Move keyboard USB IDs and strings to data driven: K (#17846)

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

22 files changed, 76 insertions, 87 deletions

diff --git a/keyboards/kb_elmo/67mk_e/config.h b/keyboards/kb_elmo/67mk_e/config.h
index 60c90ed522..9d0ab1a10c 100644
--- a/keyboards/kb_elmo/67mk_e/config.h
+++ b/keyboards/kb_elmo/67mk_e/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    0xA68C
-#define PRODUCT_ID   0xD03E
-#define DEVICE_VER   0x0001
-#define MANUFACTURER kb_elmo
-#define PRODUCT      67mk_E
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
diff --git a/keyboards/kb_elmo/67mk_e/info.json b/keyboards/kb_elmo/67mk_e/info.json
index fd417097b8..ca0437811e 100644
--- a/keyboards/kb_elmo/67mk_e/info.json
+++ b/keyboards/kb_elmo/67mk_e/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "67mk_e", 
+    "keyboard_name": "67mk_E", 
+    "manufacturer": "kb_elmo",
     "url": "", 
     "maintainer": "kb-elmo", 
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0xD03E",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/kb_elmo/aek2_usb/config.h b/keyboards/kb_elmo/aek2_usb/config.h
index 9cad5d5c72..5251a5d91e 100644
--- a/keyboards/kb_elmo/aek2_usb/config.h
+++ b/keyboards/kb_elmo/aek2_usb/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 0xA68C
-#define PRODUCT_ID 0xDB52
-#define DEVICE_VER 0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT AEK II USB
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 14
diff --git a/keyboards/kb_elmo/aek2_usb/info.json b/keyboards/kb_elmo/aek2_usb/info.json
index 82050e6fae..ef94b0994e 100644
--- a/keyboards/kb_elmo/aek2_usb/info.json
+++ b/keyboards/kb_elmo/aek2_usb/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "aek 2 usb", 
+    "keyboard_name": "AEK II USB", 
+    "manufacturer": "kb-elmo",
     "url": "https://github.com/kb-elmo/aek2_usb", 
     "maintainer": "kb-elmo", 
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0xDB52",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kb_elmo/elmopad/config.h b/keyboards/kb_elmo/elmopad/config.h
index 1dd6cff5b3..de2711bbc3 100644
--- a/keyboards/kb_elmo/elmopad/config.h
+++ b/keyboards/kb_elmo/elmopad/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 0xA68C
-#define PRODUCT_ID 0x8B35
-#define DEVICE_VER 0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT ElmoPad
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 4
diff --git a/keyboards/kb_elmo/elmopad/info.json b/keyboards/kb_elmo/elmopad/info.json
index 6193342c6b..bfe97e3161 100644
--- a/keyboards/kb_elmo/elmopad/info.json
+++ b/keyboards/kb_elmo/elmopad/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "elmopad",
+    "keyboard_name": "ElmoPad",
+    "manufacturer": "kb-elmo",
     "url": "https://github.com/kb-elmo/numpad",
     "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x8B35",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
diff --git a/keyboards/kb_elmo/isolation/config.h b/keyboards/kb_elmo/isolation/config.h
index 2f083955b0..493714310a 100644
--- a/keyboards/kb_elmo/isolation/config.h
+++ b/keyboards/kb_elmo/isolation/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    0xA68C
-#define PRODUCT_ID   0x4EE6
-#define DEVICE_VER   0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT      ISOlation
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 1
diff --git a/keyboards/kb_elmo/isolation/info.json b/keyboards/kb_elmo/isolation/info.json
index 1cca4610d7..4042b2677c 100644
--- a/keyboards/kb_elmo/isolation/info.json
+++ b/keyboards/kb_elmo/isolation/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "isolation",
+    "keyboard_name": "ISOlation",
+    "manufacturer": "kb-elmo",
     "url": "",
     "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x4EE6",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kb_elmo/m0110a_usb/config.h b/keyboards/kb_elmo/m0110a_usb/config.h
index 0010f0d27e..18a3a405d7 100644
--- a/keyboards/kb_elmo/m0110a_usb/config.h
+++ b/keyboards/kb_elmo/m0110a_usb/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 0xA68C
-#define PRODUCT_ID 0xDB4B
-#define DEVICE_VER 0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT M0110A USB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 17
diff --git a/keyboards/kb_elmo/m0110a_usb/info.json b/keyboards/kb_elmo/m0110a_usb/info.json
index 1970c4960c..e515a1e142 100644
--- a/keyboards/kb_elmo/m0110a_usb/info.json
+++ b/keyboards/kb_elmo/m0110a_usb/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "m0110a usb", 
+    "keyboard_name": "M0110A USB", 
+    "manufacturer": "kb-elmo",
     "url": "https://github.com/kb-elmo/m0110a_usb", 
     "maintainer": "kb-elmo", 
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0xDB4B",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kb_elmo/m0116_usb/config.h b/keyboards/kb_elmo/m0116_usb/config.h
index 693d3ab6a8..28c82ddb33 100644
--- a/keyboards/kb_elmo/m0116_usb/config.h
+++ b/keyboards/kb_elmo/m0116_usb/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 0xA68C
-#define PRODUCT_ID 0x8F7E
-#define DEVICE_VER 0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT M0116 USB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 18
diff --git a/keyboards/kb_elmo/m0116_usb/info.json b/keyboards/kb_elmo/m0116_usb/info.json
index 9a5386b838..1b52a8c0e6 100644
--- a/keyboards/kb_elmo/m0116_usb/info.json
+++ b/keyboards/kb_elmo/m0116_usb/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "m0116 usb", 
+    "keyboard_name": "M0116 USB", 
+    "manufacturer": "kb-elmo",
     "url": "https://github.com/kb-elmo/m0116_usb", 
     "maintainer": "kb-elmo", 
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x8F7E",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kb_elmo/noah_avr/config.h b/keyboards/kb_elmo/noah_avr/config.h
index 5c6dfe8b5e..07dec2e1c1 100644
--- a/keyboards/kb_elmo/noah_avr/config.h
+++ b/keyboards/kb_elmo/noah_avr/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    0xA68C
-#define PRODUCT_ID   0x1DB0
-#define DEVICE_VER   0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT      Noah AVR
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
diff --git a/keyboards/kb_elmo/noah_avr/info.json b/keyboards/kb_elmo/noah_avr/info.json
index 6bc9b32b07..91875a6505 100644
--- a/keyboards/kb_elmo/noah_avr/info.json
+++ b/keyboards/kb_elmo/noah_avr/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Noah AVR",
+    "manufacturer": "kb-elmo",
     "url": "https://github.com/kb-elmo/noah_avr",
     "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x1DB0",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT_ansi": "LAYOUT_65_ansi_blocker",
         "LAYOUT_ansi_splitbs": "LAYOUT_65_ansi_blocker_split_bs",
diff --git a/keyboards/kb_elmo/qez/config.h b/keyboards/kb_elmo/qez/config.h
index 055ebe2a4b..4b51eb3ff4 100644
--- a/keyboards/kb_elmo/qez/config.h
+++ b/keyboards/kb_elmo/qez/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    0xA68C
-#define PRODUCT_ID   0x675F
-#define DEVICE_VER   0x0001
-#define MANUFACTURER kb_elmo
-#define PRODUCT      QEZ
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 10
diff --git a/keyboards/kb_elmo/qez/info.json b/keyboards/kb_elmo/qez/info.json
index a7cdd219d4..a0c2da02f9 100644
--- a/keyboards/kb_elmo/qez/info.json
+++ b/keyboards/kb_elmo/qez/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "qez",
+    "keyboard_name": "QEZ",
+    "manufacturer": "kb_elmo",
     "url": "",
     "maintainer": "kb-elmo<mail@elmo.space>",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x675F",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_split_space": {
             "layout": [
diff --git a/keyboards/kb_elmo/sesame/config.h b/keyboards/kb_elmo/sesame/config.h
index 4f40c62273..20e19ea60d 100644
--- a/keyboards/kb_elmo/sesame/config.h
+++ b/keyboards/kb_elmo/sesame/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 0xA68C
-#define PRODUCT_ID 0xE2BD
-#define DEVICE_VER 0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT Sesame
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/kb_elmo/sesame/info.json b/keyboards/kb_elmo/sesame/info.json
index 639c8b4d7c..d537ed1973 100644
--- a/keyboards/kb_elmo/sesame/info.json
+++ b/keyboards/kb_elmo/sesame/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "sesame",
+  "keyboard_name": "Sesame",
+  "manufacturer": "kb-elmo",
   "url": "https://github.com/kb-elmo/sesame",
   "maintainer": "kb-elmo",
+  "usb": {
+    "vid": "0xA68C",
+    "pid": "0xE2BD",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_alice": {
       "layout": [
diff --git a/keyboards/kb_elmo/twelvekey/config.h b/keyboards/kb_elmo/twelvekey/config.h
index 4be5f4f313..2ffc1e4589 100644
--- a/keyboards/kb_elmo/twelvekey/config.h
+++ b/keyboards/kb_elmo/twelvekey/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    0xA68C
-#define PRODUCT_ID   0x9879
-#define DEVICE_VER   0x0001
-#define MANUFACTURER kb-elmo
-#define PRODUCT      Twelvekey
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 4
diff --git a/keyboards/kb_elmo/twelvekey/info.json b/keyboards/kb_elmo/twelvekey/info.json
index c44d88ce45..27a67923d0 100644
--- a/keyboards/kb_elmo/twelvekey/info.json
+++ b/keyboards/kb_elmo/twelvekey/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "twelvekey", 
+    "keyboard_name": "Twelvekey", 
+    "manufacturer": "kb-elmo",
     "url": "https://github.com/kb-elmo/twelvekey", 
     "maintainer": "kb-elmo", 
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x9879",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_3x4": {
             "layout": [{"x":0, "y":0},
diff --git a/keyboards/kb_elmo/vertex/config.h b/keyboards/kb_elmo/vertex/config.h
index 9d8eafe5bf..b532b63745 100644
--- a/keyboards/kb_elmo/vertex/config.h
+++ b/keyboards/kb_elmo/vertex/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    0xA68C
-#define PRODUCT_ID   0x6B47
-#define DEVICE_VER   0x0001
-#define MANUFACTURER kb_elmo
-#define PRODUCT      Vertex
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
diff --git a/keyboards/kb_elmo/vertex/info.json b/keyboards/kb_elmo/vertex/info.json
index a7bea40772..e443ae5f72 100644
--- a/keyboards/kb_elmo/vertex/info.json
+++ b/keyboards/kb_elmo/vertex/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "vertex",
+    "keyboard_name": "Vertex",
+    "manufacturer": "kb_elmo",
     "url": "",
     "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0xA68C",
+        "pid": "0x6B47",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_8keys": {
             "layout": [