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

2022-08-02 10:10:48 +10:00
parent 7222969964
commit 056a44c7d3
114 changed files with 367 additions and 434 deletions
--- a/keyboards/nightly_boards/adellein/config.h
+++ b/keyboards/nightly_boards/adellein/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 0xD812
-#define PRODUCT_ID 0x0010
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Neil Brian Ramirez
-#define PRODUCT Adellein
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 13
--- a/keyboards/nightly_boards/adellein/info.json
+++ b/keyboards/nightly_boards/adellein/info.json
@@ -1,7 +1,13 @@
 {
    "keyboard_name": "Adellein",
+    "manufacturer": "Neil Brian Ramirez",
    "url": "",
    "maintainer": "Neil Brian Ramirez",
+    "usb": {
+    	"vid": "0xD812",
+    	"pid": "0x0010",
+    	"device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT_40ergo_split_ent": {
            "layout": [
--- a/keyboards/nightly_boards/alter/rev1/config.h
+++ b/keyboards/nightly_boards/alter/rev1/config.h
@@ -16,13 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include "config_common.h"

-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x0717
-#define PRODUCT_ID 0x0002
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Neil Brian Ramirez
-#define PRODUCT Alter
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8
--- a/keyboards/nightly_boards/alter/rev1/info.json
+++ b/keyboards/nightly_boards/alter/rev1/info.json
@@ -1,7 +1,13 @@
 {
    "keyboard_name": "Alter",
+    "manufacturer": "Neil Brian Ramirez",
    "url": "",
    "maintainer": "Neil Brian Ramirez",
+    "usb": {
+    	"vid": "0x0717",
+    	"pid": "0x0002",
+    	"device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT_alice_split_bs": {
             "layout": [
--- a/keyboards/nightly_boards/alter_lite/config.h
+++ b/keyboards/nightly_boards/alter_lite/config.h
@@ -16,13 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include "config_common.h"

-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xD812
-#define PRODUCT_ID 0x0013
-#define DEVICE_VER 0x0001
-#define MANUFACTURER DeskDaily
-#define PRODUCT Alter Lite
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16	
--- a/keyboards/nightly_boards/alter_lite/info.json
+++ b/keyboards/nightly_boards/alter_lite/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Alter",
+    "keyboard_name": "Alter Lite",
+    "manufacturer": "DeskDaily",
    "url": "",
    "maintainer": "DeskDaily",
+    "usb": {
+    	"vid": "0xD812",
+    	"pid": "0x0013",
+    	"device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/nightly_boards/conde60/config.h
+++ b/keyboards/nightly_boards/conde60/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 0xD812
-#define PRODUCT_ID 0x0015
-#define DEVICE_VER 0x0001
-#define MANUFACTURER DeskDaily
-#define PRODUCT Conde60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
--- a/keyboards/nightly_boards/conde60/info.json
+++ b/keyboards/nightly_boards/conde60/info.json
@@ -1,7 +1,13 @@
 {
    "keyboard_name": "Conde60", 
+    "manufacturer": "DeskDaily",
    "url": "", 
    "maintainer": "DeskDaily", 
+    "usb": {
+    	"vid": "0xD812",
+    	"pid": "0x0015",
+    	"device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/nightly_boards/n2/config.h
+++ b/keyboards/nightly_boards/n2/config.h
@@ -16,13 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include "config_common.h"

-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x0717
-#define PRODUCT_ID 0x0003
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Neil Brian Ramirez
-#define PRODUCT [n]2
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 2
--- a/keyboards/nightly_boards/n2/info.json
+++ b/keyboards/nightly_boards/n2/info.json
@@ -1,7 +1,13 @@
 {
    "keyboard_name": "[n]2",
+    "manufacturer": "Neil Brian Ramirez",
    "url": "",
    "maintainer": "Neil Brian Ramirez",
+    "usb": {
+        "vid": "0x0717",
+        "pid": "0x0003",
+        "device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [{"x":0, "y":0}, {"x":0, "y":1}]
--- a/keyboards/nightly_boards/n40_o/config.h
+++ b/keyboards/nightly_boards/n40_o/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 0xD812
-#define PRODUCT_ID 0x0009
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Neil Brian Ramirez
-#define PRODUCT [n]40-o
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 13
--- a/keyboards/nightly_boards/n40_o/info.json
+++ b/keyboards/nightly_boards/n40_o/info.json
@@ -1,7 +1,13 @@
 {
    "keyboard_name": "[n]40-o",
+    "manufacturer": "Neil Brian Ramirez",
    "url": "",
    "maintainer": "Neil Brian Ramirez",
+    "usb": {
+    	"vid": "0xD812",
+    	"pid": "0x0009",
+    	"device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT_ortho_4x13_encoders": {
            "layout": [
--- a/keyboards/nightly_boards/n60_s/config.h
+++ b/keyboards/nightly_boards/n60_s/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 0xD812
-#define PRODUCT_ID 0x0007
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Neil Brian Ramirez
-#define PRODUCT [n]60-S
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 14
--- a/keyboards/nightly_boards/n60_s/info.json
+++ b/keyboards/nightly_boards/n60_s/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "[n]60-s", 
+    "keyboard_name": "[n]60-S", 
+    "manufacturer": "Neil Brian Ramirez",
    "url": "", 
    "maintainer": "Neil Brian Ramirez", 
+    "usb": {
+    	"vid": "0xD812",
+    	"pid": "0x0007",
+    	"device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT_60_ansi_split_bs_rshift": {
 			"layout": [
--- a/keyboards/nightly_boards/n87/config.h
+++ b/keyboards/nightly_boards/n87/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 0x0717
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Neil Brian Ramirez
-#define PRODUCT [n]87
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 9
--- a/keyboards/nightly_boards/n87/info.json
+++ b/keyboards/nightly_boards/n87/info.json
@@ -1,7 +1,13 @@
 {
    "keyboard_name": "[n]87",
+    "manufacturer": "Neil Brian Ramirez",
    "url": "",
    "maintainer": "Neil Brian Ramirez",
+    "usb": {
+        "vid": "0x0717",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT_tkl_ansi_split_bs_rshift": {
            "layout": [
--- a/keyboards/nightly_boards/n9/config.h
+++ b/keyboards/nightly_boards/n9/config.h
@@ -16,13 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #include "config_common.h"

-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xD812
-#define PRODUCT_ID 0x0012
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Neil Brian Ramirez
-#define PRODUCT [n]9
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3
--- a/keyboards/nightly_boards/n9/info.json
+++ b/keyboards/nightly_boards/n9/info.json
@@ -1,7 +1,13 @@
 {
    "keyboard_name": "[n]9", 
+    "manufacturer": "Neil Brian Ramirez",
    "url": "", 
    "maintainer": "Neil Brian Ramirez", 
+    "usb": {
+    	"vid": "0xD812",
+    	"pid": "0x0012",
+    	"device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/nightly_boards/octopad/config.h
+++ b/keyboards/nightly_boards/octopad/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 0xD812
-#define PRODUCT_ID 0x0004
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Neil Brian Ramirez
-#define PRODUCT Octopad
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 5
--- a/keyboards/nightly_boards/octopad/info.json
+++ b/keyboards/nightly_boards/octopad/info.json
@@ -1,7 +1,13 @@
 {
    "keyboard_name": "Octopad",
+    "manufacturer": "Neil Brian Ramirez",
    "url": "",
    "maintainer": "Neil Brian Ramirez",
+    "usb": {
+    	"vid": "0xD812",
+    	"pid": "0x0004",
+    	"device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/nightly_boards/paraluman/config.h
+++ b/keyboards/nightly_boards/paraluman/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 0xD812
-#define PRODUCT_ID 0x0012
-#define DEVICE_VER 0x0001
-#define MANUFACTURER DeskDaily
-#define PRODUCT Paraluman
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
--- a/keyboards/nightly_boards/paraluman/info.json
+++ b/keyboards/nightly_boards/paraluman/info.json
@@ -1,7 +1,13 @@
 {
    "keyboard_name": "Paraluman",
+    "manufacturer": "DeskDaily",
    "url": "",
    "maintainer": "DeskDaily",
+    "usb": {
+    	"vid": "0xD812",
+    	"pid": "0x0012",
+    	"device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT_60_ansi_split_bs_rshift": {
 			"layout": [
--- a/keyboards/nightly_boards/ph_arisu/config.h
+++ b/keyboards/nightly_boards/ph_arisu/config.h
@@ -2,13 +2,6 @@

 #include "config_common.h"

-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6172
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    PH
-#define PRODUCT         Arisu
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8
--- a/keyboards/nightly_boards/ph_arisu/info.json
+++ b/keyboards/nightly_boards/ph_arisu/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "PH Arisu",
+    "keyboard_name": "Arisu",
+    "manufacturer": "PH",
    "url": "https://github.com/FateNozomi/arisu-pcb",
    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x6172",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"1,1", "x":3, "y":0}, {"label":"0,2", "x":4, "y":0}, {"label":"1,2", "x":5, "y":0}, {"label":"0,3", "x":6, "y":0}, {"label":"1,3", "x":8.5, "y":0}, {"label":"0,4", "x":9.5, "y":0}, {"label":"1,4", "x":10.5, "y":0}, {"label":"0,5", "x":11.5, "y":0}, {"label":"1,5", "x":12.5, "y":0}, {"label":"0,6", "x":13.5, "y":0}, {"label":"1,6", "x":14.5, "y":0}, {"label":"0,7", "x":15.5, "y":0}, {"label":"2,7", "x":16.8, "y":0}, {"label":"2,0", "x":0, "y":1, "w":1.5}, {"label":"3,0", "x":1.5, "y":1}, {"label":"2,1", "x":2.5, "y":1}, {"label":"3,1", "x":3.5, "y":1}, {"label":"2,2", "x":4.5, "y":1}, {"label":"3,2", "x":5.5, "y":1}, {"label":"2,3", "x":8, "y":1}, {"label":"3,3", "x":9, "y":1}, {"label":"2,4", "x":10, "y":1}, {"label":"3,4", "x":11, "y":1}, {"label":"2,5", "x":12, "y":1}, {"label":"3,5", "x":13, "y":1}, {"label":"2,6", "x":14, "y":1}, {"label":"3,6", "x":15, "y":1, "w":1.5}, {"label":"4,7", "x":16.8, "y":1}, {"label":"4,0", "x":0, "y":2, "w":1.75}, {"label":"5,0", "x":1.75, "y":2}, {"label":"4,1", "x":2.75, "y":2}, {"label":"5,1", "x":3.75, "y":2}, {"label":"4,2", "x":4.75, "y":2}, {"label":"5,2", "x":5.75, "y":2}, {"label":"4,3", "x":8.25, "y":2}, {"label":"5,3", "x":9.25, "y":2}, {"label":"4,4", "x":10.25, "y":2}, {"label":"5,4", "x":11.25, "y":2}, {"label":"4,5", "x":12.25, "y":2}, {"label":"5,5", "x":13.25, "y":2}, {"label":"4,6", "x":14.25, "y":2, "w":2.25}, {"label":"6,7", "x":16.8, "y":2}, {"label":"6,0", "x":0, "y":3, "w":2.25}, {"label":"7,0", "x":2.25, "y":3}, {"label":"6,1", "x":3.25, "y":3}, {"label":"7,1", "x":4.25, "y":3}, {"label":"6,2", "x":5.25, "y":3}, {"label":"7,2", "x":6.25, "y":3}, {"label":"6,3", "x":8.75, "y":3}, {"label":"7,3", "x":9.75, "y":3}, {"label":"6,4", "x":10.75, "y":3}, {"label":"7,4", "x":11.75, "y":3}, {"label":"6,5", "x":12.75, "y":3}, {"label":"7,5", "x":13.75, "y":3, "w":1.75}, {"label":"7,6", "x":15.75, "y":3.25}, {"label":"8,0", "x":0, "y":4, "w":1.5}, {"label":"8,1", "x":2.75, "y":4, "w":1.5}, {"label":"8,2", "x":4.25, "y":4, "w":2}, {"label":"9,2", "x":6.25, "y":4, "w":1.25}, {"label":"9,3", "x":8.25, "y":4, "w":2.75}, {"label":"9,4", "x":11, "y":4, "w":1.5}, {"label":"8,6", "x":14.75, "y":4.25}, {"label":"9,6", "x":15.75, "y":4.25}, {"label":"8,7", "x":16.75, "y":4.25}]