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

keyboards/primekb/prime_e/config.h

@@ -19,10 +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       0x5052
-#define MANUFACTURER    PrimeKB
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 13

keyboards/primekb/prime_e/info.json

@@ -1,7 +1,10 @@
 {
-  "keyboard_name": "Prime_E",
+  "manufacturer": "PrimeKB",
   "url": "https://www.primekb.com",
   "maintainer": "holtenc",
+  "usb": {
+    "vid": "0x5052"
+  },
   "layouts": {
       "LAYOUT": {
           "layout": [{"x":0,"y":0,"w":1,"h":1}, {"x":1,"y":0,"w":1,"h":1}, {"x":2,"y":0,"w":1,"h":1}, {"x":3,"y":0,"w":1,"h":1}, {"x":4,"y":0,"w":1,"h":1}, {"x":5,"y":0,"w":1,"h":1}, {"x":7,"y":0,"w":1,"h":1}, {"x":8,"y":0,"w":1,"h":1}, {"x":9,"y":0,"w":1,"h":1}, {"x":10,"y":0,"w":1,"h":1}, {"x":11,"y":0,"w":1,"h":1}, {"x":12,"y":0,"w":1,"h":1}, {"x":13,"y":0,"w":1,"h":1},

keyboards/primekb/prime_e/rgb/config.h

@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x0052
-#define DEVICE_VER      0x0001
-#define PRODUCT         Prime_E RGB
-
 #define RGB_DI_PIN B7
 #define RGBLED_NUM 8
 #define RGBLIGHT_ANIMATIONS

keyboards/primekb/prime_e/rgb/info.json

@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Prime_E RGB",
+    "usb": {
+        "pid": "0x0052",
+        "device_version": "0.0.1"
+    }
+}

keyboards/primekb/prime_e/std/config.h

@@ -19,10 +19,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define PRODUCT_ID      0x0051
-#define DEVICE_VER      0x0001
-#define PRODUCT         Prime_E
-
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 5

keyboards/primekb/prime_e/std/info.json

@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Prime_E",
+    "usb": {
+        "pid": "0x0051",
+        "device_version": "0.0.1"
+    }
+}