diff options
| author | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
|---|---|---|
| committer | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
| commit | 6afdd9d74da250e47ac64d6690bd19d037045e99 (patch) | |
| tree | 661f6cfb244c02bcd1fbfe8fb9b2bd9242a91394 /keyboards/kineticlabs | |
| parent | 93a55e61b59d20f7cd842cce02e5b18a63a23612 (diff) | |
| parent | 1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 (diff) | |
| download | qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.tar.gz qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.zip | |
Merge branch 'master' into taamas
Diffstat (limited to 'keyboards/kineticlabs')
| -rw-r--r-- | keyboards/kineticlabs/emu/hotswap/config.h | 8 | ||||
| -rw-r--r-- | keyboards/kineticlabs/emu/hotswap/info.json | 8 | ||||
| -rw-r--r-- | keyboards/kineticlabs/emu/soldered/config.h | 8 | ||||
| -rw-r--r-- | keyboards/kineticlabs/emu/soldered/info.json | 8 |
4 files changed, 14 insertions, 18 deletions
diff --git a/keyboards/kineticlabs/emu/hotswap/config.h b/keyboards/kineticlabs/emu/hotswap/config.h index 57eaad44b4..23e3b22a37 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 @@ -33,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Keyboard Matrix Assignments */ #define MATRIX_ROW_PINS { E6, D4, B3, B1, B0, B7 } #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1, D0 } -#define UNUSED_PINS /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW 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..23e3b22a37 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 @@ -33,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Keyboard Matrix Assignments */ #define MATRIX_ROW_PINS { E6, D4, B3, B1, B0, B7 } #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1, D0 } -#define UNUSED_PINS /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW 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": [ |