From aac4e02152b131b050d7b6a8cab9a8f4b1ab989a Mon Sep 17 00:00:00 2001 From: Ivan Gromov <38141348+key10iq@users.noreply.github.com> Date: Wed, 21 Aug 2024 09:30:55 +0400 Subject: [PATCH] Add imi60 (#768) --- keyboards/keyten/imi60/info.json | 87 +------ keyboards/keyten/imi60/keymaps/vial/keymap.c | 22 -- keyboards/keyten/imi60/keymaps/vial/rules.mk | 7 - keyboards/keyten/imi60/rev1/keyboard.json | 89 +++++++ .../imi60/rev1/keymaps/default/keymap.c | 22 ++ .../imi60/{ => rev1}/keymaps/vial/config.h | 5 +- .../keyten/imi60/rev1/keymaps/vial/keymap.c | 22 ++ .../keyten/imi60/rev1/keymaps/vial/rules.mk | 3 + .../imi60/{ => rev1}/keymaps/vial/vial.json | 2 +- .../keyten/imi60/{ => rev2}/keyboard.json | 7 +- .../imi60/{ => rev2}/keymaps/default/keymap.c | 0 .../imi60/{ => rev2}/keymaps/via/keymap.c | 0 .../imi60/{ => rev2}/keymaps/via/rules.mk | 0 .../keyten/imi60/rev2/keymaps/vial/config.h | 8 + .../keyten/imi60/rev2/keymaps/vial/keymap.c | 22 ++ .../keyten/imi60/rev2/keymaps/vial/rules.mk | 3 + .../keyten/imi60/rev2/keymaps/vial/vial.json | 235 ++++++++++++++++++ keyboards/keyten/imi60/rules.mk | 1 - 18 files changed, 410 insertions(+), 125 deletions(-) delete mode 100644 keyboards/keyten/imi60/keymaps/vial/keymap.c delete mode 100644 keyboards/keyten/imi60/keymaps/vial/rules.mk create mode 100644 keyboards/keyten/imi60/rev1/keyboard.json create mode 100644 keyboards/keyten/imi60/rev1/keymaps/default/keymap.c rename keyboards/keyten/imi60/{ => rev1}/keymaps/vial/config.h (63%) create mode 100644 keyboards/keyten/imi60/rev1/keymaps/vial/keymap.c create mode 100644 keyboards/keyten/imi60/rev1/keymaps/vial/rules.mk rename keyboards/keyten/imi60/{ => rev1}/keymaps/vial/vial.json (98%) rename keyboards/keyten/imi60/{ => rev2}/keyboard.json (95%) rename keyboards/keyten/imi60/{ => rev2}/keymaps/default/keymap.c (100%) rename keyboards/keyten/imi60/{ => rev2}/keymaps/via/keymap.c (100%) rename keyboards/keyten/imi60/{ => rev2}/keymaps/via/rules.mk (100%) create mode 100644 keyboards/keyten/imi60/rev2/keymaps/vial/config.h create mode 100644 keyboards/keyten/imi60/rev2/keymaps/vial/keymap.c create mode 100644 keyboards/keyten/imi60/rev2/keymaps/vial/rules.mk create mode 100644 keyboards/keyten/imi60/rev2/keymaps/vial/vial.json delete mode 100644 keyboards/keyten/imi60/rules.mk diff --git a/keyboards/keyten/imi60/info.json b/keyboards/keyten/imi60/info.json index f2885bb9db..d8ba7d13ac 100644 --- a/keyboards/keyten/imi60/info.json +++ b/keyboards/keyten/imi60/info.json @@ -2,93 +2,8 @@ "manufacturer": "keyten", "keyboard_name": "imi60", "maintainer": "key10iq", - "processor": "atmega32u4", - "bootloader": "atmel-dfu", "usb": { "vid": "0xEB69", - "pid": "0x6002", - "device_version": "0.0.1" - }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "diode_direction": "COL2ROW", - "matrix_pins": { - "rows": ["D1", "D0", "D3", "D2", "D5"], - "cols": ["B7", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"] - }, - "layouts": { - "LAYOUT": { - "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 1], "x": 1, "y": 0 }, - { "matrix": [0, 2], "x": 2, "y": 0 }, - { "matrix": [0, 3], "x": 3, "y": 0 }, - { "matrix": [0, 4], "x": 4, "y": 0 }, - { "matrix": [0, 5], "x": 5, "y": 0 }, - { "matrix": [0, 6], "x": 6, "y": 0 }, - { "matrix": [0, 7], "x": 7, "y": 0 }, - { "matrix": [0, 8], "x": 8, "y": 0 }, - { "matrix": [0, 9], "x": 9, "y": 0 }, - { "matrix": [0, 10], "x": 10, "y": 0 }, - { "matrix": [0, 11], "x": 11, "y": 0 }, - { "matrix": [0, 12], "x": 12, "y": 0 }, - { "matrix": [0, 13], "x": 13, "y": 0 }, - { "matrix": [2, 13], "x": 14, "y": 0 }, - { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "matrix": [2, 11], "x": 11.75, "y": 2 }, - { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, - { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 1.25, "y": 3 }, - { "matrix": [3, 2], "x": 2.25, "y": 3 }, - { "matrix": [3, 3], "x": 3.25, "y": 3 }, - { "matrix": [3, 4], "x": 4.25, "y": 3 }, - { "matrix": [3, 5], "x": 5.25, "y": 3 }, - { "matrix": [3, 6], "x": 6.25, "y": 3 }, - { "matrix": [3, 7], "x": 7.25, "y": 3 }, - { "matrix": [3, 8], "x": 8.25, "y": 3 }, - { "matrix": [3, 9], "x": 9.25, "y": 3 }, - { "matrix": [3, 10], "x": 10.25, "y": 3 }, - { "matrix": [3, 11], "x": 11.25, "y": 3 }, - { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, - { "matrix": [3, 13], "x": 14, "y": 3 }, - { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 }, - { "matrix": [4, 1], "x": 1.5, "y": 4 }, - { "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4 }, - { "matrix": [4, 7], "w": 7, "x": 4, "y": 4 }, - { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 }, - { "matrix": [4, 12], "x": 12.5, "y": 4 }, - { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 } - ] - } + "pid": "0x6005" } } diff --git a/keyboards/keyten/imi60/keymaps/vial/keymap.c b/keyboards/keyten/imi60/keymaps/vial/keymap.c deleted file mode 100644 index dd11389cef..0000000000 --- a/keyboards/keyten/imi60/keymaps/vial/keymap.c +++ /dev/null @@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, - KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_CAPS, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL - ), - - [1] = LAYOUT( - KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, - KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_UP, KC_INS, KC_DEL, - KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_HOME, KC_LEFT, KC_RGHT, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_END, KC_DOWN, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -) -}; diff --git a/keyboards/keyten/imi60/keymaps/vial/rules.mk b/keyboards/keyten/imi60/keymaps/vial/rules.mk deleted file mode 100644 index 96d058b29d..0000000000 --- a/keyboards/keyten/imi60/keymaps/vial/rules.mk +++ /dev/null @@ -1,7 +0,0 @@ -VIA_ENABLE = yes -VIAL_ENABLE = yes - -LTO_ENABLE = yes -TAP_DANCE_ENABLE = no -COMBO_ENABLE = no -KEY_OVERRIDE_ENABLE = no diff --git a/keyboards/keyten/imi60/rev1/keyboard.json b/keyboards/keyten/imi60/rev1/keyboard.json new file mode 100644 index 0000000000..e4f3b8b565 --- /dev/null +++ b/keyboards/keyten/imi60/rev1/keyboard.json @@ -0,0 +1,89 @@ +{ + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "usb": { + "device_version": "0.0.1" + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["D1", "D0", "D3", "D2", "D5"], + "cols": ["B7", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"] + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0 }, + { "matrix": [0, 11], "x": 11, "y": 0 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 13], "x": 13, "y": 0 }, + { "matrix": [2, 13], "x": 14, "y": 0 }, + { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1.5, "y": 1 }, + { "matrix": [1, 2], "x": 2.5, "y": 1 }, + { "matrix": [1, 3], "x": 3.5, "y": 1 }, + { "matrix": [1, 4], "x": 4.5, "y": 1 }, + { "matrix": [1, 5], "x": 5.5, "y": 1 }, + { "matrix": [1, 6], "x": 6.5, "y": 1 }, + { "matrix": [1, 7], "x": 7.5, "y": 1 }, + { "matrix": [1, 8], "x": 8.5, "y": 1 }, + { "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "matrix": [1, 12], "x": 12.5, "y": 1 }, + { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1.75, "y": 2 }, + { "matrix": [2, 2], "x": 2.75, "y": 2 }, + { "matrix": [2, 3], "x": 3.75, "y": 2 }, + { "matrix": [2, 4], "x": 4.75, "y": 2 }, + { "matrix": [2, 5], "x": 5.75, "y": 2 }, + { "matrix": [2, 6], "x": 6.75, "y": 2 }, + { "matrix": [2, 7], "x": 7.75, "y": 2 }, + { "matrix": [2, 8], "x": 8.75, "y": 2 }, + { "matrix": [2, 9], "x": 9.75, "y": 2 }, + { "matrix": [2, 10], "x": 10.75, "y": 2 }, + { "matrix": [2, 11], "x": 11.75, "y": 2 }, + { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, + { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, + { "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "matrix": [3, 11], "x": 11.25, "y": 3 }, + { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, + { "matrix": [3, 13], "x": 14, "y": 3 }, + { "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 }, + { "matrix": [4, 1], "x": 1.5, "y": 4 }, + { "matrix": [4, 3], "w": 1.5, "x": 2.5, "y": 4 }, + { "matrix": [4, 7], "w": 7, "x": 4, "y": 4 }, + { "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 }, + { "matrix": [4, 12], "x": 12.5, "y": 4 }, + { "matrix": [4, 13], "w": 1.5, "x": 13.5, "y": 4 } + ] + } + } +} diff --git a/keyboards/keyten/imi60/rev1/keymaps/default/keymap.c b/keyboards/keyten/imi60/rev1/keymaps/default/keymap.c new file mode 100644 index 0000000000..ec7228d897 --- /dev/null +++ b/keyboards/keyten/imi60/rev1/keymaps/default/keymap.c @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_CAPS, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL + ), + + [1] = LAYOUT( + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_UP, KC_INS, KC_DEL, + KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_HOME, KC_LEFT, KC_RGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_END, KC_DOWN, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/keyten/imi60/keymaps/vial/config.h b/keyboards/keyten/imi60/rev1/keymaps/vial/config.h similarity index 63% rename from keyboards/keyten/imi60/keymaps/vial/config.h rename to keyboards/keyten/imi60/rev1/keymaps/vial/config.h index 0984cab61c..45f9587256 100644 --- a/keyboards/keyten/imi60/keymaps/vial/config.h +++ b/keyboards/keyten/imi60/rev1/keymaps/vial/config.h @@ -3,5 +3,6 @@ #pragma once #define VIAL_KEYBOARD_UID {0x49, 0x3C, 0xCA, 0xFB, 0xB6, 0xD2, 0xF6, 0xD8} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 4 } -#define VIAL_UNLOCK_COMBO_COLS { 0, 13 } + +#define VIAL_UNLOCK_COMBO_ROWS {0, 4} +#define VIAL_UNLOCK_COMBO_COLS {0, 13} diff --git a/keyboards/keyten/imi60/rev1/keymaps/vial/keymap.c b/keyboards/keyten/imi60/rev1/keymaps/vial/keymap.c new file mode 100644 index 0000000000..ec7228d897 --- /dev/null +++ b/keyboards/keyten/imi60/rev1/keymaps/vial/keymap.c @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_CAPS, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL + ), + + [1] = LAYOUT( + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_UP, KC_INS, KC_DEL, + KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_HOME, KC_LEFT, KC_RGHT, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_END, KC_DOWN, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/keyten/imi60/rev1/keymaps/vial/rules.mk b/keyboards/keyten/imi60/rev1/keymaps/vial/rules.mk new file mode 100644 index 0000000000..46f9f1360f --- /dev/null +++ b/keyboards/keyten/imi60/rev1/keymaps/vial/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/keyten/imi60/keymaps/vial/vial.json b/keyboards/keyten/imi60/rev1/keymaps/vial/vial.json similarity index 98% rename from keyboards/keyten/imi60/keymaps/vial/vial.json rename to keyboards/keyten/imi60/rev1/keymaps/vial/vial.json index 9f0a714388..215096fa12 100644 --- a/keyboards/keyten/imi60/keymaps/vial/vial.json +++ b/keyboards/keyten/imi60/rev1/keymaps/vial/vial.json @@ -1,7 +1,7 @@ { "name": "imi60", "vendorId": "0xEB69", - "productId": "0x6002", + "productId": "0x6005", "lighting": "none", "matrix": { "rows": 5, diff --git a/keyboards/keyten/imi60/keyboard.json b/keyboards/keyten/imi60/rev2/keyboard.json similarity index 95% rename from keyboards/keyten/imi60/keyboard.json rename to keyboards/keyten/imi60/rev2/keyboard.json index 2ccf831411..bc3e1c59c8 100644 --- a/keyboards/keyten/imi60/keyboard.json +++ b/keyboards/keyten/imi60/rev2/keyboard.json @@ -1,7 +1,4 @@ { - "manufacturer": "keyten", - "keyboard_name": "imi60", - "maintainer": "key10iq", "bootloader": "stm32-dfu", "diode_direction": "COL2ROW", "features": { @@ -16,9 +13,7 @@ }, "processor": "STM32F072", "usb": { - "device_version": "0.0.1", - "pid": "0x6005", - "vid": "0xEB69" + "device_version": "0.0.2" }, "community_layouts": ["60_tsangan_hhkb"], "layouts": { diff --git a/keyboards/keyten/imi60/keymaps/default/keymap.c b/keyboards/keyten/imi60/rev2/keymaps/default/keymap.c similarity index 100% rename from keyboards/keyten/imi60/keymaps/default/keymap.c rename to keyboards/keyten/imi60/rev2/keymaps/default/keymap.c diff --git a/keyboards/keyten/imi60/keymaps/via/keymap.c b/keyboards/keyten/imi60/rev2/keymaps/via/keymap.c similarity index 100% rename from keyboards/keyten/imi60/keymaps/via/keymap.c rename to keyboards/keyten/imi60/rev2/keymaps/via/keymap.c diff --git a/keyboards/keyten/imi60/keymaps/via/rules.mk b/keyboards/keyten/imi60/rev2/keymaps/via/rules.mk similarity index 100% rename from keyboards/keyten/imi60/keymaps/via/rules.mk rename to keyboards/keyten/imi60/rev2/keymaps/via/rules.mk diff --git a/keyboards/keyten/imi60/rev2/keymaps/vial/config.h b/keyboards/keyten/imi60/rev2/keymaps/vial/config.h new file mode 100644 index 0000000000..f9703540ea --- /dev/null +++ b/keyboards/keyten/imi60/rev2/keymaps/vial/config.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0x7D, 0x66, 0xE6, 0x10, 0xEA, 0x57, 0x97, 0xB3} + +#define VIAL_UNLOCK_COMBO_ROWS {0, 4} +#define VIAL_UNLOCK_COMBO_COLS {0, 13} diff --git a/keyboards/keyten/imi60/rev2/keymaps/vial/keymap.c b/keyboards/keyten/imi60/rev2/keymaps/vial/keymap.c new file mode 100644 index 0000000000..36859fad55 --- /dev/null +++ b/keyboards/keyten/imi60/rev2/keymaps/vial/keymap.c @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_60_tsangan_hhkb( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL + ), + + [1] = LAYOUT_60_tsangan_hhkb( + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, + KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, + KC_TRNS, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; diff --git a/keyboards/keyten/imi60/rev2/keymaps/vial/rules.mk b/keyboards/keyten/imi60/rev2/keymaps/vial/rules.mk new file mode 100644 index 0000000000..46f9f1360f --- /dev/null +++ b/keyboards/keyten/imi60/rev2/keymaps/vial/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/keyten/imi60/rev2/keymaps/vial/vial.json b/keyboards/keyten/imi60/rev2/keymaps/vial/vial.json new file mode 100644 index 0000000000..9d447ec97e --- /dev/null +++ b/keyboards/keyten/imi60/rev2/keymaps/vial/vial.json @@ -0,0 +1,235 @@ +{ + "name": "imi60", + "vendorId": "0xEB69", + "productId": "0x6005", + "lighting": "none", + "matrix": { + "rows": 5, + "cols": 14 + }, + "layouts": { + "labels": [ + "Split Backspace", + "Split Right Shift", + [ + "Bottom Row", + "Tsangan", + "WKL", + "HHKB" + ] + ], + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "2,13\n\n\n0,0", + { + "x": 1, + "c": "#cccccc" + }, + "0,13\n\n\n0,1", + "2,13\n\n\n0,1" + ], + [ + { + "c": "#aaaaaa", + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "w": 1.5 + }, + "1,13" + ], + [ + { + "c": "#aaaaaa", + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + { + "c": "#777777", + "w": 2.25 + }, + "2,12" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "4,12\n\n\n1,0", + { + "x": 0.25, + "w": 1.75 + }, + "4,12\n\n\n1,1", + "3,13\n\n\n1,1" + ], + [ + { + "w": 1.5 + }, + "4,0\n\n\n2,0", + "4,1\n\n\n2,0", + { + "w": 1.5 + }, + "4,2\n\n\n2,0", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n2,0", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10\n\n\n2,0", + "4,11\n\n\n2,0", + { + "w": 1.5 + }, + "4,13\n\n\n2,0" + ], + [ + { + "y": 0.25, + "w": 1.5 + }, + "4,0\n\n\n2,1", + { + "c": "#cccccc", + "d": true + }, + "4,1\n\n\n2,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,2\n\n\n2,1", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n2,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10\n\n\n2,1", + { + "c": "#cccccc", + "d": true + }, + "4,11\n\n\n2,1", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,13\n\n\n2,1" + ], + [ + { + "c": "#cccccc", + "w": 1.5, + "d": true + }, + "4,0\n\n\n2,2", + { + "c": "#aaaaaa" + }, + "4,1\n\n\n2,2", + { + "w": 1.5 + }, + "4,2\n\n\n2,2", + { + "c": "#cccccc", + "w": 7 + }, + "4,6\n\n\n2,2", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "4,10\n\n\n2,2", + "4,11\n\n\n2,2", + { + "c": "#cccccc", + "w": 1.5, + "d": true + }, + "4,13\n\n\n2,2" + ] + ] + } +} diff --git a/keyboards/keyten/imi60/rules.mk b/keyboards/keyten/imi60/rules.mk deleted file mode 100644 index 6e7633bfe0..0000000000 --- a/keyboards/keyten/imi60/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank