From b40c03140e5da1edac2faa2b672a84ea28d0a7c1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 Aug 2022 08:05:40 +1000 Subject: Move keyboard USB IDs and strings to data driven: R (#17885) --- keyboards/recompile_keys/choco60/config.h | 7 ------- keyboards/recompile_keys/choco60/info.json | 6 ++++++ keyboards/recompile_keys/cocoa40/config.h | 7 ------- keyboards/recompile_keys/cocoa40/info.json | 6 ++++++ keyboards/recompile_keys/mio/config.h | 7 ------- keyboards/recompile_keys/mio/info.json | 6 ++++++ keyboards/recompile_keys/nomu30/config.h | 7 ------- keyboards/recompile_keys/nomu30/info.json | 6 ++++++ 8 files changed, 24 insertions(+), 28 deletions(-) (limited to 'keyboards/recompile_keys') diff --git a/keyboards/recompile_keys/choco60/config.h b/keyboards/recompile_keys/choco60/config.h index 72264f51e2..5a017cbc4b 100644 --- a/keyboards/recompile_keys/choco60/config.h +++ b/keyboards/recompile_keys/choco60/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x524B // recompile keys -#define PRODUCT_ID 0x4362 // Choco60 -#define DEVICE_VER 0x0001 -#define MANUFACTURER recompile keys -#define PRODUCT Choco60 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 9 diff --git a/keyboards/recompile_keys/choco60/info.json b/keyboards/recompile_keys/choco60/info.json index 193e8f37b6..17ab7eadb2 100644 --- a/keyboards/recompile_keys/choco60/info.json +++ b/keyboards/recompile_keys/choco60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Choco60", + "manufacturer": "recompile keys", "url": "https://keys.recompile.net/projects/choco60/", "maintainer": "Naoto Takai", + "usb": { + "vid": "0x524B", + "pid": "0x4362", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":7, "y":0}, {"label":"&", "x":8, "y":0}, {"label":"*", "x":9, "y":0}, {"label":"(", "x":10, "y":0}, {"label":")", "x":11, "y":0}, {"label":"_", "x":12, "y":0}, {"label":"+", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"~", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"{", "x":12.5, "y":1}, {"label":"}", "x":13.5, "y":1}, {"label":"Delete", "x":14.5, "y":1, "w":1.5}, {"label":"Control", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":7.75, "y":2}, {"label":"J", "x":8.75, "y":2}, {"label":"K", "x":9.75, "y":2}, {"label":"L", "x":10.75, "y":2}, {"label":":", "x":11.75, "y":2}, {"label":"\"", "x":12.75, "y":2}, {"label":"Return", "x":13.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":8.25, "y":3}, {"label":"M", "x":9.25, "y":3}, {"label":"<", "x":10.25, "y":3}, {"label":">", "x":11.25, "y":3}, {"label":"?", "x":12.25, "y":3}, {"label":"Shift", "x":13.25, "y":3, "w":1.75}, {"label":"Fn", "x":15, "y":3}, {"label":"Opt", "x":1.5, "y":4}, {"label":"\u2318", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":2.75}, {"label":"Opt", "x":7.75, "y":4}, {"x":8.75, "y":4, "w":2.25}, {"label":"\u2318", "x":11, "y":4, "w":1.5}, {"label":"Ctrl", "x":12.5, "y":4}] diff --git a/keyboards/recompile_keys/cocoa40/config.h b/keyboards/recompile_keys/cocoa40/config.h index 50da34ffbd..e85bed8b14 100644 --- a/keyboards/recompile_keys/cocoa40/config.h +++ b/keyboards/recompile_keys/cocoa40/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xC0C0 -#define PRODUCT_ID 0x4000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER recompile keys -#define PRODUCT cocoa40 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 8 diff --git a/keyboards/recompile_keys/cocoa40/info.json b/keyboards/recompile_keys/cocoa40/info.json index d2b75a6fca..dca5750161 100644 --- a/keyboards/recompile_keys/cocoa40/info.json +++ b/keyboards/recompile_keys/cocoa40/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Cocoa40", + "manufacturer": "recompile keys", "url": "https://keys.recompile.net/projects/cocoa40/", "maintainer": "Naoto Takai", + "usb": { + "vid": "0xC0C0", + "pid": "0x4000", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":7.25, "y":0}, {"label":"U", "x":8.25, "y":0}, {"label":"I", "x":9.25, "y":0}, {"label":"O", "x":10.25, "y":0}, {"label":"P", "x":11.25, "y":0}, {"label":"{", "x":12.25, "y":0}, {"label":"}", "x":13.25, "y":0}, {"label":"Back
Space", "x":14.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":7.5, "y":1}, {"label":"J", "x":8.5, "y":1}, {"label":"K", "x":9.5, "y":1}, {"label":"L", "x":10.5, "y":1}, {"label":":", "x":11.5, "y":1}, {"label":"\"", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":8, "y":2}, {"label":"M", "x":9, "y":2}, {"label":"<", "x":10, "y":2}, {"label":">", "x":11, "y":2}, {"label":"?", "x":12, "y":2}, {"label":"Shift", "x":13, "y":2, "w":1.25}, {"label":"Fn", "x":14.25, "y":2}, {"label":"Opt", "x":1.5, "y":3}, {"label":"Command", "x":2.5, "y":3, "w":1.5}, {"label":"", "x":4, "y":3, "w":2.25}, {"label":"", "x":7.5, "y":3, "w":2.75}, {"label":"Command", "x":10.25, "y":3, "w":1.5}, {"label":"Opt", "x":11.75, "y":3}] diff --git a/keyboards/recompile_keys/mio/config.h b/keyboards/recompile_keys/mio/config.h index 0c4438e53e..2a7668d3f5 100644 --- a/keyboards/recompile_keys/mio/config.h +++ b/keyboards/recompile_keys/mio/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x524B // recompile keys -#define PRODUCT_ID 0x4D41 // MIO -#define DEVICE_VER 0x0001 -#define MANUFACTURER recompile keys -#define PRODUCT MIO - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 8 diff --git a/keyboards/recompile_keys/mio/info.json b/keyboards/recompile_keys/mio/info.json index fb66fba7f5..6c82236727 100644 --- a/keyboards/recompile_keys/mio/info.json +++ b/keyboards/recompile_keys/mio/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "MIO", + "manufacturer": "recompile keys", "url": "https://keys.recompile.net/projects/mio/", "maintainer": "recompile keys", + "usb": { + "vid": "0x524B", + "pid": "0x4D41", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/recompile_keys/nomu30/config.h b/keyboards/recompile_keys/nomu30/config.h index 62aec20525..23b19c4e0c 100644 --- a/keyboards/recompile_keys/nomu30/config.h +++ b/keyboards/recompile_keys/nomu30/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x524B // recompile keys -#define PRODUCT_ID 0x4E31 // Nomu30 -#define DEVICE_VER 0x0001 -#define MANUFACTURER recompile keys -#define PRODUCT Nomu30 - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 12 diff --git a/keyboards/recompile_keys/nomu30/info.json b/keyboards/recompile_keys/nomu30/info.json index 8f53f003b5..7521023d1b 100644 --- a/keyboards/recompile_keys/nomu30/info.json +++ b/keyboards/recompile_keys/nomu30/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Nomu30", + "manufacturer": "recompile keys", "url": "https://keys.recompile.net/projects/nomu30/", "maintainer": "takai", + "usb": { + "vid": "0x524B", + "pid": "0x4E31", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.3