Move keyboard USB IDs and strings to data driven, pass 2: M-O (#18090)

keyboards/maple_computing/christmas_tree/V2017/config.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-#define DEVICE_VER 0x2017

keyboards/maple_computing/christmas_tree/V2017/info.json

@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "20.1.7"
+    }
+}

keyboards/maple_computing/christmas_tree/config.h

@@ -19,12 +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      0x3070
-#define MANUFACTURER    Maple Computing
-#define PRODUCT         Christmas Tree
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 1

keyboards/maple_computing/christmas_tree/info.json

@@ -1,7 +1,12 @@
 {
   "keyboard_name": "Christmas Tree",
+  "manufacturer": "Maple Computing",
   "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/",
   "maintainer": "That-Canadian",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x3070"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [{"x":1, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}]

keyboards/maple_computing/ivy/config.h

@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x1337
-#define PRODUCT_ID      0x6012
-#define MANUFACTURER    Maple Computing
-#define PRODUCT         Ivy
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3

keyboards/maple_computing/ivy/rev1/config.h

@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DEVICE_VER      0x0001
-
 /* Let's Macro V2 pin-out */
 #define MATRIX_ROW_PINS { F1, B2, D3 }
 #define MATRIX_COL_PINS { F5, B3, D5 }

keyboards/maple_computing/ivy/rev1/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "IVY",
+    "keyboard_name": "Ivy",
+    "manufacturer": "Maple Computing",
     "url": "",
     "maintainer": "That-Canadian",
+    "usb": {
+        "vid": "0x1337",
+        "pid": "0x6012",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/maple_computing/launchpad/config.h

@@ -19,12 +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       0x1337
-#define PRODUCT_ID      0x6007
-#define MANUFACTURER    Maple Computing
-#define PRODUCT         Launch Pad
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 2

keyboards/maple_computing/launchpad/rev1/config.h

@@ -19,8 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../config.h"
 
-#define DEVICE_VER      0x0001
-
 /* Let's Macro V2 pin-out */
 #define MATRIX_ROW_PINS { C6, B1, B3, D7 }
 #define MATRIX_COL_PINS { D2, F7 }

keyboards/maple_computing/launchpad/rev1/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Launch Pad rev1",
+    "keyboard_name": "Launch Pad",
+    "manufacturer": "Maple Computing",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x1337",
+        "pid": "0x6007",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/maple_computing/lets_split_eh/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      0xE401
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    That-Canadian
-#define PRODUCT         Lets Split Eh?
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 8

keyboards/maple_computing/lets_split_eh/eh/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Let's Split",
+    "keyboard_name": "Lets Split Eh?",
+    "manufacturer": "That-Canadian",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xE401",
+        "device_version": "1.0.0"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/maple_computing/minidox/config.h

@@ -19,12 +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      0x3060
-#define MANUFACTURER    That-Canadian
-#define PRODUCT         MiniDox
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 8

keyboards/maple_computing/minidox/rev1/config.h

@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DEVICE_VER      0x0001
-
 // wiring of each half
 #define MATRIX_ROW_PINS { B2, B6, B4, B5 }
 #define MATRIX_COL_PINS { F4, D3, D2, D1, D4 }

keyboards/maple_computing/minidox/rev1/info.json

@@ -1,7 +1,13 @@
 {
   "keyboard_name": "MiniDox",
+  "manufacturer": "That-Canadian",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x3060",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_split_3x5_3": {
       "layout": [{"x":0, "y":0.375}, {"x":1, "y":0.125}, {"x":2, "y":0}, {"x":3, "y":0.125}, {"x":4, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.125}, {"x":9, "y":0}, {"x":10, "y":0.125}, {"x":11, "y":0.375}, {"x":0, "y":1.375}, {"x":1, "y":1.125}, {"x":2, "y":1}, {"x":3, "y":1.125}, {"x":4, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.125}, {"x":9, "y":1}, {"x":10, "y":1.125}, {"x":11, "y":1.375}, {"x":0, "y":2.375}, {"x":1, "y":2.125}, {"x":2, "y":2}, {"x":3, "y":2.125}, {"x":4, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.125}, {"x":9, "y":2}, {"x":10, "y":2.125}, {"x":11, "y":2.375}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":3.75, "h":2}, {"x":6.5, "y":3.75, "h":2}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}]

keyboards/marksard/rhymestone/rev1/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      0xDFA1
-#define DEVICE_VER      0x0020
-#define MANUFACTURER    marksard
-#define PRODUCT         Rhymestone
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 5

keyboards/marksard/rhymestone/info.json → keyboards/marksard/rhymestone/rev1/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Rhymestone",
+    "manufacturer": "marksard",
     "url": "https://github.com/marksard/Keyboards",
     "maintainer": "marksard",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xDFA1",
+        "device_version": "0.2.0"
+    },
     "layouts": {
         "LAYOUT_ortho_4x10": {
             "layout": [

keyboards/marksard/treadstone32/info.json

@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "Treadstone32",
+    "manufacturer": "marksard",
     "url": "https://github.com/marksard/Keyboards",
     "maintainer": "marksard",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xDFA5"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/marksard/treadstone32/lite/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      0xDFA5
-#define DEVICE_VER      0x0015
-#define MANUFACTURER    marksard
-#define PRODUCT         treadstone32 lite
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 5

keyboards/marksard/treadstone32/lite/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "treadstone32 lite",
+    "usb": {
+        "device_version": "0.1.5"
+    }
+}

keyboards/marksard/treadstone32/rev1/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      0xDFA5
-#define DEVICE_VER      0x0010
-#define MANUFACTURER    marksard
-#define PRODUCT         treadstone32
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 5

keyboards/marksard/treadstone32/rev1/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "treadstone32",
+    "usb": {
+        "device_version": "0.1.0"
+    }
+}

keyboards/masterworks/classy_tkl/rev_a/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 0x4D57  // "MW" = Masterworks
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Masterworks
-#define PRODUCT Classy TKL
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17

keyboards/masterworks/classy_tkl/info.json → keyboards/masterworks/classy_tkl/rev_a/info.json

@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Classy TKL",
+    "manufacturer": "Masterworks",
     "url": "https://geekhack.org/index.php?topic=105933",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4D57",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/mechllama/g35/config.h

@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0xCEEB
-#define PRODUCT_ID      0x0035
-#define MANUFACTURER    kaylynb
-#define PRODUCT         MechLlama G35
-
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 7
 

keyboards/mechllama/g35/info.json

@@ -1,7 +1,12 @@
 {
-    "keyboard_name": "G35",
+    "keyboard_name": "MechLlama G35",
+    "manufacturer": "kaylynb",
     "url": "https://github.com/kaylynb/MechLlama-G35",
     "maintainer": "kaylynb",
+    "usb": {
+        "vid": "0xCEEB",
+        "pid": "0x0035"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"label":"F1", "x":0, "y":0.5}, {"label":"Esc", "x":1, "y":0.5}, {"label":"1", "x":2, "y":0}, {"label":"2", "x":3, "y":0.15}, {"label":"3", "x":4, "y":0}, {"label":"4", "x":5, "y":0}, {"label":"5", "x":6, "y":0}, {"label":"F2", "x":0, "y":1.5}, {"label":"Tab", "x":1, "y":1.5}, {"label":"Q", "x":2, "y":1}, {"label":"W", "x":3, "y":1.15}, {"label":"E", "x":4, "y":1}, {"label":"R", "x":5, "y":1}, {"label":"T", "x":6, "y":1}, {"label":"F3", "x":0, "y":2.5}, {"label":"Shift", "x":1, "y":2.5}, {"label":"A", "x":2, "y":2}, {"label":"S", "x":3, "y":2.15}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"F4", "x":0, "y":3.5}, {"label":"Ctrl", "x":1, "y":3.5}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3.15}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"F5", "x":0, "y":4.5}, {"label":"Super", "x":1, "y":4.5}, {"label":"Alt", "x":2, "y":4, "h":1.5}, {"label":"Bksp", "x":3, "y":4.25, "h":1.25}, {"label":"Enter", "x":4, "y":4, "h":1.5}, {"label":"Space", "x":5, "y":4, "h":1.75}, {"label":"Fn", "x":6, "y":4, "h":1.75}]

keyboards/mechllama/g35/v1/config.h

@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DEVICE_VER      0x0001
-
 #define MATRIX_ROW_PINS { F5, F6, F4, F1, D4 }
 #define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F0, D5 }
 

keyboards/mechllama/g35/v1/info.json

@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.1"
+    }
+}

