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

keyboards/tkw/grandiceps/config.h

@@ -18,10 +18,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x7812
 #define DEVICE_VER 0x0001
-#define MANUFACTURER tkw
 #define PRODUCT Grandiceps Split
 
 /* key matrix size */

keyboards/tkw/grandiceps/info.json

@@ -1,8 +1,11 @@
 {
-    "keyboard_name": "grandiceps",
+    "manufacturer": "tkw",
     "url": "https://github.com/vattern/grandiceps",
     "maintainer": "vattern",
-    "manufacturer": "tkw",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x7812"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/tkw/grandiceps/rev1/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Grandiceps Split",
+    "usb": {
+        "device_version": "0.0.1"
+    }
+}

keyboards/tkw/grandiceps/rev2/config.h

@@ -15,10 +15,5 @@
  */
 #pragma once
 
-#undef DEVICE_VER
-#define DEVICE_VER 0x0002
-#undef PRODUCT
-#define PRODUCT Grandiceps Split rev2
-
 #define SPLIT_HAND_PIN B3
 #define EEPROM_I2C_24LC64

keyboards/tkw/grandiceps/rev2/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Grandiceps Split rev2",
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}

keyboards/tkw/grandiceps/rules.mk

@@ -26,3 +26,5 @@ OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 WS2812_DRIVER = pwm
 OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE
+
+DEFAULT_FOLDER = tkw/grandiceps/rev1