From 319d9aa7b94daba050a7d207caf2dd607b04298c Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 31 Mar 2024 12:23:40 +0100 Subject: [PATCH 01/40] Fix 'qmk compile' mass_compile execution (#23296) --- lib/python/qmk/cli/compile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/python/qmk/cli/compile.py b/lib/python/qmk/cli/compile.py index 4c36dec3e79..8d1195bc8f0 100755 --- a/lib/python/qmk/cli/compile.py +++ b/lib/python/qmk/cli/compile.py @@ -41,17 +41,17 @@ def compile(cli): cli.args.filter = [] cli.config.mass_compile.keymap = cli.config.compile.keymap cli.config.mass_compile.parallel = cli.config.compile.parallel - cli.config.mass_compile.no_temp = False + cli.args.no_temp = False return mass_compile(cli) # If we've received `-km all`, reroute it to mass-compile. if cli.args.keymap == 'all': from .mass_compile import mass_compile - cli.args.builds = [f'{cli.args.keyboard}:all'] + cli.args.builds = [f'{cli.config.compile.keyboard}:all'] cli.args.filter = [] cli.config.mass_compile.keymap = None cli.config.mass_compile.parallel = cli.config.compile.parallel - cli.config.mass_compile.no_temp = False + cli.args.no_temp = False return mass_compile(cli) # Build the environment vars From ea7194544187c89c0c69dd035d5cd1860ce6813c Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 31 Mar 2024 21:38:58 +0100 Subject: [PATCH 02/40] Align encoder layout validation with encoder.h logic (#23330) --- keyboards/zvecr/zv48/info.json | 4 ++-- lib/python/qmk/info.py | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json index e58651499a9..cd81109ed14 100644 --- a/keyboards/zvecr/zv48/info.json +++ b/keyboards/zvecr/zv48/info.json @@ -56,7 +56,7 @@ "layouts": { "LAYOUT_ortho_4x12": { "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0, "encoder": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 2], "x": 2, "y": 0}, {"matrix": [0, 3], "x": 3, "y": 0}, @@ -67,7 +67,7 @@ {"matrix": [4, 3], "x": 8, "y": 0}, {"matrix": [4, 2], "x": 9, "y": 0}, {"matrix": [4, 1], "x": 10, "y": 0}, - {"matrix": [4, 0], "x": 11, "y": 0}, + {"matrix": [4, 0], "x": 11, "y": 0, "encoder": 1}, {"matrix": [1, 0], "x": 0, "y": 1}, {"matrix": [1, 1], "x": 1, "y": 1}, diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 71bb6e9454c..e463ac8ce74 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -58,8 +58,13 @@ def _get_key_left_position(key): def _find_invalid_encoder_index(info_data): """Perform additional validation of encoders """ - enc_count = len(info_data.get('encoder', {}).get('rotary', [])) - enc_count += len(info_data.get('split', {}).get('encoder', {}).get('right', {}).get('rotary', [])) + enc_left = info_data.get('encoder', {}).get('rotary', []) + enc_right = [] + + if info_data.get('split', {}).get('enabled', False): + enc_right = info_data.get('split', {}).get('encoder', {}).get('right', {}).get('rotary', enc_left) + + enc_count = len(enc_left) + len(enc_right) ret = [] layouts = info_data.get('layouts', {}) From a9226273191a3fc4b16995c1ba74285d77f1cd62 Mon Sep 17 00:00:00 2001 From: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Date: Mon, 1 Apr 2024 12:33:50 -0400 Subject: [PATCH 03/40] refactor: flehrad/bigswitch (#23384) --- keyboards/flehrad/bigswitch/bigswitch.c | 37 ------------ keyboards/flehrad/bigswitch/config.h | 23 -------- keyboards/flehrad/bigswitch/keyboard.json | 58 ++++++++++--------- .../bigswitch/keymaps/default/keymap.c | 7 +-- .../flehrad/bigswitch/keymaps/via/keymap.c | 9 +-- 5 files changed, 32 insertions(+), 102 deletions(-) delete mode 100644 keyboards/flehrad/bigswitch/bigswitch.c delete mode 100644 keyboards/flehrad/bigswitch/config.h diff --git a/keyboards/flehrad/bigswitch/bigswitch.c b/keyboards/flehrad/bigswitch/bigswitch.c deleted file mode 100644 index 987e816ee9b..00000000000 --- a/keyboards/flehrad/bigswitch/bigswitch.c +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2018 QMK Contributors - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ -#include "quantum.h" - -volatile uint8_t runonce = true; -static uint16_t my_timer; - -__attribute__ ((weak)) -void matrix_init_user(void) { - my_timer = timer_read(); -} - -__attribute__ ((weak)) -void matrix_scan_user(void) { -#if defined(RGBLIGHT_ENABLE) - if (runonce && timer_elapsed(my_timer) > 1000) { - runonce = false; - rgblight_sethsv_noeeprom(0x0, 0xff, 0x80); - rgblight_mode_noeeprom(9); - rgblight_enable_noeeprom(); - } -#endif -} diff --git a/keyboards/flehrad/bigswitch/config.h b/keyboards/flehrad/bigswitch/config.h deleted file mode 100644 index 44163932472..00000000000 --- a/keyboards/flehrad/bigswitch/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2018 QMK Contributors - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* key combination for command */ -#define IS_COMMAND() ( \ - false \ -) diff --git a/keyboards/flehrad/bigswitch/keyboard.json b/keyboards/flehrad/bigswitch/keyboard.json index a56c0b1e9ef..ac68db1a358 100644 --- a/keyboards/flehrad/bigswitch/keyboard.json +++ b/keyboards/flehrad/bigswitch/keyboard.json @@ -1,47 +1,49 @@ { - "keyboard_name": "BigSwitch PCB", "manufacturer": "flehrad", + "keyboard_name": "BigSwitch PCB", "maintainer": "qmk", - "usb": { - "vid": "0x1209", - "pid": "0xB195", - "device_version": "0.0.1" + "debounce": 50, + "development_board": "promicro", + "diode_direction": "ROW2COL", + "features": { + "bootmagic": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgblight": true + }, + "matrix_pins": { + "cols": ["B6"], + "rows": ["B5"] }, "rgblight": { - "led_count": 8, "animations": { + "alternating": true, "breathing": true, + "christmas": true, + "knight": true, "rainbow_mood": true, "rainbow_swirl": true, + "rgb_test": true, "snake": true, - "knight": true, - "christmas": true, "static_gradient": true, - "rgb_test": true, - "alternating": true, "twinkle": true - } + }, + "default": { + "animation": "rainbow_swirl", + "val": 127 + }, + "led_count": 8 + }, + "usb": { + "device_version": "0.0.1", + "pid": "0xB195", + "vid": "0x1209" }, "ws2812": { "pin": "D3" }, - "features": { - "bootmagic": false, - "command": true, - "console": true, - "extrakey": false, - "mousekey": false, - "nkro": false, - "rgblight": true - }, - "matrix_pins": { - "cols": ["B6"], - "rows": ["B5"] - }, - "diode_direction": "ROW2COL", - "processor": "atmega32u4", - "bootloader": "caterina", - "debounce": 50, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/flehrad/bigswitch/keymaps/default/keymap.c b/keyboards/flehrad/bigswitch/keymaps/default/keymap.c index 210d001236c..f5d99b656ba 100644 --- a/keyboards/flehrad/bigswitch/keymaps/default/keymap.c +++ b/keyboards/flehrad/bigswitch/keymaps/default/keymap.c @@ -16,12 +16,7 @@ along with this program. If not, see . */ #include QMK_KEYBOARD_H -#define KC_OSX_EJECT 0x66 -#define LOCK_OSX LSFT(LCTL(KC_OSX_EJECT)) -#define SLEEP_OSX LALT(LGUI(KC_OSX_EJECT)) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -LAYOUT(SLEEP_OSX), - + [0] = LAYOUT(LALT(LGUI(KC_KB_POWER))) // OSX Sleep }; diff --git a/keyboards/flehrad/bigswitch/keymaps/via/keymap.c b/keyboards/flehrad/bigswitch/keymaps/via/keymap.c index f253f4b12e0..621b38605ce 100644 --- a/keyboards/flehrad/bigswitch/keymaps/via/keymap.c +++ b/keyboards/flehrad/bigswitch/keymaps/via/keymap.c @@ -18,12 +18,5 @@ along with this program. If not, see . #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT(KC_TRNS), - - [1] = LAYOUT(KC_TRNS), - - [2] = LAYOUT(KC_TRNS), - - [3] = LAYOUT(KC_TRNS) + [0] = LAYOUT(LALT(LGUI(KC_KB_POWER))) // OSX Sleep }; From 73e3053e255f83c3cbaeee454aa6b8233e9581a9 Mon Sep 17 00:00:00 2001 From: SmollChungus <38044391+SmollChungus@users.noreply.github.com> Date: Mon, 1 Apr 2024 21:32:21 +0200 Subject: [PATCH 04/40] [Keyboard] Add rose75 (#22968) Co-authored-by: Joel Challis Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre --- keyboards/rose75/info.json | 128 ++++++++++++++++++++++ keyboards/rose75/keymaps/default/keymap.c | 16 +++ keyboards/rose75/keymaps/via/keymap.c | 16 +++ keyboards/rose75/keymaps/via/rules.mk | 1 + keyboards/rose75/readme.md | 24 ++++ keyboards/rose75/rose75.c | 20 ++++ keyboards/rose75/rules.mk | 1 + 7 files changed, 206 insertions(+) create mode 100644 keyboards/rose75/info.json create mode 100644 keyboards/rose75/keymaps/default/keymap.c create mode 100644 keyboards/rose75/keymaps/via/keymap.c create mode 100644 keyboards/rose75/keymaps/via/rules.mk create mode 100644 keyboards/rose75/readme.md create mode 100644 keyboards/rose75/rose75.c create mode 100644 keyboards/rose75/rules.mk diff --git a/keyboards/rose75/info.json b/keyboards/rose75/info.json new file mode 100644 index 00000000000..9306cb211b6 --- /dev/null +++ b/keyboards/rose75/info.json @@ -0,0 +1,128 @@ +{ + "manufacturer": "Matthijs Muller", + "keyboard_name": "ROSE75", + "maintainer": "Matthijs Muller", + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["GP23", "GP21", "GP20", "GP19", "GP28", "GP12", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP10"], + "rows": ["GP27", "GP26", "GP25", "GP24", "GP18", "GP22"] + }, + "processor": "RP2040", + "rgb_matrix": { + "driver": "ws2812", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 8}, + {"matrix": [0, 1], "x": 15, "y": 15, "flags": 8} + ], + "max_brightness": 210, + "sleep": true + }, + "url": "https://github.com/Smollchungus", + "usb": { + "device_version": "0.0.1", + "force_nkro": true, + "pid": "0x7503", + "vid": "0x5363" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP29" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "F5", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "F6", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "F7", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "F8", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "F9", "matrix": [0, 10], "x": 10.5, "y": 0}, + {"label": "F10", "matrix": [0, 11], "x": 11.5, "y": 0}, + {"label": "F11", "matrix": [0, 12], "x": 12.5, "y": 0}, + {"label": "F12", "matrix": [0, 13], "x": 13.5, "y": 0}, + {"label": "Del", "matrix": [0, 14], "x": 15, "y": 0}, + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.5}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.5}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.5}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.5}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.5}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.5}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.5}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.5}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.5}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.5}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.5}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.5}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.5}, + {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + {"label": "Home", "matrix": [1, 14], "x": 15, "y": 1.5}, + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"label": "LB", "matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"label": "RB", "matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"label": "Pipe", "matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + {"label": "PgUp", "matrix": [2, 14], "x": 15, "y": 2.5}, + {"label": "Capslock", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"label": "Quote", "matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25}, + {"label": "PgDn", "matrix": [3, 14], "x": 15, "y": 3.5}, + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"label": "Up", "matrix": [4, 13], "x": 14, "y": 4.5}, + {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.5}, + {"label": "Control", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"label": "Win", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25}, + {"label": "Fn", "matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25}, + {"label": "Left", "matrix": [5, 12], "x": 13, "y": 5.5}, + {"label": "Down", "matrix": [5, 13], "x": 14, "y": 5.5}, + {"label": "Right", "matrix": [5, 14], "x": 15, "y": 5.5} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/rose75/keymaps/default/keymap.c b/keyboards/rose75/keymaps/default/keymap.c new file mode 100644 index 00000000000..043edaecbc1 --- /dev/null +++ b/keyboards/rose75/keymaps/default/keymap.c @@ -0,0 +1,16 @@ +// Copyright 2023 Matthijs Muller (@Smollchungus) +// 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_END, + 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_HOME, + 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_PGUP, + 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_PGDN, + KC_LSFT, 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/rose75/keymaps/via/keymap.c b/keyboards/rose75/keymaps/via/keymap.c new file mode 100644 index 00000000000..043edaecbc1 --- /dev/null +++ b/keyboards/rose75/keymaps/via/keymap.c @@ -0,0 +1,16 @@ +// Copyright 2023 Matthijs Muller (@Smollchungus) +// 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_END, + 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_HOME, + 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_PGUP, + 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_PGDN, + KC_LSFT, 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/rose75/keymaps/via/rules.mk b/keyboards/rose75/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/rose75/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/rose75/readme.md b/keyboards/rose75/readme.md new file mode 100644 index 00000000000..85d4763d9b4 --- /dev/null +++ b/keyboards/rose75/readme.md @@ -0,0 +1,24 @@ +# rose75 + +![rose75](https://i.imgur.com/f64Ttib.png) + +* Keyboard Maintainer: [Matthijs Muller](https://github.com/Smollchungus) +* Hardware Supported: Rose75 Keyboard + +Make example for this keyboard (after setting up your build environment): + + make rose75:default + +Flashing example for this keyboard: + + make rose75:default: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: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/rose75/rose75.c b/keyboards/rose75/rose75.c new file mode 100644 index 00000000000..d84f3da1d43 --- /dev/null +++ b/keyboards/rose75/rose75.c @@ -0,0 +1,20 @@ +// Copyright 2023 Matthijs Muller (@Smollchungus) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "quantum.h" + +#ifdef RGB_MATRIX_ENABLE +bool rgb_matrix_indicators_kb(void) { + if (!rgb_matrix_indicators_user()) { + return false; + } + if (host_keyboard_led_state().caps_lock) { + rgb_matrix_set_color(0, 200, 0, 0); + rgb_matrix_set_color(1, 200, 0, 0); + } else { + rgb_matrix_set_color(0, 0, 0, 0); + rgb_matrix_set_color(1, 0, 0, 0); + } + return true; +} +#endif diff --git a/keyboards/rose75/rules.mk b/keyboards/rose75/rules.mk new file mode 100644 index 00000000000..6e7633bfe01 --- /dev/null +++ b/keyboards/rose75/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 81b5ae9bdda30b798035d4ae6c25243efbaa6a2b Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Mon, 1 Apr 2024 23:42:21 +0200 Subject: [PATCH 05/40] Add MNK 60 EC (#23167) Co-authored-by: Duncan Sutherland --- keyboards/cipulot/mnk_60_ec/config.h | 66 +++++ keyboards/cipulot/mnk_60_ec/halconf.h | 21 ++ keyboards/cipulot/mnk_60_ec/info.json | 225 ++++++++++++++++++ .../mnk_60_ec/keymaps/60_hhkb/keymap.c | 42 ++++ .../mnk_60_ec/keymaps/default/keymap.c | 42 ++++ .../cipulot/mnk_60_ec/keymaps/via/keymap.c | 42 ++++ .../cipulot/mnk_60_ec/keymaps/via/rules.mk | 1 + keyboards/cipulot/mnk_60_ec/mcuconf.h | 22 ++ keyboards/cipulot/mnk_60_ec/post_rules.mk | 3 + keyboards/cipulot/mnk_60_ec/readme.md | 26 ++ keyboards/cipulot/mnk_60_ec/rules.mk | 5 + 11 files changed, 495 insertions(+) create mode 100644 keyboards/cipulot/mnk_60_ec/config.h create mode 100644 keyboards/cipulot/mnk_60_ec/halconf.h create mode 100644 keyboards/cipulot/mnk_60_ec/info.json create mode 100644 keyboards/cipulot/mnk_60_ec/keymaps/60_hhkb/keymap.c create mode 100644 keyboards/cipulot/mnk_60_ec/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/mnk_60_ec/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/mnk_60_ec/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/mnk_60_ec/mcuconf.h create mode 100644 keyboards/cipulot/mnk_60_ec/post_rules.mk create mode 100644 keyboards/cipulot/mnk_60_ec/readme.md create mode 100644 keyboards/cipulot/mnk_60_ec/rules.mk diff --git a/keyboards/cipulot/mnk_60_ec/config.h b/keyboards/cipulot/mnk_60_ec/config.h new file mode 100644 index 00000000000..1a7df486572 --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/config.h @@ -0,0 +1,66 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +#define MATRIX_ROW_PINS \ + { B13, B14, B15, A8, A15 } + +#define AMUX_COUNT 2 +#define AMUX_MAX_COLS_COUNT 8 + +#define AMUX_EN_PINS \ + { B7, B3 } + +#define AMUX_SEL_PINS \ + { B6, B5, B4 } + +#define AMUX_COL_CHANNELS_SIZES \ + { 8, 6 } + +#define AMUX_0_COL_CHANNELS \ + { 0, 3, 1, 2, 4, 5, 6, 7 } + +#define AMUX_1_COL_CHANNELS \ + { 0, 3, 1, 2, 4, 5 } + +#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS + +#define DISCHARGE_PIN A3 +#define ANALOG_PORT A2 + +#define DEFAULT_ACTUATION_MODE 0 +#define DEFAULT_MODE_0_ACTUATION_LEVEL 550 +#define DEFAULT_MODE_0_RELEASE_LEVEL 500 +#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL +#define DEFAULT_MODE_1_ACTUATION_OFFSET 70 +#define DEFAULT_MODE_1_RELEASE_OFFSET 70 +#define DEFAULT_EXTREMUM 1023 +#define EXPECTED_NOISE_FLOOR 0 +#define NOISE_FLOOR_THRESHOLD 50 +#define BOTTOMING_CALIBRATION_THRESHOLD 100 +#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30 +#define DEFAULT_BOTTOMING_READING 1023 +#define DEFAULT_CALIBRATION_STARTER true + +#define DISCHARGE_TIME 10 + +// #define DEBUG_MATRIX_SCAN_RATE + +#define EECONFIG_KB_DATA_SIZE 149 diff --git a/keyboards/cipulot/mnk_60_ec/halconf.h b/keyboards/cipulot/mnk_60_ec/halconf.h new file mode 100644 index 00000000000..835d43b6a0a --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#define HAL_USE_ADC TRUE + +#include_next diff --git a/keyboards/cipulot/mnk_60_ec/info.json b/keyboards/cipulot/mnk_60_ec/info.json new file mode 100644 index 00000000000..802e216f672 --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/info.json @@ -0,0 +1,225 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "MNK 60 EC", + "maintainer": "Cipulot", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "processor": "STM32F401", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x6BB6", + "vid": "0x6369" + }, + "community_layouts": ["60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_tsangan_hhkb"], + "layouts": { + "LAYOUT_60_ansi_wkl_split_bs_rshift": { + "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], "x": 0, "y": 1, "w": 1.5}, + {"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], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_hhkb": { + "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], "x": 0, "y": 1, "w": 1.5}, + {"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], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_tsangan_hhkb": { + "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], "x": 0, "y": 1, "w": 1.5}, + {"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], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 12.5, "y": 4}, + {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5} + ] + } + } +} diff --git a/keyboards/cipulot/mnk_60_ec/keymaps/60_hhkb/keymap.c b/keyboards/cipulot/mnk_60_ec/keymaps/60_hhkb/keymap.c new file mode 100644 index 00000000000..6e2678d4f73 --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/keymaps/60_hhkb/keymap.c @@ -0,0 +1,42 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_60_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_DEL, + 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_ENTER, + 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_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT), + + [1] = LAYOUT_60_hhkb( + _______, 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_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, KC_BSPC, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, + _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, MO(2)), + + [2] = LAYOUT_60_hhkb( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/mnk_60_ec/keymaps/default/keymap.c b/keyboards/cipulot/mnk_60_ec/keymaps/default/keymap.c new file mode 100644 index 00000000000..08599b93d3a --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/keymaps/default/keymap.c @@ -0,0 +1,42 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, + 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_RCTL, KC_RGUI, KC_RALT), + + [1] = LAYOUT_60_tsangan_hhkb( + _______, 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_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, + _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, _______, MO(2), _______), + + [2] = LAYOUT_60_tsangan_hhkb( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/mnk_60_ec/keymaps/via/keymap.c b/keyboards/cipulot/mnk_60_ec/keymaps/via/keymap.c new file mode 100644 index 00000000000..08599b93d3a --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/keymaps/via/keymap.c @@ -0,0 +1,42 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, + 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_RCTL, KC_RGUI, KC_RALT), + + [1] = LAYOUT_60_tsangan_hhkb( + _______, 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_PSCR, KC_SCRL, KC_PAUSE, KC_UP, _______, _______, + _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, S(KC_8), KC_SLSH, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, _______, + _______, _______, _______, _______, _______, _______, S(KC_EQL), KC_MINS, KC_END, KC_PGDN, KC_DOWN, _______, _______, + _______, _______, _______, _______, _______, MO(2), _______), + + [2] = LAYOUT_60_tsangan_hhkb( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______) + // clang-format on +}; diff --git a/keyboards/cipulot/mnk_60_ec/keymaps/via/rules.mk b/keyboards/cipulot/mnk_60_ec/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cipulot/mnk_60_ec/mcuconf.h b/keyboards/cipulot/mnk_60_ec/mcuconf.h new file mode 100644 index 00000000000..fa3c955e0d8 --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include_next + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE diff --git a/keyboards/cipulot/mnk_60_ec/post_rules.mk b/keyboards/cipulot/mnk_60_ec/post_rules.mk new file mode 100644 index 00000000000..d726a112a8c --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(VIA_ENABLE)), yes) + SRC += keyboards/cipulot/common/via_ec.c +endif diff --git a/keyboards/cipulot/mnk_60_ec/readme.md b/keyboards/cipulot/mnk_60_ec/readme.md new file mode 100644 index 00000000000..85a770f1518 --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/readme.md @@ -0,0 +1,26 @@ +# MNK 60 EC + +![MNK 60 EC PCB](https://i.imgur.com/UpkCUKFh.jpeg) + +EC version of the Monokei MNK 66. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: MNK 60 EC PCB +* Hardware Availability: [Monokei](https://monokei.co/) + +Make example for this keyboard (after setting up your build environment): + + make cipulot/mnk_60_ec:default + +Flashing example for this keyboard: + + make cipulot/mnk_60_ec:default: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 2 ways: + +* **Physical reset**: Long short the exposed pads on the top of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/cipulot/mnk_60_ec/rules.mk b/keyboards/cipulot/mnk_60_ec/rules.mk new file mode 100644 index 00000000000..ce525670a68 --- /dev/null +++ b/keyboards/cipulot/mnk_60_ec/rules.mk @@ -0,0 +1,5 @@ +CUSTOM_MATRIX = lite +ANALOG_DRIVER_REQUIRED = yes +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c +OPT = 3 From 5fc4e331bda7025ebef63260f0085be5b5be9f9f Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Mon, 1 Apr 2024 23:44:16 +0200 Subject: [PATCH 06/40] Add MNK 65 EC (#23168) --- keyboards/cipulot/mnk_65_ec/config.h | 66 ++++++++++++ keyboards/cipulot/mnk_65_ec/halconf.h | 21 ++++ keyboards/cipulot/mnk_65_ec/info.json | 100 ++++++++++++++++++ .../mnk_65_ec/keymaps/default/keymap.c | 43 ++++++++ .../cipulot/mnk_65_ec/keymaps/via/keymap.c | 43 ++++++++ .../cipulot/mnk_65_ec/keymaps/via/rules.mk | 1 + keyboards/cipulot/mnk_65_ec/mcuconf.h | 22 ++++ keyboards/cipulot/mnk_65_ec/post_rules.mk | 3 + keyboards/cipulot/mnk_65_ec/readme.md | 26 +++++ keyboards/cipulot/mnk_65_ec/rules.mk | 5 + 10 files changed, 330 insertions(+) create mode 100644 keyboards/cipulot/mnk_65_ec/config.h create mode 100644 keyboards/cipulot/mnk_65_ec/halconf.h create mode 100644 keyboards/cipulot/mnk_65_ec/info.json create mode 100644 keyboards/cipulot/mnk_65_ec/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/mnk_65_ec/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/mnk_65_ec/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/mnk_65_ec/mcuconf.h create mode 100644 keyboards/cipulot/mnk_65_ec/post_rules.mk create mode 100644 keyboards/cipulot/mnk_65_ec/readme.md create mode 100644 keyboards/cipulot/mnk_65_ec/rules.mk diff --git a/keyboards/cipulot/mnk_65_ec/config.h b/keyboards/cipulot/mnk_65_ec/config.h new file mode 100644 index 00000000000..01d1248c436 --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/config.h @@ -0,0 +1,66 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +#define MATRIX_ROW_PINS \ + { B14, B15, A8, B12, A15 } + +#define AMUX_COUNT 2 +#define AMUX_MAX_COLS_COUNT 8 + +#define AMUX_EN_PINS \ + { B7, B3 } + +#define AMUX_SEL_PINS \ + { B6, B5, B4 } + +#define AMUX_COL_CHANNELS_SIZES \ + { 8, 7 } + +#define AMUX_0_COL_CHANNELS \ + { 0, 3, 1, 2, 4, 5, 6, 7 } + +#define AMUX_1_COL_CHANNELS \ + { 0, 3, 1, 2, 4, 5, 6 } + +#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS + +#define DISCHARGE_PIN A3 +#define ANALOG_PORT A2 + +#define DEFAULT_ACTUATION_MODE 0 +#define DEFAULT_MODE_0_ACTUATION_LEVEL 550 +#define DEFAULT_MODE_0_RELEASE_LEVEL 500 +#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL +#define DEFAULT_MODE_1_ACTUATION_OFFSET 70 +#define DEFAULT_MODE_1_RELEASE_OFFSET 70 +#define DEFAULT_EXTREMUM 1023 +#define EXPECTED_NOISE_FLOOR 0 +#define NOISE_FLOOR_THRESHOLD 50 +#define BOTTOMING_CALIBRATION_THRESHOLD 100 +#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30 +#define DEFAULT_BOTTOMING_READING 1023 +#define DEFAULT_CALIBRATION_STARTER true + +#define DISCHARGE_TIME 10 + +// #define DEBUG_MATRIX_SCAN_RATE + +#define EECONFIG_KB_DATA_SIZE 159 diff --git a/keyboards/cipulot/mnk_65_ec/halconf.h b/keyboards/cipulot/mnk_65_ec/halconf.h new file mode 100644 index 00000000000..835d43b6a0a --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#define HAL_USE_ADC TRUE + +#include_next diff --git a/keyboards/cipulot/mnk_65_ec/info.json b/keyboards/cipulot/mnk_65_ec/info.json new file mode 100644 index 00000000000..5427601f760 --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/info.json @@ -0,0 +1,100 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "MNK 65 EC", + "maintainer": "Cipulot", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "processor": "STM32F401", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x6BB5", + "vid": "0x6369" + }, + "layouts": { + "LAYOUT_65_ansi_blocker_tsangan": { + "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, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 12], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/cipulot/mnk_65_ec/keymaps/default/keymap.c b/keyboards/cipulot/mnk_65_ec/keymaps/default/keymap.c new file mode 100644 index 00000000000..03b9c3de33e --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/keymaps/default/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_65_ansi_blocker_tsangan( + 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_BSPC, KC_HOME, + 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_PGUP, + 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_PGDN, + KC_LSFT, 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_65_ansi_blocker_tsangan( + 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_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_65_ansi_blocker_tsangan( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) + // clang-format on +}; diff --git a/keyboards/cipulot/mnk_65_ec/keymaps/via/keymap.c b/keyboards/cipulot/mnk_65_ec/keymaps/via/keymap.c new file mode 100644 index 00000000000..03b9c3de33e --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/keymaps/via/keymap.c @@ -0,0 +1,43 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT_65_ansi_blocker_tsangan( + 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_BSPC, KC_HOME, + 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_PGUP, + 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_PGDN, + KC_LSFT, 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_65_ansi_blocker_tsangan( + 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_INS, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_65_ansi_blocker_tsangan( + QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) + // clang-format on +}; diff --git a/keyboards/cipulot/mnk_65_ec/keymaps/via/rules.mk b/keyboards/cipulot/mnk_65_ec/keymaps/via/rules.mk new file mode 100644 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/cipulot/mnk_65_ec/mcuconf.h b/keyboards/cipulot/mnk_65_ec/mcuconf.h new file mode 100644 index 00000000000..fa3c955e0d8 --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include_next + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE diff --git a/keyboards/cipulot/mnk_65_ec/post_rules.mk b/keyboards/cipulot/mnk_65_ec/post_rules.mk new file mode 100644 index 00000000000..d726a112a8c --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(VIA_ENABLE)), yes) + SRC += keyboards/cipulot/common/via_ec.c +endif diff --git a/keyboards/cipulot/mnk_65_ec/readme.md b/keyboards/cipulot/mnk_65_ec/readme.md new file mode 100644 index 00000000000..aeedcc51c7e --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/readme.md @@ -0,0 +1,26 @@ +# Monokei MNK 65 EC + +![MNK 65 EC PCB](https://i.imgur.com/k5ZvGhth.jpeg) + +EC version of the Monokei MNK 65. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: Monokei MNK 65 EC +* Hardware Availability: [Monokei](https://monokei.co/) + +Make example for this keyboard (after setting up your build environment): + + make cipulot/mnk_65_ec:default + +Flashing example for this keyboard: + + make cipulot/mnk_65_ec:default: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 2 ways: + +* **Physical reset**: Long short the exposed pads on the top of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/cipulot/mnk_65_ec/rules.mk b/keyboards/cipulot/mnk_65_ec/rules.mk new file mode 100644 index 00000000000..ce525670a68 --- /dev/null +++ b/keyboards/cipulot/mnk_65_ec/rules.mk @@ -0,0 +1,5 @@ +CUSTOM_MATRIX = lite +ANALOG_DRIVER_REQUIRED = yes +VPATH += keyboards/cipulot/common +SRC += matrix.c ec_board.c ec_switch_matrix.c +OPT = 3 From 8757a19375b4fdc65b4dd471b11cb4378c3e7177 Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Mon, 1 Apr 2024 23:45:09 +0200 Subject: [PATCH 07/40] Fix in 60_iso_wkl_split_bs_rshift diagram (#22654) --- .../default_60_iso_wkl_split_bs_rshift/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c b/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c index b07d56ea206..228522f1b67 100644 --- a/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c +++ b/layouts/default/60_iso_wkl_split_bs_rshift/default_60_iso_wkl_split_bs_rshift/keymap.c @@ -11,9 +11,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ │ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ - * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Sft│ - * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┤ + * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │Sft│ + * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ * │Ctrl │ │ Alt │ │ Alt │ │ Ctrl│ * └─────┘ └─────┴───────────────────────────┴─────┘ └─────┘ */ From d4d8b0c6d32845c8a765afd615b8e2e2670f85fd Mon Sep 17 00:00:00 2001 From: Cipulot <40441626+Cipulot@users.noreply.github.com> Date: Mon, 1 Apr 2024 23:49:46 +0200 Subject: [PATCH 08/40] Add EC Type-K (#23193) --- keyboards/cipulot/ec_typek/config.h | 81 +++ keyboards/cipulot/ec_typek/ec_switch_matrix.c | 318 +++++++++++ keyboards/cipulot/ec_typek/ec_switch_matrix.h | 84 +++ keyboards/cipulot/ec_typek/ec_typek.c | 119 +++++ keyboards/cipulot/ec_typek/halconf.h | 23 + keyboards/cipulot/ec_typek/info.json | 133 +++++ .../cipulot/ec_typek/keymaps/default/keymap.c | 41 ++ .../cipulot/ec_typek/keymaps/via/keymap.c | 41 ++ .../cipulot/ec_typek/keymaps/via/rules.mk | 3 + .../ec_typek/keymaps/via/via_ec_indicators.c | 502 ++++++++++++++++++ keyboards/cipulot/ec_typek/matrix.c | 42 ++ keyboards/cipulot/ec_typek/mcuconf.h | 28 + keyboards/cipulot/ec_typek/readme.md | 26 + keyboards/cipulot/ec_typek/rules.mk | 4 + 14 files changed, 1445 insertions(+) create mode 100644 keyboards/cipulot/ec_typek/config.h create mode 100644 keyboards/cipulot/ec_typek/ec_switch_matrix.c create mode 100644 keyboards/cipulot/ec_typek/ec_switch_matrix.h create mode 100644 keyboards/cipulot/ec_typek/ec_typek.c create mode 100644 keyboards/cipulot/ec_typek/halconf.h create mode 100644 keyboards/cipulot/ec_typek/info.json create mode 100644 keyboards/cipulot/ec_typek/keymaps/default/keymap.c create mode 100644 keyboards/cipulot/ec_typek/keymaps/via/keymap.c create mode 100644 keyboards/cipulot/ec_typek/keymaps/via/rules.mk create mode 100644 keyboards/cipulot/ec_typek/keymaps/via/via_ec_indicators.c create mode 100644 keyboards/cipulot/ec_typek/matrix.c create mode 100644 keyboards/cipulot/ec_typek/mcuconf.h create mode 100644 keyboards/cipulot/ec_typek/readme.md create mode 100644 keyboards/cipulot/ec_typek/rules.mk diff --git a/keyboards/cipulot/ec_typek/config.h b/keyboards/cipulot/ec_typek/config.h new file mode 100644 index 00000000000..a6619c600c8 --- /dev/null +++ b/keyboards/cipulot/ec_typek/config.h @@ -0,0 +1,81 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#define MATRIX_ROWS 5 +#define MATRIX_COLS 15 + +#define MATRIX_ROW_PINS \ + { B14, B13, B12, A6, A7 } + +#define AMUX_COUNT 2 +#define AMUX_MAX_COLS_COUNT 8 + +#define AMUX_EN_PINS \ + { B9, B8 } + +#define AMUX_SEL_PINS \ + { B7, B6, B5 } + +#define AMUX_COL_CHANNELS_SIZES \ + { 7, 8 } + +#define AMUX_0_COL_CHANNELS \ + { 3, 0, 1, 2, 4, 6, 7 } + +#define AMUX_1_COL_CHANNELS \ + { 3, 0, 1, 2, 4, 6, 7, 5 } + +#define AMUX_COL_CHANNELS AMUX_0_COL_CHANNELS, AMUX_1_COL_CHANNELS + +#define DISCHARGE_PIN A1 +#define ANALOG_PORT A2 + +#define DEFAULT_ACTUATION_MODE 0 +#define DEFAULT_MODE_0_ACTUATION_LEVEL 550 +#define DEFAULT_MODE_0_RELEASE_LEVEL 500 +#define DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET DEFAULT_MODE_0_ACTUATION_LEVEL +#define DEFAULT_MODE_1_ACTUATION_OFFSET 70 +#define DEFAULT_MODE_1_RELEASE_OFFSET 70 +#define DEFAULT_EXTREMUM 1023 +#define EXPECTED_NOISE_FLOOR 0 +#define NOISE_FLOOR_THRESHOLD 50 +#define BOTTOMING_CALIBRATION_THRESHOLD 100 +#define DEFAULT_NOISE_FLOOR_SAMPLING_COUNT 30 +#define DEFAULT_BOTTOMING_READING 1023 +#define DEFAULT_CALIBRATION_STARTER true + +#define DISCHARGE_TIME 10 + +// #define DEBUG_MATRIX_SCAN_RATE + +#define EECONFIG_KB_DATA_SIZE 171 + +// RGB & Indicators +// PWM driver with direct memory access (DMA) support +#define WS2812_PWM_COMPLEMENTARY_OUTPUT +#define WS2812_PWM_DRIVER PWMD1 +#define WS2812_PWM_CHANNEL 3 +#define WS2812_PWM_PAL_MODE 1 +#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_DMA_CHANNEL 6 +#define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM1_UP + +#define RGBLIGHT_DEFAULT_VAL 200 +#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5) + +#define NUM_INDICATOR_INDEX 2 +#define CAPS_INDICATOR_INDEX 1 +#define SCROLL_INDICATOR_INDEX 0 diff --git a/keyboards/cipulot/ec_typek/ec_switch_matrix.c b/keyboards/cipulot/ec_typek/ec_switch_matrix.c new file mode 100644 index 00000000000..da58a75bbcf --- /dev/null +++ b/keyboards/cipulot/ec_typek/ec_switch_matrix.c @@ -0,0 +1,318 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "ec_switch_matrix.h" +#include "analog.h" +#include "atomic_util.h" +#include "math.h" +#include "print.h" +#include "wait.h" + +#if defined(__AVR__) +# error "AVR platforms not supported due to a variety of reasons. Among them there are limited memory, limited number of pins and ADC not being able to give satisfactory results." +#endif + +#define OPEN_DRAIN_SUPPORT defined(PAL_MODE_OUTPUT_OPENDRAIN) + +eeprom_ec_config_t eeprom_ec_config; +ec_config_t ec_config; + +// Pin and port array +const pin_t row_pins[] = MATRIX_ROW_PINS; +const pin_t amux_sel_pins[] = AMUX_SEL_PINS; +const pin_t amux_en_pins[] = AMUX_EN_PINS; +const pin_t amux_n_col_sizes[] = AMUX_COL_CHANNELS_SIZES; +const pin_t amux_n_col_channels[][AMUX_MAX_COLS_COUNT] = {AMUX_COL_CHANNELS}; + +#define AMUX_SEL_PINS_COUNT ARRAY_SIZE(amux_sel_pins) +#define EXPECTED_AMUX_SEL_PINS_COUNT ceil(log2(AMUX_MAX_COLS_COUNT) +// Checks for the correctness of the configuration +_Static_assert(ARRAY_SIZE(amux_en_pins) == AMUX_COUNT, "AMUX_EN_PINS doesn't have the minimum number of bits required to enable all the multiplexers available"); +// Check that number of select pins is enough to select all the channels +_Static_assert(AMUX_SEL_PINS_COUNT == EXPECTED_AMUX_SEL_PINS_COUNT), "AMUX_SEL_PINS doesn't have the minimum number of bits required address all the channels"); +// Check that number of elements in AMUX_COL_CHANNELS_SIZES is enough to specify the number of channels for all the multiplexers available +_Static_assert(ARRAY_SIZE(amux_n_col_sizes) == AMUX_COUNT, "AMUX_COL_CHANNELS_SIZES doesn't have the minimum number of elements required to specify the number of channels for all the multiplexers available"); +// static ec_config_t config; +static uint16_t sw_value[MATRIX_ROWS][MATRIX_COLS]; + +static adc_mux adcMux; + +// Initialize the row pins +void init_row(void) { + // Set all row pins as output and low + for (uint8_t idx = 0; idx < MATRIX_ROWS; idx++) { + gpio_set_pin_output(row_pins[idx]); + gpio_write_pin_low(row_pins[idx]); + } +} + +// Initialize the multiplexers +void init_amux(void) { + for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) { + gpio_set_pin_output(amux_en_pins[idx]); + gpio_write_pin_low(amux_en_pins[idx]); + } + for (uint8_t idx = 0; idx < AMUX_SEL_PINS_COUNT; idx++) { + gpio_set_pin_output(amux_sel_pins[idx]); + } +} + +// Select the multiplexer channel of the specified multiplexer +void select_amux_channel(uint8_t channel, uint8_t col) { + // Get the channel for the specified multiplexer + uint8_t ch = amux_n_col_channels[channel][col]; + // momentarily disable specified multiplexer + gpio_write_pin_high(amux_en_pins[channel]); + // Select the multiplexer channel + for (uint8_t i = 0; i < AMUX_SEL_PINS_COUNT; i++) { + gpio_write_pin(amux_sel_pins[i], ch & (1 << i)); + } + // re enable specified multiplexer + gpio_write_pin_low(amux_en_pins[channel]); +} + +// Disable all the unused multiplexers +void disable_unused_amux(uint8_t channel) { + // disable all the other multiplexers apart from the current selected one + for (uint8_t idx = 0; idx < AMUX_COUNT; idx++) { + if (idx != channel) { + gpio_write_pin_high(amux_en_pins[idx]); + } + } +} +// Discharge the peak hold capacitor +void discharge_capacitor(void) { +#ifdef OPEN_DRAIN_SUPPORT + gpio_write_pin_low(DISCHARGE_PIN); +#else + gpio_write_pin_low(DISCHARGE_PIN); + gpio_set_pin_output(DISCHARGE_PIN); +#endif +} + +// Charge the peak hold capacitor +void charge_capacitor(uint8_t row) { +#ifdef OPEN_DRAIN_SUPPORT + gpio_write_pin_high(DISCHARGE_PIN); +#else + gpio_set_pin_input(DISCHARGE_PIN); +#endif + gpio_write_pin_high(row_pins[row]); +} + +// Initialize the peripherals pins +int ec_init(void) { + // Initialize ADC + palSetLineMode(ANALOG_PORT, PAL_MODE_INPUT_ANALOG); + adcMux = pinToMux(ANALOG_PORT); + + // Dummy call to make sure that adcStart() has been called in the appropriate state + adc_read(adcMux); + + // Initialize discharge pin as discharge mode + gpio_write_pin_low(DISCHARGE_PIN); +#ifdef OPEN_DRAIN_SUPPORT + gpio_set_pin_output_open_drain(DISCHARGE_PIN); +#else + gpio_set_pin_output(DISCHARGE_PIN); +#endif + + // Initialize drive lines + init_row(); + + // Initialize AMUXs + init_amux(); + + return 0; +} + +// Get the noise floor +void ec_noise_floor(void) { + // Initialize the noise floor + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.noise_floor[row][col] = 0; + } + } + + // Sample the noise floor + for (uint8_t i = 0; i < DEFAULT_NOISE_FLOOR_SAMPLING_COUNT; i++) { + for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) { + disable_unused_amux(amux); + for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) { + uint8_t sum = 0; + for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++) + sum += amux_n_col_sizes[i]; + uint8_t adjusted_col = col + sum; + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + ec_config.noise_floor[row][adjusted_col] += ec_readkey_raw(amux, row, col); + } + } + } + wait_ms(5); + } + + // Average the noise floor + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.noise_floor[row][col] /= DEFAULT_NOISE_FLOOR_SAMPLING_COUNT; + } + } +} + +// Scan key values and update matrix state +bool ec_matrix_scan(matrix_row_t current_matrix[]) { + bool updated = false; + + for (uint8_t amux = 0; amux < AMUX_COUNT; amux++) { + disable_unused_amux(amux); + for (uint8_t col = 0; col < amux_n_col_sizes[amux]; col++) { + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + uint8_t sum = 0; + for (uint8_t i = 0; i < (amux > 0 ? amux : 0); i++) + sum += amux_n_col_sizes[i]; + uint8_t adjusted_col = col + sum; + sw_value[row][adjusted_col] = ec_readkey_raw(amux, row, col); + + if (ec_config.bottoming_calibration) { + if (ec_config.bottoming_calibration_starter[row][adjusted_col]) { + ec_config.bottoming_reading[row][adjusted_col] = sw_value[row][adjusted_col]; + ec_config.bottoming_calibration_starter[row][adjusted_col] = false; + } else if (sw_value[row][adjusted_col] > ec_config.bottoming_reading[row][adjusted_col]) { + ec_config.bottoming_reading[row][adjusted_col] = sw_value[row][adjusted_col]; + } + } else { + updated |= ec_update_key(¤t_matrix[row], row, adjusted_col, sw_value[row][adjusted_col]); + } + } + } + } + + return ec_config.bottoming_calibration ? false : updated; +} + +// Read the capacitive sensor value +uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col) { + uint16_t sw_value = 0; + + // Select the multiplexer + select_amux_channel(channel, col); + + // Set the row pin to low state to avoid ghosting + gpio_write_pin_low(row_pins[row]); + + ATOMIC_BLOCK_FORCEON { + // Set the row pin to high state and have capacitor charge + charge_capacitor(row); + // Read the ADC value + sw_value = adc_read(adcMux); + } + // Discharge peak hold capacitor + discharge_capacitor(); + // Waiting for the ghost capacitor to discharge fully + wait_us(DISCHARGE_TIME); + + return sw_value; +} + +// Update press/release state of key +bool ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value) { + bool current_state = (*current_row >> col) & 1; + + // Real Time Noise Floor Calibration + if (sw_value < (ec_config.noise_floor[row][col] - NOISE_FLOOR_THRESHOLD)) { + uprintf("Noise Floor Change: %d, %d, %d\n", row, col, sw_value); + ec_config.noise_floor[row][col] = sw_value; + ec_config.rescaled_mode_0_actuation_threshold[row][col] = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + ec_config.rescaled_mode_0_release_threshold[row][col] = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + } + + // Normal board-wide APC + if (ec_config.actuation_mode == 0) { + if (current_state && sw_value < ec_config.rescaled_mode_0_release_threshold[row][col]) { + *current_row &= ~(1 << col); + uprintf("Key released: %d, %d, %d\n", row, col, sw_value); + return true; + } + if ((!current_state) && sw_value > ec_config.rescaled_mode_0_actuation_threshold[row][col]) { + *current_row |= (1 << col); + uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value); + return true; + } + } + // Rapid Trigger + else if (ec_config.actuation_mode == 1) { + // Is key in active zone? + if (sw_value > ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]) { + // Is key pressed while in active zone? + if (current_state) { + // Is the key still moving down? + if (sw_value > ec_config.extremum[row][col]) { + ec_config.extremum[row][col] = sw_value; + uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value); + } + // Has key moved up enough to be released? + else if (sw_value < ec_config.extremum[row][col] - ec_config.mode_1_release_offset) { + ec_config.extremum[row][col] = sw_value; + *current_row &= ~(1 << col); + uprintf("Key released: %d, %d, %d\n", row, col, sw_value); + return true; + } + } + // Key is not pressed while in active zone + else { + // Is the key still moving up? + if (sw_value < ec_config.extremum[row][col]) { + ec_config.extremum[row][col] = sw_value; + } + // Has key moved down enough to be pressed? + else if (sw_value > ec_config.extremum[row][col] + ec_config.mode_1_actuation_offset) { + ec_config.extremum[row][col] = sw_value; + *current_row |= (1 << col); + uprintf("Key pressed: %d, %d, %d\n", row, col, sw_value); + return true; + } + } + } + // Key is not in active zone + else { + // Check to avoid key being stuck in pressed state near the active zone threshold + if (sw_value < ec_config.extremum[row][col]) { + ec_config.extremum[row][col] = sw_value; + *current_row &= ~(1 << col); + return true; + } + } + } + return false; +} + +// Print the matrix values +void ec_print_matrix(void) { + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", sw_value[row][col]); + } + uprintf("%4d\n", sw_value[row][MATRIX_COLS - 1]); + } + print("\n"); +} + +// Rescale the value to a different range +uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max) { + return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min; +} diff --git a/keyboards/cipulot/ec_typek/ec_switch_matrix.h b/keyboards/cipulot/ec_typek/ec_switch_matrix.h new file mode 100644 index 00000000000..fad20360bc7 --- /dev/null +++ b/keyboards/cipulot/ec_typek/ec_switch_matrix.h @@ -0,0 +1,84 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include +#include +#include "matrix.h" +#include "eeconfig.h" +#include "util.h" + +typedef struct _indicator_config_t { + uint8_t h; + uint8_t s; + uint8_t v; + bool enabled; +} indicator_config; + +typedef struct PACKED { + indicator_config num; + indicator_config caps; + indicator_config scroll; + uint8_t actuation_mode; // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point, 2: Rapid trigger from resting point + uint16_t mode_0_actuation_threshold; // threshold for key press in mode 0 + uint16_t mode_0_release_threshold; // threshold for key release in mode 0 + uint16_t mode_1_initial_deadzone_offset; // threshold for key press in mode 1 + uint8_t mode_1_actuation_offset; // offset for key press in mode 1 and 2 (1-255) + uint8_t mode_1_release_offset; // offset for key release in mode 1 and 2 (1-255) + uint16_t bottoming_reading[MATRIX_ROWS][MATRIX_COLS]; // bottoming reading +} eeprom_ec_config_t; + +typedef struct { + uint8_t actuation_mode; // 0: normal board-wide APC, 1: Rapid trigger from specific board-wide actuation point (it can be very near that baseline noise and be "full travel") + uint16_t mode_0_actuation_threshold; // threshold for key press in mode 0 + uint16_t mode_0_release_threshold; // threshold for key release in mode 0 + uint16_t mode_1_initial_deadzone_offset; // threshold for key press in mode 1 (initial deadzone) + uint16_t rescaled_mode_0_actuation_threshold[MATRIX_ROWS][MATRIX_COLS]; // threshold for key press in mode 0 rescaled to actual scale + uint16_t rescaled_mode_0_release_threshold[MATRIX_ROWS][MATRIX_COLS]; // threshold for key release in mode 0 rescaled to actual scale + uint16_t rescaled_mode_1_initial_deadzone_offset[MATRIX_ROWS][MATRIX_COLS]; // threshold for key press in mode 1 (initial deadzone) rescaled to actual scale + uint8_t mode_1_actuation_offset; // offset for key press in mode 1 (1-255) + uint8_t mode_1_release_offset; // offset for key release in mode 1 (1-255) + uint16_t extremum[MATRIX_ROWS][MATRIX_COLS]; // extremum values for mode 1 + uint16_t noise_floor[MATRIX_ROWS][MATRIX_COLS]; // noise floor detected during startup + bool bottoming_calibration; // calibration mode for bottoming out values (true: calibration mode, false: normal mode) + bool bottoming_calibration_starter[MATRIX_ROWS][MATRIX_COLS]; // calibration mode for bottoming out values (true: calibration mode, false: normal mode) + uint16_t bottoming_reading[MATRIX_ROWS][MATRIX_COLS]; // bottoming reading +} ec_config_t; + +// Check if the size of the reserved persistent memory is the same as the size of struct eeprom_ec_config_t +_Static_assert(sizeof(eeprom_ec_config_t) == EECONFIG_KB_DATA_SIZE, "Mismatch in keyboard EECONFIG stored data"); + +extern eeprom_ec_config_t eeprom_ec_config; + +extern ec_config_t ec_config; + +void init_row(void); +void init_amux(void); +void select_amux_channel(uint8_t channel, uint8_t col); +void disable_unused_amux(uint8_t channel); +void discharge_capacitor(void); +void charge_capacitor(uint8_t row); + +int ec_init(void); +void ec_noise_floor(void); +bool ec_matrix_scan(matrix_row_t current_matrix[]); +uint16_t ec_readkey_raw(uint8_t channel, uint8_t row, uint8_t col); +bool ec_update_key(matrix_row_t* current_row, uint8_t row, uint8_t col, uint16_t sw_value); +void ec_print_matrix(void); + +uint16_t rescale(uint16_t x, uint16_t in_min, uint16_t in_max, uint16_t out_min, uint16_t out_max); +bool indicators_callback(void); diff --git a/keyboards/cipulot/ec_typek/ec_typek.c b/keyboards/cipulot/ec_typek/ec_typek.c new file mode 100644 index 00000000000..035c90303ca --- /dev/null +++ b/keyboards/cipulot/ec_typek/ec_typek.c @@ -0,0 +1,119 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "ec_switch_matrix.h" +#include "quantum.h" + +void eeconfig_init_kb(void) { + // Default values + eeprom_ec_config.num.h = 0; + eeprom_ec_config.num.s = 0; + eeprom_ec_config.num.v = 60; + eeprom_ec_config.num.enabled = true; + eeprom_ec_config.caps.h = 0; + eeprom_ec_config.caps.s = 0; + eeprom_ec_config.caps.v = 60; + eeprom_ec_config.caps.enabled = true; + eeprom_ec_config.scroll.h = 0; + eeprom_ec_config.scroll.s = 0; + eeprom_ec_config.scroll.v = 60; + eeprom_ec_config.scroll.enabled = true; + eeprom_ec_config.actuation_mode = DEFAULT_ACTUATION_MODE; + eeprom_ec_config.mode_0_actuation_threshold = DEFAULT_MODE_0_ACTUATION_LEVEL; + eeprom_ec_config.mode_0_release_threshold = DEFAULT_MODE_0_RELEASE_LEVEL; + eeprom_ec_config.mode_1_initial_deadzone_offset = DEFAULT_MODE_1_INITIAL_DEADZONE_OFFSET; + eeprom_ec_config.mode_1_actuation_offset = DEFAULT_MODE_1_ACTUATION_OFFSET; + eeprom_ec_config.mode_1_release_offset = DEFAULT_MODE_1_RELEASE_OFFSET; + + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + eeprom_ec_config.bottoming_reading[row][col] = DEFAULT_BOTTOMING_READING; + } + } + // Write default value to EEPROM now + eeconfig_update_kb_datablock(&eeprom_ec_config); + + eeconfig_init_user(); +} + +// On Keyboard startup +void keyboard_post_init_kb(void) { + // Read custom menu variables from memory + eeconfig_read_kb_datablock(&eeprom_ec_config); + + // Set runtime values to EEPROM values + ec_config.actuation_mode = eeprom_ec_config.actuation_mode; + ec_config.mode_0_actuation_threshold = eeprom_ec_config.mode_0_actuation_threshold; + ec_config.mode_0_release_threshold = eeprom_ec_config.mode_0_release_threshold; + ec_config.mode_1_initial_deadzone_offset = eeprom_ec_config.mode_1_initial_deadzone_offset; + ec_config.mode_1_actuation_offset = eeprom_ec_config.mode_1_actuation_offset; + ec_config.mode_1_release_offset = eeprom_ec_config.mode_1_release_offset; + ec_config.bottoming_calibration = false; + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.bottoming_calibration_starter[row][col] = true; + ec_config.bottoming_reading[row][col] = eeprom_ec_config.bottoming_reading[row][col]; + ec_config.rescaled_mode_0_actuation_threshold[row][col] = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + ec_config.rescaled_mode_0_release_threshold[row][col] = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + } + } + + // Set the RGB LEDs range that will be used for the effects + rgblight_set_effect_range(3, 66); + // Call the indicator callback to set the indicator color + indicators_callback(); + + keyboard_post_init_user(); +} + +// This function gets called when caps, num, scroll change +bool led_update_kb(led_t led_state) { + indicators_callback(); + return true; +} + +// This function is called when layers change +layer_state_t layer_state_set_user(layer_state_t state) { + indicators_callback(); + return state; +} + +// INDICATOR CALLBACK ------------------------------------------------------------------------------ +/* LED index to physical position + * + * LED2 | LED1 | LED0 + * -----+------+-------- + * Num | Caps | Scroll | + */ +bool indicators_callback(void) { + if ((eeprom_ec_config.num.enabled) && (host_keyboard_led_state().num_lock)) + sethsv(eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]); + else + sethsv(0, 0, 0, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]); + + if ((eeprom_ec_config.caps.enabled) && (host_keyboard_led_state().caps_lock)) + sethsv(eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]); + else + sethsv(0, 0, 0, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]); + + if ((eeprom_ec_config.scroll.enabled) && (host_keyboard_led_state().scroll_lock)) + sethsv(eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]); + else + sethsv(0, 0, 0, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]); + + return true; +} diff --git a/keyboards/cipulot/ec_typek/halconf.h b/keyboards/cipulot/ec_typek/halconf.h new file mode 100644 index 00000000000..24de0954858 --- /dev/null +++ b/keyboards/cipulot/ec_typek/halconf.h @@ -0,0 +1,23 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#define HAL_USE_ADC TRUE +#define HAL_USE_PWM TRUE +#define HAL_USE_PAL TRUE + +#include_next diff --git a/keyboards/cipulot/ec_typek/info.json b/keyboards/cipulot/ec_typek/info.json new file mode 100644 index 00000000000..e4642ee5553 --- /dev/null +++ b/keyboards/cipulot/ec_typek/info.json @@ -0,0 +1,133 @@ +{ + "manufacturer": "Cipulot", + "keyboard_name": "EC Type-K", + "maintainer": "Cipulot", + "bootloader": "stm32-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "eeprom": { + "wear_leveling": { + "backing_size": 4096 + } + }, + "features": { + "bootmagic": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "processor": "STM32F411", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "rgblight": { + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + }, + "led_count": 69, + "led_map": [0, 1, 2, 3, 4, 5, 66, 67, 68, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65], + "max_brightness": 200 + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x6BB4", + "shared_endpoint": { + "keyboard": true + }, + "vid": "0x6369" + }, + "ws2812": { + "driver": "pwm", + "pin": "B15" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [1, 0], "x": 0.75, "y": 0}, + {"matrix": [0, 0], "x": 2.5, "y": 0}, + {"matrix": [0, 1], "x": 3.5, "y": 0}, + {"matrix": [0, 2], "x": 4.5, "y": 0}, + {"matrix": [0, 3], "x": 5.5, "y": 0}, + {"matrix": [0, 4], "x": 6.5, "y": 0}, + {"matrix": [0, 5], "x": 7.5, "y": 0}, + {"matrix": [0, 6], "x": 8.5, "y": 0}, + {"matrix": [0, 7], "x": 10.5, "y": 0}, + {"matrix": [0, 8], "x": 11.5, "y": 0}, + {"matrix": [0, 9], "x": 12.5, "y": 0}, + {"matrix": [0, 10], "x": 13.5, "y": 0}, + {"matrix": [0, 11], "x": 14.5, "y": 0}, + {"matrix": [0, 12], "x": 15.5, "y": 0}, + {"matrix": [0, 13], "x": 16.5, "y": 0}, + {"matrix": [0, 14], "x": 17.5, "y": 0}, + {"matrix": [2, 0], "x": 0.5, "y": 1}, + {"matrix": [1, 1], "x": 2.25, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 3.75, "y": 1}, + {"matrix": [1, 3], "x": 4.75, "y": 1}, + {"matrix": [1, 4], "x": 5.75, "y": 1}, + {"matrix": [1, 5], "x": 6.75, "y": 1}, + {"matrix": [1, 6], "x": 7.75, "y": 1}, + {"matrix": [1, 7], "x": 10.25, "y": 1}, + {"matrix": [1, 8], "x": 11.25, "y": 1}, + {"matrix": [1, 9], "x": 12.25, "y": 1}, + {"matrix": [1, 10], "x": 13.25, "y": 1}, + {"matrix": [1, 11], "x": 14.25, "y": 1}, + {"matrix": [1, 12], "x": 15.25, "y": 1}, + {"matrix": [1, 13], "x": 16.25, "y": 1}, + {"matrix": [1, 14], "x": 17.25, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 0.25, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 3.75, "y": 2}, + {"matrix": [2, 3], "x": 4.75, "y": 2}, + {"matrix": [2, 4], "x": 5.75, "y": 2}, + {"matrix": [2, 5], "x": 6.75, "y": 2}, + {"matrix": [2, 6], "x": 7.75, "y": 2}, + {"matrix": [2, 7], "x": 10.75, "y": 2}, + {"matrix": [2, 8], "x": 11.75, "y": 2}, + {"matrix": [2, 9], "x": 12.75, "y": 2}, + {"matrix": [2, 10], "x": 13.75, "y": 2}, + {"matrix": [2, 11], "x": 14.75, "y": 2}, + {"matrix": [2, 12], "x": 15.75, "y": 2}, + {"matrix": [2, 14], "x": 16.75, "y": 2, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1.75, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 3], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 6, "y": 3}, + {"matrix": [3, 5], "x": 7, "y": 3}, + {"matrix": [3, 6], "x": 8, "y": 3}, + {"matrix": [3, 7], "x": 10.5, "y": 3}, + {"matrix": [3, 8], "x": 11.5, "y": 3}, + {"matrix": [3, 9], "x": 12.5, "y": 3}, + {"matrix": [3, 10], "x": 13.5, "y": 3}, + {"matrix": [3, 11], "x": 14.5, "y": 3}, + {"matrix": [3, 12], "x": 15.5, "y": 3}, + {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.25}, + {"matrix": [3, 14], "x": 17.75, "y": 3}, + {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 8.5, "y": 4}, + {"matrix": [4, 7], "x": 10, "y": 4}, + {"matrix": [4, 8], "x": 11, "y": 4, "w": 2}, + {"matrix": [4, 10], "x": 13, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 16.75, "y": 4, "w": 1.5} + ] + } + } +} diff --git a/keyboards/cipulot/ec_typek/keymaps/default/keymap.c b/keyboards/cipulot/ec_typek/keymaps/default/keymap.c new file mode 100644 index 00000000000..e47e50680e0 --- /dev/null +++ b/keyboards/cipulot/ec_typek/keymaps/default/keymap.c @@ -0,0 +1,41 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT( + KC_ESC, 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_BSLS, KC_DEL, + KC_PGUP, 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_PGDN, 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_ENTER, + KC_LGUI, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_RGUI, KC_SPC, KC_RALT, MO(1) + ), + [1] = LAYOUT( + _______, _______, 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_HOME, _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______, + KC_END, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, MO(2), _______ + ), + [2] = LAYOUT( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/cipulot/ec_typek/keymaps/via/keymap.c b/keyboards/cipulot/ec_typek/keymaps/via/keymap.c new file mode 100644 index 00000000000..e47e50680e0 --- /dev/null +++ b/keyboards/cipulot/ec_typek/keymaps/via/keymap.c @@ -0,0 +1,41 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + // clang-format off + [0] = LAYOUT( + KC_ESC, 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_BSLS, KC_DEL, + KC_PGUP, 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_PGDN, 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_ENTER, + KC_LGUI, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_RGUI, KC_SPC, KC_RALT, MO(1) + ), + [1] = LAYOUT( + _______, _______, 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_HOME, _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUSE, _______, _______, _______, + KC_END, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, MO(2), _______ + ), + [2] = LAYOUT( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/cipulot/ec_typek/keymaps/via/rules.mk b/keyboards/cipulot/ec_typek/keymaps/via/rules.mk new file mode 100644 index 00000000000..b870b6349c0 --- /dev/null +++ b/keyboards/cipulot/ec_typek/keymaps/via/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes + +SRC += via_ec_indicators.c diff --git a/keyboards/cipulot/ec_typek/keymaps/via/via_ec_indicators.c b/keyboards/cipulot/ec_typek/keymaps/via/via_ec_indicators.c new file mode 100644 index 00000000000..742dac0e6f1 --- /dev/null +++ b/keyboards/cipulot/ec_typek/keymaps/via/via_ec_indicators.c @@ -0,0 +1,502 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "keyboards/cipulot/common/eeprom_tools.h" +#include "ec_switch_matrix.h" +#include "action.h" +#include "print.h" +#include "via.h" + +#ifdef VIA_ENABLE + +void ec_rescale_values(uint8_t item); +void ec_save_threshold_data(uint8_t option); +void ec_save_bottoming_reading(void); +void ec_show_calibration_data(void); +void ec_clear_bottoming_calibration_data(void); + +// Declaring enums for VIA config menu +enum via_enums { + // clang-format off + id_num_indicator_enabled = 1, + id_num_indicator_brightness = 2, + id_num_indicator_color = 3, + id_caps_indicator_enabled = 4, + id_caps_indicator_brightness = 5, + id_caps_indicator_color = 6, + id_scroll_indicator_enabled = 7, + id_scroll_indicator_brightness = 8, + id_scroll_indicator_color = 9, + id_actuation_mode = 10, + id_mode_0_actuation_threshold = 11, + id_mode_0_release_threshold = 12, + id_save_threshold_data = 13, + id_mode_1_initial_deadzone_offset = 14, + id_mode_1_actuation_offset = 15, + id_mode_1_release_offset = 16, + id_bottoming_calibration = 17, + id_noise_floor_calibration = 18, + id_show_calibration_data = 19, + id_clear_bottoming_calibration_data = 20 + // clang-format on +}; + +// Handle the data received by the keyboard from the VIA menus +void via_config_set_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_num_indicator_enabled: { + if (value_data[0] == 1) { + eeprom_ec_config.num.enabled = true; + uprintf("#########################\n"); + uprintf("# Num indicator enabled #\n"); + uprintf("#########################\n"); + } else { + eeprom_ec_config.num.enabled = false; + uprintf("##########################\n"); + uprintf("# Num indicator disabled #\n"); + uprintf("##########################\n"); + } + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.enabled); + break; + } + case id_num_indicator_brightness: { + eeprom_ec_config.num.v = value_data[0]; + uprintf("Num indicator brightness: %d\n", eeprom_ec_config.num.v); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.v); + break; + } + case id_num_indicator_color: { + eeprom_ec_config.num.h = value_data[0]; + eeprom_ec_config.num.s = value_data[1]; + uprintf("Num indicator color: %d, %d\n", eeprom_ec_config.num.h, eeprom_ec_config.num.s); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.h); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, num.s); + break; + } + case id_caps_indicator_enabled: { + if (value_data[0] == 1) { + eeprom_ec_config.caps.enabled = true; + uprintf("##########################\n"); + uprintf("# Caps indicator enabled #\n"); + uprintf("##########################\n"); + } else { + eeprom_ec_config.caps.enabled = false; + uprintf("###########################\n"); + uprintf("# Caps indicator disabled #\n"); + uprintf("###########################\n"); + } + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.enabled); + break; + } + case id_caps_indicator_brightness: { + eeprom_ec_config.caps.v = value_data[0]; + uprintf("Caps indicator brightness: %d\n", eeprom_ec_config.caps.v); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.v); + break; + } + case id_caps_indicator_color: { + eeprom_ec_config.caps.h = value_data[0]; + eeprom_ec_config.caps.s = value_data[1]; + uprintf("Caps indicator color: %d, %d\n", eeprom_ec_config.caps.h, eeprom_ec_config.caps.s); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.h); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, caps.s); + break; + } + case id_scroll_indicator_enabled: { + if (value_data[0] == 1) { + eeprom_ec_config.scroll.enabled = true; + uprintf("############################\n"); + uprintf("# Scroll indicator enabled #\n"); + uprintf("############################\n"); + } else { + eeprom_ec_config.scroll.enabled = false; + uprintf("#############################\n"); + uprintf("# Scroll indicator disabled #\n"); + uprintf("#############################\n"); + } + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.enabled); + break; + } + case id_scroll_indicator_brightness: { + eeprom_ec_config.scroll.v = value_data[0]; + uprintf("Scroll indicator brightness: %d\n", eeprom_ec_config.scroll.v); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.v); + break; + } + case id_scroll_indicator_color: { + eeprom_ec_config.scroll.h = value_data[0]; + eeprom_ec_config.scroll.s = value_data[1]; + uprintf("Scroll indicator color: %d, %d\n", eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.h); + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, scroll.s); + break; + } + case id_actuation_mode: { + eeprom_ec_config.actuation_mode = value_data[0]; + ec_config.actuation_mode = eeprom_ec_config.actuation_mode; + if (ec_config.actuation_mode == 0) { + uprintf("#########################\n"); + uprintf("# Actuation Mode: APC #\n"); + uprintf("#########################\n"); + } else if (ec_config.actuation_mode == 1) { + uprintf("#################################\n"); + uprintf("# Actuation Mode: Rapid Trigger #\n"); + uprintf("#################################\n"); + } + EEPROM_KB_PARTIAL_UPDATE(eeprom_ec_config, actuation_mode); + break; + } + case id_mode_0_actuation_threshold: { + ec_config.mode_0_actuation_threshold = value_data[1] | (value_data[0] << 8); + uprintf("APC Mode Actuation Threshold: %d\n", ec_config.mode_0_actuation_threshold); + break; + } + case id_mode_0_release_threshold: { + eeprom_ec_config.mode_0_release_threshold = value_data[1] | (value_data[0] << 8); + ec_config.mode_0_release_threshold = eeprom_ec_config.mode_0_release_threshold; + uprintf("APC Mode Release Threshold: %d\n", ec_config.mode_0_release_threshold); + break; + } + case id_mode_1_initial_deadzone_offset: { + ec_config.mode_1_initial_deadzone_offset = value_data[1] | (value_data[0] << 8); + uprintf("Rapid Trigger Mode Initial Deadzone Offset: %d\n", ec_config.mode_1_initial_deadzone_offset); + break; + } + case id_mode_1_actuation_offset: { + ec_config.mode_1_actuation_offset = value_data[0]; + uprintf("Rapid Trigger Mode Actuation Sensitivity: %d\n", ec_config.mode_1_actuation_offset); + break; + } + case id_mode_1_release_offset: { + ec_config.mode_1_release_offset = value_data[0]; + uprintf("Rapid Trigger Mode Release Sensitivity: %d\n", ec_config.mode_1_release_offset); + break; + } + case id_bottoming_calibration: { + if (value_data[0] == 1) { + ec_config.bottoming_calibration = true; + uprintf("##############################\n"); + uprintf("# Bottoming calibration mode #\n"); + uprintf("##############################\n"); + } else { + ec_config.bottoming_calibration = false; + ec_save_bottoming_reading(); + uprintf("## Bottoming calibration done ##\n"); + ec_show_calibration_data(); + } + break; + } + case id_save_threshold_data: { + ec_save_threshold_data(value_data[0]); + break; + } + case id_noise_floor_calibration: { + if (value_data[0] == 0) { + ec_noise_floor(); + ec_rescale_values(0); + ec_rescale_values(1); + ec_rescale_values(2); + uprintf("#############################\n"); + uprintf("# Noise floor data acquired #\n"); + uprintf("#############################\n"); + break; + } + } + case id_show_calibration_data: { + // Show calibration data once if the user toggle the switch + if (value_data[0] == 0) { + ec_show_calibration_data(); + break; + } + } + case id_clear_bottoming_calibration_data: { + if (value_data[0] == 0) { + ec_clear_bottoming_calibration_data(); + } + } + default: { + // Unhandled value. + break; + } + } + + // Call the indicator callback to set the indicator color + indicators_callback(); +} + +// Handle the data sent by the keyboard to the VIA menus +void via_config_get_value(uint8_t *data) { + // data = [ value_id, value_data ] + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + + switch (*value_id) { + case id_num_indicator_enabled: { + value_data[0] = eeprom_ec_config.num.enabled; + break; + } + case id_num_indicator_brightness: { + value_data[0] = eeprom_ec_config.num.v; + break; + } + case id_num_indicator_color: { + value_data[0] = eeprom_ec_config.num.h; + value_data[1] = eeprom_ec_config.num.s; + break; + } + case id_caps_indicator_enabled: { + value_data[0] = eeprom_ec_config.caps.enabled; + break; + } + case id_caps_indicator_brightness: { + value_data[0] = eeprom_ec_config.caps.v; + break; + } + case id_caps_indicator_color: { + value_data[0] = eeprom_ec_config.caps.h; + value_data[1] = eeprom_ec_config.caps.s; + break; + } + case id_scroll_indicator_enabled: { + value_data[0] = eeprom_ec_config.scroll.enabled; + break; + } + case id_scroll_indicator_brightness: { + value_data[0] = eeprom_ec_config.scroll.v; + break; + } + case id_scroll_indicator_color: { + value_data[0] = eeprom_ec_config.scroll.h; + value_data[1] = eeprom_ec_config.scroll.s; + break; + } + case id_actuation_mode: { + value_data[0] = eeprom_ec_config.actuation_mode; + break; + } + case id_mode_0_actuation_threshold: { + value_data[0] = eeprom_ec_config.mode_0_actuation_threshold >> 8; + value_data[1] = eeprom_ec_config.mode_0_actuation_threshold & 0xFF; + break; + } + case id_mode_0_release_threshold: { + value_data[0] = eeprom_ec_config.mode_0_release_threshold >> 8; + value_data[1] = eeprom_ec_config.mode_0_release_threshold & 0xFF; + break; + } + case id_mode_1_initial_deadzone_offset: { + value_data[0] = eeprom_ec_config.mode_1_initial_deadzone_offset >> 8; + value_data[1] = eeprom_ec_config.mode_1_initial_deadzone_offset & 0xFF; + break; + } + case id_mode_1_actuation_offset: { + value_data[0] = eeprom_ec_config.mode_1_actuation_offset; + break; + } + case id_mode_1_release_offset: { + value_data[0] = eeprom_ec_config.mode_1_release_offset; + break; + } + default: { + // Unhandled value. + break; + } + } +} + +// Handle the commands sent and received by the keyboard with VIA +void via_custom_value_command_kb(uint8_t *data, uint8_t length) { + // data = [ command_id, channel_id, value_id, value_data ] + uint8_t *command_id = &(data[0]); + uint8_t *channel_id = &(data[1]); + uint8_t *value_id_and_data = &(data[2]); + + if (*channel_id == id_custom_channel) { + switch (*command_id) { + case id_custom_set_value: { + via_config_set_value(value_id_and_data); + break; + } + case id_custom_get_value: { + via_config_get_value(value_id_and_data); + break; + } + case id_custom_save: { + // Bypass the save function in favor of pinpointed saves + break; + } + default: { + // Unhandled message. + *command_id = id_unhandled; + break; + } + } + return; + } + + *command_id = id_unhandled; +} + +// Rescale the values received by VIA to fit the new range +void ec_rescale_values(uint8_t item) { + switch (item) { + // Rescale the APC mode actuation thresholds + case 0: + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.rescaled_mode_0_actuation_threshold[row][col] = rescale(ec_config.mode_0_actuation_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + } + } + break; + // Rescale the APC mode release thresholds + case 1: + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.rescaled_mode_0_release_threshold[row][col] = rescale(ec_config.mode_0_release_threshold, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + } + } + break; + // Rescale the Rapid Trigger mode initial deadzone offsets + case 2: + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + ec_config.rescaled_mode_1_initial_deadzone_offset[row][col] = rescale(ec_config.mode_1_initial_deadzone_offset, 0, 1023, ec_config.noise_floor[row][col], eeprom_ec_config.bottoming_reading[row][col]); + } + } + break; + + default: + // Unhandled item. + break; + } +} + +void ec_save_threshold_data(uint8_t option) { + // Save APC mode thresholds and rescale them for runtime usage + if (option == 0) { + eeprom_ec_config.mode_0_actuation_threshold = ec_config.mode_0_actuation_threshold; + eeprom_ec_config.mode_0_release_threshold = ec_config.mode_0_release_threshold; + ec_rescale_values(0); + ec_rescale_values(1); + } + // Save Rapid Trigger mode thresholds and rescale them for runtime usage + else if (option == 1) { + eeprom_ec_config.mode_1_initial_deadzone_offset = ec_config.mode_1_initial_deadzone_offset; + ec_rescale_values(2); + } + eeconfig_update_kb_datablock(&eeprom_ec_config); + uprintf("####################################\n"); + uprintf("# New thresholds applied and saved #\n"); + uprintf("####################################\n"); +} + +// Save the bottoming reading +void ec_save_bottoming_reading(void) { + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS; col++) { + // If the bottom reading doesn't go over the noise floor by 100, it is likely that: + // 1. The key is not actually in the matrix + // 2. The key is on an alternative layout, therefore not being pressed + // 3. The key in in the current layout but not being pressed + if (ec_config.bottoming_reading[row][col] < (ec_config.noise_floor[row][col] + 100)) { + eeprom_ec_config.bottoming_reading[row][col] = 1023; + } else { + eeprom_ec_config.bottoming_reading[row][col] = ec_config.bottoming_reading[row][col]; + } + } + } + // Rescale the values to fit the new range for runtime usage + ec_rescale_values(0); + ec_rescale_values(1); + ec_rescale_values(2); + eeconfig_update_kb_datablock(&eeprom_ec_config); +} + +// Show the calibration data +void ec_show_calibration_data(void) { + uprintf("\n###############\n"); + uprintf("# Noise Floor #\n"); + uprintf("###############\n"); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", ec_config.noise_floor[row][col]); + } + uprintf("%4d\n", ec_config.noise_floor[row][MATRIX_COLS - 1]); + } + + uprintf("\n######################\n"); + uprintf("# Bottoming Readings #\n"); + uprintf("######################\n"); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", eeprom_ec_config.bottoming_reading[row][col]); + } + uprintf("%4d\n", eeprom_ec_config.bottoming_reading[row][MATRIX_COLS - 1]); + } + + uprintf("\n######################################\n"); + uprintf("# Rescaled APC Mode Actuation Points #\n"); + uprintf("######################################\n"); + uprintf("Original APC Mode Actuation Point: %4d\n", ec_config.mode_0_actuation_threshold); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", ec_config.rescaled_mode_0_actuation_threshold[row][col]); + } + uprintf("%4d\n", ec_config.rescaled_mode_0_actuation_threshold[row][MATRIX_COLS - 1]); + } + + uprintf("\n######################################\n"); + uprintf("# Rescaled APC Mode Release Points #\n"); + uprintf("######################################\n"); + uprintf("Original APC Mode Release Point: %4d\n", ec_config.mode_0_release_threshold); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", ec_config.rescaled_mode_0_release_threshold[row][col]); + } + uprintf("%4d\n", ec_config.rescaled_mode_0_release_threshold[row][MATRIX_COLS - 1]); + } + + uprintf("\n#######################################################\n"); + uprintf("# Rescaled Rapid Trigger Mode Initial Deadzone Offset #\n"); + uprintf("#######################################################\n"); + uprintf("Original Rapid Trigger Mode Initial Deadzone Offset: %4d\n", ec_config.mode_1_initial_deadzone_offset); + for (uint8_t row = 0; row < MATRIX_ROWS; row++) { + for (uint8_t col = 0; col < MATRIX_COLS - 1; col++) { + uprintf("%4d,", ec_config.rescaled_mode_1_initial_deadzone_offset[row][col]); + } + uprintf("%4d\n", ec_config.rescaled_mode_1_initial_deadzone_offset[row][MATRIX_COLS - 1]); + } + print("\n"); +} + +// Clear the calibration data +void ec_clear_bottoming_calibration_data(void) { + // Clear the EEPROM data + eeconfig_init_kb(); + + // Reset the runtime values to the EEPROM values + keyboard_post_init_kb(); + + uprintf("######################################\n"); + uprintf("# Bottoming calibration data cleared #\n"); + uprintf("######################################\n"); +} + +#endif // VIA_ENABLE diff --git a/keyboards/cipulot/ec_typek/matrix.c b/keyboards/cipulot/ec_typek/matrix.c new file mode 100644 index 00000000000..cfa2efe0506 --- /dev/null +++ b/keyboards/cipulot/ec_typek/matrix.c @@ -0,0 +1,42 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "ec_switch_matrix.h" +#include "matrix.h" + +extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values +extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values + +// Custom matrix init function +void matrix_init_custom(void) { + // Initialize EC + ec_init(); + + // Get the noise floor at boot + ec_noise_floor(); +} + +// Custom matrix scan function +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + bool updated = ec_matrix_scan(current_matrix); + + return updated; +} + +// Bootmagic overriden to avoid conflicts with EC +void bootmagic_scan(void) { + ; +} diff --git a/keyboards/cipulot/ec_typek/mcuconf.h b/keyboards/cipulot/ec_typek/mcuconf.h new file mode 100644 index 00000000000..5f9ecca48dd --- /dev/null +++ b/keyboards/cipulot/ec_typek/mcuconf.h @@ -0,0 +1,28 @@ +/* Copyright 2023 Cipulot + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include_next + +#undef STM32_ADC_USE_ADC1 +#define STM32_ADC_USE_ADC1 TRUE + +#undef STM32_PWM_USE_ADVANCED +#define STM32_PWM_USE_ADVANCED TRUE + +#undef STM32_PWM_USE_TIM1 +#define STM32_PWM_USE_TIM1 TRUE diff --git a/keyboards/cipulot/ec_typek/readme.md b/keyboards/cipulot/ec_typek/readme.md new file mode 100644 index 00000000000..44f6fd89440 --- /dev/null +++ b/keyboards/cipulot/ec_typek/readme.md @@ -0,0 +1,26 @@ +# EC Type-K + +![EC Type-K](https://i.imgur.com/hFQ0qCfh.png) + +EC Type-K Keyboard by gok. + +* Keyboard Maintainer: [cipulot](https://github.com/cipulot) +* Hardware Supported: EC Type-K +* Hardware Availability: [gok](https://www.gok.design/) + +Make example for this keyboard (after setting up your build environment): + + make cipulot/ec_typek:default + +Flashing example for this keyboard: + + make cipulot/ec_typek:default: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 2 ways: + +* **Physical Boot0 pins**: Short the Boot0 pins on the back of the PCB while plugging in the keyboard +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/cipulot/ec_typek/rules.mk b/keyboards/cipulot/ec_typek/rules.mk new file mode 100644 index 00000000000..1ff311f102d --- /dev/null +++ b/keyboards/cipulot/ec_typek/rules.mk @@ -0,0 +1,4 @@ +CUSTOM_MATRIX = lite +ANALOG_DRIVER_REQUIRED = yes +SRC += matrix.c ec_switch_matrix.c +OPT = 2 From 573db7a0eeddea94e692af85b90219d637567fc3 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 2 Apr 2024 00:48:30 +0100 Subject: [PATCH 09/40] Produce warning if keyboard is not configured via `keyboard.json` (#23321) --- lib/python/qmk/info.py | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index e463ac8ce74..ffc9d57d682 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -83,6 +83,25 @@ def _find_invalid_encoder_index(info_data): return ret +def _validate_build_target(keyboard, info_data): + """Non schema checks + """ + keyboard_json_path = Path('keyboards') / keyboard / 'keyboard.json' + config_files = find_info_json(keyboard) + + # keyboard.json can only exist at the deepest part of the tree + keyboard_json_count = 0 + for info_file in config_files: + if info_file.name == 'keyboard.json': + keyboard_json_count += 1 + if info_file != keyboard_json_path: + _log_error(info_data, f'Invalid keyboard.json location detected: {info_file}.') + + # Moving forward keyboard.json should be used as a build target + if keyboard_json_count == 0: + _log_warning(info_data, 'Build marker "keyboard.json" not found.') + + def _validate_layouts(keyboard, info_data): # noqa C901 """Non schema checks """ @@ -181,6 +200,7 @@ def _validate(keyboard, info_data): validate(info_data, 'qmk.api.keyboard.v1') # Additional validation + _validate_build_target(keyboard, info_data) _validate_layouts(keyboard, info_data) _validate_keycodes(keyboard, info_data) _validate_encoders(keyboard, info_data) @@ -890,14 +910,6 @@ def merge_info_jsons(keyboard, info_data): """ config_files = find_info_json(keyboard) - # keyboard.json can only exist at the deepest part of the tree - keyboard_json_count = 0 - for index, info_file in enumerate(config_files): - if Path(info_file).name == 'keyboard.json': - keyboard_json_count += 1 - if index != 0 or keyboard_json_count > 1: - _log_error(info_data, f'Invalid keyboard.json location detected: {info_file}.') - for info_file in config_files: # Load and validate the JSON data new_info_data = json_load(info_file) From 1bea8b9d31fff260c55d515dd221f5572d85b8ff Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Apr 2024 01:32:48 +1100 Subject: [PATCH 10/40] 40percentclub/gherkin: remove `CONVERT_TO` at keyboard level (#23396) --- keyboards/40percentclub/gherkin/info.json | 15 +++++------- .../gherkin/kb2040/keyboard.json | 12 ++++++++++ .../40percentclub/gherkin/kb2040/rules.mk | 1 - .../gherkin/keymaps/default/keymap.c | 23 ------------------- .../gherkin/pro_micro/keyboard.json | 16 +++++++++++++ keyboards/40percentclub/gherkin/rules.mk | 16 ------------- 6 files changed, 34 insertions(+), 49 deletions(-) create mode 100644 keyboards/40percentclub/gherkin/kb2040/keyboard.json delete mode 100644 keyboards/40percentclub/gherkin/kb2040/rules.mk create mode 100644 keyboards/40percentclub/gherkin/pro_micro/keyboard.json delete mode 100644 keyboards/40percentclub/gherkin/rules.mk diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json index 808a82d4cea..d531c9408c1 100644 --- a/keyboards/40percentclub/gherkin/info.json +++ b/keyboards/40percentclub/gherkin/info.json @@ -8,16 +8,13 @@ "pid": "0x6060", "device_version": "0.0.1" }, - "matrix_pins": { - "cols": ["B4", "E6", "D7", "C6", "D4", "D0"], - "rows": ["F7", "B1", "B3", "B2", "B6"] + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true }, - "diode_direction": "COL2ROW", - "backlight": { - "pin": "B5" - }, - "processor": "atmega32u4", - "bootloader": "caterina", "community_layouts": ["ortho_3x10"], "layouts": { "LAYOUT_ortho_3x10": { diff --git a/keyboards/40percentclub/gherkin/kb2040/keyboard.json b/keyboards/40percentclub/gherkin/kb2040/keyboard.json new file mode 100644 index 00000000000..431ac371eeb --- /dev/null +++ b/keyboards/40percentclub/gherkin/kb2040/keyboard.json @@ -0,0 +1,12 @@ +{ + "development_board": "kb2040", + "matrix_pins": { + "cols": ["GP8", "GP7", "GP6", "GP5", "GP4", "GP3"], + "rows": ["GP26", "GP18", "GP20", "GP19", "GP10"] + }, + "diode_direction": "COL2ROW", + "backlight": { + "pin": "GP9", + "driver": "software" + } +} diff --git a/keyboards/40percentclub/gherkin/kb2040/rules.mk b/keyboards/40percentclub/gherkin/kb2040/rules.mk deleted file mode 100644 index 982c5817025..00000000000 --- a/keyboards/40percentclub/gherkin/kb2040/rules.mk +++ /dev/null @@ -1 +0,0 @@ -CONVERT_TO = kb2040 diff --git a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c index f4d3032857c..420890a1083 100644 --- a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c +++ b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c @@ -50,26 +50,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - -void keyboard_pre_init_user(void) { - // Call the keyboard pre init code. - - // Set our LED pins as output - setPinOutput(D5); - setPinOutput(B0); -} - -bool led_update_user(led_t led_state) { - if (led_state.num_lock) { - writePinLow(D5); - } else { - writePinHigh(D5); - } - - if (led_state.caps_lock) { - writePinLow(B0); - } else { - writePinHigh(B0); - } - return false; -} diff --git a/keyboards/40percentclub/gherkin/pro_micro/keyboard.json b/keyboards/40percentclub/gherkin/pro_micro/keyboard.json new file mode 100644 index 00000000000..882ea8f72b2 --- /dev/null +++ b/keyboards/40percentclub/gherkin/pro_micro/keyboard.json @@ -0,0 +1,16 @@ +{ + "development_board": "promicro", + "matrix_pins": { + "cols": ["B4", "E6", "D7", "C6", "D4", "D0"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", + "indicators": { + "num_lock": "D5", + "caps_lock": "B0", + "on_state": 0 + }, + "backlight": { + "pin": "B5" + } +} diff --git a/keyboards/40percentclub/gherkin/rules.mk b/keyboards/40percentclub/gherkin/rules.mk deleted file mode 100644 index e47c1c65726..00000000000 --- a/keyboards/40percentclub/gherkin/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no - -# Disable unsupported hardware -RGBLIGHT_SUPPORTED = no -AUDIO_SUPPORTED = no From 05731202a2e26682b3601ae0812e18b4e2c9d694 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Apr 2024 01:37:11 +1100 Subject: [PATCH 11/40] 0xcb/splaytoraid: remove `CONVERT_TO` at keyboard level (#23395) --- keyboards/0xcb/splaytoraid/32u4/keyboard.json | 27 +++++++++++++ keyboards/0xcb/splaytoraid/32u4/rules.mk | 0 keyboards/0xcb/splaytoraid/info.json | 27 +------------ .../rp2040_ce/{info.json => keyboard.json} | 38 ++++++++++++++----- keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk | 1 - 5 files changed, 57 insertions(+), 36 deletions(-) create mode 100644 keyboards/0xcb/splaytoraid/32u4/keyboard.json delete mode 100644 keyboards/0xcb/splaytoraid/32u4/rules.mk rename keyboards/0xcb/splaytoraid/rp2040_ce/{info.json => keyboard.json} (50%) delete mode 100644 keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk diff --git a/keyboards/0xcb/splaytoraid/32u4/keyboard.json b/keyboards/0xcb/splaytoraid/32u4/keyboard.json new file mode 100644 index 00000000000..7c3f0590a6f --- /dev/null +++ b/keyboards/0xcb/splaytoraid/32u4/keyboard.json @@ -0,0 +1,27 @@ +{ + "development_board": "promicro", + "bootloader": "qmk-dfu", + "matrix_pins": { + "cols": ["F5", "F6", "F7", "F4", "B3", "B1", "B2"], + "rows": ["D3", "D2", "D1", "D4", "D7", "E6", "B4", "C6"] + }, + "diode_direction": "COL2ROW", + "rgb_matrix": { + "animations": { + "band_sat": true, + "band_spiral_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "raindrops": true + } + }, + "encoder": { + "rotary": [ + {"pin_a": "B5", "pin_b": "B6"} + ] + }, + "ws2812": { + "pin": "D0" + } +} diff --git a/keyboards/0xcb/splaytoraid/32u4/rules.mk b/keyboards/0xcb/splaytoraid/32u4/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/0xcb/splaytoraid/info.json b/keyboards/0xcb/splaytoraid/info.json index 1d47f7d77ca..8c32b0dc115 100644 --- a/keyboards/0xcb/splaytoraid/info.json +++ b/keyboards/0xcb/splaytoraid/info.json @@ -3,13 +3,6 @@ "keyboard_name": "splaytoraid", "maintainer": "freya-irl", "url": "https://github.com/freya-irl/splaytoraid40", - "development_board": "promicro", - "bootloader": "qmk-dfu", - "diode_direction": "COL2ROW", - "matrix_pins": { - "cols": ["F5", "F6", "F7", "F4", "B3", "B1", "B2"], - "rows": ["D3", "D2", "D1", "D4", "D7", "E6", "B4", "C6"] - }, "usb": { "device_version": "1.0.0", "pid": "0xCB00", @@ -21,7 +14,8 @@ "bootmagic": true, "console": true, "mousekey": true, - "nkro": true + "nkro": true, + "encoder": true }, "bootmagic": { "matrix": [1, 0] @@ -29,21 +23,7 @@ "build": { "lto": true }, - "encoder": { - "enabled": true, - "rotary": [ - {"pin_a": "B5", "pin_b": "B6", "resolution": 4} - ] - }, "rgb_matrix": { - "animations": { - "breathing": true, - "band_sat": true, - "band_spiral_val": true, - "cycle_all": true, - "raindrops": true, - "cycle_left_right": true - }, "default": { "animation": "breathing", "hue": 152, @@ -73,9 +53,6 @@ ], "max_brightness": 200 }, - "ws2812": { - "pin": "D0" - }, "layouts": { "LAYOUT_36": { "layout": [ diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/info.json b/keyboards/0xcb/splaytoraid/rp2040_ce/keyboard.json similarity index 50% rename from keyboards/0xcb/splaytoraid/rp2040_ce/info.json rename to keyboards/0xcb/splaytoraid/rp2040_ce/keyboard.json index 49256b64827..b5a4f95c692 100644 --- a/keyboards/0xcb/splaytoraid/rp2040_ce/info.json +++ b/keyboards/0xcb/splaytoraid/rp2040_ce/keyboard.json @@ -1,26 +1,44 @@ { + "development_board": "promicro_rp2040", + "matrix_pins": { + "cols": ["GP28", "GP27", "GP26", "GP29", "GP20", "GP22", "GP23"], + "rows": ["GP0", "GP1", "GP2", "GP4", "GP6", "GP7", "GP8", "GP5"] + }, + "diode_direction": "COL2ROW", "rgb_matrix": { "animations": { - "cycle_up_down": true, - "jellybean_raindrops": true, + "band_sat": true, + "band_spiral_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, "cycle_out_in": true, "cycle_out_in_dual": true, - "pixel_fractal": true, - "rainbow_moving_chevron": true, "cycle_pinwheel": true, - "pixel_rain": true, + "cycle_up_down": true, + "digital_rain": true, "dual_beacon": true, "hue_breathing": true, - "typing_heatmap": true, - "digital_rain": true, - "solid_reactive_simple": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_moving_chevron": true, + "raindrops": true, "solid_reactive": true, + "solid_reactive_simple": true, + "solid_splash": true, "splash": true, - "multisplash": true, - "solid_splash": true + "typing_heatmap": true } }, + "encoder": { + "rotary": [ + {"pin_a": "GP9", "pin_b": "GP21"} + ] + }, "ws2812": { + "pin": "GP3", "driver": "vendor" } } diff --git a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk b/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk deleted file mode 100644 index 9617c1460ea..00000000000 --- a/keyboards/0xcb/splaytoraid/rp2040_ce/rules.mk +++ /dev/null @@ -1 +0,0 @@ -CONVERT_TO = rp2040_ce From b108524314047b947031d1cb688e2a378cf586c7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Apr 2024 02:05:32 +1100 Subject: [PATCH 12/40] merge/um80: remove pointless empty layers (#23398) --- keyboards/merge/um80/keymaps/default/keymap.c | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/keyboards/merge/um80/keymaps/default/keymap.c b/keyboards/merge/um80/keymaps/default/keymap.c index 04dea2c1be2..cfd628e300d 100644 --- a/keyboards/merge/um80/keymaps/default/keymap.c +++ b/keyboards/merge/um80/keymaps/default/keymap.c @@ -41,31 +41,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_1, 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_PGUP, KC_2, 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_PGDN, KC_3, KC_LSFT, 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_4, KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT -), - -[1] = LAYOUT_rspace_split_bksp( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -), -[2] = LAYOUT_rspace_split_bksp( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS -), -[3] = LAYOUT_rspace_split_bksp( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_4, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), }; From 63bc7b63a650c4da63611900437e06ea7d051f14 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:45:44 -0700 Subject: [PATCH 13/40] Data-Driven Keyboard Conversions: A (#23379) --- keyboards/abacus/config.h | 39 ------------------ keyboards/abacus/keyboard.json | 6 +++ keyboards/abstract/ellipse/rev1/config.h | 39 ------------------ keyboards/abstract/ellipse/rev1/keyboard.json | 6 +++ keyboards/acekeyboard/titan60/config.h | 23 ----------- keyboards/acekeyboard/titan60/keyboard.json | 6 +++ keyboards/acheron/apollo/87h/delta/config.h | 5 --- .../acheron/apollo/87h/delta/keyboard.json | 6 +++ keyboards/acheron/apollo/87h/gamma/config.h | 5 --- .../87h/gamma/{info.json => keyboard.json} | 17 +++++++- keyboards/acheron/apollo/87h/gamma/rules.mk | 15 ------- keyboards/acheron/apollo/87htsc/config.h | 5 --- keyboards/acheron/apollo/87htsc/keyboard.json | 6 +++ keyboards/acheron/apollo/88htsc/config.h | 5 --- keyboards/acheron/apollo/88htsc/keyboard.json | 6 +++ keyboards/acheron/arctic/config.h | 39 ------------------ keyboards/acheron/arctic/keyboard.json | 6 +++ keyboards/acheron/athena/alpha/config.h | 3 -- keyboards/acheron/athena/alpha/keyboard.json | 6 +++ keyboards/acheron/athena/beta/config.h | 3 -- keyboards/acheron/athena/beta/keyboard.json | 6 +++ keyboards/acheron/austin/config.h | 5 --- keyboards/acheron/austin/keyboard.json | 6 +++ keyboards/acheron/elongate/beta/config.h | 39 ------------------ keyboards/acheron/elongate/beta/keyboard.json | 6 +++ keyboards/acheron/elongate/delta/config.h | 5 --- .../acheron/elongate/delta/keyboard.json | 6 +++ keyboards/acheron/keebspcb/config.h | 39 ------------------ keyboards/acheron/keebspcb/keyboard.json | 6 +++ keyboards/acheron/lasgweloth/config.h | 39 ------------------ keyboards/acheron/lasgweloth/keyboard.json | 6 +++ keyboards/acheron/shark/alpha/config.h | 5 --- keyboards/acheron/shark/alpha/info.json | 14 +++++++ keyboards/acheron/shark/alpha/rules.mk | 14 ------- keyboards/acheron/shark/beta/config.h | 3 -- keyboards/acheron/shark/beta/keyboard.json | 6 +++ keyboards/acheron/themis/87h/config.h | 3 -- keyboards/acheron/themis/87h/keyboard.json | 6 +++ keyboards/acheron/themis/87htsc/config.h | 3 -- keyboards/acheron/themis/87htsc/keyboard.json | 6 +++ keyboards/acheron/themis/88htsc/config.h | 3 -- keyboards/acheron/themis/88htsc/keyboard.json | 6 +++ keyboards/ada/infinity81/config.h | 25 ------------ keyboards/ada/infinity81/keyboard.json | 6 +++ keyboards/adafruit/macropad/info.json | 10 +++++ keyboards/adafruit/macropad/rules.mk | 15 ------- keyboards/adelheid/config.h | 39 ------------------ keyboards/adelheid/keyboard.json | 6 +++ keyboards/adkb96/rev1/config.h | 40 ------------------- .../adkb96/{info.json => rev1/keyboard.json} | 14 +++++++ keyboards/adkb96/rev1/rules.mk | 0 keyboards/adkb96/rules.mk | 15 ------- keyboards/aeboards/aegis/config.h | 23 ----------- keyboards/aeboards/aegis/keyboard.json | 6 +++ .../aeboards/constellation/rev1/config.h | 24 ----------- .../rev1/{info.json => keyboard.json} | 17 ++++++++ .../aeboards/constellation/rev1/rules.mk | 12 ------ .../aeboards/constellation/rev2/config.h | 6 --- .../rev2/{info.json => keyboard.json} | 13 ++++++ .../aeboards/constellation/rev2/rules.mk | 11 ----- .../aeboards/constellation/rev3/config.h | 24 ----------- .../rev3/{info.json => keyboard.json} | 17 ++++++++ .../aeboards/constellation/rev3/rules.mk | 12 ------ .../ext65/rev1/{info.json => keyboard.json} | 6 +++ keyboards/aeboards/ext65/rev1/rules.mk | 11 ----- .../ext65/rev2/{info.json => keyboard.json} | 10 +++++ keyboards/aeboards/ext65/rev2/rules.mk | 14 ------- keyboards/aeboards/ext65/rev3/info.json | 9 +++++ keyboards/aeboards/ext65/rev3/rules.mk | 12 ------ keyboards/aeboards/satellite/rev1/info.json | 10 +++++ keyboards/aeboards/satellite/rev1/rules.mk | 15 ------- .../breeze/rev0/{info.json => keyboard.json} | 7 ++++ keyboards/afternoonlabs/breeze/rev0/rules.mk | 13 ------ .../breeze/rev1/{info.json => keyboard.json} | 7 ++++ keyboards/afternoonlabs/breeze/rev1/rules.mk | 13 ------ .../rev1/{info.json => keyboard.json} | 7 ++++ .../afternoonlabs/oceanbreeze/rev1/rules.mk | 13 ------ .../rev1/{info.json => keyboard.json} | 7 ++++ .../southern_breeze/rev1/rules.mk | 13 ------ .../rev1/{info.json => keyboard.json} | 7 ++++ .../afternoonlabs/summer_breeze/rev1/rules.mk | 13 ------ keyboards/ai03/andromeda/config.h | 23 ----------- keyboards/ai03/andromeda/keyboard.json | 6 +++ keyboards/ai03/equinox/config.h | 39 ------------------ keyboards/ai03/equinox/info.json | 6 +++ keyboards/ai03/jp60/config.h | 39 ------------------ keyboards/ai03/jp60/keyboard.json | 6 +++ keyboards/ai03/lunar/config.h | 39 ------------------ keyboards/ai03/lunar/keyboard.json | 6 +++ keyboards/ai03/lunar_ii/config.h | 5 --- keyboards/ai03/lunar_ii/info.json | 14 +++++++ keyboards/ai03/lunar_ii/rules.mk | 14 ------- keyboards/ai03/orbit/config.h | 5 --- .../ai03/orbit/{info.json => keyboard.json} | 14 +++++++ keyboards/ai03/orbit/rules.mk | 13 ------ keyboards/ai03/orbit_x/config.h | 5 --- .../ai03/orbit_x/{info.json => keyboard.json} | 14 +++++++ keyboards/ai03/orbit_x/rules.mk | 13 ------ keyboards/ai03/polaris/config.h | 39 ------------------ keyboards/ai03/polaris/keyboard.json | 6 +++ keyboards/ai03/quasar/config.h | 39 ------------------ keyboards/ai03/quasar/keyboard.json | 6 +++ keyboards/ai03/soyuz/config.h | 39 ------------------ keyboards/ai03/soyuz/keyboard.json | 6 +++ keyboards/ai03/vega/config.h | 40 ------------------- keyboards/ai03/vega/keyboard.json | 6 +++ keyboards/akb/raine/config.h | 22 ---------- keyboards/akb/raine/keyboard.json | 6 +++ .../device_one/{info.json => keyboard.json} | 6 +++ keyboards/akegata_denki/device_one/rules.mk | 10 ----- keyboards/akko/5087/config.h | 5 --- keyboards/akko/5087/keyboard.json | 6 +++ keyboards/akko/5108/config.h | 5 --- keyboards/akko/5108/keyboard.json | 6 +++ keyboards/akko/acr87/config.h | 5 --- keyboards/akko/acr87/keyboard.json | 6 +++ keyboards/akko/top40/config.h | 5 --- keyboards/akko/top40/keyboard.json | 6 +++ keyboards/al1/config.h | 5 --- keyboards/al1/info.json | 14 +++++++ keyboards/al1/rules.mk | 13 ------ keyboards/alas/info.json | 7 ++++ keyboards/alas/rules.mk | 15 ------- .../zodiark/{info.json => keyboard.json} | 11 +++++ keyboards/aleblazer/zodiark/rules.mk | 16 -------- keyboards/alf/dc60/config.h | 39 ------------------ keyboards/alf/dc60/keyboard.json | 6 +++ keyboards/alf/x11/config.h | 39 ------------------ keyboards/alf/x11/keyboard.json | 6 +++ keyboards/alf/x2/config.h | 23 ----------- keyboards/alf/x2/keyboard.json | 6 +++ keyboards/aliceh66/pianoforte/config.h | 23 ----------- keyboards/aliceh66/pianoforte/info.json | 15 +++++++ keyboards/aliceh66/pianoforte/rules.mk | 14 ------- keyboards/aliceh66/pianoforte_hs/config.h | 23 ----------- keyboards/aliceh66/pianoforte_hs/info.json | 15 +++++++ keyboards/aliceh66/pianoforte_hs/rules.mk | 14 ------- keyboards/alpha/config.h | 7 ---- keyboards/alpha/keyboard.json | 6 +++ keyboards/alpine65/config.h | 39 ------------------ keyboards/alpine65/keyboard.json | 6 +++ keyboards/alps64/config.h | 39 ------------------ keyboards/alps64/keyboard.json | 6 +++ keyboards/alt34/rev1/config.h | 5 --- .../alt34/rev1/{info.json => keyboard.json} | 14 +++++++ keyboards/alt34/rev1/rules.mk | 14 ------- keyboards/amag23/config.h | 21 ---------- keyboards/amag23/keyboard.json | 6 +++ keyboards/amjkeyboard/amj40/config.h | 39 ------------------ keyboards/amjkeyboard/amj40/keyboard.json | 6 +++ keyboards/amjkeyboard/amj60/config.h | 39 ------------------ keyboards/amjkeyboard/amj60/keyboard.json | 6 +++ keyboards/amjkeyboard/amj66/config.h | 24 ----------- keyboards/amjkeyboard/amj66/info.json | 14 +++++++ keyboards/amjkeyboard/amj66/rules.mk | 12 ------ keyboards/amjkeyboard/amj84/config.h | 25 ------------ keyboards/amjkeyboard/amj84/keyboard.json | 6 +++ keyboards/amjkeyboard/amj96/config.h | 5 --- keyboards/amjkeyboard/amj96/info.json | 14 +++++++ keyboards/amjkeyboard/amj96/rules.mk | 13 ------ keyboards/amjkeyboard/amjpad/config.h | 39 ------------------ keyboards/amjkeyboard/amjpad/keyboard.json | 6 +++ .../anavi/knob1/{info.json => keyboard.json} | 3 +- keyboards/anavi/knob1/rules.mk | 1 - .../anavi/knobs3/{info.json => keyboard.json} | 3 +- keyboards/anavi/knobs3/rules.mk | 1 - keyboards/ano/config.h | 38 ------------------ keyboards/ano/keyboard.json | 6 ++- keyboards/anomalykb/a65i/config.h | 24 ----------- keyboards/anomalykb/a65i/keyboard.json | 6 +++ keyboards/aos/tkl/config.h | 22 ---------- keyboards/aos/tkl/keyboard.json | 6 +++ .../rev1/{info.json => keyboard.json} | 7 ++++ keyboards/arabica37/rev1/rules.mk | 14 ------- .../{info.json => keyboard.json} | 4 +- .../argo_works/ishi/80/mk0_avr_extra/rules.mk | 2 - keyboards/arisu/config.h | 39 ------------------ keyboards/arisu/keyboard.json | 6 +++ keyboards/ash1800/config.h | 39 ------------------ keyboards/ash1800/keyboard.json | 6 +++ keyboards/ash_xiix/config.h | 19 --------- keyboards/ash_xiix/keyboard.json | 6 +++ keyboards/ask55/config.h | 23 ----------- keyboards/ask55/keyboard.json | 6 +++ keyboards/at_at/660m/config.h | 6 --- .../at_at/660m/{info.json => keyboard.json} | 17 +++++++- keyboards/at_at/660m/rules.mk | 14 ------- keyboards/atlantis/ak81_ve/config.h | 6 --- keyboards/atlantis/ak81_ve/keyboard.json | 6 +++ .../ps17/{info.json => keyboard.json} | 3 ++ keyboards/atlantis/ps17/rules.mk | 1 - keyboards/atlas_65/config.h | 38 ------------------ keyboards/atlas_65/keyboard.json | 6 +++ keyboards/atomic/config.h | 39 ------------------ keyboards/atomic/keyboard.json | 6 +++ .../atreus/f103/{info.json => keyboard.json} | 5 ++- keyboards/atreus/f103/rules.mk | 2 - keyboards/atreus/feather/info.json | 4 ++ keyboards/atreus/feather/rules.mk | 6 --- keyboards/atreus62/config.h | 39 ------------------ keyboards/atreus62/keyboard.json | 6 +++ keyboards/atreyu/info.json | 8 ++++ keyboards/atreyu/rev1/config.h | 38 ------------------ keyboards/atreyu/rev1/keyboard.json | 6 +++ keyboards/atreyu/rev2/config.h | 38 ------------------ keyboards/atreyu/rev2/keyboard.json | 6 +++ keyboards/atreyu/rules.mk | 15 ------- keyboards/atset/at1/config.h | 21 ---------- keyboards/atset/at1/keyboard.json | 6 +++ keyboards/atset/at12/config.h | 21 ---------- keyboards/atset/at12/keyboard.json | 6 +++ keyboards/atset/at16/config.h | 21 ---------- keyboards/atset/at16/keyboard.json | 6 +++ keyboards/atset/at3/config.h | 21 ---------- keyboards/atset/at3/keyboard.json | 6 +++ keyboards/atset/at6/config.h | 21 ---------- keyboards/atset/at6/keyboard.json | 6 +++ keyboards/atset/at9/config.h | 21 ---------- keyboards/atset/at9/keyboard.json | 6 +++ keyboards/atxkb/1894/config.h | 39 ------------------ keyboards/atxkb/1894/keyboard.json | 6 +++ keyboards/aurora65/info.json | 7 ++++ keyboards/aurora65/rules.mk | 13 ------ .../avalanche/v1/{info.json => keyboard.json} | 7 ++++ keyboards/avalanche/v1/rules.mk | 14 ------- .../avalanche/v2/{info.json => keyboard.json} | 9 +++++ keyboards/avalanche/v2/rules.mk | 15 ------- .../avalanche/v3/{info.json => keyboard.json} | 8 ++++ keyboards/avalanche/v3/rules.mk | 15 ------- .../avalanche/v4/{info.json => keyboard.json} | 9 +++++ keyboards/avalanche/v4/rules.mk | 16 -------- keyboards/aves60/config.h | 25 ------------ keyboards/aves60/keyboard.json | 6 +++ keyboards/aves65/config.h | 23 ----------- keyboards/aves65/keyboard.json | 6 +++ keyboards/axolstudio/helpo/info.json | 5 +++ keyboards/axolstudio/helpo/rules.mk | 13 ------ keyboards/aya/{info.json => keyboard.json} | 9 +++++ keyboards/aya/rules.mk | 13 ------ 239 files changed, 827 insertions(+), 2434 deletions(-) delete mode 100644 keyboards/abacus/config.h delete mode 100644 keyboards/abstract/ellipse/rev1/config.h delete mode 100644 keyboards/acekeyboard/titan60/config.h rename keyboards/acheron/apollo/87h/gamma/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/acheron/apollo/87h/gamma/rules.mk delete mode 100644 keyboards/acheron/arctic/config.h delete mode 100644 keyboards/acheron/elongate/beta/config.h delete mode 100644 keyboards/acheron/keebspcb/config.h delete mode 100644 keyboards/acheron/lasgweloth/config.h delete mode 100644 keyboards/ada/infinity81/config.h delete mode 100644 keyboards/adelheid/config.h delete mode 100644 keyboards/adkb96/rev1/config.h rename keyboards/adkb96/{info.json => rev1/keyboard.json} (95%) delete mode 100644 keyboards/adkb96/rev1/rules.mk delete mode 100644 keyboards/aeboards/aegis/config.h delete mode 100755 keyboards/aeboards/constellation/rev1/config.h rename keyboards/aeboards/constellation/rev1/{info.json => keyboard.json} (96%) delete mode 100755 keyboards/aeboards/constellation/rev1/rules.mk rename keyboards/aeboards/constellation/rev2/{info.json => keyboard.json} (97%) delete mode 100755 keyboards/aeboards/constellation/rev2/rules.mk delete mode 100755 keyboards/aeboards/constellation/rev3/config.h rename keyboards/aeboards/constellation/rev3/{info.json => keyboard.json} (96%) delete mode 100755 keyboards/aeboards/constellation/rev3/rules.mk rename keyboards/aeboards/ext65/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/aeboards/ext65/rev1/rules.mk rename keyboards/aeboards/ext65/rev2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/aeboards/ext65/rev2/rules.mk rename keyboards/afternoonlabs/breeze/rev0/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/afternoonlabs/breeze/rev0/rules.mk rename keyboards/afternoonlabs/breeze/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/afternoonlabs/breeze/rev1/rules.mk rename keyboards/afternoonlabs/oceanbreeze/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk rename keyboards/afternoonlabs/southern_breeze/rev1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/afternoonlabs/southern_breeze/rev1/rules.mk rename keyboards/afternoonlabs/summer_breeze/rev1/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/afternoonlabs/summer_breeze/rev1/rules.mk delete mode 100644 keyboards/ai03/andromeda/config.h delete mode 100644 keyboards/ai03/equinox/config.h delete mode 100644 keyboards/ai03/jp60/config.h delete mode 100644 keyboards/ai03/lunar/config.h rename keyboards/ai03/orbit/{info.json => keyboard.json} (94%) delete mode 100644 keyboards/ai03/orbit/rules.mk rename keyboards/ai03/orbit_x/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/ai03/orbit_x/rules.mk delete mode 100644 keyboards/ai03/polaris/config.h delete mode 100644 keyboards/ai03/quasar/config.h delete mode 100644 keyboards/ai03/soyuz/config.h delete mode 100644 keyboards/ai03/vega/config.h delete mode 100644 keyboards/akb/raine/config.h rename keyboards/akegata_denki/device_one/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/akegata_denki/device_one/rules.mk rename keyboards/aleblazer/zodiark/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/aleblazer/zodiark/rules.mk delete mode 100644 keyboards/alf/dc60/config.h delete mode 100644 keyboards/alf/x11/config.h delete mode 100644 keyboards/alf/x2/config.h delete mode 100644 keyboards/aliceh66/pianoforte/config.h delete mode 100644 keyboards/aliceh66/pianoforte_hs/config.h delete mode 100755 keyboards/alpha/config.h delete mode 100644 keyboards/alpine65/config.h delete mode 100644 keyboards/alps64/config.h rename keyboards/alt34/rev1/{info.json => keyboard.json} (90%) delete mode 100644 keyboards/alt34/rev1/rules.mk delete mode 100644 keyboards/amag23/config.h delete mode 100755 keyboards/amjkeyboard/amj40/config.h delete mode 100644 keyboards/amjkeyboard/amj60/config.h delete mode 100644 keyboards/amjkeyboard/amj66/config.h delete mode 100644 keyboards/amjkeyboard/amj84/config.h delete mode 100644 keyboards/amjkeyboard/amjpad/config.h rename keyboards/anavi/knob1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/anavi/knob1/rules.mk rename keyboards/anavi/knobs3/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/anavi/knobs3/rules.mk delete mode 100644 keyboards/ano/config.h delete mode 100644 keyboards/anomalykb/a65i/config.h delete mode 100644 keyboards/aos/tkl/config.h rename keyboards/arabica37/rev1/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/arabica37/rev1/rules.mk rename keyboards/argo_works/ishi/80/mk0_avr_extra/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk delete mode 100644 keyboards/arisu/config.h delete mode 100644 keyboards/ash1800/config.h delete mode 100644 keyboards/ash_xiix/config.h delete mode 100644 keyboards/ask55/config.h rename keyboards/at_at/660m/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/at_at/660m/rules.mk rename keyboards/atlantis/ps17/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/atlantis/ps17/rules.mk delete mode 100644 keyboards/atlas_65/config.h delete mode 100644 keyboards/atomic/config.h rename keyboards/atreus/f103/{info.json => keyboard.json} (73%) delete mode 100644 keyboards/atreus/f103/rules.mk delete mode 100644 keyboards/atreus62/config.h create mode 100644 keyboards/atreyu/info.json delete mode 100644 keyboards/atreyu/rev1/config.h delete mode 100644 keyboards/atreyu/rev2/config.h delete mode 100644 keyboards/atset/at1/config.h delete mode 100644 keyboards/atset/at12/config.h delete mode 100644 keyboards/atset/at16/config.h delete mode 100644 keyboards/atset/at3/config.h delete mode 100644 keyboards/atset/at6/config.h delete mode 100644 keyboards/atset/at9/config.h delete mode 100644 keyboards/atxkb/1894/config.h rename keyboards/avalanche/v1/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/avalanche/v1/rules.mk rename keyboards/avalanche/v2/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/avalanche/v2/rules.mk rename keyboards/avalanche/v3/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/avalanche/v3/rules.mk rename keyboards/avalanche/v4/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/avalanche/v4/rules.mk delete mode 100644 keyboards/aves60/config.h delete mode 100644 keyboards/aves65/config.h rename keyboards/aya/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/aya/rules.mk diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h deleted file mode 100644 index 84e1acbb3c7..00000000000 --- a/keyboards/abacus/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 nickolaij - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/abacus/keyboard.json b/keyboards/abacus/keyboard.json index c34fb32c52f..9622089bbfb 100644 --- a/keyboards/abacus/keyboard.json +++ b/keyboards/abacus/keyboard.json @@ -22,6 +22,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "B5"], "rows": ["D3", "D2", "D4", "C6"] diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h deleted file mode 100644 index 81349657efa..00000000000 --- a/keyboards/abstract/ellipse/rev1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 AbstractKB - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/abstract/ellipse/rev1/keyboard.json b/keyboards/abstract/ellipse/rev1/keyboard.json index 31a17301a7a..8e38f29d56c 100644 --- a/keyboards/abstract/ellipse/rev1/keyboard.json +++ b/keyboards/abstract/ellipse/rev1/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "B6", "B5"], "rows": ["D3", "C7"] diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h deleted file mode 100644 index 2bcc184a309..00000000000 --- a/keyboards/acekeyboard/titan60/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 MechMerlin - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/acekeyboard/titan60/keyboard.json b/keyboards/acekeyboard/titan60/keyboard.json index 3111e1e9d7f..4446927ab8a 100644 --- a/keyboards/acekeyboard/titan60/keyboard.json +++ b/keyboards/acekeyboard/titan60/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "F0", "F1"] diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h index 17c09f0f576..cda883bd631 100644 --- a/keyboards/acheron/apollo/87h/delta/config.h +++ b/keyboards/acheron/apollo/87h/delta/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE #define WS2812_PWM_COMPLEMENTARY_OUTPUT diff --git a/keyboards/acheron/apollo/87h/delta/keyboard.json b/keyboards/acheron/apollo/87h/delta/keyboard.json index c2d5e206923..5d01c1b8f77 100644 --- a/keyboards/acheron/apollo/87h/delta/keyboard.json +++ b/keyboards/acheron/apollo/87h/delta/keyboard.json @@ -68,6 +68,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h index 42b27d55ba9..8870c3c9c99 100644 --- a/keyboards/acheron/apollo/87h/gamma/config.h +++ b/keyboards/acheron/apollo/87h/gamma/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE // RGB Matrix defines diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/keyboard.json similarity index 95% rename from keyboards/acheron/apollo/87h/gamma/info.json rename to keyboards/acheron/apollo/87h/gamma/keyboard.json index 150f838c89b..5c2087c968c 100644 --- a/keyboards/acheron/apollo/87h/gamma/info.json +++ b/keyboards/acheron/apollo/87h/gamma/keyboard.json @@ -2,7 +2,10 @@ "keyboard_name": "Apollo87H rev. Gamma", "usb": { "pid": "0x8774", - "device_version": "0.0.3" + "device_version": "0.0.3", + "shared_endpoint": { + "keyboard": true + } }, "rgb_matrix": { "animations": { @@ -57,6 +60,18 @@ "driver": "is31fl3741", "sleep": true }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "rgb_matrix": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "A15", "A10", "A8", "B14", "B12", "B10", "B1", "B0", "A7", "A4", "A5", "A6", "C15", "A0", "A1"], "rows": ["C14", "C13", "B9", "B4", "A3", "A2"] diff --git a/keyboards/acheron/apollo/87h/gamma/rules.mk b/keyboards/acheron/apollo/87h/gamma/rules.mk deleted file mode 100644 index 4af646ec021..00000000000 --- a/keyboards/acheron/apollo/87h/gamma/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes -KEYBOARD_SHARED_EP = yes - diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h index 17c09f0f576..cda883bd631 100644 --- a/keyboards/acheron/apollo/87htsc/config.h +++ b/keyboards/acheron/apollo/87htsc/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE #define WS2812_PWM_COMPLEMENTARY_OUTPUT diff --git a/keyboards/acheron/apollo/87htsc/keyboard.json b/keyboards/acheron/apollo/87htsc/keyboard.json index 5f7d30e65a3..55229706b1d 100644 --- a/keyboards/acheron/apollo/87htsc/keyboard.json +++ b/keyboards/acheron/apollo/87htsc/keyboard.json @@ -72,6 +72,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h index 17c09f0f576..cda883bd631 100644 --- a/keyboards/acheron/apollo/88htsc/config.h +++ b/keyboards/acheron/apollo/88htsc/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE #define WS2812_PWM_COMPLEMENTARY_OUTPUT diff --git a/keyboards/acheron/apollo/88htsc/keyboard.json b/keyboards/acheron/apollo/88htsc/keyboard.json index e29300019ca..9b9482874f6 100644 --- a/keyboards/acheron/apollo/88htsc/keyboard.json +++ b/keyboards/acheron/apollo/88htsc/keyboard.json @@ -72,6 +72,12 @@ "nkro": false, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"], "rows": ["B3", "D2", "C12", "A6", "A5", "A4"] diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h deleted file mode 100644 index f608132b5af..00000000000 --- a/keyboards/acheron/arctic/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Álvaro "Gondolindrim" Volpato - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/acheron/arctic/keyboard.json b/keyboards/acheron/arctic/keyboard.json index e8c9e92f61c..cc686be5fa2 100644 --- a/keyboards/acheron/arctic/keyboard.json +++ b/keyboards/acheron/arctic/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8"], "rows": ["B7", "B6", "A6", "A7", "B1"] diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h index c9f1d29f24b..b1264c3fa54 100644 --- a/keyboards/acheron/athena/alpha/config.h +++ b/keyboards/acheron/athena/alpha/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 diff --git a/keyboards/acheron/athena/alpha/keyboard.json b/keyboards/acheron/athena/alpha/keyboard.json index 8570fa12748..7e29cdc0372 100644 --- a/keyboards/acheron/athena/alpha/keyboard.json +++ b/keyboards/acheron/athena/alpha/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A8", "B14", "B12", "B10", "B1", "B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A7", "B4", "B3", "A15"], "rows": ["B9", "C13", "B8", "B5", "A14", "C14"] diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h index b2a8d2edf89..79add9aedcb 100644 --- a/keyboards/acheron/athena/beta/config.h +++ b/keyboards/acheron/athena/beta/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define BACKLIGHT_PWM_DRIVER PWMD3 #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+5 diff --git a/keyboards/acheron/athena/beta/keyboard.json b/keyboards/acheron/athena/beta/keyboard.json index 21aa189470e..ba96b201515 100644 --- a/keyboards/acheron/athena/beta/keyboard.json +++ b/keyboards/acheron/athena/beta/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "C6", "B14", "B12", "B10", "B1", "C4", "A7", "A6", "A5", "A4", "A3", "A2", "C5", "A10", "A8", "C9"], "rows": ["C11", "C12", "C10", "A15", "C0", "A1"] diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h index a47b76953a2..974ecf1c6c0 100644 --- a/keyboards/acheron/austin/config.h +++ b/keyboards/acheron/austin/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/acheron/austin/keyboard.json b/keyboards/acheron/austin/keyboard.json index 6c467a7da05..bee675472c9 100755 --- a/keyboards/acheron/austin/keyboard.json +++ b/keyboards/acheron/austin/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A5", "A15", "B3", "B4", "B5", "B8", "A3", "C15", "C14", "F1"], "rows": ["C13", "A4", "A7", "B0", "B1", "B2"] diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h deleted file mode 100644 index 62093e37b23..00000000000 --- a/keyboards/acheron/elongate/beta/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Gondolindrim - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/acheron/elongate/beta/keyboard.json b/keyboards/acheron/elongate/beta/keyboard.json index 80c984caab6..d15f1789911 100644 --- a/keyboards/acheron/elongate/beta/keyboard.json +++ b/keyboards/acheron/elongate/beta/keyboard.json @@ -41,6 +41,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F4", "F1", "F0", "B2", "B1", "C6", "B0", "B3", "E6", "D4", "B4"], "rows": ["D3", "B7", "D5", "B5", "D6"] diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h index 81342ef26dc..09ccd741640 100755 --- a/keyboards/acheron/elongate/delta/config.h +++ b/keyboards/acheron/elongate/delta/config.h @@ -23,11 +23,6 @@ along with this program. If not, see . #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5) -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - // Elongate has six indicator LEDs. These def's are the indicator pin defs. The LEDs are distributed in two clusters: one next to the numpad and another between spacebars; LEDs are numbered top-to-bottom. #define LED1_PIN A2 diff --git a/keyboards/acheron/elongate/delta/keyboard.json b/keyboards/acheron/elongate/delta/keyboard.json index 33fc5b55ddd..1c6d0927d63 100644 --- a/keyboards/acheron/elongate/delta/keyboard.json +++ b/keyboards/acheron/elongate/delta/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B14", "B12", "B11", "B10", "B2", "B1", "A7", "A5", "B9", "B8", "B7", "B6"], "rows": ["B3", "A15", "B0", "B4", "B5"] diff --git a/keyboards/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h deleted file mode 100644 index 4b007cf387e..00000000000 --- a/keyboards/acheron/keebspcb/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Jun Wako - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/acheron/keebspcb/keyboard.json b/keyboards/acheron/keebspcb/keyboard.json index 1017cf47ecf..a4815e10143 100644 --- a/keyboards/acheron/keebspcb/keyboard.json +++ b/keyboards/acheron/keebspcb/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B12", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B6", "B5"], "rows": ["B4", "B3", "A2", "A3", "A4"] diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h deleted file mode 100644 index f608132b5af..00000000000 --- a/keyboards/acheron/lasgweloth/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Álvaro "Gondolindrim" Volpato - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/acheron/lasgweloth/keyboard.json b/keyboards/acheron/lasgweloth/keyboard.json index ccdf9d6f302..35d30e89b26 100644 --- a/keyboards/acheron/lasgweloth/keyboard.json +++ b/keyboards/acheron/lasgweloth/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B12", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5", "A4", "B7"], "rows": ["B9", "B8", "A3", "B0", "B1"] diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h index a34ea41cffb..0786a3ac0e6 100644 --- a/keyboards/acheron/shark/alpha/config.h +++ b/keyboards/acheron/shark/alpha/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD3 -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json index 5250da47276..f88c312a255 100644 --- a/keyboards/acheron/shark/alpha/info.json +++ b/keyboards/acheron/shark/alpha/info.json @@ -6,6 +6,20 @@ "pid": "0x5368", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "encoder": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "B12", "A1", "A7", "A5", "A4", "A3", "A2", "A0", "C15", "C14", "C13"], "rows": ["B4", "A15", "B10", "B2"] diff --git a/keyboards/acheron/shark/alpha/rules.mk b/keyboards/acheron/shark/alpha/rules.mk index 27db06a0448..16051206467 100644 --- a/keyboards/acheron/shark/alpha/rules.mk +++ b/keyboards/acheron/shark/alpha/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h index 1182d39d3b5..4e1b46d085c 100644 --- a/keyboards/acheron/shark/beta/config.h +++ b/keyboards/acheron/shark/beta/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 diff --git a/keyboards/acheron/shark/beta/keyboard.json b/keyboards/acheron/shark/beta/keyboard.json index 7f182068a0d..2433f61fecf 100644 --- a/keyboards/acheron/shark/beta/keyboard.json +++ b/keyboards/acheron/shark/beta/keyboard.json @@ -15,6 +15,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A5", "A10", "C13", "B9", "B8", "B5", "B4", "B3", "A15", "A0", "A1", "A2"], "rows": ["A8", "B14", "A4", "A3"] diff --git a/keyboards/acheron/themis/87h/config.h b/keyboards/acheron/themis/87h/config.h index fb2a5e1ed7f..ebe7e5398a5 100644 --- a/keyboards/acheron/themis/87h/config.h +++ b/keyboards/acheron/themis/87h/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define WS2812_PWM_COMPLEMENTARY_OUTPUT #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 diff --git a/keyboards/acheron/themis/87h/keyboard.json b/keyboards/acheron/themis/87h/keyboard.json index ce2037bfade..488cb324c16 100644 --- a/keyboards/acheron/themis/87h/keyboard.json +++ b/keyboards/acheron/themis/87h/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "eeprom": { "wear_leveling": { diff --git a/keyboards/acheron/themis/87htsc/config.h b/keyboards/acheron/themis/87htsc/config.h index fb2a5e1ed7f..ebe7e5398a5 100644 --- a/keyboards/acheron/themis/87htsc/config.h +++ b/keyboards/acheron/themis/87htsc/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define WS2812_PWM_COMPLEMENTARY_OUTPUT #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 diff --git a/keyboards/acheron/themis/87htsc/keyboard.json b/keyboards/acheron/themis/87htsc/keyboard.json index eaf8a323abb..46cdb092475 100644 --- a/keyboards/acheron/themis/87htsc/keyboard.json +++ b/keyboards/acheron/themis/87htsc/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "eeprom": { "wear_leveling": { diff --git a/keyboards/acheron/themis/88htsc/config.h b/keyboards/acheron/themis/88htsc/config.h index fb2a5e1ed7f..ebe7e5398a5 100644 --- a/keyboards/acheron/themis/88htsc/config.h +++ b/keyboards/acheron/themis/88htsc/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - #define WS2812_PWM_COMPLEMENTARY_OUTPUT #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 diff --git a/keyboards/acheron/themis/88htsc/keyboard.json b/keyboards/acheron/themis/88htsc/keyboard.json index f8e65afbade..1e193d2661b 100644 --- a/keyboards/acheron/themis/88htsc/keyboard.json +++ b/keyboards/acheron/themis/88htsc/keyboard.json @@ -19,6 +19,12 @@ "rgblight": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "diode_direction": "COL2ROW", "eeprom": { "wear_leveling": { diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h deleted file mode 100644 index 86415b251a0..00000000000 --- a/keyboards/ada/infinity81/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2022 peepeetee (@peepeetee) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ada/infinity81/keyboard.json b/keyboards/ada/infinity81/keyboard.json index 934bd6fca2c..40c5bd2f180 100644 --- a/keyboards/ada/infinity81/keyboard.json +++ b/keyboards/ada/infinity81/keyboard.json @@ -38,6 +38,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F1", "F4"], "rows": ["B3", "B2", "B1", "B0", "F6", "B7"] diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json index 295af783398..86601c0167f 100644 --- a/keyboards/adafruit/macropad/info.json +++ b/keyboards/adafruit/macropad/info.json @@ -8,6 +8,16 @@ "pid": "0x0108", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true, + "audio": true, + "encoder": true, + "rgb_matrix": true, + "oled": true + }, "audio": { "power_control": { "pin": "GP14" diff --git a/keyboards/adafruit/macropad/rules.mk b/keyboards/adafruit/macropad/rules.mk index a84e29da3d1..1630b74ceae 100644 --- a/keyboards/adafruit/macropad/rules.mk +++ b/keyboards/adafruit/macropad/rules.mk @@ -1,17 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output AUDIO_DRIVER = pwm_hardware -ENCODER_ENABLE = yes -RGB_MATRIX_ENABLE = yes -OLED_ENABLE = yes OLED_TRANSPORT = spi diff --git a/keyboards/adelheid/config.h b/keyboards/adelheid/config.h deleted file mode 100644 index db23a531199..00000000000 --- a/keyboards/adelheid/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 floookay - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/adelheid/keyboard.json b/keyboards/adelheid/keyboard.json index e066e5d5f18..7766a44a8d5 100644 --- a/keyboards/adelheid/keyboard.json +++ b/keyboards/adelheid/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "F6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "F4", "D1", "D2", "D3", "D5", "F7"] diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h deleted file mode 100644 index 0b8941e7760..00000000000 --- a/keyboards/adkb96/rev1/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -// #define NO_DEBUG - -/* disable print */ -// #define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/adkb96/info.json b/keyboards/adkb96/rev1/keyboard.json similarity index 95% rename from keyboards/adkb96/info.json rename to keyboards/adkb96/rev1/keyboard.json index aa7e5a6921e..77f9177555a 100644 --- a/keyboards/adkb96/info.json +++ b/keyboards/adkb96/rev1/keyboard.json @@ -8,12 +8,26 @@ "pid": "0xAD96", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "command": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, "tapping": { diff --git a/keyboards/adkb96/rev1/rules.mk b/keyboards/adkb96/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/adkb96/rules.mk b/keyboards/adkb96/rules.mk index 2b74eb41834..ac7561b21dd 100644 --- a/keyboards/adkb96/rules.mk +++ b/keyboards/adkb96/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = adkb96/rev1 diff --git a/keyboards/aeboards/aegis/config.h b/keyboards/aeboards/aegis/config.h deleted file mode 100644 index 8606067a4cf..00000000000 --- a/keyboards/aeboards/aegis/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2018 Jason Williams (Wilba) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/aeboards/aegis/keyboard.json b/keyboards/aeboards/aegis/keyboard.json index 26414ba55a3..26f5f2a0c1c 100644 --- a/keyboards/aeboards/aegis/keyboard.json +++ b/keyboards/aeboards/aegis/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "C6", "B7", "D2", "D3", "B3", "B2", "B1", "B0"], "rows": ["F5", "F6", "E6", "F7", "D1", "D0", "D6", "D4", "B4", "D7", "B6", "B5"] diff --git a/keyboards/aeboards/constellation/rev1/config.h b/keyboards/aeboards/constellation/rev1/config.h deleted file mode 100755 index 01155887a5e..00000000000 --- a/keyboards/aeboards/constellation/rev1/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2018 Jason Williams (Wilba) - * Copyright 2021 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/aeboards/constellation/rev1/info.json b/keyboards/aeboards/constellation/rev1/keyboard.json similarity index 96% rename from keyboards/aeboards/constellation/rev1/info.json rename to keyboards/aeboards/constellation/rev1/keyboard.json index 9001eec1c5e..5a43568d57c 100644 --- a/keyboards/aeboards/constellation/rev1/info.json +++ b/keyboards/aeboards/constellation/rev1/keyboard.json @@ -8,6 +8,23 @@ "pid": "0x065C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, + "build": { + "lto": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B0", "B1", "F0", "F1", "F4"] diff --git a/keyboards/aeboards/constellation/rev1/rules.mk b/keyboards/aeboards/constellation/rev1/rules.mk deleted file mode 100755 index bc5a3a3498a..00000000000 --- a/keyboards/aeboards/constellation/rev1/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/aeboards/constellation/rev2/config.h b/keyboards/aeboards/constellation/rev2/config.h index f4b7be6bdf7..2091bab964c 100755 --- a/keyboards/aeboards/constellation/rev2/config.h +++ b/keyboards/aeboards/constellation/rev2/config.h @@ -16,12 +16,6 @@ #pragma once -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - // I2C setup #define I2C1_SCL_PIN B8 #define I2C1_SDA_PIN B9 diff --git a/keyboards/aeboards/constellation/rev2/info.json b/keyboards/aeboards/constellation/rev2/keyboard.json similarity index 97% rename from keyboards/aeboards/constellation/rev2/info.json rename to keyboards/aeboards/constellation/rev2/keyboard.json index b8dae5f20cf..f296b523e0b 100644 --- a/keyboards/aeboards/constellation/rev2/info.json +++ b/keyboards/aeboards/constellation/rev2/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x065C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B12", "A1", "H0", "C15", "C14", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3"], "rows": ["B15", "A14", "A2", "B13", "B14"] diff --git a/keyboards/aeboards/constellation/rev2/rules.mk b/keyboards/aeboards/constellation/rev2/rules.mk deleted file mode 100755 index c12086843f1..00000000000 --- a/keyboards/aeboards/constellation/rev2/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/aeboards/constellation/rev3/config.h b/keyboards/aeboards/constellation/rev3/config.h deleted file mode 100755 index 01155887a5e..00000000000 --- a/keyboards/aeboards/constellation/rev3/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2018 Jason Williams (Wilba) - * Copyright 2021 Harrison Chan (Xelus) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/aeboards/constellation/rev3/info.json b/keyboards/aeboards/constellation/rev3/keyboard.json similarity index 96% rename from keyboards/aeboards/constellation/rev3/info.json rename to keyboards/aeboards/constellation/rev3/keyboard.json index 6e38e99fe91..ab39641b74b 100644 --- a/keyboards/aeboards/constellation/rev3/info.json +++ b/keyboards/aeboards/constellation/rev3/keyboard.json @@ -8,6 +8,23 @@ "pid": "0x065D", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, + "build": { + "lto": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "D5", "B2", "B3", "D3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B0", "B1", "F0", "F1", "F4"] diff --git a/keyboards/aeboards/constellation/rev3/rules.mk b/keyboards/aeboards/constellation/rev3/rules.mk deleted file mode 100755 index bc5a3a3498a..00000000000 --- a/keyboards/aeboards/constellation/rev3/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/aeboards/ext65/rev1/info.json b/keyboards/aeboards/ext65/rev1/keyboard.json similarity index 97% rename from keyboards/aeboards/ext65/rev1/info.json rename to keyboards/aeboards/ext65/rev1/keyboard.json index 0e110e92357..c254a671421 100644 --- a/keyboards/aeboards/ext65/rev1/info.json +++ b/keyboards/aeboards/ext65/rev1/keyboard.json @@ -7,6 +7,12 @@ "pid": "0xAE65", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", diff --git a/keyboards/aeboards/ext65/rev1/rules.mk b/keyboards/aeboards/ext65/rev1/rules.mk deleted file mode 100644 index 29eb5c8fbe8..00000000000 --- a/keyboards/aeboards/ext65/rev1/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/aeboards/ext65/rev2/info.json b/keyboards/aeboards/ext65/rev2/keyboard.json similarity index 96% rename from keyboards/aeboards/ext65/rev2/info.json rename to keyboards/aeboards/ext65/rev2/keyboard.json index ab229e19ec6..0ab50f92582 100644 --- a/keyboards/aeboards/ext65/rev2/info.json +++ b/keyboards/aeboards/ext65/rev2/keyboard.json @@ -7,6 +7,16 @@ "pid": "0xA652", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true, + "backlight": true, + "rgblight": true, + "sleep_led": true + }, "backlight": { "pin": "B5", "levels": 6, diff --git a/keyboards/aeboards/ext65/rev2/rules.mk b/keyboards/aeboards/ext65/rev2/rules.mk deleted file mode 100644 index b9637955ff7..00000000000 --- a/keyboards/aeboards/ext65/rev2/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SLEEP_LED_ENABLE = yes - diff --git a/keyboards/aeboards/ext65/rev3/info.json b/keyboards/aeboards/ext65/rev3/info.json index 0faf6fa135a..8c8051fc444 100644 --- a/keyboards/aeboards/ext65/rev3/info.json +++ b/keyboards/aeboards/ext65/rev3/info.json @@ -7,6 +7,15 @@ "pid": "0xA653", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, + "build": { + "lto": true + }, "indicators": { "caps_lock": "F4", "num_lock": "F5", diff --git a/keyboards/aeboards/ext65/rev3/rules.mk b/keyboards/aeboards/ext65/rev3/rules.mk index f1ec6515067..1716098b3e1 100644 --- a/keyboards/aeboards/ext65/rev3/rules.mk +++ b/keyboards/aeboards/ext65/rev3/rules.mk @@ -1,13 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output OPT = 3 -LTO_ENABLE = yes diff --git a/keyboards/aeboards/satellite/rev1/info.json b/keyboards/aeboards/satellite/rev1/info.json index 68256ed8699..8b90704efa4 100644 --- a/keyboards/aeboards/satellite/rev1/info.json +++ b/keyboards/aeboards/satellite/rev1/info.json @@ -8,6 +8,16 @@ "pid": "0x6553", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "lto": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/aeboards/satellite/rev1/rules.mk b/keyboards/aeboards/satellite/rev1/rules.mk index f95b0f015d7..7149ec106a1 100644 --- a/keyboards/aeboards/satellite/rev1/rules.mk +++ b/keyboards/aeboards/satellite/rev1/rules.mk @@ -1,18 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes - -RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects. - COMMON_VPATH += $(DRIVER_PATH)/issi # project specific files diff --git a/keyboards/afternoonlabs/breeze/rev0/info.json b/keyboards/afternoonlabs/breeze/rev0/keyboard.json similarity index 96% rename from keyboards/afternoonlabs/breeze/rev0/info.json rename to keyboards/afternoonlabs/breeze/rev0/keyboard.json index 0afb37957fe..f20f082ec96 100644 --- a/keyboards/afternoonlabs/breeze/rev0/info.json +++ b/keyboards/afternoonlabs/breeze/rev0/keyboard.json @@ -8,12 +8,19 @@ "pid": "0x0001", "device_version": "0.0.0" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "console": true + }, "matrix_pins": { "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "bootmagic": { diff --git a/keyboards/afternoonlabs/breeze/rev0/rules.mk b/keyboards/afternoonlabs/breeze/rev0/rules.mk deleted file mode 100644 index 7b63c0c2988..00000000000 --- a/keyboards/afternoonlabs/breeze/rev0/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes diff --git a/keyboards/afternoonlabs/breeze/rev1/info.json b/keyboards/afternoonlabs/breeze/rev1/keyboard.json similarity index 96% rename from keyboards/afternoonlabs/breeze/rev1/info.json rename to keyboards/afternoonlabs/breeze/rev1/keyboard.json index 21b6a7a4364..ccb13551c10 100644 --- a/keyboards/afternoonlabs/breeze/rev1/info.json +++ b/keyboards/afternoonlabs/breeze/rev1/keyboard.json @@ -8,12 +8,19 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true + }, "matrix_pins": { "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "bootmagic": { diff --git a/keyboards/afternoonlabs/breeze/rev1/rules.mk b/keyboards/afternoonlabs/breeze/rev1/rules.mk deleted file mode 100644 index 151c93f7796..00000000000 --- a/keyboards/afternoonlabs/breeze/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -SPLIT_KEYBOARD = yes -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json b/keyboards/afternoonlabs/oceanbreeze/rev1/keyboard.json similarity index 96% rename from keyboards/afternoonlabs/oceanbreeze/rev1/info.json rename to keyboards/afternoonlabs/oceanbreeze/rev1/keyboard.json index 44f7fa7006a..2a80a0bc2bd 100644 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json +++ b/keyboards/afternoonlabs/oceanbreeze/rev1/keyboard.json @@ -8,12 +8,19 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true + }, "matrix_pins": { "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1", "B6"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "bootmagic": { diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk b/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk deleted file mode 100644 index 904c6b60cbd..00000000000 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/info.json b/keyboards/afternoonlabs/southern_breeze/rev1/keyboard.json similarity index 96% rename from keyboards/afternoonlabs/southern_breeze/rev1/info.json rename to keyboards/afternoonlabs/southern_breeze/rev1/keyboard.json index c71feef8ba0..c4d38a7a69e 100644 --- a/keyboards/afternoonlabs/southern_breeze/rev1/info.json +++ b/keyboards/afternoonlabs/southern_breeze/rev1/keyboard.json @@ -8,12 +8,19 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "console": true + }, "matrix_pins": { "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "bootmagic": { diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk b/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk deleted file mode 100644 index 7b63c0c2988..00000000000 --- a/keyboards/afternoonlabs/southern_breeze/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/info.json b/keyboards/afternoonlabs/summer_breeze/rev1/keyboard.json similarity index 97% rename from keyboards/afternoonlabs/summer_breeze/rev1/info.json rename to keyboards/afternoonlabs/summer_breeze/rev1/keyboard.json index 4ec3db219cd..702a942a3cf 100644 --- a/keyboards/afternoonlabs/summer_breeze/rev1/info.json +++ b/keyboards/afternoonlabs/summer_breeze/rev1/keyboard.json @@ -8,12 +8,19 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": false, + "console": true + }, "matrix_pins": { "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "F7", "B1"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "bootmagic": { diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk b/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk deleted file mode 100644 index 7b63c0c2988..00000000000 --- a/keyboards/afternoonlabs/summer_breeze/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes diff --git a/keyboards/ai03/andromeda/config.h b/keyboards/ai03/andromeda/config.h deleted file mode 100644 index 056f54d5212..00000000000 --- a/keyboards/ai03/andromeda/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Andrew Kannan - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/ai03/andromeda/keyboard.json b/keyboards/ai03/andromeda/keyboard.json index 5a9bf32ef15..d085b91ad17 100644 --- a/keyboards/ai03/andromeda/keyboard.json +++ b/keyboards/ai03/andromeda/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "B5", "B8", "B9"], "rows": ["B4", "B3", "A15", "A3", "A4", "A5"] diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/ai03/equinox/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ai03/equinox/info.json b/keyboards/ai03/equinox/info.json index 2912f0c1d83..7c2cc465005 100644 --- a/keyboards/ai03/equinox/info.json +++ b/keyboards/ai03/equinox/info.json @@ -8,6 +8,12 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ai03/jp60/config.h b/keyboards/ai03/jp60/config.h deleted file mode 100644 index 9fe6627ecc1..00000000000 --- a/keyboards/ai03/jp60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 ai03 - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ai03/jp60/keyboard.json b/keyboards/ai03/jp60/keyboard.json index bc366e60e50..389993626d8 100644 --- a/keyboards/ai03/jp60/keyboard.json +++ b/keyboards/ai03/jp60/keyboard.json @@ -19,6 +19,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D1", "D3", "D5", "D4", "D6", "C6", "F0", "F1", "F4", "F5", "F6", "F7", "C7"], "rows": ["B6", "B5", "B4", "D7", "E6"] diff --git a/keyboards/ai03/lunar/config.h b/keyboards/ai03/lunar/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/ai03/lunar/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ai03/lunar/keyboard.json b/keyboards/ai03/lunar/keyboard.json index 8a5bc145765..00ff761d3f8 100644 --- a/keyboards/ai03/lunar/keyboard.json +++ b/keyboards/ai03/lunar/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B3", "D0", "D1", "D2", "D3"] diff --git a/keyboards/ai03/lunar_ii/config.h b/keyboards/ai03/lunar_ii/config.h index 1b02059356a..07dde6cb899 100644 --- a/keyboards/ai03/lunar_ii/config.h +++ b/keyboards/ai03/lunar_ii/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once - -/* Mechanical lock switch support */ -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE - /* Solenoid support */ #define SOLENOID_PIN B7 #define SOLENOID_DEFAULT_DWELL 15 diff --git a/keyboards/ai03/lunar_ii/info.json b/keyboards/ai03/lunar_ii/info.json index ee7f1527586..38729595a29 100644 --- a/keyboards/ai03/lunar_ii/info.json +++ b/keyboards/ai03/lunar_ii/info.json @@ -8,6 +8,20 @@ "pid": "0x0016", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true, + "haptic": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "diode_direction": "COL2ROW", diff --git a/keyboards/ai03/lunar_ii/rules.mk b/keyboards/ai03/lunar_ii/rules.mk index 7ad594e1f9f..a521203b326 100644 --- a/keyboards/ai03/lunar_ii/rules.mk +++ b/keyboards/ai03/lunar_ii/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -HAPTIC_ENABLE = yes # Enable solenoid support HAPTIC_DRIVER = solenoid diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h index 53a057875f9..f3a4ae2db34 100644 --- a/keyboards/ai03/orbit/config.h +++ b/keyboards/ai03/orbit/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D5 -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/keyboard.json similarity index 94% rename from keyboards/ai03/orbit/info.json rename to keyboards/ai03/orbit/keyboard.json index d7ff0b786cc..ec308028120 100644 --- a/keyboards/ai03/orbit/info.json +++ b/keyboards/ai03/orbit/keyboard.json @@ -8,6 +8,19 @@ "pid": "0x0003", "device_version": "0.0.3" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "backlight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "B4", "D7", "D6", "D4", "F1", "F0"], "rows": ["F7", "F6", "F5", "F4", "D3"] @@ -17,6 +30,7 @@ "pin": "B7" }, "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { diff --git a/keyboards/ai03/orbit/rules.mk b/keyboards/ai03/orbit/rules.mk deleted file mode 100644 index c95da2740d8..00000000000 --- a/keyboards/ai03/orbit/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes # Split keyboard flag disabled as manual edits had to be done to the split common files diff --git a/keyboards/ai03/orbit_x/config.h b/keyboards/ai03/orbit_x/config.h index 05d319d030a..2c63852cbeb 100644 --- a/keyboards/ai03/orbit_x/config.h +++ b/keyboards/ai03/orbit_x/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define SPLIT_USB_DETECT #define SPLIT_USB_TIMEOUT 2500 -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/keyboard.json similarity index 92% rename from keyboards/ai03/orbit_x/info.json rename to keyboards/ai03/orbit_x/keyboard.json index ebb11624fe2..edfbbb27969 100644 --- a/keyboards/ai03/orbit_x/info.json +++ b/keyboards/ai03/orbit_x/keyboard.json @@ -8,12 +8,26 @@ "pid": "0x0014", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F6", "B1", "B0", "C7", "C6"], "rows": ["D7", "D6", "D4", "F0"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0", "matrix_pins": { "right": { diff --git a/keyboards/ai03/orbit_x/rules.mk b/keyboards/ai03/orbit_x/rules.mk deleted file mode 100644 index 66711e46132..00000000000 --- a/keyboards/ai03/orbit_x/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes # Split keyboard diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/ai03/polaris/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ai03/polaris/keyboard.json b/keyboards/ai03/polaris/keyboard.json index 169118a0cf6..decedbab3df 100644 --- a/keyboards/ai03/polaris/keyboard.json +++ b/keyboards/ai03/polaris/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "F0", "F1"] diff --git a/keyboards/ai03/quasar/config.h b/keyboards/ai03/quasar/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/ai03/quasar/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ai03/quasar/keyboard.json b/keyboards/ai03/quasar/keyboard.json index b0514f9e9aa..52902e3067a 100644 --- a/keyboards/ai03/quasar/keyboard.json +++ b/keyboards/ai03/quasar/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B7", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4"], "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"] diff --git a/keyboards/ai03/soyuz/config.h b/keyboards/ai03/soyuz/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/ai03/soyuz/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ai03/soyuz/keyboard.json b/keyboards/ai03/soyuz/keyboard.json index 61e8375dd18..2abfbd5ead5 100644 --- a/keyboards/ai03/soyuz/keyboard.json +++ b/keyboards/ai03/soyuz/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "B3", "D7", "B5"], "rows": ["D4", "C6", "B6", "E6", "B4"] diff --git a/keyboards/ai03/vega/config.h b/keyboards/ai03/vega/config.h deleted file mode 100644 index b575a49f388..00000000000 --- a/keyboards/ai03/vega/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2015 Jun Wako - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ai03/vega/keyboard.json b/keyboards/ai03/vega/keyboard.json index 64eaf5eadd7..a58fa4fcaef 100644 --- a/keyboards/ai03/vega/keyboard.json +++ b/keyboards/ai03/vega/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "A3", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6"], "rows": ["A1", "A2", "B3", "A15", "A10"] diff --git a/keyboards/akb/raine/config.h b/keyboards/akb/raine/config.h deleted file mode 100644 index 4ffa418a091..00000000000 --- a/keyboards/akb/raine/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2019 Elliot Powell - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/akb/raine/keyboard.json b/keyboards/akb/raine/keyboard.json index f3631068fd5..a8e841637ab 100644 --- a/keyboards/akb/raine/keyboard.json +++ b/keyboards/akb/raine/keyboard.json @@ -15,6 +15,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "B1", "F1", "F0", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"], "rows": ["E6", "C6", "F7", "B2", "B0"] diff --git a/keyboards/akegata_denki/device_one/info.json b/keyboards/akegata_denki/device_one/keyboard.json similarity index 99% rename from keyboards/akegata_denki/device_one/info.json rename to keyboards/akegata_denki/device_one/keyboard.json index e1e69e2510e..b85f186ad6f 100644 --- a/keyboards/akegata_denki/device_one/info.json +++ b/keyboards/akegata_denki/device_one/keyboard.json @@ -7,6 +7,12 @@ "pid": "0xADD0", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "nkro": true + }, "matrix_pins": { "cols": ["A2", "A3", "A4", "A5", "A6", "A7", "A1", "A10", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], "rows": ["B1", "B0", "A9", "A8", "A0"] diff --git a/keyboards/akegata_denki/device_one/rules.mk b/keyboards/akegata_denki/device_one/rules.mk deleted file mode 100644 index ecb62658826..00000000000 --- a/keyboards/akegata_denki/device_one/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = no -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover diff --git a/keyboards/akko/5087/config.h b/keyboards/akko/5087/config.h index ceb98727385..888dfa6f800 100644 --- a/keyboards/akko/5087/config.h +++ b/keyboards/akko/5087/config.h @@ -20,11 +20,6 @@ #define LED_MAC_OS_PIN C10 #define LED_WIN_LOCK_PIN C11 -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/akko/5087/keyboard.json b/keyboards/akko/5087/keyboard.json index 67ea54c169b..a2f72351ed6 100644 --- a/keyboards/akko/5087/keyboard.json +++ b/keyboards/akko/5087/keyboard.json @@ -21,6 +21,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "dynamic_keymap": { "layer_count": 6 }, diff --git a/keyboards/akko/5108/config.h b/keyboards/akko/5108/config.h index 6a509733d6a..f3d8ed4d67a 100644 --- a/keyboards/akko/5108/config.h +++ b/keyboards/akko/5108/config.h @@ -19,11 +19,6 @@ /* LED Indicators */ #define LED_WIN_LOCK_PIN C11 -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/akko/5108/keyboard.json b/keyboards/akko/5108/keyboard.json index 5e97d151c34..e98e421089b 100644 --- a/keyboards/akko/5108/keyboard.json +++ b/keyboards/akko/5108/keyboard.json @@ -21,6 +21,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": [ "C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14"], "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] diff --git a/keyboards/akko/acr87/config.h b/keyboards/akko/acr87/config.h index cdc4b6011a3..dc309c4a41b 100644 --- a/keyboards/akko/acr87/config.h +++ b/keyboards/akko/acr87/config.h @@ -16,11 +16,6 @@ #pragma once -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/akko/acr87/keyboard.json b/keyboards/akko/acr87/keyboard.json index 2702ee79152..9f37a91b9a8 100644 --- a/keyboards/akko/acr87/keyboard.json +++ b/keyboards/akko/acr87/keyboard.json @@ -21,6 +21,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": [ "C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2", "B10"], "rows": [ "B15", "C6", "C7", "C8", "C9", "A8"] diff --git a/keyboards/akko/top40/config.h b/keyboards/akko/top40/config.h index a23cf6db922..7924ae32148 100644 --- a/keyboards/akko/top40/config.h +++ b/keyboards/akko/top40/config.h @@ -16,11 +16,6 @@ #pragma once -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/akko/top40/keyboard.json b/keyboards/akko/top40/keyboard.json index 183c9242f4e..fd7cf497e75 100644 --- a/keyboards/akko/top40/keyboard.json +++ b/keyboards/akko/top40/keyboard.json @@ -21,6 +21,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4"], "rows": ["C7", "C8", "C9", "A8"] diff --git a/keyboards/al1/config.h b/keyboards/al1/config.h index 32c7bcbd2a8..e864567cec7 100644 --- a/keyboards/al1/config.h +++ b/keyboards/al1/config.h @@ -27,11 +27,6 @@ along with this program. If not, see . #define SN74X154_ADDRESS_PINS { D4, D5, D6, D7 } #define SN74X154_E1_PIN D3 -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/al1/info.json b/keyboards/al1/info.json index 6051163dc73..7e6440560ff 100644 --- a/keyboards/al1/info.json +++ b/keyboards/al1/info.json @@ -8,6 +8,20 @@ "pid": "0x6050", "device_version": "1.0.4" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "backlight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "B6", "breathing": true diff --git a/keyboards/al1/rules.mk b/keyboards/al1/rules.mk index ca917bc5480..73713d8a3f8 100644 --- a/keyboards/al1/rules.mk +++ b/keyboards/al1/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = lite VPATH += drivers/gpio SRC += matrix.c sn74x154.c diff --git a/keyboards/alas/info.json b/keyboards/alas/info.json index 5c5e29f5956..b5617189dec 100755 --- a/keyboards/alas/info.json +++ b/keyboards/alas/info.json @@ -8,6 +8,12 @@ "pid": "0x414C", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "indicators": { "caps_lock": "B6", "on_state": 0 @@ -19,6 +25,7 @@ "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", + "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_tsangan_hhkb"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/alas/rules.mk b/keyboards/alas/rules.mk index 916e1bf9bb7..0ab54aaaf71 100644 --- a/keyboards/alas/rules.mk +++ b/keyboards/alas/rules.mk @@ -1,17 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_ansi_tsangan 60_iso 60_iso_split_bs_rshift 60_iso_tsangan 60_tsangan_hhkb diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/keyboard.json similarity index 96% rename from keyboards/aleblazer/zodiark/info.json rename to keyboards/aleblazer/zodiark/keyboard.json index a66b5188b60..9f77049dee1 100644 --- a/keyboards/aleblazer/zodiark/info.json +++ b/keyboards/aleblazer/zodiark/keyboard.json @@ -8,6 +8,16 @@ "pid": "0xF902", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "oled": true, + "encoder": true + }, + "build": { + "lto": true + }, "ws2812": { "pin": "B5" }, @@ -49,6 +59,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D3", "encoder": { "right": { diff --git a/keyboards/aleblazer/zodiark/rules.mk b/keyboards/aleblazer/zodiark/rules.mk deleted file mode 100644 index 8fc2f2ff256..00000000000 --- a/keyboards/aleblazer/zodiark/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -OLED_ENABLE = yes -ENCODER_ENABLE = yes -SPLIT_KEYBOARD = yes -LTO_ENABLE = yes diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h deleted file mode 100644 index d876570c808..00000000000 --- a/keyboards/alf/dc60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 MechMerlin - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/alf/dc60/keyboard.json b/keyboards/alf/dc60/keyboard.json index 7fd360d726a..ea04748f847 100644 --- a/keyboards/alf/dc60/keyboard.json +++ b/keyboards/alf/dc60/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"], "rows": ["B0", "B1", "B2", "B3", "B4"] diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h deleted file mode 100644 index b5b661bef2a..00000000000 --- a/keyboards/alf/x11/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 MechMerlin - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/alf/x11/keyboard.json b/keyboards/alf/x11/keyboard.json index 03abfc2dbed..c571705dc10 100644 --- a/keyboards/alf/x11/keyboard.json +++ b/keyboards/alf/x11/keyboard.json @@ -21,6 +21,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "F0", "F1", "F4", "F5", "F6"], "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"] diff --git a/keyboards/alf/x2/config.h b/keyboards/alf/x2/config.h deleted file mode 100644 index 02460e0beda..00000000000 --- a/keyboards/alf/x2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2018-2021 @fixed, MechMerlin, QMK - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/alf/x2/keyboard.json b/keyboards/alf/x2/keyboard.json index fe700979327..9dd011c7f1c 100644 --- a/keyboards/alf/x2/keyboard.json +++ b/keyboards/alf/x2/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/aliceh66/pianoforte/config.h b/keyboards/aliceh66/pianoforte/config.h deleted file mode 100644 index ff87862693a..00000000000 --- a/keyboards/aliceh66/pianoforte/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 AliceH - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/aliceh66/pianoforte/info.json b/keyboards/aliceh66/pianoforte/info.json index 6cc2546794c..b732b02db25 100644 --- a/keyboards/aliceh66/pianoforte/info.json +++ b/keyboards/aliceh66/pianoforte/info.json @@ -8,6 +8,21 @@ "pid": "0x7066", "vid": "0x6168" }, + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "nkro": true + }, + "build": { + "lto": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "D6", "D7", "B4", "B5", "F1", "F0", "E6", "B6"], "rows": ["D1", "D0", "D3", "D2", "D5", "B0", "C6", "C7", "F6", "F7", "F5", "F4"] diff --git a/keyboards/aliceh66/pianoforte/rules.mk b/keyboards/aliceh66/pianoforte/rules.mk index 2f9cd4eea95..4b54462335d 100644 --- a/keyboards/aliceh66/pianoforte/rules.mk +++ b/keyboards/aliceh66/pianoforte/rules.mk @@ -1,16 +1,2 @@ # Processor Frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/aliceh66/pianoforte_hs/config.h b/keyboards/aliceh66/pianoforte_hs/config.h deleted file mode 100644 index ff87862693a..00000000000 --- a/keyboards/aliceh66/pianoforte_hs/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 AliceH - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/aliceh66/pianoforte_hs/info.json b/keyboards/aliceh66/pianoforte_hs/info.json index 7366e961c1f..ff73a00ea85 100644 --- a/keyboards/aliceh66/pianoforte_hs/info.json +++ b/keyboards/aliceh66/pianoforte_hs/info.json @@ -8,6 +8,21 @@ "pid": "0x7068", "vid": "0x6168" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true + }, + "build": { + "lto": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B5", "B6", "F6", "F5", "E6", "D4"], "rows": ["D2", "D1", "D3", "D0", "D5", "B0", "F0", "F1", "F7", "F4", "C7", "C6"] diff --git a/keyboards/aliceh66/pianoforte_hs/rules.mk b/keyboards/aliceh66/pianoforte_hs/rules.mk index 3488ea0dd24..4b54462335d 100644 --- a/keyboards/aliceh66/pianoforte_hs/rules.mk +++ b/keyboards/aliceh66/pianoforte_hs/rules.mk @@ -1,16 +1,2 @@ # Processor Frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes diff --git a/keyboards/alpha/config.h b/keyboards/alpha/config.h deleted file mode 100755 index 5f360813239..00000000000 --- a/keyboards/alpha/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/alpha/keyboard.json b/keyboards/alpha/keyboard.json index f708ad2b9f5..1cb2fe71cd2 100644 --- a/keyboards/alpha/keyboard.json +++ b/keyboards/alpha/keyboard.json @@ -36,6 +36,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5"], "rows": ["D4", "B4", "B5"] diff --git a/keyboards/alpine65/config.h b/keyboards/alpine65/config.h deleted file mode 100644 index f608132b5af..00000000000 --- a/keyboards/alpine65/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Álvaro "Gondolindrim" Volpato - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/alpine65/keyboard.json b/keyboards/alpine65/keyboard.json index 4fccb3c564e..36bba880a8f 100644 --- a/keyboards/alpine65/keyboard.json +++ b/keyboards/alpine65/keyboard.json @@ -37,6 +37,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A9", "A8", "B14", "B12", "A10", "A0", "A1"], "rows": ["C14", "C15", "C13", "A2", "A3"] diff --git a/keyboards/alps64/config.h b/keyboards/alps64/config.h deleted file mode 100644 index 4b007cf387e..00000000000 --- a/keyboards/alps64/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Jun Wako - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/alps64/keyboard.json b/keyboards/alps64/keyboard.json index 72f21d0c33d..a6a60478f81 100644 --- a/keyboards/alps64/keyboard.json +++ b/keyboards/alps64/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"], "rows": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "C2"] diff --git a/keyboards/alt34/rev1/config.h b/keyboards/alt34/rev1/config.h index ffff9dc8c6f..9dd9e9bdde5 100644 --- a/keyboards/alt34/rev1/config.h +++ b/keyboards/alt34/rev1/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - #define USE_I2C /* Select hand configuration */ diff --git a/keyboards/alt34/rev1/info.json b/keyboards/alt34/rev1/keyboard.json similarity index 90% rename from keyboards/alt34/rev1/info.json rename to keyboards/alt34/rev1/keyboard.json index cf90324c142..712dd72943b 100644 --- a/keyboards/alt34/rev1/info.json +++ b/keyboards/alt34/rev1/keyboard.json @@ -8,6 +8,20 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "split": { + "enabled": true + }, "matrix_pins": { "cols": ["B6", "B2", "B3", "B1", "F7"], "rows": ["D7", "E6", "B4", "B5"] diff --git a/keyboards/alt34/rev1/rules.mk b/keyboards/alt34/rev1/rules.mk deleted file mode 100644 index 99541b285bd..00000000000 --- a/keyboards/alt34/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change to "no" to disable the options -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes diff --git a/keyboards/amag23/config.h b/keyboards/amag23/config.h deleted file mode 100644 index cdad6969cbc..00000000000 --- a/keyboards/amag23/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/amag23/keyboard.json b/keyboards/amag23/keyboard.json index ed37a36e548..e3eb16cdad5 100644 --- a/keyboards/amag23/keyboard.json +++ b/keyboards/amag23/keyboard.json @@ -37,6 +37,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B4", "B5"], "rows": ["A0", "A1", "A2", "A3"] diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h deleted file mode 100755 index b9449c4714b..00000000000 --- a/keyboards/amjkeyboard/amj40/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/amjkeyboard/amj40/keyboard.json b/keyboards/amjkeyboard/amj40/keyboard.json index 8ce166728ca..de536cb55e4 100644 --- a/keyboards/amjkeyboard/amj40/keyboard.json +++ b/keyboards/amjkeyboard/amj40/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7"], "rows": ["F4", "F5", "F6", "F7"] diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/amjkeyboard/amj60/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/amjkeyboard/amj60/keyboard.json b/keyboards/amjkeyboard/amj60/keyboard.json index 0b65c742aa4..5ab353675a7 100644 --- a/keyboards/amjkeyboard/amj60/keyboard.json +++ b/keyboards/amjkeyboard/amj60/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["F7", "F6", "F5", "F4", "D5"] diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h deleted file mode 100644 index b48aca77700..00000000000 --- a/keyboards/amjkeyboard/amj66/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2018 Alex Peters - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/info.json index 07a170a3f6a..72646e4fc71 100644 --- a/keyboards/amjkeyboard/amj66/info.json +++ b/keyboards/amjkeyboard/amj66/info.json @@ -8,6 +8,20 @@ "pid": "0xBD66", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "backlight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5", "B6"], "rows": ["F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/amjkeyboard/amj66/rules.mk b/keyboards/amjkeyboard/amj66/rules.mk index cb4a880111b..09057bea54b 100644 --- a/keyboards/amjkeyboard/amj66/rules.mk +++ b/keyboards/amjkeyboard/amj66/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - # Disable unsupported hardware RGBLIGHT_SUPPORTED = no AUDIO_SUPPORTED = no diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h deleted file mode 100644 index 86415b251a0..00000000000 --- a/keyboards/amjkeyboard/amj84/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2022 peepeetee (@peepeetee) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/amjkeyboard/amj84/keyboard.json b/keyboards/amjkeyboard/amj84/keyboard.json index 217b685391f..b544ffc8b3c 100644 --- a/keyboards/amjkeyboard/amj84/keyboard.json +++ b/keyboards/amjkeyboard/amj84/keyboard.json @@ -18,6 +18,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "E6", "C7", "C6", "B0", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3", "D1"], "rows": ["D0", "F7", "F6", "F5", "F4", "D5"] diff --git a/keyboards/amjkeyboard/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h index b16c84d50eb..81cbb4a5e0b 100644 --- a/keyboards/amjkeyboard/amj96/config.h +++ b/keyboards/amjkeyboard/amj96/config.h @@ -36,11 +36,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json index 60cb8ee9e83..23a131c6150 100644 --- a/keyboards/amjkeyboard/amj96/info.json +++ b/keyboards/amjkeyboard/amj96/info.json @@ -8,6 +8,20 @@ "pid": "0x6074", "device_version": "0.0.2" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true, + "rgblight": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "led_count": 16, "animations": { diff --git a/keyboards/amjkeyboard/amj96/rules.mk b/keyboards/amjkeyboard/amj96/rules.mk index dfe1d12b556..8784813b335 100644 --- a/keyboards/amjkeyboard/amj96/rules.mk +++ b/keyboards/amjkeyboard/amj96/rules.mk @@ -1,15 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/amjkeyboard/amjpad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/amjkeyboard/amjpad/keyboard.json b/keyboards/amjkeyboard/amjpad/keyboard.json index bd960d8c8ab..e331f3af191 100644 --- a/keyboards/amjkeyboard/amjpad/keyboard.json +++ b/keyboards/amjkeyboard/amjpad/keyboard.json @@ -17,6 +17,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "E6", "C7"], "rows": ["F7", "F6", "F5", "F4", "D5", "D0"] diff --git a/keyboards/anavi/knob1/info.json b/keyboards/anavi/knob1/keyboard.json similarity index 96% rename from keyboards/anavi/knob1/info.json rename to keyboards/anavi/knob1/keyboard.json index 551d059badf..9c4c60640ee 100644 --- a/keyboards/anavi/knob1/info.json +++ b/keyboards/anavi/knob1/keyboard.json @@ -12,7 +12,8 @@ "extrakey": true, "mousekey": false, "nkro": true, - "rgblight": true + "rgblight": true, + "oled": true }, "rgblight": { "led_count": 1, diff --git a/keyboards/anavi/knob1/rules.mk b/keyboards/anavi/knob1/rules.mk deleted file mode 100644 index dd68e9d3b09..00000000000 --- a/keyboards/anavi/knob1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -OLED_ENABLE = yes diff --git a/keyboards/anavi/knobs3/info.json b/keyboards/anavi/knobs3/keyboard.json similarity index 97% rename from keyboards/anavi/knobs3/info.json rename to keyboards/anavi/knobs3/keyboard.json index ad51b7ce6ca..11081ee0863 100644 --- a/keyboards/anavi/knobs3/info.json +++ b/keyboards/anavi/knobs3/keyboard.json @@ -17,7 +17,8 @@ "extrakey": true, "mousekey": false, "nkro": true, - "rgblight": true + "rgblight": true, + "oled": true }, "rgblight": { "led_count": 1, diff --git a/keyboards/anavi/knobs3/rules.mk b/keyboards/anavi/knobs3/rules.mk deleted file mode 100644 index dd68e9d3b09..00000000000 --- a/keyboards/anavi/knobs3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -OLED_ENABLE = yes diff --git a/keyboards/ano/config.h b/keyboards/ano/config.h deleted file mode 100644 index fff04f05b3c..00000000000 --- a/keyboards/ano/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 Sebastien Sauve-Hoover (@sauvehoo) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - #pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ano/keyboard.json b/keyboards/ano/keyboard.json index c522f816ce5..e676ce72707 100644 --- a/keyboards/ano/keyboard.json +++ b/keyboards/ano/keyboard.json @@ -28,7 +28,11 @@ ] }, "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "processor": "STM32F303", "bootloader": "stm32-dfu", diff --git a/keyboards/anomalykb/a65i/config.h b/keyboards/anomalykb/a65i/config.h deleted file mode 100644 index 947f85bbb2b..00000000000 --- a/keyboards/anomalykb/a65i/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 Lfgberg - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/anomalykb/a65i/keyboard.json b/keyboards/anomalykb/a65i/keyboard.json index 98015fcd72b..8fadaadadb2 100644 --- a/keyboards/anomalykb/a65i/keyboard.json +++ b/keyboards/anomalykb/a65i/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "D6", "D4", "B4", "B6", "E6", "F1", "B7", "C6", "C7", "D5", "D3", "D2", "F0", "D1", "D0"], "rows": ["B3", "B2", "B1", "B0", "B5"] diff --git a/keyboards/aos/tkl/config.h b/keyboards/aos/tkl/config.h deleted file mode 100644 index 66790ac3d39..00000000000 --- a/keyboards/aos/tkl/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2020 aholland909 - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/aos/tkl/keyboard.json b/keyboards/aos/tkl/keyboard.json index 730a262366a..8cd47a44a54 100644 --- a/keyboards/aos/tkl/keyboard.json +++ b/keyboards/aos/tkl/keyboard.json @@ -37,6 +37,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7", "B6", "B5", "D7", "B4", "D6", "F0", "D1", "C6", "D4"], "rows": ["D3", "D2", "B7", "F1", "C7", "D5"] diff --git a/keyboards/arabica37/rev1/info.json b/keyboards/arabica37/rev1/keyboard.json similarity index 95% rename from keyboards/arabica37/rev1/info.json rename to keyboards/arabica37/rev1/keyboard.json index 14d0c01cb9e..710a377ab9a 100644 --- a/keyboards/arabica37/rev1/info.json +++ b/keyboards/arabica37/rev1/keyboard.json @@ -8,12 +8,19 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "rgblight": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/arabica37/rev1/rules.mk b/keyboards/arabica37/rev1/rules.mk deleted file mode 100644 index 822a7cf01cb..00000000000 --- a/keyboards/arabica37/rev1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json b/keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json similarity index 98% rename from keyboards/argo_works/ishi/80/mk0_avr_extra/info.json rename to keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json index eeeb33f236f..89b9b1994f2 100644 --- a/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json +++ b/keyboards/argo_works/ishi/80/mk0_avr_extra/keyboard.json @@ -21,7 +21,9 @@ "extrakey": true, "mousekey": true, "nkro": true, - "encoder": true + "encoder": true, + "oled": true, + "wpm": true }, "matrix_pins": { "cols": ["D3", "F4", "F5", "F6", "F7", "D7", "C6", "D4", "D2"], diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk b/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk deleted file mode 100644 index 76e55c05f48..00000000000 --- a/keyboards/argo_works/ishi/80/mk0_avr_extra/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -OLED_ENABLE = yes -WPM_ENABLE = yes diff --git a/keyboards/arisu/config.h b/keyboards/arisu/config.h deleted file mode 100644 index 3cf449a32bf..00000000000 --- a/keyboards/arisu/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Fate - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/arisu/keyboard.json b/keyboards/arisu/keyboard.json index af1cb819dc9..43bb668b990 100644 --- a/keyboards/arisu/keyboard.json +++ b/keyboards/arisu/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/ash1800/config.h b/keyboards/ash1800/config.h deleted file mode 100644 index 75e72d0e22a..00000000000 --- a/keyboards/ash1800/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 angelbirth - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/ash1800/keyboard.json b/keyboards/ash1800/keyboard.json index 9e60de6b343..c2244a7ad70 100644 --- a/keyboards/ash1800/keyboard.json +++ b/keyboards/ash1800/keyboard.json @@ -21,6 +21,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"], "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"] diff --git a/keyboards/ash_xiix/config.h b/keyboards/ash_xiix/config.h deleted file mode 100644 index 08dd2458c88..00000000000 --- a/keyboards/ash_xiix/config.h +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2020 sh_xguitar -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/ash_xiix/keyboard.json b/keyboards/ash_xiix/keyboard.json index d1e32efec13..5cb21b488e9 100644 --- a/keyboards/ash_xiix/keyboard.json +++ b/keyboards/ash_xiix/keyboard.json @@ -22,6 +22,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"], "rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"] diff --git a/keyboards/ask55/config.h b/keyboards/ask55/config.h deleted file mode 100644 index f16fa8823e2..00000000000 --- a/keyboards/ask55/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 Yiancar / Keyboard-Magpie - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/ask55/keyboard.json b/keyboards/ask55/keyboard.json index d47d79612d3..66efb1749ae 100644 --- a/keyboards/ask55/keyboard.json +++ b/keyboards/ask55/keyboard.json @@ -13,6 +13,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "D0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["B0", "B1", "D1", "F6", "F5"] diff --git a/keyboards/at_at/660m/config.h b/keyboards/at_at/660m/config.h index 70ad2757b92..ff79c3f7f89 100644 --- a/keyboards/at_at/660m/config.h +++ b/keyboards/at_at/660m/config.h @@ -23,12 +23,6 @@ along with this program. If not, see . /* LSE clock */ #define STM32_LSECLK 32768 -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/at_at/660m/info.json b/keyboards/at_at/660m/keyboard.json similarity index 92% rename from keyboards/at_at/660m/info.json rename to keyboards/at_at/660m/keyboard.json index 97f38080dc7..a9c5af73f85 100644 --- a/keyboards/at_at/660m/info.json +++ b/keyboards/at_at/660m/keyboard.json @@ -6,7 +6,22 @@ "usb": { "vid": "0xA22A", "pid": "0x6600", - "device_version": "0.0.1" + "device_version": "0.0.1", + "no_startup_check": true + }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } }, "matrix_pins": { "cols": ["B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B9", "B8", "B7", "B6", "B5", "B3", "B4", "B0"], diff --git a/keyboards/at_at/660m/rules.mk b/keyboards/at_at/660m/rules.mk deleted file mode 100644 index e984f8dc96e..00000000000 --- a/keyboards/at_at/660m/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -# BACKLIGHT_ENABLE = yes -# RGBLIGHT_ENABLE = yes -NO_USB_STARTUP_CHECK = yes # Workaround for issue 6369 - - diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h index 374119935e9..ab111a5ec5f 100644 --- a/keyboards/atlantis/ak81_ve/config.h +++ b/keyboards/atlantis/ak81_ve/config.h @@ -16,10 +16,4 @@ #pragma once -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - #define RGB_MATRIX_LED_COUNT 96 diff --git a/keyboards/atlantis/ak81_ve/keyboard.json b/keyboards/atlantis/ak81_ve/keyboard.json index 6b618646443..a2d064295c8 100644 --- a/keyboards/atlantis/ak81_ve/keyboard.json +++ b/keyboards/atlantis/ak81_ve/keyboard.json @@ -74,6 +74,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "B2", "B7", "D3", "D2", "D1", "D0", "B3"], "rows": ["F1", "F7", "F6", "F5", "F4", "D5"] diff --git a/keyboards/atlantis/ps17/info.json b/keyboards/atlantis/ps17/keyboard.json similarity index 98% rename from keyboards/atlantis/ps17/info.json rename to keyboards/atlantis/ps17/keyboard.json index ac8f979d399..ee7255c8fa3 100644 --- a/keyboards/atlantis/ps17/info.json +++ b/keyboards/atlantis/ps17/keyboard.json @@ -11,6 +11,9 @@ "pid": "0x414B", "vid": "0x0015" }, + "build": { + "lto": true + }, "features": { "bootmagic": false, "command": false, diff --git a/keyboards/atlantis/ps17/rules.mk b/keyboards/atlantis/ps17/rules.mk deleted file mode 100644 index 4da205a168c..00000000000 --- a/keyboards/atlantis/ps17/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes diff --git a/keyboards/atlas_65/config.h b/keyboards/atlas_65/config.h deleted file mode 100644 index d0851ac1fde..00000000000 --- a/keyboards/atlas_65/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 Joshua Nguyen - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/atlas_65/keyboard.json b/keyboards/atlas_65/keyboard.json index 896ecf6f20c..4e8db96d3af 100644 --- a/keyboards/atlas_65/keyboard.json +++ b/keyboards/atlas_65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/atomic/config.h b/keyboards/atomic/config.h deleted file mode 100644 index b9449c4714b..00000000000 --- a/keyboards/atomic/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/atomic/keyboard.json b/keyboards/atomic/keyboard.json index cb4bddceae5..5a269316cfa 100644 --- a/keyboards/atomic/keyboard.json +++ b/keyboards/atomic/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7", "D3", "D2", "D1"], "rows": ["D0", "D5", "B5", "B6", "C6"] diff --git a/keyboards/atreus/f103/info.json b/keyboards/atreus/f103/keyboard.json similarity index 73% rename from keyboards/atreus/f103/info.json rename to keyboards/atreus/f103/keyboard.json index 341ed4e8e64..813ef97e373 100644 --- a/keyboards/atreus/f103/info.json +++ b/keyboards/atreus/f103/keyboard.json @@ -5,5 +5,8 @@ }, "diode_direction": "COL2ROW", "processor": "STM32F103", - "bootloader": "stm32duino" + "bootloader": "stm32duino", + "features": { + "bootmagic": true + } } diff --git a/keyboards/atreus/f103/rules.mk b/keyboards/atreus/f103/rules.mk deleted file mode 100644 index 22634018d2f..00000000000 --- a/keyboards/atreus/f103/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ - -BOOTMAGIC_ENABLE = yes \ No newline at end of file diff --git a/keyboards/atreus/feather/info.json b/keyboards/atreus/feather/info.json index b0d7d554433..19e9654f127 100644 --- a/keyboards/atreus/feather/info.json +++ b/keyboards/atreus/feather/info.json @@ -6,6 +6,10 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bluetooth": true, + "console": false + }, "bluetooth": { "driver": "bluefruit_le" } diff --git a/keyboards/atreus/feather/rules.mk b/keyboards/atreus/feather/rules.mk index c93cad90807..3437a35bdf1 100644 --- a/keyboards/atreus/feather/rules.mk +++ b/keyboards/atreus/feather/rules.mk @@ -1,8 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BLUETOOTH_ENABLE = yes -CONSOLE_ENABLE = no diff --git a/keyboards/atreus62/config.h b/keyboards/atreus62/config.h deleted file mode 100644 index 9b7700e0139..00000000000 --- a/keyboards/atreus62/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2012 Jun Wako - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -// #define NO_DEBUG - -/* disable print */ -// #define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/atreus62/keyboard.json b/keyboards/atreus62/keyboard.json index 5263e799df3..c24c02e71e6 100644 --- a/keyboards/atreus62/keyboard.json +++ b/keyboards/atreus62/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "unicode": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6"], "rows": ["D2", "D3", "D1", "D0", "D4"] diff --git a/keyboards/atreyu/info.json b/keyboards/atreyu/info.json new file mode 100644 index 00000000000..26caa20330a --- /dev/null +++ b/keyboards/atreyu/info.json @@ -0,0 +1,8 @@ +{ + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + } +} diff --git a/keyboards/atreyu/rev1/config.h b/keyboards/atreyu/rev1/config.h deleted file mode 100644 index d7c434426bc..00000000000 --- a/keyboards/atreyu/rev1/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 Jesus Climent (@climent) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/atreyu/rev1/keyboard.json b/keyboards/atreyu/rev1/keyboard.json index 8a38baabf81..dc632a74a7b 100644 --- a/keyboards/atreyu/rev1/keyboard.json +++ b/keyboards/atreyu/rev1/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["D7", "E6", "B4", "B5", "F6", "F7", "B1", "B3", "B6", "B2"] diff --git a/keyboards/atreyu/rev2/config.h b/keyboards/atreyu/rev2/config.h deleted file mode 100644 index d7c434426bc..00000000000 --- a/keyboards/atreyu/rev2/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 Jesus Climent (@climent) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/atreyu/rev2/keyboard.json b/keyboards/atreyu/rev2/keyboard.json index 6fcfd64d1ff..19dc8761c49 100644 --- a/keyboards/atreyu/rev2/keyboard.json +++ b/keyboards/atreyu/rev2/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "C6", "D4", "D2", "D3"], "rows": ["D7", "E6", "B4", "B5", "F6", "F7", "B1", "B3", "B6", "B2"] diff --git a/keyboards/atreyu/rules.mk b/keyboards/atreyu/rules.mk index 23ebd8ba330..4daffe6b9d4 100644 --- a/keyboards/atreyu/rules.mk +++ b/keyboards/atreyu/rules.mk @@ -1,16 +1 @@ DEFAULT_FOLDER = atreyu/rev1 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -ENCODER_ENABLE = no diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h deleted file mode 100644 index dc6abdcaf25..00000000000 --- a/keyboards/atset/at1/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/atset/at1/keyboard.json b/keyboards/atset/at1/keyboard.json index e8fa5f8b5fe..4c4806c40bb 100644 --- a/keyboards/atset/at1/keyboard.json +++ b/keyboards/atset/at1/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6"], "rows": ["D2"] diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h deleted file mode 100644 index dc6abdcaf25..00000000000 --- a/keyboards/atset/at12/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/atset/at12/keyboard.json b/keyboards/atset/at12/keyboard.json index c15ff3f46ea..8c7a3d4ea90 100644 --- a/keyboards/atset/at12/keyboard.json +++ b/keyboards/atset/at12/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "B4"], "rows": ["D3", "D2", "D1", "D0"] diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h deleted file mode 100644 index dc6abdcaf25..00000000000 --- a/keyboards/atset/at16/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/atset/at16/keyboard.json b/keyboards/atset/at16/keyboard.json index 0db5ad692c7..2c03c2295f7 100644 --- a/keyboards/atset/at16/keyboard.json +++ b/keyboards/atset/at16/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "B4", "B2"], "rows": ["D3", "D2", "D1", "D0"] diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h deleted file mode 100644 index dc6abdcaf25..00000000000 --- a/keyboards/atset/at3/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/atset/at3/keyboard.json b/keyboards/atset/at3/keyboard.json index 171faf984a0..e6d1d97bf0a 100644 --- a/keyboards/atset/at3/keyboard.json +++ b/keyboards/atset/at3/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "B4"], "rows": ["D2"] diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h deleted file mode 100644 index dc6abdcaf25..00000000000 --- a/keyboards/atset/at6/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/atset/at6/keyboard.json b/keyboards/atset/at6/keyboard.json index c24611f8b74..8cf2d9e9e01 100644 --- a/keyboards/atset/at6/keyboard.json +++ b/keyboards/atset/at6/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "B4"], "rows": ["D2", "D1"] diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h deleted file mode 100644 index dc6abdcaf25..00000000000 --- a/keyboards/atset/at9/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/atset/at9/keyboard.json b/keyboards/atset/at9/keyboard.json index 35bdf95550e..c531397f3aa 100644 --- a/keyboards/atset/at9/keyboard.json +++ b/keyboards/atset/at9/keyboard.json @@ -15,6 +15,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "B4"], "rows": ["D2", "D1", "D0"] diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h deleted file mode 100644 index 50001e978cc..00000000000 --- a/keyboards/atxkb/1894/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Ryota Goto - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/atxkb/1894/keyboard.json b/keyboards/atxkb/1894/keyboard.json index 0ea4918bf38..5abaf88eb0b 100644 --- a/keyboards/atxkb/1894/keyboard.json +++ b/keyboards/atxkb/1894/keyboard.json @@ -21,6 +21,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], "rows": ["B1", "B2", "B3", "F0", "F1"] diff --git a/keyboards/aurora65/info.json b/keyboards/aurora65/info.json index 9311e0f8086..1c0dd684cb2 100644 --- a/keyboards/aurora65/info.json +++ b/keyboards/aurora65/info.json @@ -8,6 +8,13 @@ "pid": "0x4136", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/aurora65/rules.mk b/keyboards/aurora65/rules.mk index cc9d7bb3f53..0ab54aaaf71 100644 --- a/keyboards/aurora65/rules.mk +++ b/keyboards/aurora65/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/keyboard.json similarity index 96% rename from keyboards/avalanche/v1/info.json rename to keyboards/avalanche/v1/keyboard.json index 7787ae2a953..97acaf0d9f9 100644 --- a/keyboards/avalanche/v1/info.json +++ b/keyboards/avalanche/v1/keyboard.json @@ -8,12 +8,19 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/avalanche/v1/rules.mk b/keyboards/avalanche/v1/rules.mk deleted file mode 100644 index ef90e04bc1d..00000000000 --- a/keyboards/avalanche/v1/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/keyboard.json similarity index 96% rename from keyboards/avalanche/v2/info.json rename to keyboards/avalanche/v2/keyboard.json index 62c284a8454..219e5bb6c6e 100644 --- a/keyboards/avalanche/v2/info.json +++ b/keyboards/avalanche/v2/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0002", "device_version": "0.0.2" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "encoder": true + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] @@ -26,6 +34,7 @@ "pin": "D3" }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "processor": "atmega32u4", diff --git a/keyboards/avalanche/v2/rules.mk b/keyboards/avalanche/v2/rules.mk deleted file mode 100644 index 8e241b2dfd6..00000000000 --- a/keyboards/avalanche/v2/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - -SPLIT_KEYBOARD = yes diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/keyboard.json similarity index 96% rename from keyboards/avalanche/v3/info.json rename to keyboards/avalanche/v3/keyboard.json index 8cf8187df7f..6104dbd7939 100644 --- a/keyboards/avalanche/v3/info.json +++ b/keyboards/avalanche/v3/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0003", "device_version": "0.0.3" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "encoder": true + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] @@ -19,6 +26,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/avalanche/v3/rules.mk b/keyboards/avalanche/v3/rules.mk deleted file mode 100644 index 5a35722be4e..00000000000 --- a/keyboards/avalanche/v3/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - -SPLIT_KEYBOARD = yes diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/keyboard.json similarity index 96% rename from keyboards/avalanche/v4/info.json rename to keyboards/avalanche/v4/keyboard.json index 7bb047466b5..2a4909ba368 100644 --- a/keyboards/avalanche/v4/info.json +++ b/keyboards/avalanche/v4/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x0004", "device_version": "0.0.4" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "encoder": true, + "oled": true + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "C6", "D7", "E6", "B4"] @@ -19,6 +27,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2" }, "ws2812": { diff --git a/keyboards/avalanche/v4/rules.mk b/keyboards/avalanche/v4/rules.mk deleted file mode 100644 index 513c25d04d9..00000000000 --- a/keyboards/avalanche/v4/rules.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes -OLED_ENABLE = yes - -SPLIT_KEYBOARD = yes diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h deleted file mode 100644 index 35ca2e0fc3c..00000000000 --- a/keyboards/aves60/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2021 Evelien Dekkers (@evyd13) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/aves60/keyboard.json b/keyboards/aves60/keyboard.json index fce12cd9f73..6d58d43b6a5 100644 --- a/keyboards/aves60/keyboard.json +++ b/keyboards/aves60/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B2", "B3", "D0", "D1", "D2", "D3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["F6", "F7", "F5", "F1", "F4"] diff --git a/keyboards/aves65/config.h b/keyboards/aves65/config.h deleted file mode 100644 index 95af0f8e733..00000000000 --- a/keyboards/aves65/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 I/O Keyboards - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/aves65/keyboard.json b/keyboards/aves65/keyboard.json index fba7dcaf387..3ad686f83a1 100644 --- a/keyboards/aves65/keyboard.json +++ b/keyboards/aves65/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6"], "rows": ["D4", "D6", "D7", "B4", "E6"] diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/info.json index 14a3c8213e3..c90c967788e 100644 --- a/keyboards/axolstudio/helpo/info.json +++ b/keyboards/axolstudio/helpo/info.json @@ -8,6 +8,11 @@ "pid": "0xC89F", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "matrix_pins": { "cols": ["A1", "B4", "B3", "B2", "B1"], "rows": ["A2", "A3", "A4", "A5"] diff --git a/keyboards/axolstudio/helpo/rules.mk b/keyboards/axolstudio/helpo/rules.mk index 1e9f9255447..c2ee0bc86f9 100644 --- a/keyboards/axolstudio/helpo/rules.mk +++ b/keyboards/axolstudio/helpo/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/aya/info.json b/keyboards/aya/keyboard.json similarity index 96% rename from keyboards/aya/info.json rename to keyboards/aya/keyboard.json index 6b65aa5521a..547f495ddd2 100644 --- a/keyboards/aya/info.json +++ b/keyboards/aya/keyboard.json @@ -8,6 +8,15 @@ "pid": "0x2925", "device_version": "0.0.1" }, + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "command": true + }, + "split": { + "enabled": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6", "B4"] diff --git a/keyboards/aya/rules.mk b/keyboards/aya/rules.mk deleted file mode 100644 index b893863bb52..00000000000 --- a/keyboards/aya/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes From 03a3a2673d6deff5a55c14033cc8b505d22a553b Mon Sep 17 00:00:00 2001 From: zlabkeeb <160311066+zlabkeeb@users.noreply.github.com> Date: Wed, 3 Apr 2024 02:58:31 +0700 Subject: [PATCH 14/40] Update 15PAD & 6PAD (#23397) --- keyboards/zlabkeeb/15pad/keyboard.json | 24 ++++++++++++------------ keyboards/zlabkeeb/6pad/readme.md | 3 ++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/keyboards/zlabkeeb/15pad/keyboard.json b/keyboards/zlabkeeb/15pad/keyboard.json index 9733d0169a8..6e28d594f20 100644 --- a/keyboards/zlabkeeb/15pad/keyboard.json +++ b/keyboards/zlabkeeb/15pad/keyboard.json @@ -59,18 +59,18 @@ {"x": 0, "y": 0, "matrix": [0, 0], "encoder": 0}, {"x": 1, "y": 0, "matrix": [0, 1], "encoder": 1}, {"x": 3, "y": 0, "matrix": [0, 3], "encoder": 2}, - {"x": 0, "y": 0, "matrix": [1, 0]}, - {"x": 1, "y": 0, "matrix": [1, 1]}, - {"x": 2, "y": 0, "matrix": [1, 2]}, - {"x": 3, "y": 0, "matrix": [1, 3]}, - {"x": 0, "y": 0, "matrix": [2, 0]}, - {"x": 1, "y": 0, "matrix": [2, 1]}, - {"x": 2, "y": 0, "matrix": [2, 2]}, - {"x": 3, "y": 0, "matrix": [2, 3]}, - {"x": 0, "y": 0, "matrix": [3, 0]}, - {"x": 1, "y": 0, "matrix": [3, 1]}, - {"x": 2, "y": 0, "matrix": [3, 2]}, - {"x": 3, "y": 0, "matrix": [3, 3]} + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1, "matrix": [1, 3]}, + {"x": 0, "y": 2, "matrix": [2, 0]}, + {"x": 1, "y": 2, "matrix": [2, 1]}, + {"x": 2, "y": 2, "matrix": [2, 2]}, + {"x": 3, "y": 2, "matrix": [2, 3]}, + {"x": 0, "y": 3, "matrix": [3, 0]}, + {"x": 1, "y": 3, "matrix": [3, 1]}, + {"x": 2, "y": 3, "matrix": [3, 2]}, + {"x": 3, "y": 3, "matrix": [3, 3]} ] } } diff --git a/keyboards/zlabkeeb/6pad/readme.md b/keyboards/zlabkeeb/6pad/readme.md index 9470ee1d6d9..4575f69088f 100644 --- a/keyboards/zlabkeeb/6pad/readme.md +++ b/keyboards/zlabkeeb/6pad/readme.md @@ -7,7 +7,7 @@ - Support RGB light UnderGlow - Keyboard Maintainer: [zlabkeeb](https://github.com/zlabkeeb) - Hardware Supported: 6Pad PCB, Promicro -- Hardware Availability: (INDONESIA Only) Will be available at [Tokopedia](https://www.tokopedia.com/zahranetid) +- Hardware Availability: (INDONESIA ONLY) [Tokopedia](https://www.tokopedia.com/zahranetid/macropad-6pad-via-compatible-by-zlabkeeb) Make example for this keyboard (after setting up your build environment): @@ -24,3 +24,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 1 way: - **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead + From 73daecdc2373b787cafdfca930ecb65d9de285f7 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 3 Apr 2024 00:36:30 +0100 Subject: [PATCH 15/40] Fix spaceholdings/nebula68b (#23399) --- .../spaceholdings/nebula68b/hs/keyboard.json | 86 +++++++++++++++++++ .../nebula68b/hs/keymaps/via/keymap.c | 32 +++++++ .../nebula68b/{ => hs}/keymaps/via/rules.mk | 0 keyboards/spaceholdings/nebula68b/hs/rules.mk | 0 keyboards/spaceholdings/nebula68b/info.json | 82 ++++++++++++++++++ .../nebula68b/keymaps/default/keymap.c | 24 +++--- .../nebula68b/keymaps/default/readme.md | 7 -- .../nebula68b/keymaps/via/keymap.c | 46 ---------- .../nebula68b/keymaps/via/readme.md | 7 -- keyboards/spaceholdings/nebula68b/readme.md | 4 +- keyboards/spaceholdings/nebula68b/rules.mk | 1 + .../nebula68b/{ => solder}/keyboard.json | 82 +----------------- .../solder/keymaps/default_split_bs/keymap.c | 32 +++++++ .../nebula68b/solder/keymaps/via/keymap.c | 32 +++++++ .../nebula68b/solder/keymaps/via/rules.mk | 1 + .../{nebula68b.c => solder/solder.c} | 2 - 16 files changed, 282 insertions(+), 156 deletions(-) create mode 100755 keyboards/spaceholdings/nebula68b/hs/keyboard.json create mode 100755 keyboards/spaceholdings/nebula68b/hs/keymaps/via/keymap.c rename keyboards/spaceholdings/nebula68b/{ => hs}/keymaps/via/rules.mk (100%) delete mode 100644 keyboards/spaceholdings/nebula68b/hs/rules.mk create mode 100644 keyboards/spaceholdings/nebula68b/info.json mode change 100755 => 100644 keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c delete mode 100755 keyboards/spaceholdings/nebula68b/keymaps/default/readme.md delete mode 100755 keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c delete mode 100755 keyboards/spaceholdings/nebula68b/keymaps/via/readme.md create mode 100644 keyboards/spaceholdings/nebula68b/rules.mk rename keyboards/spaceholdings/nebula68b/{ => solder}/keyboard.json (76%) create mode 100755 keyboards/spaceholdings/nebula68b/solder/keymaps/default_split_bs/keymap.c create mode 100755 keyboards/spaceholdings/nebula68b/solder/keymaps/via/keymap.c create mode 100755 keyboards/spaceholdings/nebula68b/solder/keymaps/via/rules.mk rename keyboards/spaceholdings/nebula68b/{nebula68b.c => solder/solder.c} (97%) diff --git a/keyboards/spaceholdings/nebula68b/hs/keyboard.json b/keyboards/spaceholdings/nebula68b/hs/keyboard.json new file mode 100755 index 00000000000..ca41cff8e64 --- /dev/null +++ b/keyboards/spaceholdings/nebula68b/hs/keyboard.json @@ -0,0 +1,86 @@ +{ + "keyboard_name": "NEBULA68B HOTSWAP", + "community_layouts": ["68_ansi"], + "layouts": { + "LAYOUT_68_ansi": { + "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, "w": 2}, + + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [2, 14], "x": 16.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [3, 14], "x": 16.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [3, 13], "x": 15.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 14.25, "y": 4}, + {"matrix": [4, 13], "x": 15.25, "y": 4}, + {"matrix": [4, 14], "x": 16.25, "y": 4} + ] + } + } +} diff --git a/keyboards/spaceholdings/nebula68b/hs/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68b/hs/keymaps/via/keymap.c new file mode 100755 index 00000000000..c42ca071f3f --- /dev/null +++ b/keyboards/spaceholdings/nebula68b/hs/keymaps/via/keymap.c @@ -0,0 +1,32 @@ +/* Copyright 2021 Yiancar + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_68_ansi( /* Base */ + QK_GESC, 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_INS, KC_PGUP, + 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_DEL, KC_PGDN, + 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_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + +[1] = LAYOUT_68_ansi( /* FN */ + 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, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/spaceholdings/nebula68b/keymaps/via/rules.mk b/keyboards/spaceholdings/nebula68b/hs/keymaps/via/rules.mk similarity index 100% rename from keyboards/spaceholdings/nebula68b/keymaps/via/rules.mk rename to keyboards/spaceholdings/nebula68b/hs/keymaps/via/rules.mk diff --git a/keyboards/spaceholdings/nebula68b/hs/rules.mk b/keyboards/spaceholdings/nebula68b/hs/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/spaceholdings/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json new file mode 100644 index 00000000000..3a7f6f9b25d --- /dev/null +++ b/keyboards/spaceholdings/nebula68b/info.json @@ -0,0 +1,82 @@ +{ + "manufacturer": "Yiancar-Designs", + "url": "", + "maintainer": "yiancar", + "usb": { + "vid": "0x8968", + "pid": "0x5338", + "device_version": "0.0.1" + }, + "ws2812": { + "pin": "B7" + }, + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "driver": "ws2812", + "max_brightness": 130, + "sleep": true + }, + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["D4", "D6", "D7", "B4", "E6"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c old mode 100755 new mode 100644 index 08c433bdb1a..c42ca071f3f --- a/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c +++ b/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c @@ -16,17 +16,17 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT_68_ansi_split_bs( /* Base */ - QK_GESC, 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_DEL, KC_BSPC, KC_INS, KC_PGUP, - 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_DEL, KC_PGDN, - 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_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), +[0] = LAYOUT_68_ansi( /* Base */ + QK_GESC, 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_INS, KC_PGUP, + 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_DEL, KC_PGDN, + 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_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), -[1] = LAYOUT_68_ansi_split_bs( /* FN */ - 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_TRNS, KC_DEL, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) +[1] = LAYOUT_68_ansi( /* FN */ + 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, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, _______, _______) }; diff --git a/keyboards/spaceholdings/nebula68b/keymaps/default/readme.md b/keyboards/spaceholdings/nebula68b/keymaps/default/readme.md deleted file mode 100755 index a4a6c7facf7..00000000000 --- a/keyboards/spaceholdings/nebula68b/keymaps/default/readme.md +++ /dev/null @@ -1,7 +0,0 @@ -# The default keymap for Nebula68B. VIA support disabled. - -![Layer 0](https://i.imgur.com/dXyRwb1.png) - -![Layer 1](https://i.imgur.com/kxXnxVQ.png) - -Default layer is normal ANSI 68% diff --git a/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c deleted file mode 100755 index 87727200f43..00000000000 --- a/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 Yiancar - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT_68_ansi_split_bs( /* Base */ - QK_GESC, 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_DEL, KC_BSPC, KC_INS, KC_PGUP, - 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_DEL, KC_PGDN, - 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_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - -[1] = LAYOUT_68_ansi_split_bs( /* FN */ - 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_TRNS, KC_DEL, KC_TRNS, KC_TRNS, - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - -[2] = LAYOUT_68_ansi_split_bs( /* Empty for dynamic keymaps */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - -[3] = LAYOUT_68_ansi_split_bs( /* Empty for dynamic keymaps */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) -}; diff --git a/keyboards/spaceholdings/nebula68b/keymaps/via/readme.md b/keyboards/spaceholdings/nebula68b/keymaps/via/readme.md deleted file mode 100755 index 583ddc02cf8..00000000000 --- a/keyboards/spaceholdings/nebula68b/keymaps/via/readme.md +++ /dev/null @@ -1,7 +0,0 @@ -# The default keymap for Nebula68B. VIA support enabled. - -![Layer 0](https://i.imgur.com/dXyRwb1.png) - -![Layer 1](https://i.imgur.com/kxXnxVQ.png) - -Default layer is normal ANSI 68% diff --git a/keyboards/spaceholdings/nebula68b/readme.md b/keyboards/spaceholdings/nebula68b/readme.md index 4c238e2ea0a..6ff3bc2b913 100755 --- a/keyboards/spaceholdings/nebula68b/readme.md +++ b/keyboards/spaceholdings/nebula68b/readme.md @@ -12,7 +12,9 @@ This is a standard fixed layout 68% PCB. It supports VIA, full per-key RGB and u Make example for this keyboard (after setting up your build environment): - make spaceholdings/nebula68b:via + make spaceholdings/nebula68b/hs:via + make spaceholdings/nebula68b/solder:via + 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). diff --git a/keyboards/spaceholdings/nebula68b/rules.mk b/keyboards/spaceholdings/nebula68b/rules.mk new file mode 100644 index 00000000000..8fe37f83b32 --- /dev/null +++ b/keyboards/spaceholdings/nebula68b/rules.mk @@ -0,0 +1 @@ +DEFAULT_FOLDER = spaceholdings/nebula68b/solder diff --git a/keyboards/spaceholdings/nebula68b/keyboard.json b/keyboards/spaceholdings/nebula68b/solder/keyboard.json similarity index 76% rename from keyboards/spaceholdings/nebula68b/keyboard.json rename to keyboards/spaceholdings/nebula68b/solder/keyboard.json index 3be1f806391..3a50385fe33 100755 --- a/keyboards/spaceholdings/nebula68b/keyboard.json +++ b/keyboards/spaceholdings/nebula68b/solder/keyboard.json @@ -1,85 +1,5 @@ { - "keyboard_name": "NEBULA68B", - "manufacturer": "Yiancar-Designs", - "url": "", - "maintainer": "yiancar", - "usb": { - "vid": "0x8968", - "pid": "0x5338", - "device_version": "0.0.1" - }, - "ws2812": { - "pin": "B7" - }, - "rgb_matrix": { - "animations": { - "alphas_mods": true, - "gradient_up_down": true, - "gradient_left_right": true, - "breathing": true, - "band_sat": true, - "band_val": true, - "band_pinwheel_sat": true, - "band_pinwheel_val": true, - "band_spiral_sat": true, - "band_spiral_val": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "rainbow_pinwheels": true, - "raindrops": true, - "jellybean_raindrops": true, - "hue_breathing": true, - "hue_pendulum": true, - "hue_wave": true, - "pixel_rain": true, - "pixel_flow": true, - "pixel_fractal": true, - "typing_heatmap": true, - "digital_rain": true, - "solid_reactive_simple": true, - "solid_reactive": true, - "solid_reactive_wide": true, - "solid_reactive_multiwide": true, - "solid_reactive_cross": true, - "solid_reactive_multicross": true, - "solid_reactive_nexus": true, - "solid_reactive_multinexus": true, - "splash": true, - "multisplash": true, - "solid_splash": true, - "solid_multisplash": true - }, - "driver": "ws2812", - "max_brightness": 130, - "sleep": true - }, - "build": { - "lto": true - }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true, - "rgb_matrix": true - }, - "matrix_pins": { - "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], - "rows": ["D4", "D6", "D7", "B4", "E6"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega32u4", - "bootloader": "atmel-dfu", + "keyboard_name": "NEBULA68B SOLDER", "community_layouts": ["68_ansi"], "layouts": { "LAYOUT_68_ansi": { diff --git a/keyboards/spaceholdings/nebula68b/solder/keymaps/default_split_bs/keymap.c b/keyboards/spaceholdings/nebula68b/solder/keymaps/default_split_bs/keymap.c new file mode 100755 index 00000000000..68fe5d22fd4 --- /dev/null +++ b/keyboards/spaceholdings/nebula68b/solder/keymaps/default_split_bs/keymap.c @@ -0,0 +1,32 @@ +/* Copyright 2021 Yiancar + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_68_ansi_split_bs( /* Base */ + QK_GESC, 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_DEL, KC_BSPC, KC_INS, KC_PGUP, + 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_DEL, KC_PGDN, + 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_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + +[1] = LAYOUT_68_ansi_split_bs( /* FN */ + 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, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/spaceholdings/nebula68b/solder/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68b/solder/keymaps/via/keymap.c new file mode 100755 index 00000000000..68fe5d22fd4 --- /dev/null +++ b/keyboards/spaceholdings/nebula68b/solder/keymaps/via/keymap.c @@ -0,0 +1,32 @@ +/* Copyright 2021 Yiancar + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_68_ansi_split_bs( /* Base */ + QK_GESC, 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_DEL, KC_BSPC, KC_INS, KC_PGUP, + 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_DEL, KC_PGDN, + 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_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + +[1] = LAYOUT_68_ansi_split_bs( /* FN */ + 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, _______, _______, + _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/spaceholdings/nebula68b/solder/keymaps/via/rules.mk b/keyboards/spaceholdings/nebula68b/solder/keymaps/via/rules.mk new file mode 100755 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/spaceholdings/nebula68b/solder/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/spaceholdings/nebula68b/nebula68b.c b/keyboards/spaceholdings/nebula68b/solder/solder.c similarity index 97% rename from keyboards/spaceholdings/nebula68b/nebula68b.c rename to keyboards/spaceholdings/nebula68b/solder/solder.c index b99777ff5be..352cee1d52b 100755 --- a/keyboards/spaceholdings/nebula68b/nebula68b.c +++ b/keyboards/spaceholdings/nebula68b/solder/solder.c @@ -16,7 +16,6 @@ #include "quantum.h" -#ifndef KEYBOARD_spaceholdings_nebula68b_hs #ifdef RGB_MATRIX_ENABLE // clang-format off led_config_t g_led_config = { { @@ -40,4 +39,3 @@ led_config_t g_led_config = { { } }; // clang-format on #endif -#endif From 408f6e43cd2522b6a4073bedcfbe2ee7df2603dd Mon Sep 17 00:00:00 2001 From: DOIO2022 <116554792+DOIO2022@users.noreply.github.com> Date: Wed, 3 Apr 2024 07:36:49 +0800 Subject: [PATCH 16/40] Change the VID and PID of the file kb38 info.json (#23393) --- keyboards/doio/kb38/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/info.json index a89c5951e39..a1775a2b107 100644 --- a/keyboards/doio/kb38/info.json +++ b/keyboards/doio/kb38/info.json @@ -21,8 +21,8 @@ "processor": "atmega32u4", "usb": { "device_version": "1.0.0", - "pid": "0x0000", - "vid": "0xFEED" + "pid": "0x3801", + "vid": "0xD010" }, "encoder": { "rotary": [ From c635733a7fd48c6692d818ac8621571cbc5f470a Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 3 Apr 2024 10:44:25 +1100 Subject: [PATCH 17/40] Remove `quantum.h` includes from keyboard code (#23394) --- keyboards/25keys/cassette42/common/oled_helper.c | 4 +++- .../keymaps/default_pimoroni/pimoroni_trackball.c | 4 ++++ .../keymaps/default_pimoroni/pimoroni_trackball.h | 4 +++- keyboards/annepro2/annepro2_ble.h | 1 - .../lib/satisfaction75/satisfaction_core.c | 3 +++ .../lib/satisfaction75/satisfaction_core.h | 3 ++- .../lib/satisfaction75/satisfaction_encoder.c | 1 + .../lib/satisfaction75/satisfaction_oled.c | 8 ++++++++ keyboards/clueboard/2x1800/2021/max7219.c | 4 ++++ keyboards/clueboard/2x1800/2021/max7219.h | 6 ++++-- keyboards/converter/usb_usb/custom_matrix.cpp | 4 ---- keyboards/converter/xt_usb/xt.h | 3 ++- keyboards/duck/duck_led/duck_led.c | 3 +-- keyboards/duck/jetfire/indicator_leds.c | 5 +---- keyboards/duck/jetfire/indicator_leds.h | 2 ++ keyboards/fallacy/indicators.h | 3 +-- keyboards/handwired/d48/taphold.c | 3 +++ keyboards/handwired/d48/taphold.h | 4 +++- .../dactyl_minidox/{3x5_3.c => dactyl_minidox.c} | 0 keyboards/handwired/dygma/raise/leds.c | 6 +++--- keyboards/handwired/dygma/raise/leds.h | 3 +-- keyboards/handwired/lagrange/transport.c | 4 +--- .../handwired/promethium/keymaps/default/keymap.c | 1 - keyboards/horrortroll/nyx/rev1/{nyx.c => rev1.c} | 0 keyboards/hotdox/left.c | 1 + keyboards/hotdox/left.h | 4 ---- keyboards/idobao/id61/keymaps/idobao/specialk.c | 3 +++ keyboards/idobao/id61/keymaps/idobao/specialk.h | 3 +-- keyboards/input_club/k_type/i2c_master.c | 5 +++-- keyboards/kagizaraya/chidori/board.c | 1 - keyboards/keyboardio/model01/leds.c | 3 ++- keyboards/keyboardio/model01/leds.h | 3 +-- keyboards/matrix/m20add/rgb_ring.c | 4 ++++ keyboards/miiiw/common/shift_register.c | 2 +- keyboards/miiiw/common/shift_register.h | 1 + keyboards/mntre_v3/{mntre.c => mntre_v3.c} | 0 keyboards/molecule/adns.c | 2 +- keyboards/molecule/adns.h | 2 ++ keyboards/nullbitsco/common/bitc_led.h | 3 ++- keyboards/nullbitsco/common/remote_kb.c | 3 +++ keyboards/nullbitsco/common/remote_kb.h | 3 ++- keyboards/nullbitsco/nibble/big_led.h | 3 ++- .../nibble/keymaps/oled_status/oled_display.c | 9 ++++++++- .../nibble/keymaps/oled_status/oled_display.h | 2 ++ keyboards/rocketboard_16/keycode_lookup.c | 5 ++++- keyboards/rocketboard_16/keycode_lookup.h | 2 +- keyboards/sirius/unigo66/custom_matrix.cpp | 4 ---- keyboards/stront/keymaps/hid/hid_display.h | 3 ++- keyboards/wilba_tech/via_test.c | 1 - keyboards/wilba_tech/wt_mono_backlight.c | 5 ++--- keyboards/wilba_tech/wt_mono_backlight.h | 1 + keyboards/wilba_tech/wt_rgb_backlight.c | 14 +++++--------- keyboards/wilba_tech/wt_rgb_backlight.h | 1 + keyboards/wilba_tech/wt_rgb_backlight_keycodes.h | 2 ++ keyboards/work_louder/rgb_functions.c | 5 +++++ keyboards/work_louder/rgb_functions.h | 2 +- keyboards/yushakobo/navpad/navpad_prefs.c | 5 +++++ keyboards/yushakobo/navpad/navpad_prefs.h | 2 +- keyboards/yushakobo/quick17/quick17_prefs.h | 4 +++- keyboards/yushakobo/quick17/rgb_matrix_kb.inc | 1 + 60 files changed, 123 insertions(+), 70 deletions(-) rename keyboards/handwired/dactyl_minidox/{3x5_3.c => dactyl_minidox.c} (100%) rename keyboards/horrortroll/nyx/rev1/{nyx.c => rev1.c} (100%) rename keyboards/mntre_v3/{mntre.c => mntre_v3.c} (100%) diff --git a/keyboards/25keys/cassette42/common/oled_helper.c b/keyboards/25keys/cassette42/common/oled_helper.c index 1c4148a7d9f..83832a99474 100644 --- a/keyboards/25keys/cassette42/common/oled_helper.c +++ b/keyboards/25keys/cassette42/common/oled_helper.c @@ -1,5 +1,7 @@ #include "oled_helper.h" -#include "quantum.h" +#include "progmem.h" +#include "rgblight.h" +#include "oled_driver.h" #include #include diff --git a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c index 0db58bfabd6..c32f2a04d21 100644 --- a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c +++ b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c @@ -14,8 +14,12 @@ * along with this program. If not, see . */ +#include QMK_KEYBOARD_H #include "pimoroni_trackball.h" #include "i2c_master.h" +#include "action.h" +#include "timer.h" +#include "print.h" static uint8_t scrolling = 0; static int16_t x_offset = 0; diff --git a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h index ca2559bec74..d85d4e60a9c 100644 --- a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h +++ b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.h @@ -16,8 +16,10 @@ #pragma once -#include "quantum.h" +#include +#include #include "pointing_device.h" +#include "report.h" #ifndef TRACKBALL_ADDRESS # define TRACKBALL_ADDRESS (0x0A << 1) diff --git a/keyboards/annepro2/annepro2_ble.h b/keyboards/annepro2/annepro2_ble.h index 0cfb68e0716..37dd6d31a1c 100644 --- a/keyboards/annepro2/annepro2_ble.h +++ b/keyboards/annepro2/annepro2_ble.h @@ -17,7 +17,6 @@ #pragma once #include "annepro2.h" -#include "quantum.h" void annepro2_ble_bootload(void); void annepro2_ble_startup(void); diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c index e148ae468a6..6f76582e4b2 100644 --- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c +++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c @@ -4,6 +4,9 @@ #include "satisfaction_core.h" #include "print.h" #include "debug.h" +#include "matrix.h" +#include "quantum.h" +#include "encoder.h" #include #include diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h index 9c466421952..70ee2a3fdaf 100644 --- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h +++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h @@ -3,7 +3,8 @@ #pragma once -#include "quantum.h" +#include +#include #include "via.h" // only for EEPROM address #include "satisfaction_keycodes.h" diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c index 7122091ea3c..074fe262b3b 100644 --- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c +++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c @@ -2,6 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "satisfaction_core.h" +#include "backlight.h" #include "eeprom.h" void pre_encoder_mode_change(void){ diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c index 18ae368e535..0361453c52b 100644 --- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c +++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c @@ -2,6 +2,14 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "satisfaction_core.h" +#include "action_layer.h" +#include "action_util.h" +#include "timer.h" +#include "matrix.h" +#include "led.h" +#include "host.h" +#include "oled_driver.h" +#include "progmem.h" #include void draw_default(void); diff --git a/keyboards/clueboard/2x1800/2021/max7219.c b/keyboards/clueboard/2x1800/2021/max7219.c index 1ba22362fe4..81d26b9a518 100644 --- a/keyboards/clueboard/2x1800/2021/max7219.c +++ b/keyboards/clueboard/2x1800/2021/max7219.c @@ -40,6 +40,10 @@ */ #include "max7219.h" +#include "spi_master.h" +#include "debug.h" +#include "gpio.h" +#include "wait.h" #include "font.h" // Datastructures diff --git a/keyboards/clueboard/2x1800/2021/max7219.h b/keyboards/clueboard/2x1800/2021/max7219.h index 95d1d9389d1..6d78345d5d9 100644 --- a/keyboards/clueboard/2x1800/2021/max7219.h +++ b/keyboards/clueboard/2x1800/2021/max7219.h @@ -26,8 +26,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once -#include "quantum.h" -#include "spi_master.h" + +#include +#include +#include // Set defaults if they're not set #ifndef MAX7219_LOAD diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp index f5f751da14f..ca0855a82b9 100644 --- a/keyboards/converter/usb_usb/custom_matrix.cpp +++ b/keyboards/converter/usb_usb/custom_matrix.cpp @@ -35,10 +35,6 @@ along with this program. If not, see . #include "host.h" #include "keyboard.h" -extern "C" { -#include "quantum.h" -} - /* KEY CODE to Matrix * * HID keycode(1 byte): diff --git a/keyboards/converter/xt_usb/xt.h b/keyboards/converter/xt_usb/xt.h index 538ff0e459f..e9c1c7751d8 100644 --- a/keyboards/converter/xt_usb/xt.h +++ b/keyboards/converter/xt_usb/xt.h @@ -38,7 +38,8 @@ POSSIBILITY OF SUCH DAMAGE. #pragma once -#include "quantum.h" +#include +#include "gpio.h" #define XT_DATA_IN() \ do { \ diff --git a/keyboards/duck/duck_led/duck_led.c b/keyboards/duck/duck_led/duck_led.c index 2fa920e4b61..ce9bd0fde10 100644 --- a/keyboards/duck/duck_led/duck_led.c +++ b/keyboards/duck/duck_led/duck_led.c @@ -1,6 +1,5 @@ -#include #include "duck_led.h" -#include "quantum.h" +#include "wait.h" void show(void) { wait_us((RES / 1000UL) + 1); diff --git a/keyboards/duck/jetfire/indicator_leds.c b/keyboards/duck/jetfire/indicator_leds.c index 7dbdb1ff79b..200a9ce6ff6 100644 --- a/keyboards/duck/jetfire/indicator_leds.c +++ b/keyboards/duck/jetfire/indicator_leds.c @@ -12,13 +12,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#include "indicator_leds.h" #include #include -#include #include -#include -#include "indicator_leds.h" -#include "quantum.h" #define LED_T1H 900 #define LED_T1L 600 diff --git a/keyboards/duck/jetfire/indicator_leds.h b/keyboards/duck/jetfire/indicator_leds.h index 36dda632fbc..27dcc1535b0 100644 --- a/keyboards/duck/jetfire/indicator_leds.h +++ b/keyboards/duck/jetfire/indicator_leds.h @@ -1,5 +1,7 @@ #pragma once +#include +#include #include "duck_led/duck_led.h" void backlight_init_ports(void); diff --git a/keyboards/fallacy/indicators.h b/keyboards/fallacy/indicators.h index 6de374cda8e..838a698f7b2 100755 --- a/keyboards/fallacy/indicators.h +++ b/keyboards/fallacy/indicators.h @@ -15,8 +15,7 @@ */ #pragma once -#include "quantum.h" - +#include void init_fallacy_leds(void); void update_fallacy_leds(void); diff --git a/keyboards/handwired/d48/taphold.c b/keyboards/handwired/d48/taphold.c index 0b56a5a6a10..5360391b970 100644 --- a/keyboards/handwired/d48/taphold.c +++ b/keyboards/handwired/d48/taphold.c @@ -1,4 +1,7 @@ #include "taphold.h" +#include "action_layer.h" +#include "keyboard.h" +#include "timer.h" bool taphold_process(uint16_t keycode, keyrecord_t *record) { for (int i = 0; i < taphold_config_size; i++) { diff --git a/keyboards/handwired/d48/taphold.h b/keyboards/handwired/d48/taphold.h index 2a691aa63f6..8788c58f3d9 100644 --- a/keyboards/handwired/d48/taphold.h +++ b/keyboards/handwired/d48/taphold.h @@ -1,6 +1,8 @@ #pragma once -#include "quantum.h" +#include +#include +#include "action.h" typedef enum taphold_mode_t { TAPHOLD_LAYER, diff --git a/keyboards/handwired/dactyl_minidox/3x5_3.c b/keyboards/handwired/dactyl_minidox/dactyl_minidox.c similarity index 100% rename from keyboards/handwired/dactyl_minidox/3x5_3.c rename to keyboards/handwired/dactyl_minidox/dactyl_minidox.c diff --git a/keyboards/handwired/dygma/raise/leds.c b/keyboards/handwired/dygma/raise/leds.c index 53fa3892069..ad156445793 100644 --- a/keyboards/handwired/dygma/raise/leds.c +++ b/keyboards/handwired/dygma/raise/leds.c @@ -14,15 +14,15 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "leds.h" +#include #include "i2c_master.h" #include "led_tables.h" #include "rgb_matrix.h" -#include +#include "wait.h" #include "raise.h" #include "wire-protocol-constants.h" #include "print.h" -#include "leds.h" // Color order of LEDs is Green, Red, Blue. typedef struct PACKED { diff --git a/keyboards/handwired/dygma/raise/leds.h b/keyboards/handwired/dygma/raise/leds.h index c25a4326a90..1b7bfce2e2d 100644 --- a/keyboards/handwired/dygma/raise/leds.h +++ b/keyboards/handwired/dygma/raise/leds.h @@ -16,8 +16,7 @@ #pragma once -#include "quantum.h" -#include "rgb_matrix.h" +#include extern const uint8_t led_map[RGB_MATRIX_LED_COUNT]; diff --git a/keyboards/handwired/lagrange/transport.c b/keyboards/handwired/lagrange/transport.c index 8f6973925ff..ec91cff3068 100644 --- a/keyboards/handwired/lagrange/transport.c +++ b/keyboards/handwired/lagrange/transport.c @@ -14,9 +14,7 @@ * along with this program. If not, see . */ -#include - -#include "quantum.h" +#include "spi_master.h" #include "split_util.h" #include "transport.h" #include "timer.h" diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c index ff73e51d5eb..8af82d8297c 100644 --- a/keyboards/handwired/promethium/keymaps/default/keymap.c +++ b/keyboards/handwired/promethium/keymaps/default/keymap.c @@ -22,7 +22,6 @@ along with this program. If not, see . #endif #include "eeconfig.h" #include "process_unicode.h" -#include "quantum.h" #ifdef RGBSPS_ENABLE #include "rgbsps.h" #include "rgbtheme.h" diff --git a/keyboards/horrortroll/nyx/rev1/nyx.c b/keyboards/horrortroll/nyx/rev1/rev1.c similarity index 100% rename from keyboards/horrortroll/nyx/rev1/nyx.c rename to keyboards/horrortroll/nyx/rev1/rev1.c diff --git a/keyboards/hotdox/left.c b/keyboards/hotdox/left.c index 5196fb3115e..ac513224767 100644 --- a/keyboards/hotdox/left.c +++ b/keyboards/hotdox/left.c @@ -1,5 +1,6 @@ #include "action.h" #include "left.h" +#include "print.h" #include "wait.h" bool i2c_initialized = false; diff --git a/keyboards/hotdox/left.h b/keyboards/hotdox/left.h index 32faadba219..931d98d8e56 100644 --- a/keyboards/hotdox/left.h +++ b/keyboards/hotdox/left.h @@ -1,9 +1,7 @@ #pragma once -#include "quantum.h" #include #include "i2c_master.h" -#include #define MCP23017 #define MCP23017_A0 0 @@ -43,8 +41,6 @@ void left_scan(void); uint8_t left_read_cols(void); uint8_t left_get_col(uint8_t col); -matrix_row_t left_read_row(void); - void left_unselect_rows(void); void left_select_row(uint8_t row); diff --git a/keyboards/idobao/id61/keymaps/idobao/specialk.c b/keyboards/idobao/id61/keymaps/idobao/specialk.c index 03a31e68049..9b7e481d682 100644 --- a/keyboards/idobao/id61/keymaps/idobao/specialk.c +++ b/keyboards/idobao/id61/keymaps/idobao/specialk.c @@ -2,6 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "specialk.h" +#include "keycodes.h" +#include "action_layer.h" +#include "action_util.h" bool delkey_registered = false; uint32_t __keycode_raised = 0; diff --git a/keyboards/idobao/id61/keymaps/idobao/specialk.h b/keyboards/idobao/id61/keymaps/idobao/specialk.h index a2ec124de8a..a79cde5953f 100644 --- a/keyboards/idobao/id61/keymaps/idobao/specialk.h +++ b/keyboards/idobao/id61/keymaps/idobao/specialk.h @@ -5,8 +5,7 @@ #include #include -#include "util.h" -#include "quantum.h" +#include "action.h" bool ID61_process_special_k(uint16_t keycode, keyrecord_t *record, bool arrow_mode, uint8_t k_norm, uint8_t k_spcl, uint8_t k_altr); bool ID61_backspace_special(uint16_t keycode, keyrecord_t *record); diff --git a/keyboards/input_club/k_type/i2c_master.c b/keyboards/input_club/k_type/i2c_master.c index e25ae2ef6f1..a55b2fb38ce 100644 --- a/keyboards/input_club/k_type/i2c_master.c +++ b/keyboards/input_club/k_type/i2c_master.c @@ -27,10 +27,11 @@ #ifdef RGB_MATRIX_ENABLE - -#include "quantum.h" #include "i2c_master.h" +#include "gpio.h" +#include "chibios_config.h" #include +#include #include static uint8_t i2c_address; diff --git a/keyboards/kagizaraya/chidori/board.c b/keyboards/kagizaraya/chidori/board.c index 34e57a88741..2834f7625b8 100644 --- a/keyboards/kagizaraya/chidori/board.c +++ b/keyboards/kagizaraya/chidori/board.c @@ -19,7 +19,6 @@ #include "print.h" #include "debug.h" #include "matrix.h" -#include "quantum.h" #include "board.h" #include "i2c_master.h" diff --git a/keyboards/keyboardio/model01/leds.c b/keyboards/keyboardio/model01/leds.c index 3fb502cb27d..656e176bfad 100644 --- a/keyboards/keyboardio/model01/leds.c +++ b/keyboards/keyboardio/model01/leds.c @@ -13,7 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "quantum.h" + +#include "leds.h" #include "i2c_master.h" #include "led_tables.h" #include "rgb_matrix.h" diff --git a/keyboards/keyboardio/model01/leds.h b/keyboards/keyboardio/model01/leds.h index 4d185919b00..6f5e12a6a84 100644 --- a/keyboards/keyboardio/model01/leds.h +++ b/keyboards/keyboardio/model01/leds.h @@ -15,8 +15,7 @@ */ #pragma once -#include "quantum.h" -#include "rgb_matrix.h" +#include void set_all_leds_to(uint8_t r, uint8_t g, uint8_t b); void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b); diff --git a/keyboards/matrix/m20add/rgb_ring.c b/keyboards/matrix/m20add/rgb_ring.c index f32875cf4f7..ecdac9130a6 100644 --- a/keyboards/matrix/m20add/rgb_ring.c +++ b/keyboards/matrix/m20add/rgb_ring.c @@ -18,9 +18,13 @@ #include "rgb_ring.h" +#include +#include #include #include "quantum.h" #include "rgblight.h" +#include "timer.h" +#include "action.h" #include "drivers/led/issi/is31fl3731.h" #include "i2c_master.h" diff --git a/keyboards/miiiw/common/shift_register.c b/keyboards/miiiw/common/shift_register.c index 1f21c124683..2c9259180ea 100644 --- a/keyboards/miiiw/common/shift_register.c +++ b/keyboards/miiiw/common/shift_register.c @@ -14,8 +14,8 @@ * along with this program. If not, see . */ -#include "quantum.h" #include "shift_register.h" +#include static void shift_out(void); diff --git a/keyboards/miiiw/common/shift_register.h b/keyboards/miiiw/common/shift_register.h index f9895e63f82..8d72149be23 100644 --- a/keyboards/miiiw/common/shift_register.h +++ b/keyboards/miiiw/common/shift_register.h @@ -16,6 +16,7 @@ #pragma once +#include #include "gpio.h" #ifndef GPIOH_BASE diff --git a/keyboards/mntre_v3/mntre.c b/keyboards/mntre_v3/mntre_v3.c similarity index 100% rename from keyboards/mntre_v3/mntre.c rename to keyboards/mntre_v3/mntre_v3.c diff --git a/keyboards/molecule/adns.c b/keyboards/molecule/adns.c index 96fc83ee0b5..0648193557e 100644 --- a/keyboards/molecule/adns.c +++ b/keyboards/molecule/adns.c @@ -16,7 +16,7 @@ #include "spi_master.h" #include "adns.h" #include "debug.h" -#include "quantum.h" +#include "wait.h" #include "pointing_device.h" #include "adns9800_srom_A6.h" diff --git a/keyboards/molecule/adns.h b/keyboards/molecule/adns.h index d684d3cbcb1..e557aeb2ece 100644 --- a/keyboards/molecule/adns.h +++ b/keyboards/molecule/adns.h @@ -15,6 +15,8 @@ */ #pragma once +#include + void adns_begin(void); void adns_end(void); diff --git a/keyboards/nullbitsco/common/bitc_led.h b/keyboards/nullbitsco/common/bitc_led.h index 14cd4f15b7d..c649f1c1dd5 100644 --- a/keyboards/nullbitsco/common/bitc_led.h +++ b/keyboards/nullbitsco/common/bitc_led.h @@ -15,7 +15,8 @@ */ #pragma once -#include "quantum.h" +#include +#include "gpio.h" #define LED_ON 2 #define LED_DIM 1 diff --git a/keyboards/nullbitsco/common/remote_kb.c b/keyboards/nullbitsco/common/remote_kb.c index 8e3f7f6766d..bd2b396e6b5 100644 --- a/keyboards/nullbitsco/common/remote_kb.c +++ b/keyboards/nullbitsco/common/remote_kb.c @@ -27,7 +27,10 @@ This will require a new communication protocol, as the current one is limited. */ #include "remote_kb.h" +#include "quantum.h" #include "uart.h" +#include "wait.h" +#include "debug.h" uint8_t msg[UART_MSG_LEN], diff --git a/keyboards/nullbitsco/common/remote_kb.h b/keyboards/nullbitsco/common/remote_kb.h index da124bf5f4e..97d299189df 100644 --- a/keyboards/nullbitsco/common/remote_kb.h +++ b/keyboards/nullbitsco/common/remote_kb.h @@ -15,7 +15,8 @@ */ #pragma once -#include "quantum.h" +#include +#include "action.h" #define SERIAL_UART_BAUD 76800 //low error rate for 32u4 @ 16MHz diff --git a/keyboards/nullbitsco/nibble/big_led.h b/keyboards/nullbitsco/nibble/big_led.h index 4ebcc35f08e..1198d3490bb 100644 --- a/keyboards/nullbitsco/nibble/big_led.h +++ b/keyboards/nullbitsco/nibble/big_led.h @@ -15,7 +15,8 @@ */ #pragma once -#include "quantum.h" +#include +#include "gpio.h" /* Optional big LED pins */ #define BIG_LED_R_PIN D7 diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c index c734e80cefe..11a0e1f11eb 100644 --- a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c +++ b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c @@ -13,8 +13,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "quantum.h" + #include "oled_display.h" +#include "keycodes.h" +#include "progmem.h" +#include "host.h" +#include "timer.h" +#include "wpm.h" +#include "rgblight.h" +#include "oled_driver.h" static const char PROGMEM oled_mode_messages[5][15] = { "", diff --git a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h index bd59d44b413..7f2b5e1e779 100644 --- a/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h +++ b/keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h @@ -15,6 +15,8 @@ */ #pragma once +#include + typedef enum { OLED_MODE_IDLE = 0, OLED_MODE_VOLUME_UP = 1, diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c index 61b73bd0c03..cb8b0330c2f 100644 --- a/keyboards/rocketboard_16/keycode_lookup.c +++ b/keyboards/rocketboard_16/keycode_lookup.c @@ -15,8 +15,11 @@ */ #include "keycode_lookup.h" +#include "quantum_keycodes.h" +#include "keymap_us.h" #include "print.h" #include "via.h" +#include "util.h" #define num_keycodes ARRAY_SIZE(lookup_table) static char UNKNOWN_KEYCODE[] = "UNKNOWN"; @@ -289,7 +292,7 @@ lookup_table_t lookup_table[333] = {"KC_QUES", KC_QUES}, {"QK_BOOT", QK_BOOT}, {"DB_TOGG", DB_TOGG}, - {"MAGIC_TOGGLE_NKRO", MAGIC_TOGGLE_NKRO}, + {"NK_TOGG", NK_TOGG}, {"QK_GESC", QK_GESC}, {"AU_ON", AU_ON}, {"AU_OFF", AU_OFF}, diff --git a/keyboards/rocketboard_16/keycode_lookup.h b/keyboards/rocketboard_16/keycode_lookup.h index 35f0b66f25f..06f0efb53b6 100644 --- a/keyboards/rocketboard_16/keycode_lookup.h +++ b/keyboards/rocketboard_16/keycode_lookup.h @@ -16,7 +16,7 @@ #pragma once -#include "quantum.h" +#include typedef struct { diff --git a/keyboards/sirius/unigo66/custom_matrix.cpp b/keyboards/sirius/unigo66/custom_matrix.cpp index 07c6df29819..25648a5f78e 100644 --- a/keyboards/sirius/unigo66/custom_matrix.cpp +++ b/keyboards/sirius/unigo66/custom_matrix.cpp @@ -35,10 +35,6 @@ along with this program. If not, see . #include "host.h" #include "keyboard.h" -extern "C" { -#include "quantum.h" -} - /* KEY CODE to Matrix * * HID keycode(1 byte): diff --git a/keyboards/stront/keymaps/hid/hid_display.h b/keyboards/stront/keymaps/hid/hid_display.h index b93bf647169..e823d3e8a4c 100644 --- a/keyboards/stront/keymaps/hid/hid_display.h +++ b/keyboards/stront/keymaps/hid/hid_display.h @@ -1,7 +1,8 @@ // Copyright 2023 zzeneg (@zzeneg) // SPDX-License-Identifier: GPL-2.0-or-later -#include "quantum.h" +#include +#include typedef enum { _QWERTY = 0, diff --git a/keyboards/wilba_tech/via_test.c b/keyboards/wilba_tech/via_test.c index 6a74df51643..314ec4472c3 100644 --- a/keyboards/wilba_tech/via_test.c +++ b/keyboards/wilba_tech/via_test.c @@ -14,7 +14,6 @@ // - add `#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 128` to config.h // (or change to match CHANNELS*VALUES*2) -#include "quantum.h" #include "via.h" #ifdef VIA_ENABLE diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c index 1523fbdb853..1426e09fc6f 100644 --- a/keyboards/wilba_tech/wt_mono_backlight.c +++ b/keyboards/wilba_tech/wt_mono_backlight.c @@ -14,16 +14,15 @@ * along with this program. If not, see . */ -#include "quantum.h" #include "wt_mono_backlight.h" #include "wt_rgb_backlight_api.h" // reuse these for now #include "wt_rgb_backlight_keycodes.h" // reuse these for now +#include #include #include "i2c_master.h" - +#include "host.h" #include "progmem.h" -#include "quantum/color.h" #include "eeprom.h" #include "via.h" // uses EEPROM address, lighting value IDs diff --git a/keyboards/wilba_tech/wt_mono_backlight.h b/keyboards/wilba_tech/wt_mono_backlight.h index 9bf76b44bb8..fb77ec66e19 100644 --- a/keyboards/wilba_tech/wt_mono_backlight.h +++ b/keyboards/wilba_tech/wt_mono_backlight.h @@ -19,6 +19,7 @@ #include #include +#include "action.h" #include "quantum/color.h" typedef struct PACKED diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c index d03d189b298..02bcdd610be 100644 --- a/keyboards/wilba_tech/wt_rgb_backlight.c +++ b/keyboards/wilba_tech/wt_rgb_backlight.c @@ -40,19 +40,15 @@ #error wt_rgb_backlight.c compiled without setting configuration symbol #endif -#ifndef MAX - #define MAX(X, Y) ((X) > (Y) ? (X) : (Y)) -#endif - -#ifndef MIN - #define MIN(a,b) ((a) < (b)? (a): (b)) -#endif - -#include "quantum.h" #include "wt_rgb_backlight.h" #include "wt_rgb_backlight_api.h" #include "wt_rgb_backlight_keycodes.h" +#include +#include "quantum.h" +#include "host.h" +#include "util.h" + #if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined (RGB_BACKLIGHT_KW_MEGA) #include #include "i2c_master.h" diff --git a/keyboards/wilba_tech/wt_rgb_backlight.h b/keyboards/wilba_tech/wt_rgb_backlight.h index 6fb2ee21220..56621781978 100644 --- a/keyboards/wilba_tech/wt_rgb_backlight.h +++ b/keyboards/wilba_tech/wt_rgb_backlight.h @@ -23,6 +23,7 @@ #include #include +#include "action.h" #include "quantum/color.h" typedef struct PACKED diff --git a/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h b/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h index b8c23c4b073..79016744af9 100644 --- a/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h +++ b/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h @@ -15,6 +15,8 @@ */ #pragma once +#include "keycodes.h" + enum wt_rgb_backlight_keycodes { BR_INC = QK_KB_0, // brightness increase BR_DEC, // brightness decrease diff --git a/keyboards/work_louder/rgb_functions.c b/keyboards/work_louder/rgb_functions.c index 36f9da013ec..bc31aab7c1f 100644 --- a/keyboards/work_louder/rgb_functions.c +++ b/keyboards/work_louder/rgb_functions.c @@ -15,6 +15,11 @@ */ #include "rgb_functions.h" +#include +#include "quantum.h" +#include "action.h" +#include "rgblight.h" +#include "rgb_matrix.h" #ifdef RGBLIGHT_ENABLE #undef WS2812_DI_PIN diff --git a/keyboards/work_louder/rgb_functions.h b/keyboards/work_louder/rgb_functions.h index 9ad7cdb19c1..eaef787a222 100644 --- a/keyboards/work_louder/rgb_functions.h +++ b/keyboards/work_louder/rgb_functions.h @@ -16,7 +16,7 @@ #pragma once -#include "quantum.h" +#include "keycodes.h" #ifndef VIA_ENABLE # ifndef RGB_MATRIX_TOGGLE diff --git a/keyboards/yushakobo/navpad/navpad_prefs.c b/keyboards/yushakobo/navpad/navpad_prefs.c index 1ffd4416744..08b7464cf95 100644 --- a/keyboards/yushakobo/navpad/navpad_prefs.c +++ b/keyboards/yushakobo/navpad/navpad_prefs.c @@ -15,6 +15,11 @@ */ #include "navpad_prefs.h" +#include "quantum.h" +#include "action.h" +#include "action_layer.h" +#include "rgblight.h" +#include "led.h" bool process_record_kb(uint16_t keycode, keyrecord_t *record) { if (!process_record_user(keycode, record)) { return false; } diff --git a/keyboards/yushakobo/navpad/navpad_prefs.h b/keyboards/yushakobo/navpad/navpad_prefs.h index d9d2286e5be..6c73e1ed07d 100644 --- a/keyboards/yushakobo/navpad/navpad_prefs.h +++ b/keyboards/yushakobo/navpad/navpad_prefs.h @@ -16,7 +16,7 @@ #pragma once -#include "quantum.h" +#include "keycodes.h" enum custom_keycodes { TAP_00 = QK_KB_0 diff --git a/keyboards/yushakobo/quick17/quick17_prefs.h b/keyboards/yushakobo/quick17/quick17_prefs.h index 25f2e1e0ae5..a498381cee5 100644 --- a/keyboards/yushakobo/quick17/quick17_prefs.h +++ b/keyboards/yushakobo/quick17/quick17_prefs.h @@ -16,7 +16,9 @@ #pragma once -#include "quantum.h" +#include +#include +#include "color.h" enum layer_names { _CONTROL, diff --git a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc index 34b410ce574..4998cce0291 100644 --- a/keyboards/yushakobo/quick17/rgb_matrix_kb.inc +++ b/keyboards/yushakobo/quick17/rgb_matrix_kb.inc @@ -3,6 +3,7 @@ RGB_MATRIX_EFFECT(quick17_rgbm_effect) #ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS #include "quick17_prefs.h" +#include "quantum.h" #define LED_LAYOUT(\ L00, L01, L02, L03, L04, L05, \ From 62af50ceeff95a49f381130008ed03fdb0cc9362 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 3 Apr 2024 14:01:30 +0100 Subject: [PATCH 18/40] Fix failing keyboards on develop (#23406) --- .../atreus/feather/{info.json => keyboard.json} | 3 +++ .../lib/satisfaction75/satisfaction_encoder.c | 4 +++- keyboards/cipulot/ec_typek/ec_typek.c | 12 ++++++------ .../symmetric70_proto/matrix_debug/matrix.c | 2 ++ .../symmetric70_proto/matrix_fast/gpio_extr.h | 3 +++ .../handwired/symmetric70_proto/matrix_fast/matrix.c | 1 + .../matrix_fast/matrix_extension_74hc15x.c | 4 ++++ 7 files changed, 22 insertions(+), 7 deletions(-) rename keyboards/atreus/feather/{info.json => keyboard.json} (90%) diff --git a/keyboards/atreus/feather/info.json b/keyboards/atreus/feather/keyboard.json similarity index 90% rename from keyboards/atreus/feather/info.json rename to keyboards/atreus/feather/keyboard.json index 19e9654f127..7f5866e502a 100644 --- a/keyboards/atreus/feather/info.json +++ b/keyboards/atreus/feather/keyboard.json @@ -10,6 +10,9 @@ "bluetooth": true, "console": false }, + "build": { + "lto": true + }, "bluetooth": { "driver": "bluefruit_le" } diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c index 074fe262b3b..aab005ebd87 100644 --- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c +++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c @@ -2,8 +2,10 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "satisfaction_core.h" -#include "backlight.h" #include "eeprom.h" +#ifdef BACKLIGHT_ENABLE +# include "backlight.h" +#endif void pre_encoder_mode_change(void){ if(encoder_mode == ENC_MODE_CLOCK_SET){ diff --git a/keyboards/cipulot/ec_typek/ec_typek.c b/keyboards/cipulot/ec_typek/ec_typek.c index 035c90303ca..7c3874d6b3f 100644 --- a/keyboards/cipulot/ec_typek/ec_typek.c +++ b/keyboards/cipulot/ec_typek/ec_typek.c @@ -101,19 +101,19 @@ layer_state_t layer_state_set_user(layer_state_t state) { */ bool indicators_callback(void) { if ((eeprom_ec_config.num.enabled) && (host_keyboard_led_state().num_lock)) - sethsv(eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]); + rgblight_sethsv_at(eeprom_ec_config.num.h, eeprom_ec_config.num.s, eeprom_ec_config.num.v, NUM_INDICATOR_INDEX); else - sethsv(0, 0, 0, (rgb_led_t *)&led[NUM_INDICATOR_INDEX]); + rgblight_sethsv_at(0, 0, 0, NUM_INDICATOR_INDEX); if ((eeprom_ec_config.caps.enabled) && (host_keyboard_led_state().caps_lock)) - sethsv(eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]); + rgblight_sethsv_at(eeprom_ec_config.caps.h, eeprom_ec_config.caps.s, eeprom_ec_config.caps.v, CAPS_INDICATOR_INDEX); else - sethsv(0, 0, 0, (rgb_led_t *)&led[CAPS_INDICATOR_INDEX]); + rgblight_sethsv_at(0, 0, 0, CAPS_INDICATOR_INDEX); if ((eeprom_ec_config.scroll.enabled) && (host_keyboard_led_state().scroll_lock)) - sethsv(eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]); + rgblight_sethsv_at(eeprom_ec_config.scroll.h, eeprom_ec_config.scroll.s, eeprom_ec_config.scroll.v, SCROLL_INDICATOR_INDEX); else - sethsv(0, 0, 0, (rgb_led_t *)&led[SCROLL_INDICATOR_INDEX]); + rgblight_sethsv_at(0, 0, 0, SCROLL_INDICATOR_INDEX); return true; } diff --git a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c index 22d92dd99a1..d6fcb0f7939 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c +++ b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c @@ -14,7 +14,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#include "atomic_util.h" #include "util.h" +#include "wait.h" #include "matrix.h" #include "debounce.h" #ifndef readPort diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h b/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h index e31cb5f3a5d..437fa93a201 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h @@ -1,4 +1,7 @@ #pragma once + +#include + // clang-format off #if defined(__AVR__) diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c index 3acbdfbeda6..842df65dbd6 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c @@ -18,6 +18,7 @@ along with this program. If not, see . #ifndef readPort # include "gpio_extr.h" #endif +#include "atomic_util.h" #include "util.h" #include "matrix.h" #include "matrix_extr.h" diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c index bca53da24c2..202454a2215 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c @@ -16,6 +16,10 @@ along with this program. If not, see . */ // clang-format off +#include "atomic_util.h" +#include "gpio.h" +#include "wait.h" + #if defined(MATRIX_EXTENSION_74HC157) # define MATRIX_DEVICES MCU_GPIOa, MCU_GPIOb # define IS_74HC15x(dev) ((dev)==MCU_GPIOa || (dev)==MCU_GPIOb) From f29daff9b6ed178d1d9c3bdb5d504ca8782f8d5a Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 3 Apr 2024 23:14:03 +0100 Subject: [PATCH 19/40] Miscellaneous keyboard.json migrations (#23378) --- .../{info.json => v1/keyboard.json} | 0 keyboards/canary/canary60rgb/v1/rules.mk | 1 - .../canary60rgb/{canary60rgb.c => v1/v1.c} | 0 .../qc60/{info.json => proto/keyboard.json} | 0 keyboards/handwired/qc60/proto/rules.mk | 1 - .../{info.json => rev1/keyboard.json} | 0 .../split_5x7/{split_5x7.c => rev1/rev1.c} | 0 .../junco/{info.json => rev1/keyboard.json} | 4 ++ keyboards/junco/rev1/rules.mk | 1 + keyboards/junco/rules.mk | 8 ---- .../{info.json => rev1/keyboard.json} | 0 keyboards/keaboard/rev1/rules.mk | 1 - keyboards/melgeek/mj65/{ => rev3}/config.h | 0 .../mj65/{info.json => rev3/keyboard.json} | 7 ++++ keyboards/melgeek/mj65/rev3/rules.mk | 13 ------- keyboards/melgeek/mojo68/rev1/config.h | 3 ++ .../mojo68/{info.json => rev1/keyboard.json} | 0 keyboards/melgeek/mojo68/rev1/rules.mk | 1 - keyboards/melgeek/mojo75/{ => rev1}/config.h | 0 .../mojo75/{info.json => rev1/keyboard.json} | 0 keyboards/melgeek/mojo75/rev1/rules.mk | 1 - keyboards/melgeek/tegic/config.h | 20 ---------- .../melgeek/{mojo68 => tegic/rev1}/config.h | 0 .../tegic/{info.json => rev1/keyboard.json} | 0 keyboards/melgeek/tegic/rev1/rules.mk | 1 - .../melgeek/z70ultra/{ => rev1}/config.h | 0 .../{info.json => rev1/keyboard.json} | 0 .../z70ultra/{z70ultra.c => rev1/rev1.c} | 0 keyboards/melgeek/z70ultra/rev1/rules.mk | 1 - keyboards/miiiw/blackio83/config.h | 20 ---------- keyboards/miiiw/blackio83/rev_0100/config.h | 3 ++ .../miiiw/blackio83/{ => rev_0100}/halconf.h | 0 .../{info.json => rev_0100/keyboard.json} | 0 .../miiiw/blackio83/{ => rev_0100}/matrix.c | 0 .../miiiw/blackio83/{ => rev_0100}/mcuconf.h | 0 .../{blackio83.c => rev_0100/rev_0100.c} | 2 +- .../{blackio83.h => rev_0100/rev_0100.h} | 0 keyboards/miiiw/blackio83/rev_0100/rules.mk | 2 - .../{info.json => rev1/keyboard.json} | 0 keyboards/murcielago/rev1/rules.mk | 1 - keyboards/polilla/{ => rev1}/chconf.h | 0 keyboards/polilla/rev1/config.h | 22 ----------- keyboards/polilla/{ => rev1}/halconf.h | 0 .../polilla/{info.json => rev1/keyboard.json} | 6 +++ keyboards/polilla/{ => rev1}/mcuconf.h | 0 keyboards/polilla/rev1/rules.mk | 1 - keyboards/qwertyydox/{ => rev1}/config.h | 5 --- .../{info.json => rev1/keyboard.json} | 10 +++++ keyboards/qwertyydox/rev1/rules.mk | 0 keyboards/qwertyydox/rules.mk | 15 ------- keyboards/spacetime/config.h | 39 ------------------- keyboards/spacetime/info.json | 6 +++ keyboards/spacetime/rev1/keyboard.json | 1 + keyboards/spacetime/rev1/rules.mk | 1 - keyboards/splitty/{ => rev1}/config.h | 0 .../splitty/{info.json => rev1/keyboard.json} | 7 ++++ keyboards/splitty/rev1/rules.mk | 0 keyboards/splitty/rules.mk | 15 ------- .../featherble/{info.json => keyboard.json} | 2 + keyboards/woodkeys/meira/info.json | 5 ++- .../woodkeys/meira/promicro/keyboard.json | 3 ++ keyboards/woodkeys/meira/rules.mk | 13 ------- 62 files changed, 57 insertions(+), 185 deletions(-) rename keyboards/canary/canary60rgb/{info.json => v1/keyboard.json} (100%) delete mode 100644 keyboards/canary/canary60rgb/v1/rules.mk rename keyboards/canary/canary60rgb/{canary60rgb.c => v1/v1.c} (100%) rename keyboards/handwired/qc60/{info.json => proto/keyboard.json} (100%) delete mode 100644 keyboards/handwired/qc60/proto/rules.mk rename keyboards/handwired/stef9998/split_5x7/{info.json => rev1/keyboard.json} (100%) rename keyboards/handwired/stef9998/split_5x7/{split_5x7.c => rev1/rev1.c} (100%) rename keyboards/junco/{info.json => rev1/keyboard.json} (98%) rename keyboards/keaboard/{info.json => rev1/keyboard.json} (100%) delete mode 100644 keyboards/keaboard/rev1/rules.mk rename keyboards/melgeek/mj65/{ => rev3}/config.h (100%) rename keyboards/melgeek/mj65/{info.json => rev3/keyboard.json} (97%) rename keyboards/melgeek/mojo68/{info.json => rev1/keyboard.json} (100%) delete mode 100755 keyboards/melgeek/mojo68/rev1/rules.mk rename keyboards/melgeek/mojo75/{ => rev1}/config.h (100%) rename keyboards/melgeek/mojo75/{info.json => rev1/keyboard.json} (100%) delete mode 100644 keyboards/melgeek/mojo75/rev1/rules.mk delete mode 100755 keyboards/melgeek/tegic/config.h rename keyboards/melgeek/{mojo68 => tegic/rev1}/config.h (100%) rename keyboards/melgeek/tegic/{info.json => rev1/keyboard.json} (100%) delete mode 100755 keyboards/melgeek/tegic/rev1/rules.mk rename keyboards/melgeek/z70ultra/{ => rev1}/config.h (100%) rename keyboards/melgeek/z70ultra/{info.json => rev1/keyboard.json} (100%) rename keyboards/melgeek/z70ultra/{z70ultra.c => rev1/rev1.c} (100%) delete mode 100644 keyboards/melgeek/z70ultra/rev1/rules.mk delete mode 100644 keyboards/miiiw/blackio83/config.h rename keyboards/miiiw/blackio83/{ => rev_0100}/halconf.h (100%) rename keyboards/miiiw/blackio83/{info.json => rev_0100/keyboard.json} (100%) rename keyboards/miiiw/blackio83/{ => rev_0100}/matrix.c (100%) rename keyboards/miiiw/blackio83/{ => rev_0100}/mcuconf.h (100%) rename keyboards/miiiw/blackio83/{blackio83.c => rev_0100/rev_0100.c} (99%) rename keyboards/miiiw/blackio83/{blackio83.h => rev_0100/rev_0100.h} (100%) rename keyboards/murcielago/{info.json => rev1/keyboard.json} (100%) delete mode 100644 keyboards/murcielago/rev1/rules.mk rename keyboards/polilla/{ => rev1}/chconf.h (100%) rename keyboards/polilla/{ => rev1}/halconf.h (100%) rename keyboards/polilla/{info.json => rev1/keyboard.json} (97%) rename keyboards/polilla/{ => rev1}/mcuconf.h (100%) delete mode 100644 keyboards/polilla/rev1/rules.mk rename keyboards/qwertyydox/{ => rev1}/config.h (87%) rename keyboards/qwertyydox/{info.json => rev1/keyboard.json} (95%) delete mode 100644 keyboards/qwertyydox/rev1/rules.mk delete mode 100644 keyboards/spacetime/config.h create mode 100644 keyboards/spacetime/rev1/keyboard.json delete mode 100644 keyboards/spacetime/rev1/rules.mk rename keyboards/splitty/{ => rev1}/config.h (100%) rename keyboards/splitty/{info.json => rev1/keyboard.json} (97%) delete mode 100644 keyboards/splitty/rev1/rules.mk rename keyboards/woodkeys/meira/featherble/{info.json => keyboard.json} (50%) create mode 100644 keyboards/woodkeys/meira/promicro/keyboard.json diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/v1/keyboard.json similarity index 100% rename from keyboards/canary/canary60rgb/info.json rename to keyboards/canary/canary60rgb/v1/keyboard.json diff --git a/keyboards/canary/canary60rgb/v1/rules.mk b/keyboards/canary/canary60rgb/v1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/canary/canary60rgb/v1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/canary/canary60rgb/canary60rgb.c b/keyboards/canary/canary60rgb/v1/v1.c similarity index 100% rename from keyboards/canary/canary60rgb/canary60rgb.c rename to keyboards/canary/canary60rgb/v1/v1.c diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/proto/keyboard.json similarity index 100% rename from keyboards/handwired/qc60/info.json rename to keyboards/handwired/qc60/proto/keyboard.json diff --git a/keyboards/handwired/qc60/proto/rules.mk b/keyboards/handwired/qc60/proto/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/handwired/qc60/proto/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/handwired/stef9998/split_5x7/info.json b/keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json similarity index 100% rename from keyboards/handwired/stef9998/split_5x7/info.json rename to keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json diff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.c b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c similarity index 100% rename from keyboards/handwired/stef9998/split_5x7/split_5x7.c rename to keyboards/handwired/stef9998/split_5x7/rev1/rev1.c diff --git a/keyboards/junco/info.json b/keyboards/junco/rev1/keyboard.json similarity index 98% rename from keyboards/junco/info.json rename to keyboards/junco/rev1/keyboard.json index 6956ab4834b..855628d3b1c 100644 --- a/keyboards/junco/info.json +++ b/keyboards/junco/rev1/keyboard.json @@ -8,6 +8,9 @@ "pid": "0x4A13", "device_version": "1.0.0" }, + "features": { + "bootmagic": true + }, "matrix_pins": { "cols": ["GP2", "GP3", "GP4", "GP5", "GP6", "GP7"], "rows": ["GP8", "GP9", "GP10", "GP11", "GP12"] @@ -28,6 +31,7 @@ ] }, "split": { + "enabled": true, "encoder": { "right": { "rotary": [ diff --git a/keyboards/junco/rev1/rules.mk b/keyboards/junco/rev1/rules.mk index e69de29bb2d..161ec22b16e 100644 --- a/keyboards/junco/rev1/rules.mk +++ b/keyboards/junco/rev1/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = vendor diff --git a/keyboards/junco/rules.mk b/keyboards/junco/rules.mk index a04c7822f91..bb94741e5ad 100644 --- a/keyboards/junco/rules.mk +++ b/keyboards/junco/rules.mk @@ -1,9 +1 @@ -# Split Keyboard Stuff -SPLIT_KEYBOARD = yes -SERIAL_DRIVER = vendor - -# Enable Bootmagic Lite -BOOTMAGIC_ENABLE = yes - -# Default Folder DEFAULT_FOLDER = junco/rev1 diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/rev1/keyboard.json similarity index 100% rename from keyboards/keaboard/info.json rename to keyboards/keaboard/rev1/keyboard.json diff --git a/keyboards/keaboard/rev1/rules.mk b/keyboards/keaboard/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/keaboard/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/mj65/config.h b/keyboards/melgeek/mj65/rev3/config.h similarity index 100% rename from keyboards/melgeek/mj65/config.h rename to keyboards/melgeek/mj65/rev3/config.h diff --git a/keyboards/melgeek/mj65/info.json b/keyboards/melgeek/mj65/rev3/keyboard.json similarity index 97% rename from keyboards/melgeek/mj65/info.json rename to keyboards/melgeek/mj65/rev3/keyboard.json index 773c9a31984..adf0ef94bc6 100644 --- a/keyboards/melgeek/mj65/info.json +++ b/keyboards/melgeek/mj65/rev3/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/melgeek/mj65/rev3/rules.mk b/keyboards/melgeek/mj65/rev3/rules.mk index 7a3d7020d90..8b7f40c50b5 100644 --- a/keyboards/melgeek/mj65/rev3/rules.mk +++ b/keyboards/melgeek/mj65/rev3/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Use RGB matrix - RGB_MATRIX_SUPPORTED = yes RGBLIGHT_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/melgeek/mojo68/rev1/config.h b/keyboards/melgeek/mojo68/rev1/config.h index 960bf58c52f..829eb63fe6b 100755 --- a/keyboards/melgeek/mojo68/rev1/config.h +++ b/keyboards/melgeek/mojo68/rev1/config.h @@ -16,4 +16,7 @@ #pragma once +#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND +#define IS31FL3741_SDB_PIN B7 + #define DRIVER_INDICATOR_LED_TOTAL 3 diff --git a/keyboards/melgeek/mojo68/info.json b/keyboards/melgeek/mojo68/rev1/keyboard.json similarity index 100% rename from keyboards/melgeek/mojo68/info.json rename to keyboards/melgeek/mojo68/rev1/keyboard.json diff --git a/keyboards/melgeek/mojo68/rev1/rules.mk b/keyboards/melgeek/mojo68/rev1/rules.mk deleted file mode 100755 index 6e7633bfe01..00000000000 --- a/keyboards/melgeek/mojo68/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/mojo75/config.h b/keyboards/melgeek/mojo75/rev1/config.h similarity index 100% rename from keyboards/melgeek/mojo75/config.h rename to keyboards/melgeek/mojo75/rev1/config.h diff --git a/keyboards/melgeek/mojo75/info.json b/keyboards/melgeek/mojo75/rev1/keyboard.json similarity index 100% rename from keyboards/melgeek/mojo75/info.json rename to keyboards/melgeek/mojo75/rev1/keyboard.json diff --git a/keyboards/melgeek/mojo75/rev1/rules.mk b/keyboards/melgeek/mojo75/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/melgeek/mojo75/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/tegic/config.h b/keyboards/melgeek/tegic/config.h deleted file mode 100755 index 68088ba7453..00000000000 --- a/keyboards/melgeek/tegic/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 MelGeek - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#define IS31FL3741_I2C_ADDRESS_1 IS31FL3741_I2C_ADDRESS_GND -#define IS31FL3741_SDB_PIN B7 diff --git a/keyboards/melgeek/mojo68/config.h b/keyboards/melgeek/tegic/rev1/config.h similarity index 100% rename from keyboards/melgeek/mojo68/config.h rename to keyboards/melgeek/tegic/rev1/config.h diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/rev1/keyboard.json similarity index 100% rename from keyboards/melgeek/tegic/info.json rename to keyboards/melgeek/tegic/rev1/keyboard.json diff --git a/keyboards/melgeek/tegic/rev1/rules.mk b/keyboards/melgeek/tegic/rev1/rules.mk deleted file mode 100755 index 6e7633bfe01..00000000000 --- a/keyboards/melgeek/tegic/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/melgeek/z70ultra/config.h b/keyboards/melgeek/z70ultra/rev1/config.h similarity index 100% rename from keyboards/melgeek/z70ultra/config.h rename to keyboards/melgeek/z70ultra/rev1/config.h diff --git a/keyboards/melgeek/z70ultra/info.json b/keyboards/melgeek/z70ultra/rev1/keyboard.json similarity index 100% rename from keyboards/melgeek/z70ultra/info.json rename to keyboards/melgeek/z70ultra/rev1/keyboard.json diff --git a/keyboards/melgeek/z70ultra/z70ultra.c b/keyboards/melgeek/z70ultra/rev1/rev1.c similarity index 100% rename from keyboards/melgeek/z70ultra/z70ultra.c rename to keyboards/melgeek/z70ultra/rev1/rev1.c diff --git a/keyboards/melgeek/z70ultra/rev1/rules.mk b/keyboards/melgeek/z70ultra/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/melgeek/z70ultra/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/miiiw/blackio83/config.h b/keyboards/miiiw/blackio83/config.h deleted file mode 100644 index 055e8e35794..00000000000 --- a/keyboards/miiiw/blackio83/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2023 ArthurCyy - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -// EEPROM i2c chip -#define EEPROM_I2C_24LC256 diff --git a/keyboards/miiiw/blackio83/rev_0100/config.h b/keyboards/miiiw/blackio83/rev_0100/config.h index b1eec364edf..008d1448f2e 100644 --- a/keyboards/miiiw/blackio83/rev_0100/config.h +++ b/keyboards/miiiw/blackio83/rev_0100/config.h @@ -16,6 +16,9 @@ #pragma once +// EEPROM i2c chip +#define EEPROM_I2C_24LC256 + #define POWER_SWITCH_PIN B0 /* 16 with dummy columns for shift registers */ diff --git a/keyboards/miiiw/blackio83/halconf.h b/keyboards/miiiw/blackio83/rev_0100/halconf.h similarity index 100% rename from keyboards/miiiw/blackio83/halconf.h rename to keyboards/miiiw/blackio83/rev_0100/halconf.h diff --git a/keyboards/miiiw/blackio83/info.json b/keyboards/miiiw/blackio83/rev_0100/keyboard.json similarity index 100% rename from keyboards/miiiw/blackio83/info.json rename to keyboards/miiiw/blackio83/rev_0100/keyboard.json diff --git a/keyboards/miiiw/blackio83/matrix.c b/keyboards/miiiw/blackio83/rev_0100/matrix.c similarity index 100% rename from keyboards/miiiw/blackio83/matrix.c rename to keyboards/miiiw/blackio83/rev_0100/matrix.c diff --git a/keyboards/miiiw/blackio83/mcuconf.h b/keyboards/miiiw/blackio83/rev_0100/mcuconf.h similarity index 100% rename from keyboards/miiiw/blackio83/mcuconf.h rename to keyboards/miiiw/blackio83/rev_0100/mcuconf.h diff --git a/keyboards/miiiw/blackio83/blackio83.c b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c similarity index 99% rename from keyboards/miiiw/blackio83/blackio83.c rename to keyboards/miiiw/blackio83/rev_0100/rev_0100.c index 8c80ebd73c7..7af6861f535 100644 --- a/keyboards/miiiw/blackio83/blackio83.c +++ b/keyboards/miiiw/blackio83/rev_0100/rev_0100.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "blackio83.h" +#include "rev_0100.h" #include "usb_main.h" #include "usb_util.h" diff --git a/keyboards/miiiw/blackio83/blackio83.h b/keyboards/miiiw/blackio83/rev_0100/rev_0100.h similarity index 100% rename from keyboards/miiiw/blackio83/blackio83.h rename to keyboards/miiiw/blackio83/rev_0100/rev_0100.h diff --git a/keyboards/miiiw/blackio83/rev_0100/rules.mk b/keyboards/miiiw/blackio83/rev_0100/rules.mk index 5558efa95d7..7a361addb34 100644 --- a/keyboards/miiiw/blackio83/rev_0100/rules.mk +++ b/keyboards/miiiw/blackio83/rev_0100/rules.mk @@ -1,7 +1,5 @@ CUSTOM_MATRIX = lite -WS2812_DRIVER_REQUIRED := yes - # Project specific files SRC += matrix.c \ common/shift_register.c diff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/rev1/keyboard.json similarity index 100% rename from keyboards/murcielago/info.json rename to keyboards/murcielago/rev1/keyboard.json diff --git a/keyboards/murcielago/rev1/rules.mk b/keyboards/murcielago/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/murcielago/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/polilla/chconf.h b/keyboards/polilla/rev1/chconf.h similarity index 100% rename from keyboards/polilla/chconf.h rename to keyboards/polilla/rev1/chconf.h diff --git a/keyboards/polilla/rev1/config.h b/keyboards/polilla/rev1/config.h index 3b3b9b0fb79..c2b8d7aff92 100644 --- a/keyboards/polilla/rev1/config.h +++ b/keyboards/polilla/rev1/config.h @@ -16,26 +16,4 @@ along with this program. If not, see . */ #pragma once - #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/polilla/halconf.h b/keyboards/polilla/rev1/halconf.h similarity index 100% rename from keyboards/polilla/halconf.h rename to keyboards/polilla/rev1/halconf.h diff --git a/keyboards/polilla/info.json b/keyboards/polilla/rev1/keyboard.json similarity index 97% rename from keyboards/polilla/info.json rename to keyboards/polilla/rev1/keyboard.json index ea6c5aafa89..746f47963e2 100644 --- a/keyboards/polilla/info.json +++ b/keyboards/polilla/rev1/keyboard.json @@ -23,6 +23,12 @@ "diode_direction": "ROW2COL", "processor": "STM32F042", "bootloader": "stm32-dfu", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/polilla/mcuconf.h b/keyboards/polilla/rev1/mcuconf.h similarity index 100% rename from keyboards/polilla/mcuconf.h rename to keyboards/polilla/rev1/mcuconf.h diff --git a/keyboards/polilla/rev1/rules.mk b/keyboards/polilla/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/polilla/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/rev1/config.h similarity index 87% rename from keyboards/qwertyydox/config.h rename to keyboards/qwertyydox/rev1/config.h index 8e59e903ac0..e5dc39eb775 100644 --- a/keyboards/qwertyydox/config.h +++ b/keyboards/qwertyydox/rev1/config.h @@ -17,11 +17,6 @@ along with this program. If not, see . #pragma once -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - #define MOUSEKEY_DELAY 150 #define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_MAX_SPEED 10 diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/rev1/keyboard.json similarity index 95% rename from keyboards/qwertyydox/info.json rename to keyboards/qwertyydox/rev1/keyboard.json index 5f1eb80da84..f2a335aa027 100644 --- a/keyboards/qwertyydox/info.json +++ b/keyboards/qwertyydox/rev1/keyboard.json @@ -9,6 +9,9 @@ "pid": "0x1256", "device_version": "1.0.0" }, + "features": { + "mousekey": true + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"], "rows": ["B6", "B2", "B3", "B1"] @@ -36,8 +39,15 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D0" }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "bootloader": "caterina", "processor": "atmega32u4", "layouts": { diff --git a/keyboards/qwertyydox/rev1/rules.mk b/keyboards/qwertyydox/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/qwertyydox/rules.mk b/keyboards/qwertyydox/rules.mk index 9bcd2f0741f..688444b5663 100644 --- a/keyboards/qwertyydox/rules.mk +++ b/keyboards/qwertyydox/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = qwertyydox/rev1 diff --git a/keyboards/spacetime/config.h b/keyboards/spacetime/config.h deleted file mode 100644 index b7ece10f6c7..00000000000 --- a/keyboards/spacetime/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2019 Kyle Terry - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/spacetime/info.json b/keyboards/spacetime/info.json index a55223b653a..1e04608349b 100644 --- a/keyboards/spacetime/info.json +++ b/keyboards/spacetime/info.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], "rows": ["D4", "C6", "D7", "E6"] diff --git a/keyboards/spacetime/rev1/keyboard.json b/keyboards/spacetime/rev1/keyboard.json new file mode 100644 index 00000000000..0967ef424bc --- /dev/null +++ b/keyboards/spacetime/rev1/keyboard.json @@ -0,0 +1 @@ +{} diff --git a/keyboards/spacetime/rev1/rules.mk b/keyboards/spacetime/rev1/rules.mk deleted file mode 100644 index 6e7633bfe01..00000000000 --- a/keyboards/spacetime/rev1/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank diff --git a/keyboards/splitty/config.h b/keyboards/splitty/rev1/config.h similarity index 100% rename from keyboards/splitty/config.h rename to keyboards/splitty/rev1/config.h diff --git a/keyboards/splitty/info.json b/keyboards/splitty/rev1/keyboard.json similarity index 97% rename from keyboards/splitty/info.json rename to keyboards/splitty/rev1/keyboard.json index 06e9c6a099f..d820993dbc5 100644 --- a/keyboards/splitty/info.json +++ b/keyboards/splitty/rev1/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x6052", "device_version": "0.0.1" }, + "features": { + "mousekey": true, + "extrakey": true + }, + "split": { + "enabled": true + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "B6"], "rows": ["F0", "F1", "D4", "D5", "D6"] diff --git a/keyboards/splitty/rev1/rules.mk b/keyboards/splitty/rev1/rules.mk deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/keyboards/splitty/rules.mk b/keyboards/splitty/rules.mk index 2389937b0b8..68b3198bfba 100644 --- a/keyboards/splitty/rules.mk +++ b/keyboards/splitty/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = splitty/rev1 diff --git a/keyboards/woodkeys/meira/featherble/info.json b/keyboards/woodkeys/meira/featherble/keyboard.json similarity index 50% rename from keyboards/woodkeys/meira/featherble/info.json rename to keyboards/woodkeys/meira/featherble/keyboard.json index 2ce28918df5..8dc946dd571 100644 --- a/keyboards/woodkeys/meira/featherble/info.json +++ b/keyboards/woodkeys/meira/featherble/keyboard.json @@ -1,4 +1,6 @@ { + "processor": "atmega32u4", + "bootloader": "caterina", "bluetooth": { "driver": "bluefruit_le" } diff --git a/keyboards/woodkeys/meira/info.json b/keyboards/woodkeys/meira/info.json index 5fbcc9deafc..3ad2918d8e6 100644 --- a/keyboards/woodkeys/meira/info.json +++ b/keyboards/woodkeys/meira/info.json @@ -8,8 +8,9 @@ "pid": "0x6061", "device_version": "0.0.1" }, - "processor": "atmega32u4", - "bootloader": "caterina", + "features": { + "extrakey": true + }, "layout_aliases": { "LAYOUT": "LAYOUT_ortho_4x12" }, diff --git a/keyboards/woodkeys/meira/promicro/keyboard.json b/keyboards/woodkeys/meira/promicro/keyboard.json new file mode 100644 index 00000000000..4c44b1c5bf9 --- /dev/null +++ b/keyboards/woodkeys/meira/promicro/keyboard.json @@ -0,0 +1,3 @@ +{ + "development_board": "promicro" +} diff --git a/keyboards/woodkeys/meira/rules.mk b/keyboards/woodkeys/meira/rules.mk index bad7949ec0d..423c14cfb73 100644 --- a/keyboards/woodkeys/meira/rules.mk +++ b/keyboards/woodkeys/meira/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = yes SRC += matrix.c From 2a4c746718cf60ccf15f758a97ce51ea407432c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 Apr 2024 10:11:45 +1100 Subject: [PATCH 20/40] handwired/technicpad: fix `keyboard` in keymaps (#23408) --- keyboards/handwired/technicpad/keymaps/default/keymap.json | 2 +- keyboards/handwired/technicpad/keymaps/via/keymap.json | 2 +- keyboards/mechwild/bb40/keymaps/default/keymap.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/handwired/technicpad/keymaps/default/keymap.json b/keyboards/handwired/technicpad/keymaps/default/keymap.json index 6d544a59466..5d662bf780c 100644 --- a/keyboards/handwired/technicpad/keymaps/default/keymap.json +++ b/keyboards/handwired/technicpad/keymaps/default/keymap.json @@ -1,5 +1,5 @@ { - "keyboard": "technicpad", + "keyboard": "handwired/technicpad", "keymap": "default", "layers": [ ["KC_A", "KC_B", "KC_C", "KC_D"] diff --git a/keyboards/handwired/technicpad/keymaps/via/keymap.json b/keyboards/handwired/technicpad/keymaps/via/keymap.json index 845fff0dfba..040881546c1 100644 --- a/keyboards/handwired/technicpad/keymaps/via/keymap.json +++ b/keyboards/handwired/technicpad/keymaps/via/keymap.json @@ -1,5 +1,5 @@ { - "keyboard": "technicpad", + "keyboard": "handwired/technicpad", "keymap": "via", "config": { "features": { diff --git a/keyboards/mechwild/bb40/keymaps/default/keymap.json b/keyboards/mechwild/bb40/keymaps/default/keymap.json index 104e42483c2..7ab58982586 100644 --- a/keyboards/mechwild/bb40/keymaps/default/keymap.json +++ b/keyboards/mechwild/bb40/keymaps/default/keymap.json @@ -1,5 +1,5 @@ { - "keyboard": "mechwild/bb40", + "keyboard": "mechwild/bb40/f401", "keymap": "default", "version": 1, "layout": "LAYOUT_all", From c70ebd4a0e27009a9baf4c8f74379dae6c55b461 Mon Sep 17 00:00:00 2001 From: Taro Hayashi <87086895+Taro-Hayashi@users.noreply.github.com> Date: Thu, 4 Apr 2024 12:39:02 +0900 Subject: [PATCH 21/40] Fix pointing_device_set_cpi_on_side() (#23391) Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- quantum/pointing_device/pointing_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c index bcced166c0d..4682aceb14d 100644 --- a/quantum/pointing_device/pointing_device.c +++ b/quantum/pointing_device/pointing_device.c @@ -368,7 +368,7 @@ void pointing_device_set_cpi(uint16_t cpi) { * @param[in] cpi uint16_t value. */ void pointing_device_set_cpi_on_side(bool left, uint16_t cpi) { - bool local = (is_keyboard_left() & left) ? true : false; + bool local = (is_keyboard_left() == left); if (local) { pointing_device_driver.set_cpi(cpi); } else { From b9b8ff830276c9d6a323c55a16334601f5c9b7db Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 3 Apr 2024 23:44:20 -0700 Subject: [PATCH 22/40] Fix malformed JSON in `layouts/default/ortho_5x10/info.json` (#23414) --- layouts/default/ortho_5x10/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/default/ortho_5x10/info.json b/layouts/default/ortho_5x10/info.json index 0c4cb9bb498..cf02fd618ae 100644 --- a/layouts/default/ortho_5x10/info.json +++ b/layouts/default/ortho_5x10/info.json @@ -58,7 +58,7 @@ {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, - {"x":9, "y":4}, + {"x":9, "y":4} ] } } From 2a25e79760a7c760e1fbda0ad21f1c9b6f7ec0b1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 5 Apr 2024 01:16:27 +1100 Subject: [PATCH 23/40] Remove deprecated quantum keycodes (#23407) --- docs/feature_sequencer.md | 2 +- .../ghost_squid/keymaps/default/keymap.c | 2 +- .../keymaps/default/keymap.c | 2 +- .../kd83a_bfg_edition/keymaps/via/keymap.c | 2 +- .../keymaps/default/keymap.c | 2 +- .../kd87a_bfg_edition/keymaps/via/keymap.c | 2 +- keyboards/durgod/dgk6x/dgk6x.c | 2 +- .../dgk6x/galaxy/keymaps/default/keymap.json | 2 +- .../dgk6x/galaxy/keymaps/via/keymap.json | 2 +- .../hades_ansi/keymaps/default/keymap.json | 2 +- .../dgk6x/hades_ansi/keymaps/via/keymap.json | 2 +- .../hades_iso/keymaps/default/keymap.json | 2 +- .../dgk6x/hades_iso/keymaps/via/keymap.json | 2 +- .../dgk6x/venus/keymaps/default/keymap.json | 2 +- .../dgk6x/venus/keymaps/via/keymap.json | 2 +- keyboards/durgod/k310/k310.c | 2 +- .../durgod/k310/keymaps/default/keymap.json | 2 +- keyboards/durgod/k310/keymaps/via/keymap.c | 2 +- keyboards/durgod/k320/k320.c | 2 +- .../durgod/k320/keymaps/default/keymap.json | 2 +- keyboards/durgod/k320/keymaps/via/keymap.c | 2 +- keyboards/feker/ik75/keymaps/default/keymap.c | 2 +- keyboards/feker/ik75/keymaps/via/keymap.c | 2 +- .../horizon_z/keymaps/default/keymap.c | 2 +- .../flashquark/horizon_z/keymaps/via/keymap.c | 2 +- .../for_science/keymaps/default/keymap.c | 2 +- .../walnut/keymaps/default/keymap.c | 2 +- .../walnut/keymaps/default_ansi/keymap.c | 2 +- .../walnut/keymaps/default_iso/keymap.c | 2 +- .../frooastboard/walnut/keymaps/via/keymap.c | 2 +- .../polly40/keymaps/default/keymap.c | 2 +- .../riblee_f401/keymaps/default/keymap.c | 2 +- .../riblee_f411/keymaps/default/keymap.c | 2 +- .../jadookb/jkb65/keymaps/default/keymap.c | 2 +- keyboards/jadookb/jkb65/keymaps/via/keymap.c | 2 +- .../jukaie/jk01/keymaps/default/keymap.c | 2 +- keyboards/jukaie/jk01/keymaps/via/keymap.c | 2 +- .../kiwikeebs/macro/keymaps/default/keymap.c | 2 +- .../kiwikeebs/macro/keymaps/via/keymap.c | 2 +- .../macro_v2/keymaps/default/keymap.c | 2 +- .../kiwikeebs/macro_v2/keymaps/via/keymap.c | 2 +- .../longnald/corin/keymaps/default/keymap.c | 4 +- .../miller/gm862/keymaps/default/keymap.c | 2 +- keyboards/miller/gm862/keymaps/via/keymap.c | 2 +- .../monsgeek/m5/keymaps/default/keymap.c | 2 +- .../had60/keymaps/default/keymap.c | 4 +- .../senselessclay/had60/keymaps/iso/keymap.c | 4 +- .../senselessclay/had60/keymaps/via/keymap.c | 4 +- .../native/ansi/keymaps/default/keymap.c | 2 +- .../native/ansi/keymaps/perfmode/keymap.c | 2 +- .../teleport/native/ansi/keymaps/via/keymap.c | 2 +- .../native/iso/keymaps/default/keymap.c | 2 +- .../native/iso/keymaps/perfmode/keymap.c | 2 +- .../teleport/native/iso/keymaps/via/keymap.c | 2 +- keyboards/teleport/tkl/keymaps/ansi/keymap.c | 2 +- .../teleport/tkl/keymaps/default/keymap.c | 2 +- keyboards/teleport/tkl/keymaps/iso/keymap.c | 2 +- keyboards/teleport/tkl/keymaps/via/keymap.c | 2 +- keyboards/viendi8l/keymaps/default/keymap.c | 2 +- keyboards/viendi8l/keymaps/via/keymap.c | 2 +- .../keymaps/default/keymap.c | 7 +-- .../buff67v3/keymaps/default/keymap.c | 2 +- .../yandrstudio/buff67v3/keymaps/via/keymap.c | 2 +- .../yandrstudio/nz64/keymaps/default/keymap.c | 2 +- .../yandrstudio/nz64/keymaps/via/keymap.c | 2 +- .../nz67v2/keymaps/default/keymap.c | 2 +- .../yandrstudio/nz67v2/keymaps/via/keymap.c | 2 +- .../wave75/keymaps/default/keymap.c | 2 +- .../yandrstudio/wave75/keymaps/via/keymap.c | 2 +- .../yr6095/keymaps/default/keymap.c | 2 +- .../yandrstudio/yr6095/keymaps/via/keymap.c | 2 +- .../quick17/keymaps/default/keymap.c | 2 +- .../yushakobo/quick17/keymaps/via/keymap.c | 2 +- quantum/quantum_keycodes_legacy.h | 53 ------------------- 74 files changed, 78 insertions(+), 134 deletions(-) diff --git a/docs/feature_sequencer.md b/docs/feature_sequencer.md index 87a277400a2..3af55197c54 100644 --- a/docs/feature_sequencer.md +++ b/docs/feature_sequencer.md @@ -44,7 +44,7 @@ While the tempo defines the absolute speed at which the sequencer goes through t |-------------------------------|---------|---------------------------------------------------| |`QK_SEQUENCER_ON` |`SQ_ON` |Start the step sequencer | |`QK_SEQUENCER_OFF` |`SQ_OFF` |Stop the step sequencer | -|`QK_SEQUENCER_TOGGLE` |`SQ_TOG` |Toggle the step sequencer playback | +|`QK_SEQUENCER_TOGGLE` |`SQ_TOGG`|Toggle the step sequencer playback | |`QK_SEQUENCER_STEPS_ALL` |`SQ_SALL`|Enable all the steps | |`QK_SEQUENCER_STEPS_CLEAR` |`SQ_SCLR`|Disable all the steps | |`QK_SEQUENCER_TEMPO_DOWN` |`SQ_TMPD`|Decrease the tempo | diff --git a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c index f53bdd83377..52305bba744 100644 --- a/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c +++ b/keyboards/bpiphany/ghost_squid/keymaps/default/keymap.c @@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Layer 1: Function layer */ [_MD] = LAYOUT_fullsize_iso( - _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, GUI_TOG, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, QK_BOOT, + _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, GU_TOGG, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c b/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c index 78324c69426..0d426d3c9ac 100644 --- a/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c +++ b/keyboards/darkproject/kd83a_bfg_edition/keymaps/default/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, TO(Win), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(Mac), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), [Macfn] = LAYOUT( QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, RGB_MOD, diff --git a/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c b/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c index 78324c69426..0d426d3c9ac 100644 --- a/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c +++ b/keyboards/darkproject/kd83a_bfg_edition/keymaps/via/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, TO(Win), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(Mac), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), [Macfn] = LAYOUT( QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, RGB_MOD, diff --git a/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c b/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c index 4abb1bdc915..5f475caa1b6 100644 --- a/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c +++ b/keyboards/darkproject/kd87a_bfg_edition/keymaps/default/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, TO(Win), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(Mac), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), [Macfn] = LAYOUT_tkl_ansi( QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c index 71fbfa4ff20..300855c452f 100644 --- a/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c +++ b/keyboards/darkproject/kd87a_bfg_edition/keymaps/via/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, TO(Win), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(Mac), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), [Macfn] = LAYOUT_tkl_ansi( QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/durgod/dgk6x/dgk6x.c b/keyboards/durgod/dgk6x/dgk6x.c index 649821c5f23..b7f1da778d9 100644 --- a/keyboards/durgod/dgk6x/dgk6x.c +++ b/keyboards/durgod/dgk6x/dgk6x.c @@ -41,7 +41,7 @@ void led_init_ports(void) { #ifndef WINLOCK_DISABLED bool process_record_kb(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case GUI_TOG: + case GU_TOGG: if (record->event.pressed) { // Toggle LED on key press togglePin(LED_WIN_LOCK_PIN); diff --git a/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json index c40cfac3030..83b285786d6 100644 --- a/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json +++ b/keyboards/durgod/dgk6x/galaxy/keymaps/default/keymap.json @@ -17,7 +17,7 @@ "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_TRNS", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_TRNS", "KC_TRNS" ], [ "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_RMOD","RGB_MOD", "RGB_TOG", diff --git a/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json index e8073ff800d..7cd7bd3d325 100644 --- a/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json +++ b/keyboards/durgod/dgk6x/galaxy/keymaps/via/keymap.json @@ -17,7 +17,7 @@ "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_TRNS", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_TRNS", "KC_TRNS" ], [ "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_RMOD","RGB_MOD", "RGB_TOG", diff --git a/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json index e3b969149ac..fc2a11b35cd 100644 --- a/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json +++ b/keyboards/durgod/dgk6x/hades_ansi/keymaps/default/keymap.json @@ -15,7 +15,7 @@ "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" ], [ "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS", diff --git a/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json index 7c25f6efb07..82c3d528327 100644 --- a/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json +++ b/keyboards/durgod/dgk6x/hades_ansi/keymaps/via/keymap.json @@ -15,7 +15,7 @@ "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" ], [ "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS", diff --git a/keyboards/durgod/dgk6x/hades_iso/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/hades_iso/keymaps/default/keymap.json index 774c010206a..f3ecd2cc9b6 100644 --- a/keyboards/durgod/dgk6x/hades_iso/keymaps/default/keymap.json +++ b/keyboards/durgod/dgk6x/hades_iso/keymaps/default/keymap.json @@ -15,7 +15,7 @@ "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" ], [ "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS", diff --git a/keyboards/durgod/dgk6x/hades_iso/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/hades_iso/keymaps/via/keymap.json index c9d5e7b843d..cffa5affd91 100644 --- a/keyboards/durgod/dgk6x/hades_iso/keymaps/via/keymap.json +++ b/keyboards/durgod/dgk6x/hades_iso/keymaps/via/keymap.json @@ -15,7 +15,7 @@ "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_SCRL", "KC_PAUS", "KC_TRNS", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_INS", "KC_END", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS", "KC_APP", "KC_TRNS", "KC_TRNS" ], [ "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", "KC_TRNS", diff --git a/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json b/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json index e7ef2e9d4bf..ff3f85d9e48 100644 --- a/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json +++ b/keyboards/durgod/dgk6x/venus/keymaps/default/keymap.json @@ -15,7 +15,7 @@ "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_INS", "KC_HOME", "KC_END", "KC_DEL", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT","KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGUP", "KC_PGDN", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS" ], [ "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", diff --git a/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json b/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json index fd456255341..0243dc33ddb 100644 --- a/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json +++ b/keyboards/durgod/dgk6x/venus/keymaps/via/keymap.json @@ -15,7 +15,7 @@ "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PSCR", "KC_INS", "KC_HOME", "KC_END", "KC_DEL", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RIGHT","KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_PGUP", "KC_PGDN", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", "GUI_TOG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS" + "KC_TRNS", "GU_TOGG", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "MO(3)", "KC_TRNS" ], [ "KC_TRNS", "KC_MPLY", "KC_MSTP", "KC_MPRV", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_RMOD", diff --git a/keyboards/durgod/k310/k310.c b/keyboards/durgod/k310/k310.c index cf2b618158f..a88100be20b 100644 --- a/keyboards/durgod/k310/k310.c +++ b/keyboards/durgod/k310/k310.c @@ -55,7 +55,7 @@ void led_init_ports(void) { #ifndef WINLOCK_DISABLED bool process_record_kb(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case GUI_TOG: + case GU_TOGG: if (record->event.pressed) { // Toggle LED on key press togglePin(LED_WIN_LOCK_PIN); diff --git a/keyboards/durgod/k310/keymaps/default/keymap.json b/keyboards/durgod/k310/keymaps/default/keymap.json index 7b9c0e7efbe..1731eca6ede 100644 --- a/keyboards/durgod/k310/keymaps/default/keymap.json +++ b/keyboards/durgod/k310/keymaps/default/keymap.json @@ -17,7 +17,7 @@ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "GUI_TOG", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" + "_______", "GU_TOGG", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" ] ], "author": "tylert", diff --git a/keyboards/durgod/k310/keymaps/via/keymap.c b/keyboards/durgod/k310/keymaps/via/keymap.c index c2f0ebd65f3..11d50c93823 100644 --- a/keyboards/durgod/k310/keymaps/via/keymap.c +++ b/keyboards/durgod/k310/keymaps/via/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, GUI_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_LAYER3] = LAYOUT_all( /* Layer 3 */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/durgod/k320/k320.c b/keyboards/durgod/k320/k320.c index 98527ba1b58..c1b9701d7b7 100644 --- a/keyboards/durgod/k320/k320.c +++ b/keyboards/durgod/k320/k320.c @@ -55,7 +55,7 @@ void led_init_ports(void) { #ifndef WINLOCK_DISABLED bool process_record_kb(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case GUI_TOG: + case GU_TOGG: if (record->event.pressed) { // Toggle LED on key press togglePin(LED_WIN_LOCK_PIN); diff --git a/keyboards/durgod/k320/keymaps/default/keymap.json b/keyboards/durgod/k320/keymaps/default/keymap.json index f3bc38a49b1..ba474f40443 100644 --- a/keyboards/durgod/k320/keymaps/default/keymap.json +++ b/keyboards/durgod/k320/keymaps/default/keymap.json @@ -17,7 +17,7 @@ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", - "_______", "GUI_TOG", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" + "_______", "GU_TOGG", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______" ] ], "author": "tylert", diff --git a/keyboards/durgod/k320/keymaps/via/keymap.c b/keyboards/durgod/k320/keymaps/via/keymap.c index f91e752a292..7597089d0cb 100644 --- a/keyboards/durgod/k320/keymaps/via/keymap.c +++ b/keyboards/durgod/k320/keymaps/via/keymap.c @@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, GUI_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_LAYER3] = LAYOUT_all( /* Layer 3 */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/feker/ik75/keymaps/default/keymap.c b/keyboards/feker/ik75/keymaps/default/keymap.c index f6ca00552ec..0ba5c774db0 100644 --- a/keyboards/feker/ik75/keymaps/default/keymap.c +++ b/keyboards/feker/ik75/keymaps/default/keymap.c @@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, RGB_HUI, _______, _______, KC_SCRL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI, _______, _______, _______, _______, _______, _______, KC_NUM, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, - _______, GUI_TOG, _______, _______, _______, _______, _______, _______, RGB_VAD, _______ + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RGB_VAD, _______ ), }; diff --git a/keyboards/feker/ik75/keymaps/via/keymap.c b/keyboards/feker/ik75/keymaps/via/keymap.c index e9a221cb3f9..71c82c2e2d7 100644 --- a/keyboards/feker/ik75/keymaps/via/keymap.c +++ b/keyboards/feker/ik75/keymaps/via/keymap.c @@ -99,7 +99,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, RGB_HUI, _______, _______, KC_SCRL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI, _______, _______, _______, _______, _______, _______, KC_NUM, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, - _______, GUI_TOG, _______, _______, _______, _______, _______, _______, RGB_VAD, _______ + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RGB_VAD, _______ ), /* diff --git a/keyboards/flashquark/horizon_z/keymaps/default/keymap.c b/keyboards/flashquark/horizon_z/keymaps/default/keymap.c index 1ab95c54a56..5b8838c3b2a 100755 --- a/keyboards/flashquark/horizon_z/keymaps/default/keymap.c +++ b/keyboards/flashquark/horizon_z/keymaps/default/keymap.c @@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_GESC, 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_TRNS, RGB_TOG, KC_UP, RGB_MOD, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT , KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, - KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, + KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; \ No newline at end of file diff --git a/keyboards/flashquark/horizon_z/keymaps/via/keymap.c b/keyboards/flashquark/horizon_z/keymaps/via/keymap.c index 1ab95c54a56..5b8838c3b2a 100755 --- a/keyboards/flashquark/horizon_z/keymaps/via/keymap.c +++ b/keyboards/flashquark/horizon_z/keymaps/via/keymap.c @@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_GESC, 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_TRNS, RGB_TOG, KC_UP, RGB_MOD, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT , KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, - KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, + KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; \ No newline at end of file diff --git a/keyboards/for_science/keymaps/default/keymap.c b/keyboards/for_science/keymaps/default/keymap.c index 7da986a0292..15b1a01d474 100644 --- a/keyboards/for_science/keymaps/default/keymap.c +++ b/keyboards/for_science/keymaps/default/keymap.c @@ -84,7 +84,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FUNCT] = LAYOUT_split_4x5_3( - QK_BOOT, _______, _______, _______, LOCK, MAC_LCK, _______, _______, _______, MAGIC_SWAP_LALT_LGUI, + QK_BOOT, _______, _______, _______, LOCK, MAC_LCK, _______, _______, _______, AG_LSWP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/frooastboard/walnut/keymaps/default/keymap.c b/keyboards/frooastboard/walnut/keymaps/default/keymap.c index 195b3c150bb..57058d5de72 100644 --- a/keyboards/frooastboard/walnut/keymaps/default/keymap.c +++ b/keyboards/frooastboard/walnut/keymaps/default/keymap.c @@ -16,5 +16,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) }; diff --git a/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c b/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c index f28645cf2f2..b9abd07d7d3 100644 --- a/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c +++ b/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c @@ -16,5 +16,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) }; diff --git a/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c b/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c index f42b67db2db..e6dd393f15c 100644 --- a/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c +++ b/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c @@ -16,5 +16,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) }; diff --git a/keyboards/frooastboard/walnut/keymaps/via/keymap.c b/keyboards/frooastboard/walnut/keymaps/via/keymap.c index f5022057612..1fdc5a100df 100644 --- a/keyboards/frooastboard/walnut/keymaps/via/keymap.c +++ b/keyboards/frooastboard/walnut/keymaps/via/keymap.c @@ -16,5 +16,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) }; \ No newline at end of file diff --git a/keyboards/handwired/polly40/keymaps/default/keymap.c b/keyboards/handwired/polly40/keymaps/default/keymap.c index a89e438ae8b..b1ef23bc289 100644 --- a/keyboards/handwired/polly40/keymaps/default/keymap.c +++ b/keyboards/handwired/polly40/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( 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_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_ENT, - KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, LSG(KC_S), MAGIC_TOGGLE_NKRO, KC_COMM, KC_DOT, KC_SLSH, KC_PGUP, _______, + KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, LSG(KC_S), NK_TOGG, KC_COMM, KC_DOT, KC_SLSH, KC_PGUP, _______, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_PGDN, _______ ), diff --git a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c index d3fadcace20..f39f439c50e 100644 --- a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c +++ b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c @@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, - _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, _______, _______, _______, + _______, _______, _______, _______, _______, _______, NK_TOGG, CG_LSWP, CG_LNRM, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c index c1ff5682fcb..74308a1c19f 100644 --- a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c +++ b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c @@ -160,7 +160,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, - _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, _______, _______, _______, + _______, _______, _______, _______, _______, _______, NK_TOGG, CG_LSWP, CG_LNRM, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/jadookb/jkb65/keymaps/default/keymap.c b/keyboards/jadookb/jkb65/keymaps/default/keymap.c index 22016cea763..14055736cdb 100644 --- a/keyboards/jadookb/jkb65/keymaps/default/keymap.c +++ b/keyboards/jadookb/jkb65/keymaps/default/keymap.c @@ -32,6 +32,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_RMOD, RGB_HUI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - MAGIC_UNNO_GUI,MAGIC_NO_GUI, _______, RGB_TOG, _______, MO(2), RGB_SPD, RGB_VAD, RGB_SPI + GU_ON, GU_OFF, _______, RGB_TOG, _______, MO(2), RGB_SPD, RGB_VAD, RGB_SPI ) }; diff --git a/keyboards/jadookb/jkb65/keymaps/via/keymap.c b/keyboards/jadookb/jkb65/keymaps/via/keymap.c index 950410d1aff..d96f2bbce3d 100644 --- a/keyboards/jadookb/jkb65/keymaps/via/keymap.c +++ b/keyboards/jadookb/jkb65/keymaps/via/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, RGB_RMOD, RGB_HUI, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, - MAGIC_UNNO_GUI,MAGIC_NO_GUI, _______, RGB_TOG, _______, MO(2), RGB_SPD, RGB_VAD, RGB_SPI + GU_ON, GU_OFF, _______, RGB_TOG, _______, MO(2), RGB_SPD, RGB_VAD, RGB_SPI ), [2] = LAYOUT_65_ansi_blocker( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/jukaie/jk01/keymaps/default/keymap.c b/keyboards/jukaie/jk01/keymaps/default/keymap.c index bdf509a8e89..156fb77d697 100644 --- a/keyboards/jukaie/jk01/keymaps/default/keymap.c +++ b/keyboards/jukaie/jk01/keymaps/default/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, TO(Win), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(Mac), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), [Macfn] = LAYOUT( QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, RGB_MOD, diff --git a/keyboards/jukaie/jk01/keymaps/via/keymap.c b/keyboards/jukaie/jk01/keymaps/via/keymap.c index bdf509a8e89..156fb77d697 100644 --- a/keyboards/jukaie/jk01/keymaps/via/keymap.c +++ b/keyboards/jukaie/jk01/keymaps/via/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, TO(Win), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(Mac), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_VAD, RGB_SPI), [Macfn] = LAYOUT( QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_TRNS, KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, RGB_MOD, diff --git a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c index b7f98c68caf..77c3603f8a5 100644 --- a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c +++ b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT( QK_BOOT, KC_UP, _______, - KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO + KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG ), [_FN2] = LAYOUT( _______, _______, _______, diff --git a/keyboards/kiwikeebs/macro/keymaps/via/keymap.c b/keyboards/kiwikeebs/macro/keymaps/via/keymap.c index 0641efab59b..4aa89cab951 100644 --- a/keyboards/kiwikeebs/macro/keymaps/via/keymap.c +++ b/keyboards/kiwikeebs/macro/keymaps/via/keymap.c @@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT( QK_BOOT, KC_UP, _______, - KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO + KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG ) }; diff --git a/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c index bfe8208a8b4..0c66b20c915 100644 --- a/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c +++ b/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN1] = LAYOUT( QK_BOOT, KC_UP, _______, - KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO + KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG ), [_FN2] = LAYOUT( _______, _______, _______, diff --git a/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c b/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c index 0641efab59b..4aa89cab951 100644 --- a/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c +++ b/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c @@ -29,6 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT( QK_BOOT, KC_UP, _______, - KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO + KC_LEFT, KC_DOWN, KC_RGHT, NK_TOGG ) }; diff --git a/keyboards/longnald/corin/keymaps/default/keymap.c b/keyboards/longnald/corin/keymaps/default/keymap.c index a16bfde7c25..9fcdaa222fb 100644 --- a/keyboards/longnald/corin/keymaps/default/keymap.c +++ b/keyboards/longnald/corin/keymaps/default/keymap.c @@ -34,9 +34,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [2] = LAYOUT_64_ansi( KC_NO, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_G, RGB_M_SW, RGB_M_SN, KC_NO, KC_NO, RGB_HUD, RGB_HUI, RGB_VAD, RGB_VAI, KC_NO, - KC_NO, KC_NO, LAG_NRM, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, AG_LNRM, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LAG_SWP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, AG_LSWP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO ), [3] = LAYOUT_64_ansi( diff --git a/keyboards/miller/gm862/keymaps/default/keymap.c b/keyboards/miller/gm862/keymaps/default/keymap.c index 07b3acee9b9..2eb134f53da 100644 --- a/keyboards/miller/gm862/keymaps/default/keymap.c +++ b/keyboards/miller/gm862/keymaps/default/keymap.c @@ -12,6 +12,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_GESC, 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_TRNS, RGB_TOG, KC_UP, RGB_MOD, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT , KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, - KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, + KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; \ No newline at end of file diff --git a/keyboards/miller/gm862/keymaps/via/keymap.c b/keyboards/miller/gm862/keymaps/via/keymap.c index 07b3acee9b9..2eb134f53da 100644 --- a/keyboards/miller/gm862/keymaps/via/keymap.c +++ b/keyboards/miller/gm862/keymaps/via/keymap.c @@ -12,6 +12,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_GESC, 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_TRNS, RGB_TOG, KC_UP, RGB_MOD, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT , KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS, - KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, + KC_MPRV, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; \ No newline at end of file diff --git a/keyboards/monsgeek/m5/keymaps/default/keymap.c b/keyboards/monsgeek/m5/keymaps/default/keymap.c index 28c433736cc..6fe98a89d6c 100644 --- a/keyboards/monsgeek/m5/keymaps/default/keymap.c +++ b/keyboards/monsgeek/m5/keymaps/default/keymap.c @@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______,TG(WIN_WASD),_______,_______,_______,_______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______, - _______, GUI_TOG, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI, _______, _______), + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_VAD, RGB_SAI, _______, _______), [MAC_B] = LAYOUT( /* Base */ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5, KC_F6, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PSCR, KC_SCRL, KC_PAUS, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, diff --git a/keyboards/senselessclay/had60/keymaps/default/keymap.c b/keyboards/senselessclay/had60/keymaps/default/keymap.c index 5f9d5247660..9c70873acf1 100644 --- a/keyboards/senselessclay/had60/keymaps/default/keymap.c +++ b/keyboards/senselessclay/had60/keymaps/default/keymap.c @@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT_all( - MAGIC_NO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, - MAGIC_UNNO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, + GU_OFF, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, + GU_ON, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) diff --git a/keyboards/senselessclay/had60/keymaps/iso/keymap.c b/keyboards/senselessclay/had60/keymaps/iso/keymap.c index 3c1323050ed..0324df5e87a 100644 --- a/keyboards/senselessclay/had60/keymaps/iso/keymap.c +++ b/keyboards/senselessclay/had60/keymaps/iso/keymap.c @@ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT_all( - MAGIC_NO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, - MAGIC_UNNO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, + GU_OFF, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, + GU_ON, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) diff --git a/keyboards/senselessclay/had60/keymaps/via/keymap.c b/keyboards/senselessclay/had60/keymaps/via/keymap.c index ed21d8bad5a..11ec292b6c3 100644 --- a/keyboards/senselessclay/had60/keymaps/via/keymap.c +++ b/keyboards/senselessclay/had60/keymaps/via/keymap.c @@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [_2] = LAYOUT_all( - MAGIC_NO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, - MAGIC_UNNO_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, + GU_OFF, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, + GU_ON, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), diff --git a/keyboards/teleport/native/ansi/keymaps/default/keymap.c b/keyboards/teleport/native/ansi/keymaps/default/keymap.c index 2780fdda7dd..60983df4351 100644 --- a/keyboards/teleport/native/ansi/keymaps/default/keymap.c +++ b/keyboards/teleport/native/ansi/keymaps/default/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c b/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c index e34f0f9d164..aa5c7a0f993 100644 --- a/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c +++ b/keyboards/teleport/native/ansi/keymaps/perfmode/keymap.c @@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, RGB_M_P, RGB_M_2, RGB_M_3, RGB_M_4, RGB_M_5, RGB_M_6, RGB_M_7, RGB_M_8, RGB_M_9, RGB_M_0, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME),KC_TRNS, TO(PERF), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/teleport/native/ansi/keymaps/via/keymap.c b/keyboards/teleport/native/ansi/keymaps/via/keymap.c index 95a5bc58b13..17c566d47c2 100644 --- a/keyboards/teleport/native/ansi/keymaps/via/keymap.c +++ b/keyboards/teleport/native/ansi/keymaps/via/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; diff --git a/keyboards/teleport/native/iso/keymaps/default/keymap.c b/keyboards/teleport/native/iso/keymaps/default/keymap.c index b6f2e7ab82f..68105f0a021 100644 --- a/keyboards/teleport/native/iso/keymaps/default/keymap.c +++ b/keyboards/teleport/native/iso/keymaps/default/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; diff --git a/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c b/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c index ca311edf5e1..96018a2fb82 100644 --- a/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c +++ b/keyboards/teleport/native/iso/keymaps/perfmode/keymap.c @@ -131,7 +131,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, RGB_M_P, RGB_M_2, RGB_M_3, RGB_M_4, RGB_M_5, RGB_M_6, RGB_M_7, RGB_M_8, RGB_M_9, RGB_M_0, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME),KC_TRNS, TO(PERF), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), diff --git a/keyboards/teleport/native/iso/keymaps/via/keymap.c b/keyboards/teleport/native/iso/keymaps/via/keymap.c index b6f2e7ab82f..68105f0a021 100644 --- a/keyboards/teleport/native/iso/keymaps/via/keymap.c +++ b/keyboards/teleport/native/iso/keymaps/via/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD, RGB_TOG, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(GAME),KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), }; diff --git a/keyboards/teleport/tkl/keymaps/ansi/keymap.c b/keyboards/teleport/tkl/keymaps/ansi/keymap.c index ed8255aaf25..735270fb0b2 100644 --- a/keyboards/teleport/tkl/keymaps/ansi/keymap.c +++ b/keyboards/teleport/tkl/keymaps/ansi/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/teleport/tkl/keymaps/default/keymap.c b/keyboards/teleport/tkl/keymaps/default/keymap.c index 76a4fc7aa6d..0568b79c771 100644 --- a/keyboards/teleport/tkl/keymaps/default/keymap.c +++ b/keyboards/teleport/tkl/keymaps/default/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/teleport/tkl/keymaps/iso/keymap.c b/keyboards/teleport/tkl/keymaps/iso/keymap.c index fdadd4ea24a..d5de75f130a 100644 --- a/keyboards/teleport/tkl/keymaps/iso/keymap.c +++ b/keyboards/teleport/tkl/keymaps/iso/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/teleport/tkl/keymaps/via/keymap.c b/keyboards/teleport/tkl/keymaps/via/keymap.c index 76a4fc7aa6d..0568b79c771 100644 --- a/keyboards/teleport/tkl/keymaps/via/keymap.c +++ b/keyboards/teleport/tkl/keymaps/via/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MAGIC_TOGGLE_NKRO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/viendi8l/keymaps/default/keymap.c b/keyboards/viendi8l/keymaps/default/keymap.c index 0a2f96c20be..40ac1fb8986 100755 --- a/keyboards/viendi8l/keymaps/default/keymap.c +++ b/keyboards/viendi8l/keymaps/default/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MINS, KC_F7, KC_F8, KC_F9, KC_TAB, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, KC_DEL, KC_EQL, KC_F4, KC_F5, KC_F6, _______, KC_HOME, KC_PGDN, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1, KC_F2, KC_F3, XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, - XXXXXXX, KC_CALC, KC_CALC, KC_DEL, XXXXXXX, GUI_TOG, KC_SLEP, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX + XXXXXXX, KC_CALC, KC_CALC, KC_DEL, XXXXXXX, GU_TOGG, KC_SLEP, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX ) }; diff --git a/keyboards/viendi8l/keymaps/via/keymap.c b/keyboards/viendi8l/keymaps/via/keymap.c index 59adaa62417..4989ba89db4 100755 --- a/keyboards/viendi8l/keymaps/via/keymap.c +++ b/keyboards/viendi8l/keymaps/via/keymap.c @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MINS, KC_F7, KC_F8, KC_F9, KC_TAB, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX, KC_DEL, KC_EQL, KC_F4, KC_F5, KC_F6, _______, KC_HOME, KC_PGDN, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F1, KC_F2, KC_F3, XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, - XXXXXXX, KC_CALC, KC_CALC, KC_DEL, XXXXXXX, GUI_TOG, KC_SLEP, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX + XXXXXXX, KC_CALC, KC_CALC, KC_DEL, XXXXXXX, GU_TOGG, KC_SLEP, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX ), [3] = LAYOUT_all( diff --git a/keyboards/vitamins_included/keymaps/default/keymap.c b/keyboards/vitamins_included/keymaps/default/keymap.c index 59903b1a6f7..0f90fe22bdb 100644 --- a/keyboards/vitamins_included/keymaps/default/keymap.c +++ b/keyboards/vitamins_included/keymaps/default/keymap.c @@ -1,8 +1,5 @@ #include QMK_KEYBOARD_H -#define TG_NKRO MAGIC_TOGGLE_NKRO - - // Layer names enum layer_names { @@ -94,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, QK_BOOT, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______,_______,_______, - TG_NKRO, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + NK_TOGG, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), /* Raise @@ -111,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = LAYOUT_ortho_4x12( KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, TG_NKRO, QK_BOOT, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, NK_TOGG, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY ), diff --git a/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c b/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c index 276c0738895..d802dd3c05b 100644 --- a/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/buff67v3/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GU_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c b/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c index 7ee3017117f..2d60e61302a 100644 --- a/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/buff67v3/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, GUI_TOG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS, GU_TOGG,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/yandrstudio/nz64/keymaps/default/keymap.c b/keyboards/yandrstudio/nz64/keymaps/default/keymap.c index 3ecbcf83621..9283a3f9751 100644 --- a/keyboards/yandrstudio/nz64/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/nz64/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/yandrstudio/nz64/keymaps/via/keymap.c b/keyboards/yandrstudio/nz64/keymaps/via/keymap.c index 284a06cacd6..c9817118187 100644 --- a/keyboards/yandrstudio/nz64/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/nz64/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT( diff --git a/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c index f1069c37db6..522b8d1043d 100644 --- a/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/nz67v2/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c index 52e0d15c8e5..d417fdb8ba8 100644 --- a/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/nz67v2/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT_all( diff --git a/keyboards/yandrstudio/wave75/keymaps/default/keymap.c b/keyboards/yandrstudio/wave75/keymaps/default/keymap.c index d9201d06cf6..766d1421e11 100644 --- a/keyboards/yandrstudio/wave75/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/wave75/keymaps/default/keymap.c @@ -30,5 +30,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/yandrstudio/wave75/keymaps/via/keymap.c b/keyboards/yandrstudio/wave75/keymaps/via/keymap.c index 47b133af1e2..56f2c6229d5 100644 --- a/keyboards/yandrstudio/wave75/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/wave75/keymaps/via/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c b/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c index 3347731f2bb..812270b13bd 100644 --- a/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c +++ b/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c @@ -27,5 +27,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; diff --git a/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c b/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c index 7bb2ef62657..50b4ed8d353 100644 --- a/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c +++ b/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, CG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS, GU_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), [2] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c index d1b27cd94e2..134f48965d0 100644 --- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( KC_ESC, KC_LANG,KC_NO, RGB_TOG,KC_MNXT,KC_VOLU, KC_CAPS,KC_NUM, KC_NO, RGB_MOD,KC_MPRV,KC_VOLD, - CG_NORM,LCG_SWP,EE_CLR, QK_BOOT, TO(0), KC_MUTE + CG_NORM,CG_LSWP,EE_CLR, QK_BOOT, TO(0), KC_MUTE ) }; diff --git a/keyboards/yushakobo/quick17/keymaps/via/keymap.c b/keyboards/yushakobo/quick17/keymaps/via/keymap.c index d1b27cd94e2..134f48965d0 100644 --- a/keyboards/yushakobo/quick17/keymaps/via/keymap.c +++ b/keyboards/yushakobo/quick17/keymaps/via/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FN] = LAYOUT( KC_ESC, KC_LANG,KC_NO, RGB_TOG,KC_MNXT,KC_VOLU, KC_CAPS,KC_NUM, KC_NO, RGB_MOD,KC_MPRV,KC_VOLD, - CG_NORM,LCG_SWP,EE_CLR, QK_BOOT, TO(0), KC_MUTE + CG_NORM,CG_LSWP,EE_CLR, QK_BOOT, TO(0), KC_MUTE ) }; diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h index 260ac1c8a44..51ec77bae0f 100644 --- a/quantum/quantum_keycodes_legacy.h +++ b/quantum/quantum_keycodes_legacy.h @@ -3,56 +3,3 @@ // clang-format off // Deprecated Quantum keycodes -#define SH_TG QK_SWAP_HANDS_TOGGLE -#define SQ_TOG QK_SEQUENCER_TOGGLE - -#define MAGIC_SWAP_CONTROL_CAPSLOCK QK_MAGIC_SWAP_CONTROL_CAPS_LOCK -#define MAGIC_UNSWAP_CONTROL_CAPSLOCK QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK -#define MAGIC_TOGGLE_CONTROL_CAPSLOCK QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK -#define MAGIC_UNCAPSLOCK_TO_CONTROL QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF -#define MAGIC_CAPSLOCK_TO_CONTROL QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON -#define MAGIC_SWAP_LALT_LGUI QK_MAGIC_SWAP_LALT_LGUI -#define MAGIC_UNSWAP_LALT_LGUI QK_MAGIC_UNSWAP_LALT_LGUI -#define MAGIC_SWAP_RALT_RGUI QK_MAGIC_SWAP_RALT_RGUI -#define MAGIC_UNSWAP_RALT_RGUI QK_MAGIC_UNSWAP_RALT_RGUI -#define MAGIC_UNNO_GUI QK_MAGIC_GUI_ON -#define MAGIC_NO_GUI QK_MAGIC_GUI_OFF -#define MAGIC_TOGGLE_GUI QK_MAGIC_TOGGLE_GUI -#define MAGIC_SWAP_GRAVE_ESC QK_MAGIC_SWAP_GRAVE_ESC -#define MAGIC_UNSWAP_GRAVE_ESC QK_MAGIC_UNSWAP_GRAVE_ESC -#define MAGIC_SWAP_BACKSLASH_BACKSPACE QK_MAGIC_SWAP_BACKSLASH_BACKSPACE -#define MAGIC_UNSWAP_BACKSLASH_BACKSPACE QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE -#define MAGIC_TOGGLE_BACKSLASH_BACKSPACE QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE -#define MAGIC_HOST_NKRO QK_MAGIC_NKRO_ON -#define MAGIC_UNHOST_NKRO QK_MAGIC_NKRO_OFF -#define MAGIC_TOGGLE_NKRO QK_MAGIC_TOGGLE_NKRO -#define MAGIC_SWAP_ALT_GUI QK_MAGIC_SWAP_ALT_GUI -#define MAGIC_UNSWAP_ALT_GUI QK_MAGIC_UNSWAP_ALT_GUI -#define MAGIC_TOGGLE_ALT_GUI QK_MAGIC_TOGGLE_ALT_GUI -#define MAGIC_SWAP_LCTL_LGUI QK_MAGIC_SWAP_LCTL_LGUI -#define MAGIC_UNSWAP_LCTL_LGUI QK_MAGIC_UNSWAP_LCTL_LGUI -#define MAGIC_SWAP_RCTL_RGUI QK_MAGIC_SWAP_RCTL_RGUI -#define MAGIC_UNSWAP_RCTL_RGUI QK_MAGIC_UNSWAP_RCTL_RGUI -#define MAGIC_SWAP_CTL_GUI QK_MAGIC_SWAP_CTL_GUI -#define MAGIC_UNSWAP_CTL_GUI QK_MAGIC_UNSWAP_CTL_GUI -#define MAGIC_TOGGLE_CTL_GUI QK_MAGIC_TOGGLE_CTL_GUI -#define MAGIC_EE_HANDS_LEFT QK_MAGIC_EE_HANDS_LEFT -#define MAGIC_EE_HANDS_RIGHT QK_MAGIC_EE_HANDS_RIGHT -#define MAGIC_SWAP_ESCAPE_CAPSLOCK QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK -#define MAGIC_UNSWAP_ESCAPE_CAPSLOCK QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK -#define MAGIC_TOGGLE_ESCAPE_CAPSLOCK QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK - -#define LCG_SWP QK_MAGIC_SWAP_LCTL_LGUI -#define LCG_NRM QK_MAGIC_UNSWAP_LCTL_LGUI -#define RCG_SWP QK_MAGIC_SWAP_RCTL_RGUI -#define RCG_NRM QK_MAGIC_UNSWAP_RCTL_RGUI -#define LAG_SWP QK_MAGIC_SWAP_LALT_LGUI -#define LAG_NRM QK_MAGIC_UNSWAP_LALT_LGUI -#define RAG_SWP QK_MAGIC_SWAP_RALT_RGUI -#define RAG_NRM QK_MAGIC_UNSWAP_RALT_RGUI -#define GUI_ON QK_MAGIC_GUI_ON -#define GUI_OFF QK_MAGIC_GUI_OFF -#define GUI_TOG QK_MAGIC_TOGGLE_GUI - -#define X(i) UM(i) -#define XP(i, j) UP(i, j) From fd17ae34ecd5443418994910f02c34379fea36f3 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 5 Apr 2024 02:38:12 +0100 Subject: [PATCH 24/40] Tidy up keyboards/zvecr (#23418) --- keyboards/zvecr/split_blackpill/config.h | 39 +----------------- keyboards/zvecr/split_blackpill/halconf.h | 23 +---------- .../{info.json => keyboard.json} | 11 +++++ .../split_blackpill/keymaps/default/keymap.c | 8 ++-- keyboards/zvecr/split_blackpill/mcuconf.h | 23 +---------- keyboards/zvecr/split_blackpill/rules.mk | 18 --------- .../zvecr/split_blackpill/split_blackpill.c | 26 ++++-------- keyboards/zvecr/zv48/config.h | 40 ++----------------- keyboards/zvecr/zv48/f401/halconf.h | 23 +---------- keyboards/zvecr/zv48/f401/keyboard.json | 4 +- keyboards/zvecr/zv48/f401/mcuconf.h | 23 +---------- keyboards/zvecr/zv48/f401/rules.mk | 1 + keyboards/zvecr/zv48/f411/halconf.h | 23 +---------- keyboards/zvecr/zv48/f411/keyboard.json | 4 +- keyboards/zvecr/zv48/f411/mcuconf.h | 23 +---------- keyboards/zvecr/zv48/f411/rules.mk | 1 + keyboards/zvecr/zv48/info.json | 12 ++++++ keyboards/zvecr/zv48/keymaps/default/keymap.c | 8 ++-- keyboards/zvecr/zv48/rules.mk | 19 --------- keyboards/zvecr/zv48/zv48.c | 30 +++++--------- 20 files changed, 70 insertions(+), 289 deletions(-) rename keyboards/zvecr/split_blackpill/{info.json => keyboard.json} (94%) create mode 100644 keyboards/zvecr/zv48/f401/rules.mk create mode 100644 keyboards/zvecr/zv48/f411/rules.mk delete mode 100644 keyboards/zvecr/zv48/rules.mk diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h index dd26e9ca325..efc3bbe66a9 100644 --- a/keyboards/zvecr/split_blackpill/config.h +++ b/keyboards/zvecr/split_blackpill/config.h @@ -1,45 +1,10 @@ -/* Copyright 2020 zvecr - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define SPLIT_HAND_PIN B3 #define SELECT_SOFT_SERIAL_SPEED 0 #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 1 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 #define WS2812_PWM_DMA_CHANNEL 3 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/zvecr/split_blackpill/halconf.h b/keyboards/zvecr/split_blackpill/halconf.h index 0ee73f028ad..894921e6d2b 100644 --- a/keyboards/zvecr/split_blackpill/halconf.h +++ b/keyboards/zvecr/split_blackpill/halconf.h @@ -1,23 +1,5 @@ -/* Copyright 2020 QMK - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/zvecr/split_blackpill/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -26,4 +8,3 @@ #define HAL_USE_SERIAL TRUE #include_next - diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/keyboard.json similarity index 94% rename from keyboards/zvecr/split_blackpill/info.json rename to keyboards/zvecr/split_blackpill/keyboard.json index 377ec44f97e..71eb99b7d40 100644 --- a/keyboards/zvecr/split_blackpill/info.json +++ b/keyboards/zvecr/split_blackpill/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B11", "B10", "B1", "B0", "A7", "A6"], "rows": ["B15", "B14", "B13", "B12"], @@ -15,6 +22,10 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, + "handedness": { + "pin": "B3" + }, "soft_serial_pin": "B6", "bootmagic": { "matrix": [4, 0] diff --git a/keyboards/zvecr/split_blackpill/keymaps/default/keymap.c b/keyboards/zvecr/split_blackpill/keymaps/default/keymap.c index 51052bd6c3f..e48a7950289 100644 --- a/keyboards/zvecr/split_blackpill/keymaps/default/keymap.c +++ b/keyboards/zvecr/split_blackpill/keymaps/default/keymap.c @@ -1,6 +1,8 @@ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H -// Defines names for use in layer keycodes and the keymap enum layer_names { _QWERTY, _LOWER, @@ -26,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_ortho_4x12( KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, 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_ENT, KC_LCTL, KC_LGUI, KC_LALT, KC_APP, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), @@ -78,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, QK_BOOT, _______, + _______, QK_BOOT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/zvecr/split_blackpill/mcuconf.h b/keyboards/zvecr/split_blackpill/mcuconf.h index 01cb4f40f42..72b7a95be8b 100644 --- a/keyboards/zvecr/split_blackpill/mcuconf.h +++ b/keyboards/zvecr/split_blackpill/mcuconf.h @@ -1,23 +1,5 @@ -/* Copyright 2020 QMK - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/zvecr/split_blackpill/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h` - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -31,4 +13,3 @@ #undef STM32_SPI_USE_SPI2 #define STM32_SPI_USE_SPI2 FALSE - diff --git a/keyboards/zvecr/split_blackpill/rules.mk b/keyboards/zvecr/split_blackpill/rules.mk index 196b4019ca5..c6e29883213 100644 --- a/keyboards/zvecr/split_blackpill/rules.mk +++ b/keyboards/zvecr/split_blackpill/rules.mk @@ -1,19 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart - -# Disable unsupported hardware -AUDIO_SUPPORTED = no -BACKLIGHT_SUPPORTED = no diff --git a/keyboards/zvecr/split_blackpill/split_blackpill.c b/keyboards/zvecr/split_blackpill/split_blackpill.c index 6c7db0580e7..64f1cb84013 100644 --- a/keyboards/zvecr/split_blackpill/split_blackpill.c +++ b/keyboards/zvecr/split_blackpill/split_blackpill.c @@ -1,25 +1,13 @@ -/* Copyright 2020 zvecr - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later + #include "quantum.h" -void keyboard_pre_init_kb(void){ +void keyboard_pre_init_kb(void) { // Workaround for reversible pcb/mcu - palSetLineMode(C13, PAL_MODE_OUTPUT_OPENDRAIN); - palSetLineMode(B9, PAL_MODE_OUTPUT_OPENDRAIN); - palSetLineMode(B8, PAL_MODE_OUTPUT_OPENDRAIN); + gpio_set_pin_output_open_drain(C13); + gpio_set_pin_output_open_drain(B9); + gpio_set_pin_output_open_drain(B8); keyboard_pre_init_user(); } diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h index a67a46a1850..9e8c2656a91 100644 --- a/keyboards/zvecr/zv48/config.h +++ b/keyboards/zvecr/zv48/config.h @@ -1,21 +1,8 @@ -/* Copyright 2020 zvecr - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later + #pragma once -#define SPLIT_HAND_PIN B9 //#define SELECT_SOFT_SERIAL_SPEED 0 #define SERIAL_USART_SPEED 921600 @@ -24,24 +11,3 @@ #define WS2812_PWM_PAL_MODE 2 #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM2 #define WS2812_PWM_DMA_CHANNEL 5 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/zvecr/zv48/f401/halconf.h b/keyboards/zvecr/zv48/f401/halconf.h index b42a6939968..089526f1f0d 100644 --- a/keyboards/zvecr/zv48/f401/halconf.h +++ b/keyboards/zvecr/zv48/f401/halconf.h @@ -1,23 +1,5 @@ -/* Copyright 2020 QMK - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -28,4 +10,3 @@ #define SERIAL_USB_BUFFERS_SIZE 256 #include_next - diff --git a/keyboards/zvecr/zv48/f401/keyboard.json b/keyboards/zvecr/zv48/f401/keyboard.json index acd7e83f77d..797e9900595 100644 --- a/keyboards/zvecr/zv48/f401/keyboard.json +++ b/keyboards/zvecr/zv48/f401/keyboard.json @@ -1,5 +1,3 @@ { - "processor": "STM32F401", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F401" + "development_board": "blackpill_f401" } diff --git a/keyboards/zvecr/zv48/f401/mcuconf.h b/keyboards/zvecr/zv48/f401/mcuconf.h index 3c14f5e0275..6a6ab823771 100644 --- a/keyboards/zvecr/zv48/f401/mcuconf.h +++ b/keyboards/zvecr/zv48/f401/mcuconf.h @@ -1,23 +1,5 @@ -/* Copyright 2020 QMK - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h` - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -28,4 +10,3 @@ #undef STM32_SERIAL_USE_USART1 #define STM32_SERIAL_USE_USART1 TRUE - diff --git a/keyboards/zvecr/zv48/f401/rules.mk b/keyboards/zvecr/zv48/f401/rules.mk new file mode 100644 index 00000000000..c6e29883213 --- /dev/null +++ b/keyboards/zvecr/zv48/f401/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = usart diff --git a/keyboards/zvecr/zv48/f411/halconf.h b/keyboards/zvecr/zv48/f411/halconf.h index 3678cd52b51..089526f1f0d 100644 --- a/keyboards/zvecr/zv48/f411/halconf.h +++ b/keyboards/zvecr/zv48/f411/halconf.h @@ -1,23 +1,5 @@ -/* Copyright 2020 QMK - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f411/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -28,4 +10,3 @@ #define SERIAL_USB_BUFFERS_SIZE 256 #include_next - diff --git a/keyboards/zvecr/zv48/f411/keyboard.json b/keyboards/zvecr/zv48/f411/keyboard.json index 2517a82403f..a41c5f4dd14 100644 --- a/keyboards/zvecr/zv48/f411/keyboard.json +++ b/keyboards/zvecr/zv48/f411/keyboard.json @@ -1,5 +1,3 @@ { - "processor": "STM32F411", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F411" + "development_board": "blackpill_f411" } diff --git a/keyboards/zvecr/zv48/f411/mcuconf.h b/keyboards/zvecr/zv48/f411/mcuconf.h index 572a8616cfb..6a6ab823771 100644 --- a/keyboards/zvecr/zv48/f411/mcuconf.h +++ b/keyboards/zvecr/zv48/f411/mcuconf.h @@ -1,23 +1,5 @@ -/* Copyright 2020 QMK - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f411/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F411/configs/mcuconf.h` - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -28,4 +10,3 @@ #undef STM32_SERIAL_USE_USART1 #define STM32_SERIAL_USE_USART1 TRUE - diff --git a/keyboards/zvecr/zv48/f411/rules.mk b/keyboards/zvecr/zv48/f411/rules.mk new file mode 100644 index 00000000000..c6e29883213 --- /dev/null +++ b/keyboards/zvecr/zv48/f411/rules.mk @@ -0,0 +1 @@ +SERIAL_DRIVER = usart diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json index cd81109ed14..e596eb6e79b 100644 --- a/keyboards/zvecr/zv48/info.json +++ b/keyboards/zvecr/zv48/info.json @@ -8,6 +8,14 @@ "pid": "0x0048", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B15", "B10", "B0", "A5", "A4", "A3"], "rows": ["A10", "A15", "B3", "B4"], @@ -41,6 +49,10 @@ } }, "split": { + "enabled": true, + "handedness": { + "pin": "B9" + }, "soft_serial_pin": "B6", "bootmagic": { "matrix": [4, 0] diff --git a/keyboards/zvecr/zv48/keymaps/default/keymap.c b/keyboards/zvecr/zv48/keymaps/default/keymap.c index 51052bd6c3f..e48a7950289 100644 --- a/keyboards/zvecr/zv48/keymaps/default/keymap.c +++ b/keyboards/zvecr/zv48/keymaps/default/keymap.c @@ -1,6 +1,8 @@ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H -// Defines names for use in layer keycodes and the keymap enum layer_names { _QWERTY, _LOWER, @@ -26,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT_ortho_4x12( KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, 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_ENT, KC_LCTL, KC_LGUI, KC_LALT, KC_APP, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), @@ -78,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( - _______, QK_BOOT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, QK_BOOT, _______, + _______, QK_BOOT, _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/zvecr/zv48/rules.mk b/keyboards/zvecr/zv48/rules.mk deleted file mode 100644 index 7b615f95fa4..00000000000 --- a/keyboards/zvecr/zv48/rules.mk +++ /dev/null @@ -1,19 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -ENCODER_ENABLE = yes # Enable rotary encoder support -AUDIO_ENABLE = no # Audio output - -SPLIT_KEYBOARD = yes -SERIAL_DRIVER = usart - -DEFAULT_FOLDER = zvecr/zv48/f401 diff --git a/keyboards/zvecr/zv48/zv48.c b/keyboards/zvecr/zv48/zv48.c index 2716b780806..91cf2d25209 100644 --- a/keyboards/zvecr/zv48/zv48.c +++ b/keyboards/zvecr/zv48/zv48.c @@ -1,27 +1,15 @@ -/* Copyright 2020 zvecr - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +// Copyright 2024 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later + #include "quantum.h" -void keyboard_pre_init_kb(void){ +void keyboard_pre_init_kb(void) { // Workaround for reversible pcb/mcu - palSetLineMode(C13, PAL_MODE_INPUT_PULLUP); - palSetLineMode(C15, PAL_MODE_INPUT_PULLUP); - palSetLineMode(B7, PAL_MODE_OUTPUT_OPENDRAIN); - palSetLineMode(A0, PAL_MODE_OUTPUT_OPENDRAIN); - palSetLineMode(A1, PAL_MODE_OUTPUT_OPENDRAIN); + gpio_set_pin_input_high(C13); + gpio_set_pin_input_high(C15); + gpio_set_pin_output_open_drain(B7); + gpio_set_pin_output_open_drain(A0); + gpio_set_pin_output_open_drain(A1); keyboard_pre_init_user(); } From 0696a624764363d48e98286ba27e200e18db1ffa Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 5 Apr 2024 02:38:35 +0100 Subject: [PATCH 25/40] "features.split" is not a valid key (#23419) --- keyboards/tweetydabird/lotus58/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/tweetydabird/lotus58/info.json b/keyboards/tweetydabird/lotus58/info.json index f4660c3ad9f..2c3f85cdd9f 100644 --- a/keyboards/tweetydabird/lotus58/info.json +++ b/keyboards/tweetydabird/lotus58/info.json @@ -14,7 +14,6 @@ "nkro": true, "oled": true, "rgblight": true, - "split": true, "tri_layer": true }, "rgblight": { @@ -118,4 +117,4 @@ ] } } -} \ No newline at end of file +} From f8a7a6848d737b01dcb5843503bcabcdd68cdb01 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Fri, 5 Apr 2024 13:23:43 +1100 Subject: [PATCH 26/40] Update ChibiOS submodules. (#23405) --- lib/chibios | 2 +- lib/chibios-contrib | 2 +- platforms/chibios/platform.mk | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/chibios b/lib/chibios index 11edb161098..be44b3305f9 160000 --- a/lib/chibios +++ b/lib/chibios @@ -1 +1 @@ -Subproject commit 11edb1610980f213b9f83161e1715a46fb7e4c51 +Subproject commit be44b3305f9a9fe5f2f49a4e7b978db322dc463e diff --git a/lib/chibios-contrib b/lib/chibios-contrib index 9d7a7f904ed..77cb0a4f758 160000 --- a/lib/chibios-contrib +++ b/lib/chibios-contrib @@ -1 +1 @@ -Subproject commit 9d7a7f904ed135e3459cf6d602db56a26872df6b +Subproject commit 77cb0a4f7589f89e724f5e6ecb1d76d514dd1212 diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk index b13eed39be8..169707966ff 100644 --- a/platforms/chibios/platform.mk +++ b/platforms/chibios/platform.mk @@ -258,8 +258,8 @@ endif # HAL-OSAL files (optional). include $(CHIBIOS)/os/hal/hal.mk --include $(CHIBIOS)/os/hal/osal/rt/osal.mk # ChibiOS <= 19.x --include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk # ChibiOS >= 20.x +include $(CHIBIOS)/os/oslib/oslib.mk +include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk # RTOS files (optional). include $(CHIBIOS)/os/rt/rt.mk # Other files (optional). @@ -270,6 +270,7 @@ PLATFORM_SRC = \ $(KERNSRC) \ $(PORTSRC) \ $(OSALSRC) \ + $(OSLIBSRC) \ $(HALSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ @@ -285,11 +286,11 @@ QUANTUM_LIB_SRC += $(STARTUPASM) $(PORTASM) $(OSALASM) $(PLATFORMASM) PLATFORM_SRC := $(patsubst $(TOP_DIR)/%,%,$(PLATFORM_SRC)) -EXTRAINCDIRS += $(CHIBIOS)/os/license $(CHIBIOS)/os/oslib/include \ +EXTRAINCDIRS += $(CHIBIOS)/os/license \ $(TOP_DIR)/platforms/chibios/boards/$(BOARD)/configs \ $(TOP_DIR)/platforms/chibios/boards/common/configs \ $(HALCONFDIR) $(CHCONFDIR) \ - $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \ + $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) $(OSLIBINC) \ $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \ $(STREAMSINC) $(CHIBIOS)/os/various $(COMMON_VPATH) From a14c03b96e75212d042621f4c68ccbecb7ee9901 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 5 Apr 2024 14:48:21 +1100 Subject: [PATCH 27/40] Remove more unnecessary `quantum.h` includes (#23402) --- keyboards/bastardkb/charybdis/3x5/3x5.c | 2 +- keyboards/bastardkb/charybdis/3x6/3x6.c | 2 +- keyboards/bastardkb/charybdis/4x6/4x6.c | 2 +- keyboards/bastardkb/dilemma/3x5_3/3x5_3.c | 2 +- keyboards/bastardkb/dilemma/4x6_4/4x6_4.c | 2 +- keyboards/cipulot/common/ec_board.c | 2 +- keyboards/crkbd/lib/host_led_state_reader.c | 3 ++- keyboards/crkbd/lib/keylogger.c | 3 ++- keyboards/crkbd/lib/layer_state_reader.c | 2 +- keyboards/crkbd/lib/logo_reader.c | 2 -- keyboards/crkbd/lib/mode_icon_reader.c | 1 - keyboards/crkbd/lib/rgb_state_reader.c | 2 +- keyboards/crkbd/lib/timelogger.c | 2 +- keyboards/doio/kb16/lib/bongocat/bongocat.c | 9 +++++++-- keyboards/doio/kb16/lib/layer_status/layer_status.c | 4 +++- keyboards/doio/kb16/lib/logo.c | 3 ++- keyboards/durgod/dgk6x/galaxy/galaxy.c | 2 +- keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c | 2 +- keyboards/durgod/dgk6x/hades_iso/hades_iso.c | 2 +- keyboards/durgod/dgk6x/venus/venus.c | 2 +- keyboards/gboards/engine/engine.h | 5 ++++- keyboards/gboards/g/engine.h | 5 ++++- keyboards/gopolar/gg86/lib/logo.c | 3 ++- keyboards/handwired/dygma/raise/ansi/ansi.c | 2 +- keyboards/handwired/dygma/raise/iso/iso.c | 2 +- .../handwired/tractyl_manuform/5x6_right/f411/f411.c | 2 +- keyboards/helix/rev3_5rows/rev3_5rows.c | 2 +- keyboards/horrortroll/handwired_k552/lib/bongocat.c | 9 +++++++-- keyboards/horrortroll/handwired_k552/lib/galaxy.c | 4 +++- keyboards/horrortroll/handwired_k552/lib/logo.c | 4 +++- keyboards/horrortroll/lemon40/lib/bongocat.c | 9 +++++++-- keyboards/hotdox/hotdox.c | 2 -- keyboards/kbdfans/odin75/lib/bongocat.c | 8 +++++++- keyboards/keyboardio/model01/model01.c | 4 ++-- keyboards/lily58/lib/layer_state_reader.c | 2 +- keyboards/marksard/rhymestone/common/oled_helper.c | 4 +++- keyboards/marksard/treadstone48/common/oled_helper.c | 4 +++- keyboards/monstargear/xo87/solderable/solderable.c | 1 - keyboards/palette1202/lib/oled_helper.c | 2 +- keyboards/rgbkb/sol/rev1/rev1.c | 2 +- keyboards/rgbkb/sol/rev2/rev2.c | 2 +- keyboards/satt/comet46/lib/host_led_state_reader.c | 3 ++- keyboards/satt/comet46/lib/modifier_state_reader.c | 2 +- keyboards/sekigon/grs_70ec/ec_switch_matrix.c | 3 +-- keyboards/terrazzo/terrazzo.c | 4 ---- keyboards/tzarc/djinn/djinn.c | 4 +--- keyboards/tzarc/djinn/djinn_portscan_matrix.c | 3 --- keyboards/tzarc/djinn/djinn_split_sync.c | 2 -- keyboards/tzarc/djinn/djinn_usbpd.c | 2 -- keyboards/v60_type_r/v60_type_r.c | 2 -- keyboards/v60_type_r/v60_type_r.h | 2 -- keyboards/viktus/minne_topre/ec.c | 2 +- keyboards/viktus/osav2_numpad_topre/ec.c | 2 +- keyboards/viktus/osav2_topre/ec.c | 2 +- keyboards/viktus/styrka_topre/ec.c | 2 +- keyboards/vinhcatba/uncertainty/bongo.c | 7 +++++++ keyboards/vinhcatba/uncertainty/bongo.h | 2 ++ keyboards/vinhcatba/uncertainty/uncertainty.c | 3 +-- keyboards/yosino58/lib/layer_state_reader.c | 2 +- keyboards/yosino58/lib/rgb_state_reader.c | 1 - 60 files changed, 102 insertions(+), 77 deletions(-) diff --git a/keyboards/bastardkb/charybdis/3x5/3x5.c b/keyboards/bastardkb/charybdis/3x5/3x5.c index 082dbbc3bd4..6e8e3bef106 100644 --- a/keyboards/bastardkb/charybdis/3x5/3x5.c +++ b/keyboards/bastardkb/charybdis/3x5/3x5.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "charybdis.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/charybdis/3x6/3x6.c b/keyboards/bastardkb/charybdis/3x6/3x6.c index a6c7ce07d6e..d2c0a39815c 100644 --- a/keyboards/bastardkb/charybdis/3x6/3x6.c +++ b/keyboards/bastardkb/charybdis/3x6/3x6.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "charybdis.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/charybdis/4x6/4x6.c b/keyboards/bastardkb/charybdis/4x6/4x6.c index c7856c12bbb..ff1bbea4704 100644 --- a/keyboards/bastardkb/charybdis/4x6/4x6.c +++ b/keyboards/bastardkb/charybdis/4x6/4x6.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "charybdis.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c index 0a5ba151814..3decc51e846 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c +++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dilemma.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c b/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c index c80ccbc8eb8..49b24fbd049 100644 --- a/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c +++ b/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dilemma.h" #ifdef SWAP_HANDS_ENABLE const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/cipulot/common/ec_board.c b/keyboards/cipulot/common/ec_board.c index 2225d6da63d..d9ba1975893 100644 --- a/keyboards/cipulot/common/ec_board.c +++ b/keyboards/cipulot/common/ec_board.c @@ -15,7 +15,7 @@ */ #include "ec_switch_matrix.h" -#include "quantum.h" +#include "keyboard.h" void eeconfig_init_kb(void) { // Default values diff --git a/keyboards/crkbd/lib/host_led_state_reader.c b/keyboards/crkbd/lib/host_led_state_reader.c index 2593ac5f8b7..8602134f699 100644 --- a/keyboards/crkbd/lib/host_led_state_reader.c +++ b/keyboards/crkbd/lib/host_led_state_reader.c @@ -1,5 +1,6 @@ #include -#include "quantum.h" +#include "led.h" +#include "host.h" char host_led_state_str[24]; diff --git a/keyboards/crkbd/lib/keylogger.c b/keyboards/crkbd/lib/keylogger.c index 9adb55d6eeb..84d2f8913db 100644 --- a/keyboards/crkbd/lib/keylogger.c +++ b/keyboards/crkbd/lib/keylogger.c @@ -1,5 +1,6 @@ #include -#include "quantum.h" +#include +#include "action.h" char keylog_str[24] = {}; char keylogs_str[21] = {}; diff --git a/keyboards/crkbd/lib/layer_state_reader.c b/keyboards/crkbd/lib/layer_state_reader.c index 7dd17024859..f1030cae099 100644 --- a/keyboards/crkbd/lib/layer_state_reader.c +++ b/keyboards/crkbd/lib/layer_state_reader.c @@ -1,5 +1,5 @@ -#include "quantum.h" #include +#include "action_layer.h" // in the future, should use (1U<<_LAYER_NAME) instead, but needs to be moved to keymap,c #define L_BASE 0 diff --git a/keyboards/crkbd/lib/logo_reader.c b/keyboards/crkbd/lib/logo_reader.c index 4a710bb2502..039a538cc54 100644 --- a/keyboards/crkbd/lib/logo_reader.c +++ b/keyboards/crkbd/lib/logo_reader.c @@ -1,5 +1,3 @@ -#include "quantum.h" - const char *read_logo(void) { static char logo[] = { 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, diff --git a/keyboards/crkbd/lib/mode_icon_reader.c b/keyboards/crkbd/lib/mode_icon_reader.c index 02a63ec1c60..9dadd6ac86b 100644 --- a/keyboards/crkbd/lib/mode_icon_reader.c +++ b/keyboards/crkbd/lib/mode_icon_reader.c @@ -1,5 +1,4 @@ #include -#include "quantum.h" char mode_icon[24]; diff --git a/keyboards/crkbd/lib/rgb_state_reader.c b/keyboards/crkbd/lib/rgb_state_reader.c index a255cd662d2..8ba0cda8df7 100644 --- a/keyboards/crkbd/lib/rgb_state_reader.c +++ b/keyboards/crkbd/lib/rgb_state_reader.c @@ -1,7 +1,7 @@ #ifdef RGBLIGHT_ENABLE #include -#include "quantum.h" +#include "rgblight.h" extern rgblight_config_t rgblight_config; char rbf_info_str[24]; diff --git a/keyboards/crkbd/lib/timelogger.c b/keyboards/crkbd/lib/timelogger.c index bce9d99a4be..83fe9706ddc 100644 --- a/keyboards/crkbd/lib/timelogger.c +++ b/keyboards/crkbd/lib/timelogger.c @@ -1,5 +1,5 @@ #include -#include "quantum.h" +#include "timer.h" char timelog_str[24] = {}; int last_time = 0; diff --git a/keyboards/doio/kb16/lib/bongocat/bongocat.c b/keyboards/doio/kb16/lib/bongocat/bongocat.c index 12ca8694c1d..c90df38aec0 100644 --- a/keyboards/doio/kb16/lib/bongocat/bongocat.c +++ b/keyboards/doio/kb16/lib/bongocat/bongocat.c @@ -14,7 +14,13 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "bongocat.h" +#include +#include "oled_driver.h" +#include "progmem.h" +#include "timer.h" +#include "wpm.h" +#include "util.h" // WPM-responsive animation stuff here #define IDLE_FRAMES 5 @@ -28,7 +34,6 @@ #define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm // #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing #define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024 -#define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro uint32_t curr_anim_duration = 0; // variable animation duration uint32_t bongo_timer = 0; diff --git a/keyboards/doio/kb16/lib/layer_status/layer_status.c b/keyboards/doio/kb16/lib/layer_status/layer_status.c index 657ac86ff21..d9ba20bd8c4 100644 --- a/keyboards/doio/kb16/lib/layer_status/layer_status.c +++ b/keyboards/doio/kb16/lib/layer_status/layer_status.c @@ -15,7 +15,9 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "oled_driver.h" +#include "action_layer.h" +#include "progmem.h" #define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/doio/kb16/lib/logo.c b/keyboards/doio/kb16/lib/logo.c index 7a52b479ff4..ade4b954e09 100644 --- a/keyboards/doio/kb16/lib/logo.c +++ b/keyboards/doio/kb16/lib/logo.c @@ -15,7 +15,8 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "oled_driver.h" +#include "progmem.h" #define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/durgod/dgk6x/galaxy/galaxy.c b/keyboards/durgod/dgk6x/galaxy/galaxy.c index 1cf2d712558..5d08163109a 100644 --- a/keyboards/durgod/dgk6x/galaxy/galaxy.c +++ b/keyboards/durgod/dgk6x/galaxy/galaxy.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dgk6x.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c index e984c36d911..d092310814b 100644 --- a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c +++ b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dgk6x.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c index 5ccc60e841e..dcd821803e9 100644 --- a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c +++ b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dgk6x.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/durgod/dgk6x/venus/venus.c b/keyboards/durgod/dgk6x/venus/venus.c index 9bde901374b..5433266e3ba 100644 --- a/keyboards/durgod/dgk6x/venus/venus.c +++ b/keyboards/durgod/dgk6x/venus/venus.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "dgk6x.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/gboards/engine/engine.h b/keyboards/gboards/engine/engine.h index 005dd730b8d..a28777f4f24 100644 --- a/keyboards/gboards/engine/engine.h +++ b/keyboards/gboards/engine/engine.h @@ -12,9 +12,12 @@ #pragma once -#include "quantum.h" +#include +#include #include #include +#include "action.h" +#include "progmem.h" #include "config_engine.h" // Maximum values for combos diff --git a/keyboards/gboards/g/engine.h b/keyboards/gboards/g/engine.h index a78ddc96ff0..2b62165c51e 100644 --- a/keyboards/gboards/g/engine.h +++ b/keyboards/gboards/g/engine.h @@ -12,9 +12,12 @@ #pragma once -#include "quantum.h" +#include +#include #include #include +#include "action.h" +#include "progmem.h" #include "config_engine.h" // Set defaults diff --git a/keyboards/gopolar/gg86/lib/logo.c b/keyboards/gopolar/gg86/lib/logo.c index 3db3acdac10..8a8b97c4b7e 100644 --- a/keyboards/gopolar/gg86/lib/logo.c +++ b/keyboards/gopolar/gg86/lib/logo.c @@ -14,7 +14,8 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "oled_driver.h" +#include "progmem.h" #define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/handwired/dygma/raise/ansi/ansi.c b/keyboards/handwired/dygma/raise/ansi/ansi.c index c9e0cb288cb..67b84c3bc88 100644 --- a/keyboards/handwired/dygma/raise/ansi/ansi.c +++ b/keyboards/handwired/dygma/raise/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "raise.h" // "led_map" is taken from kaleidoscope // LHK = Left Hand Keys diff --git a/keyboards/handwired/dygma/raise/iso/iso.c b/keyboards/handwired/dygma/raise/iso/iso.c index 48ba85bf902..9643af7b8c0 100644 --- a/keyboards/handwired/dygma/raise/iso/iso.c +++ b/keyboards/handwired/dygma/raise/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "raise.h" // "led_map" is taken from kaleidoscope // LHK = Left Hand Keys diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c index a0c3ee0f4e4..24263fa832c 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "tractyl_manuform.h" void keyboard_pre_init_sub(void) { setPinInputHigh(A0); } diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.c b/keyboards/helix/rev3_5rows/rev3_5rows.c index 921558e80d9..28fa314a7ba 100644 --- a/keyboards/helix/rev3_5rows/rev3_5rows.c +++ b/keyboards/helix/rev3_5rows/rev3_5rows.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "rev3_5rows.h" bool is_mac_mode(void) { return keymap_config.swap_lalt_lgui == false; diff --git a/keyboards/horrortroll/handwired_k552/lib/bongocat.c b/keyboards/horrortroll/handwired_k552/lib/bongocat.c index 6510223b222..70699ff3cda 100644 --- a/keyboards/horrortroll/handwired_k552/lib/bongocat.c +++ b/keyboards/horrortroll/handwired_k552/lib/bongocat.c @@ -14,7 +14,13 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "bongocat.h" +#include +#include "oled_driver.h" +#include "progmem.h" +#include "timer.h" +#include "wpm.h" +#include "util.h" // WPM-responsive animation stuff here # define IDLE_FRAMES 5 @@ -28,7 +34,6 @@ # define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm // #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing # define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024 -# define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro uint32_t curr_anim_duration = 0; // variable animation duration uint32_t bongo_timer = 0; diff --git a/keyboards/horrortroll/handwired_k552/lib/galaxy.c b/keyboards/horrortroll/handwired_k552/lib/galaxy.c index 04885b80859..6578295c6f0 100644 --- a/keyboards/horrortroll/handwired_k552/lib/galaxy.c +++ b/keyboards/horrortroll/handwired_k552/lib/galaxy.c @@ -14,7 +14,9 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "galaxy.h" +#include "oled_driver.h" +#include "progmem.h" # define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/horrortroll/handwired_k552/lib/logo.c b/keyboards/horrortroll/handwired_k552/lib/logo.c index 3931fdf4554..f3ae2f8a068 100644 --- a/keyboards/horrortroll/handwired_k552/lib/logo.c +++ b/keyboards/horrortroll/handwired_k552/lib/logo.c @@ -14,7 +14,9 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "logo.h" +#include "oled_driver.h" +#include "progmem.h" # define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/horrortroll/lemon40/lib/bongocat.c b/keyboards/horrortroll/lemon40/lib/bongocat.c index 12ca8694c1d..c90df38aec0 100644 --- a/keyboards/horrortroll/lemon40/lib/bongocat.c +++ b/keyboards/horrortroll/lemon40/lib/bongocat.c @@ -14,7 +14,13 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "bongocat.h" +#include +#include "oled_driver.h" +#include "progmem.h" +#include "timer.h" +#include "wpm.h" +#include "util.h" // WPM-responsive animation stuff here #define IDLE_FRAMES 5 @@ -28,7 +34,6 @@ #define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm // #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing #define ANIM_SIZE 525 // number of bytes in array, minimize for adequate firmware size, max is 1024 -#define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro uint32_t curr_anim_duration = 0; // variable animation duration uint32_t bongo_timer = 0; diff --git a/keyboards/hotdox/hotdox.c b/keyboards/hotdox/hotdox.c index 00af9efb1e5..4e86ec6d18b 100644 --- a/keyboards/hotdox/hotdox.c +++ b/keyboards/hotdox/hotdox.c @@ -1,6 +1,4 @@ #include "hotdox.h" -#include "backlight.h" -#include "quantum.h" extern inline void ergodox_board_led_on(void); extern inline void ergodox_right_led_1_on(void); diff --git a/keyboards/kbdfans/odin75/lib/bongocat.c b/keyboards/kbdfans/odin75/lib/bongocat.c index 05be2173d15..9c7a5dc1fce 100644 --- a/keyboards/kbdfans/odin75/lib/bongocat.c +++ b/keyboards/kbdfans/odin75/lib/bongocat.c @@ -14,7 +14,13 @@ * along with this program. If not, see . */ -#include "quantum.h" +#include "bongocat.h" +#include +#include "oled_driver.h" +#include "progmem.h" +#include "timer.h" +#include "wpm.h" +#include "util.h" // WPM-responsive animation stuff here #define IDLE_FRAMES 5 diff --git a/keyboards/keyboardio/model01/model01.c b/keyboards/keyboardio/model01/model01.c index 3644f045163..33198423de6 100644 --- a/keyboards/keyboardio/model01/model01.c +++ b/keyboards/keyboardio/model01/model01.c @@ -13,10 +13,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "quantum.h" + +#include "model01.h" #include "i2c_master.h" #include -#include "model01.h" void matrix_init_kb(void) { /* the bootloader can leave LEDs on, so */ diff --git a/keyboards/lily58/lib/layer_state_reader.c b/keyboards/lily58/lib/layer_state_reader.c index 69b46130931..fb74825ef94 100644 --- a/keyboards/lily58/lib/layer_state_reader.c +++ b/keyboards/lily58/lib/layer_state_reader.c @@ -1,4 +1,4 @@ -#include "quantum.h" +#include "action_layer.h" #include #define L_BASE 0 diff --git a/keyboards/marksard/rhymestone/common/oled_helper.c b/keyboards/marksard/rhymestone/common/oled_helper.c index 613798c941e..4a0ca72e89f 100644 --- a/keyboards/marksard/rhymestone/common/oled_helper.c +++ b/keyboards/marksard/rhymestone/common/oled_helper.c @@ -1,9 +1,11 @@ #include "oled_helper.h" -#include "quantum.h" +#include "host.h" +#include "progmem.h" #include #include #ifdef OLED_ENABLE +#include "oled_driver.h" void render_logo(void) { diff --git a/keyboards/marksard/treadstone48/common/oled_helper.c b/keyboards/marksard/treadstone48/common/oled_helper.c index e9a8cf564a3..66124abe120 100644 --- a/keyboards/marksard/treadstone48/common/oled_helper.c +++ b/keyboards/marksard/treadstone48/common/oled_helper.c @@ -1,5 +1,7 @@ #include "oled_helper.h" -#include "quantum.h" +#include "oled_driver.h" +#include "host.h" +#include "rgblight.h" #include #include diff --git a/keyboards/monstargear/xo87/solderable/solderable.c b/keyboards/monstargear/xo87/solderable/solderable.c index f1fc65ea011..cb4da24a3ac 100644 --- a/keyboards/monstargear/xo87/solderable/solderable.c +++ b/keyboards/monstargear/xo87/solderable/solderable.c @@ -15,7 +15,6 @@ */ #include "solderable.h" -#include "quantum.h" #define noLed {255,255} diff --git a/keyboards/palette1202/lib/oled_helper.c b/keyboards/palette1202/lib/oled_helper.c index 38608e5a6c9..9e46da921d6 100644 --- a/keyboards/palette1202/lib/oled_helper.c +++ b/keyboards/palette1202/lib/oled_helper.c @@ -1,5 +1,5 @@ #include "oled_helper.h" -#include "quantum.h" +#include "oled_driver.h" #include #include diff --git a/keyboards/rgbkb/sol/rev1/rev1.c b/keyboards/rgbkb/sol/rev1/rev1.c index 21b4503ab9f..f5997bac007 100644 --- a/keyboards/rgbkb/sol/rev1/rev1.c +++ b/keyboards/rgbkb/sol/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "quantum.h" +#include "sol.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/rgbkb/sol/rev2/rev2.c b/keyboards/rgbkb/sol/rev2/rev2.c index e00c4856098..cd2c9f96452 100644 --- a/keyboards/rgbkb/sol/rev2/rev2.c +++ b/keyboards/rgbkb/sol/rev2/rev2.c @@ -1,4 +1,4 @@ -#include "quantum.h" +#include "sol.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/satt/comet46/lib/host_led_state_reader.c b/keyboards/satt/comet46/lib/host_led_state_reader.c index e9910e01414..54be4195790 100644 --- a/keyboards/satt/comet46/lib/host_led_state_reader.c +++ b/keyboards/satt/comet46/lib/host_led_state_reader.c @@ -1,5 +1,6 @@ #include -#include "quantum.h" +#include "led.h" +#include "host.h" char host_led_state_str[22]; diff --git a/keyboards/satt/comet46/lib/modifier_state_reader.c b/keyboards/satt/comet46/lib/modifier_state_reader.c index c85c83b1dea..856b8d8a682 100644 --- a/keyboards/satt/comet46/lib/modifier_state_reader.c +++ b/keyboards/satt/comet46/lib/modifier_state_reader.c @@ -1,5 +1,5 @@ #include -#include "quantum.h" +#include "action_util.h" char modifier_state_str[22]; diff --git a/keyboards/sekigon/grs_70ec/ec_switch_matrix.c b/keyboards/sekigon/grs_70ec/ec_switch_matrix.c index d1c2d85ac83..9c474695a11 100644 --- a/keyboards/sekigon/grs_70ec/ec_switch_matrix.c +++ b/keyboards/sekigon/grs_70ec/ec_switch_matrix.c @@ -15,8 +15,7 @@ */ #include "ec_switch_matrix.h" - -#include "quantum.h" +#include #include "analog.h" #include "print.h" diff --git a/keyboards/terrazzo/terrazzo.c b/keyboards/terrazzo/terrazzo.c index 53b0bd4c519..34aa7c4324a 100644 --- a/keyboards/terrazzo/terrazzo.c +++ b/keyboards/terrazzo/terrazzo.c @@ -17,10 +17,6 @@ #include "terrazzo.h" #ifdef LED_MATRIX_ENABLE - #include - #include "print.h" - #include "quantum.h" - const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { /* Refer to IS31 manual for these locations * https://cdn-learn.adafruit.com/downloads/pdf/adafruit-15x7-7x15-charlieplex-led-matrix-charliewing-featherwing.pdf diff --git a/keyboards/tzarc/djinn/djinn.c b/keyboards/tzarc/djinn/djinn.c index 17e5833ee9e..8d6e2ec92e2 100644 --- a/keyboards/tzarc/djinn/djinn.c +++ b/keyboards/tzarc/djinn/djinn.c @@ -1,12 +1,10 @@ // Copyright 2018-2023 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later +#include "djinn.h" #include -#include "quantum.h" #include -#include "djinn.h" #include "serial.h" #include "split_util.h" -#include "qp.h" painter_device_t lcd; diff --git a/keyboards/tzarc/djinn/djinn_portscan_matrix.c b/keyboards/tzarc/djinn/djinn_portscan_matrix.c index ac81ad18c1b..63f480be270 100644 --- a/keyboards/tzarc/djinn/djinn_portscan_matrix.c +++ b/keyboards/tzarc/djinn/djinn_portscan_matrix.c @@ -1,8 +1,5 @@ // Copyright 2018-2022 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later -#include -#include -#include "quantum.h" #include "djinn.h" #define GPIOB_BITMASK (1 << 13 | 1 << 14 | 1 << 15) // B13, B14, B15 diff --git a/keyboards/tzarc/djinn/djinn_split_sync.c b/keyboards/tzarc/djinn/djinn_split_sync.c index 8b10e88b4b2..3a2a8a4ff3e 100644 --- a/keyboards/tzarc/djinn/djinn_split_sync.c +++ b/keyboards/tzarc/djinn/djinn_split_sync.c @@ -1,7 +1,5 @@ // Copyright 2018-2023 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later -#include -#include "quantum.h" #include "transactions.h" #include "split_util.h" #include "djinn.h" diff --git a/keyboards/tzarc/djinn/djinn_usbpd.c b/keyboards/tzarc/djinn/djinn_usbpd.c index 7a56f92b8e9..e4e75f20d80 100644 --- a/keyboards/tzarc/djinn/djinn_usbpd.c +++ b/keyboards/tzarc/djinn/djinn_usbpd.c @@ -1,7 +1,5 @@ // Copyright 2018-2022 Nick Brassel (@tzarc) // SPDX-License-Identifier: GPL-2.0-or-later -#include -#include "quantum.h" #include "djinn.h" const char* usbpd_str(usbpd_allowance_t allowance) { diff --git a/keyboards/v60_type_r/v60_type_r.c b/keyboards/v60_type_r/v60_type_r.c index b266472e64e..540c5ec6ecf 100644 --- a/keyboards/v60_type_r/v60_type_r.c +++ b/keyboards/v60_type_r/v60_type_r.c @@ -15,8 +15,6 @@ */ #include "v60_type_r.h" -#include "quantum.h" - // if we've got an RGB underglow! #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/v60_type_r/v60_type_r.h b/keyboards/v60_type_r/v60_type_r.h index 1a7098fc416..ae2381a9514 100644 --- a/keyboards/v60_type_r/v60_type_r.h +++ b/keyboards/v60_type_r/v60_type_r.h @@ -19,8 +19,6 @@ #ifdef RGBLIGHT_ENABLE -#include "rgblight.h" - void rgb_init(void); void set_rgb_color(uint8_t pin, uint8_t value, uint8_t timer_value); diff --git a/keyboards/viktus/minne_topre/ec.c b/keyboards/viktus/minne_topre/ec.c index 569c8785822..edd5f9a31db 100644 --- a/keyboards/viktus/minne_topre/ec.c +++ b/keyboards/viktus/minne_topre/ec.c @@ -14,8 +14,8 @@ * along with this program. If not, see . */ -#include "quantum.h" #include "ec.h" +#include #include "analog.h" //#include "debug.h" // needed for debugging diff --git a/keyboards/viktus/osav2_numpad_topre/ec.c b/keyboards/viktus/osav2_numpad_topre/ec.c index e4f59c3b6bf..93e698412a0 100644 --- a/keyboards/viktus/osav2_numpad_topre/ec.c +++ b/keyboards/viktus/osav2_numpad_topre/ec.c @@ -14,8 +14,8 @@ * along with this program. If not, see . */ -#include "quantum.h" #include "ec.h" +#include #include "analog.h" //#include "debug.h" // needed for debugging diff --git a/keyboards/viktus/osav2_topre/ec.c b/keyboards/viktus/osav2_topre/ec.c index 076ffc0ba86..13d9fde654c 100644 --- a/keyboards/viktus/osav2_topre/ec.c +++ b/keyboards/viktus/osav2_topre/ec.c @@ -14,8 +14,8 @@ * along with this program. If not, see . */ -#include "quantum.h" #include "ec.h" +#include #include "analog.h" //#include "debug.h" // needed for debugging diff --git a/keyboards/viktus/styrka_topre/ec.c b/keyboards/viktus/styrka_topre/ec.c index c9980461afb..078723f691e 100644 --- a/keyboards/viktus/styrka_topre/ec.c +++ b/keyboards/viktus/styrka_topre/ec.c @@ -15,8 +15,8 @@ */ #include "ec.h" +#include -#include "quantum.h" #include "analog.h" //#include "debug.h" diff --git a/keyboards/vinhcatba/uncertainty/bongo.c b/keyboards/vinhcatba/uncertainty/bongo.c index 707955ee881..773a882f508 100644 --- a/keyboards/vinhcatba/uncertainty/bongo.c +++ b/keyboards/vinhcatba/uncertainty/bongo.c @@ -1,7 +1,14 @@ // Copyright 2022 Parker Levin (@pedker) // SPDX-License-Identifier: GPL-2.0-or-later +#include "bongo.h" +#include #include "quantum.h" +#include "matrix.h" +#include "oled_driver.h" +#include "timer.h" +#include "wpm.h" +#include "util.h" #define ANIM_FRAME_DURATION 75 // how long each frame lasts in ms #define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024 diff --git a/keyboards/vinhcatba/uncertainty/bongo.h b/keyboards/vinhcatba/uncertainty/bongo.h index d1cecbc6197..c4bb1ed6756 100644 --- a/keyboards/vinhcatba/uncertainty/bongo.h +++ b/keyboards/vinhcatba/uncertainty/bongo.h @@ -3,4 +3,6 @@ #pragma once +#include + void draw_bongo(bool minimal); diff --git a/keyboards/vinhcatba/uncertainty/uncertainty.c b/keyboards/vinhcatba/uncertainty/uncertainty.c index 19e5a5cfd53..c569f07a3bd 100644 --- a/keyboards/vinhcatba/uncertainty/uncertainty.c +++ b/keyboards/vinhcatba/uncertainty/uncertainty.c @@ -1,8 +1,7 @@ // Copyright 2023 Vinh Le (@vinhcatba) // SPDX-License-Identifier: GPL-2.0-or-later -#include QMK_KEYBOARD_H -#include "quantum.h" +#include "uncertainty.h" #ifdef OLED_ENABLE #include "bongo.h" diff --git a/keyboards/yosino58/lib/layer_state_reader.c b/keyboards/yosino58/lib/layer_state_reader.c index f9cd9345685..5f48c1f426d 100644 --- a/keyboards/yosino58/lib/layer_state_reader.c +++ b/keyboards/yosino58/lib/layer_state_reader.c @@ -1,5 +1,5 @@ -#include "quantum.h" +#include "action_layer.h" #include #define L_BASE 0 diff --git a/keyboards/yosino58/lib/rgb_state_reader.c b/keyboards/yosino58/lib/rgb_state_reader.c index daa008d8499..3d74fb45e4e 100644 --- a/keyboards/yosino58/lib/rgb_state_reader.c +++ b/keyboards/yosino58/lib/rgb_state_reader.c @@ -1,6 +1,5 @@ #ifdef RGBLIGHT_ENABLE -#include "quantum.h" #include extern rgblight_config_t rgblight_config; From 9fa91ad4947293f75df4c0e85ea594b1529afbca Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 6 Apr 2024 01:43:52 +1100 Subject: [PATCH 28/40] Rename `process_{led,rgb}_matrix()` (#23422) --- quantum/keyboard.c | 4 ++-- quantum/led_matrix/led_matrix.c | 2 +- quantum/led_matrix/led_matrix.h | 2 +- quantum/rgb_matrix/rgb_matrix.c | 2 +- quantum/rgb_matrix/rgb_matrix.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/quantum/keyboard.c b/quantum/keyboard.c index 5aaa4b452f2..df1dc1c3ee0 100644 --- a/quantum/keyboard.c +++ b/quantum/keyboard.c @@ -500,10 +500,10 @@ void keyboard_init(void) { */ void switch_events(uint8_t row, uint8_t col, bool pressed) { #if defined(LED_MATRIX_ENABLE) - process_led_matrix(row, col, pressed); + led_matrix_handle_key_event(row, col, pressed); #endif #if defined(RGB_MATRIX_ENABLE) - process_rgb_matrix(row, col, pressed); + rgb_matrix_handle_key_event(row, col, pressed); #endif } diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c index c0fb4c810b1..2ca62c6969d 100644 --- a/quantum/led_matrix/led_matrix.c +++ b/quantum/led_matrix/led_matrix.c @@ -159,7 +159,7 @@ void led_matrix_set_value_all(uint8_t value) { #endif } -void process_led_matrix(uint8_t row, uint8_t col, bool pressed) { +void led_matrix_handle_key_event(uint8_t row, uint8_t col, bool pressed) { #ifndef LED_MATRIX_SPLIT if (!is_keyboard_master()) return; #endif diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h index 941d42aecad..9a13c3e52b4 100644 --- a/quantum/led_matrix/led_matrix.h +++ b/quantum/led_matrix/led_matrix.h @@ -124,7 +124,7 @@ uint8_t led_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *l void led_matrix_set_value(int index, uint8_t value); void led_matrix_set_value_all(uint8_t value); -void process_led_matrix(uint8_t row, uint8_t col, bool pressed); +void led_matrix_handle_key_event(uint8_t row, uint8_t col, bool pressed); void led_matrix_task(void); diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c index 655aca18679..aaba00b4576 100644 --- a/quantum/rgb_matrix/rgb_matrix.c +++ b/quantum/rgb_matrix/rgb_matrix.c @@ -156,7 +156,7 @@ void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue) { #endif } -void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) { +void rgb_matrix_handle_key_event(uint8_t row, uint8_t col, bool pressed) { #ifndef RGB_MATRIX_SPLIT if (!is_keyboard_master()) return; #endif diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h index f8a6845e02b..ceb3185d1a8 100644 --- a/quantum/rgb_matrix/rgb_matrix.h +++ b/quantum/rgb_matrix/rgb_matrix.h @@ -148,7 +148,7 @@ uint8_t rgb_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *l void rgb_matrix_set_color(int index, uint8_t red, uint8_t green, uint8_t blue); void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue); -void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed); +void rgb_matrix_handle_key_event(uint8_t row, uint8_t col, bool pressed); void rgb_matrix_task(void); From 1f3d709fcb22dd922369fa434813531fed3748ab Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 5 Apr 2024 15:44:06 +0100 Subject: [PATCH 29/40] Migrate build target markers to keyboard.json - YZ (#23421) --- keyboards/yampad/{info.json => keyboard.json} | 7 +++++++ keyboards/yampad/rules.mk | 14 -------------- .../buff67v3/{info.json => keyboard.json} | 7 +++++++ keyboards/yandrstudio/buff67v3/rules.mk | 13 ------------- .../eau87/{info.json => keyboard.json} | 6 ++++++ keyboards/yandrstudio/eau87/rules.mk | 13 ------------- .../eau_r2/{info.json => keyboard.json} | 7 +++++++ keyboards/yandrstudio/eau_r2/rules.mk | 13 ------------- .../nightstar75/{info.json => keyboard.json} | 7 +++++++ keyboards/yandrstudio/nightstar75/rules.mk | 13 ------------- .../nz67v2/{info.json => keyboard.json} | 8 ++++++++ keyboards/yandrstudio/nz67v2/rules.mk | 15 --------------- .../tg67/{info.json => keyboard.json} | 7 +++++++ keyboards/yandrstudio/tg67/rules.mk | 14 -------------- .../wave75/{info.json => keyboard.json} | 6 ++++++ keyboards/yandrstudio/wave75/rules.mk | 13 ------------- .../yr6095/{info.json => keyboard.json} | 7 +++++++ keyboards/yandrstudio/yr6095/rules.mk | 13 ------------- .../yr80/{info.json => keyboard.json} | 7 +++++++ keyboards/yandrstudio/yr80/rules.mk | 13 ------------- .../ydkb/grape/{info.json => keyboard.json} | 7 +++++++ keyboards/ydkb/grape/rules.mk | 13 ------------- .../ydkb/just60/{info.json => keyboard.json} | 3 +++ keyboards/ydkb/just60/rules.mk | 13 ------------- .../barleycorn/{info.json => keyboard.json} | 5 +++++ keyboards/yiancardesigns/barleycorn/rules.mk | 13 ------------- .../gingham/{info.json => keyboard.json} | 5 +++++ keyboards/yiancardesigns/gingham/rules.mk | 17 ++--------------- .../seigaiha/{info.json => keyboard.json} | 5 +++++ keyboards/yiancardesigns/seigaiha/rules.mk | 13 ------------- .../ymdk/id75/{info.json => keyboard.json} | 0 keyboards/ymdk/id75/rules.mk | 1 - .../soldered/{info.json => keyboard.json} | 8 ++++++++ keyboards/ymdk/melody96/soldered/rules.mk | 12 ------------ .../ymdk/sp64/{info.json => keyboard.json} | 6 ++++++ keyboards/ymdk/sp64/rules.mk | 13 +------------ .../ymd40/air40/{info.json => keyboard.json} | 7 +++++++ keyboards/ymdk/ymd40/air40/rules.mk | 16 ---------------- .../ymdk/ymd40/v2/{info.json => keyboard.json} | 7 +++++++ keyboards/ymdk/ymd40/v2/rules.mk | 15 --------------- .../lunakey_mini/{info.json => keyboard.json} | 5 +++++ keyboards/yoichiro/lunakey_mini/rules.mk | 13 ------------- .../lunakey_pico/{info.json => keyboard.json} | 0 .../yosino58/rev1/{info.json => keyboard.json} | 1 + keyboards/yosino58/rev1/rules.mk | 13 ------------- .../yynmt/acperience12/rev1/keyboard.json | 5 +++++ keyboards/yynmt/acperience12/rules.mk | 13 ------------- .../zigotica/z34/{info.json => keyboard.json} | 7 +++++++ keyboards/zigotica/z34/rules.mk | 16 ---------------- .../lets_split_v3/{info.json => keyboard.json} | 0 keyboards/zlant/{info.json => keyboard.json} | 7 +++++++ keyboards/zlant/rules.mk | 13 ------------- .../moonlander/{info.json => keyboard.json} | 16 +++++++++++++++- keyboards/zsa/moonlander/rules.mk | 18 +----------------- 54 files changed, 166 insertions(+), 343 deletions(-) rename keyboards/yampad/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/yampad/rules.mk rename keyboards/yandrstudio/buff67v3/{info.json => keyboard.json} (96%) rename keyboards/yandrstudio/eau87/{info.json => keyboard.json} (97%) rename keyboards/yandrstudio/eau_r2/{info.json => keyboard.json} (97%) rename keyboards/yandrstudio/nightstar75/{info.json => keyboard.json} (97%) rename keyboards/yandrstudio/nz67v2/{info.json => keyboard.json} (98%) rename keyboards/yandrstudio/tg67/{info.json => keyboard.json} (97%) rename keyboards/yandrstudio/wave75/{info.json => keyboard.json} (97%) rename keyboards/yandrstudio/yr6095/{info.json => keyboard.json} (98%) rename keyboards/yandrstudio/yr80/{info.json => keyboard.json} (97%) rename keyboards/ydkb/grape/{info.json => keyboard.json} (99%) rename keyboards/ydkb/just60/{info.json => keyboard.json} (98%) rename keyboards/yiancardesigns/barleycorn/{info.json => keyboard.json} (99%) rename keyboards/yiancardesigns/gingham/{info.json => keyboard.json} (98%) rename keyboards/yiancardesigns/seigaiha/{info.json => keyboard.json} (99%) rename keyboards/ymdk/id75/{info.json => keyboard.json} (100%) rename keyboards/ymdk/melody96/soldered/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/ymdk/melody96/soldered/rules.mk rename keyboards/ymdk/sp64/{info.json => keyboard.json} (97%) rename keyboards/ymdk/ymd40/air40/{info.json => keyboard.json} (98%) rename keyboards/ymdk/ymd40/v2/{info.json => keyboard.json} (98%) rename keyboards/yoichiro/lunakey_mini/{info.json => keyboard.json} (97%) delete mode 100644 keyboards/yoichiro/lunakey_mini/rules.mk rename keyboards/yoichiro/lunakey_pico/{info.json => keyboard.json} (100%) rename keyboards/yosino58/rev1/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/yosino58/rev1/rules.mk rename keyboards/zigotica/z34/{info.json => keyboard.json} (96%) rename keyboards/ziptyze/lets_split_v3/{info.json => keyboard.json} (100%) rename keyboards/zlant/{info.json => keyboard.json} (97%) rename keyboards/zsa/moonlander/{info.json => keyboard.json} (94%) diff --git a/keyboards/yampad/info.json b/keyboards/yampad/keyboard.json similarity index 93% rename from keyboards/yampad/info.json rename to keyboards/yampad/keyboard.json index bf9841492d9..76efef72ad9 100644 --- a/keyboards/yampad/info.json +++ b/keyboards/yampad/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x8369", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "nkro": true, + "oled": true, + "rgblight": true + }, "rgblight": { "led_count": 9, "animations": { @@ -27,6 +33,7 @@ "pin": "F4" }, "build": { + "lto": true, "debounce_type": "sym_eager_pk" }, "matrix_pins": { diff --git a/keyboards/yampad/rules.mk b/keyboards/yampad/rules.mk deleted file mode 100644 index 498bf77b977..00000000000 --- a/keyboards/yampad/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -AUDIO_ENABLE = no # Audio output -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -COMMAND_ENABLE = no # Commands for debug and configuration -CONSOLE_ENABLE = no # Console for debug -EXTRAKEY_ENABLE = no # Audio control and System control -LTO_ENABLE = yes # Link time optimise, reduce firmware size -MOUSEKEY_ENABLE = no # Mouse keys -NKRO_ENABLE = yes # Enable N-Key Rollover -OLED_ENABLE = yes -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/keyboard.json similarity index 96% rename from keyboards/yandrstudio/buff67v3/info.json rename to keyboards/yandrstudio/buff67v3/keyboard.json index 9fe09cd95b9..918bc7b0e7c 100644 --- a/keyboards/yandrstudio/buff67v3/info.json +++ b/keyboards/yandrstudio/buff67v3/keyboard.json @@ -6,6 +6,13 @@ "pid": "0xAA88", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "led_count": 1, "animations": { diff --git a/keyboards/yandrstudio/buff67v3/rules.mk b/keyboards/yandrstudio/buff67v3/rules.mk index 421ae9fce11..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/buff67v3/rules.mk +++ b/keyboards/yandrstudio/buff67v3/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/yandrstudio/eau87/info.json b/keyboards/yandrstudio/eau87/keyboard.json similarity index 97% rename from keyboards/yandrstudio/eau87/info.json rename to keyboards/yandrstudio/eau87/keyboard.json index 39eeac8564b..ec91989d0f2 100644 --- a/keyboards/yandrstudio/eau87/info.json +++ b/keyboards/yandrstudio/eau87/keyboard.json @@ -6,6 +6,12 @@ "pid": "0xAAEB", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "A15", "B3"], "rows": ["B12", "B5", "B4", "A4", "B7", "B6"] diff --git a/keyboards/yandrstudio/eau87/rules.mk b/keyboards/yandrstudio/eau87/rules.mk index 4a92d0f891c..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/eau87/rules.mk +++ b/keyboards/yandrstudio/eau87/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/keyboard.json similarity index 97% rename from keyboards/yandrstudio/eau_r2/info.json rename to keyboards/yandrstudio/eau_r2/keyboard.json index c3aaf39e2d8..78f7dc108c4 100644 --- a/keyboards/yandrstudio/eau_r2/info.json +++ b/keyboards/yandrstudio/eau_r2/keyboard.json @@ -6,6 +6,13 @@ "pid": "0xAACD", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["B7", "A6", "B6", "B5", "B4", "B3", "A5", "A10", "B1", "B0", "A7", "A9", "B11", "B10", "B2", "A15", "B15"], "rows": ["A3", "B9", "B8", "A4", "C14", "C13"] diff --git a/keyboards/yandrstudio/eau_r2/rules.mk b/keyboards/yandrstudio/eau_r2/rules.mk index 421ae9fce11..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/eau_r2/rules.mk +++ b/keyboards/yandrstudio/eau_r2/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/keyboard.json similarity index 97% rename from keyboards/yandrstudio/nightstar75/info.json rename to keyboards/yandrstudio/nightstar75/keyboard.json index 956016a7e6d..d356b81fd5c 100644 --- a/keyboards/yandrstudio/nightstar75/info.json +++ b/keyboards/yandrstudio/nightstar75/keyboard.json @@ -6,6 +6,13 @@ "pid": "0xAA87", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "ws2812": { "pin": "A7", "driver": "pwm" diff --git a/keyboards/yandrstudio/nightstar75/rules.mk b/keyboards/yandrstudio/nightstar75/rules.mk index 421ae9fce11..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/nightstar75/rules.mk +++ b/keyboards/yandrstudio/nightstar75/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/yandrstudio/nz67v2/info.json b/keyboards/yandrstudio/nz67v2/keyboard.json similarity index 98% rename from keyboards/yandrstudio/nz67v2/info.json rename to keyboards/yandrstudio/nz67v2/keyboard.json index 372330eb68f..fc931f3427a 100644 --- a/keyboards/yandrstudio/nz67v2/info.json +++ b/keyboards/yandrstudio/nz67v2/keyboard.json @@ -6,6 +6,14 @@ "pid": "0xAA83", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "ws2812": { "pin": "B5", "driver": "pwm" diff --git a/keyboards/yandrstudio/nz67v2/rules.mk b/keyboards/yandrstudio/nz67v2/rules.mk index ba2d7ccbc32..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/nz67v2/rules.mk +++ b/keyboards/yandrstudio/nz67v2/rules.mk @@ -1,17 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality -ENCODER_ENABLE = yes # Rotary encoder support diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/keyboard.json similarity index 97% rename from keyboards/yandrstudio/tg67/info.json rename to keyboards/yandrstudio/tg67/keyboard.json index 0e4a0f62434..8a1df37805d 100644 --- a/keyboards/yandrstudio/tg67/info.json +++ b/keyboards/yandrstudio/tg67/keyboard.json @@ -6,6 +6,13 @@ "pid": "0xAA8D", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, "ws2812": { "pin": "A7", "driver": "pwm" diff --git a/keyboards/yandrstudio/tg67/rules.mk b/keyboards/yandrstudio/tg67/rules.mk index 8aabb4f22e0..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/tg67/rules.mk +++ b/keyboards/yandrstudio/tg67/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB Matrix diff --git a/keyboards/yandrstudio/wave75/info.json b/keyboards/yandrstudio/wave75/keyboard.json similarity index 97% rename from keyboards/yandrstudio/wave75/info.json rename to keyboards/yandrstudio/wave75/keyboard.json index d055dc00486..8455eb11886 100644 --- a/keyboards/yandrstudio/wave75/info.json +++ b/keyboards/yandrstudio/wave75/keyboard.json @@ -6,6 +6,12 @@ "pid": "0xAA8E", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "diode_direction": "COL2ROW", "matrix_pins": { "cols": ["B0", "A7", "A6", "B15", "B14", "B13", "A5", "B7", "B6", "B5", "A4", "B12", "A3", "B2", "A2"], diff --git a/keyboards/yandrstudio/wave75/rules.mk b/keyboards/yandrstudio/wave75/rules.mk index 4a92d0f891c..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/wave75/rules.mk +++ b/keyboards/yandrstudio/wave75/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/keyboard.json similarity index 98% rename from keyboards/yandrstudio/yr6095/info.json rename to keyboards/yandrstudio/yr6095/keyboard.json index 7f5308f50a7..7a5d11181ef 100644 --- a/keyboards/yandrstudio/yr6095/info.json +++ b/keyboards/yandrstudio/yr6095/keyboard.json @@ -6,6 +6,13 @@ "pid": "0xAA0C", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "led_count": 1, "animations": { diff --git a/keyboards/yandrstudio/yr6095/rules.mk b/keyboards/yandrstudio/yr6095/rules.mk index 421ae9fce11..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/yr6095/rules.mk +++ b/keyboards/yandrstudio/yr6095/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/yandrstudio/yr80/info.json b/keyboards/yandrstudio/yr80/keyboard.json similarity index 97% rename from keyboards/yandrstudio/yr80/info.json rename to keyboards/yandrstudio/yr80/keyboard.json index 3581fa9d1c8..abf552af5c9 100644 --- a/keyboards/yandrstudio/yr80/info.json +++ b/keyboards/yandrstudio/yr80/keyboard.json @@ -6,6 +6,13 @@ "pid": "0xAA0D", "device_version": "1.0.0" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "rgblight": { "led_count": 1, "animations": { diff --git a/keyboards/yandrstudio/yr80/rules.mk b/keyboards/yandrstudio/yr80/rules.mk index 421ae9fce11..04fe1eba2ac 100644 --- a/keyboards/yandrstudio/yr80/rules.mk +++ b/keyboards/yandrstudio/yr80/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ydkb/grape/info.json b/keyboards/ydkb/grape/keyboard.json similarity index 99% rename from keyboards/ydkb/grape/info.json rename to keyboards/ydkb/grape/keyboard.json index 75aa8fffafe..f8f0364d93d 100644 --- a/keyboards/ydkb/grape/info.json +++ b/keyboards/ydkb/grape/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x6772", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, "backlight": { "pin": "B7", "breathing": true diff --git a/keyboards/ydkb/grape/rules.mk b/keyboards/ydkb/grape/rules.mk index d1eb5135b4d..6beea3e392f 100644 --- a/keyboards/ydkb/grape/rules.mk +++ b/keyboards/ydkb/grape/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = lite VPATH += drivers/gpio SRC += matrix.c sn74x138.c diff --git a/keyboards/ydkb/just60/info.json b/keyboards/ydkb/just60/keyboard.json similarity index 98% rename from keyboards/ydkb/just60/info.json rename to keyboards/ydkb/just60/keyboard.json index d61f09221a9..fb46e08ea31 100644 --- a/keyboards/ydkb/just60/info.json +++ b/keyboards/ydkb/just60/keyboard.json @@ -8,6 +8,9 @@ "pid": "0x1960", "device_version": "0.0.1" }, + "features": { + "bootmagic": true + }, "matrix_pins": { "cols": ["D6", "D7", "B4", "B6", "B5", "B7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0"], "rows": ["E2", "C7", "B3", "B2", "B1"] diff --git a/keyboards/ydkb/just60/rules.mk b/keyboards/ydkb/just60/rules.mk index 2a99e009194..3437a35bdf1 100644 --- a/keyboards/ydkb/just60/rules.mk +++ b/keyboards/ydkb/just60/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/yiancardesigns/barleycorn/info.json b/keyboards/yiancardesigns/barleycorn/keyboard.json similarity index 99% rename from keyboards/yiancardesigns/barleycorn/info.json rename to keyboards/yiancardesigns/barleycorn/keyboard.json index 99786319b3e..2fd79052c91 100644 --- a/keyboards/yiancardesigns/barleycorn/info.json +++ b/keyboards/yiancardesigns/barleycorn/keyboard.json @@ -8,6 +8,11 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true + }, "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/yiancardesigns/barleycorn/rules.mk b/keyboards/yiancardesigns/barleycorn/rules.mk index 3808b0d3f24..c04c3c92ed3 100644 --- a/keyboards/yiancardesigns/barleycorn/rules.mk +++ b/keyboards/yiancardesigns/barleycorn/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/yiancardesigns/gingham/info.json b/keyboards/yiancardesigns/gingham/keyboard.json similarity index 98% rename from keyboards/yiancardesigns/gingham/info.json rename to keyboards/yiancardesigns/gingham/keyboard.json index 23f0788d0f2..eb5573a355b 100644 --- a/keyboards/yiancardesigns/gingham/info.json +++ b/keyboards/yiancardesigns/gingham/keyboard.json @@ -9,6 +9,11 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true + }, "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { diff --git a/keyboards/yiancardesigns/gingham/rules.mk b/keyboards/yiancardesigns/gingham/rules.mk index cd47b89aeda..23e7186f190 100644 --- a/keyboards/yiancardesigns/gingham/rules.mk +++ b/keyboards/yiancardesigns/gingham/rules.mk @@ -1,17 +1,4 @@ +CUSTOM_MATRIX = lite + SRC = matrix.c I2C_DRIVER_REQUIRED = yes - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -CUSTOM_MATRIX = lite diff --git a/keyboards/yiancardesigns/seigaiha/info.json b/keyboards/yiancardesigns/seigaiha/keyboard.json similarity index 99% rename from keyboards/yiancardesigns/seigaiha/info.json rename to keyboards/yiancardesigns/seigaiha/keyboard.json index 91a0529e88a..5890357c99f 100644 --- a/keyboards/yiancardesigns/seigaiha/info.json +++ b/keyboards/yiancardesigns/seigaiha/keyboard.json @@ -9,6 +9,11 @@ "device_version": "0.0.1", "max_power": 100 }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true + }, "bootmagic": { "matrix": [1, 0] }, diff --git a/keyboards/yiancardesigns/seigaiha/rules.mk b/keyboards/yiancardesigns/seigaiha/rules.mk index 3808b0d3f24..c04c3c92ed3 100644 --- a/keyboards/yiancardesigns/seigaiha/rules.mk +++ b/keyboards/yiancardesigns/seigaiha/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - CUSTOM_MATRIX = lite SRC += matrix.c diff --git a/keyboards/ymdk/id75/info.json b/keyboards/ymdk/id75/keyboard.json similarity index 100% rename from keyboards/ymdk/id75/info.json rename to keyboards/ymdk/id75/keyboard.json diff --git a/keyboards/ymdk/id75/rules.mk b/keyboards/ymdk/id75/rules.mk index edbd3dd7181..dbee20ab053 100644 --- a/keyboards/ymdk/id75/rules.mk +++ b/keyboards/ymdk/id75/rules.mk @@ -3,4 +3,3 @@ MCU_LDSCRIPT = STM32F103xB # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - diff --git a/keyboards/ymdk/melody96/soldered/info.json b/keyboards/ymdk/melody96/soldered/keyboard.json similarity index 99% rename from keyboards/ymdk/melody96/soldered/info.json rename to keyboards/ymdk/melody96/soldered/keyboard.json index f941c659702..06d39472406 100644 --- a/keyboards/ymdk/melody96/soldered/info.json +++ b/keyboards/ymdk/melody96/soldered/keyboard.json @@ -8,6 +8,14 @@ "pid": "0x4D96", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/ymdk/melody96/soldered/rules.mk b/keyboards/ymdk/melody96/soldered/rules.mk deleted file mode 100644 index 3d5cb57ad50..00000000000 --- a/keyboards/ymdk/melody96/soldered/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/ymdk/sp64/info.json b/keyboards/ymdk/sp64/keyboard.json similarity index 97% rename from keyboards/ymdk/sp64/info.json rename to keyboards/ymdk/sp64/keyboard.json index a0091c8f3da..bfb140873af 100644 --- a/keyboards/ymdk/sp64/info.json +++ b/keyboards/ymdk/sp64/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x5364", "device_version": "2.0.0" }, + "features": { + "bootmagic": true, + "command": true, + "extrakey": true, + "rgblight": true + }, "indicators": { "caps_lock": "D1", "num_lock": "D0", diff --git a/keyboards/ymdk/sp64/rules.mk b/keyboards/ymdk/sp64/rules.mk index 56da806510d..9edee34f595 100644 --- a/keyboards/ymdk/sp64/rules.mk +++ b/keyboards/ymdk/sp64/rules.mk @@ -1,16 +1,5 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow + CUSTOM_MATRIX = yes SRC += matrix.c diff --git a/keyboards/ymdk/ymd40/air40/info.json b/keyboards/ymdk/ymd40/air40/keyboard.json similarity index 98% rename from keyboards/ymdk/ymd40/air40/info.json rename to keyboards/ymdk/ymd40/air40/keyboard.json index 4e791c87c47..aaca80156b1 100644 --- a/keyboards/ymdk/ymd40/air40/info.json +++ b/keyboards/ymdk/ymd40/air40/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0911", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "rgb_matrix": true + }, "rgb_matrix": { "animations":{ "alphas_mods": true, @@ -68,6 +74,7 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/ymdk/ymd40/air40/rules.mk b/keyboards/ymdk/ymd40/air40/rules.mk index f408492aa87..9f9c86d4bbf 100644 --- a/keyboards/ymdk/ymd40/air40/rules.mk +++ b/keyboards/ymdk/ymd40/air40/rules.mk @@ -1,18 +1,2 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no RGBLIGHT_SUPPORTED = no -RGB_MATRIX_ENABLE = yes -AUDIO_ENABLE = no # Audio output AUDIO_SUPPORTED = no -KEY_LOCK_ENABLE = no - -LAYOUTS = ortho_4x12 diff --git a/keyboards/ymdk/ymd40/v2/info.json b/keyboards/ymdk/ymd40/v2/keyboard.json similarity index 98% rename from keyboards/ymdk/ymd40/v2/info.json rename to keyboards/ymdk/ymd40/v2/keyboard.json index 6686030166b..08f5f0a4e37 100644 --- a/keyboards/ymdk/ymd40/v2/info.json +++ b/keyboards/ymdk/ymd40/v2/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x4440", "device_version": "0.0.1" }, + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D0", "B3", "B2", "B1"] diff --git a/keyboards/ymdk/ymd40/v2/rules.mk b/keyboards/ymdk/ymd40/v2/rules.mk index e0fdb5c802b..79487b2ec4b 100644 --- a/keyboards/ymdk/ymd40/v2/rules.mk +++ b/keyboards/ymdk/ymd40/v2/rules.mk @@ -1,16 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -KEY_LOCK_ENABLE = no - AUDIO_SUPPORTED = no diff --git a/keyboards/yoichiro/lunakey_mini/info.json b/keyboards/yoichiro/lunakey_mini/keyboard.json similarity index 97% rename from keyboards/yoichiro/lunakey_mini/info.json rename to keyboards/yoichiro/lunakey_mini/keyboard.json index aa00e7e69e3..5fbf6c8fbc9 100644 --- a/keyboards/yoichiro/lunakey_mini/info.json +++ b/keyboards/yoichiro/lunakey_mini/keyboard.json @@ -8,12 +8,17 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "B1", "B3"], "rows": ["D4", "D7", "E6", "B4"] }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/yoichiro/lunakey_mini/rules.mk b/keyboards/yoichiro/lunakey_mini/rules.mk deleted file mode 100644 index 6188406cdee..00000000000 --- a/keyboards/yoichiro/lunakey_mini/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes # Enable Split keyboard diff --git a/keyboards/yoichiro/lunakey_pico/info.json b/keyboards/yoichiro/lunakey_pico/keyboard.json similarity index 100% rename from keyboards/yoichiro/lunakey_pico/info.json rename to keyboards/yoichiro/lunakey_pico/keyboard.json diff --git a/keyboards/yosino58/rev1/info.json b/keyboards/yosino58/rev1/keyboard.json similarity index 99% rename from keyboards/yosino58/rev1/info.json rename to keyboards/yosino58/rev1/keyboard.json index c0dc03831fa..2e50450a272 100644 --- a/keyboards/yosino58/rev1/info.json +++ b/keyboards/yosino58/rev1/keyboard.json @@ -14,6 +14,7 @@ }, "diode_direction": "COL2ROW", "split": { + "enabled": true, "soft_serial_pin": "D2" }, "rgblight": { diff --git a/keyboards/yosino58/rev1/rules.mk b/keyboards/yosino58/rev1/rules.mk deleted file mode 100644 index 2fcc81da0f6..00000000000 --- a/keyboards/yosino58/rev1/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = yes diff --git a/keyboards/yynmt/acperience12/rev1/keyboard.json b/keyboards/yynmt/acperience12/rev1/keyboard.json index 5eea37a35df..deb02bd55d4 100644 --- a/keyboards/yynmt/acperience12/rev1/keyboard.json +++ b/keyboards/yynmt/acperience12/rev1/keyboard.json @@ -8,6 +8,11 @@ "pid": "0xEA51", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true + }, "processor": "atmega32u2", "bootloader": "atmel-dfu", "matrix_pins": { diff --git a/keyboards/yynmt/acperience12/rules.mk b/keyboards/yynmt/acperience12/rules.mk index 3a226546213..cfe8b8ac18f 100644 --- a/keyboards/yynmt/acperience12/rules.mk +++ b/keyboards/yynmt/acperience12/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = yynmt/acperience12/rev1 diff --git a/keyboards/zigotica/z34/info.json b/keyboards/zigotica/z34/keyboard.json similarity index 96% rename from keyboards/zigotica/z34/info.json rename to keyboards/zigotica/z34/keyboard.json index e82a6dd304c..5faa9b23b21 100644 --- a/keyboards/zigotica/z34/info.json +++ b/keyboards/zigotica/z34/keyboard.json @@ -8,6 +8,12 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "build": { + "lto": true + }, + "features": { + "extrakey": true + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { @@ -19,6 +25,7 @@ ] }, "split": { + "enabled": true, "soft_serial_pin": "D2", "matrix_pins": { "right": { diff --git a/keyboards/zigotica/z34/rules.mk b/keyboards/zigotica/z34/rules.mk index 669d2bc02f2..68cfee02814 100644 --- a/keyboards/zigotica/z34/rules.mk +++ b/keyboards/zigotica/z34/rules.mk @@ -1,19 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -SPLIT_KEYBOARD = yes # Split common -LTO_ENABLE = yes # Enables Link Time Optimization (LTO) which reduces the compiled size - # There are no extra pins, so we make sure to disable OLED and Encoders OLED_SUPPORTED = no # Enables the use of OLED displays ENCODER_SUPPORTED = no # Enables the use of encoders - diff --git a/keyboards/ziptyze/lets_split_v3/info.json b/keyboards/ziptyze/lets_split_v3/keyboard.json similarity index 100% rename from keyboards/ziptyze/lets_split_v3/info.json rename to keyboards/ziptyze/lets_split_v3/keyboard.json diff --git a/keyboards/zlant/info.json b/keyboards/zlant/keyboard.json similarity index 97% rename from keyboards/zlant/info.json rename to keyboards/zlant/keyboard.json index 7fba339db1c..d59b1c3f19d 100644 --- a/keyboards/zlant/info.json +++ b/keyboards/zlant/keyboard.json @@ -8,6 +8,13 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B7", "D1", "D2", "D3", "B3", "B2"], "rows": ["B0", "B1", "D4", "D5"] diff --git a/keyboards/zlant/rules.mk b/keyboards/zlant/rules.mk index c0d021d8912..4df55cd2206 100755 --- a/keyboards/zlant/rules.mk +++ b/keyboards/zlant/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes - # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/zsa/moonlander/info.json b/keyboards/zsa/moonlander/keyboard.json similarity index 94% rename from keyboards/zsa/moonlander/info.json rename to keyboards/zsa/moonlander/keyboard.json index 31d6693e398..233cb46bba7 100644 --- a/keyboards/zsa/moonlander/info.json +++ b/keyboards/zsa/moonlander/keyboard.json @@ -6,7 +6,21 @@ "usb": { "vid": "0x3297", "pid": "0x1969", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "mouse": false + } + }, + "features": { + "audio": true, + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true, + "swap_hands": true }, "dynamic_keymap": { "layer_count": 8 diff --git a/keyboards/zsa/moonlander/rules.mk b/keyboards/zsa/moonlander/rules.mk index 204c5940e44..46375584890 100644 --- a/keyboards/zsa/moonlander/rules.mk +++ b/keyboards/zsa/moonlander/rules.mk @@ -1,22 +1,6 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = yes # Audio output AUDIO_DRIVER = dac_additive CUSTOM_MATRIX = lite -SWAP_HANDS_ENABLE = yes -RGB_MATRIX_ENABLE = yes -#project specific files +# project specific files SRC += matrix.c I2C_DRIVER_REQUIRED = yes - -MOUSE_SHARED_EP = no From 36ae585468d4ee781a31303185c71662e2e27d0e Mon Sep 17 00:00:00 2001 From: yiancar Date: Sat, 6 Apr 2024 09:43:20 +0100 Subject: [PATCH 30/40] [Keyboard] Add Skelett60 (#23409) Co-authored-by: yiancar Co-authored-by: Ryan Co-authored-by: Duncan Sutherland --- keyboards/novelkeys/skelett60/info.json | 946 ++++++++++++++++++ .../skelett60/keymaps/default/keymap.c | 32 + .../novelkeys/skelett60/keymaps/via/keymap.c | 32 + .../novelkeys/skelett60/keymaps/via/rules.mk | 1 + keyboards/novelkeys/skelett60/readme.md | 36 + keyboards/novelkeys/skelett60/rules.mk | 3 + keyboards/novelkeys/skelett60/skelett60.c | 21 + 7 files changed, 1071 insertions(+) create mode 100755 keyboards/novelkeys/skelett60/info.json create mode 100644 keyboards/novelkeys/skelett60/keymaps/default/keymap.c create mode 100644 keyboards/novelkeys/skelett60/keymaps/via/keymap.c create mode 100755 keyboards/novelkeys/skelett60/keymaps/via/rules.mk create mode 100755 keyboards/novelkeys/skelett60/readme.md create mode 100644 keyboards/novelkeys/skelett60/rules.mk create mode 100755 keyboards/novelkeys/skelett60/skelett60.c diff --git a/keyboards/novelkeys/skelett60/info.json b/keyboards/novelkeys/skelett60/info.json new file mode 100755 index 00000000000..1a8f988b018 --- /dev/null +++ b/keyboards/novelkeys/skelett60/info.json @@ -0,0 +1,946 @@ +{ + "manufacturer": "Yiancar-Designs", + "keyboard_name": "Skelett 60", + "maintainer": "Yiancar-Designs", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "indicators": { + "caps_lock": "B6", + "on_state": 0 + }, + "matrix_pins": { + "cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"], + "rows": ["A2", "B9", "B8", "B5", "B4"] + }, + "processor": "STM32F072", + "url": "https://yiancar-designs.com", + "usb": { + "device_version": "0.0.1", + "pid": "0x7336", + "vid": "0x8968" + }, + "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_ansi_tsangan", "60_ansi_wkl", "60_ansi_wkl_split_bs_rshift", "60_hhkb", "60_iso", "60_iso_split_bs_rshift", "60_iso_tsangan", "60_iso_tsangan_split_bs_rshift", "60_iso_wkl", "60_iso_wkl_split_bs_rshift", "60_tsangan_hhkb"], + "layouts": { + "LAYOUT_60_ansi": { + "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, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_ansi_split_bs_rshift": { + "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, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_ansi_tsangan": { + "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, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_wkl": { + "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, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_ansi_wkl_split_bs_rshift": { + "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, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_hhkb": { + "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, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_iso": { + "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, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"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], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_iso_split_bs_rshift": { + "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, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"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], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_iso_tsangan": { + "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, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"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], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_tsangan_split_bs_rshift": { + "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, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"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], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_wkl": { + "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, "w": 2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"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], "x": 12.25, "y": 3, "w": 2.75}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_iso_wkl_split_bs_rshift": { + "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, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"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], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_60_tsangan_hhkb": { + "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, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + }, + "LAYOUT_all": { + "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, 12], "x": 14, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"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], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"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, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"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], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + } + } +} diff --git a/keyboards/novelkeys/skelett60/keymaps/default/keymap.c b/keyboards/novelkeys/skelett60/keymaps/default/keymap.c new file mode 100644 index 00000000000..6ce0d78bc7c --- /dev/null +++ b/keyboards/novelkeys/skelett60/keymaps/default/keymap.c @@ -0,0 +1,32 @@ +/* Copyright 2024 Yiancar-Designs + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_all( /* Base */ + QK_GESC, 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_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_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, MO(1), KC_APP, KC_RCTL), + +[1] = LAYOUT_all( /* FN */ + 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_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/novelkeys/skelett60/keymaps/via/keymap.c b/keyboards/novelkeys/skelett60/keymaps/via/keymap.c new file mode 100644 index 00000000000..6ce0d78bc7c --- /dev/null +++ b/keyboards/novelkeys/skelett60/keymaps/via/keymap.c @@ -0,0 +1,32 @@ +/* Copyright 2024 Yiancar-Designs + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +[0] = LAYOUT_all( /* Base */ + QK_GESC, 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_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_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, MO(1), KC_APP, KC_RCTL), + +[1] = LAYOUT_all( /* FN */ + 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_PSCR, KC_SCRL, KC_PAUS, KC_UP, _______, _______, + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, _______, + KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______) +}; diff --git a/keyboards/novelkeys/skelett60/keymaps/via/rules.mk b/keyboards/novelkeys/skelett60/keymaps/via/rules.mk new file mode 100755 index 00000000000..1e5b99807cb --- /dev/null +++ b/keyboards/novelkeys/skelett60/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/novelkeys/skelett60/readme.md b/keyboards/novelkeys/skelett60/readme.md new file mode 100755 index 00000000000..05c920502b3 --- /dev/null +++ b/keyboards/novelkeys/skelett60/readme.md @@ -0,0 +1,36 @@ +# Skelett 60 + +This is a standard 60% layout PCB. It supports VIA. + +* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar) +* Hardware Supported: A 60% keyboard with STM32F072CB +* Hardware Availability: https://novelkeys.com/ + +## Instructions + +### Build + +Make example for this keyboard (after setting up your build environment): + + make novelkeys/skelett60:default + +Flashing example for this keyboard: + + make novelkeys/skelett60:default: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). + +### Reset + +- Unplug +- Hold Escape +- Plug In +- Unplug +- Release Escape + +### Flash + +- Unplug +- Hold Escape +- Plug In +- Flash using QMK Toolbox or CLI (`make novelkeys/skelett60::flash`) diff --git a/keyboards/novelkeys/skelett60/rules.mk b/keyboards/novelkeys/skelett60/rules.mk new file mode 100644 index 00000000000..6dd24d8e068 --- /dev/null +++ b/keyboards/novelkeys/skelett60/rules.mk @@ -0,0 +1,3 @@ +# Wildcard to allow APM32 MCU +DFU_SUFFIX_ARGS = -v FFFF -p FFFF + diff --git a/keyboards/novelkeys/skelett60/skelett60.c b/keyboards/novelkeys/skelett60/skelett60.c new file mode 100755 index 00000000000..fdbfa8f2727 --- /dev/null +++ b/keyboards/novelkeys/skelett60/skelett60.c @@ -0,0 +1,21 @@ +/* Copyright 2024 Yiancar-Designs + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include "quantum.h" + +void led_init_ports(void) { + // Set our LED pins as open drain outputs + gpio_set_pin_output_open_drain(LED_CAPS_LOCK_PIN); +} From b0e948c380a073833a38881e998963db4da456e0 Mon Sep 17 00:00:00 2001 From: Felix Teutsch <63754496+FelixTeutsch@users.noreply.github.com> Date: Sun, 7 Apr 2024 00:57:12 +0200 Subject: [PATCH 31/40] Update hand_wire.md (#23429) --- docs/hand_wire.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/hand_wire.md b/docs/hand_wire.md index 06809254df2..cfae38d6d20 100644 --- a/docs/hand_wire.md +++ b/docs/hand_wire.md @@ -175,7 +175,7 @@ As you move along, be sure that the controller is staying in place - recutting a From here, you should have a working keyboard once you program a firmware. -Simple firmware can be created easily using the [Keyboard Firmware Builder](https://kbfirmware.com/) website. Recreate your layout using [Keyboard Layout Editor](https://www.keyboard-layout-editor.com), import it and recreate the matrix (if not already done as part of [planning the matrix](#planning-the-matrix). +Simple firmware can be created easily using the [Keyboard Firmware Builder](https://kbfirmware.com/) website. Recreate your layout using [Keyboard Layout Editor](https://www.keyboard-layout-editor.com), import it and recreate the matrix (if not already done as part of [planning the matrix](#planning-the-matrix)). Go through the rest of the tabs, assigning keys until you get to the last one where you can compile and download your firmware. The .hex file can be flashed straight onto your keyboard, or for advanced functionality, compiled locally after [Setting up Your Environment](newbs_getting_started.md). From ad8d934d3cb325d5ad2ed98167a8aa869ccc5e9e Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 8 Apr 2024 02:56:46 +0100 Subject: [PATCH 32/40] Tidy up default layer handling in keymaps (#23436) --- .../dz60/keymaps/iso_split-spacebar/keymap.c | 6 ---- keyboards/eco/keymaps/default/keymap.c | 21 ----------- .../atreus50/keymaps/default/keymap.c | 11 ++---- .../4x5/keymaps/default/keymap.c | 5 --- .../4x5/keymaps/dvorak/keymap.c | 6 ---- .../4x6/keymaps/default/keymap.c | 5 --- .../ortho5x13/keymaps/default/keymap.c | 11 ++---- .../promethium/keymaps/default/keymap.c | 15 ++++---- .../terminus_mini/keymaps/default/keymap.c | 5 --- keyboards/helix/pico/keymaps/default/keymap.c | 11 ++---- keyboards/helix/rev2/keymaps/default/keymap.c | 11 ++---- .../halberd/keymaps/default/keymap.c | 9 +---- .../halberd/keymaps/right_modifiers/keymap.c | 9 +---- .../miniaxe/keymaps/default/keymap.c | 10 +----- .../miniaxe/keymaps/underglow/keymap.c | 10 +----- .../keebio/levinson/keymaps/default/keymap.c | 11 ++---- .../keebio/nyquist/keymaps/default/keymap.c | 11 ++---- .../keebio/nyquist/keymaps/tester/keymap.c | 13 +++---- .../keebio/wavelet/keymaps/default/keymap.c | 11 ++---- keyboards/lets_split/keymaps/poker/config.h | 32 ----------------- keyboards/lets_split/keymaps/poker/keymap.c | 13 +++---- .../lfk78/keymaps/default/keymap.c | 8 ----- .../lfkeyboards/lfk78/keymaps/iso/keymap.c | 8 ----- .../lfk78/keymaps/split_bs_osx/keymap.c | 8 ----- .../lfkeyboards/lfk78/keymaps/via/keymap.c | 8 ----- .../lfk87/keymaps/default/keymap.c | 8 ----- .../lfkeyboards/lfk87/keymaps/iso/keymap.c | 8 ----- .../lfkpad/keymaps/default/keymap.c | 8 ----- .../mini1800/keymaps/default/keymap.c | 8 ----- .../minidox/keymaps/default/keymap.c | 17 +-------- .../the_ruler/keymaps/default/keymap.c | 18 ---------- .../ergodash/rev1/keymaps/default/keymap.c | 15 +------- .../rgbkb/zen/rev1/keymaps/default/keymap.c | 36 ------------------- .../rgbkb/zen/rev2/keymaps/default/keymap.c | 24 ------------- .../minivan/keymaps/default/keymap.c | 11 ++---- .../roadkit/keymaps/default/keymap.c | 23 ------------ .../divergetm2/keymaps/default/keymap.c | 6 ++-- .../woodkeys/meira/keymaps/default/keymap.c | 3 -- .../woodkeys/meira/keymaps/takmiya/keymap.c | 14 ++------ 39 files changed, 50 insertions(+), 417 deletions(-) delete mode 100644 keyboards/lets_split/keymaps/poker/config.h diff --git a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c index 8a6945567a1..26edee65b97 100644 --- a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c +++ b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c @@ -144,12 +144,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - // always enable num lock on layer NL and disable on other layers // thanks to spidey3 & Erovia on discord layer_state_t layer_state_set_user(layer_state_t state) { diff --git a/keyboards/eco/keymaps/default/keymap.c b/keyboards/eco/keymaps/default/keymap.c index 8867e11124f..096d955e85b 100644 --- a/keyboards/eco/keymaps/default/keymap.c +++ b/keyboards/eco/keymaps/default/keymap.c @@ -13,10 +13,6 @@ #define _FN1 2 #define _FN2 3 -enum eco_keycodes { - QWERTY = SAFE_RANGE -}; - // Defines for task manager and such #define CALTDEL LCTL(LALT(KC_DEL)) #define TSKMGR LCTL(LSFT(KC_ESC)) @@ -78,20 +74,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - persistant_default_layer_set(1UL<<_QWERTY); - } - return false; - break; - } - return true; -} diff --git a/keyboards/handwired/atreus50/keymaps/default/keymap.c b/keyboards/handwired/atreus50/keymaps/default/keymap.c index c9de095cf89..ea6018bfcce 100644 --- a/keyboards/handwired/atreus50/keymaps/default/keymap.c +++ b/keyboards/handwired/atreus50/keymaps/default/keymap.c @@ -107,11 +107,6 @@ float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -119,7 +114,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -128,7 +123,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -137,7 +132,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c index 375c2082444..630b106ca77 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c @@ -130,8 +130,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______ ) }; - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c index bc309f5a783..d0136c4c51d 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c +++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c @@ -119,9 +119,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ____, ____, ____, ____ ) }; - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c index b447b5c18c3..e218c65d426 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c @@ -70,8 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______ ) }; - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} diff --git a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c index d7253971998..0cf3573a072 100644 --- a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c +++ b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c @@ -175,11 +175,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -187,7 +182,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -196,7 +191,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -205,7 +200,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c index 8af82d8297c..7db69a2a978 100644 --- a/keyboards/handwired/promethium/keymaps/default/keymap.c +++ b/keyboards/handwired/promethium/keymaps/default/keymap.c @@ -940,9 +940,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); +void persistent_default_layer_set(uint8_t default_layer) { + set_single_persistent_default_layer(default_layer); #ifdef RGBSPS_ENABLE led_set_default_layer_indicator(); #endif @@ -1119,14 +1118,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { // layout switchers case QWERTY: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_QWERTY); + persistent_default_layer_set(_QWERTY); } return false; break; #ifdef LAYOUT_DVORAK case DVORAK: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_DVORAK); + persistent_default_layer_set(_DVORAK); } return false; break; @@ -1134,7 +1133,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef LAYOUT_COLEMAK case COLEMAK: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_COLEMAK); + persistent_default_layer_set(_COLEMAK); } return false; break; @@ -1142,7 +1141,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef LAYOUT_WORKMAN case WORKMAN: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_WORKMAN); + persistent_default_layer_set(_WORKMAN); } return false; break; @@ -1150,7 +1149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef LAYOUT_NORMAN case NORMAN: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_NORMAN); + persistent_default_layer_set(_NORMAN); } return false; break; diff --git a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c index 5b0dc9f3839..e6d8bb6f052 100644 --- a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c +++ b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c @@ -201,11 +201,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - // Cases to switch default layer to QWERTY, COLEMAK or DVORAK and to access ADJUST layer bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { diff --git a/keyboards/helix/pico/keymaps/default/keymap.c b/keyboards/helix/pico/keymaps/default/keymap.c index 3ee620360d8..6684890f72b 100644 --- a/keyboards/helix/pico/keymaps/default/keymap.c +++ b/keyboards/helix/pico/keymaps/default/keymap.c @@ -179,11 +179,6 @@ float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); bool TOG_STATUS = false; int RGB_current_mode; -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - // Setting ADJUST layer RGB back to default void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) { @@ -203,7 +198,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -212,7 +207,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -221,7 +216,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/helix/rev2/keymaps/default/keymap.c b/keyboards/helix/rev2/keymaps/default/keymap.c index f23ff07b4fc..15bf4e86af6 100644 --- a/keyboards/helix/rev2/keymaps/default/keymap.c +++ b/keyboards/helix/rev2/keymaps/default/keymap.c @@ -191,11 +191,6 @@ float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND); bool TOG_STATUS = false; int RGB_current_mode; -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - // Setting ADJUST layer RGB back to default void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) { @@ -215,7 +210,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -224,7 +219,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -233,7 +228,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/kagizaraya/halberd/keymaps/default/keymap.c b/keyboards/kagizaraya/halberd/keymaps/default/keymap.c index ecc0e328a7b..27f54ce7c12 100644 --- a/keyboards/kagizaraya/halberd/keymaps/default/keymap.c +++ b/keyboards/kagizaraya/halberd/keymaps/default/keymap.c @@ -25,8 +25,7 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST, }; @@ -112,12 +111,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - // persistant_default_layer_set(1UL<<_QWERTY); - set_single_persistent_default_layer(_QWERTY); - } - return false; case LOWER: if (record->event.pressed) { layer_on(_LOWER); diff --git a/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c index a5c017336a4..500e3a93a4a 100644 --- a/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c +++ b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c @@ -25,8 +25,7 @@ enum layer_names { // Defines the keycodes used by our macros in process_record_user enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST, }; @@ -112,12 +111,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - // persistant_default_layer_set(1UL<<_QWERTY); - set_single_persistent_default_layer(_QWERTY); - } - return false; case LOWER: if (record->event.pressed) { layer_on(_LOWER); diff --git a/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c b/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c index 81f8004e694..1957c0276ce 100644 --- a/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c +++ b/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c @@ -24,8 +24,7 @@ enum layer_names { }; enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST, }; @@ -112,13 +111,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - // persistant_default_layer_set(1UL<<_QWERTY); - set_single_persistent_default_layer(_QWERTY); - } - return false; - break; case LOWER: if (record->event.pressed) { layer_on(_LOWER); diff --git a/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c b/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c index 8b4417f62d1..c162c12045b 100644 --- a/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c +++ b/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c @@ -24,8 +24,7 @@ enum layer_names { }; enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST, }; @@ -112,13 +111,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - // persistant_default_layer_set(1UL<<_QWERTY); - set_single_persistent_default_layer(_QWERTY); - } - return false; - break; case LOWER: if (record->event.pressed) { layer_on(_LOWER); diff --git a/keyboards/keebio/levinson/keymaps/default/keymap.c b/keyboards/keebio/levinson/keymaps/default/keymap.c index 72da4addc31..bdc4a50827f 100644 --- a/keyboards/keebio/levinson/keymaps/default/keymap.c +++ b/keyboards/keebio/levinson/keymaps/default/keymap.c @@ -142,11 +142,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -154,7 +149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -163,7 +158,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -172,7 +167,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/keebio/nyquist/keymaps/default/keymap.c b/keyboards/keebio/nyquist/keymaps/default/keymap.c index 8bf16240fb1..df399d355f1 100644 --- a/keyboards/keebio/nyquist/keymaps/default/keymap.c +++ b/keyboards/keebio/nyquist/keymaps/default/keymap.c @@ -162,11 +162,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -174,7 +169,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -183,7 +178,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -192,7 +187,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/keebio/nyquist/keymaps/tester/keymap.c b/keyboards/keebio/nyquist/keymaps/tester/keymap.c index 6109661ffd1..7ed85044ca6 100644 --- a/keyboards/keebio/nyquist/keymaps/tester/keymap.c +++ b/keyboards/keebio/nyquist/keymaps/tester/keymap.c @@ -11,7 +11,7 @@ extern keymap_config_t keymap_config; #define _DVORAK 2 #define _LOWER 3 #define _RAISE 4 -#define _ADJUST 16 +#define _ADJUST 5 enum custom_keycodes { QWERTY = SAFE_RANGE, @@ -159,11 +159,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -171,7 +166,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -180,7 +175,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -189,7 +184,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/keebio/wavelet/keymaps/default/keymap.c b/keyboards/keebio/wavelet/keymaps/default/keymap.c index 72da4addc31..bdc4a50827f 100644 --- a/keyboards/keebio/wavelet/keymaps/default/keymap.c +++ b/keyboards/keebio/wavelet/keymaps/default/keymap.c @@ -142,11 +142,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -154,7 +149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -163,7 +158,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -172,7 +167,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/lets_split/keymaps/poker/config.h b/keyboards/lets_split/keymaps/poker/config.h deleted file mode 100644 index 470fc078542..00000000000 --- a/keyboards/lets_split/keymaps/poker/config.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -This is the c configuration file for the keymap - -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#ifndef CONFIG_USER_H -#define CONFIG_USER_H - -#include "../../config.h" - -/* Select hand configuration */ - -#define MASTER_LEFT -// #define MASTER_RIGHT -// #define EE_HANDS - -#endif diff --git a/keyboards/lets_split/keymaps/poker/keymap.c b/keyboards/lets_split/keymaps/poker/keymap.c index 37e9dd9aedb..7b17b71f971 100644 --- a/keyboards/lets_split/keymaps/poker/keymap.c +++ b/keyboards/lets_split/keymaps/poker/keymap.c @@ -13,7 +13,7 @@ extern keymap_config_t keymap_config; #define _LOWER 3 #define _RAISE 4 #define _FN 5 -#define _ADJUST 16 +#define _ADJUST 6 enum custom_keycodes { QWERTY = SAFE_RANGE, @@ -161,11 +161,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: @@ -173,7 +168,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - persistent_default_layer_set(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -182,7 +177,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - persistent_default_layer_set(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -191,7 +186,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - persistent_default_layer_set(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c index d81ed91814d..c149ea04b4b 100644 --- a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c @@ -70,11 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c index 1f3ef6fc8e1..d07d7de4e6d 100644 --- a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c +++ b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c @@ -70,11 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c index 041c3cdfd03..3073c47bf78 100644 --- a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c +++ b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c @@ -70,11 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c index 88aa97da702..7ed2e71a7f6 100644 --- a/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c +++ b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c @@ -62,11 +62,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_SAI ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c index b9057e9047d..84e4fbb59fb 100644 --- a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c @@ -79,11 +79,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, RGB_SAD, RGB_HUD, RGB_SAI ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c index 510aa6730f0..46286c3f321 100644 --- a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c +++ b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c @@ -79,11 +79,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c index 0aa720e4003..05f42b8b98e 100644 --- a/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/lfkpad/keymaps/default/keymap.c @@ -21,11 +21,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, RGB_TOG ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c index c2abd128430..7d6e267611f 100644 --- a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c +++ b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c @@ -76,11 +76,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_SAD, RGB_HUD, RGB_SAI, XXXXXXX, XXXXXXX ) }; - -void matrix_init_user(void) { - // This keymap only has a single base layer, so reset the default if needed - if (eeconfig_read_default_layer() > 1) { - eeconfig_update_default_layer(1); - default_layer_set(1); - } -} diff --git a/keyboards/maple_computing/minidox/keymaps/default/keymap.c b/keyboards/maple_computing/minidox/keymaps/default/keymap.c index d71e5b6e559..39ebffd9875 100644 --- a/keyboards/maple_computing/minidox/keymaps/default/keymap.c +++ b/keyboards/maple_computing/minidox/keymaps/default/keymap.c @@ -13,8 +13,7 @@ enum layer_names { }; enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST, }; @@ -114,22 +113,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_qwerty); - #endif - persistant_default_layer_set(1UL<<_QWERTY); - } - return false; - break; case LOWER: if (record->event.pressed) { layer_on(_LOWER); diff --git a/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c b/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c index 87190f0b3f1..6ef57fd895a 100644 --- a/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c +++ b/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c @@ -9,12 +9,6 @@ #define _FN_1 1 #define _FN_2 2 -enum custom_keycodes { - DEFAULT = SAFE_RANGE, - FN_1, - FN_2 -}; - // Defines for task manager and such #define CALTDEL LCTL(LALT(KC_DEL)) #define TSKMGR LCTL(LSFT(KC_ESC)) @@ -49,15 +43,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - // NONE - } - return true; -} diff --git a/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c index 739e22c04e6..f112f113945 100644 --- a/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c +++ b/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c @@ -9,8 +9,7 @@ enum layer_names { }; enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST, }; @@ -108,20 +107,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { float tone_qwerty[][2] = SONG(QWERTY_SOUND); #endif -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - print("mode just switched to qwerty and this is a huge string\n"); - set_single_persistent_default_layer(_QWERTY); - } - return false; - break; case LOWER: if (record->event.pressed) { layer_on(_LOWER); diff --git a/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c index b044652afd2..c84d9574af8 100644 --- a/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c +++ b/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c @@ -10,13 +10,6 @@ enum layer_number { _NAV }; - -enum custom_keycodes { - QWERTY = SAFE_RANGE, - NAV, - -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty @@ -67,32 +60,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { float tone_qwerty[][2] = SONG(QWERTY_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif - -void persistant_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_qwerty); - #endif - persistant_default_layer_set(1UL<<_QWERTY); - } - return false; - break; - //case COLEMAK: - //if (record->event.pressed) { - //#ifdef AUDIO_ENABLE - //PLAY_SONG(tone_colemak); - //#endif - //persistant_default_layer_set(1UL<<_COLEMAK); - //} - //return false; - //break; - } - return true; -} diff --git a/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c index 4b289b095fd..1776c6b5856 100644 --- a/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c +++ b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c @@ -10,11 +10,6 @@ enum layer_number { _NAV }; -enum custom_keycodes { - QWERTY = SAFE_RANGE, - NAV -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty @@ -84,25 +79,6 @@ bool encoder_update_user(uint8_t index, bool clockwise) { return true; } -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case QWERTY: - if (record->event.pressed) { - set_single_persistent_default_layer(1UL<<_QWERTY); - } - return false; - break; - //case COLEMAK: - //if (record->event.pressed) { - //set_single_persistent_default_layer(1UL<<_COLEMAK); - //} - //return false; - //break; - } - return true; -} - - #if OLED_ENABLE const char* layer_name_user(uint32_t layer) { switch (layer) { diff --git a/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c index fec08cea3ea..fadf9990cd9 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/default/keymap.c @@ -63,26 +63,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch(keycode) { case DVORAK: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_DV); + set_single_persistent_default_layer(_DV); } return false; case QWERTY: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_QW); + set_single_persistent_default_layer(_QW); } return false; case COLEMAK: if (record->event.pressed) { - persistent_default_layer_set(1UL<<_CM); + set_single_persistent_default_layer(_CM); } return false; default: diff --git a/keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c b/keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c index 32e4694cd55..ac9d97bde54 100644 --- a/keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c +++ b/keyboards/thevankeyboards/roadkit/keymaps/default/keymap.c @@ -1,6 +1,5 @@ #include QMK_KEYBOARD_H - // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them @@ -8,10 +7,6 @@ #define _NP 0 -enum custom_keycodes { - NUMPAD = SAFE_RANGE -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_NP] = LAYOUT_numpad_4x4( /* Numpad */ KC_P7, KC_P8, KC_P9, KC_PPLS, @@ -20,21 +15,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P0, KC_PDOT ), }; - -void persistent_default_layer_set(uint16_t default_layer) { - eeconfig_update_default_layer(default_layer); - default_layer_set(default_layer); -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch(keycode) { - case NUMPAD: - if (record->event.pressed) { - persistent_default_layer_set(1UL<<_NP); - } - return false; - default: - return true; - } - return true; -}; diff --git a/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c b/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c index d4f38e4a199..3111ac26d76 100644 --- a/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c +++ b/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c @@ -170,7 +170,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - set_single_persistent_default_layer(1UL<<_QWERTY); + set_single_persistent_default_layer(_QWERTY); } return false; break; @@ -179,7 +179,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - set_single_persistent_default_layer(1UL<<_COLEMAK); + set_single_persistent_default_layer(_COLEMAK); } return false; break; @@ -188,7 +188,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - set_single_persistent_default_layer(1UL<<_DVORAK); + set_single_persistent_default_layer(_DVORAK); } return false; break; diff --git a/keyboards/woodkeys/meira/keymaps/default/keymap.c b/keyboards/woodkeys/meira/keymaps/default/keymap.c index 8aedffc675f..72f465e44ac 100644 --- a/keyboards/woodkeys/meira/keymaps/default/keymap.c +++ b/keyboards/woodkeys/meira/keymaps/default/keymap.c @@ -182,7 +182,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_qwerty); #endif - // persistent_default_layer_set(1UL<<_QWERTY); } return false; break; @@ -191,7 +190,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_colemak); #endif - // persistent_default_layer_set(1UL<<_COLEMAK); } return false; break; @@ -200,7 +198,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef AUDIO_ENABLE PLAY_SONG(tone_dvorak); #endif - // persistent_default_layer_set(1UL<<_DVORAK); } return false; break; diff --git a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c index cf1b2b8ce69..bba1b5583ee 100644 --- a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c +++ b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c @@ -26,8 +26,7 @@ extern rgblight_config_t rgblight_config; #define _ADJUST 3 enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, + LOWER = SAFE_RANGE, RAISE, ADJUST, }; @@ -104,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT( BL_TOGG, QK_BOOT, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC_PSCR, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, - BL_STEP, RGB_MOD, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, _______, _______, _______, _______, + BL_STEP, RGB_MOD, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) @@ -124,15 +123,6 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case QWERTY: - if (record->event.pressed) { - #ifdef AUDIO_ENABLE - PLAY_SONG(tone_qwerty); - #endif -// persistent_default_layer_set(1UL<<_QWERTY); - } - return false; - break; case LOWER: if (record->event.pressed) { //not sure how to have keyboard check mode and set it to a variable, so my work around From cd0043de8ffaa1cdbeb86f242b250c8d23f5a231 Mon Sep 17 00:00:00 2001 From: Draic Date: Mon, 8 Apr 2024 17:47:11 +0200 Subject: [PATCH 33/40] Fix Layout_Arrow 3rd key in bottom row (#23443) Co-authored-by: v --- keyboards/trashman/ketch/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json index a674acb2759..9c3474c32ed 100644 --- a/keyboards/trashman/ketch/info.json +++ b/keyboards/trashman/ketch/info.json @@ -130,7 +130,7 @@ {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25}, {"matrix": [5, 4], "x": 1.25, "y": 3, "w": 1.5}, - {"matrix": [3, 0], "x": 2.75, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 2.75, "y": 3, "w": 1.25}, {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25}, {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2}, {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.5}, From b99143fdd2637f573bb8c2632a38b84acc1945a0 Mon Sep 17 00:00:00 2001 From: NoOne2246 Date: Tue, 9 Apr 2024 04:55:42 +1000 Subject: [PATCH 34/40] Oneshot locked mods split transaction (#23434) --- docs/feature_split_keyboard.md | 2 +- quantum/split_common/transactions.c | 5 +++++ quantum/split_common/transport.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/feature_split_keyboard.md b/docs/feature_split_keyboard.md index 59159cb3fab..99c252d03ec 100644 --- a/docs/feature_split_keyboard.md +++ b/docs/feature_split_keyboard.md @@ -266,7 +266,7 @@ This enables syncing of the Host LED status (caps lock, num lock, etc) between b #define SPLIT_MODS_ENABLE ``` -This enables transmitting modifier state (normal, weak and oneshot) to the non primary side of the split keyboard. The purpose of this feature is to support cosmetic use of modifer state (e.g. displaying status on an OLED screen). +This enables transmitting modifier state (normal, weak, oneshot and oneshot locked) to the non primary side of the split keyboard. The purpose of this feature is to support cosmetic use of modifer state (e.g. displaying status on an OLED screen). ```c #define SPLIT_WPM_ENABLE diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c index 33bc9e9f575..decf5e5ede0 100644 --- a/quantum/split_common/transactions.c +++ b/quantum/split_common/transactions.c @@ -419,6 +419,10 @@ static bool mods_handlers_master(matrix_row_t master_matrix[], matrix_row_t slav if (!mods_need_sync && new_mods.oneshot_mods != split_shmem->mods.oneshot_mods) { mods_need_sync = true; } + new_mods.oneshot_locked_mods = get_oneshot_locked_mods(); + if (!mods_need_sync && new_mods.oneshot_locked_mods != split_shmem->mods.oneshot_locked_mods) { + mods_need_sync = true; + } # endif // NO_ACTION_ONESHOT bool okay = true; @@ -442,6 +446,7 @@ static void mods_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave set_weak_mods(mods.weak_mods); # ifndef NO_ACTION_ONESHOT set_oneshot_mods(mods.oneshot_mods); + set_oneshot_locked_mods(mods.oneshot_locked_mods); # endif } diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h index 4f6b968fa8a..fbd87ca3123 100644 --- a/quantum/split_common/transport.h +++ b/quantum/split_common/transport.h @@ -101,6 +101,7 @@ typedef struct _split_mods_sync_t { uint8_t weak_mods; # ifndef NO_ACTION_ONESHOT uint8_t oneshot_mods; + uint8_t oneshot_locked_mods; # endif // NO_ACTION_ONESHOT } split_mods_sync_t; #endif // SPLIT_MODS_ENABLE From 4acdddbf48707e5221cb754b4aa5caf32ce28276 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Wed, 10 Apr 2024 19:03:11 +1000 Subject: [PATCH 35/40] Bodge consolidation. (#23448) --- builddefs/build_keyboard.mk | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk index 0b9ab8849f7..f0788e55c99 100644 --- a/builddefs/build_keyboard.mk +++ b/builddefs/build_keyboard.mk @@ -521,22 +521,14 @@ ifeq ($(strip $(KEEP_INTERMEDIATES)), yes) OPT_DEFS += -save-temps=obj endif -# TODO: remove this bodge? -PROJECT_DEFS := $(OPT_DEFS) -PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS) -PROJECT_CONFIG := $(CONFIG_H) - -CONFIG_H += $(POST_CONFIG_H) -ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H) - OUTPUTS := $(INTERMEDIATE_OUTPUT) $(INTERMEDIATE_OUTPUT)_SRC := $(SRC) $(PLATFORM_SRC) -$(INTERMEDIATE_OUTPUT)_DEFS := $(OPT_DEFS) \ +$(INTERMEDIATE_OUTPUT)_DEFS := \ -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(INTERMEDIATE_OUTPUT)/src/default_keyboard.h\" \ -DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \ - $(PROJECT_DEFS) -$(INTERMEDIATE_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS) $(PROJECT_INC) -$(INTERMEDIATE_OUTPUT)_CONFIG := $(CONFIG_H) $(PROJECT_CONFIG) + $(OPT_DEFS) +$(INTERMEDIATE_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS) +$(INTERMEDIATE_OUTPUT)_CONFIG := $(CONFIG_H) $(POST_CONFIG_H) # Default target. all: build check-size From 25f608c1b437060e8c9b451ed81c7e37a2531284 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 11 Apr 2024 14:06:36 +1000 Subject: [PATCH 36/40] Separate keycode handling for LED Matrix and Backlight (#23426) --- builddefs/common_features.mk | 2 +- quantum/process_keycode/process_backlight.c | 30 ++---------------- quantum/process_keycode/process_led_matrix.c | 32 ++++++++++++++++++++ quantum/process_keycode/process_led_matrix.h | 10 ++++++ quantum/quantum.c | 11 +++++-- 5 files changed, 54 insertions(+), 31 deletions(-) create mode 100644 quantum/process_keycode/process_led_matrix.c create mode 100644 quantum/process_keycode/process_led_matrix.h diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index 49197dc91e1..68f9a1dd08a 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -353,7 +353,7 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), yes) COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations COMMON_VPATH += $(QUANTUM_DIR)/led_matrix/animations/runners POST_CONFIG_H += $(QUANTUM_DIR)/led_matrix/post_config.h - SRC += $(QUANTUM_DIR)/process_keycode/process_backlight.c + SRC += $(QUANTUM_DIR)/process_keycode/process_led_matrix.c SRC += $(QUANTUM_DIR)/led_matrix/led_matrix.c SRC += $(QUANTUM_DIR)/led_matrix/led_matrix_drivers.c LIB8TION_ENABLE := yes diff --git a/quantum/process_keycode/process_backlight.c b/quantum/process_keycode/process_backlight.c index c1596ec07d1..dafe9797607 100644 --- a/quantum/process_keycode/process_backlight.c +++ b/quantum/process_keycode/process_backlight.c @@ -15,36 +15,11 @@ */ #include "process_backlight.h" - -#ifdef LED_MATRIX_ENABLE -# include "led_matrix.h" -#else -# include "backlight.h" -#endif +#include "backlight.h" bool process_backlight(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { switch (keycode) { -#ifdef LED_MATRIX_ENABLE - case QK_BACKLIGHT_ON: - led_matrix_enable(); - return false; - case QK_BACKLIGHT_OFF: - led_matrix_disable(); - return false; - case QK_BACKLIGHT_DOWN: - led_matrix_decrease_val(); - return false; - case QK_BACKLIGHT_UP: - led_matrix_increase_val(); - return false; - case QK_BACKLIGHT_TOGGLE: - led_matrix_toggle(); - return false; - case QK_BACKLIGHT_STEP: - led_matrix_step(); - return false; -#else case QK_BACKLIGHT_ON: backlight_level(BACKLIGHT_LEVELS); return false; @@ -63,11 +38,10 @@ bool process_backlight(uint16_t keycode, keyrecord_t *record) { case QK_BACKLIGHT_STEP: backlight_step(); return false; -# ifdef BACKLIGHT_BREATHING +#ifdef BACKLIGHT_BREATHING case QK_BACKLIGHT_TOGGLE_BREATHING: backlight_toggle_breathing(); return false; -# endif #endif } } diff --git a/quantum/process_keycode/process_led_matrix.c b/quantum/process_keycode/process_led_matrix.c new file mode 100644 index 00000000000..217c9a2c28a --- /dev/null +++ b/quantum/process_keycode/process_led_matrix.c @@ -0,0 +1,32 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "process_led_matrix.h" +#include "led_matrix.h" + +bool process_led_matrix(uint16_t keycode, keyrecord_t *record) { + if (record->event.pressed) { + switch (keycode) { + case QK_BACKLIGHT_ON: + led_matrix_enable(); + return false; + case QK_BACKLIGHT_OFF: + led_matrix_disable(); + return false; + case QK_BACKLIGHT_DOWN: + led_matrix_decrease_val(); + return false; + case QK_BACKLIGHT_UP: + led_matrix_increase_val(); + return false; + case QK_BACKLIGHT_TOGGLE: + led_matrix_toggle(); + return false; + case QK_BACKLIGHT_STEP: + led_matrix_step(); + return false; + } + } + + return true; +} diff --git a/quantum/process_keycode/process_led_matrix.h b/quantum/process_keycode/process_led_matrix.h new file mode 100644 index 00000000000..407d04aa27e --- /dev/null +++ b/quantum/process_keycode/process_led_matrix.h @@ -0,0 +1,10 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include +#include +#include "action.h" + +bool process_led_matrix(uint16_t keycode, keyrecord_t *record); diff --git a/quantum/quantum.c b/quantum/quantum.c index 6639dc22910..011f9d73e4a 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -16,7 +16,7 @@ #include "quantum.h" -#if defined(BACKLIGHT_ENABLE) || defined(LED_MATRIX_ENABLE) +#ifdef BACKLIGHT_ENABLE # include "process_backlight.h" #endif @@ -40,6 +40,10 @@ # include "process_leader.h" #endif +#ifdef LED_MATRIX_ENABLE +# include "process_led_matrix.h" +#endif + #ifdef MAGIC_ENABLE # include "process_magic.h" #endif @@ -333,9 +337,12 @@ bool process_record_quantum(keyrecord_t *record) { #ifdef AUDIO_ENABLE process_audio(keycode, record) && #endif -#if defined(BACKLIGHT_ENABLE) || defined(LED_MATRIX_ENABLE) +#if defined(BACKLIGHT_ENABLE) process_backlight(keycode, record) && #endif +#if defined(LED_MATRIX_ENABLE) + process_led_matrix(keycode, record) && +#endif #ifdef STENO_ENABLE process_steno(keycode, record) && #endif From 52d3ef0fe4bd860420893e364be36c155f4ba300 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 11 Apr 2024 14:14:02 +1000 Subject: [PATCH 37/40] Add new set of keycodes for LED Matrix (#23432) --- data/constants/keycodes/keycodes_0.0.4.hjson | 0 .../keycodes/keycodes_0.0.4_lighting.hjson | 67 +++++++++++++++++++ docs/feature_led_matrix.md | 21 +++--- docs/keycodes.md | 16 +++++ quantum/keycodes.h | 20 ++++++ tests/test_common/keycode_table.cpp | 9 +++ 6 files changed, 123 insertions(+), 10 deletions(-) create mode 100644 data/constants/keycodes/keycodes_0.0.4.hjson create mode 100644 data/constants/keycodes/keycodes_0.0.4_lighting.hjson diff --git a/data/constants/keycodes/keycodes_0.0.4.hjson b/data/constants/keycodes/keycodes_0.0.4.hjson new file mode 100644 index 00000000000..e69de29bb2d diff --git a/data/constants/keycodes/keycodes_0.0.4_lighting.hjson b/data/constants/keycodes/keycodes_0.0.4_lighting.hjson new file mode 100644 index 00000000000..d7b27230f30 --- /dev/null +++ b/data/constants/keycodes/keycodes_0.0.4_lighting.hjson @@ -0,0 +1,67 @@ +{ + "keycodes": { + "0x7810": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_ON", + "aliases": [ + "LM_ON" + ] + }, + "0x7811": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_OFF", + "aliases": [ + "LM_OFF" + ] + }, + "0x7812": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_TOGGLE", + "aliases": [ + "LM_TOGG" + ] + }, + "0x7813": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_MODE_NEXT", + "aliases": [ + "LM_NEXT" + ] + }, + "0x7814": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_MODE_PREVIOUS", + "aliases": [ + "LM_PREV" + ] + }, + "0x7815": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_BRIGHTNESS_UP", + "aliases": [ + "LM_BRIU" + ] + }, + "0x7816": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_BRIGHTNESS_DOWN", + "aliases": [ + "LM_BRID" + ] + }, + "0x7817": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_SPEED_UP", + "aliases": [ + "LM_SPDU" + ] + }, + "0x7818": { + "group": "led_matrix", + "key": "QK_LED_MATRIX_SPEED_DOWN", + "aliases": [ + "LM_SPDD" + ] + } + } +} diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md index 3a3a9dbf844..83357ab14e8 100644 --- a/docs/feature_led_matrix.md +++ b/docs/feature_led_matrix.md @@ -217,16 +217,17 @@ As mentioned earlier, the center of the keyboard by default is expected to be `{ ## Keycodes :id=keycodes -All LED matrix keycodes are currently shared with the [Backlight feature](feature_backlight.md). - -| Key | Aliases | Description | -|-------------------------|-----------|-------------------------------| -| `QK_BACKLIGHT_TOGGLE` | `BL_TOGG` | Toggle LED Matrix on or off | -| `QK_BACKLIGHT_STEP` | `BL_STEP` | Cycle through modes | -| `QK_BACKLIGHT_ON` | `BL_ON` | Turn on LED Matrix | -| `QK_BACKLIGHT_OFF` | `BL_OFF` | Turn off LED Matrix | -| `QK_BACKLIGHT_UP` | `BL_UP` | Increase the brightness level | -| `QK_BACKLIGHT_DOWN` | `BL_DOWN` | Decrease the brightness level | +|Key |Aliases |Description | +|-------------------------------|---------|-----------------------------------| +|`QK_LED_MATRIX_ON` |`LM_ON` |Turn on LED Matrix | +|`QK_LED_MATRIX_OFF` |`LM_OFF` |Turn off LED Matrix | +|`QK_LED_MATRIX_TOGGLE` |`LM_TOGG`|Toggle LED Matrix on or off | +|`QK_LED_MATRIX_MODE_NEXT` |`LM_NEXT`|Cycle through animations | +|`QK_LED_MATRIX_MODE_PREVIOUS` |`LM_PREV`|Cycle through animations in reverse| +|`QK_LED_MATRIX_BRIGHTNESS_UP` |`LM_BRIU`|Increase the brightness level | +|`QK_LED_MATRIX_BRIGHTNESS_DOWN`|`LM_BRID`|Decrease the brightness level | +|`QK_LED_MATRIX_SPEED_UP` |`LM_SPDU`|Increase the animation speed | +|`QK_LED_MATRIX_SPEED_DOWN` |`LM_SPDD`|Decrease the animation speed | ## LED Matrix Effects :id=led-matrix-effects diff --git a/docs/keycodes.md b/docs/keycodes.md index 65762234a44..9d722216a93 100644 --- a/docs/keycodes.md +++ b/docs/keycodes.md @@ -398,6 +398,22 @@ See also: [Leader Key](feature_leader_key.md) |---------|------------------------| |`QK_LEAD`|Begins a leader sequence| +## LED Matrix :id=led-matrix + +See also: [LED Matrix](feature_led_matrix.md) + +|Key |Aliases |Description | +|-------------------------------|---------|-----------------------------------| +|`QK_LED_MATRIX_ON` |`LM_ON` |Turn on LED Matrix | +|`QK_LED_MATRIX_OFF` |`LM_OFF` |Turn off LED Matrix | +|`QK_LED_MATRIX_TOGGLE` |`LM_TOGG`|Toggle LED Matrix on or off | +|`QK_LED_MATRIX_MODE_NEXT` |`LM_NEXT`|Cycle through animations | +|`QK_LED_MATRIX_MODE_PREVIOUS` |`LM_PREV`|Cycle through animations in reverse| +|`QK_LED_MATRIX_BRIGHTNESS_UP` |`LM_BRIU`|Increase the brightness level | +|`QK_LED_MATRIX_BRIGHTNESS_DOWN`|`LM_BRID`|Decrease the brightness level | +|`QK_LED_MATRIX_SPEED_UP` |`LM_SPDU`|Increase the animation speed | +|`QK_LED_MATRIX_SPEED_DOWN` |`LM_SPDD`|Decrease the animation speed | + ## Magic Keycodes :id=magic-keycodes See also: [Magic Keycodes](keycodes_magic.md) diff --git a/quantum/keycodes.h b/quantum/keycodes.h index 69d62b57311..da1012cf12b 100644 --- a/quantum/keycodes.h +++ b/quantum/keycodes.h @@ -627,6 +627,15 @@ enum qk_keycode_defines { QK_BACKLIGHT_UP = 0x7804, QK_BACKLIGHT_STEP = 0x7805, QK_BACKLIGHT_TOGGLE_BREATHING = 0x7806, + QK_LED_MATRIX_ON = 0x7810, + QK_LED_MATRIX_OFF = 0x7811, + QK_LED_MATRIX_TOGGLE = 0x7812, + QK_LED_MATRIX_MODE_NEXT = 0x7813, + QK_LED_MATRIX_MODE_PREVIOUS = 0x7814, + QK_LED_MATRIX_BRIGHTNESS_UP = 0x7815, + QK_LED_MATRIX_BRIGHTNESS_DOWN = 0x7816, + QK_LED_MATRIX_SPEED_UP = 0x7817, + QK_LED_MATRIX_SPEED_DOWN = 0x7818, RGB_TOG = 0x7820, RGB_MODE_FORWARD = 0x7821, RGB_MODE_REVERSE = 0x7822, @@ -1281,6 +1290,15 @@ enum qk_keycode_defines { BL_UP = QK_BACKLIGHT_UP, BL_STEP = QK_BACKLIGHT_STEP, BL_BRTG = QK_BACKLIGHT_TOGGLE_BREATHING, + LM_ON = QK_LED_MATRIX_ON, + LM_OFF = QK_LED_MATRIX_OFF, + LM_TOGG = QK_LED_MATRIX_TOGGLE, + LM_NEXT = QK_LED_MATRIX_MODE_NEXT, + LM_PREV = QK_LED_MATRIX_MODE_PREVIOUS, + LM_BRIU = QK_LED_MATRIX_BRIGHTNESS_UP, + LM_BRID = QK_LED_MATRIX_BRIGHTNESS_DOWN, + LM_SPDU = QK_LED_MATRIX_SPEED_UP, + LM_SPDD = QK_LED_MATRIX_SPEED_DOWN, RGB_MOD = RGB_MODE_FORWARD, RGB_RMOD = RGB_MODE_REVERSE, RGB_M_P = RGB_MODE_PLAIN, @@ -1416,6 +1434,7 @@ enum qk_keycode_defines { #define IS_STENO_KEYCODE(code) ((code) >= QK_STENO_BOLT && (code) <= QK_STENO_COMB_MAX) #define IS_MACRO_KEYCODE(code) ((code) >= QK_MACRO_0 && (code) <= QK_MACRO_31) #define IS_BACKLIGHT_KEYCODE(code) ((code) >= QK_BACKLIGHT_ON && (code) <= QK_BACKLIGHT_TOGGLE_BREATHING) +#define IS_LED_MATRIX_KEYCODE(code) ((code) >= QK_LED_MATRIX_ON && (code) <= QK_LED_MATRIX_SPEED_DOWN) #define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE) #define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_ALT_REPEAT_KEY) #define IS_KB_KEYCODE(code) ((code) >= QK_KB_0 && (code) <= QK_KB_31) @@ -1438,6 +1457,7 @@ enum qk_keycode_defines { #define STENO_KEYCODE_RANGE QK_STENO_BOLT ... QK_STENO_COMB_MAX #define MACRO_KEYCODE_RANGE QK_MACRO_0 ... QK_MACRO_31 #define BACKLIGHT_KEYCODE_RANGE QK_BACKLIGHT_ON ... QK_BACKLIGHT_TOGGLE_BREATHING +#define LED_MATRIX_KEYCODE_RANGE QK_LED_MATRIX_ON ... QK_LED_MATRIX_SPEED_DOWN #define RGB_KEYCODE_RANGE RGB_TOG ... RGB_MODE_TWINKLE #define QUANTUM_KEYCODE_RANGE QK_BOOTLOADER ... QK_ALT_REPEAT_KEY #define KB_KEYCODE_RANGE QK_KB_0 ... QK_KB_31 diff --git a/tests/test_common/keycode_table.cpp b/tests/test_common/keycode_table.cpp index 29f7c710a03..06064e77f91 100644 --- a/tests/test_common/keycode_table.cpp +++ b/tests/test_common/keycode_table.cpp @@ -569,6 +569,15 @@ std::map KEYCODE_ID_TABLE = { {QK_BACKLIGHT_UP, "QK_BACKLIGHT_UP"}, {QK_BACKLIGHT_STEP, "QK_BACKLIGHT_STEP"}, {QK_BACKLIGHT_TOGGLE_BREATHING, "QK_BACKLIGHT_TOGGLE_BREATHING"}, + {QK_LED_MATRIX_ON, "QK_LED_MATRIX_ON"}, + {QK_LED_MATRIX_OFF, "QK_LED_MATRIX_OFF"}, + {QK_LED_MATRIX_TOGGLE, "QK_LED_MATRIX_TOGGLE"}, + {QK_LED_MATRIX_MODE_NEXT, "QK_LED_MATRIX_MODE_NEXT"}, + {QK_LED_MATRIX_MODE_PREVIOUS, "QK_LED_MATRIX_MODE_PREVIOUS"}, + {QK_LED_MATRIX_BRIGHTNESS_UP, "QK_LED_MATRIX_BRIGHTNESS_UP"}, + {QK_LED_MATRIX_BRIGHTNESS_DOWN, "QK_LED_MATRIX_BRIGHTNESS_DOWN"}, + {QK_LED_MATRIX_SPEED_UP, "QK_LED_MATRIX_SPEED_UP"}, + {QK_LED_MATRIX_SPEED_DOWN, "QK_LED_MATRIX_SPEED_DOWN"}, {RGB_TOG, "RGB_TOG"}, {RGB_MODE_FORWARD, "RGB_MODE_FORWARD"}, {RGB_MODE_REVERSE, "RGB_MODE_REVERSE"}, From f73e69f56d86949fece6f11f97e322f6cca70f98 Mon Sep 17 00:00:00 2001 From: era <73109780+eerraa@users.noreply.github.com> Date: Thu, 11 Apr 2024 13:47:14 +0900 Subject: [PATCH 38/40] [Keyboard] Add N86 (#23454) --- keyboards/era/linx3/n86/config.h | 8 + keyboards/era/linx3/n86/info.json | 451 ++++++++++++++++++ .../era/linx3/n86/keymaps/default/keymap.c | 24 + keyboards/era/linx3/n86/keymaps/via/keymap.c | 24 + keyboards/era/linx3/n86/keymaps/via/rules.mk | 1 + keyboards/era/linx3/n86/readme.md | 23 + keyboards/era/linx3/n86/rules.mk | 1 + 7 files changed, 532 insertions(+) create mode 100644 keyboards/era/linx3/n86/config.h create mode 100644 keyboards/era/linx3/n86/info.json create mode 100644 keyboards/era/linx3/n86/keymaps/default/keymap.c create mode 100644 keyboards/era/linx3/n86/keymaps/via/keymap.c create mode 100644 keyboards/era/linx3/n86/keymaps/via/rules.mk create mode 100644 keyboards/era/linx3/n86/readme.md create mode 100644 keyboards/era/linx3/n86/rules.mk diff --git a/keyboards/era/linx3/n86/config.h b/keyboards/era/linx3/n86/config.h new file mode 100644 index 00000000000..8b294dd91b1 --- /dev/null +++ b/keyboards/era/linx3/n86/config.h @@ -0,0 +1,8 @@ +// Copyright 2024 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* Reset */ +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 2000U \ No newline at end of file diff --git a/keyboards/era/linx3/n86/info.json b/keyboards/era/linx3/n86/info.json new file mode 100644 index 00000000000..40e1f78baaa --- /dev/null +++ b/keyboards/era/linx3/n86/info.json @@ -0,0 +1,451 @@ +{ + "manufacturer": "eerraa", + "keyboard_name": "N86", + "maintainer": "eerraa", + "bootloader": "rp2040", + "build": { + "debounce_type": "sym_defer_pk" + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP20", "GP19", "GP18", "GP17", "GP16", "GP21", "GP11", "GP9", "GP5"], + "rows": ["GP3", "GP2", "GP1", "GP0", "GP10", "GP8"] + }, + "processor": "RP2040", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 16], "x": 224, "y": 0, "flags": 4}, + {"matrix": [0, 15], "x": 211, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 198, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 182, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 169, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 156, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 143, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 123, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 110, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 97, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 84, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 65, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 52, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 39, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 26, "y": 0, "flags": 4}, + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1}, + {"matrix": [1, 0], "x": 0, "y": 15, "flags": 4}, + {"matrix": [1, 1], "x": 13, "y": 15, "flags": 4}, + {"matrix": [1, 2], "x": 26, "y": 15, "flags": 4}, + {"matrix": [1, 3], "x": 39, "y": 15, "flags": 4}, + {"matrix": [1, 4], "x": 52, "y": 15, "flags": 4}, + {"matrix": [1, 5], "x": 65, "y": 15, "flags": 4}, + {"matrix": [1, 6], "x": 78, "y": 15, "flags": 4}, + {"matrix": [1, 7], "x": 91, "y": 15, "flags": 4}, + {"matrix": [1, 8], "x": 104, "y": 15, "flags": 4}, + {"matrix": [1, 9], "x": 117, "y": 15, "flags": 4}, + {"matrix": [1, 10], "x": 130, "y": 15, "flags": 4}, + {"matrix": [1, 11], "x": 143, "y": 15, "flags": 4}, + {"matrix": [1, 12], "x": 156, "y": 15, "flags": 4}, + {"matrix": [1, 13], "x": 175, "y": 15, "flags": 1}, + {"matrix": [2, 14], "x": 198, "y": 15, "flags": 4}, + {"matrix": [1, 15], "x": 211, "y": 15, "flags": 4}, + {"matrix": [1, 16], "x": 224, "y": 15, "flags": 4}, + {"matrix": [2, 16], "x": 224, "y": 27, "flags": 4}, + {"matrix": [2, 15], "x": 211, "y": 27, "flags": 4}, + {"matrix": [3, 14], "x": 198, "y": 27, "flags": 4}, + {"matrix": [2, 13], "x": 179, "y": 27, "flags": 4}, + {"matrix": [2, 12], "x": 162, "y": 27, "flags": 4}, + {"matrix": [2, 11], "x": 149, "y": 27, "flags": 4}, + {"matrix": [2, 10], "x": 136, "y": 27, "flags": 4}, + {"matrix": [2, 9], "x": 123, "y": 27, "flags": 4}, + {"matrix": [2, 8], "x": 110, "y": 27, "flags": 4}, + {"matrix": [2, 7], "x": 97, "y": 27, "flags": 4}, + {"matrix": [2, 6], "x": 84, "y": 27, "flags": 4}, + {"matrix": [2, 5], "x": 71, "y": 27, "flags": 4}, + {"matrix": [2, 4], "x": 58, "y": 27, "flags": 4}, + {"matrix": [2, 3], "x": 45, "y": 27, "flags": 4}, + {"matrix": [2, 2], "x": 32, "y": 27, "flags": 4}, + {"matrix": [2, 1], "x": 19, "y": 27, "flags": 4}, + {"matrix": [2, 0], "x": 3, "y": 27, "flags": 1}, + {"matrix": [3, 0], "x": 2, "y": 40, "flags": 1}, + {"matrix": [3, 1], "x": 23, "y": 40, "flags": 4}, + {"matrix": [3, 2], "x": 36, "y": 40, "flags": 4}, + {"matrix": [3, 3], "x": 49, "y": 40, "flags": 4}, + {"matrix": [3, 4], "x": 62, "y": 40, "flags": 4}, + {"matrix": [3, 5], "x": 75, "y": 40, "flags": 4}, + {"matrix": [3, 6], "x": 88, "y": 40, "flags": 4}, + {"matrix": [3, 7], "x": 101, "y": 40, "flags": 4}, + {"matrix": [3, 8], "x": 114, "y": 40, "flags": 4}, + {"matrix": [3, 9], "x": 127, "y": 40, "flags": 4}, + {"matrix": [3, 10], "x": 140, "y": 40, "flags": 4}, + {"matrix": [3, 11], "x": 153, "y": 40, "flags": 4}, + {"matrix": [3, 13], "x": 174, "y": 40, "flags": 1}, + {"matrix": [4, 15], "x": 211, "y": 52, "flags": 1}, + {"matrix": [4, 13], "x": 182, "y": 52, "flags": 4}, + {"matrix": [4, 12], "x": 170, "y": 52, "flags": 1}, + {"matrix": [4, 11], "x": 146, "y": 52, "flags": 4}, + {"matrix": [4, 10], "x": 133, "y": 52, "flags": 4}, + {"matrix": [4, 9], "x": 120, "y": 52, "flags": 4}, + {"matrix": [4, 8], "x": 107, "y": 52, "flags": 4}, + {"matrix": [4, 7], "x": 94, "y": 52, "flags": 4}, + {"matrix": [4, 6], "x": 81, "y": 52, "flags": 4}, + {"matrix": [4, 5], "x": 68, "y": 52, "flags": 4}, + {"matrix": [4, 4], "x": 55, "y": 52, "flags": 4}, + {"matrix": [4, 3], "x": 42, "y": 52, "flags": 4}, + {"matrix": [4, 2], "x": 29, "y": 52, "flags": 4}, + {"matrix": [4, 0], "x": 8, "y": 52, "flags": 1}, + {"matrix": [5, 0], "x": 3, "y": 64, "flags": 1}, + {"matrix": [5, 1], "x": 19, "y": 64, "flags": 1}, + {"matrix": [5, 2], "x": 36, "y": 64, "flags": 1}, + {"x": 62, "y": 64, "flags": 4}, + {"x": 76, "y": 64, "flags": 4}, + {"matrix": [5, 7], "x": 91, "y": 64, "flags": 4}, + {"x": 106, "y": 64, "flags": 4}, + {"x": 120, "y": 64, "flags": 4}, + {"matrix": [5, 11], "x": 146, "y": 64, "flags": 1}, + {"matrix": [5, 12], "x": 162, "y": 64, "flags": 1}, + {"matrix": [5, 13], "x": 179, "y": 64, "flags": 1}, + {"matrix": [5, 14], "x": 198, "y": 64, "flags": 1}, + {"matrix": [5, 15], "x": 211, "y": 64, "flags": 1}, + {"matrix": [5, 16], "x": 224, "y": 64, "flags": 1} + ], + "sleep": true + }, + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0008", + "vid": "0x4552" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP4" + }, + "community_layouts": ["tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift"], + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 11.75, "y": 3.25}, + {"matrix": [3, 11], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/era/linx3/n86/keymaps/default/keymap.c b/keyboards/era/linx3/n86/keymaps/default/keymap.c new file mode 100644 index 00000000000..49ae04a5a79 --- /dev/null +++ b/keyboards/era/linx3/n86/keymaps/default/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2024 QMK (@qmk) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [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_PSCR, KC_SCRL, KC_PAUS, + 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, + 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_DEL , KC_END , KC_PGDN, + 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_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_UP , + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/linx3/n86/keymaps/via/keymap.c b/keyboards/era/linx3/n86/keymaps/via/keymap.c new file mode 100644 index 00000000000..49ae04a5a79 --- /dev/null +++ b/keyboards/era/linx3/n86/keymaps/via/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2024 QMK (@qmk) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [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_PSCR, KC_SCRL, KC_PAUS, + 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, + 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_DEL , KC_END , KC_PGDN, + 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_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_UP , + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/linx3/n86/keymaps/via/rules.mk b/keyboards/era/linx3/n86/keymaps/via/rules.mk new file mode 100644 index 00000000000..036bd6d1c3e --- /dev/null +++ b/keyboards/era/linx3/n86/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/era/linx3/n86/readme.md b/keyboards/era/linx3/n86/readme.md new file mode 100644 index 00000000000..ba681090689 --- /dev/null +++ b/keyboards/era/linx3/n86/readme.md @@ -0,0 +1,23 @@ +# N86 + +* Keyboard Maintainer: [ERA](https://github.com/eerraa) +* Hardware supported: Syryan & Linx3 +* Hardware availability: [Syryan](https://srind.mysoho.com/) & [Linx3](https://allthatkeyboard.com) + +Make example for this keyboard (after setting up your build environment): + + make era/linx3/n86:default + +Flashing example for this keyboard: + + make era/linx3/n86:default: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: + +* **Bootmagic reset**: Hold down the key at ESC(0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly short the `RESET` and `GND` pads on the SWD header twice, or short the `BOOT` header and plug in keyboard +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file diff --git a/keyboards/era/linx3/n86/rules.mk b/keyboards/era/linx3/n86/rules.mk new file mode 100644 index 00000000000..7ff128fa692 --- /dev/null +++ b/keyboards/era/linx3/n86/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file From de4d28cd6065058057535aac168d48bd734f2adc Mon Sep 17 00:00:00 2001 From: era <73109780+eerraa@users.noreply.github.com> Date: Thu, 11 Apr 2024 13:48:32 +0900 Subject: [PATCH 39/40] [Keyboard] Add N8X (#23444) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Duncan Sutherland --- keyboards/era/linx3/n8x/config.h | 14 + keyboards/era/linx3/n8x/halconf.h | 8 + keyboards/era/linx3/n8x/info.json | 1230 +++++++++++++++++ .../era/linx3/n8x/keymaps/default/keymap.c | 24 + keyboards/era/linx3/n8x/keymaps/via/keymap.c | 24 + keyboards/era/linx3/n8x/keymaps/via/rules.mk | 1 + keyboards/era/linx3/n8x/mcuconf.h | 9 + keyboards/era/linx3/n8x/readme.md | 23 + keyboards/era/linx3/n8x/rules.mk | 1 + 9 files changed, 1334 insertions(+) create mode 100644 keyboards/era/linx3/n8x/config.h create mode 100644 keyboards/era/linx3/n8x/halconf.h create mode 100644 keyboards/era/linx3/n8x/info.json create mode 100644 keyboards/era/linx3/n8x/keymaps/default/keymap.c create mode 100644 keyboards/era/linx3/n8x/keymaps/via/keymap.c create mode 100644 keyboards/era/linx3/n8x/keymaps/via/rules.mk create mode 100644 keyboards/era/linx3/n8x/mcuconf.h create mode 100644 keyboards/era/linx3/n8x/readme.md create mode 100644 keyboards/era/linx3/n8x/rules.mk diff --git a/keyboards/era/linx3/n8x/config.h b/keyboards/era/linx3/n8x/config.h new file mode 100644 index 00000000000..b2cffb1151a --- /dev/null +++ b/keyboards/era/linx3/n8x/config.h @@ -0,0 +1,14 @@ +// Copyright 2024 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* Reset */ +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 2000U + +/* BACKLIGHT PWM */ +#define BACKLIGHT_PWM_DRIVER PWMD1 +#define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B + +#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 4 \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/halconf.h b/keyboards/era/linx3/n8x/halconf.h new file mode 100644 index 00000000000..3dbc886a838 --- /dev/null +++ b/keyboards/era/linx3/n8x/halconf.h @@ -0,0 +1,8 @@ +// Copyright 2024 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/info.json b/keyboards/era/linx3/n8x/info.json new file mode 100644 index 00000000000..ae0d608ffa8 --- /dev/null +++ b/keyboards/era/linx3/n8x/info.json @@ -0,0 +1,1230 @@ +{ + "manufacturer": "eerraa", + "keyboard_name": "N8X", + "maintainer": "eerraa", + "backlight": { + "breathing": true, + "breathing_period": 5, + "levels": 10, + "pin": "GP3" + }, + "bootloader": "rp2040", + "build": { + "debounce_type": "sym_defer_pk" + }, + "diode_direction": "COL2ROW", + "features": { + "backlight": true, + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "indicators": { + "caps_lock": "GP11", + "scroll_lock": "GP8" + }, + "matrix_pins": { + "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP22", "GP20", "GP19", "GP18", "GP17", "GP16", "GP21", "GP1", "GP0", "GP2"], + "rows": ["GP4", "GP5", "GP6", "GP7", "GP10", "GP9"] + }, + "processor": "RP2040", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0007", + "vid": "0x4552" + }, + "community_layouts": ["tkl_ansi", "tkl_ansi_split_bs_rshift", "tkl_ansi_tsangan", "tkl_ansi_tsangan_split_bs_rshift", "tkl_iso", "tkl_iso_split_bs_rshift", "tkl_iso_tsangan", "tkl_iso_tsangan_split_bs_rshift"], + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_iso_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_iso_tsangan": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_iso_tsangan_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_iso_wkl": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + } + "LAYOUT_tkl_iso_wkl_split_bs_rshift": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [2, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"matrix": [1, 16], "x": 17.25, "y": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [3, 14], "x": 15.25, "y": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2.25}, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 10], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25}, + {"matrix": [5, 15], "x": 16.25, "y": 5.25}, + {"matrix": [5, 16], "x": 17.25, "y": 5.25} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/keymaps/default/keymap.c b/keyboards/era/linx3/n8x/keymaps/default/keymap.c new file mode 100644 index 00000000000..3dd2571ab86 --- /dev/null +++ b/keyboards/era/linx3/n8x/keymaps/default/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2024 QMK (@qmk) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [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_PSCR, KC_SCRL, KC_PAUS, + 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, + 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_DEL , KC_END , KC_PGDN, + 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_NUHS, 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_UP , + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RGUI, MO(1) , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/keymaps/via/keymap.c b/keyboards/era/linx3/n8x/keymaps/via/keymap.c new file mode 100644 index 00000000000..3dd2571ab86 --- /dev/null +++ b/keyboards/era/linx3/n8x/keymaps/via/keymap.c @@ -0,0 +1,24 @@ +// Copyright 2024 QMK (@qmk) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [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_PSCR, KC_SCRL, KC_PAUS, + 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, + 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_DEL , KC_END , KC_PGDN, + 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_NUHS, 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_UP , + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RGUI, MO(1) , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_all( + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/keymaps/via/rules.mk b/keyboards/era/linx3/n8x/keymaps/via/rules.mk new file mode 100644 index 00000000000..036bd6d1c3e --- /dev/null +++ b/keyboards/era/linx3/n8x/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/mcuconf.h b/keyboards/era/linx3/n8x/mcuconf.h new file mode 100644 index 00000000000..9a4b5b1c61e --- /dev/null +++ b/keyboards/era/linx3/n8x/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2024 Hyojin Bak (@eerraa) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#undef RP_PWM_USE_PWM1 +#define RP_PWM_USE_PWM1 TRUE \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/readme.md b/keyboards/era/linx3/n8x/readme.md new file mode 100644 index 00000000000..b414e149758 --- /dev/null +++ b/keyboards/era/linx3/n8x/readme.md @@ -0,0 +1,23 @@ +# N8X + +* Keyboard Maintainer: [ERA](https://github.com/eerraa) +* Hardware supported: Syryan & Linx3 +* Hardware availability: [Syryan](https://srind.mysoho.com/) & [Linx3](https://allthatkeyboard.com) + +Make example for this keyboard (after setting up your build environment): + + make era/linx3/n8x:default + +Flashing example for this keyboard: + + make era/linx3/n8x:default: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: + +* **Bootmagic reset**: Hold down the key at ESC(0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly short the `RESET` and `GND` pads on the SWD header twice, or short the `BOOT` header and plug in keyboard +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available \ No newline at end of file diff --git a/keyboards/era/linx3/n8x/rules.mk b/keyboards/era/linx3/n8x/rules.mk new file mode 100644 index 00000000000..7ff128fa692 --- /dev/null +++ b/keyboards/era/linx3/n8x/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file From a532d1cc5a785da3d73812330aad95555efb81fa Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 11 Apr 2024 08:29:10 -0700 Subject: [PATCH 40/40] Data-driven Keyboard Conversions: C (#23453) --- keyboards/cannonkeys/aella/info.json | 8 ++++++++ keyboards/cannonkeys/aella/rules.mk | 14 -------------- keyboards/cannonkeys/an_c/info.json | 10 ++++++++++ keyboards/cannonkeys/an_c/rules.mk | 13 ------------- keyboards/cannonkeys/balance/info.json | 9 +++++++++ keyboards/cannonkeys/balance/rules.mk | 15 --------------- keyboards/cannonkeys/brutalv2_65/info.json | 8 ++++++++ keyboards/cannonkeys/brutalv2_65/rules.mk | 14 -------------- keyboards/cannonkeys/cloudline/info.json | 10 ++++++++++ keyboards/cannonkeys/cloudline/rules.mk | 14 -------------- keyboards/cannonkeys/crin/info.json | 9 +++++++++ keyboards/cannonkeys/crin/rules.mk | 14 -------------- keyboards/cannonkeys/db60/info.json | 12 +++++++++++- keyboards/cannonkeys/db60/rules.mk | 13 ------------- keyboards/cannonkeys/devastatingtkl/info.json | 10 ++++++++++ keyboards/cannonkeys/devastatingtkl/rules.mk | 13 ------------- keyboards/cannonkeys/gentoo/info.json | 8 ++++++++ keyboards/cannonkeys/gentoo/rules.mk | 14 -------------- keyboards/cannonkeys/gentoo_hs/info.json | 8 ++++++++ keyboards/cannonkeys/gentoo_hs/rules.mk | 14 -------------- keyboards/cannonkeys/instant60/info.json | 10 ++++++++++ keyboards/cannonkeys/instant60/rules.mk | 13 ------------- keyboards/cannonkeys/instant65/info.json | 10 ++++++++++ keyboards/cannonkeys/instant65/rules.mk | 14 -------------- keyboards/cannonkeys/malicious_ergo/info.json | 10 ++++++++++ keyboards/cannonkeys/malicious_ergo/rules.mk | 14 -------------- keyboards/cannonkeys/obliterated75/info.json | 10 ++++++++++ keyboards/cannonkeys/obliterated75/rules.mk | 14 -------------- keyboards/cannonkeys/onyx/info.json | 9 +++++++++ keyboards/cannonkeys/onyx/rules.mk | 14 -------------- keyboards/cannonkeys/rekt1800/info.json | 9 +++++++++ keyboards/cannonkeys/rekt1800/rules.mk | 13 ------------- keyboards/cannonkeys/sagittarius/info.json | 10 ++++++++++ keyboards/cannonkeys/sagittarius/rules.mk | 14 -------------- keyboards/cannonkeys/savage65/info.json | 10 ++++++++++ keyboards/cannonkeys/savage65/rules.mk | 13 ------------- keyboards/cannonkeys/tmov2/info.json | 10 ++++++++++ keyboards/cannonkeys/tmov2/rules.mk | 13 ------------- keyboards/cannonkeys/tsukuyomi/info.json | 10 ++++++++++ keyboards/cannonkeys/tsukuyomi/rules.mk | 14 -------------- keyboards/cannonkeys/vicious40/info.json | 9 +++++++++ keyboards/cannonkeys/vicious40/rules.mk | 14 -------------- keyboards/centromere/info.json | 8 ++++++++ keyboards/centromere/rules.mk | 13 ------------- .../checkerboards/phoenix45_ortho/info.json | 9 +++++++++ .../checkerboards/phoenix45_ortho/rules.mk | 14 -------------- keyboards/checkerboards/quark/info.json | 10 ++++++++++ keyboards/checkerboards/quark/rules.mk | 16 ---------------- keyboards/checkerboards/quark_squared/info.json | 10 ++++++++++ keyboards/checkerboards/quark_squared/rules.mk | 14 -------------- .../snop60/{info.json => keyboard.json} | 13 +++++++++++++ keyboards/checkerboards/snop60/rules.mk | 13 ------------- .../str_merro60/{info.json => keyboard.json} | 8 ++++++++ keyboards/chlx/str_merro60/rules.mk | 14 -------------- .../cipulot/kawayo/{info.json => keyboard.json} | 11 ++++++++++- keyboards/cipulot/kawayo/rules.mk | 14 -------------- .../prototype/{info.json => keyboard.json} | 3 +++ .../clueboard/66_hotswap/prototype/rules.mk | 1 - .../coarse/ixora/{info.json => keyboard.json} | 6 ++++++ keyboards/coarse/ixora/rules.mk | 10 ---------- .../coarse/vinta/{info.json => keyboard.json} | 6 ++++++ keyboards/coarse/vinta/rules.mk | 10 ---------- keyboards/controllerworks/city42/info.json | 5 +++-- keyboards/controllerworks/city42/rules.mk | 3 +-- keyboards/converter/adb_usb/info.json | 5 +++++ keyboards/converter/adb_usb/rules.mk | 12 ------------ keyboards/converter/hp_46010a/info.json | 7 +++++++ keyboards/converter/hp_46010a/rules.mk | 13 ------------- keyboards/converter/ibm_terminal/info.json | 7 +++++++ keyboards/converter/ibm_terminal/rules.mk | 13 ------------- keyboards/converter/m0110_usb/info.json | 7 +++++++ keyboards/converter/m0110_usb/rules.mk | 11 ----------- keyboards/converter/palm_usb/info.json | 9 ++++++++- keyboards/converter/palm_usb/rules.mk | 12 ------------ .../periboard_512/{info.json => keyboard.json} | 5 +++++ keyboards/converter/periboard_512/rules.mk | 12 ------------ keyboards/converter/siemens_tastatur/info.json | 9 +++++++++ keyboards/converter/siemens_tastatur/rules.mk | 17 +---------------- keyboards/converter/sun_usb/info.json | 10 +++++++++- keyboards/converter/sun_usb/rules.mk | 12 ------------ keyboards/converter/xt_usb/info.json | 8 ++++++++ keyboards/converter/xt_usb/rules.mk | 12 ------------ keyboards/coseyfannitutti/discipline/info.json | 5 +++++ keyboards/coseyfannitutti/discipline/rules.mk | 13 ------------- keyboards/coseyfannitutti/mysterium/info.json | 5 +++++ keyboards/coseyfannitutti/mysterium/rules.mk | 13 ------------- keyboards/cozykeys/speedo/v3/info.json | 6 ++++++ keyboards/cozykeys/speedo/v3/rules.mk | 13 ------------- keyboards/crimsonkeyboards/resume1800/info.json | 5 +++++ keyboards/crimsonkeyboards/resume1800/rules.mk | 13 ------------- keyboards/crypt_macro/info.json | 7 +++++++ keyboards/crypt_macro/rules.mk | 13 ------------- keyboards/custommk/genesis/rev1/keyboard.json | 8 ++++++++ .../genesis/rev2/{info.json => keyboard.json} | 8 ++++++++ keyboards/custommk/genesis/rev2/rules.mk | 13 ------------- keyboards/custommk/genesis/rules.mk | 14 -------------- 96 files changed, 395 insertions(+), 620 deletions(-) rename keyboards/checkerboards/snop60/{info.json => keyboard.json} (96%) delete mode 100644 keyboards/checkerboards/snop60/rules.mk rename keyboards/chlx/str_merro60/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/chlx/str_merro60/rules.mk rename keyboards/cipulot/kawayo/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/cipulot/kawayo/rules.mk rename keyboards/clueboard/66_hotswap/prototype/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/clueboard/66_hotswap/prototype/rules.mk rename keyboards/coarse/ixora/{info.json => keyboard.json} (93%) delete mode 100644 keyboards/coarse/ixora/rules.mk rename keyboards/coarse/vinta/{info.json => keyboard.json} (99%) delete mode 100644 keyboards/coarse/vinta/rules.mk rename keyboards/converter/periboard_512/{info.json => keyboard.json} (98%) delete mode 100644 keyboards/converter/periboard_512/rules.mk rename keyboards/custommk/genesis/rev2/{info.json => keyboard.json} (95%) delete mode 100644 keyboards/custommk/genesis/rev2/rules.mk diff --git a/keyboards/cannonkeys/aella/info.json b/keyboards/cannonkeys/aella/info.json index 0cab7223380..54679d57921 100644 --- a/keyboards/cannonkeys/aella/info.json +++ b/keyboards/cannonkeys/aella/info.json @@ -15,6 +15,14 @@ "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/aella/rules.mk b/keyboards/cannonkeys/aella/rules.mk index 480e8661799..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/aella/rules.mk +++ b/keyboards/cannonkeys/aella/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/info.json index 9de1ff5fff6..e1e18f51670 100644 --- a/keyboards/cannonkeys/an_c/info.json +++ b/keyboards/cannonkeys/an_c/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["60_ansi", "60_tsangan_hhkb"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/cannonkeys/an_c/rules.mk b/keyboards/cannonkeys/an_c/rules.mk index 8d3de1b8b23..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/an_c/rules.mk +++ b/keyboards/cannonkeys/an_c/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes - diff --git a/keyboards/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/info.json index 9565795169c..c7ecea37f8e 100644 --- a/keyboards/cannonkeys/balance/info.json +++ b/keyboards/cannonkeys/balance/info.json @@ -28,6 +28,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "encoder": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/balance/rules.mk b/keyboards/cannonkeys/balance/rules.mk index 5afdd3772f5..04fe1eba2ac 100644 --- a/keyboards/cannonkeys/balance/rules.mk +++ b/keyboards/cannonkeys/balance/rules.mk @@ -1,17 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - diff --git a/keyboards/cannonkeys/brutalv2_65/info.json b/keyboards/cannonkeys/brutalv2_65/info.json index 0eddf11aaa5..4cff1a7571f 100644 --- a/keyboards/cannonkeys/brutalv2_65/info.json +++ b/keyboards/cannonkeys/brutalv2_65/info.json @@ -19,6 +19,14 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "community_layouts": [ "65_ansi_blocker", "65_ansi_blocker_split_bs", diff --git a/keyboards/cannonkeys/brutalv2_65/rules.mk b/keyboards/cannonkeys/brutalv2_65/rules.mk index 480e8661799..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/brutalv2_65/rules.mk +++ b/keyboards/cannonkeys/brutalv2_65/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json index d1bbce929a1..ac1bca976b1 100644 --- a/keyboards/cannonkeys/cloudline/info.json +++ b/keyboards/cannonkeys/cloudline/info.json @@ -44,6 +44,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": [ "tkl_f13_ansi_tsangan", "tkl_f13_ansi_tsangan_split_bs_rshift", diff --git a/keyboards/cannonkeys/cloudline/rules.mk b/keyboards/cannonkeys/cloudline/rules.mk index 86794ca0f70..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/cloudline/rules.mk +++ b/keyboards/cannonkeys/cloudline/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/info.json index a8468b3ed33..f61d0e12e5b 100644 --- a/keyboards/cannonkeys/crin/info.json +++ b/keyboards/cannonkeys/crin/info.json @@ -24,6 +24,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT" }, diff --git a/keyboards/cannonkeys/crin/rules.mk b/keyboards/cannonkeys/crin/rules.mk index a5906b6a90f..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/crin/rules.mk +++ b/keyboards/cannonkeys/crin/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json index 112ebaddde7..0c437ed921f 100644 --- a/keyboards/cannonkeys/db60/info.json +++ b/keyboards/cannonkeys/db60/info.json @@ -36,5 +36,15 @@ "driver": "spi" }, "processor": "STM32F072", - "bootloader": "stm32-dfu" + "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + } } diff --git a/keyboards/cannonkeys/db60/rules.mk b/keyboards/cannonkeys/db60/rules.mk index 023b329ad22..60addd7fe72 100644 --- a/keyboards/cannonkeys/db60/rules.mk +++ b/keyboards/cannonkeys/db60/rules.mk @@ -1,17 +1,4 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes - DEFAULT_FOLDER = cannonkeys/db60/rev2 - diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/info.json index a3b269f1cfe..7acea3fe8b1 100644 --- a/keyboards/cannonkeys/devastatingtkl/info.json +++ b/keyboards/cannonkeys/devastatingtkl/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": [ "tkl_f13_ansi", "tkl_f13_ansi_split_bs_rshift", diff --git a/keyboards/cannonkeys/devastatingtkl/rules.mk b/keyboards/cannonkeys/devastatingtkl/rules.mk index 8d3de1b8b23..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/devastatingtkl/rules.mk +++ b/keyboards/cannonkeys/devastatingtkl/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes - diff --git a/keyboards/cannonkeys/gentoo/info.json b/keyboards/cannonkeys/gentoo/info.json index a371ae42320..3d8a4acac93 100644 --- a/keyboards/cannonkeys/gentoo/info.json +++ b/keyboards/cannonkeys/gentoo/info.json @@ -19,6 +19,14 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "community_layouts": [ "65_ansi", "65_ansi_split_bs", diff --git a/keyboards/cannonkeys/gentoo/rules.mk b/keyboards/cannonkeys/gentoo/rules.mk index 480e8661799..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/gentoo/rules.mk +++ b/keyboards/cannonkeys/gentoo/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/gentoo_hs/info.json b/keyboards/cannonkeys/gentoo_hs/info.json index ef496628dac..fa97ae58772 100644 --- a/keyboards/cannonkeys/gentoo_hs/info.json +++ b/keyboards/cannonkeys/gentoo_hs/info.json @@ -19,6 +19,14 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "layout_aliases": { "LAYOUT_default": "LAYOUT_65_ansi_rwkl" }, diff --git a/keyboards/cannonkeys/gentoo_hs/rules.mk b/keyboards/cannonkeys/gentoo_hs/rules.mk index 4ee7a29916a..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/gentoo_hs/rules.mk +++ b/keyboards/cannonkeys/gentoo_hs/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/info.json index 355ae99f0c9..bca90e50157 100644 --- a/keyboards/cannonkeys/instant60/info.json +++ b/keyboards/cannonkeys/instant60/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["60_ansi", "60_tsangan_hhkb"], "layouts": { "LAYOUT_60_ansi": { diff --git a/keyboards/cannonkeys/instant60/rules.mk b/keyboards/cannonkeys/instant60/rules.mk index 8d3de1b8b23..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/instant60/rules.mk +++ b/keyboards/cannonkeys/instant60/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes - diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/info.json index 3c447a4bd3e..63e84be0aa4 100644 --- a/keyboards/cannonkeys/instant65/info.json +++ b/keyboards/cannonkeys/instant65/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/instant65/rules.mk b/keyboards/cannonkeys/instant65/rules.mk index 86794ca0f70..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/instant65/rules.mk +++ b/keyboards/cannonkeys/instant65/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json index d5941f5f969..3897aea08b9 100644 --- a/keyboards/cannonkeys/malicious_ergo/info.json +++ b/keyboards/cannonkeys/malicious_ergo/info.json @@ -45,6 +45,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/malicious_ergo/rules.mk b/keyboards/cannonkeys/malicious_ergo/rules.mk index 86794ca0f70..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/malicious_ergo/rules.mk +++ b/keyboards/cannonkeys/malicious_ergo/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/info.json index d831eb1aca5..19227c51507 100644 --- a/keyboards/cannonkeys/obliterated75/info.json +++ b/keyboards/cannonkeys/obliterated75/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/obliterated75/rules.mk b/keyboards/cannonkeys/obliterated75/rules.mk index 86794ca0f70..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/obliterated75/rules.mk +++ b/keyboards/cannonkeys/obliterated75/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/onyx/info.json b/keyboards/cannonkeys/onyx/info.json index 8be4673df4b..5ae7039049a 100644 --- a/keyboards/cannonkeys/onyx/info.json +++ b/keyboards/cannonkeys/onyx/info.json @@ -20,6 +20,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/onyx/rules.mk b/keyboards/cannonkeys/onyx/rules.mk index a5906b6a90f..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/onyx/rules.mk +++ b/keyboards/cannonkeys/onyx/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/rekt1800/info.json b/keyboards/cannonkeys/rekt1800/info.json index 889ff5eff92..f9a58afa020 100644 --- a/keyboards/cannonkeys/rekt1800/info.json +++ b/keyboards/cannonkeys/rekt1800/info.json @@ -20,6 +20,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/cannonkeys/rekt1800/rules.mk b/keyboards/cannonkeys/rekt1800/rules.mk index 01d0c0ade11..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/rekt1800/rules.mk +++ b/keyboards/cannonkeys/rekt1800/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = no - diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json index d9236b39056..876c68e82e2 100644 --- a/keyboards/cannonkeys/sagittarius/info.json +++ b/keyboards/cannonkeys/sagittarius/info.json @@ -44,6 +44,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/sagittarius/rules.mk b/keyboards/cannonkeys/sagittarius/rules.mk index 86794ca0f70..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/sagittarius/rules.mk +++ b/keyboards/cannonkeys/sagittarius/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/info.json index 0c2409713b9..9d7d454e550 100644 --- a/keyboards/cannonkeys/savage65/info.json +++ b/keyboards/cannonkeys/savage65/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker"], "layouts": { "LAYOUT_default": { diff --git a/keyboards/cannonkeys/savage65/rules.mk b/keyboards/cannonkeys/savage65/rules.mk index 8d3de1b8b23..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/savage65/rules.mk +++ b/keyboards/cannonkeys/savage65/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes - diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/info.json index ed834c73cd9..acc5093221d 100644 --- a/keyboards/cannonkeys/tmov2/info.json +++ b/keyboards/cannonkeys/tmov2/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/tmov2/rules.mk b/keyboards/cannonkeys/tmov2/rules.mk index 8d3de1b8b23..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/tmov2/rules.mk +++ b/keyboards/cannonkeys/tmov2/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes -RGBLIGHT_ENABLE = yes - diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/info.json index 3542bca1f6b..a874d3d2935 100644 --- a/keyboards/cannonkeys/tsukuyomi/info.json +++ b/keyboards/cannonkeys/tsukuyomi/info.json @@ -39,6 +39,16 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/tsukuyomi/rules.mk b/keyboards/cannonkeys/tsukuyomi/rules.mk index 86794ca0f70..0ab54aaaf71 100644 --- a/keyboards/cannonkeys/tsukuyomi/rules.mk +++ b/keyboards/cannonkeys/tsukuyomi/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/cannonkeys/vicious40/info.json b/keyboards/cannonkeys/vicious40/info.json index d6669155cfc..b2d68545f0b 100644 --- a/keyboards/cannonkeys/vicious40/info.json +++ b/keyboards/cannonkeys/vicious40/info.json @@ -20,6 +20,15 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "backlight": true + }, "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/cannonkeys/vicious40/rules.mk b/keyboards/cannonkeys/vicious40/rules.mk index 9d14eaf9aa0..04fe1eba2ac 100644 --- a/keyboards/cannonkeys/vicious40/rules.mk +++ b/keyboards/cannonkeys/vicious40/rules.mk @@ -1,16 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/centromere/info.json b/keyboards/centromere/info.json index 280ab8bd7e4..c190bd84d71 100644 --- a/keyboards/centromere/info.json +++ b/keyboards/centromere/info.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "unicode": true + }, "community_layouts": ["split_3x5_3", "split_3x6_3"], "layout_aliases": { "LAYOUT": "LAYOUT_split_3x6_3" diff --git a/keyboards/centromere/rules.mk b/keyboards/centromere/rules.mk index 26081e41321..0bb4817a8bd 100644 --- a/keyboards/centromere/rules.mk +++ b/keyboards/centromere/rules.mk @@ -1,19 +1,6 @@ # Processor frequency F_CPU = 8000000 -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes CUSTOM_MATRIX = lite # project specific files diff --git a/keyboards/checkerboards/phoenix45_ortho/info.json b/keyboards/checkerboards/phoenix45_ortho/info.json index 5bd7c644cff..43565b98529 100644 --- a/keyboards/checkerboards/phoenix45_ortho/info.json +++ b/keyboards/checkerboards/phoenix45_ortho/info.json @@ -20,6 +20,15 @@ }, "processor": "atmega32u2", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "command": true, + "nkro": true, + "unicode": true, + "encoder": true + }, "layouts": { "LAYOUT_ortho_2x225u": { "layout": [ diff --git a/keyboards/checkerboards/phoenix45_ortho/rules.mk b/keyboards/checkerboards/phoenix45_ortho/rules.mk index 634fd79c1de..4df55cd2206 100644 --- a/keyboards/checkerboards/phoenix45_ortho/rules.mk +++ b/keyboards/checkerboards/phoenix45_ortho/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes # Unicode -ENCODER_ENABLE = yes # Encoder enable - # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/checkerboards/quark/info.json b/keyboards/checkerboards/quark/info.json index ca844603484..22fa758e7ed 100644 --- a/keyboards/checkerboards/quark/info.json +++ b/keyboards/checkerboards/quark/info.json @@ -41,6 +41,16 @@ }, "processor": "atmega32u2", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true, + "unicode": true, + "encoder": true + }, "community_layouts": ["ortho_4x12", "planck_mit"], "layouts": { "LAYOUT_ortho_5x12_2x225u": { diff --git a/keyboards/checkerboards/quark/rules.mk b/keyboards/checkerboards/quark/rules.mk index 2dd2e10d801..4df55cd2206 100644 --- a/keyboards/checkerboards/quark/rules.mk +++ b/keyboards/checkerboards/quark/rules.mk @@ -1,19 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes # Unicode -ENCODER_ENABLE = yes # Enable Rotary Encoders - - # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/info.json index a47253d5b4a..e242bfc5d9a 100644 --- a/keyboards/checkerboards/quark_squared/info.json +++ b/keyboards/checkerboards/quark_squared/info.json @@ -41,6 +41,16 @@ }, "processor": "atmega32u2", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true, + "command": true, + "nkro": true, + "rgblight": true, + "unicode": true, + "encoder": true + }, "layouts": { "LAYOUT_4_2x225u": { "layout": [ diff --git a/keyboards/checkerboards/quark_squared/rules.mk b/keyboards/checkerboards/quark_squared/rules.mk index 88b0022c5fd..4df55cd2206 100644 --- a/keyboards/checkerboards/quark_squared/rules.mk +++ b/keyboards/checkerboards/quark_squared/rules.mk @@ -1,17 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes # Unicode -ENCODER_ENABLE = yes # Enable Rotary Encoders # Disable unsupported hardware AUDIO_SUPPORTED = no BACKLIGHT_SUPPORTED = no diff --git a/keyboards/checkerboards/snop60/info.json b/keyboards/checkerboards/snop60/keyboard.json similarity index 96% rename from keyboards/checkerboards/snop60/info.json rename to keyboards/checkerboards/snop60/keyboard.json index f88186faddc..60b22caf76a 100644 --- a/keyboards/checkerboards/snop60/info.json +++ b/keyboards/checkerboards/snop60/keyboard.json @@ -47,6 +47,19 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "build": { + "lto": true + }, + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "command": true, + "nkro": true, + "backlight": true, + "rgblight": true, + "encoder": true + }, "layout_aliases": { "LAYOUT_7u": "LAYOUT_60_ansi_tsangan_split_bs_rshift", "LAYOUT_2x3u": "LAYOUT_60_ansi_tsangan_split_bs_rshift_space" diff --git a/keyboards/checkerboards/snop60/rules.mk b/keyboards/checkerboards/snop60/rules.mk deleted file mode 100644 index d24c9861b4d..00000000000 --- a/keyboards/checkerboards/snop60/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENBALE = yes # Enable Rotary Encoders diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/keyboard.json similarity index 99% rename from keyboards/chlx/str_merro60/info.json rename to keyboards/chlx/str_merro60/keyboard.json index 89fdd4baa12..15903f2f6cb 100644 --- a/keyboards/chlx/str_merro60/info.json +++ b/keyboards/chlx/str_merro60/keyboard.json @@ -36,12 +36,20 @@ "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "layout_aliases": { "LAYOUT_default": "LAYOUT_all", "LAYOUT_hhkb": "LAYOUT_60_hhkb", "LAYOUT_iso": "LAYOUT_60_iso_split_bs_rshift", "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb" }, + "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_hhkb", "60_iso", "60_tsangan_hhkb"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/chlx/str_merro60/rules.mk b/keyboards/chlx/str_merro60/rules.mk deleted file mode 100644 index 9cceab1f746..00000000000 --- a/keyboards/chlx/str_merro60/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - -Layouts = 60_ansi 60_ansi_split_bs_rshift 60_hhkb 60_iso 60_tsangan_hhkb diff --git a/keyboards/cipulot/kawayo/info.json b/keyboards/cipulot/kawayo/keyboard.json similarity index 99% rename from keyboards/cipulot/kawayo/info.json rename to keyboards/cipulot/kawayo/keyboard.json index 85a5f81c2b3..ac4d24b9b53 100644 --- a/keyboards/cipulot/kawayo/info.json +++ b/keyboards/cipulot/kawayo/keyboard.json @@ -6,7 +6,10 @@ "usb": { "vid": "0x6369", "pid": "0x6B7F", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "matrix_pins": { "cols": ["B10", "A0", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A4", "A3", "A2", "A1"], @@ -15,6 +18,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs" }, diff --git a/keyboards/cipulot/kawayo/rules.mk b/keyboards/cipulot/kawayo/rules.mk deleted file mode 100644 index fbab9885cdb..00000000000 --- a/keyboards/cipulot/kawayo/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -KEYBOARD_SHARED_EP = yes - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/keyboard.json similarity index 99% rename from keyboards/clueboard/66_hotswap/prototype/info.json rename to keyboards/clueboard/66_hotswap/prototype/keyboard.json index 2ef1fbec1eb..9d0b0dd27c7 100644 --- a/keyboards/clueboard/66_hotswap/prototype/info.json +++ b/keyboards/clueboard/66_hotswap/prototype/keyboard.json @@ -16,6 +16,9 @@ "nkro": true, "rgblight": true }, + "build": { + "lto": true + }, "indicators": { "caps_lock": "B4" }, diff --git a/keyboards/clueboard/66_hotswap/prototype/rules.mk b/keyboards/clueboard/66_hotswap/prototype/rules.mk deleted file mode 100644 index 4da205a168c..00000000000 --- a/keyboards/clueboard/66_hotswap/prototype/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes diff --git a/keyboards/coarse/ixora/info.json b/keyboards/coarse/ixora/keyboard.json similarity index 93% rename from keyboards/coarse/ixora/info.json rename to keyboards/coarse/ixora/keyboard.json index 8d51f1e9272..33ba2270acf 100644 --- a/keyboards/coarse/ixora/info.json +++ b/keyboards/coarse/ixora/keyboard.json @@ -20,6 +20,12 @@ }, "processor": "STM32F042", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "debounce": 0, "layouts": { "LAYOUT_full": { diff --git a/keyboards/coarse/ixora/rules.mk b/keyboards/coarse/ixora/rules.mk deleted file mode 100644 index 285aeb82028..00000000000 --- a/keyboards/coarse/ixora/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = no -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover diff --git a/keyboards/coarse/vinta/info.json b/keyboards/coarse/vinta/keyboard.json similarity index 99% rename from keyboards/coarse/vinta/info.json rename to keyboards/coarse/vinta/keyboard.json index 3dd9898f1aa..df9aa7e5a18 100644 --- a/keyboards/coarse/vinta/info.json +++ b/keyboards/coarse/vinta/keyboard.json @@ -15,6 +15,12 @@ "diode_direction": "COL2ROW", "processor": "STM32F042", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true + }, "debounce": 0, "community_layouts": ["65_ansi_blocker"], "layout_aliases": { diff --git a/keyboards/coarse/vinta/rules.mk b/keyboards/coarse/vinta/rules.mk deleted file mode 100644 index 285aeb82028..00000000000 --- a/keyboards/coarse/vinta/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Build Options -# change yes to no to disable -# -BACKLIGHT_ENABLE = no -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover diff --git a/keyboards/controllerworks/city42/info.json b/keyboards/controllerworks/city42/info.json index bff73f7e6ff..6657a7485b1 100644 --- a/keyboards/controllerworks/city42/info.json +++ b/keyboards/controllerworks/city42/info.json @@ -14,7 +14,8 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgb_matrix": true + "rgb_matrix": true, + "pointing_device": true }, "matrix_pins": { "cols": ["GP28", "GP27", "GP26", "GP25", "GP24", "GP23", "GP0", "GP1", "GP2", "GP3", "GP4", "GP5"], @@ -174,4 +175,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/controllerworks/city42/rules.mk b/keyboards/controllerworks/city42/rules.mk index 2e0f2befbf4..fb5d6497359 100644 --- a/keyboards/controllerworks/city42/rules.mk +++ b/keyboards/controllerworks/city42/rules.mk @@ -1,2 +1 @@ -POINTING_DEVICE_ENABLE = yes -POINTING_DEVICE_DRIVER = cirque_pinnacle_spi \ No newline at end of file +POINTING_DEVICE_DRIVER = cirque_pinnacle_spi diff --git a/keyboards/converter/adb_usb/info.json b/keyboards/converter/adb_usb/info.json index b553dfc10ff..47467a97c72 100644 --- a/keyboards/converter/adb_usb/info.json +++ b/keyboards/converter/adb_usb/info.json @@ -8,6 +8,11 @@ "pid": "0x0ADB", "device_version": "1.0.1" }, + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true + }, "layouts": { "LAYOUT_ext_ansi": { "layout": [ diff --git a/keyboards/converter/adb_usb/rules.mk b/keyboards/converter/adb_usb/rules.mk index 4e4d068a704..28df56c337d 100644 --- a/keyboards/converter/adb_usb/rules.mk +++ b/keyboards/converter/adb_usb/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = yes SRC += matrix.c adb.c led.c diff --git a/keyboards/converter/hp_46010a/info.json b/keyboards/converter/hp_46010a/info.json index da29c72fac7..0296bda5e98 100644 --- a/keyboards/converter/hp_46010a/info.json +++ b/keyboards/converter/hp_46010a/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "nkro": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/hp_46010a/rules.mk b/keyboards/converter/hp_46010a/rules.mk index 104381f12fc..3c6124d20ab 100644 --- a/keyboards/converter/hp_46010a/rules.mk +++ b/keyboards/converter/hp_46010a/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -SPLIT_KEYBOARD = no WAIT_FOR_USB = yes CUSTOM_MATRIX = yes diff --git a/keyboards/converter/ibm_terminal/info.json b/keyboards/converter/ibm_terminal/info.json index 39840eb6276..b95ea58d206 100644 --- a/keyboards/converter/ibm_terminal/info.json +++ b/keyboards/converter/ibm_terminal/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "nkro": true, + "ps2": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/ibm_terminal/rules.mk b/keyboards/converter/ibm_terminal/rules.mk index c04e7e01a47..038d8da5a2f 100644 --- a/keyboards/converter/ibm_terminal/rules.mk +++ b/keyboards/converter/ibm_terminal/rules.mk @@ -1,16 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -PS2_ENABLE = yes PS2_DRIVER = usart CUSTOM_MATRIX = yes diff --git a/keyboards/converter/m0110_usb/info.json b/keyboards/converter/m0110_usb/info.json index 1869d2dacb8..522f83caba1 100644 --- a/keyboards/converter/m0110_usb/info.json +++ b/keyboards/converter/m0110_usb/info.json @@ -10,6 +10,13 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "console": true, + "extrakey": true, + "usb_hid": true + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/converter/m0110_usb/rules.mk b/keyboards/converter/m0110_usb/rules.mk index a9dc1a9e499..7021c1052a2 100644 --- a/keyboards/converter/m0110_usb/rules.mk +++ b/keyboards/converter/m0110_usb/rules.mk @@ -1,17 +1,6 @@ # Processor frequency F_CPU = 8000000 -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -EXTRAKEY_ENABLE = yes -USB_HID_ENABLE = yes -BACKLIGHT_ENABLE = no CUSTOM_MATRIX = yes SRC = matrix.c m0110.c diff --git a/keyboards/converter/palm_usb/info.json b/keyboards/converter/palm_usb/info.json index 2fe66720ec7..c5b893d7576 100644 --- a/keyboards/converter/palm_usb/info.json +++ b/keyboards/converter/palm_usb/info.json @@ -9,5 +9,12 @@ "device_version": "1.0.0" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false, + "console": true, + "command": true + } } diff --git a/keyboards/converter/palm_usb/rules.mk b/keyboards/converter/palm_usb/rules.mk index 72d9daf6d9a..bdb3bb0d6bb 100644 --- a/keyboards/converter/palm_usb/rules.mk +++ b/keyboards/converter/palm_usb/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. #HARDWARE_SERIAL = yes CUSTOM_MATRIX = yes diff --git a/keyboards/converter/periboard_512/info.json b/keyboards/converter/periboard_512/keyboard.json similarity index 98% rename from keyboards/converter/periboard_512/info.json rename to keyboards/converter/periboard_512/keyboard.json index 08cc8ee9bf3..b3359314931 100644 --- a/keyboards/converter/periboard_512/info.json +++ b/keyboards/converter/periboard_512/keyboard.json @@ -10,6 +10,11 @@ }, "processor": "at90usb1286", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": false + }, "diode_direction": "ROW2COL", "matrix_pins": { "cols": ["B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"], diff --git a/keyboards/converter/periboard_512/rules.mk b/keyboards/converter/periboard_512/rules.mk deleted file mode 100644 index 1eeda920b40..00000000000 --- a/keyboards/converter/periboard_512/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/converter/siemens_tastatur/info.json b/keyboards/converter/siemens_tastatur/info.json index 8ed2523c260..571d06a5c31 100644 --- a/keyboards/converter/siemens_tastatur/info.json +++ b/keyboards/converter/siemens_tastatur/info.json @@ -10,6 +10,15 @@ }, "processor": "STM32F103", "bootloader": "stm32duino", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true, + "sleep_led": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/converter/siemens_tastatur/rules.mk b/keyboards/converter/siemens_tastatur/rules.mk index 1bc8ee188b8..3215e3588a3 100644 --- a/keyboards/converter/siemens_tastatur/rules.mk +++ b/keyboards/converter/siemens_tastatur/rules.mk @@ -1,17 +1,2 @@ -SRC = matrix.c - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no -RGBLIGHT_ENABLE = no -SLEEP_LED_ENABLE = yes CUSTOM_MATRIX = yes - - +SRC = matrix.c diff --git a/keyboards/converter/sun_usb/info.json b/keyboards/converter/sun_usb/info.json index a243a64da25..e4031595ad3 100644 --- a/keyboards/converter/sun_usb/info.json +++ b/keyboards/converter/sun_usb/info.json @@ -9,5 +9,13 @@ "device_version": "1.0.0" }, "processor": "atmega32u4", - "bootloader": "lufa-dfu" + "bootloader": "lufa-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + } } diff --git a/keyboards/converter/sun_usb/rules.mk b/keyboards/converter/sun_usb/rules.mk index ae20f51b37e..d3ec00c5d5f 100644 --- a/keyboards/converter/sun_usb/rules.mk +++ b/keyboards/converter/sun_usb/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. #HARDWARE_SERIAL = yes CUSTOM_MATRIX = yes diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/info.json index 1c9bcf5e345..649b2833292 100644 --- a/keyboards/converter/xt_usb/info.json +++ b/keyboards/converter/xt_usb/info.json @@ -10,6 +10,14 @@ }, "processor": "atmega32u4", "bootloader": "halfkay", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "console": true, + "command": true, + "nkro": true + }, "layouts": { "LAYOUT_xt": { "layout": [ diff --git a/keyboards/converter/xt_usb/rules.mk b/keyboards/converter/xt_usb/rules.mk index f98bdcc5d35..3fd6b1cfa65 100644 --- a/keyboards/converter/xt_usb/rules.mk +++ b/keyboards/converter/xt_usb/rules.mk @@ -1,15 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = yes SRC += matrix.c xt_interrupt.c diff --git a/keyboards/coseyfannitutti/discipline/info.json b/keyboards/coseyfannitutti/discipline/info.json index 82da2f800f7..1fb94c7052c 100644 --- a/keyboards/coseyfannitutti/discipline/info.json +++ b/keyboards/coseyfannitutti/discipline/info.json @@ -16,6 +16,11 @@ "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "layout_aliases": { "LAYOUT_65_ansi_2_right_mods": "LAYOUT_65_ansi_blocker", "LAYOUT_65_iso_2_right_mods": "LAYOUT_65_iso_blocker", diff --git a/keyboards/coseyfannitutti/discipline/rules.mk b/keyboards/coseyfannitutti/discipline/rules.mk index 18550f0a64d..c2ee0bc86f9 100644 --- a/keyboards/coseyfannitutti/discipline/rules.mk +++ b/keyboards/coseyfannitutti/discipline/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/coseyfannitutti/mysterium/info.json b/keyboards/coseyfannitutti/mysterium/info.json index ff6e2de22b0..0d75d192293 100644 --- a/keyboards/coseyfannitutti/mysterium/info.json +++ b/keyboards/coseyfannitutti/mysterium/info.json @@ -15,6 +15,11 @@ "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": false, + "extrakey": true + }, "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/coseyfannitutti/mysterium/rules.mk b/keyboards/coseyfannitutti/mysterium/rules.mk index b6082e107ce..c2ee0bc86f9 100644 --- a/keyboards/coseyfannitutti/mysterium/rules.mk +++ b/keyboards/coseyfannitutti/mysterium/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json index 3a084b04baa..7636d9b702f 100644 --- a/keyboards/cozykeys/speedo/v3/info.json +++ b/keyboards/cozykeys/speedo/v3/info.json @@ -36,6 +36,12 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "features": { + "bootmagic": false, + "mousekey": true, + "extrakey": true, + "rgblight": true + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/cozykeys/speedo/v3/rules.mk b/keyboards/cozykeys/speedo/v3/rules.mk index 78ff4d5d60e..baf23318ccd 100644 --- a/keyboards/cozykeys/speedo/v3/rules.mk +++ b/keyboards/cozykeys/speedo/v3/rules.mk @@ -1,14 +1 @@ PIN_COMPATIBLE = elite_c - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/crimsonkeyboards/resume1800/info.json b/keyboards/crimsonkeyboards/resume1800/info.json index 23257be46e5..f88b7032086 100644 --- a/keyboards/crimsonkeyboards/resume1800/info.json +++ b/keyboards/crimsonkeyboards/resume1800/info.json @@ -20,6 +20,11 @@ }, "processor": "atmega32a", "bootloader": "usbasploader", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true + }, "layout_aliases": { "LAYOUT_resume1800_ansi_all": "LAYOUT_ansi_all", "LAYOUT_resume1800_iso_all": "LAYOUT_iso_all" diff --git a/keyboards/crimsonkeyboards/resume1800/rules.mk b/keyboards/crimsonkeyboards/resume1800/rules.mk index 18550f0a64d..c2ee0bc86f9 100644 --- a/keyboards/crimsonkeyboards/resume1800/rules.mk +++ b/keyboards/crimsonkeyboards/resume1800/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/crypt_macro/info.json b/keyboards/crypt_macro/info.json index 1b340ff74f6..e8771e363e6 100644 --- a/keyboards/crypt_macro/info.json +++ b/keyboards/crypt_macro/info.json @@ -31,6 +31,13 @@ }, "processor": "STM32F072", "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true + }, "matrix_pins": { "direct": [ ["B12", "B6", "B7"], diff --git a/keyboards/crypt_macro/rules.mk b/keyboards/crypt_macro/rules.mk index cc9d7bb3f53..0ab54aaaf71 100644 --- a/keyboards/crypt_macro/rules.mk +++ b/keyboards/crypt_macro/rules.mk @@ -1,15 +1,2 @@ # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -v FFFF -p FFFF - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/custommk/genesis/rev1/keyboard.json b/keyboards/custommk/genesis/rev1/keyboard.json index f859a6b9bf3..7025834d91b 100644 --- a/keyboards/custommk/genesis/rev1/keyboard.json +++ b/keyboards/custommk/genesis/rev1/keyboard.json @@ -45,6 +45,14 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "encoder": true + }, "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/keyboard.json similarity index 95% rename from keyboards/custommk/genesis/rev2/info.json rename to keyboards/custommk/genesis/rev2/keyboard.json index 5760ba52cdc..d56cdb9df5e 100644 --- a/keyboards/custommk/genesis/rev2/info.json +++ b/keyboards/custommk/genesis/rev2/keyboard.json @@ -45,6 +45,14 @@ }, "processor": "atmega32u4", "bootloader": "qmk-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "nkro": true, + "rgblight": true, + "encoder": true + }, "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/custommk/genesis/rev2/rules.mk b/keyboards/custommk/genesis/rev2/rules.mk deleted file mode 100644 index 212c267b251..00000000000 --- a/keyboards/custommk/genesis/rev2/rules.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/custommk/genesis/rules.mk b/keyboards/custommk/genesis/rules.mk index cb164c1a89f..3d64c0af2b9 100644 --- a/keyboards/custommk/genesis/rules.mk +++ b/keyboards/custommk/genesis/rules.mk @@ -1,15 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -ENCODER_ENABLE = yes - DEFAULT_FOLDER = custommk/genesis/rev2