keyboards/mechllama/g35/v2/config.h

@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DEVICE_VER      0x0002
-
 #define MATRIX_ROW_PINS { F5, F4, F1, F0, D4 }
 #define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F6, D5 }
 

keyboards/mechllama/g35/v2/info.json

@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}

keyboards/mechlovin/adelais/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 VENDOR_ID    0x4D4C // "ML"
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Team.Mechlovin
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/mechlovin/adelais/info.json

@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "Adelais",
+    "manufacturer": "Team.Mechlovin",
     "url": "",
     "maintainer": "mechlovin",
+    "usb": {
+        "vid": "0x4D4C",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_alice_split_bs"
     },

keyboards/mechlovin/adelais/rgb_led/rev1/config.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#define PRODUCT_ID   0xAEC1
-#define PRODUCT      Adelais En Ciel
-
 #define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
 #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 }
 #define UNUSED_PINS

keyboards/mechlovin/adelais/rgb_led/rev1/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Adelais En Ciel",
+    "usb": {
+        "pid": "0xAEC1"
+    }
+}

keyboards/mechlovin/adelais/rgb_led/rev2/config.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#define PRODUCT_ID   0xAEC2
-#define PRODUCT      Adelais En Ciel Rev2
-
 #define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
 #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A7 }
 

keyboards/mechlovin/adelais/rgb_led/rev2/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Adelais En Ciel Rev2",
+    "usb": {
+        "pid": "0xAEC2"
+    }
+}

