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/redox/info.json | 94 ------------------------------ keyboards/redox/rev1/base/info.json | 5 ++ keyboards/redox/rev1/base/rules.mk | 0 keyboards/redox/rev1/config.h | 7 --- keyboards/redox/rev1/info.json | 100 ++++++++++++++++++++++++++++++++ keyboards/redox/rev1/proton_c/config.h | 4 -- keyboards/redox/rev1/proton_c/info.json | 5 ++ keyboards/redox/rev1/rules.mk | 1 + keyboards/redox/rules.mk | 2 +- 9 files changed, 112 insertions(+), 106 deletions(-) delete mode 100644 keyboards/redox/info.json create mode 100644 keyboards/redox/rev1/base/info.json create mode 100644 keyboards/redox/rev1/base/rules.mk create mode 100644 keyboards/redox/rev1/info.json create mode 100644 keyboards/redox/rev1/proton_c/info.json (limited to 'keyboards/redox') diff --git a/keyboards/redox/info.json b/keyboards/redox/info.json deleted file mode 100644 index e404d195e4..0000000000 --- a/keyboards/redox/info.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "keyboard_name": "Redox", - "url": "", - "maintainer": "qmk", - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"_Nav || `", "x":0, "y":0.375, "w":1.25}, - {"label":"1", "x":1.25, "y":0.375}, - {"label":"2", "x":2.25, "y":0.125}, - {"label":"3", "x":3.25, "y":0}, - {"label":"4", "x":4.25, "y":0.125}, - {"label":"5", "x":5.25, "y":0.25}, - - {"label":"6", "x":12.25, "y":0.25}, - {"label":"7", "x":13.25, "y":0.125}, - {"label":"8", "x":14.25, "y":0}, - {"label":"9", "x":15.25, "y":0.125}, - {"label":"0", "x":16.25, "y":0.375}, - {"label":"_Nav || -", "x":17.25, "y":0.375, "w":1.25}, - - {"label":"Tab", "x":0, "y":1.375, "w":1.25}, - {"label":"Q", "x":1.25, "y":1.375}, - {"label":"W", "x":2.25, "y":1.125}, - {"label":"E", "x":3.25, "y":1}, - {"label":"R", "x":4.25, "y":1.125}, - {"label":"T", "x":5.25, "y":1.25}, - {"label":"MO(_SYMB)", "x":6.25, "y":0.75}, - - {"label":"MO(_SYMB)", "x":11.25, "y":0.75}, - {"label":"Y", "x":12.25, "y":1.25}, - {"label":"U", "x":13.25, "y":1.125}, - {"label":"I", "x":14.25, "y":1}, - {"label":"O", "x":15.25, "y":1.125}, - {"label":"P", "x":16.25, "y":1.375}, - {"label":"=", "x":17.25, "y":1.375, "w":1.25}, - - {"label":"Esc", "x":0, "y":2.375, "w":1.25}, - {"label":"A", "x":1.25, "y":2.375}, - {"label":"S", "x":2.25, "y":2.125}, - {"label":"D", "x":3.25, "y":2}, - {"label":"F", "x":4.25, "y":2.125}, - {"label":"G", "x":5.25, "y":2.25}, - {"label":"[", "x":6.25, "y":1.75, "h":1.5}, - - {"label":"]", "x":11.25, "y":1.75, "h":1.5}, - {"label":"H", "x":12.25, "y":2.25}, - {"label":"J", "x":13.25, "y":2.125}, - {"label":"K", "x":14.25, "y":2}, - {"label":"L", "x":15.25, "y":2.125}, - {"label":";", "x":16.25, "y":2.375}, - {"label":"'", "x":17.25, "y":2.375, "w":1.25}, - - {"label":"Shift", "x":0, "y":3.375, "w":1.25}, - {"label":"Z", "x":1.25, "y":3.375}, - {"label":"X", "x":2.25, "y":3.125}, - {"label":"C", "x":3.25, "y":3}, - {"label":"V", "x":4.25, "y":3.125}, - {"label":"B", "x":5.25, "y":3.25}, - - {"label":"_Adjust/Page Up", "x":6.75, "y":3.75}, - {"label":"Page Down", "x":7.75, "y":3.75}, - - {"label":"Home", "x":9.75, "y":3.75}, - {"label":"_Adjust/End", "x":10.75, "y":3.75}, - - {"label":"N", "x":12.25, "y":3.25}, - {"label":"M", "x":13.25, "y":3.125}, - {"label":",", "x":14.25, "y":3}, - {"label":",", "x":15.25, "y":3.125}, - {"label":"\\", "x":16.25, "y":3.375}, - {"label":"Shift", "x":17.25, "y":3.375, "w":1.25}, - - {"label":"LGUI", "x":0.25, "y":4.375}, - {"label":"P+", "x":1.25, "y":4.375}, - {"label":"P-", "x":2.25, "y":4.125}, - {"label":"LAlt || P*", "x":3.25, "y":4}, - - {"label":"LCtrl || P/", "x":5.5, "y":5.25, "w":1.25}, - {"label":"Backspace", "x":6.75, "y":4.75, "h":1.5}, - {"label":"Delete", "x":7.75, "y":4.75, "h":1.5}, - - {"label":"Enter", "x":9.75, "y":4.75, "h":1.5}, - {"label":"Space", "x":10.75, "y":4.75, "h":1.5}, - {"label":"RAlt", "x":11.75, "y":5.25, "w":1.25}, - - {"label":"Left", "x":14.25, "y":4}, - {"label":"Down", "x":15.25, "y":4.125}, - {"label":"Up", "x":16.25, "y":4.375}, - {"label":"Right", "x":17.25, "y":4.375} - ] - } - } -} diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/info.json new file mode 100644 index 0000000000..ad889c2304 --- /dev/null +++ b/keyboards/redox/rev1/base/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "1.0.0" + } +} diff --git a/keyboards/redox/rev1/base/rules.mk b/keyboards/redox/rev1/base/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h index 95c4e3cbbf..72874b66f5 100644 --- a/keyboards/redox/rev1/config.h +++ b/keyboards/redox/rev1/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D44 // "MD" -#define PRODUCT_ID 0x5244 // "RD" -#define DEVICE_VER 0x0100 -#define MANUFACTURER Falbatech -#define PRODUCT The Redox Keyboard - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 10 diff --git a/keyboards/redox/rev1/info.json b/keyboards/redox/rev1/info.json new file mode 100644 index 0000000000..bceac88bb0 --- /dev/null +++ b/keyboards/redox/rev1/info.json @@ -0,0 +1,100 @@ +{ + "keyboard_name": "Redox", + "manufacturer": "Falbatech", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x4D44", + "pid": "0x5244", + "device_version": "1.0.0" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"_Nav || `", "x":0, "y":0.375, "w":1.25}, + {"label":"1", "x":1.25, "y":0.375}, + {"label":"2", "x":2.25, "y":0.125}, + {"label":"3", "x":3.25, "y":0}, + {"label":"4", "x":4.25, "y":0.125}, + {"label":"5", "x":5.25, "y":0.25}, + + {"label":"6", "x":12.25, "y":0.25}, + {"label":"7", "x":13.25, "y":0.125}, + {"label":"8", "x":14.25, "y":0}, + {"label":"9", "x":15.25, "y":0.125}, + {"label":"0", "x":16.25, "y":0.375}, + {"label":"_Nav || -", "x":17.25, "y":0.375, "w":1.25}, + + {"label":"Tab", "x":0, "y":1.375, "w":1.25}, + {"label":"Q", "x":1.25, "y":1.375}, + {"label":"W", "x":2.25, "y":1.125}, + {"label":"E", "x":3.25, "y":1}, + {"label":"R", "x":4.25, "y":1.125}, + {"label":"T", "x":5.25, "y":1.25}, + {"label":"MO(_SYMB)", "x":6.25, "y":0.75}, + + {"label":"MO(_SYMB)", "x":11.25, "y":0.75}, + {"label":"Y", "x":12.25, "y":1.25}, + {"label":"U", "x":13.25, "y":1.125}, + {"label":"I", "x":14.25, "y":1}, + {"label":"O", "x":15.25, "y":1.125}, + {"label":"P", "x":16.25, "y":1.375}, + {"label":"=", "x":17.25, "y":1.375, "w":1.25}, + + {"label":"Esc", "x":0, "y":2.375, "w":1.25}, + {"label":"A", "x":1.25, "y":2.375}, + {"label":"S", "x":2.25, "y":2.125}, + {"label":"D", "x":3.25, "y":2}, + {"label":"F", "x":4.25, "y":2.125}, + {"label":"G", "x":5.25, "y":2.25}, + {"label":"[", "x":6.25, "y":1.75, "h":1.5}, + + {"label":"]", "x":11.25, "y":1.75, "h":1.5}, + {"label":"H", "x":12.25, "y":2.25}, + {"label":"J", "x":13.25, "y":2.125}, + {"label":"K", "x":14.25, "y":2}, + {"label":"L", "x":15.25, "y":2.125}, + {"label":";", "x":16.25, "y":2.375}, + {"label":"'", "x":17.25, "y":2.375, "w":1.25}, + + {"label":"Shift", "x":0, "y":3.375, "w":1.25}, + {"label":"Z", "x":1.25, "y":3.375}, + {"label":"X", "x":2.25, "y":3.125}, + {"label":"C", "x":3.25, "y":3}, + {"label":"V", "x":4.25, "y":3.125}, + {"label":"B", "x":5.25, "y":3.25}, + + {"label":"_Adjust/Page Up", "x":6.75, "y":3.75}, + {"label":"Page Down", "x":7.75, "y":3.75}, + + {"label":"Home", "x":9.75, "y":3.75}, + {"label":"_Adjust/End", "x":10.75, "y":3.75}, + + {"label":"N", "x":12.25, "y":3.25}, + {"label":"M", "x":13.25, "y":3.125}, + {"label":",", "x":14.25, "y":3}, + {"label":",", "x":15.25, "y":3.125}, + {"label":"\\", "x":16.25, "y":3.375}, + {"label":"Shift", "x":17.25, "y":3.375, "w":1.25}, + + {"label":"LGUI", "x":0.25, "y":4.375}, + {"label":"P+", "x":1.25, "y":4.375}, + {"label":"P-", "x":2.25, "y":4.125}, + {"label":"LAlt || P*", "x":3.25, "y":4}, + + {"label":"LCtrl || P/", "x":5.5, "y":5.25, "w":1.25}, + {"label":"Backspace", "x":6.75, "y":4.75, "h":1.5}, + {"label":"Delete", "x":7.75, "y":4.75, "h":1.5}, + + {"label":"Enter", "x":9.75, "y":4.75, "h":1.5}, + {"label":"Space", "x":10.75, "y":4.75, "h":1.5}, + {"label":"RAlt", "x":11.75, "y":5.25, "w":1.25}, + + {"label":"Left", "x":14.25, "y":4}, + {"label":"Down", "x":15.25, "y":4.125}, + {"label":"Up", "x":16.25, "y":4.375}, + {"label":"Right", "x":17.25, "y":4.375} + ] + } + } +} diff --git a/keyboards/redox/rev1/proton_c/config.h b/keyboards/redox/rev1/proton_c/config.h index eec50ab879..56cdb88126 100644 --- a/keyboards/redox/rev1/proton_c/config.h +++ b/keyboards/redox/rev1/proton_c/config.h @@ -5,10 +5,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#undef DEVICE_VER -#define DEVICE_VER 0x0101 // added 1 for the rev1 + proton c - // wiring of each half #undef MATRIX_ROW_PINS #define MATRIX_ROW_PINS { B5, B3, B2, B1, B0 } diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/info.json new file mode 100644 index 0000000000..62a27157ad --- /dev/null +++ b/keyboards/redox/rev1/proton_c/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "1.0.1" + } +} diff --git a/keyboards/redox/rev1/rules.mk b/keyboards/redox/rev1/rules.mk index e69de29bb2..c971da1680 100644 --- a/keyboards/redox/rev1/rules.mk +++ b/keyboards/redox/rev1/rules.mk @@ -0,0 +1 @@ +DEFAULT_FOLDER = redox/rev1/base diff --git a/keyboards/redox/rules.mk b/keyboards/redox/rules.mk index 1ce6f56efe..181027c417 100644 --- a/keyboards/redox/rules.mk +++ b/keyboards/redox/rules.mk @@ -19,7 +19,7 @@ RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. SPLIT_KEYBOARD = yes -DEFAULT_FOLDER = redox/rev1 +DEFAULT_FOLDER = redox/rev1/base # Disable unsupported hardware AUDIO_SUPPORTED = no -- cgit v1.2.3