From 201a914beb7a07d8e08b1cbfa8dd35a768f6ae3a Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:42:49 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: P-R (#18091) --- keyboards/ramonimbao/tkl_ff/config.h | 7 ------- keyboards/ramonimbao/tkl_ff/info.json | 5 +++++ keyboards/ramonimbao/tkl_ff/rules.mk | 2 ++ keyboards/ramonimbao/tkl_ff/v1/info.json | 5 +++++ keyboards/ramonimbao/tkl_ff/v1/rules.mk | 0 keyboards/ramonimbao/tkl_ff/v2/config.h | 3 --- keyboards/ramonimbao/tkl_ff/v2/info.json | 5 +++++ 7 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 keyboards/ramonimbao/tkl_ff/v1/info.json create mode 100644 keyboards/ramonimbao/tkl_ff/v1/rules.mk create mode 100644 keyboards/ramonimbao/tkl_ff/v2/info.json (limited to 'keyboards/ramonimbao') diff --git a/keyboards/ramonimbao/tkl_ff/config.h b/keyboards/ramonimbao/tkl_ff/config.h index d0b3ee75ff..4ccf88b9fc 100644 --- a/keyboards/ramonimbao/tkl_ff/config.h +++ b/keyboards/ramonimbao/tkl_ff/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xB16B -#define PRODUCT_ID 0x00FF -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ramon Imbao -#define PRODUCT TKL FF - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/ramonimbao/tkl_ff/info.json b/keyboards/ramonimbao/tkl_ff/info.json index fd71d3f990..a3a22e34d8 100644 --- a/keyboards/ramonimbao/tkl_ff/info.json +++ b/keyboards/ramonimbao/tkl_ff/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "TKL FF", + "manufacturer": "Ramon Imbao", "url": "", "maintainer": "Ramon Imbao", + "usb": { + "vid": "0xB16B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/ramonimbao/tkl_ff/rules.mk b/keyboards/ramonimbao/tkl_ff/rules.mk index 1275531ef6..36c8b4137b 100644 --- a/keyboards/ramonimbao/tkl_ff/rules.mk +++ b/keyboards/ramonimbao/tkl_ff/rules.mk @@ -16,3 +16,5 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output + +DEFAULT_FOLDER = ramonimbao/tkl_ff/v1 diff --git a/keyboards/ramonimbao/tkl_ff/v1/info.json b/keyboards/ramonimbao/tkl_ff/v1/info.json new file mode 100644 index 0000000000..3370446f2d --- /dev/null +++ b/keyboards/ramonimbao/tkl_ff/v1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x00FF" + } +} diff --git a/keyboards/ramonimbao/tkl_ff/v1/rules.mk b/keyboards/ramonimbao/tkl_ff/v1/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/ramonimbao/tkl_ff/v2/config.h b/keyboards/ramonimbao/tkl_ff/v2/config.h index a35d1bc599..906f38813a 100644 --- a/keyboards/ramonimbao/tkl_ff/v2/config.h +++ b/keyboards/ramonimbao/tkl_ff/v2/config.h @@ -17,9 +17,6 @@ #include "config_common.h" -#undef PRODUCT_ID -#define PRODUCT_ID 0x10FF - #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF diff --git a/keyboards/ramonimbao/tkl_ff/v2/info.json b/keyboards/ramonimbao/tkl_ff/v2/info.json new file mode 100644 index 0000000000..ed70ec408c --- /dev/null +++ b/keyboards/ramonimbao/tkl_ff/v2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x10FF" + } +} -- cgit v1.2.1