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

keyboards/b_sides/rev41lp/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       0xFEED
-#define PRODUCT_ID      0x5F10
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    cyril279
-#define PRODUCT         rev41lp
-
 /* key matrix size */
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 6

keyboards/b_sides/rev41lp/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "rev41lp",
+    "manufacturer": "cyril279",
     "url": "https://github.com/cyril279/keyboards/tree/main/revlp/41_1350",
     "maintainer": "cyril279",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x5F10",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_rev41lp": {
             "layout": [

keyboards/bacca70/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       0xBACA
-#define PRODUCT_ID      0x6970
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Viktus Design LLC
-#define PRODUCT         Bacca70
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 8

keyboards/bacca70/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Bacca70",
+    "manufacturer": "Viktus Design LLC",
     "url": "https://3dkeebs.com/",
     "maintainer": "keebnewb",
+    "usb": {
+        "vid": "0xBACA",
+        "pid": "0x6970",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_default": {
           "layout": [

keyboards/baguette/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       0xFEED
-#define PRODUCT_ID      0x5050
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Yiancar
-#define PRODUCT         Baguette
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/baguette/info.json

@@ -1,8 +1,14 @@
 {
   "keyboard_name": "Baguette",
+  "manufacturer": "Yiancar",
   "url": "",
   "maintainer": "qmk",
   "bootloader": "atmel-dfu",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x5050",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_ansi": {
       "layout": [

keyboards/bandominedoni/config.h

@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0xFEED
-#define PRODUCT_ID   0xF4B5
-#define DEVICE_VER   0x0001
-#define MANUFACTURER 3araht
-#define PRODUCT      bandominedoni
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 7

keyboards/bandominedoni/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "bandominedoni",
+    "manufacturer": "3araht",
     "url": "https://github.com/3araht",
     "maintainer": "3araht",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xF4B5",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/bantam44/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       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Bantam Keyboards
-#define PRODUCT         Bantam44
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/bantam44/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "Bantam-44",
+  "keyboard_name": "Bantam44",
+  "manufacturer": "Bantam Keyboards",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":3, "y":0}, {"label":"K04", "x":4, "y":0}, {"label":"K05", "x":5, "y":0}, {"label":"K06", "x":6, "y":0}, {"label":"K07", "x":7, "y":0}, {"label":"K08", "x":8, "y":0}, {"label":"K09", "x":9, "y":0}, {"label":"K0A", "x":10, "y":0}, {"label":"K0B", "x":11, "y":0}, {"label":"K10", "x":0, "y":1, "w":1.5}, {"label":"K11", "x":1.5, "y":1}, {"label":"K12", "x":2.5, "y":1}, {"label":"K13", "x":3.5, "y":1}, {"label":"K14", "x":4.5, "y":1}, {"label":"K15", "x":5.5, "y":1}, {"label":"K16", "x":6.5, "y":1}, {"label":"K17", "x":7.5, "y":1}, {"label":"K18", "x":8.5, "y":1}, {"label":"K19", "x":9.5, "y":1}, {"label":"K1A", "x":10.5, "y":1, "w":1.5}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K24", "x":4, "y":2}, {"label":"K25", "x":5, "y":2}, {"label":"K26", "x":6, "y":2}, {"label":"K27", "x":7, "y":2}, {"label":"K28", "x":8, "y":2}, {"label":"K29", "x":9, "y":2}, {"label":"K2A", "x":10, "y":2}, {"label":"K2B", "x":11, "y":2}, {"label":"K30", "x":0, "y":3, "w":1.25}, {"label":"K31", "x":1.25, "y":3, "w":1.25}, {"label":"K32", "x":2.5, "y":3, "w":1.25}, {"label":"K33", "x":3.75, "y":3, "w":1.25}, {"label":"K34", "x":5, "y":3, "w":2.75}, {"label":"K35", "x":7.75, "y":3, "w":1.25}, {"label":"K36", "x":9, "y":3}, {"label":"K37", "x":10, "y":3}, {"label":"K38", "x":11, "y":3}]

keyboards/barleycorn_smd/config.h

@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x7033
-#define PRODUCT_ID      0x4749
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    P3D Store
-#define PRODUCT         Barleycorn SMD
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 18

keyboards/barleycorn_smd/info.json

@@ -1,6 +1,12 @@
 {
     "keyboard_name": "Barleycorn SMD",
+    "manufacturer": "P3D Store",
     "maintainer": "matthewdias",
+    "usb": {
+        "vid": "0x7033",
+        "pid": "0x4749",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/barracuda/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x6B6E
-#define PRODUCT_ID   0x0001
-#define DEVICE_VER   0x0001
-#define MANUFACTURER knaruo
-#define PRODUCT      barracuda
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 6

keyboards/barracuda/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "barracuda",
+    "manufacturer": "knaruo",
     "url": "https://github.com/knaruo/barracuda",
     "maintainer": "knaruo",
+    "usb": {
+        "vid": "0x6B6E",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_3x11": {
             "layout": [

keyboards/basekeys/trifecta/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x04D8
-#define PRODUCT_ID      0xEAF3
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Swiftrax
-#define PRODUCT         Trifecta
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8

keyboards/basketweave/config.h

@@ -18,12 +18,6 @@
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x6B62
-#define PRODUCT_ID      0x8989
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Clackery
-#define PRODUCT         Basketweave
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/basketweave/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Basketweave",
+    "manufacturer": "Clackery",
     "url": "https://github.com/null-ll/basketweave",
     "maintainer": "null-ll",
+    "usb": {
+        "vid": "0x6B62",
+        "pid": "0x8989",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_default": {
             "layout": [

keyboards/bastardkb/scylla/info.json

@@ -1,7 +1,12 @@
 {
-    "url": "https://bastardkb.com/scylla",
+    "keyboard_name": "Scylla",
+    "manufacturer": "Bastard Keyboards",
+    "url": "https://bastardkb.com/",
+    "maintainer": "Quentin Lebastard",
     "usb": {
+        "vid": "0xA8F8",
         "pid": "0x1829",
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_split_4x6_5": {

keyboards/bastardkb/skeletyl/info.json

@@ -1,7 +1,12 @@
 {
-    "url": "https://bastardkb.com/skeletyl",
+    "keyboard_name": "Skeletyl",
+    "manufacturer": "Bastard Keyboards",
+    "url": "https://www.bastardkb.com",
+    "maintainer": "Quentin Lebastard",
     "usb": {
+        "vid": "0xA8F8",
         "pid": "0x1830",
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_split_3x5_3": {

keyboards/bastardkb/tbk/config.h

@@ -17,11 +17,6 @@
 
 #pragma once
 #include "config_common.h"
-#define VENDOR_ID 0xA8F8
-#define PRODUCT_ID 0x1828
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Bastard Keyboards
-#define PRODUCT The Bastard Keyboard
 
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 6

keyboards/bastardkb/tbk/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "The Bastard Keyboard",
+    "manufacturer": "Bastard Keyboards",
     "url": "https://bastardkb.com/",
     "maintainer": "Quentin Lebastard",
+    "usb": {
+        "vid": "0xA8F8",
+        "pid": "0x1828",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_split_4x6_5": {
             "layout": [

keyboards/bastardkb/tbkmini/info.json

@@ -1,7 +1,12 @@
 {
-    "url": "https://bastardkb.com/tbk-mini",
+    "keyboard_name": "TBK Mini",
+    "manufacturer": "Bastard Keyboards",
+    "url": "https://www.bastardkb.com",
+    "maintainer": "Quentin Lebastard",
     "usb": {
+        "vid": "0xA8F8",
         "pid": "0x1828",
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_split_3x6_3": {

keyboards/bbrfkr/dynamis/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6262
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER bbrfkr
-#define PRODUCT dynamis
-
 /* key matrix */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 7

keyboards/bbrfkr/dynamis/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "dynamis",
+    "manufacturer": "bbrfkr",
     "url": "https://github.com/bbrfkr/keyboards",
     "maintainer": "bbrfkr",
+    "usb": {
+        "vid": "0x6262",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [

keyboards/beatervan/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6F6A // "oj"
-#define PRODUCT_ID 0x6276 // "bv"
-#define DEVICE_VER 0x0001
-#define MANUFACTURER OJ
-#define PRODUCT beatervan
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12

keyboards/beatervan/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "beatervan",
+  "manufacturer": "OJ",
   "url": "",
   "maintainer": "OJ",
+  "usb": {
+    "vid": "0x6F7A",
+    "pid": "0x6276",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
         "layout": [

keyboards/bfake/config.h

@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x20A0
-#define PRODUCT_ID      0x422D
-#define DEVICE_VER      0x0200
-#define MANUFACTURER    NotWinkeyless
-#define PRODUCT         B.fake
-
 #define RGBLED_NUM 16
 
 #define MATRIX_ROWS 8

keyboards/biacco42/meishi/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       0xBC42
-#define PRODUCT_ID      0x0002
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Biacco42
-#define PRODUCT         meishi
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 4

keyboards/biacco42/meishi/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Meishi",
+    "manufacturer": "Biacco42",
     "url": "",
     "maintainer": "Biacco42",
+    "usb": {
+        "vid": "0xBC42",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/biacco42/meishi2/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       0xBC42
-#define PRODUCT_ID      0x0003
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Biacco42
-#define PRODUCT         meishi2
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 2

keyboards/biacco42/meishi2/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "meishi2",
+  "manufacturer": "Biacco42",
   "url": "",
   "maintainer": "biacco42",
+  "usb": {
+    "vid": "0xBC42",
+    "pid": "0x0003",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/binepad/bn003/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4249 // Binepad
-#define PRODUCT_ID      0x4287
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Binepad
-#define PRODUCT         BN003
-
 /* Key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 3

keyboards/binepad/bn003/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "BN003",
+  "manufacturer": "Binepad",
   "url": "https://binepad.com",
   "maintainer": "binepad",
+  "usb": {
+    "vid": "0x4249",
+    "pid": "0x4287",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/binepad/bn009/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4249 // Binepad
-#define PRODUCT_ID      0x4295
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Binepad
-#define PRODUCT         BN009
-
 /* Key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3

keyboards/binepad/bn009/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "BN009",
+  "manufacturer": "Binepad",
   "url": "https://binepad.com",
   "maintainer": "binepad",
+  "usb": {
+    "vid": "0x4249",
+    "pid": "0x4295",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}]

keyboards/bioi/f60/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    0x8101
-#define PRODUCT_ID   0x4660
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Basic IO Instruments
-#define PRODUCT      BIOI F60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/bioi/f60/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "f60",
+    "keyboard_name": "BIOI F60",
+    "manufacturer": "Basic IO Instruments",
     "url": "",
     "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0x8101",
+        "pid": "0x4660",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/bioi/g60/config.h

@@ -19,14 +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       0x8101  // 8101 = "BIOI"
-#define PRODUCT_ID      0x6080
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Basic IO Instruments
-#define PRODUCT         BIOI G60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/bioi/g60/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "BIOI G60",
+    "manufacturer": "Basic IO Instruments",
     "url": "https://scottywei.github.io/bioi-g60ble/",
     "maintainer": "scottywei",
+    "usb": {
+        "vid": "0x8101",
+        "pid": "0x6080",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/bioi/g60ble/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6583
-#define PRODUCT_ID 0x6080
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Basic IO Instruments
-#define PRODUCT BIOI G60 BLE
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/bioi/g60ble/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "BIOI G60 BLE",
+    "manufacturer": "Basic IO Instruments",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x6583",
+        "pid": "0x6080",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/bioi/morgan65/config.h

@@ -19,14 +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       0x8101  // 8101 = "BIOI"
-#define PRODUCT_ID      0x6581
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Basic IO Instruments
-#define PRODUCT         BIOI MORGAN65
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/bioi/morgan65/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Morgan65",
+    "manufacturer": "Basic IO Instruments",
     "url": "",
     "maintainer": "scottywei",
+    "usb": {
+        "vid": "0x8101",
+        "pid": "0x6581",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
           "layout": [

keyboards/bioi/s65/config.h

@@ -19,14 +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       0x8101  // 8101 = "BIOI"
-#define PRODUCT_ID      0x5365    // "S"65
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Basic IO Instruments
-#define PRODUCT         BIOI S65
-
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/bioi/s65/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "BIOI S65",
+    "manufacturer": "Basic IO Instruments",
     "url": "",
     "maintainer": "scottywei",
+    "usb": {
+        "vid": "0x8101",
+        "pid": "0x5365",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/blackplum/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x5058 // "PX"
-#define PRODUCT_ID      0x4250 // "BP"
-#define DEVICE_VER      0x1001
-#define MANUFACTURER    Pixlup
-#define PRODUCT         Blackplum Keeb
-
 /* key matrix size */
 #define MATRIX_ROWS 9
 #define MATRIX_COLS 8

keyboards/blank/blank01/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    0x424C         // "BL"
-#define PRODUCT_ID   0x4B01         // "K01"
-#define DEVICE_VER   0x0001
-#define MANUFACTURER BLANK
-#define PRODUCT      BLANK.01
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/blank/blank01/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "blank01",
+    "keyboard_name": "BLANK.01",
+    "manufacturer": "BLANK",
     "url": "",
     "maintainer": "gkeyboard",
+    "usb": {
+        "vid": "0x424C",
+        "pid": "0x4B01",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_60_tsangan_hhkb": {
             "layout": [

keyboards/blank_tehnologii/manibus/config.h

@@ -18,12 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    Blank Tehnologii
-#define PRODUCT         Manibus
 #define EE_HANDS
 
 /* key matrix size */

keyboards/blank_tehnologii/manibus/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Manibus",
+    "manufacturer": "Blank Tehnologii",
     "url": "https://blank.computer/",
     "maintainer": "SamuraiKek",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout":  [

keyboards/blaster75/config.h

@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0xA122  
-#define PRODUCT_ID      0xB075  
-#define DEVICE_VER      0x0001  
-#define MANUFACTURER    Altain
-#define PRODUCT         Blaster75
-
 /* Matrix Size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15

keyboards/blaster75/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Blaster 75", 
+    "manufacturer": "Altain",
     "url": "", 
     "maintainer": "Altain", 
+    "usb": {
+        "vid": "0xA122",
+        "pid": "0xB075",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/blockey/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       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Eucalyn
-#define PRODUCT         Blockey
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 7

keyboards/boardrun/bizarre/config.h

@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xCDCD
-#define PRODUCT_ID      0x5339
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    shensmobile
-#define PRODUCT         Boardrun Bizarre
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 17

keyboards/boardrun/bizarre/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Boardrun Bizarre",
+    "manufacturer": "shensmobile",
     "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/boardrun/bizarre",
     "maintainer": "QMK Community",
+    "usb": {
+        "vid": "0xCDCD",
+        "pid": "0x5339",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/boardrun/classic/config.h

@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xCDCD
-#define PRODUCT_ID      0x5338
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    shensmobile
-#define PRODUCT         Boardrun Classic
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 17

keyboards/boardrun/classic/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Boardrun Classic",
+    "manufacturer": "shensmobile",
     "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/boardrun/classic",
     "maintainer": "QMK Community",
+    "usb": {
+        "vid": "0xCDCD",
+        "pid": "0x5338",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_classic": {
             "layout": [

keyboards/boardwalk/config.h

@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xCDCD
-#define PRODUCT_ID      0x5337
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    shensmobile
-#define PRODUCT         Boardwalk
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/boardwalk/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Boardwalk",
+    "manufacturer": "shensmobile",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xCDCD",
+        "pid": "0x5337",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_5x14": {
             "layout": [

keyboards/bobpad/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x416B
-#define PRODUCT_ID      0x0002
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Desiboards
-#define PRODUCT         bobpad
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3

keyboards/bobpad/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "bobPad",
+    "manufacturer": "Desiboards",
     "url": "",
     "maintainer": "Ananya Kirti",
+    "usb": {
+        "vid": "0x416B",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_2x3": {
             "layout": [

keyboards/bolsa/damapad/config.h

@@ -20,14 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6D64
-#define PRODUCT_ID      0x6470
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Bolsa Keyboard Supply
-#define PRODUCT         Damapad
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 6

keyboards/bolsa/damapad/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Damapad",
+    "manufacturer": "Bolsa Keyboard Supply",
     "url": "",
     "maintainer": "matthewdias",
+    "usb": {
+        "vid": "0x6D64",
+        "pid": "0x6470",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_wkl": {
             "layout": [{

keyboards/bop/config.h

@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x666B // fk
-#define PRODUCT_ID      0x626F // bo
-#define DEVICE_VER      0x0001 // rev 1
-#define MANUFACTURER    fruitykeeb
-#define PRODUCT         bop
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 20

keyboards/bop/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name":  "bop",
+    "manufacturer": "fruitykeeb",
     "url": "https://github.com/blewis308/BOP-Keyboard",
     "maintainer": "Fruit",
+    "usb": {
+        "vid": "0x666B",
+        "pid": "0x626F",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/boston/config.h

@@ -16,12 +16,6 @@
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xAC12
-#define PRODUCT_ID 0x4176
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Pylon
-#define PRODUCT Boston
 /* key matrix size */
 #define MATRIX_ROWS 7
 #define MATRIX_COLS 19

keyboards/boston/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "boston",
+    "keyboard_name": "Boston",
+    "manufacturer": "Pylon",
     "url": "https://github.com/bluepylons/Boston",
     "maintainer": "bluepylons",
+    "usb": {
+        "vid": "0xAC12",
+        "pid": "0x4176",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/botanicalkeyboards/fm2u/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 0x6969
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER botanicalkeyboards
-#define PRODUCT fm2u
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1

keyboards/botanicalkeyboards/fm2u/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Botanical Keyboards FM2U",
+    "keyboard_name": "FM2U",
+    "manufacturer": "Botanical Keyboards",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x6969",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_1u": {
             "layout": [

keyboards/box75/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       0x7668 // LD for LinDesign
-#define PRODUCT_ID      0xB075 // For BOX75
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Lin Design
-#define PRODUCT         BOX75
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15

keyboards/box75/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "BOX75",
+    "manufacturer": "Lin Design",
     "url": "",
     "maintainer": "Gondolindrim",
+    "usb": {
+        "vid": "0x7668",
+        "pid": "0xB075",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/bpiphany/four_banger/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x2004
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    1up Keyboards
-#define PRODUCT         Four Banger
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 2

keyboards/bpiphany/four_banger/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Four Banger",
+    "manufacturer": "1up Keyboards",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x2004",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_2x2": {
             "layout": [

keyboards/bpiphany/ghost_squid/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       0xFEED
-#define PRODUCT_ID      0x6050
-#define DEVICE_VER      0x0104
-#define MANUFACTURER    Bathroom Epiphanies
-#define PRODUCT         ghost_squid
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18

keyboards/bpiphany/ghost_squid/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Bathroom Epiphanies Ghost Squid",
+    "keyboard_name": "Ghost Squid",
+    "manufacturer": "Bathroom Epiphanies",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6050",
+        "device_version": "1.0.4"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/bpiphany/hid_liber/config.h

@@ -19,13 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0xB919
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    "bpiphany"
-#define PRODUCT         "HIDLiberation"
-
 /* key matrix size */
 #define MATRIX_ROWS 18
 #define MATRIX_COLS 8

keyboards/bpiphany/hid_liber/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "bpiphany HIDLiberation",
+    "keyboard_name": "HIDLiberation",
+    "manufacturer": "bpiphany",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xB919",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/bpiphany/kitten_paw/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       0xFEED
-#define PRODUCT_ID      0x6050
-#define DEVICE_VER      0x0104
-#define MANUFACTURER    Costar
-#define PRODUCT         Majestouch
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18

keyboards/bpiphany/sixshooter/config.h

@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6666
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    bpiphany
-#define PRODUCT         sixshooter
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3

keyboards/bpiphany/sixshooter/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "SixShooter",
+  "manufacturer": "bpiphany",
   "maintainer": "qmk",
   "url": "https://geekhack.org/index.php?topic=70033.0",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6666",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":0, "y":1}, {"label":"K04", "x":1, "y":1}, {"label":"K05", "x":2, "y":1}]

keyboards/bpiphany/tiger_lily/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       0x4245  //BE
-#define PRODUCT_ID      0x544C  //TL
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Bathroom Epiphanies
-#define PRODUCT         tiger_lily
-
 /*
  * Frosty Flake Rev. 20140521 made by Bathroom Ephiphanies
  * Ported from the Bathroom Epiphanies TMK Firmware:

keyboards/bpiphany/unloved_bastard/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       0xFEED
-#define PRODUCT_ID      0x1337
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    BathroomEpiphanies
-#define PRODUCT         Unloved Bastard
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18

keyboards/bt66tech/bt66tech60/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	0x4254
-#define PRODUCT_ID	0x7070
-#define DEVICE_VER      0x0001
-#define MANUFACTURER bt66tech
-#define PRODUCT bt66tech 60%
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/bt66tech/bt66tech60/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "bt66tech60",
+    "keyboard_name": "bt66tech 60%",
+    "manufacturer": "bt66tech",
     "url": "",
     "maintainer": "bt66tech",
+    "usb": {
+        "vid": "0x4254",
+        "pid": "0x7070",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_60_ansi": {
 "layout": [

keyboards/bthlabs/geekpad/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       0xFEED
-#define PRODUCT_ID      0x4257
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    BTHLabs
-#define PRODUCT         GeekPad
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3

keyboards/bthlabs/geekpad/info.json

@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "BTHLabs GeekPad",
+  "keyboard_name": "GeekPad",
+  "manufacturer": "BTHLabs",
   "url": "https://git.bthlabs.pl/tomekwojcik/geekpad",
   "maintainer": "Tomek Wójcik <contact@bthlabs.pl>",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x4257",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

keyboards/buildakb/potato65/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    0xFEED
-#define PRODUCT_ID   0x0001
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Maelkk
-#define PRODUCT      Potato 65
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

keyboards/buildakb/potato65/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Potato 65",
+    "manufacturer": "Maelkk",
     "url": "https://github.com/Aeonstrife/potato65",
     "maintainer": "Maelkk",
+    "usb": {
+        "vid": "0x4A56",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_65_ansi_split_bs": {
             "layout": [

keyboards/buildakb/potato65hs/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       0x4A56
-#define PRODUCT_ID      0x0002
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Maelkk
-#define PRODUCT         Potato 65 Hotswap
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/buildakb/potato65hs/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Potato 65 Hotswap",
+    "manufacturer": "Maelkk",
     "url": "https://github.com/Aeonstrife/potato65hotswap",
     "maintainer": "Maelkk",
+    "usb": {
+        "vid": "0x4A56",
+        "pid": "0x0002",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [

keyboards/buildakb/potato65s/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       0x4A56
-#define PRODUCT_ID      0x0003
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Maelkk
-#define PRODUCT         Potato 65 Solderable
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/buildakb/potato65s/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Potato 65 Solderable",
+    "manufacturer": "Maelkk",
     "url": "https://github.com/Aeonstrife/potato65solderable",
     "maintainer": "Maelkk",
+    "usb": {
+        "vid": "0x4A56",
+        "pid": "0x0003",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/charue/sunsetter_r2/sunsetter_r2.h

@@ -10,11 +10,11 @@
     k10, k11,    k12,   k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,  k1f,  k2f, \
     k20, k21,     k22,   k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,    k2e,    k3f, \
     k30, k31,    k32,  k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,   k3e,  k3g, k4g, \
-    k40, k41,    k42,   k43,   k44,   k45,   k48,      k4a,  k4c,                k4d, k4e, k4f  \
+    k40, k41,    k42,   k43,   k44,   k45,   k47,      k4a,  k4c,                k4d, k4e, k4f  \
 ) { \
-    { k00, k01, k02, k03, k04, k05, k06,   k07,   k08, k09,   k0a, k0b,   k0c, k0d, k0e, k0f, k0g   }, \
-    { k10, k11, k12, k13, k14, k15, k16,   k17,   k18, k19,   k1a, k1b,   k1c, k1d, k1e, k1f, k1g   }, \
-    { k20, k21, k22, k23, k24, k25, k26,   k27,   k28, k29,   k2a, k2b,   k2c, k2d, k2e, k2f, KC_NO }, \
-    { k30, k31, k32, k33, k34, k35, k36,   k37,   k38, k39,   k3a, k3b,   k3c, k3d, k3e, k3f, k3g   }, \
-    { k40, k41, k42, k43, k44, k45, KC_NO, KC_NO, k48, KC_NO, k4a, KC_NO, k4c, k4d, k4e, k4f, k4g   }  \
-}
+    { k00, k01, k02, k03, k04, k05, k06,   k07, k08,   k09,   k0a, k0b,   k0c, k0d, k0e, k0f, k0g   }, \
+    { k10, k11, k12, k13, k14, k15, k16,   k17, k18,   k19,   k1a, k1b,   k1c, k1d, k1e, k1f, k1g   }, \
+    { k20, k21, k22, k23, k24, k25, k26,   k27, k28,   k29,   k2a, k2b,   k2c, k2d, k2e, k2f, KC_NO }, \
+    { k30, k31, k32, k33, k34, k35, k36,   k37, k38,   k39,   k3a, k3b,   k3c, k3d, k3e, k3f, k3g   }, \
+    { k40, k41, k42, k43, k44, k45, KC_NO, k47, KC_NO, KC_NO, k4a, KC_NO, k4c, k4d, k4e, k4f, k4g   }  \
+}