From 30796913913c0f6dc0cce317ad8249de2b602294 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 14 Aug 2022 10:47:05 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: 0-9, A (#17941) --- keyboards/1upkeyboards/sweet16/config.h | 5 ----- keyboards/1upkeyboards/sweet16/info.json | 6 +++++- keyboards/1upkeyboards/sweet16/v1/config.h | 4 ---- keyboards/1upkeyboards/sweet16/v1/info.json | 6 ++++++ keyboards/1upkeyboards/sweet16/v2/promicro/config.h | 4 ---- keyboards/1upkeyboards/sweet16/v2/promicro/info.json | 6 ++++++ keyboards/1upkeyboards/sweet16/v2/proton_c/config.h | 4 ---- keyboards/1upkeyboards/sweet16/v2/proton_c/info.json | 6 ++++++ 8 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 keyboards/1upkeyboards/sweet16/v1/info.json create mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/info.json create mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/info.json (limited to 'keyboards/1upkeyboards/sweet16') diff --git a/keyboards/1upkeyboards/sweet16/config.h b/keyboards/1upkeyboards/sweet16/config.h index f858685b8f..6463505000 100644 --- a/keyboards/1upkeyboards/sweet16/config.h +++ b/keyboards/1upkeyboards/sweet16/config.h @@ -2,11 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x6F75 // OU -#define MANUFACTURER 1up Keyboards -#define PRODUCT Sweet16 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 4 diff --git a/keyboards/1upkeyboards/sweet16/info.json b/keyboards/1upkeyboards/sweet16/info.json index 7755c8efb0..320c96bac8 100644 --- a/keyboards/1upkeyboards/sweet16/info.json +++ b/keyboards/1upkeyboards/sweet16/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Sweet 16", + "keyboard_name": "Sweet16", + "manufacturer": "1up Keyboards", "url": "", "maintainer": "skullydazed", + "usb": { + "vid": "0x6F75" + }, "layouts": { "LAYOUT_ortho_4x4": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}] diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h index 4020f4fdc0..41ebf0f8b5 100644 --- a/keyboards/1upkeyboards/sweet16/v1/config.h +++ b/keyboards/1upkeyboards/sweet16/v1/config.h @@ -2,10 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0161 -#define DEVICE_VER 0x0001 - /* key matrix pins */ #define MATRIX_ROW_PINS { F4, F5, F6, F7 } #define MATRIX_COL_PINS { D1, D0, D4, C6 } diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json new file mode 100644 index 0000000000..11a0d97d89 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x0161", + "device_version": "0.0.1" + } +} diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h index d344b0750d..99cb5388d2 100644 --- a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h +++ b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h @@ -2,10 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0162 -#define DEVICE_VER 0x0001 - /* key matrix pins */ #define MATRIX_ROW_PINS { D4, D1, E6, B5 } #define MATRIX_COL_PINS { F7, F6, D2, D3 } diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/info.json b/keyboards/1upkeyboards/sweet16/v2/promicro/info.json new file mode 100644 index 0000000000..bed6579e82 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/promicro/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x0162", + "device_version": "0.0.1" + } +} diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h index 286af1857f..ba25c0fa0d 100644 --- a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h +++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h @@ -2,10 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x0162 -#define DEVICE_VER 0x0001 - /* key matrix pins */ #define MATRIX_ROW_PINS { B5, B7, B2, B0 } #define MATRIX_COL_PINS { B8, A0, A10, A9 } diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json b/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json new file mode 100644 index 0000000000..bed6579e82 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x0162", + "device_version": "0.0.1" + } +} -- cgit v1.2.1