diff options
Diffstat (limited to 'keyboards/kb_elmo')
23 files changed, 80 insertions, 96 deletions
diff --git a/keyboards/kb_elmo/67mk_e/config.h b/keyboards/kb_elmo/67mk_e/config.h index 60c90ed522..9d0ab1a10c 100644 --- a/keyboards/kb_elmo/67mk_e/config.h +++ b/keyboards/kb_elmo/67mk_e/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 0xA68C -#define PRODUCT_ID 0xD03E -#define DEVICE_VER 0x0001 -#define MANUFACTURER kb_elmo -#define PRODUCT 67mk_E - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/kb_elmo/67mk_e/info.json b/keyboards/kb_elmo/67mk_e/info.json index fd417097b8..ca0437811e 100644 --- a/keyboards/kb_elmo/67mk_e/info.json +++ b/keyboards/kb_elmo/67mk_e/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "67mk_e", + "keyboard_name": "67mk_E", + "manufacturer": "kb_elmo", "url": "", "maintainer": "kb-elmo", + "usb": { + "vid": "0xA68C", + "pid": "0xD03E", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/kb_elmo/aek2_usb/config.h b/keyboards/kb_elmo/aek2_usb/config.h index 9cad5d5c72..345195b428 100644 --- a/keyboards/kb_elmo/aek2_usb/config.h +++ b/keyboards/kb_elmo/aek2_usb/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 0xA68C -#define PRODUCT_ID 0xDB52 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kb-elmo -#define PRODUCT AEK II USB - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 14 @@ -35,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #define MATRIX_ROW_PINS { D5, C1, C4, D0, C3, C2, B3, B4 } #define MATRIX_COL_PINS { A1, A0, A2, A3, A4, A5, A6, A7, C7, C6, C5, C0, D6, D1 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/kb_elmo/aek2_usb/info.json b/keyboards/kb_elmo/aek2_usb/info.json index 82050e6fae..ef94b0994e 100644 --- a/keyboards/kb_elmo/aek2_usb/info.json +++ b/keyboards/kb_elmo/aek2_usb/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "aek 2 usb", + "keyboard_name": "AEK II USB", + "manufacturer": "kb-elmo", "url": "https://github.com/kb-elmo/aek2_usb", "maintainer": "kb-elmo", + "usb": { + "vid": "0xA68C", + "pid": "0xDB52", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb_elmo/elmopad/config.h b/keyboards/kb_elmo/elmopad/config.h index 1dd6cff5b3..4581fbf94f 100644 --- a/keyboards/kb_elmo/elmopad/config.h +++ b/keyboards/kb_elmo/elmopad/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 0xA68C -#define PRODUCT_ID 0x8B35 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kb-elmo -#define PRODUCT ElmoPad - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 4 @@ -35,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #define MATRIX_ROW_PINS { C5, C4, B2, B1, D7, B0 } #define MATRIX_COL_PINS { C0, C1, C2, C3 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/kb_elmo/elmopad/info.json b/keyboards/kb_elmo/elmopad/info.json index 6193342c6b..bfe97e3161 100644 --- a/keyboards/kb_elmo/elmopad/info.json +++ b/keyboards/kb_elmo/elmopad/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "elmopad", + "keyboard_name": "ElmoPad", + "manufacturer": "kb-elmo", "url": "https://github.com/kb-elmo/numpad", "maintainer": "kb-elmo", + "usb": { + "vid": "0xA68C", + "pid": "0x8B35", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_numpad_6x4": { "layout": [ diff --git a/keyboards/kb_elmo/isolation/config.h b/keyboards/kb_elmo/isolation/config.h index 2f083955b0..6088cd5de2 100644 --- a/keyboards/kb_elmo/isolation/config.h +++ b/keyboards/kb_elmo/isolation/config.h @@ -19,20 +19,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xA68C -#define PRODUCT_ID 0x4EE6 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kb-elmo -#define PRODUCT ISOlation - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 1 /* direct key pin */ #define DIRECT_PINS {{ B0 }} -#define UNUSED_PINS /* RGB backlight */ #define RGB_DI_PIN B2 diff --git a/keyboards/kb_elmo/isolation/info.json b/keyboards/kb_elmo/isolation/info.json index 1cca4610d7..4042b2677c 100644 --- a/keyboards/kb_elmo/isolation/info.json +++ b/keyboards/kb_elmo/isolation/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "isolation", + "keyboard_name": "ISOlation", + "manufacturer": "kb-elmo", "url": "", "maintainer": "kb-elmo", + "usb": { + "vid": "0xA68C", + "pid": "0x4EE6", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb_elmo/m0110a_usb/config.h b/keyboards/kb_elmo/m0110a_usb/config.h index 0010f0d27e..4509b76933 100644 --- a/keyboards/kb_elmo/m0110a_usb/config.h +++ b/keyboards/kb_elmo/m0110a_usb/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 0xA68C -#define PRODUCT_ID 0xDB4B -#define DEVICE_VER 0x0001 -#define MANUFACTURER kb-elmo -#define PRODUCT M0110A USB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 17 @@ -35,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #define MATRIX_ROW_PINS { B0, B1, B2, B3, D5 } #define MATRIX_COL_PINS { D7, C0, C1, C2, C3, D1, B4, C6, C7, A7, A6, A5, A4, A3, A2, A1, A0 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/kb_elmo/m0110a_usb/info.json b/keyboards/kb_elmo/m0110a_usb/info.json index 1970c4960c..e515a1e142 100644 --- a/keyboards/kb_elmo/m0110a_usb/info.json +++ b/keyboards/kb_elmo/m0110a_usb/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "m0110a usb", + "keyboard_name": "M0110A USB", + "manufacturer": "kb-elmo", "url": "https://github.com/kb-elmo/m0110a_usb", "maintainer": "kb-elmo", + "usb": { + "vid": "0xA68C", + "pid": "0xDB4B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb_elmo/m0116_usb/config.h b/keyboards/kb_elmo/m0116_usb/config.h index 693d3ab6a8..7d3581efff 100644 --- a/keyboards/kb_elmo/m0116_usb/config.h +++ b/keyboards/kb_elmo/m0116_usb/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 0xA68C -#define PRODUCT_ID 0x8F7E -#define DEVICE_VER 0x0001 -#define MANUFACTURER kb-elmo -#define PRODUCT M0116 USB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 18 @@ -35,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #define MATRIX_ROW_PINS { B1, A0, B2, A2, A1 } #define MATRIX_COL_PINS { D6, D5, D1, D0, D7, C0, C1, C2, C3, C4, C5, C6, C7, A7, A6, A5, A4, A3 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/kb_elmo/m0116_usb/info.json b/keyboards/kb_elmo/m0116_usb/info.json index 9a5386b838..1b52a8c0e6 100644 --- a/keyboards/kb_elmo/m0116_usb/info.json +++ b/keyboards/kb_elmo/m0116_usb/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "m0116 usb", + "keyboard_name": "M0116 USB", + "manufacturer": "kb-elmo", "url": "https://github.com/kb-elmo/m0116_usb", "maintainer": "kb-elmo", + "usb": { + "vid": "0xA68C", + "pid": "0x8F7E", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kb_elmo/noah_avr/config.h b/keyboards/kb_elmo/noah_avr/config.h index 5c6dfe8b5e..6c462d7176 100644 --- a/keyboards/kb_elmo/noah_avr/config.h +++ b/keyboards/kb_elmo/noah_avr/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 0xA68C -#define PRODUCT_ID 0x1DB0 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kb-elmo -#define PRODUCT Noah AVR - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 @@ -33,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Keyboard Matrix Assignments */ #define MATRIX_ROW_PINS { B4, B6, D7, D5, D0 } #define MATRIX_COL_PINS { D1, D2, D3, D4, C6, C7, F7, F6, F5, F4, F0, F1, B3, B2, B1, B0 } -#define UNUSED_PINS /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/kb_elmo/noah_avr/info.json b/keyboards/kb_elmo/noah_avr/info.json index 6bc9b32b07..91875a6505 100644 --- a/keyboards/kb_elmo/noah_avr/info.json +++ b/keyboards/kb_elmo/noah_avr/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Noah AVR", + "manufacturer": "kb-elmo", "url": "https://github.com/kb-elmo/noah_avr", "maintainer": "kb-elmo", + "usb": { + "vid": "0xA68C", + "pid": "0x1DB0", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_ansi": "LAYOUT_65_ansi_blocker", "LAYOUT_ansi_splitbs": "LAYOUT_65_ansi_blocker_split_bs", diff --git a/keyboards/kb_elmo/qez/config.h b/keyboards/kb_elmo/qez/config.h index 055ebe2a4b..4b51eb3ff4 100644 --- a/keyboards/kb_elmo/qez/config.h +++ b/keyboards/kb_elmo/qez/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 0xA68C -#define PRODUCT_ID 0x675F -#define DEVICE_VER 0x0001 -#define MANUFACTURER kb_elmo -#define PRODUCT QEZ - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 10 diff --git a/keyboards/kb_elmo/qez/info.json b/keyboards/kb_elmo/qez/info.json index a7cdd219d4..a0c2da02f9 100644 --- a/keyboards/kb_elmo/qez/info.json +++ b/keyboards/kb_elmo/qez/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "qez", + "keyboard_name": "QEZ", + "manufacturer": "kb_elmo", "url": "", "maintainer": "kb-elmo<mail@elmo.space>", + "usb": { + "vid": "0xA68C", + "pid": "0x675F", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_space": { "layout": [ diff --git a/keyboards/kb_elmo/sesame/config.h b/keyboards/kb_elmo/sesame/config.h index 5015cc87b9..432bb769c3 100644 --- a/keyboards/kb_elmo/sesame/config.h +++ b/keyboards/kb_elmo/sesame/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 0xA68C -#define PRODUCT_ID 0xE2BD -#define DEVICE_VER 0x0001 -#define MANUFACTURER kb-elmo -#define PRODUCT Sesame - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 @@ -35,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #define MATRIX_ROW_PINS { C4, C5, C6, C7, A7 } #define MATRIX_COL_PINS { D1, D5, D6, D7, C0, C1, C2, C3, A6, A5, A4, A3, A2, A1, A0 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW @@ -46,3 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Bootmagic Lite key configuration */ #define BOOTMAGIC_LITE_ROW 0 #define BOOTMAGIC_LITE_COLUMN 1 + +/* Workaround for https://github.com/qmk/qmk_firmware/issues/11389 */ +#define IGNORE_ATOMIC_BLOCK diff --git a/keyboards/kb_elmo/sesame/info.json b/keyboards/kb_elmo/sesame/info.json index 639c8b4d7c..d537ed1973 100644 --- a/keyboards/kb_elmo/sesame/info.json +++ b/keyboards/kb_elmo/sesame/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "sesame", + "keyboard_name": "Sesame", + "manufacturer": "kb-elmo", "url": "https://github.com/kb-elmo/sesame", "maintainer": "kb-elmo", + "usb": { + "vid": "0xA68C", + "pid": "0xE2BD", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_alice": { "layout": [ diff --git a/keyboards/kb_elmo/twelvekey/config.h b/keyboards/kb_elmo/twelvekey/config.h index 4be5f4f313..2ffc1e4589 100644 --- a/keyboards/kb_elmo/twelvekey/config.h +++ b/keyboards/kb_elmo/twelvekey/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 0xA68C -#define PRODUCT_ID 0x9879 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kb-elmo -#define PRODUCT Twelvekey - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 4 diff --git a/keyboards/kb_elmo/twelvekey/info.json b/keyboards/kb_elmo/twelvekey/info.json index c44d88ce45..27a67923d0 100644 --- a/keyboards/kb_elmo/twelvekey/info.json +++ b/keyboards/kb_elmo/twelvekey/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "twelvekey", + "keyboard_name": "Twelvekey", + "manufacturer": "kb-elmo", "url": "https://github.com/kb-elmo/twelvekey", "maintainer": "kb-elmo", + "usb": { + "vid": "0xA68C", + "pid": "0x9879", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_3x4": { "layout": [{"x":0, "y":0}, diff --git a/keyboards/kb_elmo/vertex/config.h b/keyboards/kb_elmo/vertex/config.h index 9d8eafe5bf..9bf46423b4 100644 --- a/keyboards/kb_elmo/vertex/config.h +++ b/keyboards/kb_elmo/vertex/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 0xA68C -#define PRODUCT_ID 0x6B47 -#define DEVICE_VER 0x0001 -#define MANUFACTURER kb_elmo -#define PRODUCT Vertex - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 @@ -33,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Keyboard Matrix Assignments */ #define MATRIX_ROW_PINS { D2, D4, B7, C6 } #define MATRIX_COL_PINS { C4, C7, D3, D5, B6, D6, B5, B0, B4, B1, B3, B2 } -#define UNUSED_PINS /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/kb_elmo/vertex/info.json b/keyboards/kb_elmo/vertex/info.json index a7bea40772..e443ae5f72 100644 --- a/keyboards/kb_elmo/vertex/info.json +++ b/keyboards/kb_elmo/vertex/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "vertex", + "keyboard_name": "Vertex", + "manufacturer": "kb_elmo", "url": "", "maintainer": "kb-elmo", + "usb": { + "vid": "0xA68C", + "pid": "0x6B47", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_8keys": { "layout": [ diff --git a/keyboards/kb_elmo/vertex/readme.md b/keyboards/kb_elmo/vertex/readme.md index 0710e48070..cbcdd9a179 100644 --- a/keyboards/kb_elmo/vertex/readme.md +++ b/keyboards/kb_elmo/vertex/readme.md @@ -22,4 +22,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to * **Bootmagic reset**: Hold down the top left key and plug in the keyboard * **Physical reset button**: Briefly press the button labeled "Reset" on the back of the PCB -* **Keycode in layout**: Press the key mapped to `RESET` if it is available +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available |