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

keyboards/keycapsss/plaid_pad/config.h

@@ -18,11 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7983
-#define PRODUCT_ID 0x5050 // "PP"
-#define MANUFACTURER Keycapsss
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4

keyboards/keycapsss/plaid_pad/info.json

@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "Plaid-Pad",
+    "manufacturer": "Keycapsss",
     "url": "https://keycapsss.com/diy-kits/104/plaid-pad-4x4-numpad",
     "maintainer": "BenRoe",
+    "usb": {
+        "vid": "0x7983",
+        "pid": "0x5050"
+    },
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [

keyboards/keycapsss/plaid_pad/rev1/config.h

@@ -16,10 +16,6 @@
 
 #pragma once
 
-#define PRODUCT Plaid-Pad Rev1
-#define DEVICE_VER 0x0001
-
-
 #define ENCODERS_PAD_A { D1, B2 }
 #define ENCODERS_PAD_B { D0, B1 }
 

keyboards/keycapsss/plaid_pad/rev1/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Plaid-Pad Rev1",
+    "usb": {
+        "device_version": "0.0.1"
+    }
+}

keyboards/keycapsss/plaid_pad/rev2/config.h

@@ -16,10 +16,6 @@
 
 #pragma once
 
-#define PRODUCT Plaid-Pad Rev2
-#define DEVICE_VER 0x0002
-
-
 #define ENCODERS_PAD_A { D1, B2, B4, D4 }
 #define ENCODERS_PAD_B { D0, B1, B3, B5 }
 

keyboards/keycapsss/plaid_pad/rev2/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Plaid-Pad Rev2",
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}

keyboards/keycapsss/plaid_pad/rev3/config.h

@@ -16,9 +16,5 @@
 
 #pragma once
 
-#define PRODUCT Plaid-Pad Rev3
-#define DEVICE_VER 0x0003
-
-
 #define ENCODERS_PAD_A { D1, B2, B4, D4 }
 #define ENCODERS_PAD_B { D0, B1, B3, B5 }

keyboards/keycapsss/plaid_pad/rev3/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Plaid-Pad Rev3",
+    "usb": {
+        "device_version": "0.0.3"
+    }
+}