Move keyboard USB IDs and strings to data driven: N (qmk#17865)

laughk · Aug 2, 2022 · 056a44c · 056a44c
1 parent 7222969
commit 056a44c
Show file tree

Hide file tree

Showing 114 changed files with 367 additions and 434 deletions.
diff --git a/keyboards/nack/config.h b/keyboards/nack/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 #include "config_common.h"
 
-#define VENDOR_ID 0xDA12
-#define PRODUCT_ID 0x6060
-#define DEVICE_VER 0x0001
-#define MANUFACTURER farfalleflickan
-#define PRODUCT nack keyboard
-
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 13
 

diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "nack",
+    "manufacturer": "farfalleflickan",
     "url": "https://github.com/farfalleflickan/nack",
     "maintainer": "farfalleflickan",
+    "usb": {
+        "vid": "0xDA12",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_ortho_4x13"
     },

diff --git a/keyboards/nacly/sodium42/config.h b/keyboards/nacly/sodium42/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xBEEF
-#define PRODUCT_ID      0xFED0
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    nacly
-#define PRODUCT         sodium42
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 8

diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "sodium42",
+    "manufacturer": "nacly",
     "url": "https://nacly.net",
     "maintainer": "nacly",
+    "usb": {
+        "vid": "0xBEEF",
+        "pid": "0xFED0",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/nacly/sodium50/config.h b/keyboards/nacly/sodium50/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xBEEF
-#define PRODUCT_ID      0xFED0
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    nacly
-#define PRODUCT         sodium50
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10

diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "sodium50",
+    "manufacturer": "nacly",
     "url": "https://nacly.net",
     "maintainer": "nacly",
+    "usb": {
+        "vid": "0xBEEF",
+        "pid": "0xFED0",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/nacly/sodium62/config.h b/keyboards/nacly/sodium62/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xBEEF
-#define PRODUCT_ID      0xFED0
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    nacly
-#define PRODUCT         sodium62
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10

diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "sodium62",
+    "manufacturer": "nacly",
     "url": "https://nacly.net",
     "maintainer": "nacly",
+    "usb": {
+        "vid": "0xBEEF",
+        "pid": "0xFED0",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/nacly/splitreus62/config.h b/keyboards/nacly/splitreus62/config.h
@@ -20,13 +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       0xBEEF
-#define PRODUCT_ID      0xFED0
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    NaCly
-#define PRODUCT         Splitreus62
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 12

diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "splitreus62",
+    "keyboard_name": "Splitreus62",
+    "manufacturer": "NaCly",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+      "vid": "0xBEEF",
+      "pid": "0xFED0",
+      "device_version": "0.0.1"
+    },
     "layouts": {
       "LAYOUT": {
         "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}]

diff --git a/keyboards/nacly/ua62/config.h b/keyboards/nacly/ua62/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 0xBEEF
-#define PRODUCT_ID 0xFFFF
-#define DEVICE_VER 0x0001
-#define MANUFACTURER NaCly
-#define PRODUCT UA62
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 13

diff --git a/keyboards/nacly/ua62/info.json b/keyboards/nacly/ua62/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "ua62",
+    "keyboard_name": "UA62",
+    "manufacturer": "NaCly",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+      "vid": "0xBEEF",
+      "pid": "0xFFFF",
+      "device_version": "0.0.1"
+    },
     "layouts": {
       "LAYOUT": {
         "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}]

diff --git a/keyboards/nasu/config.h b/keyboards/nasu/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       0x8968
-#define PRODUCT_ID      0x4E53
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Yiancar-Designs
-#define PRODUCT         Nasu
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

diff --git a/keyboards/nasu/info.json b/keyboards/nasu/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Nasu",
+    "manufacturer": "Yiancar-Designs",
     "url": "https://yiancar-designs.com",
     "maintainer": "Yiancar-Designs",
+    "usb": {
+        "vid": "0x8968",
+        "pid": "0x4E53",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [

diff --git a/keyboards/ncc1701kb/config.h b/keyboards/ncc1701kb/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      0x1701
-#define DEVICE_VER 		0x0001
-#define MANUFACTURER    J2L Designs
-#define PRODUCT         NCC1701KB
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3

diff --git a/keyboards/ncc1701kb/info.json b/keyboards/ncc1701kb/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "NCC-1701-KB",
+  "manufacturer": "J2L Designs",
   "url": "",
   "maintainer": "jessel92",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x1701",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

diff --git a/keyboards/neito/config.h b/keyboards/neito/config.h
@@ -16,13 +16,6 @@
 #pragma once
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xB9F7 // "Oliver Granlund"
-#define PRODUCT_ID      0xB44C // "Neito"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Oliver Granlund
-#define PRODUCT         Neito
-
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8
 #define MATRIX_ROW_PINS { E6, F0, F5, F6, C7, C6, B4, D7, D6, D4 }

diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Neito",
+    "manufacturer": "Oliver Granlund",
     "url": "olli.works",
     "maintainer": "Oliver Granlund",
+    "usb": {
+        "vid": "0xB9F7",
+        "pid": "0xB44C",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/nek_type_a/config.h b/keyboards/nek_type_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       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    miker
-#define PRODUCT         nek_type_a
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 18

diff --git a/keyboards/nek_type_a/info.json b/keyboards/nek_type_a/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "NEK Type A",
+    "manufacturer": "miker",
     "url": "",
     "maintainer": "ecopoesis",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/nemui/config.h b/keyboards/nemui/config.h
@@ -16,13 +16,6 @@
  */
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6400
-#define PRODUCT_ID      0x2371
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Bachoo
-#define PRODUCT         Nemui
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

diff --git a/keyboards/nemui/info.json b/keyboards/nemui/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "nemui",
+  "keyboard_name": "Nemui",
+  "manufacturer": "Bachoo",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x6400",
+    "pid": "0x2371",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [

diff --git a/keyboards/neokeys/g67/element_hs/config.h b/keyboards/neokeys/g67/element_hs/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4E4B // "NK"
-#define PRODUCT_ID      0x5049
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    NEO Keys
-#define PRODUCT         Element G67 Hotswap
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

diff --git a/keyboards/neokeys/g67/element_hs/info.json b/keyboards/neokeys/g67/element_hs/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "NEO Keys Element Hotswap",
+    "keyboard_name": "Element G67 Hotswap",
+    "manufacturer": "NEO Keys",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4E4B",
+        "pid": "0x5049",
+        "device_version": "1.0.0"
+    },
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [

diff --git a/keyboards/neokeys/g67/hotswap/config.h b/keyboards/neokeys/g67/hotswap/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4E4B // "NK"
-#define PRODUCT_ID      0x5048
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    NEO Keys
-#define PRODUCT         Palette G67 Hotswap
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15

diff --git a/keyboards/neokeys/g67/hotswap/info.json b/keyboards/neokeys/g67/hotswap/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "NEO Keys Palette G67 Hotswap",
+    "keyboard_name": "Palette G67 Hotswap",
+    "manufacturer": "NEO Keys",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4E4B",
+        "pid": "0x5048",
+        "device_version": "1.0.0"
+    },
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
             "layout": [

diff --git a/keyboards/neokeys/g67/soldered/config.h b/keyboards/neokeys/g67/soldered/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4E4B // "NK"
-#define PRODUCT_ID      0x5053
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    NEO Keys
-#define PRODUCT         Palette G67 Soldered
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16

diff --git a/keyboards/neokeys/g67/soldered/info.json b/keyboards/neokeys/g67/soldered/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "NEO Keys Palette G67 Soldered",
+    "keyboard_name": "Palette G67 Soldered",
+    "manufacturer": "NEO Keys",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4E4B",
+        "pid": "0x5053",
+        "device_version": "1.0.0"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [