From d5e33306fa88e545b216dfe518ceda09874f40b1 Mon Sep 17 00:00:00 2001 From: Takeshi Nishio Date: Sat, 4 Nov 2023 10:01:58 +0900 Subject: [PATCH] Move keyboard USB IDs and strings to data driven: J (qmk#17837) --- keyboards/nora/v01/config.h | 7 ------- keyboards/nora/v01/info.json | 6 ++++++ keyboards/nora/v03/config.h | 7 ------- keyboards/nora/v03/info.json | 6 ++++++ keyboards/nora/v031/config.h | 7 ------- keyboards/nora/v031/info.json | 6 ++++++ keyboards/nora/v1/config.h | 7 ------- keyboards/nora/v1/info.json | 6 ++++++ 8 files changed, 24 insertions(+), 28 deletions(-) diff --git a/keyboards/nora/v01/config.h b/keyboards/nora/v01/config.h index cab164975bd7..dad434c33c7b 100644 --- a/keyboards/nora/v01/config.h +++ b/keyboards/nora/v01/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xB9DD -#define PRODUCT_ID 0xC9D7 -#define DEVICE_VER 0x0010 -#define MANUFACTURER jpskenn -#define PRODUCT Nora - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 diff --git a/keyboards/nora/v01/info.json b/keyboards/nora/v01/info.json index fc320c398027..cac2e97d7328 100644 --- a/keyboards/nora/v01/info.json +++ b/keyboards/nora/v01/info.json @@ -2,6 +2,12 @@ "keyboard_name": "Nora", "url": "https://github.com/jpskenn/Nora", "maintainer": "jpskenn", + "manufacturer": "jpskenn", + "usb": { + "vid": "0xB9DD", + "pid": "0xC9D7", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nora/v03/config.h b/keyboards/nora/v03/config.h index 97dda8c7e3d4..1b6501decbe8 100644 --- a/keyboards/nora/v03/config.h +++ b/keyboards/nora/v03/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xB9DD -#define PRODUCT_ID 0xC9D7 -#define DEVICE_VER 0x0030 -#define MANUFACTURER jpskenn -#define PRODUCT Nora - /* key matrix size */ // Same number for Round-Robin matrix. #define MATRIX_ROWS 10 diff --git a/keyboards/nora/v03/info.json b/keyboards/nora/v03/info.json index e385f362f671..ebf6427d557e 100644 --- a/keyboards/nora/v03/info.json +++ b/keyboards/nora/v03/info.json @@ -2,6 +2,12 @@ "keyboard_name": "Nora", "url": "https://github.com/jpskenn/Nora", "maintainer": "jpskenn", + "manufacturer": "jpskenn", + "usb": { + "vid": "0xB9DD", + "pid": "0xC9D7", + "device_version": "0.3.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nora/v031/config.h b/keyboards/nora/v031/config.h index 753451308476..75ab0935cd4d 100644 --- a/keyboards/nora/v031/config.h +++ b/keyboards/nora/v031/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xB9DD -#define PRODUCT_ID 0xC9D7 -#define DEVICE_VER 0x0031 -#define MANUFACTURER jpskenn -#define PRODUCT Nora DN0031 - /* key matrix size */ // Same number for Round-Robin matrix. #define MATRIX_ROWS 10 diff --git a/keyboards/nora/v031/info.json b/keyboards/nora/v031/info.json index e385f362f671..b61bb21c801d 100644 --- a/keyboards/nora/v031/info.json +++ b/keyboards/nora/v031/info.json @@ -2,6 +2,12 @@ "keyboard_name": "Nora", "url": "https://github.com/jpskenn/Nora", "maintainer": "jpskenn", + "manufacturer": "jpskenn", + "usb": { + "vid": "0xB9DD", + "pid": "0xC9D7", + "device_version": "0.3.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/nora/v1/config.h b/keyboards/nora/v1/config.h index 1b49b5dca7b8..dec982d43a53 100644 --- a/keyboards/nora/v1/config.h +++ b/keyboards/nora/v1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xB9DD -#define PRODUCT_ID 0xC9D7 -#define DEVICE_VER 0x0032 -#define MANUFACTURER jpskenn -#define PRODUCT Nora - /* key matrix size */ // Same number for Round-Robin matrix. #define MATRIX_ROWS 10 diff --git a/keyboards/nora/v1/info.json b/keyboards/nora/v1/info.json index 8914301ba178..38337d989eea 100644 --- a/keyboards/nora/v1/info.json +++ b/keyboards/nora/v1/info.json @@ -2,6 +2,12 @@ "keyboard_name": "Nora", "url": "https://github.com/jpskenn/Nora", "maintainer": "jpskenn", + "manufacturer": "jpskenn", + "usb": { + "vid": "0xB9DD", + "pid": "0xC9D7", + "device_version": "0.3.2" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":14.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2}, {"x":14.5, "y":2, "w":1.5}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":2.25, "y":4, "w":1.5}, {"x":3.75, "y":4}, {"x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4}, {"x":7.25, "y":4, "w":1.5}, {"x":8.75, "y":4}, {"x":9.75, "y":4, "w":1.5}, {"x":11.25, "y":4}, {"x":12.25, "y":4, "w":1.5}]