keyboards/mechlovin/adelais/rgb_led/rev3/config.h

@@ -17,9 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define PRODUCT_ID   0xAEC3
-#define PRODUCT      Adelais En Ciel Rev3
-
 #define MATRIX_ROW_PINS { A4, A3, C13, A1, A2}
 #define MATRIX_COL_PINS { B10, B11, B2, B1, B0, A6, A5, A10, A9, A15, B3, B4, B5, B8, B9 }
 

keyboards/mechlovin/adelais/rgb_led/rev3/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Adelais En Ciel Rev3",
+    "usb": {
+        "pid": "0xAEC3"
+    }
+}

keyboards/mechlovin/adelais/standard_led/arm/config.h

@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define PRODUCT      Adelais
-
 #define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
 #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 }
 #define UNUSED_PINS

keyboards/mechlovin/adelais/standard_led/arm/info.json

@@ -0,0 +1,3 @@
+{
+    "keyboard_name": "Adelais"
+}

keyboards/mechlovin/adelais/standard_led/arm/rev2/config.h

@@ -1,3 +0,0 @@
-#pragma once
-
-#define PRODUCT_ID   0xAD01

keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json

@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "pid": "0xAD01"
+    }
+}

keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#define PRODUCT_ID   0xAD02
-
 #define ENCODERS_PAD_A { A6, A4, B7 }
 #define ENCODERS_PAD_B { A5, A3, B6 }
 #define ENCODER_RESOLUTION 4

keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json

@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "pid": "0xAD02"
+    }
+}

keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h

@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define PRODUCT_ID   0xAD03
-
 #define ENCODERS_PAD_A { A6, A4, B7 }
 #define ENCODERS_PAD_B { A5, A3, B6 }
 #define ENCODER_RESOLUTION 4

keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json

@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "pid": "0xAD03"
+    }
+}

keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h

