From 3a7dbc89817950709717d6dcec18a6eccbcc2d28 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 14 Aug 2022 12:16:16 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: B-C (#17945) --- keyboards/capsunlocked/cu80/v2_ansi/base/info.json | 6 ++++++ keyboards/capsunlocked/cu80/v2_ansi/base/rules.mk | 0 keyboards/capsunlocked/cu80/v2_ansi/info.json | 2 -- keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h | 4 ---- keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json | 1 + keyboards/capsunlocked/cu80/v2_ansi/rules.mk | 11 ++--------- keyboards/capsunlocked/cu80/v2_iso/base/info.json | 6 ++++++ keyboards/capsunlocked/cu80/v2_iso/base/rules.mk | 0 keyboards/capsunlocked/cu80/v2_iso/info.json | 2 -- keyboards/capsunlocked/cu80/v2_iso/rgb/config.h | 4 ---- keyboards/capsunlocked/cu80/v2_iso/rgb/info.json | 1 + keyboards/capsunlocked/cu80/v2_iso/rules.mk | 11 ++--------- 12 files changed, 18 insertions(+), 30 deletions(-) create mode 100644 keyboards/capsunlocked/cu80/v2_ansi/base/info.json create mode 100644 keyboards/capsunlocked/cu80/v2_ansi/base/rules.mk create mode 100644 keyboards/capsunlocked/cu80/v2_iso/base/info.json create mode 100644 keyboards/capsunlocked/cu80/v2_iso/base/rules.mk (limited to 'keyboards/capsunlocked/cu80') diff --git a/keyboards/capsunlocked/cu80/v2_ansi/base/info.json b/keyboards/capsunlocked/cu80/v2_ansi/base/info.json new file mode 100644 index 0000000000..9dc24b5e40 --- /dev/null +++ b/keyboards/capsunlocked/cu80/v2_ansi/base/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "CU80 v2 ANSI", + "usb": { + "pid": "0x0081" + } +} diff --git a/keyboards/capsunlocked/cu80/v2_ansi/base/rules.mk b/keyboards/capsunlocked/cu80/v2_ansi/base/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/capsunlocked/cu80/v2_ansi/info.json b/keyboards/capsunlocked/cu80/v2_ansi/info.json index 7615d9f029..96234185f6 100644 --- a/keyboards/capsunlocked/cu80/v2_ansi/info.json +++ b/keyboards/capsunlocked/cu80/v2_ansi/info.json @@ -1,6 +1,5 @@ { "manufacturer": "CapsUnlocked", - "keyboard_name": "CapsUnlocked CU80 v2 ANSI", "maintainer": "rys / maz0r", "bootloader": "atmel-dfu", "debounce": 5, @@ -38,7 +37,6 @@ "url": "https://caps-unlocked.com/cu80-round-2/", "usb": { "device_version": "0.0.1", - "pid": "0x0081", "vid": "0x4355" }, "community_layouts": ["tkl_ansi"], diff --git a/keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h b/keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h index 00a05ad7da..5789266397 100644 --- a/keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h +++ b/keyboards/capsunlocked/cu80/v2_ansi/rgb/config.h @@ -19,10 +19,6 @@ along with this program. If not, see . /* enable RGB matrix */ #define CU80_RGB -/* update the product for RGB Matrix variant in VIA/VIAL and Remap-keys.app */ -#undef PRODUCT -#define PRODUCT CU80 v2 ANSI RGB - /* moved to RGB specific */ #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 diff --git a/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json b/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json index f97e203645..52676aa041 100644 --- a/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json +++ b/keyboards/capsunlocked/cu80/v2_ansi/rgb/info.json @@ -1,4 +1,5 @@ { + "keyboard_name": "CU80 v2 ANSI RGB", "features": { "rgblight": false }, diff --git a/keyboards/capsunlocked/cu80/v2_ansi/rules.mk b/keyboards/capsunlocked/cu80/v2_ansi/rules.mk index 7c5554a087..e96dd72928 100644 --- a/keyboards/capsunlocked/cu80/v2_ansi/rules.mk +++ b/keyboards/capsunlocked/cu80/v2_ansi/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# NO_USB_STARTUP_CHECK = yes # resolve possible sleep issue + +DEFAULT_FOLDER = capsunlocked/cu80/v2_ansi/base diff --git a/keyboards/capsunlocked/cu80/v2_iso/base/info.json b/keyboards/capsunlocked/cu80/v2_iso/base/info.json new file mode 100644 index 0000000000..636e6e2276 --- /dev/null +++ b/keyboards/capsunlocked/cu80/v2_iso/base/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "CU80 v2 ISO", + "usb": { + "pid": "0x0080" + } +} diff --git a/keyboards/capsunlocked/cu80/v2_iso/base/rules.mk b/keyboards/capsunlocked/cu80/v2_iso/base/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/capsunlocked/cu80/v2_iso/info.json b/keyboards/capsunlocked/cu80/v2_iso/info.json index 43f074f170..61e033c59f 100644 --- a/keyboards/capsunlocked/cu80/v2_iso/info.json +++ b/keyboards/capsunlocked/cu80/v2_iso/info.json @@ -1,6 +1,5 @@ { "manufacturer": "CapsUnlocked", - "keyboard_name": "CapsUnlocked CU80 v2 ISO", "maintainer": "rys / maz0r", "bootloader": "atmel-dfu", "debounce": 5, @@ -38,7 +37,6 @@ "url": "https://caps-unlocked.com/cu80-round-2/", "usb": { "device_version": "0.0.1", - "pid": "0x0080", "vid": "0x4355" }, "community_layouts": ["tkl_iso"], diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h b/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h index dbe9143b8b..41dbede767 100644 --- a/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h +++ b/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . /* enable RGB matrix */ #define CU80_RGB -/* update the product for RGB Matrix variant in VIA/VIAL and Remap-keys.app */ -#undef PRODUCT -#define PRODUCT CU80 v2 ISO RGB - /* moved to RGB specific */ #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50 diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json b/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json index 36748237c5..e04971c21a 100644 --- a/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json +++ b/keyboards/capsunlocked/cu80/v2_iso/rgb/info.json @@ -1,4 +1,5 @@ { + "keyboard_name": "CU80 v2 ISO RGB", "features": { "rgblight": false }, diff --git a/keyboards/capsunlocked/cu80/v2_iso/rules.mk b/keyboards/capsunlocked/cu80/v2_iso/rules.mk index 7c5554a087..c0feb35307 100644 --- a/keyboards/capsunlocked/cu80/v2_iso/rules.mk +++ b/keyboards/capsunlocked/cu80/v2_iso/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# NO_USB_STARTUP_CHECK = yes # resolve possible sleep issue + +DEFAULT_FOLDER = capsunlocked/cu80/v2_iso/base -- cgit v1.2.3