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/kineticlabs | |
| parent | d52d7bc6587ebde3f3ead42e5670ac05087e7e35 (diff) | |
| parent | 1b92c204c10594fce6a715710c277a748a4fdc68 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/kineticlabs')
| -rw-r--r-- | keyboards/kineticlabs/emu/hotswap/config.h | 7 | ||||
| -rw-r--r-- | keyboards/kineticlabs/emu/hotswap/info.json | 8 | ||||
| -rw-r--r-- | keyboards/kineticlabs/emu/soldered/config.h | 7 | ||||
| -rw-r--r-- | keyboards/kineticlabs/emu/soldered/info.json | 8 |
4 files changed, 14 insertions, 16 deletions
diff --git a/keyboards/kineticlabs/emu/hotswap/config.h b/keyboards/kineticlabs/emu/hotswap/config.h index 57eaad44b4..e4b07c155f 100644 --- a/keyboards/kineticlabs/emu/hotswap/config.h +++ b/keyboards/kineticlabs/emu/hotswap/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 0xE015 -#define PRODUCT_ID 0xC387 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Kineticlabs -#define PRODUCT Emu Hotswap - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 18 diff --git a/keyboards/kineticlabs/emu/hotswap/info.json b/keyboards/kineticlabs/emu/hotswap/info.json index 106bdf8da9..257cf50126 100644 --- a/keyboards/kineticlabs/emu/hotswap/info.json +++ b/keyboards/kineticlabs/emu/hotswap/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Emu hotswap", + "keyboard_name": "Emu Hotswap", + "manufacturer": "Kineticlabs", "url": "", "maintainer": "kb-elmo<mail@elmo.space>", + "usb": { + "vid": "0xE015", + "pid": "0xC387", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/kineticlabs/emu/soldered/config.h b/keyboards/kineticlabs/emu/soldered/config.h index 0921911192..e4b07c155f 100644 --- a/keyboards/kineticlabs/emu/soldered/config.h +++ b/keyboards/kineticlabs/emu/soldered/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 0xE015 -#define PRODUCT_ID 0xC386 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Kineticlabs -#define PRODUCT Emu - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 18 diff --git a/keyboards/kineticlabs/emu/soldered/info.json b/keyboards/kineticlabs/emu/soldered/info.json index d1a35a91d9..1f6fde64ce 100644 --- a/keyboards/kineticlabs/emu/soldered/info.json +++ b/keyboards/kineticlabs/emu/soldered/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Emu hotswap", + "keyboard_name": "Emu Soldered", + "manufacturer": "Kineticlabs", "url": "", "maintainer": "kb-elmo<mail@elmo.space>", + "usb": { + "vid": "0xE015", + "pid": "0xC386", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ |