Merge remote-tracking branch 'origin/master' into develop

keyboards/aplyard/aplx6/rev2/config.h

@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xE0E0
-#define PRODUCT_ID      0x0040
-#define DEVICE_VER 		0x0002
-#define MANUFACTURER    Aplyard
-#define PRODUCT         Aplx6
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3

keyboards/aplyard/aplx6/rev2/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0x0040",
+        "device_version": "0.0.2"
+    }
+}