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

keyboards/edi/hardlight/mk1/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       0xF7E0
-#define PRODUCT_ID      0x2401
-#define DEVICE_VER      0x0000
-#define MANUFACTURER    Everywhere Defense Industries
-#define PRODUCT         Hard Light
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8

keyboards/edi/hardlight/mk1/info.json

@@ -0,0 +1,9 @@
+{
+    "keyboard_name": "Hard Light",
+    "manufacturer": "Everywhere Defense Industries",
+    "usb": {
+        "vid": "0xF7E0",
+        "pid": "0x2401",
+        "device_version": "0.0.1"
+    }
+}

keyboards/edi/hardlight/mk2/config.h

@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xF7E0
-#define PRODUCT_ID      0x2408
-#define DEVICE_VER      0x0007
-#define MANUFACTURER    Everywhere Defense Industries
-#define PRODUCT         Hard Light Mk 2
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8

keyboards/edi/hardlight/mk2/info.json

@@ -0,0 +1,9 @@
+{
+    "keyboard_name": "Hard Light Mk 2",
+    "manufacturer": "Everywhere Defense Industries",
+    "usb": {
+        "vid": "0xF7E0",
+        "pid": "0x2408",
+        "device_version": "0.0.7"
+    }
+}