@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 
-#define PRODUCT_ID   0xAD04
-#define PRODUCT      Adelais AVR
 /*
  * Keyboard Matrix Assignments
  *

keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Adelais AVR",
+    "usb": {
+        "pid": "0xAD04"
+    }
+}

keyboards/mechlovin/delphine/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 VENDOR_ID       0x4D4C
-#define MANUFACTURER    Mechlovin
-#define PRODUCT         Mechlovin Delphine
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 4

keyboards/mechlovin/delphine/info.json

@@ -1,7 +1,11 @@
 {
     "keyboard_name": "Delphine",
+    "manufacturer": "Mechlovin",
     "url": "",
     "maintainer": "mechlovin",
+    "usb": {
+        "vid": "0x4D4C"
+    },
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [

keyboards/mechlovin/delphine/mono_led/config.h

@@ -1,10 +1,6 @@
 
 #pragma once
 
-#define PRODUCT_ID      0xDEF1
-#define DEVICE_VER      0x0001
-
-
 #ifdef BACKLIGHT_ENABLE
 #define BACKLIGHT_PIN B6
 // #define BACKLIGHT_BREATHING

keyboards/mechlovin/delphine/mono_led/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0xDEF1",
+        "device_version": "0.0.1"
+    }
+}

keyboards/mechlovin/delphine/rgb_led/config.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#define PRODUCT_ID      0xDEF2
-#define DEVICE_VER      0x0001
-
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN E2
 #define RGBLED_NUM 13

keyboards/mechlovin/delphine/rgb_led/info.json

@@ -0,0 +1,6 @@
+{
+    "usb": {
+        "pid": "0xDEF2",
+        "device_version": "0.0.1"
+    }
+}

keyboards/mechlovin/foundation/config.h

@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x4D4C
-#define PRODUCT_ID   0x0180
-#define DEVICE_VER   0x0002
-#define MANUFACTURER Mechlovin Studio
-#define PRODUCT      Foundation FRL
 
 #define MATRIX_ROW_PINS { B12, B13, B14, A8, A2 }
 #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A15, B9, B8, B7, B6, B5, B4, B3}

keyboards/mechlovin/hannah60rgb/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    0x4D4C // ML-Mechlovin
-#define MANUFACTURER Team.Mechlovin
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14

keyboards/mechlovin/hannah60rgb/rev1/config.h

@@ -1,9 +1,5 @@
 #pragma once
 
-#define PRODUCT_ID   0x6001
-#define DEVICE_VER   0x0001
-#define PRODUCT      Hannah60 RGB
-
 #define RGB_DI_PIN A15
 #ifdef RGB_MATRIX_ENABLE
 #    define DRIVER_LED_TOTAL 72

keyboards/mechlovin/hannah60rgb/rev1/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "hannah60rgb rev1",
+    "keyboard_name": "Hannah60 RGB",
+    "manufacturer": "Team.Mechlovin",
     "url": "",
     "maintainer": "mechlovin",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x6001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/mechlovin/hannah60rgb/rev2/config.h

@@ -1,9 +1,5 @@
 #pragma once
 
-#define PRODUCT_ID   0x6002
-#define DEVICE_VER   0x0001
-#define PRODUCT      Hannah60 RGB Rev.2
-
 #ifdef RGBLIGHT_ENABLE
 #    define RGB_DI_PIN A15
 #    define RGBLED_NUM      18

keyboards/mechlovin/hannah60rgb/rev2/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "hannah60rgb rev2",
+    "keyboard_name": "Hannah60 RGB Rev.2",
+    "manufacturer": "Team.Mechlovin",
     "url": "",
     "maintainer": "mechlovin",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x6002",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/mechlovin/hannah65/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    0x4D4C
-#define MANUFACTURER Team Mechlovin
-
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 

keyboards/mechlovin/hannah65/rev1/haus/config.h

@@ -1,22 +0,0 @@
-/*
-Copyright 2021 Mechlovin' Studio
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define PRODUCT_ID   0x6500
-#define DEVICE_VER   0x0001
-#define PRODUCT      Haus Rev. 1

keyboards/mechlovin/hannah65/rev1/info.json → keyboards/mechlovin/hannah65/rev1/haus/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "hannah65-rev1",
+    "keyboard_name": "Haus Rev. 1",
+    "manufacturer": "Team Mechlovin",
     "url": "",
     "maintainer": "Team Mechlovin",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x6500",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/mechlovin/hannah910/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 VENDOR_ID       0x4D4C // ML-MechLovin'
-#define MANUFACTURER    Mechlovin
-#define PRODUCT         Mechlovin Hannah910
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

keyboards/mechlovin/hannah910/rev1/config.h

@@ -1,6 +1,3 @@
 #pragma once
 
-#define PRODUCT_ID 0x9101 
-#define DEVICE_VER 0x0001
-
 #define RGBLED_NUM 9

keyboards/mechlovin/hannah910/rev2/config.h

@@ -1,6 +1,3 @@
 #pragma once
 
-#define PRODUCT_ID 0x9102 
-#define DEVICE_VER 0x0002
-
 #define RGBLED_NUM 28

keyboards/mechlovin/hannah910/rev2/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Hannah910 Rev.2",
+    "keyboard_name": "Hannah910",
+    "manufacturer": "Mechlovin",
     "url": "",
     "maintainer": "Team Mechlovin'",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x9102",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/mechlovin/hannah910/rev3/config.h

@@ -1,6 +1,3 @@
 #pragma once
 
-#define PRODUCT_ID 0x9103
-#define DEVICE_VER 0x0002
-
 #define RGBLED_NUM 28

keyboards/mechlovin/hannah910/rev3/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "hannah910-rev3",
+    "keyboard_name": "Hannah910",
+    "manufacturer": "Mechlovin",
     "url": "",
     "maintainer": "Team Mechlovin'",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x9103",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/mechlovin/hex4b/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 VENDOR_ID    0x4D4C
-#define PRODUCT_ID   0x0675 //Hex-75
-#define MANUFACTURER Mechlovin Studio
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15

keyboards/mechlovin/hex4b/info.json

@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "Hex4B",
+    "manufacturer": "Mechlovin Studio",
     "url": "",
     "maintainer": "Hex-Keyboard&Mechlovin",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x0675"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_split_bs",
         "LAYOUT_all": "LAYOUT_split_bs"

keyboards/mechlovin/hex4b/rev1/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 DEVICE_VER   0x0001
-#define PRODUCT      Hex-4B Rev.1
-
 /*
  * Keyboard Matrix Assignments
  *

keyboards/mechlovin/hex4b/rev1/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Hex-4B Rev.1",
+    "usb": {
+        "device_version": "0.0.1"
+    }
+}

keyboards/mechlovin/hex4b/rev2/config.h

@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER   0x0002
-#define PRODUCT      Hex-4B Rev.2
-
-
-
 /*
  * Keyboard Matrix Assignments
  *

keyboards/mechlovin/hex4b/rev2/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Hex-4B Rev.2",
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}

keyboards/mechlovin/infinity87/config.h

@@ -18,11 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID   0x4D4C // ML
-
-#define MANUFACTURER  Mechlovin.Studio
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17

keyboards/mechlovin/infinity87/rev1/rogue87/config.h

@@ -1,21 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define PRODUCT_ID  0x8704
-#define DEVICE_VER  0x0001
-#define PRODUCT     Rogue87 Rev.1

keyboards/mechlovin/infinity87/rev1/rogue87/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Rogue87",
+    "keyboard_name": "Rogue87 Rev.1",
+    "manufacturer": "Mechlovin.Studio",
     "url": "",
     "maintainer": "Mechlovin' Studio",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x8704",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/mechlovin/infinity87/rev1/rouge87/config.h

@@ -1,21 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define PRODUCT_ID  0x8703
-#define DEVICE_VER  0x0001
-#define PRODUCT     Rouge87 Rev.1

keyboards/mechlovin/infinity87/rev1/rouge87/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Rouge87",
+    "keyboard_name": "Rouge87 Rev.1",
+    "manufacturer": "Mechlovin.Studio",
     "url": "",
     "maintainer": "Mechlovin' Studio",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x8703",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/mechlovin/infinity87/rev1/standard/config.h

@@ -16,10 +16,6 @@
 
 #pragma once
 
-#define PRODUCT_ID  0x8701
-#define DEVICE_VER  0x0001
-#define PRODUCT     Infinity 87 rev1
-
 #define RGB_DI_PIN A15
 #define RGBLED_NUM 26
 #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */

