From f61a459f29fa11e1cbbcb12efbc54656f573ccca Mon Sep 17 00:00:00 2001 From: Ilya Zhuravlev Date: Mon, 24 Feb 2025 00:01:34 -0600 Subject: [PATCH] fix remaining keyboards --- keyboards/crkbd/keymaps/vial/config.h | 1 + keyboards/for_science/keymaps/vial/rules.mk | 1 + keyboards/hhkb/ansi/keymaps/vial/rules.mk | 1 + .../kbd0/curve0/60_ansi/keymaps/vial/keymap.c | 6 +- .../kopibeng/mnk65/keymaps/vial/rules.mk | 1 + .../mt/ncr80/r2/solder/keymaps/vial/rules.mk | 1 + keyboards/mykeyclub/jris65/README.md | 32 ------ keyboards/mykeyclub/jris65/config.h | 10 -- keyboards/mykeyclub/jris65/keyboard.json | 100 ------------------ .../mykeyclub/jris65/keymaps/default/keymap.c | 20 ---- .../mykeyclub/jris65/keymaps/vial/keymap.c | 4 +- keyboards/mykeyclub/jris65/rules.mk | 15 --- .../reviung/reviung34/keymaps/vial/config.h | 2 +- .../ncr80alpsskfl/keymaps/vial/keymap.c | 2 +- .../creator_pro/keymaps/vial/rules.mk | 1 + 15 files changed, 13 insertions(+), 184 deletions(-) delete mode 100644 keyboards/mykeyclub/jris65/README.md delete mode 100644 keyboards/mykeyclub/jris65/config.h delete mode 100644 keyboards/mykeyclub/jris65/keyboard.json delete mode 100644 keyboards/mykeyclub/jris65/keymaps/default/keymap.c delete mode 100644 keyboards/mykeyclub/jris65/rules.mk diff --git a/keyboards/crkbd/keymaps/vial/config.h b/keyboards/crkbd/keymaps/vial/config.h index a4e7d7da1c..c9ff10199a 100644 --- a/keyboards/crkbd/keymaps/vial/config.h +++ b/keyboards/crkbd/keymaps/vial/config.h @@ -22,6 +22,7 @@ along with this program. If not, see . #define VIAL_UNLOCK_COMBO_ROWS {0, 0} #define VIAL_UNLOCK_COMBO_COLS {0, 1} +#undef DYNAMIC_KEYMAP_LAYER_COUNT #define DYNAMIC_KEYMAP_LAYER_COUNT 4 #define TAPPING_TERM 180 diff --git a/keyboards/for_science/keymaps/vial/rules.mk b/keyboards/for_science/keymaps/vial/rules.mk index d57394ae1e..ff3deb620b 100644 --- a/keyboards/for_science/keymaps/vial/rules.mk +++ b/keyboards/for_science/keymaps/vial/rules.mk @@ -3,3 +3,4 @@ VIAL_ENABLE = yes LTO_ENABLE = yes CONSOLE_ENABLE = no COMMAND_ENABLE = no +QMK_SETTINGS = no diff --git a/keyboards/hhkb/ansi/keymaps/vial/rules.mk b/keyboards/hhkb/ansi/keymaps/vial/rules.mk index 043b69911e..59a8957580 100644 --- a/keyboards/hhkb/ansi/keymaps/vial/rules.mk +++ b/keyboards/hhkb/ansi/keymaps/vial/rules.mk @@ -2,3 +2,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes LTO_ENABLE = yes QMK_SETTINGS = no +COMBO_ENABLE = no diff --git a/keyboards/kbd0/curve0/60_ansi/keymaps/vial/keymap.c b/keyboards/kbd0/curve0/60_ansi/keymaps/vial/keymap.c index 2eb589ec9f..c06d9a5b95 100644 --- a/keyboards/kbd0/curve0/60_ansi/keymaps/vial/keymap.c +++ b/keyboards/kbd0/curve0/60_ansi/keymaps/vial/keymap.c @@ -17,15 +17,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │Ctrl│GUI │Alt │ │ Alt│ GUI│Menu│Ctrl│ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ */ - - [0] = LAYOUT( + + [0] = LAYOUT_all( 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_BSPC, 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_BSLS, KC_CAPS, 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_NUBS, 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_APP, KC_RCTL ), - [1] = LAYOUT( + [1] = LAYOUT_all( KC_GRV, 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_DEL, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kopibeng/mnk65/keymaps/vial/rules.mk b/keyboards/kopibeng/mnk65/keymaps/vial/rules.mk index 66514e78c9..299958648e 100644 --- a/keyboards/kopibeng/mnk65/keymaps/vial/rules.mk +++ b/keyboards/kopibeng/mnk65/keymaps/vial/rules.mk @@ -2,3 +2,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes LTO_ENABLE = yes CONSOLE_ENABLE = no +QMK_SETTINGS = no diff --git a/keyboards/mt/ncr80/r2/solder/keymaps/vial/rules.mk b/keyboards/mt/ncr80/r2/solder/keymaps/vial/rules.mk index 8298c47bab..b823138c83 100644 --- a/keyboards/mt/ncr80/r2/solder/keymaps/vial/rules.mk +++ b/keyboards/mt/ncr80/r2/solder/keymaps/vial/rules.mk @@ -1,3 +1,4 @@ LTO_ENABLE = yes VIA_ENABLE = yes VIAL_ENABLE = yes +QMK_SETTINGS = no diff --git a/keyboards/mykeyclub/jris65/README.md b/keyboards/mykeyclub/jris65/README.md deleted file mode 100644 index 10b0edf0e7..0000000000 --- a/keyboards/mykeyclub/jris65/README.md +++ /dev/null @@ -1,32 +0,0 @@ -# JRIS65 - -**Hotswap PCB** - -A 65% keyboard sold by Mykeyclub. - -* Keyboard Maintainer: [Dave](https://github.com/unixb0y) -* Hardware Supported: JRIS65 hotswap. -* Hardware Availability: intermitently via group buys from [Mykeyclub](https://www.mykeyclub.com/) - -Make example for this keyboard (after setting up your build environment): - - make mykeyclub/jris65:vial - -Flashing example for this keyboard: - - make mykeyclub/jris65:vial:flash - -See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). - -## Bootloader - -Enter the bootloader in 3 ways: - -* **Keycode in layout**: Using the default firmware, assign a key to Reset (`QK_BOOT`) and press the assigned key. -* **Physical reset button**: Briefly press the button on the back of the PCB - -The QMK default keymap has FN+Backspace assigned to `QK_BOOT` so you can use that key sequence for subsequent flashing. - -## Disclaimer - -In May 2024 Mykeyclub was contacted to see if they had interest in contributing firmware to the QMK project they did not. This code is thus community supported. diff --git a/keyboards/mykeyclub/jris65/config.h b/keyboards/mykeyclub/jris65/config.h deleted file mode 100644 index 17641563dd..0000000000 --- a/keyboards/mykeyclub/jris65/config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 16 - -/* Use 1000hz polling */ -#define USB_POLLING_INTERVAL_MS 1 diff --git a/keyboards/mykeyclub/jris65/keyboard.json b/keyboards/mykeyclub/jris65/keyboard.json deleted file mode 100644 index 5cf54d564e..0000000000 --- a/keyboards/mykeyclub/jris65/keyboard.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "keyboard_name": "IRIS65", - "manufacturer": "zlkb", - "maintainer": "unixb0y", - "bootloader": "atmel-dfu", - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "matrix_pins": { - "cols": ["B6", "C6", "C7", "F1", "F0", "E6", "B0", "B1", "B3", "B7", "D2", "D1", "D0", "D7", "B4", "B5"], - "rows": ["F7", "F6", "F5", "B2", "F4"] - }, - "processor": "atmega32u4", - "url": "", - "usb": { - "device_version": "0.1.0", - "pid": "0x4953", - "vid": "0x5A4C" - }, - "layouts": { - "LAYOUT_65_ansi": { - "layout": [ - {"label": "0,0", "matrix": [0, 0], "x": 0, "y": 0}, - {"label": "0,1", "matrix": [0, 1], "x": 1, "y": 0}, - {"label": "0,2", "matrix": [0, 2], "x": 2, "y": 0}, - {"label": "0,3", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "0,4", "matrix": [0, 4], "x": 4, "y": 0}, - {"label": "0,5", "matrix": [0, 5], "x": 5, "y": 0}, - {"label": "0,6", "matrix": [0, 6], "x": 6, "y": 0}, - {"label": "0,7", "matrix": [0, 7], "x": 7, "y": 0}, - {"label": "0,8", "matrix": [0, 8], "x": 8, "y": 0}, - {"label": "0,9", "matrix": [0, 9], "x": 9, "y": 0}, - {"label": "0,10", "matrix": [0, 10], "x": 10, "y": 0}, - {"label": "0,11", "matrix": [0, 11], "x": 11, "y": 0}, - {"label": "0,12", "matrix": [0, 12], "x": 12, "y": 0}, - {"label": "0,13", "matrix": [0, 13], "x": 13, "y": 0}, - {"label": "0,14", "matrix": [0, 14], "x": 14, "y": 0}, - {"label": "0,15", "matrix": [0, 15], "x": 15, "y": 0}, - {"label": "1,0", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"label": "1,1", "matrix": [1, 1], "x": 1.5, "y": 1}, - {"label": "1,2", "matrix": [1, 2], "x": 2.5, "y": 1}, - {"label": "1,3", "matrix": [1, 3], "x": 3.5, "y": 1}, - {"label": "1,4", "matrix": [1, 4], "x": 4.5, "y": 1}, - {"label": "1,5", "matrix": [1, 5], "x": 5.5, "y": 1}, - {"label": "1,6", "matrix": [1, 6], "x": 6.5, "y": 1}, - {"label": "1,7", "matrix": [1, 7], "x": 7.5, "y": 1}, - {"label": "1,,8", "matrix": [1, 8], "x": 8.5, "y": 1}, - {"label": "1,9", "matrix": [1, 9], "x": 9.5, "y": 1}, - {"label": "1,10", "matrix": [1, 10], "x": 10.5, "y": 1}, - {"label": "1,11", "matrix": [1, 11], "x": 11.5, "y": 1}, - {"label": "1,12", "matrix": [1, 12], "x": 12.5, "y": 1}, - {"label": "1,13", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"label": "1,14", "matrix": [1, 14], "x": 15, "y": 1}, - {"label": "2,0", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"label": "2,1", "matrix": [2, 1], "x": 1.75, "y": 2}, - {"label": "2,2", "matrix": [2, 2], "x": 2.75, "y": 2}, - {"label": "2,3", "matrix": [2, 3], "x": 3.75, "y": 2}, - {"label": "2,4", "matrix": [2, 4], "x": 4.75, "y": 2}, - {"label": "2,5", "matrix": [2, 5], "x": 5.75, "y": 2}, - {"label": "2,6", "matrix": [2, 6], "x": 6.75, "y": 2}, - {"label": "2,7", "matrix": [2, 7], "x": 7.75, "y": 2}, - {"label": "2,8", "matrix": [2, 8], "x": 8.75, "y": 2}, - {"label": "2,9", "matrix": [2, 9], "x": 9.75, "y": 2}, - {"label": "2,10", "matrix": [2, 10], "x": 10.75, "y": 2}, - {"label": "2,11", "matrix": [2, 11], "x": 11.75, "y": 2}, - {"label": "2,12", "matrix": [2, 12], "x": 12.75, "y": 2}, - {"label": "2,13", "matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, - {"label": "2,14", "matrix": [2, 14], "x": 15, "y": 2}, - {"label": "3,0", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, - {"label": "3,1", "matrix": [3, 1], "x": 1.25, "y": 3}, - {"label": "3,2", "matrix": [3, 2], "x": 2.25, "y": 3}, - {"label": "3,3", "matrix": [3, 3], "x": 3.25, "y": 3}, - {"label": "3,4", "matrix": [3, 4], "x": 4.25, "y": 3}, - {"label": "3,5", "matrix": [3, 5], "x": 5.25, "y": 3}, - {"label": "3,6", "matrix": [3, 6], "x": 6.25, "y": 3}, - {"label": "3,7", "matrix": [3, 7], "x": 7.25, "y": 3}, - {"label": "3,8", "matrix": [3, 8], "x": 8.25, "y": 3}, - {"label": "3,9", "matrix": [3, 9], "x": 9.25, "y": 3}, - {"label": "3,10", "matrix": [3, 10], "x": 10.25, "y": 3}, - {"label": "3,11", "matrix": [3, 11], "x": 11.25, "y": 3}, - {"label": "3,12", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, - {"label": "3,13", "matrix": [3, 13], "x": 14, "y": 3}, - {"label": "3,14", "matrix": [3, 14], "x": 15, "y": 3}, - {"label": "4,0", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"label": "4,2", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"label": "4,3", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25}, - {"label": "4,10", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, - {"label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, - {"label": "4,12", "matrix": [4, 12], "x": 13, "y": 4}, - {"label": "4,13", "matrix": [4, 13], "x": 14, "y": 4}, - {"label": "4,14", "matrix": [4, 14], "x": 15, "y": 4} - ] - } - } -} diff --git a/keyboards/mykeyclub/jris65/keymaps/default/keymap.c b/keyboards/mykeyclub/jris65/keymaps/default/keymap.c deleted file mode 100644 index 54d1e0140b..0000000000 --- a/keyboards/mykeyclub/jris65/keymaps/default/keymap.c +++ /dev/null @@ -1,20 +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_65_ansi( - 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_BSPC, KC_DEL, - 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_BSLS, KC_VOLU, - MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_VOLD, - KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_MPLY, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT - ), - [1] = LAYOUT_65_ansi( - KC_GRV, 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_DEL, KC_DEL, - _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, - _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END - ) -}; diff --git a/keyboards/mykeyclub/jris65/keymaps/vial/keymap.c b/keyboards/mykeyclub/jris65/keymaps/vial/keymap.c index 54d1e0140b..7f2a66aad5 100644 --- a/keyboards/mykeyclub/jris65/keymaps/vial/keymap.c +++ b/keyboards/mykeyclub/jris65/keymaps/vial/keymap.c @@ -3,14 +3,14 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_65_ansi( + [0] = LAYOUT_all( 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_BSPC, KC_DEL, 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_BSLS, KC_VOLU, MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, KC_VOLD, KC_LSFT, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_MPLY, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT ), - [1] = LAYOUT_65_ansi( + [1] = LAYOUT_all( KC_GRV, 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_DEL, KC_DEL, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, diff --git a/keyboards/mykeyclub/jris65/rules.mk b/keyboards/mykeyclub/jris65/rules.mk deleted file mode 100644 index 730fa1e454..0000000000 --- a/keyboards/mykeyclub/jris65/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/reviung/reviung34/keymaps/vial/config.h b/keyboards/reviung/reviung34/keymaps/vial/config.h index 56bbda1b3d..fb7209d0d4 100644 --- a/keyboards/reviung/reviung34/keymaps/vial/config.h +++ b/keyboards/reviung/reviung34/keymaps/vial/config.h @@ -7,7 +7,7 @@ // the non split version #define WS2812_DI_PIN D3 #ifdef WS2812_DI_PIN - #define RGBLED_NUM 9 + #define RGBLIGHT_LED_COUNT 9 #define RGBLIGHT_HUE_STEP 16 #define RGBLIGHT_SAT_STEP 16 #define RGBLIGHT_VAL_STEP 16 diff --git a/keyboards/salane/ncr80alpsskfl/keymaps/vial/keymap.c b/keyboards/salane/ncr80alpsskfl/keymaps/vial/keymap.c index 3e8ae876b7..2a86a9253e 100644 --- a/keyboards/salane/ncr80alpsskfl/keymaps/vial/keymap.c +++ b/keyboards/salane/ncr80alpsskfl/keymaps/vial/keymap.c @@ -16,7 +16,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_all( KC_ESC, 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_GRV, 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_BSPC, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/vial/rules.mk b/keyboards/sergiopoverony/creator_pro/keymaps/vial/rules.mk index ae4cb83ec7..443e5590be 100644 --- a/keyboards/sergiopoverony/creator_pro/keymaps/vial/rules.mk +++ b/keyboards/sergiopoverony/creator_pro/keymaps/vial/rules.mk @@ -4,3 +4,4 @@ ENCODER_MAP_ENABLE = yes QMK_SETTINGS = no COMBO_ENABLE = no KEY_OVERRIDE_ENABLE = no +TAP_DANCE_ENABLE = no