diff options
| author | QMK Bot <hello@qmk.fm> | 2022-08-03 07:04:43 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-08-03 07:04:43 +0000 |
| commit | bce4fb45748bacc8cb21cb61687d9bfd9faa4494 (patch) | |
| tree | 37e753ac9e2070f540b39e5cf3b9d8844a1adbba /keyboards/kbdfans/odin | |
| parent | d52d7bc6587ebde3f3ead42e5670ac05087e7e35 (diff) | |
| parent | 1b92c204c10594fce6a715710c277a748a4fdc68 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/kbdfans/odin')
| -rw-r--r-- | keyboards/kbdfans/odin/rgb/config.h | 6 | ||||
| -rw-r--r-- | keyboards/kbdfans/odin/rgb/info.json | 10 | ||||
| -rw-r--r-- | keyboards/kbdfans/odin/soldered/config.h | 7 | ||||
| -rw-r--r-- | keyboards/kbdfans/odin/soldered/info.json | 10 |
4 files changed, 16 insertions, 17 deletions
diff --git a/keyboards/kbdfans/odin/rgb/config.h b/keyboards/kbdfans/odin/rgb/config.h index 9e2a12fcca..81572cee6e 100644 --- a/keyboards/kbdfans/odin/rgb/config.h +++ b/keyboards/kbdfans/odin/rgb/config.h @@ -15,12 +15,6 @@ */ #include "config_common.h" -#define VENDOR_ID 0x4B42 -#define PRODUCT_ID 0x0102 -#define DEVICE_VER 0x0001 -#define MANUFACTURER KBDFANS -#define PRODUCT ODIN_RGB - #define MATRIX_ROWS 6 #define MATRIX_COLS 20 diff --git a/keyboards/kbdfans/odin/rgb/info.json b/keyboards/kbdfans/odin/rgb/info.json index d5c63b5700..b4845f9468 100644 --- a/keyboards/kbdfans/odin/rgb/info.json +++ b/keyboards/kbdfans/odin/rgb/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ODIN_RGB", - "maintainer": "moyi4681", + "keyboard_name": "Odin RGB", + "manufacturer": "KBDFans", "url": "", + "maintainer": "moyi4681", + "usb": { + "vid": "0x4B42", + "pid": "0x0102", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h index d51dd06e82..0731524dad 100644 --- a/keyboards/kbdfans/odin/soldered/config.h +++ b/keyboards/kbdfans/odin/soldered/config.h @@ -15,13 +15,6 @@ */ #include "config_common.h" -#define VENDOR_ID 0x4B42 -#define PRODUCT_ID 0x0101 -#define DEVICE_VER 0x0001 -#define MANUFACTURER KBDFANS -#define PRODUCT ODIN_SOLDERED - - #define MATRIX_ROWS 6 #define MATRIX_COLS 20 diff --git a/keyboards/kbdfans/odin/soldered/info.json b/keyboards/kbdfans/odin/soldered/info.json index 1e4da0d275..bfc6f6f1bc 100644 --- a/keyboards/kbdfans/odin/soldered/info.json +++ b/keyboards/kbdfans/odin/soldered/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ODIN_SOLDERED", - "maintainer": "moyi4681", + "keyboard_name": "Odin Soldered", + "manufacturer": "KBDFans", "url": "", + "maintainer": "moyi4681", + "usb": { + "vid": "0x4B42", + "pid": "0x0101", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ |