diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-11-28 16:39:48 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-11-28 16:40:47 +1100 |
| commit | 0115951de12bd4c798a43a380651c34552552e85 (patch) | |
| tree | 62999011ae782d93aa6dc9c889615db2a840cafc /keyboards/mechwild | |
| parent | 0379d1f59e58cefa18cdb72ba1b77507d1108ae6 (diff) | |
| parent | 4d99e0a23cff02f4c6e55e093b5de08a9be0df7c (diff) | |
`develop` -> `master`, 2023q4 edition
Diffstat (limited to 'keyboards/mechwild')
33 files changed, 628 insertions, 1524 deletions
diff --git a/keyboards/mechwild/bbs/config.h b/keyboards/mechwild/bbs/config.h index d19f39dd13..b626e5590d 100644 --- a/keyboards/mechwild/bbs/config.h +++ b/keyboards/mechwild/bbs/config.h @@ -3,10 +3,6 @@ #pragma once - -/* allows the "key" button on the blackpill to toggle caps lock for user testing before soldering */ -#define DIP_SWITCH_PINS { A0 } - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/info.json index 39c23e2fff..c0ba888d9a 100644 --- a/keyboards/mechwild/bbs/info.json +++ b/keyboards/mechwild/bbs/info.json @@ -14,6 +14,9 @@ "rows": ["B12", "B10", "B13", "B1", "B14"] }, "diode_direction": "COL2ROW", + "dip_switch": { + "pins": ["A0"] + }, "indicators": { "caps_lock": "C13", "on_state": 0 diff --git a/keyboards/mechwild/bbs/keymaps/default/keymap.c b/keyboards/mechwild/bbs/keymaps/default/keymap.c index 1eabdcd540..146099fba7 100644 --- a/keyboards/mechwild/bbs/keymaps/default/keymap.c +++ b/keyboards/mechwild/bbs/keymaps/default/keymap.c @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -#include "keymap_steno.h" // Defines names for use in layer keycodes and the keymap enum layer_names { diff --git a/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h b/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h deleted file mode 100644 index 658c829f04..0000000000 --- a/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B <mxb540@gmail.com> -// SPDX-License-Identifier: GPL-2.0+ - -#pragma once - -# define TAPPING_TERM 160 -# define TAPPING_TERM_PER_KEY -# define HOLD_ON_OTHER_KEY_PRESS -# define QUICK_TAP_TERM TAPPING_TERM / 2 -# define QUICK_TAP_TERM_PER_KEY diff --git a/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c b/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c deleted file mode 100644 index e8a26fd28a..0000000000 --- a/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c +++ /dev/null @@ -1,221 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B <mxb540@gmail.com> -// SPDX-License-Identifier: GPL-2.0+ - -#include "miketronic.h" - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* WORKMAN - * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ - * │ Q │ D │ R │ W │ B │ 7 │ 8 │ 9 │ J │ F │ U │ P │ BSPC│BSPC │ - * │ ESC │ │ │ │ SYM │ │ │ │ SYM │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ A │ S │ H ┃ T ┃ G │ 4 │ 5 │ 6 │ Y ┃ N ┃ E │ O │ I │UP │ - * │SHIFT│ │ ┃ EX ┃ │ │ │ │ ┃ ┃ │ │ │RIGHT│ - * ├─────┼─────┼─────╄━━━━━╃─────┼─────┼─────┼─────┼─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │ Z │ X │ M │ C │ V │ 1 │ 2 │ 3 │ K │ L │ SPC │ SPC │ENTER│DOWN │ - * │ FN │ CTRL│ OS │ ALT │LOWER│ │ 0 │ │RAISE│RAISE│ │ │ │LEFT │ - * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ - * - */ - - [_WM] = LAYOUT_3x14_wrapper ( - _____________WORKMAN_310_001_L_____________, _________NUMBER_01__________, _____________WORKMAN_310_001_R_____________, KC_BSPC, - _____________WORKMAN_310_002_L_____________, _________NUMBER_02__________, _____________WORKMAN_310_002_R_____________, TD_UR, - _____________WORKMAN_310_003_L_____________, _________NUMBER_03__________, _____________WORKMAN_310_003_R_____________, TD_DL - ), - - [_QW] = LAYOUT_3x14_wrapper ( - _________________QWERTY_L1_________________, _________NUMBER_01__________, _________________QWERTY_R1_________________, KC_MUTE, - _________________QWERTY_L2_________________, _________NUMBER_02__________, _________________QWERTY_R2_________________, TD_UR, - _________________QWERTY_L3_________________, _________NUMBER_03__________, _________________QWERTY_R3_________________, TD_DL - ), - - - /* LOWER - * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ - * │ () │ [] │ /\ │ │ │ │ 7 │ 8 │ 9 │ 0 │ │ │ │LEAD │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - * │ @ # │ & % │ ┃ ┃ │ ┃ 4 ┃ 5 │ 6 │ │ │ │ │ │ - * │ │ │ ┃ ┃ │ ┃ ┃ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┼─────╄━━━━━╃─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ 0 │ 1 │ 2 │ 3 │ . │ │ │ │ │ - * │ │ │ │ │LOWER│ │ │ 0 │ │ ENT │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ - * - */ - - [_LOWER] = LAYOUT_3x14_wrapper ( - _______________LOWER_310_L1________________, _________NUMBER_01__________, _______________LOWER_310_R1________________, QK_LEAD, - _______________LOWER_310_L2________________, _________NUMBER_02__________, _______________LOWER_310_R2________________, TD_UR, - _______________LOWER_310_L3________________, _________NUMBER_03__________, _______________LOWER_310_R3________________, TD_DL - ), - - - /* RAISE - * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ - * │ BOOT│DEBUG│ │ │ MAKE│ │ F7 │ F8 │ F9 │ F10 │ │ │ │LEAD │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ RGB │ RGB ┃ RGB ┃ RGB │ _ ┃ F4 ┃ F5 │ F6 │ F11 │ │ │ │ │ - * │ │ TOG │ MOD ┃ HUI ┃ HUD │ - ┃ ┃ _ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┼─────╄━━━━━╃─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ RGB │ RGB │ RGB │ RGB │RAISE│ F1 │ F2 │ F3 │ F12 │ │ │ │ │ - * │ │ SAI │ SAD │ VAI │ VAD │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ - * - */ - - [_RAISE] = LAYOUT_3x14_wrapper ( - _______________RAISE_310_L1________________, _________NUMBER_01__________, _______________RAISE_310_R1________________, QK_LEAD, - _______________RAISE_310_L2________________, _________NUMBER_02__________, _______________RAISE_310_R2________________, TD_UR, - _______________RAISE_310_L3________________, _________NUMBER_03__________, _______________RAISE_310_R3________________, TD_DL - ), - - - /* EXTRAS - * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ - * │ ! │ │ │ │ │ │ /\ | () | [] | ; │ │ │ │LEAD │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ ┃EXTRA┃ │ ┃ @ # ┃ & % | | ' | │ │ │ │ - * │ │ │ ┃ ┃ │ ┃ ┃ _ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┼─────╄━━━━━╃─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ , | . | ? │ │ │ │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ - */ - - [_EX] = LAYOUT_3x14_wrapper ( - ______________EXTRAS_310_L1________________, _________NUMBER_01__________, ______________EXTRAS_310_R1________________, QK_LEAD, - ______________EXTRAS_310_L2________________, _________NUMBER_02__________, ______________EXTRAS_310_R2________________, TD_UR, - ______________EXTRAS_310_L3________________, _________NUMBER_03__________, ______________EXTRAS_310_R3________________, TD_DL -), - - - /* FUNCTION - * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ - * │COPY │CLIP │ SS │ │ │ │ │ │ | /\ │ UP │ │ DEL │LEAD │ - * │PASTE│ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │SHIFT│ M05 │ M06 ┃ M07 ┃ M08 │ │ │ │ ┃ LEFT┃ DOWN│RIGHT│ │ UP │ - * │ │ │ ┃ ┃ │ │ │ │ ┃ ┃ │ │ │RIGHT│ - * ├─────┼─────┼─────╄━━━━━╃─────┼─────┼─────┼─────┼─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │ │ M01 │ M02 │ M03 │ M04 │ │ │ | | │ , │ . │ │DOWN │ - * │ FN │ │ │ │ │ │ │ │ │ │ │ │ │LEFT │ - * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ - */ - - [_FN] = LAYOUT_3x14_wrapper ( - _____________FUNCTION_310_L1_______________, _________NUMBER_01__________, _____________FUNCTION_310_R1_______________, QK_LEAD, - _____________FUNCTION_310_L2_______________, _________NUMBER_02__________, _____________FUNCTION_310_R2_______________, TD_UR, - _____________FUNCTION_310_L3_______________, _________NUMBER_03__________, _____________FUNCTION_310_R3_______________, TD_DL - ), - - - - /* SYMBOLS - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ $ │ ^ │ < │ > │ │ │ │ | │ [ │ ] │ - │ - * │ │ │ │ │ SYMB│ │ SYMB│ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ % │ : │ ; ┃ + ┃ = │ │ ┃ ┃ ( │ ) │ _ │ - * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ & │ ' │ " │ * │ # │ │ ! │ ? │ / │ \ │ @ │ - * │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - */ - - [_SYMB] = LAYOUT_3x14_wrapper ( - _____________SYMBOLS_310_L1________________, _________NUMBER_01__________, _____________SYMBOLS_310_R1________________, QK_LEAD, - _____________SYMBOLS_310_L2________________, _________NUMBER_02__________, _____________SYMBOLS_310_R2________________, TD_UR, - _____________SYMBOLS_310_L3________________, _________NUMBER_03__________, _____________SYMBOLS_310_R3________________, TD_DL - ), - - - -}; - - -#ifndef NUM_DIRECTIONS -# define NUM_DIRECTIONS 2 -#endif -#ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_WM] = { ENCODER_CCW_CW(LCTL(KC_V), LCTL(KC_C)) }, - [_QW] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_LOWER] = { ENCODER_CCW_CW(____, ____) }, - [_RAISE] = { ENCODER_CCW_CW(____, ____) }, - [_EX] = { ENCODER_CCW_CW(____, ____) }, - [_FN] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, - [_SYMB] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } -}; -#endif - -bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case SFT_T(KC_A): - // Do not force the mod-tap key press to be handled as a modifier - // if any other key was pressed while the mod-tap key is held down. - return false; - case TEX: - return false; - case CTRLX: - return false; - case FNZ: - return false; - case MGUI: - return false; - case VLOWER: - return false; - case KRAISE: - return false; - default: - // Force the dual-role key press to be handled as a modifier if any - // other key was pressed while the mod-tap key is held down. - return true; - } -} - -#ifdef AUDIO_ENABLE -float leader_start_song[][2] = SONG(ONE_UP_SOUND); -float leader_succeed_song[][2] = SONG(ALL_STAR); -float leader_fail_song[][2] = SONG(RICK_ROLL); -#endif - -void matrix_scan_user(void); - -void leader_start_user(void) { -#ifdef AUDIO_ENABLE - PLAY_SONG(leader_start_song); -#endif -} - -bool did_leader_succeed; - -void leader_end_user(void) { - did_leader_succeed = false; - - if (leader_sequence_one_key(KC_E)) { - SEND_STRING(SS_LCTL(SS_LSFT("t"))); - did_leader_succeed = true; - } else if (leader_sequence_two_keys(KC_E, KC_D)) { - SEND_STRING(SS_LGUI("r") "cmd\n" SS_LCTL("c")); - did_leader_succeed = true; - } else if (leader_sequence_two_keys(KC_A, KC_T)) { - SEND_STRING("@guidehouse.com"); - did_leader_succeed = true; - } - - -#ifdef AUDIO_ENABLE - if (did_leader_succeed) { - PLAY_SONG(leader_succeed_song); - } else { - PLAY_SONG(leader_fail_song); - } -#endif -}
\ No newline at end of file diff --git a/keyboards/mechwild/bde/rev2/keymaps/miketronic/rules.mk b/keyboards/mechwild/bde/rev2/keymaps/miketronic/rules.mk deleted file mode 100644 index 6cdd598124..0000000000 --- a/keyboards/mechwild/bde/rev2/keymaps/miketronic/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -EXTRAKEY_ENABLE = yes # Audio control and System control -TAP_DANCE_ENABLE = yes # Tap Dance keys -NKRO_ENABLE = yes # Enable N-Key Rollover -MACROS_ENABLED = yes -LEADER_ENABLE = yes - -ENCODER_ENABLE = yes -ENCODER_MAP_ENABLE = yes -OLED_ENABLE = yes # Enable OLED Screen - -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow diff --git a/keyboards/mechwild/clunker/config.h b/keyboards/mechwild/clunker/config.h index 62caa25bb3..ee32fde520 100644 --- a/keyboards/mechwild/clunker/config.h +++ b/keyboards/mechwild/clunker/config.h @@ -3,20 +3,4 @@ #pragma once -/* - * 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 - #define SOLENOID_PIN F4 diff --git a/keyboards/mechwild/clunker/info.json b/keyboards/mechwild/clunker/info.json index 530f0fe972..1a4114f8f2 100644 --- a/keyboards/mechwild/clunker/info.json +++ b/keyboards/mechwild/clunker/info.json @@ -2,88 +2,612 @@ "manufacturer": "MechWild", "keyboard_name": "Clunker", "maintainer": "kylemccreery", - "bootloader": "caterina", + "development_board": "promicro", "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "D2", "pin_b": "D3"} + ] + }, "features": { "bootmagic": true, - "command": false, - "console": false, + "encoder": true, "extrakey": true, + "haptic": true, "mousekey": true, - "nkro": true, - "encoder": true, - "haptic": true + "nkro": true }, "matrix_pins": { - "rows": ["F5", "F6", "B3", "F7", "B2", "B1", "B6"], - "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] + "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F5", "F6", "B3", "F7", "B2", "B1", "B6"] }, - "processor": "atmega32u4", "url": "https://mechwild.com/product/clunker/", "usb": { "device_version": "1.3.0", "pid": "0x1711", "vid": "0x6D77" }, - "encoder": { - "rotary": [ - {"pin_a": "D2", "pin_b": "D3"} - ] + "layout_aliases": { + "LAYOUT": "LAYOUT_all" }, "layouts": { - "LAYOUT": { + "LAYOUT_625u": { + "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": [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": [5, 7], "x": 8.5, "y": 1}, + {"matrix": [5, 6], "x": 9.5, "y": 1}, + {"matrix": [5, 5], "x": 10.5, "y": 1}, + {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2}, + {"matrix": [5, 2], "x": 9.75, "y": 2}, + {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75}, + {"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": [6, 7], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 6.25}, + {"matrix": [4, 5], "x": 9.5, "y": 4}, + {"matrix": [4, 6], "x": 10.5, "y": 4}, + {"matrix": [4, 7], "x": 11.5, "y": 4} + ] + }, + "LAYOUT_7u": { + "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": [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": [5, 7], "x": 8.5, "y": 1}, + {"matrix": [5, 6], "x": 9.5, "y": 1}, + {"matrix": [5, 5], "x": 10.5, "y": 1}, + {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2}, + {"matrix": [5, 2], "x": 9.75, "y": 2}, + {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75}, + {"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": [6, 7], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 7}, + {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_split_lshift_625u": { + "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": [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": [5, 7], "x": 8.5, "y": 1}, + {"matrix": [5, 6], "x": 9.5, "y": 1}, + {"matrix": [5, 5], "x": 10.5, "y": 1}, + {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2}, + {"matrix": [5, 2], "x": 9.75, "y": 2}, + {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75}, + {"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": [6, 7], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 6.25}, + {"matrix": [4, 5], "x": 9.5, "y": 4}, + {"matrix": [4, 6], "x": 10.5, "y": 4}, + {"matrix": [4, 7], "x": 11.5, "y": 4} + ] + }, + "LAYOUT_split_lshift_7u": { + "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": [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": [5, 7], "x": 8.5, "y": 1}, + {"matrix": [5, 6], "x": 9.5, "y": 1}, + {"matrix": [5, 5], "x": 10.5, "y": 1}, + {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2}, + {"matrix": [5, 2], "x": 9.75, "y": 2}, + {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75}, + {"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": [6, 7], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 7}, + {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_split_lshift_split_rshift_625u": { + "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": [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": [5, 7], "x": 8.5, "y": 1}, + {"matrix": [5, 6], "x": 9.5, "y": 1}, + {"matrix": [5, 5], "x": 10.5, "y": 1}, + {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2}, + {"matrix": [5, 2], "x": 9.75, "y": 2}, + {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75}, + {"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": [6, 7], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 6.25}, + {"matrix": [4, 5], "x": 9.5, "y": 4}, + {"matrix": [4, 6], "x": 10.5, "y": 4}, + {"matrix": [4, 7], "x": 11.5, "y": 4} + ] + }, + "LAYOUT_split_lshift_split_rshift_7u": { + "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": [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": [5, 7], "x": 8.5, "y": 1}, + {"matrix": [5, 6], "x": 9.5, "y": 1}, + {"matrix": [5, 5], "x": 10.5, "y": 1}, + {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2}, + {"matrix": [5, 2], "x": 9.75, "y": 2}, + {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75}, + {"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": [6, 7], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 7}, + {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_split_rshift_625u": { + "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": [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": [5, 7], "x": 8.5, "y": 1}, + {"matrix": [5, 6], "x": 9.5, "y": 1}, + {"matrix": [5, 5], "x": 10.5, "y": 1}, + {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2}, + {"matrix": [5, 2], "x": 9.75, "y": 2}, + {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75}, + {"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": [6, 7], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 6.25}, + {"matrix": [4, 5], "x": 9.5, "y": 4}, + {"matrix": [4, 6], "x": 10.5, "y": 4}, + {"matrix": [4, 7], "x": 11.5, "y": 4} + ] + }, + "LAYOUT_split_rshift_7u": { + "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": [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": [5, 7], "x": 8.5, "y": 1}, + {"matrix": [5, 6], "x": 9.5, "y": 1}, + {"matrix": [5, 5], "x": 10.5, "y": 1}, + {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2}, + {"matrix": [5, 2], "x": 9.75, "y": 2}, + {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75}, + {"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": [6, 7], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 7}, + {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_split_lshift_split_space": { + "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": [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": [5, 7], "x": 8.5, "y": 1}, + {"matrix": [5, 6], "x": 9.5, "y": 1}, + {"matrix": [5, 5], "x": 10.5, "y": 1}, + {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2}, + {"matrix": [5, 2], "x": 9.75, "y": 2}, + {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75}, + {"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": [6, 7], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3, "w": 2.25}, + {"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, 3], "x": 3.75, "y": 4, "w": 2.75}, + {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_split_rshift_split_space": { + "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": [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": [5, 7], "x": 8.5, "y": 1}, + {"matrix": [5, 6], "x": 9.5, "y": 1}, + {"matrix": [5, 5], "x": 10.5, "y": 1}, + {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2}, + {"matrix": [5, 2], "x": 9.75, "y": 2}, + {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75}, + {"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": [6, 7], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25}, + {"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, 3], "x": 3.75, "y": 4, "w": 2.75}, + {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25} + ] + }, + "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": [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": [5, 7], "x": 8.5, "y": 1}, - {"matrix": [5, 6], "x": 9.5, "y": 1}, - {"matrix": [5, 5], "x": 10.5, "y": 1}, - {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2}, - {"matrix": [5, 2], "x": 9.75, "y": 2}, - {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75}, - {"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": [6, 7], "x": 8.25, "y": 3}, - {"matrix": [6, 6], "x": 9.25, "y": 3}, - {"matrix": [6, 5], "x": 10.25, "y": 3}, - {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25}, - {"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, 3], "x": 3.75, "y": 4, "w": 2.75}, - {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25}, - {"matrix": [4, 5], "x": 8.75, "y": 4, "w": 1.25}, - {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25} + {"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": [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": [5, 7], "x": 8.5, "y": 1}, + {"matrix": [5, 6], "x": 9.5, "y": 1}, + {"matrix": [5, 5], "x": 10.5, "y": 1}, + {"matrix": [5, 4], "x": 11.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": [5, 1], "x": 8.75, "y": 2}, + {"matrix": [5, 2], "x": 9.75, "y": 2}, + {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75}, + {"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": [6, 7], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25}, + {"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, 3], "x": 3.75, "y": 4, "w": 2.75}, + {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/mechwild/clunker/keymaps/default/keymap.c b/keyboards/mechwild/clunker/keymaps/default/keymap.c index fd9c93fe87..28322a737e 100644 --- a/keyboards/mechwild/clunker/keymaps/default/keymap.c +++ b/keyboards/mechwild/clunker/keymaps/default/keymap.c @@ -15,28 +15,28 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ - [_BASE] = LAYOUT( + [_BASE] = LAYOUT_all( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_MUTE, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, MO(_FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, KC_LSFT, KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, MO(_FN2), KC_RCTL ), - [_FN1] = LAYOUT( + [_FN1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, HF_TOGG, _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_UP, KC_SLSH, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT ), - [_FN2] = LAYOUT( + [_FN2] = LAYOUT_all( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_FN3] = LAYOUT( + [_FN3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/mechwild/clunker/keymaps/via/keymap.c b/keyboards/mechwild/clunker/keymaps/via/keymap.c index fd9c93fe87..28322a737e 100644 --- a/keyboards/mechwild/clunker/keymaps/via/keymap.c +++ b/keyboards/mechwild/clunker/keymaps/via/keymap.c @@ -15,28 +15,28 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ - [_BASE] = LAYOUT( + [_BASE] = LAYOUT_all( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_MUTE, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, MO(_FN1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, KC_LSFT, KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, MO(_FN2), KC_RCTL ), - [_FN1] = LAYOUT( + [_FN1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, HF_TOGG, _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_UP, KC_SLSH, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT ), - [_FN2] = LAYOUT( + [_FN2] = LAYOUT_all( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_FN3] = LAYOUT( + [_FN3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/config.h b/keyboards/mechwild/mercutio/keymaps/jonavin/config.h deleted file mode 100644 index 1722a2c25c..0000000000 --- a/keyboards/mechwild/mercutio/keymaps/jonavin/config.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2021 Kyle McCreery - * Copyright 2021 Jonavin Eng - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#define TAPPING_TOGGLE 2 -// TT set to two taps - -/* Handle GRAVESC combo keys */ -#define GRAVE_ESC_ALT_OVERRIDE - //Always send Escape if Alt is pressed -#define GRAVE_ESC_CTRL_OVERRIDE - //Always send Escape if Control is pressed - -#define TAPPING_TERM 180 diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c deleted file mode 100755 index b352a0d6ad..0000000000 --- a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c +++ /dev/null @@ -1,268 +0,0 @@ -/* Copyright 2021 Kyle McCreery - * Copyright 2021 Jonavin Eng - * - * 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 <http://www.gnu.org/licenses/>. - */ - - -#include QMK_KEYBOARD_H -#include "jonavin.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[_BASE] = LAYOUT_all( - KC_MUTE, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - TT(_RAISE), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - KC_LSFTCAPS, KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, SC_SENT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, LT(_LOWER,KC_SPC), KC_SPC, KC_RALT, MO(_FN1), KC_RCTL ), - - [_FN1] = LAYOUT_all( - ENCFUNC, - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL, - KC_CAPS, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NO, - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NUM, KC_NO, KC_NO, KC_NO, SC_SENT, - KC_TRNS, KC_WINLCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - - [_LOWER] = LAYOUT_all( - KC_TRNS, - KC_GRAVE, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, - KC_TRNS, KC_MINS, KC_EQL, KC_NO, KC_NO, KC_NO, KC_NO, KC_QUES, KC_SLSH, KC_PIPE, KC_BSLS, KC_TILD, - KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_NO, KC_NO, KC_NO, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - - [_RAISE] = LAYOUT_all( - KC_TRNS, - KC_TAB, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_PMNS, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_P0, KC_TRNS, - TT(_RAISE), KC_LEFT, KC_DOWN, KC_RIGHT,KC_PGDN, KC_PSLS, KC_TAB, KC_P4, KC_P5, KC_P6, KC_PDOT, KC_PEQL, - KC_TRNS, KC_TRNS, KC_NO, KC_DEL, KC_INS, KC_NO, KC_PAST, KC_P0, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) -}; - -/* These are needed whether encoder function is enabled or not when ENCFUNC keycode is pressed.? - Defaults never changes if no encoder present to change it -*/ -typedef struct { - char keydesc[6]; // this will be displayed on OLED - uint16_t keycode; // this is the keycode that will be sent when activted -} keycodedescType; - -static const keycodedescType PROGMEM keyselection[] = { - // list of key codes that will be scrollled through by encoder and description - {"TASK", KC_TASK}, - {"INS", KC_INS}, - {"DEL", KC_DEL}, - {"PrtSc", KC_PSCR}, - {"ScrLk", KC_SCLN}, - {"Break", KC_PAUS}, - {"C-A-D", KC_CAD}, // Ctrl-Alt-Del - {"AltF4", KC_AF4}, - {"PLAY", KC_MEDIA_PLAY_PAUSE}, - {"FLASH", QK_BOOT}, // firmware flash mode -}; - -#define MAX_KEYSELECTION ARRAY_SIZE(keyselection) - -static uint8_t selectedkey_idx = 0; -static keycodedescType selectedkey_rec; - -static void set_selectedkey(uint8_t idx) { - // make a copy from PROGMEM - memcpy_P (&selectedkey_rec, &keyselection[idx], sizeof selectedkey_rec); - - //selectedkey_rec = keyselection[idx]; - -} - -void keyboard_post_init_keymap(void) { - // Call the keyboard post init code. - set_selectedkey(selectedkey_idx); -} - -bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case ENCFUNC: - if (record->event.pressed) { - selectedkey_rec.keycode == QK_BOOT ? reset_keyboard() : tap_code16(selectedkey_rec.keycode); // handle QK_BOOT code - } else { - // when keycode is released - } - break; - } - return true; -}; - - - -#ifdef ENCODER_ENABLE // Encoder Functionality - void encoder_action_selectkey(bool clockwise) { - if ( clockwise ) { - if ( selectedkey_idx < MAX_KEYSELECTION-1) { - selectedkey_idx ++; - } else { - // do nothing - } - } else if ( !clockwise ) { - if ( selectedkey_idx > 0){ - selectedkey_idx --; - } else { - // do nothing - } - } - set_selectedkey(selectedkey_idx); - } - - bool encoder_update_user(uint8_t index, bool clockwise) { - #ifdef OLED_ENABLE - oled_clear(); - oled_render(); - #endif - uint8_t mods_state = get_mods(); - switch (index) { - case 0: // This is the only encoder right now, keeping for consistency - switch(get_highest_layer(layer_state)){ // special handling per layer - case _FN1: // on Fn layer select what the encoder does when pressed - if (!mods_state) { - encoder_action_selectkey(clockwise); - break; - } else { - // continue to default - } - default: // all other layers - if (mods_state & MOD_BIT(KC_LSFT) ) { // If you are holding L shift, encoder changes layers - encoder_action_layerchange(clockwise); - } else if (mods_state & MOD_BIT(KC_LCTL)) { // if holding Left Ctrl, navigate next/prev word - encoder_action_navword(clockwise); - } else if (mods_state & MOD_BIT(KC_LALT)) { // if holding Left Alt, change media next/prev track - encoder_action_mediatrack(clockwise); - } else { - encoder_action_volume(clockwise); // Otherwise it just changes volume - } - break; - } - break; - } - return false; - } -#endif - -#ifdef OLED_ENABLE // OLED Functionality - oled_rotation_t oled_init_user(oled_rotation_t rotation) { - return OLED_ROTATION_180; // flips the display 180 degrees if offhand - } - - bool clear_screen = false; // used to manage singular screen clears to prevent display glitch - static void render_name(void) { // Render Mercutio Script Text - static const char PROGMEM mercutio_name[] = { - 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0x95, 0xB5, 0x96, 0xD5, 0xB6, 0xB6, - 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, - 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, - 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 - }; - oled_write_P(mercutio_name, false); - } - - static void render_logo(void) { // Render MechWild "MW" Logo - static const char PROGMEM logo_1[] = {0x97, 0x98, 0x99, 0x9A,0x00}; - static const char PROGMEM logo_2[] = {0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0x00}; - static const char PROGMEM logo_3[] = {0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xB6, 0x00}; - static const char PROGMEM logo_4[] = {0xB6, 0xB6, 0xB6, 0x9B, 0x9C, 0x9D, 0x9E, 0x00}; - oled_set_cursor(0,0); - oled_write_P(logo_1, false); - oled_set_cursor(0,1); - oled_write_P(logo_2, false); - oled_set_cursor(0,2); - oled_write_P(logo_3, false); - oled_set_cursor(0,3); - oled_write_P(logo_4, false); - } - - bool oled_task_user(void) { - led_t led_state = host_keyboard_led_state(); - if ( !led_state.num_lock && !led_state.caps_lock && get_selected_layer() == 0 && get_highest_layer(layer_state) == 0 ) { - render_name(); - clear_screen = true; - } else { - if (clear_screen == true) { - oled_clear(); - oled_render(); - clear_screen = false; - } - render_logo(); - oled_set_cursor(8,2); - switch(get_selected_layer()){ - case 0: - oled_write_P(PSTR("BASE"), false); - break; - case 1: - oled_write_P(PSTR("FN "), false); - oled_write(selectedkey_rec.keydesc, false); - break; - case 2: - oled_write_P(PSTR("LOWER"), false); - break; - case 3: - oled_write_P(PSTR("RAISE"), false); - break; - default: - oled_write_P(PSTR("Layer ?"), false); // Should never display, here as a catchall - } - oled_write_P(keymap_config.no_gui ? PSTR(" WL") : PSTR(" "), false); - oled_set_cursor(8,3); - if (get_highest_layer(layer_state) == get_selected_layer()) { - oled_write_P(PSTR(" "), false); - } else { - switch (get_highest_layer(layer_state)) { - case 0: - oled_write_P(PSTR("Temp BASE"), false); - break; - case 1: - oled_write_P(PSTR("Temp FN "), false); - oled_write(selectedkey_rec.keydesc, false); - break; - case 2: - oled_write_P(PSTR("Temp LOWER"), false); - break; - case 3: - oled_write_P(PSTR("Temp RAISE"), false); - break; - default: - oled_write_P(PSTR("Temp Layer ?"), false); // Should never display, here as a catchall - } - } - led_t led_state = host_keyboard_led_state(); - oled_set_cursor(8,0); - uint8_t wpm_count; - wpm_count=get_current_wpm(); - - if (wpm_count > 020) { // how wpm when > 20 - oled_write_P(PSTR(" WPM: "), false); - oled_write(get_u8_str(wpm_count, ' '), false); - } else { - oled_write_P(PSTR(" JONAVIN "), false); // otherwise display keymap name - } - - oled_set_cursor(8,1); - oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR(" "), false); - oled_write_P(led_state.scroll_lock ? PSTR("SCR") : PSTR(" "), false); - - } - - return false; - } - - void suspend_power_down_user(void) { // shutdown oled when powered down to prevent OLED from showing Mercutio all the time - oled_off(); - } -#endif diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/readme.md b/keyboards/mechwild/mercutio/keymaps/jonavin/readme.md deleted file mode 100644 index ed1395ede6..0000000000 --- a/keyboards/mechwild/mercutio/keymaps/jonavin/readme.md +++ /dev/null @@ -1,62 +0,0 @@ -Jonavin's Custom Mercutio Layout - - Based on Fancy keymap - -Features - - Split Enter, shftEnter, Split Backspace - - standard shorten home row keys - - numpad and nav keys in RAISE LAYER - - symbols in LOWER layer - - CAPS LOCK 2 taps for RAISE layer toggle - - RAISE layer left spacebar Backspace - - Shift+Encoder for layer changes (from mercutio/fancy keymap) - - MOUSEKEYS is disbled - - shutdown oled when powered down to prevent OLED from showing Mercutio all the time - - add WPM indicator when wpm is > 20 wpm - - add double tap of Left Shift to toggle Caps Lock - - add WinLock feature with FN + Win; display WL on OLED when enabled - - - FN layer has encoder selectable key codes and displayed on OLED - - Change these in keymap.c to assign your desired key selection - - static const keycodedescType PROGMEM keyselection[] = { - // list of key codes that will be scrollled through by encoder and description - {"TASK", KC_TASK}, - {"INS", KC_INS}, - {"DEL", KC_DEL}, - {"PrtSc", KC_PSCR}, - {"ScrLk", KC_SCLN}, - {"Break", KC_PAUS}, - {"C-A-D", KC_CAD}, // Ctrl-Alt-Del - {"AltF4", KC_AF4}, - {"PLAY", KC_MEDIA_PLAY_PAUSE}, - {"RESET", QK_BOOT}, // firmware flash mode - }; - - - Additional encoder functionality - While holding Left Ctrl, navigates next or previous word - While holding Left Alt, media next track or previous track - - -rules.mk OPTIONS - Active features from userspace -STARTUP_NUMLOCK_ON = yes - - turns on NUMLOCK by default - -TD_LSFT_CAPSLOCK_ENABLE = yes - - This will enable double tap on Left Shift to toggle CAPSLOCK when using KC_LSFTCAPS - -Default Layers - - -MO(1) / FN Layer - - -MO(2) / Lower layer - - -MO(3) / Raise layer - - - - - diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/rules.mk b/keyboards/mechwild/mercutio/keymaps/jonavin/rules.mk deleted file mode 100644 index 0b76c6e57c..0000000000 --- a/keyboards/mechwild/mercutio/keymaps/jonavin/rules.mk +++ /dev/null @@ -1,8 +0,0 @@ -VIA_ENABLE = yes - -MOUSEKEY_ENABLE = yes -WPM_ENABLE = yes -TAP_DANCE_ENABLE = yes - -TD_LSFT_CAPSLOCK_ENABLE = yes -STARTUP_NUMLOCK_ON = yes diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h index 219a4ec7b0..d62d7b49f0 100644 --- a/keyboards/mechwild/mokulua/mirrored/config.h +++ b/keyboards/mechwild/mokulua/mirrored/config.h @@ -7,10 +7,6 @@ #define MASTER_LEFT //#define MASTER_RIGHT -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE -#define SPLIT_MODS_ENABLE -#define SPLIT_OLED_ENABLE /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json index 5221238784..7289147e6b 100644 --- a/keyboards/mechwild/mokulua/mirrored/info.json +++ b/keyboards/mechwild/mokulua/mirrored/info.json @@ -22,7 +22,15 @@ "tap_keycode_delay": 10 }, "split": { - "soft_serial_pin": "D3" + "soft_serial_pin": "D3", + "transport": { + "sync": { + "indicators": true, + "layer_state": true, + "modifiers": true, + "oled": true + } + } }, "rgblight": { "saturation_steps": 8, diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h index f13e1e582a..953e53c236 100644 --- a/keyboards/mechwild/mokulua/standard/config.h +++ b/keyboards/mechwild/mokulua/standard/config.h @@ -7,10 +7,6 @@ #define MASTER_LEFT //#define MASTER_RIGHT -#define SPLIT_LAYER_STATE_ENABLE -#define SPLIT_LED_STATE_ENABLE -#define SPLIT_MODS_ENABLE -#define SPLIT_OLED_ENABLE /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json index 05ca6775df..da82447980 100644 --- a/keyboards/mechwild/mokulua/standard/info.json +++ b/keyboards/mechwild/mokulua/standard/info.json @@ -22,7 +22,15 @@ "tap_keycode_delay": 10 }, "split": { - "soft_serial_pin": "D3" + "soft_serial_pin": "D3", + "transport": { + "sync": { + "indicators": true, + "layer_state": true, + "modifiers": true, + "oled": true + } + } }, "rgblight": { "saturation_steps": 8, diff --git a/keyboards/mechwild/murphpad/keymaps/jonavin/config.h b/keyboards/mechwild/murphpad/keymaps/jonavin/config.h deleted file mode 100644 index 2636ea4051..0000000000 --- a/keyboards/mechwild/murphpad/keymaps/jonavin/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2021 Jonavin Eng - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -// Standard encoder position. Set to 1 for top right optional position -#define ENCODER_DEFAULTACTIONS_INDEX 0 - -// Increase layers to 6 for VIA -#define DYNAMIC_KEYMAP_LAYER_COUNT 6 - -// Remove line below for vertical layout -#define LANDSCAPE_MODE diff --git a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c deleted file mode 100644 index 070b572507..0000000000 --- a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c +++ /dev/null @@ -1,424 +0,0 @@ -/* Copyright 2021 Kyle McCreery - * Copyright 2021 Jonavin Eng - * - * 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 <http://www.gnu.org/licenses/>. - */ -#include QMK_KEYBOARD_H -#include "jonavin.h" -#include "layout_landscape.h" - - -// Defines names for use in layer keycodes and the keymap -enum layer_names { - _FN2 = 2, - _FN3, - _FN4, - _RGB -}; - -#ifdef LANDSCAPE_MODE -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_BASE] = LAYOUT_landscape( - TT(_FN1), TT(_FN2), KC_MUTE, - - KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, KC_BSPC, - KC_TAB, KC_P7, KC_P8, KC_P9, KC_PDOT, KC_RGUI, - KC_RSFT, KC_P4, KC_P5, KC_P6, KC_COMMA, KC_RCTL, - KC_P0, KC_P1, KC_P2, KC_P3, KC_PENT, KC_RALT, - - TT(_FN3), TT(_FN4), TT(_RGB) - ), - [_FN1] = LAYOUT_landscape( - _______, _______, ENCFUNC, - - _______, KC_F10, KC_F11, KC_F12, KC_PSCR, _______, - _______, KC_F7, KC_F8, KC_F9, KC_SCRL, _______, - _______, KC_F4, KC_F5, KC_F6, KC_PAUS, _______, - _______, KC_F1, KC_F2, KC_F3, _______, _______, - - _______, _______, _______ - ), - [_FN2] = LAYOUT_landscape( - _______, _______, QK_BOOT, - - _______, _______, KC_MPLY, KC_MPRV, KC_MNXT, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - - _______, _______, _______ - ), - [_FN3] = LAYOUT_landscape( - _______, _______, _______, - - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - - _______, _______, _______ - ), - [_FN4] = LAYOUT_landscape( - _______, _______, _______, - - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, - - _______, _______, _______ - ), - [_RGB] = LAYOUT_landscape( - _______, _______, _______, - - _______, _______, _______, _______, _______, _______, - _______, RGB_HUD, RGB_SPI, RGB_HUI, RGB_SAI, _______, - _______, RGB_RMOD, RGB_TOG, RGB_MOD, RGB_SAD, _______, - _______, RGB_VAD, RGB_SPD, RGB_VAI, KC_NO, _______, - - _______, _______, _______ - ), -}; -#endif // LANDSCAPE_MODE - -#ifndef LANDSCAPE_MODE -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base */ - [_BASE] = LAYOUT( - TT(_FN2),TT(_FN3),TT(_FN4),LT(_RGB,KC_PSCR), - KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_MUTE, KC_P4, KC_P5, KC_P6, _______, - TT(_FN1), KC_P1, KC_P2, KC_P3, KC_PENT, - KC_RALT, KC_P0, _______, KC_PDOT, _______, - - TT(_FN3), TT(_FN4), TT(_RGB) - ), - [_FN1] = LAYOUT( - _______, _______, _______, QK_BOOT, - KC_CALC, _______, _______, _______, - _______, _______, _______, _______, - ENCFUNC, KC_TAB, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, KC_BSPC, _______, KC_DEL, _______, - - _______, _______, _______ - ), - [_FN2] = LAYOUT( - _______, _______, _______, _______, - _______, _______, KC_MPLY, KC_MPRV, - _______, _______, _______, KC_MNXT, - QK_BOOT, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - - _______, _______, _______ - ), - [_FN3] = LAYOUT( - _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - - _______, _______, _______ - ), - [_FN4] = LAYOUT( - _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, - - _______, _______, _______ - ), - [_RGB] = LAYOUT( - _______, _______, _______, _______, - _______, _______, _______, _______, - RGB_HUD, RGB_SPI, RGB_HUI, _______, - _______, RGB_RMOD, RGB_TOG, RGB_MOD, _______, - _______, RGB_VAD, RGB_SPD, RGB_VAI, _______, - _______, RGB_SAD, _______, RGB_SAI, _______, - - _______, _______, _______ - ), -}; -#endif // !LANDSCAPE_MODE - -typedef struct { - char keydesc[6]; // this will be displayed on OLED - uint16_t keycode; // this is the keycode that will be sent when activted -} keycodedescType; - -static const keycodedescType PROGMEM keyselection[] = { - // list of key codes that will be scrolled through by encoder and description - {"TASK ", KC_TASK}, - {"PREV ", KC_MEDIA_PREV_TRACK}, - {"NEXT ", KC_MEDIA_NEXT_TRACK}, - {"PLAY ", KC_MEDIA_PLAY_PAUSE}, - {"PrtScm", KC_PSCR}, - {"ScrLk", KC_SCLN}, - {"Break", KC_PAUS}, - {"C-A-D", KC_CAD}, // Ctrl-Alt-Del - {"AltF4", KC_AF4}, - {"RESET", QK_BOOT}, // firmware flash mode -}; - -#define MAX_KEYSELECTION ARRAY_SIZE(keyselection) - -static uint8_t selectedkey_idx = 0; -static keycodedescType selectedkey_rec; - -static void set_selectedkey(uint8_t idx) { - // make a copy from PROGMEM - memcpy_P (&selectedkey_rec, &keyselection[idx], sizeof selectedkey_rec); - - //selectedkey_rec = keyselection[idx]; - -} - -void keyboard_post_init_keymap(void) { - // Call the keyboard post init code. - set_selectedkey(selectedkey_idx); -} - -bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case ENCFUNC: - if (record->event.pressed) { - selectedkey_rec.keycode == QK_BOOT ? reset_keyboard() : tap_code16(selectedkey_rec.keycode); // handle QK_BOOT code - } else { - // when keycode is released - } - break; - } - return true; -}; - - -#ifdef ENCODER_ENABLE // Encoder Functionality - void encoder_action_selectkey(bool clockwise) { - if ( clockwise ) { - if ( selectedkey_idx < MAX_KEYSELECTION-1) { - selectedkey_idx ++; - } else { - // do nothing - } - } else if ( !clockwise ) { - if ( selectedkey_idx > 0){ - selectedkey_idx --; - } else { - // do nothing - } - } - set_selectedkey(selectedkey_idx); - } - - bool encoder_update_user(uint8_t index, bool clockwise) { - #ifdef OLED_ENABLE - oled_clear(); - oled_render(); - #endif - uint8_t mods_state = get_mods(); - switch (index) { - case 0: // main primary encoder - switch(get_highest_layer(layer_state)){ // special handling per layer - case _FN1: // on Fn layer select what the encoder does when pressed - if (!mods_state) { - encoder_action_selectkey(clockwise); - break; - } else { - // continue to default - } - case _RGB: - if (!mods_state) { - encoder_action_rgb_hue(clockwise); - break; - } - default: // all other layers - if (mods_state & MOD_BIT(KC_RSFT) ) { // If you are holding R shift, encoder changes layers - encoder_action_layerchange(clockwise); - } else if (mods_state & MOD_BIT(KC_RCTL)) { // if holding Right Ctrl, navigate next/prev word - encoder_action_navword(clockwise); - } else if (mods_state & MOD_BIT(KC_RALT)) { // if holding Right Alt, change media next/prev track - encoder_action_mediatrack(clockwise); - } else { - encoder_action_volume(clockwise); // Otherwise it just changes volume - } - break; - } - break; - case 1: // optional secondary encoder - switch(get_highest_layer(layer_state)){ // special handling per layer - case _RGB: - if (!mods_state) { - encoder_action_rgb_mode(clockwise); - break; - } - default: // all other layers - encoder_action_mediatrack(clockwise); // Otherwise prev/next track - break; - } - } - return false; - } -#endif - - -#ifdef OLED_ENABLE - static void render_logo(void) { // Render MechWild "MW" Logo - static const char PROGMEM logo_1[] = {0x8A, 0x8B, 0x8C, 0x8D, 0x00}; - static const char PROGMEM logo_2[] = {0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0x00}; - static const char PROGMEM logo_3[] = {0xCA, 0xCB, 0xCC, 0xCD, 0x00}; - static const char PROGMEM logo_4[] = {0x20, 0x8E, 0x8F, 0x90, 0x00}; - oled_set_cursor(0,0); - oled_write_P(logo_1, false); - oled_set_cursor(0,1); - oled_write_P(logo_2, false); - oled_set_cursor(0,2); - oled_write_P(logo_3, false); - oled_set_cursor(0,3); - oled_write_P(logo_4, false); - } - - #ifdef LANDSCAPE_MODE - oled_rotation_t oled_init_user(oled_rotation_t rotation) { - return OLED_ROTATION_0; // do not flip the display - } - - bool oled_task_user(void) { - - render_logo(); - oled_set_cursor(8,2); - switch(get_selected_layer()){ - case _BASE: - oled_write_P(PSTR("BASE"), false); - break; - case _FN1: - oled_write_P(PSTR("FN "), false); - oled_write(selectedkey_rec.keydesc, false); - break; - case _FN2: - oled_write_P(PSTR("FN2 "), false); - break; - case _FN3: - oled_write_P(PSTR("FN3 "), false); - break; - case _FN4: - oled_write_P(PSTR("FN4 "), false); - break; - case _RGB: - oled_write_P(PSTR("RGB "), false); - break; - default: - oled_write_P(PSTR(" ?? "), false); // Should never display, here as a catchall - } - oled_write_P(keymap_config.no_gui ? PSTR(" WL") : PSTR(" "), false); - oled_set_cursor(8,3); - if (get_highest_layer(layer_state) == get_selected_layer()) { - oled_write_P(PSTR(" "), false); - } else { - switch (get_highest_layer(layer_state)) { - case _BASE: - oled_write_P(PSTR("Temp BASE"), false); - break; - case _FN1: - oled_write_P(PSTR("Temp FN "), false); - oled_write(selectedkey_rec.keydesc, false); - break; - case _FN2: - oled_write_P(PSTR("Temp FN2 "), false); - break; - case _FN3: - oled_write_P(PSTR("Temp FN3 "), false); - break; - case _FN4: - oled_write_P(PSTR("Temp FN4 "), false); - break; - case _RGB: - oled_write_P(PSTR("Temp RGB "), false); - break; - default: - oled_write_P(PSTR("Temp ????"), false); // Should never display, here as a catchall - } - } - led_t led_state = host_keyboard_led_state(); - oled_set_cursor(8,0); - oled_write_P(PSTR(" JONAVIN "), false); - oled_set_cursor(8,1); - oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR(" "), false); - oled_write_P(led_state.scroll_lock ? PSTR("SCR") : PSTR(" "), false); - return false; - } - #endif // LANDSCAPE_MODE - - // regular mode - #ifndef LANDSCAPE_MODE - bool oled_task_user(void) { - render_logo(); - oled_set_cursor(0,5); - - oled_write_ln_P(PSTR("-JV-"), false); - oled_write_ln_P(PSTR(" "), false); - - bool showSelectedKey = false; - switch (get_highest_layer(layer_state)) { - case _BASE: - oled_write_ln_P(PSTR("BASE"), false); - break; - case _FN1: - oled_write_ln_P(PSTR("FN 1"), false); - showSelectedKey = true; - break; - case _FN2: - oled_write_ln_P(PSTR("FN 2"), false); - break; - case _FN3: - oled_write_ln_P(PSTR("FN 3"), false); - break; - case _FN4: - oled_write_ln_P(PSTR("FN 4"), false); - break; - case _RGB: - oled_write_ln_P(PSTR("RGB "), false); - break; - default: - oled_write_ln_P(PSTR(" ?? "), false); - } - if (showSelectedKey) oled_write_ln(selectedkey_rec.keydesc, false); - else oled_write_ln_P(PSTR(" "), false); - - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); - oled_set_cursor(0,11); - oled_write_ln_P(led_state.num_lock ? PSTR(" NUM") : PSTR(" "), false); - oled_write_ln_P(led_state.caps_lock ? PSTR(" CAP") : PSTR(" "), false); - oled_write_ln_P(led_state.scroll_lock ? PSTR(" SCR") : PSTR(" "), false); - return false; - } - #endif // !LANDSCAPE_MODE - - void suspend_power_down_user(void) { // shutdown oled when powered down to prevent OLED from showing Mercutio all the time - oled_off(); - rgblight_disable_noeeprom(); - } - - void suspend_wakeup_init_user(void) { - rgblight_enable_noeeprom(); - } -#endif diff --git a/keyboards/mechwild/murphpad/keymaps/jonavin/layout_landscape.h b/keyboards/mechwild/murphpad/keymaps/jonavin/layout_landscape.h deleted file mode 100644 index 2a3dce21d4..0000000000 --- a/keyboards/mechwild/murphpad/keymaps/jonavin/layout_landscape.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2021 Jonavin Eng - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "quantum.h" - -/* First section contains the physical layout of the board and position of keys. - * - * Second is a two-dimensional array which represents the switch matrix. - */ - -#define LAYOUT_landscape( \ - k50, k40, k30, \ - k51, k41, k31, k20, k10, k00, \ - k52, k42, k32, k21, k11, k01, \ - k53, k43, k33, k22, k12, k02, \ - k54, k44, k34, k23, k13, k03, \ - \ - BACK00, BACK01, BACK02 \ -\ -) { \ - { BACK00, k00, k01, k02, k03 }, \ - { BACK01, k10, k11, k12, k13 }, \ - { BACK02, k20, k21, k22, k23 }, \ - { k30, k31, k32, k33, k34 }, \ - { k40, k41, k42, k43, k44 }, \ - { k50, k51, k52, k53, k54 } \ -} - diff --git a/keyboards/mechwild/murphpad/keymaps/jonavin/readme.md b/keyboards/mechwild/murphpad/keymaps/jonavin/readme.md deleted file mode 100644 index 95835343e1..0000000000 --- a/keyboards/mechwild/murphpad/keymaps/jonavin/readme.md +++ /dev/null @@ -1,76 +0,0 @@ -Jonavin's Custom MurphPad Landscape Layout - -This allows you to use Murphpad in a horizontal/landscape orientation with extra layers - - - OLED has been rotated for landscape mode - - Keymap positions have been updated so it's easier to visualize the keymap in landscape - - [_BASE] = LAYOUT_landscape( - TT(_FN1), TT(_FN2), KC_MUTE, - - KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, KC_BSPC, - KC_TAB, KC_P7, KC_P8, KC_P9, KC_PDOT, KC_RGUI, - KC_RSFT, KC_P4, KC_P5, KC_P6, KC_COMMA, KC_RCTL, - KC_P0, KC_P1, KC_P2, KC_P3, KC_PENT, KC_RALT, - - _______, _______, _______ - ), - -NOTE: VIA is enabled, but it will show it in the normal orientation until I build a landscape layout version - -Special Features - - FN1 layer has encoder selectable key codes and displayed on OLED - - Change these in keymap.c to assign your desired key selection - - static const keycodedescType PROGMEM keyselection[] = { - // list of key codes that will be scrollled through by encoder and description - {"TASK ", KC_TASK}, - {"PREV ", KC_MEDIA_PREV_TRACK}, - {"NEXT ", KC_MEDIA_NEXT_TRACK}, - {"PLAY ", KC_MEDIA_PLAY_PAUSE}, - {"PrtScm", KC_PSCR}, - {"ScrLk", KC_SCLN}, - {"Break", KC_PAUS}, - {"C-A-D", KC_CAD}, // Ctrl-Alt-Del - {"AltF4", KC_AF4}, - {"RESET", QK_BOOT}, // firmware flash mode - }; - - - Additional encoder functionality - - While holding R Shift, changes layers - - While holding R Ctrl, navigates next or previous word - - While holding R Alt, media next track or previous track - - Otherwise change volume up/dn - - -rules.mk OPTIONS - Active features from userspace - - - STARTUP_NUMLOCK_ON = yes - - turns on NUMLOCK by default - -DEFAULT LANDSCAPE MAPPING - - - - -FN1 Layer 1 - - - - -FN2 Layer 2 - - - - -RGB Layer 5 - Use Shift+Encoder to get to RGB layer 5 - - - --------------- - -NORMAL / TRADITIONAL NON-LANDSCAPE NUMPAD LAYOUT - - - diff --git a/keyboards/mechwild/murphpad/keymaps/jonavin/rules.mk b/keyboards/mechwild/murphpad/keymaps/jonavin/rules.mk deleted file mode 100644 index 4887fb1bdc..0000000000 --- a/keyboards/mechwild/murphpad/keymaps/jonavin/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes - -STARTUP_NUMLOCK_ON = yes -ENCODER_DEFAULTACTIONS_ENABLE = no diff --git a/keyboards/mechwild/obe/keymaps/jonavin/config.h b/keyboards/mechwild/obe/keymaps/jonavin/config.h deleted file mode 100644 index 8a812f1550..0000000000 --- a/keyboards/mechwild/obe/keymaps/jonavin/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 Jonavin Eng - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#define TAPPING_TOGGLE 2 -// TT set to two taps - -/* Handle GRAVESC combo keys */ -#define GRAVE_ESC_ALT_OVERRIDE - //Always send Escape if Alt is pressed -#define GRAVE_ESC_CTRL_OVERRIDE - //Always send Escape if Control is pressed - -#define TAPPING_TERM 180 - -#ifdef RGBLIGHT_ENABLE - // Redefine number of LED - #ifdef RGBLED_NUM - #undef RGBLED_NUM - #endif // DEBUG - #define RGBLED_NUM 20 - - #define RGBLIGHT_LAYERS - #define RGBLIGHT_SLEEP -#endif // RGBLIGHT_ENABLE diff --git a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c b/keyboards/mechwild/obe/keymaps/jonavin/keymap.c deleted file mode 100644 index 1fa3378c16..0000000000 --- a/keyboards/mechwild/obe/keymaps/jonavin/keymap.c +++ /dev/null @@ -1,119 +0,0 @@ -/* Copyright 2021 Kyle McCreery - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include QMK_KEYBOARD_H -#include "jonavin.h" - -#ifdef RGBLIGHT_ENABLE - // Custom RGB Colours - #define HSV_OBE_BOW 180, 100, 100 // colour for matching keycaps -#endif // RGBLIGHT_ENABLE - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base */ - [_BASE] = LAYOUT( - KC_TSTOG,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_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, TT(_RAISE), 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_LSFTCAPSWIN,KC_Z, KC_X, KC_C, KC_V, KC_B, LT(_LOWER,KC_B), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_SFTUP,KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FN1), KC_RAISESPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - [_FN1] = LAYOUT( - KC_MUTE, 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_TRNS, KC_INS, - KC_HOME, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_NO, KC_NO, KC_NO, QK_BOOT, - KC_END, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NUM, KC_NO, KC_NO, KC_NO, KC_NO, KC_PGUP, KC_TRNS, - KC_TRNS,KC_WINLCK,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_HOME, KC_PGDN, KC_END - ), - [_LOWER] = LAYOUT( - EE_CLR, KC_TILD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_TRNS, KC_DEL, - RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, EMO_TEARS, EMO_SAD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_TOG, - RGB_HUD, KC_NO, KC_NO, EMO_SHRUG,KC_NO, KC_NO, KC_NO, KC_NO, EMO_JOY, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, - KC_NO, KC_NO, KC_NO, EMO_CONFUSE,KC_NO,KC_NO,KC_TRNS,EMO_NERVOUS, KC_NO, KC_NO, KC_NO, KC_NO, RGB_MOD, KC_TRNS, - KC_TRNS, KC_APP, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPD, RGB_RMOD,RGB_SPI - ), - [_RAISE] = LAYOUT( - KC_NO, KC_GRV, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_P0, KC_PMNS, KC_PPLS, KC_PSLS, KC_DEL, - KC_VOLU, KC_NO, KC_HOME,KC_UP, KC_END, KC_PGUP, KC_NO, KC_TAB, KC_P4, KC_P5, KC_P6, KC_NO, KC_NO, KC_NO, KC_PEQL, - KC_VOLD,TT(_RAISE),KC_LEFT,KC_DOWN,KC_RGHT, KC_PGDN, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_NO, KC_PAST, KC_PENT, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_P0, KC_00, KC_NO, KC_PDOT, KC_PSLS, CT_PGUP, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CT_HOME, CT_PGDN, CT_END - ) -}; - -#ifdef RGBLIGHT_ENABLE - - enum custom_rgblight_layers - { - _rgbWINLOCK, _rgbFN, - _rgbLOWER, - _rgbRAISE - }; - - // Optional RGB Light Mapping Zones {LED Posiiton, Number of LEDs, Colour} - const rgblight_segment_t PROGMEM _rgb_winlock_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {1, 3, HSV_RED}, - {15, 3, HSV_RED} - ); - const rgblight_segment_t PROGMEM _rgb_fn_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {6, 6, HSV_PURPLE} - ); - // Light LEDs 9 & 10 in cyan when keyboard layer 1 is active - const rgblight_segment_t PROGMEM _rgb_lower_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {4, 10, HSV_YELLOW} - ); - - const rgblight_segment_t PROGMEM _rgb_raise_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {3, 5, HSV_GREEN}, - {10, 5, HSV_GREEN} - ); - - const rgblight_segment_t* const PROGMEM _rgb_layers[] = RGBLIGHT_LAYERS_LIST( - _rgb_winlock_layer, - _rgb_fn_layer, - _rgb_lower_layer, - _rgb_raise_layer - ); - - bool led_update_user(led_t led_state) { - rgblight_set_layer_state(_rgbWINLOCK, keymap_config.no_gui); - writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); - #ifdef INVERT_NUMLOCK_INDICATOR - writePin(LED_NUM_LOCK_PIN, !led_state.num_lock); // inverse numlock indicator override - #else - writePin(LED_NUM_LOCK_PIN, led_state.num_lock); // normal, light LED when numlock on - #endif // INVERT_NUMLOCK_INDICATOR - return false; - } - - layer_state_t layer_state_set_user(layer_state_t state) { - rgblight_set_layer_state(_rgbFN, layer_state_cmp(state, _FN1)); - rgblight_set_layer_state(_rgbLOWER, layer_state_cmp(state, _LOWER)); - rgblight_set_layer_state(_rgbRAISE, layer_state_cmp(state, _RAISE)); - return state; - } -#endif // RGBLIGHT_ENABLE - -void keyboard_post_init_keymap(void) { - // keyboard_post_init_user() moved to userspace - #ifdef RGBLIGHT_ENABLE - rgblight_enable_noeeprom(); - rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); - rgblight_sethsv_noeeprom(HSV_OBE_BOW); // Default startup colour - rgblight_layers = _rgb_layers; - #endif -} - diff --git a/keyboards/mechwild/obe/keymaps/jonavin/readme.md b/keyboards/mechwild/obe/keymaps/jonavin/readme.md deleted file mode 100644 index ec17981caf..0000000000 --- a/keyboards/mechwild/obe/keymaps/jonavin/readme.md +++ /dev/null @@ -1,54 +0,0 @@ -# Jonavin's MechWild Orange Boy Ergo keymap - ---> This keymap makes use of user/jonavin userspace - -Features - - Split spacebars, Split Backspace - - Inverted Num Lock indicator (LED on when num lock if off) - - RGB Winlock indicator (requires LED stripto be installed) - - RGB Layer indicators: FN/MO1 - Purple; LOWER/MO2 - Yellow; RAISE/MO3/NumPad - Green - - quick demo https://youtu.be/gR1awbsouLk - -- Add PrtScr, Scroll Lock, Break, NumLock to Fn layer -- Implement Win key lock using Fn+Win -- Layer 2 (LOWER) when right B is held -- for emoticons -- Layer 2 RGB functions, and EEPROM Reset -- Layer 3 (RAISE) mod on Caps Lock with double-tap to switch to this layer, double tap to switch back - - provides arrows on WASD and additional nav keys + right hand numpad with 00; an be used for Alt Code entry - - left spacebar Backspace -- add double tap of Left Shift to toggle Caps Lock -- Up arrow is also Shift when held -- Pushing the encoder switches the default encoder scroll between volume control and Alt-Tab - - -rules.mk OPTIONS - Active features from userspace --------------------------------------------------- - -STARTUP_NUMLOCK_ON = yes -- turns on NUMLOCK by default - -ENCODER_DEFAULTACTIONS_ENABLE = yes -- Enables default encoder funtions - - holding Left shift, change layers - - holding right shift, Navigate page up/down - - holding Left Ctrl, navigate prev/next word - - holding Left Alt, change media prev/next track - - default is change volume - -TD_LSFT_CAPSLOCK_ENABLE = yes - - This will enable double tap on Left Shift to toggle CAPSLOCK when using KC_LSFTCAPS - -IDLE_TIMEOUT_ENABLE = yes - - Enables Timer functionality; for RGB idle timeouts that can be changed dynamically - -EMOTICON_ENABLE - - adds EMO_ keycodes for text emojis - -INVERT_NUMLOCK_INDICATOR - - inverts the Num lock indicator, LED is on when num lokc is off - -ALTTAB_SCROLL_ENABLE - - bind KS_TSTOG to a different key to change how this toggle happens - -## All layers diagram - diff --git a/keyboards/mechwild/obe/keymaps/jonavin/rules.mk b/keyboards/mechwild/obe/keymaps/jonavin/rules.mk deleted file mode 100644 index 6a9acf5d07..0000000000 --- a/keyboards/mechwild/obe/keymaps/jonavin/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes -RGBLIGHT_ENABLE = yes - -MOUSEKEY_ENABLE = no -TAP_DANCE_ENABLE = yes - -TD_LSFT_CAPSLOCK_ENABLE = yes -STARTUP_NUMLOCK_ON = yes -ENCODER_DEFAULTACTIONS_ENABLE = yes -EMOTICON_ENABLE = yes -INVERT_NUMLOCK_INDICATOR = yes - -ALTTAB_SCROLL_ENABLE = yes diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h index 53263d764e..ad4823c741 100644 --- a/keyboards/mechwild/puckbuddy/config.h +++ b/keyboards/mechwild/puckbuddy/config.h @@ -7,9 +7,6 @@ /* Define custom font */ #define OLED_FONT_H "keyboards/mechwild/puckbuddy/glcdfont.c" -/* allows the "key" button on the blackpill to toggle caps lock for user testing before soldering */ -#define DIP_SWITCH_PINS { A0 } - /* set the tapping term for glidepoint pad to register a tap click */ //#define CIRQUE_PINNACLE_TAPPING_TERM 0 // This is set to 0 to disable it diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json index 503d9b4429..56bac432b8 100644 --- a/keyboards/mechwild/puckbuddy/info.json +++ b/keyboards/mechwild/puckbuddy/info.json @@ -13,6 +13,9 @@ "rows": ["B12", "B13", "B14", "B15"] }, "diode_direction": "COL2ROW", + "dip_switch": { + "pins": ["A0"] + }, "encoder": { "rotary": [ {"pin_a": "B1", "pin_b": "B0"}, diff --git a/keyboards/mechwild/sugarglider/config.h b/keyboards/mechwild/sugarglider/config.h index 75aa26956c..b092db627b 100644 --- a/keyboards/mechwild/sugarglider/config.h +++ b/keyboards/mechwild/sugarglider/config.h @@ -3,8 +3,6 @@ #pragma once -#define DYNAMIC_KEYMAP_LAYER_COUNT 5 - /* Matrix COL and ROW definitions */ #define MATRIX_ROWS 9 #define MATRIX_COLS 6 @@ -16,9 +14,6 @@ /* Define custom font */ #define OLED_FONT_H "keyboards/mechwild/sugarglider/glcdfont.c" -/* allows the "key" button on the blackpill to toggle caps lock for user testing before soldering */ -#define DIP_SWITCH_PINS { A0 } - #define CIRQUE_PINNACLE_TAP_ENABLE #define POINTING_DEVICE_GESTURES_SCROLL_ENABLE diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json index f8439dde11..c9095b3db4 100644 --- a/keyboards/mechwild/sugarglider/info.json +++ b/keyboards/mechwild/sugarglider/info.json @@ -23,6 +23,9 @@ "force_nkro": true }, "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 5 + }, "rgblight": { "led_count": 10, "max_brightness": 255, @@ -51,6 +54,9 @@ "build": { "debounce_type": "sym_eager_pk" }, + "dip_switch": { + "pins": ["A0"] + }, "encoder": { "rotary": [ {"pin_a": "B0", "pin_b": "A2", "resolution": 4}, diff --git a/keyboards/mechwild/sugarglider/keymaps/default/keymap.c b/keyboards/mechwild/sugarglider/keymaps/default/keymap.c index ad0470a139..344dabfd2d 100644 --- a/keyboards/mechwild/sugarglider/keymaps/default/keymap.c +++ b/keyboards/mechwild/sugarglider/keymaps/default/keymap.c @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -#include "keymap_steno.h" // Defines names for use in layer keycodes and the keymap enum layer_names { diff --git a/keyboards/mechwild/sugarglider/rules.mk b/keyboards/mechwild/sugarglider/rules.mk index 9cfa6b7797..6fd0836a73 100644 --- a/keyboards/mechwild/sugarglider/rules.mk +++ b/keyboards/mechwild/sugarglider/rules.mk @@ -13,7 +13,7 @@ CUSTOM_MATRIX = lite VPATH += drivers/gpio SRC += mcp23018.c matrix.c -QUANTUM_LIB_SRC += i2c_master.c +I2C_DRIVER_REQUIRED = yes DEFAULT_FOLDER = mechwild/sugarglider/wide_oled |