keyboards/mechlovin/infinity87/rev1/standard/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "infinity87",
+    "keyboard_name": "infinity87 Rev.1",
+    "manufacturer": "Mechlovin.Studio",
     "url": "",
     "maintainer": "Team Mechlovin'",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x8701",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/mechlovin/infinity87/rev2/config.h

@@ -16,10 +16,6 @@
 
 #pragma once
 
-#define PRODUCT_ID  0x8702
-#define DEVICE_VER  0x0001
-#define PRODUCT     Infinity87 rev.2
-
 /*
  * Keyboard Matrix Assignments
  *

keyboards/mechlovin/infinity87/rev2/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "infinity87 Rev.2",
+    "keyboard_name": "Infinity87 Rev.2",
+    "manufacturer": "Mechlovin.Studio",
     "url": "",
     "maintainer": "Mechlovin' Studio",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x8702",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/mechlovin/infinity87/rgb_rev1/config.h

@@ -16,10 +16,6 @@
 
 #pragma once
 
-#define PRODUCT_ID  0x8710
-#define DEVICE_VER  0x0001
-#define PRODUCT     Infinity 87 RGB rev1
-
 #define MATRIX_ROW_PINS { A10, A13, A14, C13, A4, A3 }
 #define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, B11, B10, B2, B1, B0, A7, A6, A5, A2, A1, A0 }
 

keyboards/mechlovin/infinity87/rgb_rev1/info.json

@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "infinity87",
+    "keyboard_name": "Infinity87 RGB Rev1",
+    "manufacturer": "Mechlovin.Studio",
     "url": "",
     "maintainer": "Team Mechlovin'",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x8710",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/mechlovin/mechlovin9/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    0x4D4C
-#define MANUFACTURER Mechlovin Studio
-
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 

keyboards/mechlovin/mechlovin9/info.json

@@ -1,7 +1,10 @@
 {
-    "keyboard_name": "mechlovin9",
+    "manufacturer": "Mechlovin Studio",
     "url": "",
     "maintainer": "Team Mechlovin",
+    "usb": {
+        "vid": "0x4D4C"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [

keyboards/mechlovin/mechlovin9/rev1/config.h

@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define PRODUCT_ID   0x6509
-#define DEVICE_VER   0x0001
-#define PRODUCT   Mechlovin9
-
 /*
  * Keyboard Matrix Assignments
  *

keyboards/mechlovin/mechlovin9/rev1/info.json

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

keyboards/mechlovin/mechlovin9/rev2/config.h

@@ -17,10 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define PRODUCT_ID    0x6509
-#define DEVICE_VER    0x0002
-#define PRODUCT       Mechlovin9 Rev2
-
 /*
  * Keyboard Matrix Assignments
  *

keyboards/mechlovin/mechlovin9/rev2/info.json

@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "Mechlovin9 Rev2",
+    "usb": {
+        "pid": "0x6509",
+        "device_version": "0.0.2"
+    }
+}

keyboards/mechwild/bde/info.json

@@ -1,7 +1,10 @@
 {
-    "keyboard_name": "MechWild BDE Rev2",
+    "manufacturer": "MechWild",
     "url": "mechwild.com",
     "maintainer": "kylemccreery",
+    "usb": {
+        "vid": "0x6D77"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

keyboards/mechwild/bde/lefty/config.h

@@ -19,13 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6D77 // mw = "MechWild"
-#define PRODUCT_ID      0x1701
-#define DEVICE_VER      0x0203
-#define MANUFACTURER    MechWild
-#define PRODUCT         BDE Lefty
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 14

keyboards/mechwild/bde/lefty/info.json

@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "BDE Lefty",
+    "usb": {
+        "pid": "0x1701",
+        "device_version": "2.0.3"
+    }
+}

keyboards/mechwild/bde/rev2/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       0x6D77 // mw = "MechWild"
-#define PRODUCT_ID      0x170A
-#define DEVICE_VER      0x0101
-#define MANUFACTURER    MechWild
-#define PRODUCT         BDE Rev2
-
 /* Key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 7

keyboards/mechwild/bde/rev2/info.json

@@ -0,0 +1,7 @@
+{
+    "keyboard_name": "BDE Rev2",
+    "usb": {
+        "pid": "0x170A",
+        "device_version": "1.0.1"
+    }
+}

keyboards/mechwild/bde/righty/config.h

@@ -19,13 +19,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6D77 // mw = "MechWild"
-#define PRODUCT_ID      0x1702
-#define DEVICE_VER      0x0203
-#define MANUFACTURER    MechWild
-#define PRODUCT         BDE Righty
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 14