diff options
| author | Ryan <fauxpark@gmail.com> | 2022-08-20 10:42:49 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-20 01:42:49 +0100 |
| commit | 201a914beb7a07d8e08b1cbfa8dd35a768f6ae3a (patch) | |
| tree | e96cfbd96557ebfb795be7309fda320b457faede /keyboards/redox | |
| parent | 835c971f78b5d995bb58f0889fac00aac348de52 (diff) | |
Move keyboard USB IDs and strings to data driven, pass 2: P-R (#18091)
Diffstat (limited to 'keyboards/redox')
| -rw-r--r-- | keyboards/redox/rev1/base/info.json | 5 | ||||
| -rw-r--r-- | keyboards/redox/rev1/base/rules.mk | 0 | ||||
| -rw-r--r-- | keyboards/redox/rev1/config.h | 7 | ||||
| -rw-r--r-- | keyboards/redox/rev1/info.json (renamed from keyboards/redox/info.json) | 6 | ||||
| -rw-r--r-- | keyboards/redox/rev1/proton_c/config.h | 4 | ||||
| -rw-r--r-- | keyboards/redox/rev1/proton_c/info.json | 5 | ||||
| -rw-r--r-- | keyboards/redox/rev1/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/redox/rules.mk | 2 |
8 files changed, 18 insertions, 12 deletions
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 --- /dev/null +++ b/keyboards/redox/rev1/base/rules.mk 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 <http://www.gnu.org/licenses/>. #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/info.json b/keyboards/redox/rev1/info.json index e404d195e4..bceac88bb0 100644 --- a/keyboards/redox/info.json +++ b/keyboards/redox/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Redox", + "manufacturer": "Falbatech", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4D44", + "pid": "0x5244", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ 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 |