From 1a539a8a1ba63b7dde799d10308edb26b9d78cbf Mon Sep 17 00:00:00 2001 From: Sepultor Date: Mon, 17 Apr 2023 16:45:20 -0500 Subject: [PATCH 01/61] userspace updates --- .../pi40/keymaps/miketronic/config1.h | 72 +++ .../pi40/keymaps/miketronic/keymap.c | 181 ++++++++ .../pi40/keymaps/miketronic/rules1.mk | 71 +++ keyboards/hazel/satpad/config.h | 22 + keyboards/hazel/satpad/info.json | 9 + .../hazel/satpad/keymaps/17APR23/config.h | 78 ++++ .../satpad/keymaps/17APR23/keymap - BAK.c | 435 ++++++++++++++++++ .../hazel/satpad/keymaps/17APR23/keymap.c | 219 +++++++++ .../hazel/satpad/keymaps/17APR23/rules.mk | 23 + .../hazel/satpad/keymaps/default/config.h | 19 + .../satpad/keymaps/default/keymap - SATCOPY.c | 132 ++++++ .../hazel/satpad/keymaps/default/keymap.c | 132 ++++++ .../hazel/satpad/keymaps/default/rules.mk | 7 + .../hazel/satpad/keymaps/miketronic/config.h | 78 ++++ .../keymaps/miketronic/keymap - plain.c | 284 ++++++++++++ .../hazel/satpad/keymaps/miketronic/keymap.c | 219 +++++++++ .../hazel/satpad/keymaps/miketronic/readme.md | 17 + .../keymaps/miketronic/rules - backup.mk | 17 + .../hazel/satpad/keymaps/miketronic/rules.mk | 23 + keyboards/hazel/satpad/readme.md | 15 + keyboards/hazel/satpad/rules.mk | 24 + keyboards/hazel/satpad/satpad.c | 1 + keyboards/hazel/satpad/satpad.h | 32 ++ users/miketronic | 1 + 24 files changed, 2111 insertions(+) create mode 100644 keyboards/1upkeyboards/pi40/keymaps/miketronic/config1.h create mode 100644 keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c create mode 100644 keyboards/1upkeyboards/pi40/keymaps/miketronic/rules1.mk create mode 100644 keyboards/hazel/satpad/config.h create mode 100644 keyboards/hazel/satpad/info.json create mode 100644 keyboards/hazel/satpad/keymaps/17APR23/config.h create mode 100644 keyboards/hazel/satpad/keymaps/17APR23/keymap - BAK.c create mode 100644 keyboards/hazel/satpad/keymaps/17APR23/keymap.c create mode 100644 keyboards/hazel/satpad/keymaps/17APR23/rules.mk create mode 100644 keyboards/hazel/satpad/keymaps/default/config.h create mode 100644 keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c create mode 100644 keyboards/hazel/satpad/keymaps/default/keymap.c create mode 100644 keyboards/hazel/satpad/keymaps/default/rules.mk create mode 100644 keyboards/hazel/satpad/keymaps/miketronic/config.h create mode 100644 keyboards/hazel/satpad/keymaps/miketronic/keymap - plain.c create mode 100644 keyboards/hazel/satpad/keymaps/miketronic/keymap.c create mode 100644 keyboards/hazel/satpad/keymaps/miketronic/readme.md create mode 100644 keyboards/hazel/satpad/keymaps/miketronic/rules - backup.mk create mode 100644 keyboards/hazel/satpad/keymaps/miketronic/rules.mk create mode 100644 keyboards/hazel/satpad/readme.md create mode 100644 keyboards/hazel/satpad/rules.mk create mode 100644 keyboards/hazel/satpad/satpad.c create mode 100644 keyboards/hazel/satpad/satpad.h create mode 160000 users/miketronic diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/config1.h b/keyboards/1upkeyboards/pi40/keymaps/miketronic/config1.h new file mode 100644 index 000000000000..c85792b459f5 --- /dev/null +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/config1.h @@ -0,0 +1,72 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#pragma once + +// specific defines example +// #if defined(TAP_DANCE_ENABLE) && defined(KEYBOARD_lets_split_rev2) || defined(KEYBOARD_keebio_iris_rev2) + + + +// Common QMK settings +#define DEBOUNCE 10 +#if defined(TAP_DANCE_ENABLE) + #define TAP_CODE_DELAY 5 + #define TAP_HOLD_CAPS_DELAY 25 +#endif +#define ENCODER_RESOLUTION 4 + + + +////////////// +// For Pi40 // +////////////// +#if defined(KEYBOARD_1upkeyboards_pi40_mit_v1_0) + +// Tapping Config +// https://docs.qmk.fm/#/tap_hold?id=tapping_term +// https://docs.qmk.fm/#/ChangeLog/20230226?id=quick-tap-term + +// Tap-hold settings + #if defined(TAP_DANCE_ENABLE) + #define TAPPING_TERM 170 + #define TAPPING_TERM_PER_KEY + #define QUICK_TAP_TERM TAPPING_TERM / 2 + #define QUICK_TAP_TERM_PER_KEY + #endif + +#define PERMISSIVE_HOLD_PER_KEY +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY + +#endif + + + + + + +//////////////// +// For SATPAD // +//////////////// +#if defined(KEYBOARD_jasonhazel_satpad) + +// bootloader (first top leftmost key) +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 1 + +#define MATRIX_ROWS 7 +#define MATRIX_COLS 6 + +#define MATRIX_ROW_PINS { B3, B2, B6, D3, D2, D4, E6 } +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7 } + +#define DIODE_DIRECTION COL2ROW + +#define DEBOUNCE 5 + +#define ENCODERS_PAD_A {B4} +#define ENCODERS_PAD_B {B5} + +#endif + + diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c new file mode 100644 index 000000000000..132145534074 --- /dev/null +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c @@ -0,0 +1,181 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#include QMK_KEYBOARD_H +#include "miketronic.h" + + + + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Workman + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ TAB │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ BSPC│ + * │ ESC │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ ; │ ; │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ TAB │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ │ + * │SHIFT│ │ │ ┃ EX ┃ │ │ ┃ ┃ │ │ENTER│ENTER│ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │SHIFT| Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ / │ UP | + * │ │ │ │ │ │ │ │ │ │ , │ . │ │RIGHT| + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ FN │CTRL │ OS │ ALT │LOWER│ │ │ │RAISE│ SS │CLIP │COPY │ DN │ + * │ │ │ │ │ │ │ │ │ │ │ │PASTE│LEFT │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + + [_WM] = LAYOUT_ortho_4x12_wrapper ( + RGB_TOG, \ + _____________WORKMAN_412_001_L_____________, _____________WORKMAN_412_001_R_____________, \ + _____________WORKMAN_412_002_L_____________, _____________WORKMAN_412_002_R_____________, \ + _____________WORKMAN_412_003_L_____________, _____________WORKMAN_412_003_R_____________, \ + _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ \ + ), + + [_QW] = LAYOUT_ortho_4x12_wrapper ( + RGB_TOG, \ + KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \ + KC_ESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, \ + KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT, \ + FN, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_DOWN, KC_UP, KC_RGHT, T_DL \ + ), + + + + + /* Lower + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ () │ [] │ /\ │ │ │ │ │ │ │ 7 │ 8 │ 9 │ 0 │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ @ # │ & % │ │ ┃ ┃ │ │ ┃ ┃ 4 │ 5 │ 6 │ │ + * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ 1 │ 2 │ 3 │ UP │ + * │ │ │ │ │ │ │ │ │ │ │ │ │RIGHT│ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │LOWER│ │ │ │ │BPSC │ SPC │ . │ DN │ + * │ │ │ │ │ │ │ │ │ │ │ │ ENT │LEFT │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + [_LOWER] = LAYOUT_ortho_4x12_wrapper ( + KC_MUTE, \ + T_XX, T_YY, T_SL, _______, _______, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, \ + T_ATH, T_PRAM, _______, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, T_UR, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, KC_SPC, T_DENT, T_DL \ + ), + + + /* RAISE + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │BOOT │DEBUG│ │ │ │MAKE │ │ │ │ F7 │ F8 │ F9 │ F10 │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ │ RGB | RGB | RGB ┃ RGB ┃ │ │ ┃ / \ ┃ F4 │ F5 │ F6 │ F11 │ + * │ │ TOG │ MOD │ HUI ┃ HUD ┃ │ │ ┃ ┃ │ │ │ │ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │ │ RGB │ RGB │ RGB │ RGB │ │ │ │ _ │ F1 | F2 | F3 │ F12 │ + * │ │ SAI │ SAD │ VAI │ VAD │ │ │ │ - │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │RAISE│ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + [_RAISE] = LAYOUT_ortho_4x12_wrapper ( + KC_MUTE, \ + QK_BOOT, DB_TOGG, _______, _______, MAKE, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, \ + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, KC_F4, KC_F5, KC_F6, KC_F11, \ + _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, T_UMIN, KC_F1, KC_F2, KC_F3, KC_F12, \ + _______, WM, QW, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + + + /* EXTRAS + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ ! │ │ │ │ │ │ │ │ /\ | [ | ] | ; │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │SHIFT│ | |EXTRA┃ ┃ │ │ ┃ ┃ ( | ) | ' | │ + * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ , | . | ? │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ FN │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + [_EX] = LAYOUT_ortho_4x12_wrapper ( + KC_MUTE, \ + _______, KC_EXLM, _______, _______, _______, _______, _______, T_SL, KC_LBRC, KC_RBRC, KC_SCLN, _______, \ + KC_LSFT, _______, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_QUOT, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_QUES, _______, \ + _______, _______, _______, _______, _______, T_SE, T_SE, _______, _______, _______, _______, _______ \ + ), + + + + /* FUNCTION + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │COPY │CLIP │ SS │ │ │ │ │ │ /\ │ │ UP │ │ DEL │ + * │PASTE│ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │TAB │ M05 | M06 | M07 ┃ M08 ┃ │ │ ┃ ┃LEFT │DOWN │RIGHT│UP │ + * │SHIFT│ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │RIGHT│ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ │ , | . | ? │DOWN │ + * │ │ │ │ │ │ │ │ │ │ │ │ │LEFT │ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ FN │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + [_FN] = LAYOUT_ortho_4x12_wrapper ( + KC_MUTE, \ + T_CP, CLIP, SS, _______, _______, _______, _______, T_SL, _______, KC_UP, _______, KC_DEL, \ + KC_TAB, M05, M06, M07, M08, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, T_UR, \ + _______, M01, M02, M03, M04, _______, _______, _______, T_QEXC, KC_COMM, KC_DOT, T_DL, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ), + + + /* SYMBOLS + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ $ | ^ | < | > │ SYMB│ │ │ │ SYMB│ | | [ | ] | - | + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ % | : | ; | + ┃ = ┃ │ │ ┃ ┃ | ( | ) | _ | + * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * | & | ' | " | * | # | │ │ | ! | ? | / | \ | @ | + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ FN │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + + [_SYMB] = LAYOUT_ortho_4x12_wrapper ( + KC_MUTE, \ + KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, _______, _______, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, \ + KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, \ + KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, _______, _______, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, \ + _______, WM, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + ) + +}; + +#if defined(ENCODER_MAP_ENABLE) && defined(KEYBOARD_1upkeyboards_pi40_mit_v1_0) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_WM] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) }, + [_QW] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_LOWER] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_RAISE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_EX] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_FN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_SYMB] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } +}; +#endif \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules1.mk b/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules1.mk new file mode 100644 index 000000000000..4d31f9c6cada --- /dev/null +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules1.mk @@ -0,0 +1,71 @@ + +# Common feature for all keyboards +BOOTMAGIC_ENABLE = yes +EXTRAKEY_ENABLE = yes +TAP_DANCE_ENABLE = yes +MACROS_ENABLED = yes +RGBLIGHT_ENABLE = no +RGB_MATRIX_ENABLE = no + +# idobao/id75 +ifeq ($(strip $(KEYBOARD)), idobao/id75/v1) + RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow + LEADER_ENABLE = yes + NKRO_ENABLE = yes + AUTO_SHIFT_ENABLE = no # Removed 09MAR23 + VIA_ENABLE = no + MOUSEKEY_ENABLE = no + EXTRAKEY_ENABLE = no + CONSOLE_ENABLE = no + COMMAND_ENABLE = no +endif + +# Satpad +ifeq ($(strip $(KEYBOARD)), jasonhazel/satpad) + BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite + MOUSEKEY_ENABLE = yes # Mouse keys + EXTRAKEY_ENABLE = yes # Audio control and System control + NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work + ENCODER_ENABLE = yes + ENCODER_MAP_ENABLE = yes + OLED_ENABLE = yes + LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. + AUTO_SHIFT_ENABLE = no # 24FEB23 Added 26FEB23 Removed + UNICODE_ENABLE = no # Unicode + CONSOLE_ENABLE = no # Console for debug + COMMAND_ENABLE = no # Commands for debug and configuration + RGBLIGHT_ENABLE = no + BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality + SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) + AUDIO_ENABLE = no # Audio output on port C6 + MIDI_ENABLE = no # MIDI support + BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +endif + + +# 1upkeyboards/pi40 +ifeq ($(strip $(KEYBOARD)), 1upkeyboards/pi40/mit_v1_0) + BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite + MOUSEKEY_ENABLE = no # Mouse keys + 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 + + AUTO_SHIFT_ENABLE = no + CONSOLE_ENABLE = no # Console for debug + COMMAND_ENABLE = no # Commands for debug and configuration + BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality + RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow + AUDIO_ENABLE = no # Audio output + + RGB_MATRIX_ENABLE = yes + RGB_MATRIX_DRIVER = WS2812 + WS2812_DRIVER = vendor + ENCODER_ENABLE = yes + ENCODER_MAP_ENABLE = yes + OLED_ENABLE = yes + OLED_DRIVER = SSD1306 +endif + + diff --git a/keyboards/hazel/satpad/config.h b/keyboards/hazel/satpad/config.h new file mode 100644 index 000000000000..a04faf4d8a6b --- /dev/null +++ b/keyboards/hazel/satpad/config.h @@ -0,0 +1,22 @@ +#pragma once + +#include "config_common.h" + +#define MATRIX_ROWS 7 +#define MATRIX_COLS 6 + +#define MATRIX_ROW_PINS { B3, B2, B6, D3, D2, D4, E6 } +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7 } + +#define DIODE_DIRECTION COL2ROW + +#define DEBOUNCE 5 + +#define ENCODERS_PAD_A {B4} +#define ENCODERS_PAD_B {B5} + +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 1 + +#define AUTO_SHIFT_TIMEOUT 150 +#define AUTO_SHIFT_MODIFIERS \ No newline at end of file diff --git a/keyboards/hazel/satpad/info.json b/keyboards/hazel/satpad/info.json new file mode 100644 index 000000000000..61a6fc14eb57 --- /dev/null +++ b/keyboards/hazel/satpad/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "SatPad", + "manufacturer": "jasonhazel", + "usb": { + "vid": "0x4A48", + "pid": "0x7370", + "device_version": "0.0.1" + } +} \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/17APR23/config.h b/keyboards/hazel/satpad/keymaps/17APR23/config.h new file mode 100644 index 000000000000..2e5f8fe2dc5c --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/17APR23/config.h @@ -0,0 +1,78 @@ +#pragma once +#include "config_common.h" + +// bootloader (first top leftmost key) +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 1 + +#define MATRIX_ROWS 7 +#define MATRIX_COLS 6 + +#define MATRIX_ROW_PINS { B3, B2, B6, D3, D2, D4, E6 } +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7 } + +#define DIODE_DIRECTION COL2ROW + +#define DEBOUNCE 5 + +#define ENCODERS_PAD_A {B4} +#define ENCODERS_PAD_B {B5} + + + + +// Behaviors That Can Be Configured + + +#define TAPPING_TERM 175 + // how long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too + +#define PERMISSIVE_HOLD + // makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM + +#define IGNORE_MOD_TAP_INTERRUPT + // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. + +#define TAPPING_FORCE_HOLD + // makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap) + // Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) + + +/* + #define TAPPING_TERM_PER_KEY + // enables handling for per key TAPPING_TERM settings + + #define RETRO_TAPPING + // tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release + + #define TAPPING_TOGGLE 2 + // how many taps before triggering the toggle + + #define LEADER_TIMEOUT 300 + // how long before the leader key times out + // If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. + + #define LEADER_PER_KEY_TIMING + // sets the timer for leader key chords to run on each key press rather than overall + + #define LEADER_KEY_STRICT_KEY_PROCESSING + // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. + + #define ONESHOT_TIMEOUT 300 + // how long before oneshot times out + + #define ONESHOT_TAP_TOGGLE 2 + // how many taps before oneshot toggle is triggered + + #define COMBO_COUNT 2 + // Set this to the number of combos that you're using in the Combo feature. + + #define COMBO_TERM 200 + // how long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined. + + #define TAP_CODE_DELAY 100 + // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds. + + #define TAP_HOLD_CAPS_DELAY 80 + // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS. The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher. +*/ diff --git a/keyboards/hazel/satpad/keymaps/17APR23/keymap - BAK.c b/keyboards/hazel/satpad/keymaps/17APR23/keymap - BAK.c new file mode 100644 index 000000000000..c04d49b74212 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/17APR23/keymap - BAK.c @@ -0,0 +1,435 @@ +//24MAR23 +#include QMK_KEYBOARD_H + + +enum layers { + _HOME, // home base layer + _LOWER, + _RAISE, + _ADJUST, + _EXTRAS, + _FN, + _SYMBOLS +}; + +// TAP DANCE DECLARATIONS ============================================================================ +enum { + T_BR = 0, // [, ] + // T_PA, // (, ) + T_SL, // slash, backslash + T_UR, // up, right + T_DL, // down, left + T_UMIN, // underscore, minus + T_QUOTE, // quote, double quote + T_DOTENT, // dot, enter + T_IENT, // I, enter + T_TSPC, // T, space + T_COMMSPC, // space, comma + T_DOTSPC, // space, dot + T_QEXC, // Tap once for ?, twice for ! + T_QESC, // Tap once for "q", twice for escape + // T_NENT, // N, enter + // T_TE, // tab, escape + T_CP, // copy, paste + T_XX, // open/close paren + T_YY, // open/close brackets + T_ATH, // @, # + T_PRAM, // %, & + T_SBAK, // Tap once for semicolon, twice for backspace +}; + + +//TAP DANCE DEFINITIONS =========================================== +qk_tap_dance_action_t tap_dance_actions[] = { + [T_BR] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), // Tap once for [, twice for ] + // [T_PA] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN), + [T_SL] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_BSLS), + [T_UR] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_RGHT), + [T_DL] = ACTION_TAP_DANCE_DOUBLE(KC_DOWN, KC_LEFT), + [T_UMIN] = ACTION_TAP_DANCE_DOUBLE(KC_UNDS, KC_MINS), // Tap once for Underscore, twice for Minus + [T_QUOTE] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_DQUO), // Tap once for quote, twice for double quote + [T_DOTENT] = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_ENT), // Tap once for dot, twice for enter + [T_IENT] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_ENT), // Tap once for I, twice for enter + [T_TSPC] = ACTION_TAP_DANCE_DOUBLE(KC_T, KC_SPC), // Tap once for "t", twice for space + [T_COMMSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_COMM), // Tap once for space, twice for comm + [T_DOTSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_DOT), // Tap once for space, twice for dot + [T_QEXC] = ACTION_TAP_DANCE_DOUBLE(KC_QUES, KC_EXLM), // Tap once for ?, twice for ! + [T_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), // Tap once for "q", twice for escape + // [T_NENT] = ACTION_TAP_DANCE_DOUBLE(KC_N, KC_ENT), // Tap once for "n", twice for enter + // [T_TE] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_ESC), // Tap once for tab, twice for esc + [T_CP] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_C), LCTL(KC_V)), + [T_XX] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN), + [T_YY] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), + [T_ATH] = ACTION_TAP_DANCE_DOUBLE(KC_AT, KC_HASH), + [T_PRAM] = ACTION_TAP_DANCE_DOUBLE(KC_PERC, KC_AMPR), + [T_SBAK] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_BSPC), // Tap once for semicolon, twice for backspace + //[X_CTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, x_finished, x_reset) + +}; + +#define XXXX KC_NO + +// Defines for task manager and such +#define CALTDEL LCTL(LALT(KC_DEL)) +// #define TSKMGR LCTL(LSFT(KC_ESC)) +#define CLIP LCTL(LALT(KC_Q)) // Clipboard +#define SS LCTL(LALT(KC_G)) // Greenshot region +#define FNZ LT(_FN, KC_Z) // Z when tapped, FN layer MO +#define CTRLX MT(MOD_LCTL, KC_X) // X when tapped, Ctrl when held +#define TBSHFT MT(MOD_LSFT, KC_TAB) // Tab when tapped, Shift when held +// #define LOWER MO(_LOWER) +// #define RAISE MO(_RAISE) + +/* ========================================================================== + MACROS + ========================================================================== +*/ + +// Macro Declarations +enum custom_keycodes { + CK_TRIPLEZERO = SAFE_RANGE, + M01, + M02, + M03, + M04, + M05, + M06, + M07, + M08 +}; + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* + * LEGEND: + * + * ,--------------------------------. + * | Top row: shifted character | + * | Central row: standard char | + * | Bottom row: hold modifier | + * `--------------------------------' + * + * "____" means free to be assigned + * + */ + +/* Workman Home Layer + * ,----------------------------------------------------------------------------. + * | | | | | | | | | | | | + * | Q | D | R | W | B | | J | F | U | P | ; | + * |Escape| FN | | |SYMBOL| |SYMBOL| | | |BKSPC | + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | A | S | H | T | G | | Y | N | E | O | I | + * | Shift| | |EXTRAS| OSkey| | OSkey| | | | Enter| + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | Z | X | M | C | V | | K | L | Space| Space| /\ | + * | FN | CTRL | OS | ALT |LOWER | | RAISE| Alt | , | . | | + * '----------------------------------------------------------------------------' + * + * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca + * + */ + [_HOME] = LAYOUT_3x11( + T_QESC, LT(_FN, KC_D), KC_R, KC_W, LT(_SYMBOLS, KC_B), XXXX, LT(_SYMBOLS, KC_J), KC_F, KC_U, KC_P, T_SBAK, + MT(MOD_LSFT, KC_A), KC_S, KC_H, LT(_EXTRAS, KC_T), MT(MOD_LGUI, KC_G), XXXX, MT(MOD_RGUI, KC_Y), KC_N, KC_E, KC_O, T_IENT, + FNZ, CTRLX, MT(MOD_LGUI, KC_M), MT(MOD_LALT, KC_C), LT(_LOWER, KC_V), XXXX, LT(_RAISE, KC_K), MT(MOD_LALT, KC_L), TD(T_COMMSPC), TD(T_DOTSPC), KC_SLSH + ), + + + + +/* LOWER LAYER + * ,----------------------------------------------------------------------------. + * | | | | | | | | & | * | ( | ) | + * | () | [] | / \ | | | | / \ | 7 | 8 | 9 | 0 | + * | | | | | | | ____ | ____ | ____ | ____ | Shift| + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | $ | % | ^ | | + * | @ # | & % | | | | | [ ] | 4 | 5 | 6 | Del | + * | | | | | | | ____ | ____ | ____ | ____ | Shift| + * | -----+------+------+------+------+------|------+------+------+------+------| + * | | | | | XXXX | | | ! | @ | # | | + * | | | | | XXXX | | | 1 | 2 | 3 | . | + * | | | | | XXXX | | ____ | ____ | ____ | ____ | Enter| + * '----------------------------------------------------------------------------' + */ + [_LOWER] = LAYOUT_3x11( + T_XX, T_YY, T_SL, XXXX, XXXX, XXXX, T_SL, KC_7, KC_8, KC_9, MT(MOD_RSFT, KC_0), + T_ATH, T_PRAM, _______, XXXX, XXXX, XXXX, T_YY, KC_4, KC_5, KC_6, MT(MOD_RSFT, KC_DEL), + XXXX, XXXX, XXXX, XXXX, _______, XXXX, _______, KC_1, KC_2, KC_3, TD(T_DOTENT) + ), + +/* RAISE LAYER + * ,----------------------------------------------------------------------------. + * | ! | @ | # | $ | % | | ^ | & | * | ( | ) | + * | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | + * | ____ | ____ | ____ | ____ | ____ | | ____ | ____ | Alt | Ctrl | Shift| + * |------+------+------+------+------+------+------+------+------+------+------| + * | | ~ | _ | + | { | | _ | | | : | " | | + * | TAB | ` | - | = | [ | | - | \ | ; | ' | Del | + * | Shift| ____ | ____ | AltGr| OSkey| | ____ | AltGr| ____ | ____ | Shift| + * | -----+------+------+------+------+------|------+------+------+------+------| + * | | | | | | | XXXX | > | ? | | | + * | |BackSp| Del | Enter| | | XXXX | . | / | Enter| | + * | | Ctrl | Alt | ____ | ____ | | XXXX | Alt | Ctrl | Shift| | + * '----------------------------------------------------------------------------' + */ + [_RAISE] = LAYOUT_3x11( + KC_1, KC_2, KC_3, KC_4, KC_5, _______, KC_6, KC_7, MT(MOD_LALT, KC_8), MT(MOD_RCTL,KC_9), MT(MOD_RSFT, KC_0), + TBSHFT, KC_GRV, KC_MINS, MT(MOD_RALT, KC_EQL), MT(MOD_LGUI, KC_LBRC), _______, T_UMIN, MT(MOD_RALT, KC_BSLS), KC_SCLN, KC_QUOT, MT(MOD_RSFT, KC_DEL), + KC_LEFT, MT(KC_LCTL, KC_BSPC), MT(KC_LALT, KC_DEL), KC_ENT, _______, XXXX, _______, MT(MOD_LALT, KC_DOT), MT(MOD_RCTL, KC_SLSH), MT(MOD_RSFT, KC_ENT), KC_RGHT + ), + +/* ADJUST LAYER (LOWER + RAISE) + * ,----------------------------------------------------------------------------. + * | | | | | | | | | | | | + * | BOOT | | | | | | | | | |CALTDEL| + * | | ____ | ____ | ____ | ____ | | ____ | ____ | ____ | ____ | ____ | + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | TAB | | | | | | | | | | Del | + * | Shift| ____ | ____ | ____ | ____ | | ____ | ____ | ____ | ____ | Shift| + * | -----+------+------+------+------+------|------+------+------+------+------| + * | | | | | XXXX | | XXXX | | | | | + * | | | | | XXXX | | XXXX | | | | . | + * | | | | | XXXX | | XXXX | ____ | ____ | ____ | Enter| + * '----------------------------------------------------------------------------' + */ + [_ADJUST] = LAYOUT_3x11( + QK_BOOT, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, CALTDEL, + TBSHFT, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, MT(MOD_RSFT, KC_DEL), + XXXX, XXXX, XXXX, XXXX, _______, XXXX, _______, XXXX, XXXX, XXXX, MT(KC_ENT, KC_DOT) + ), + +/* EXTRAS LAYER + * ,----------------------------------------------------------------------------. + * | | | | | | | | | | | | + * | ! | | | | | | /\ | | | | ; | + * | | ____ | ____ | ____ | ____ | | ____ | ____ | ____ | ____ | ____ | + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * |SHIFT | | |EXTRAS| | | | | | | ' | + * | | ____ | ____ | ____ | ____ | | ____ | ____ | ____ | ____ | ____ | + * | -----+------+------+------+------+------|------+------+------+------+------| + * | | | | | | | | | | | | + * | | | | | | | | | , | . | ? | + * | | | | | | | | ____ | ____ | ____ | ____ | + * '----------------------------------------------------------------------------' + */ + [_EXTRAS] = LAYOUT_3x11( + KC_EXLM, XXXX, XXXX, XXXX, XXXX, XXXX, TD(T_SL), XXXX, XXXX, XXXX, KC_SCLN, + KC_LSFT, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, KC_QUOT, + XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, KC_COMM, KC_DOT, KC_QUES + ), + + +/* FUNCTION LAYER + * ,----------------------------------------------------------------------------. + * |1COPY | | | | | | | | | | | + * |2PASTE| CLIP | SS | | | | / \ | | UP | |DELETE| + * | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | TAB | M05 | M06 | M07 | M08 | | | LEFT | DOWN | RIGHT| UP | + * | Shift| | | | | | | | | | RIGHT| + * |------+------+------+------+------+------+------+------+------+------+------| + * | XXXX | | | | | | | | | | | + * | XXXX | M01 | M02 | M03 | M04 | | | ? | , | . | DOWN | + * | XXXX | | | | | | | ! | ____ | ____ | LEFT | + * '----------------------------------------------------------------------------' + */ + + [_FN] = LAYOUT_3x11( + TD(T_CP), CLIP, SS, XXXX, XXXX, XXXX, TD(T_SL), XXXX, KC_UP, XXXX, KC_DEL, + TBSHFT, M05, M06, M07, M08, XXXX, XXXX, KC_LEFT, KC_DOWN, KC_RGHT, TD(T_UR), + _______, M01, M02, M03, M04, XXXX, XXXX, XXXX, XXXX, XXXX, TD(T_DL) + ), + + +/* SYMBOLS + * ,----------------------------------------------------------------------------. + * | | | | | XXXX | | XXXX | | | | | + * | $ | ^ | < | > | XXXX | | XXXX | | | [ | ] | - | + * | | | | | XXXX | | XXXX | | | | | + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | % | : | ; | + | = | | | | ( | ) | _ | + * | | | | | | | | | | | | + * | -----+------+------+------+------+------|------+------+------+------+------| + * | | | | | | | | | | | | + * | & | ' | " | * | # | | ! | ? | / | \ | @ | + * | | | | | | | | | | | | + * '----------------------------------------------------------------------------' + * + * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca + */ + [_SYMBOLS] = LAYOUT_3x11( + KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXX, _______, XXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, + KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, + KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, _______, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT + ), + + + +}; + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} + +void matrix_init_user(void) { + // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values + // set num lock on at start (for numonly layer to work) + if (!host_keyboard_led_state().num_lock) { + tap_code(KC_NUM_LOCK); + } +} + +void matrix_scan_user(void) { +} + + +// Macro Definitions +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch(keycode) { + + case M01: + if (record->event.pressed) { + SEND_STRING("//a11"); + } + break; + + case M02: + if (record->event.pressed) { + SEND_STRING("//a12"); + } + break; + + case M03: + if (record->event.pressed) { + SEND_STRING("//a08"); + } + break; + + case M04: + if (record->event.pressed) { + SEND_STRING("//a09"); + } + break; + + case M05: + if (record->event.pressed) { + SEND_STRING("//th"); + } + break; + + case M06: + if (record->event.pressed) { + SEND_STRING("//re"); + } + break; + + case M07: + if (record->event.pressed) { + SEND_STRING("//yw"); + } + break; + + case M08: + if (record->event.pressed) { + tap_random_base64(); + } + break; + + case CK_TRIPLEZERO: + if (record->event.pressed) { + SEND_STRING("000"); + } // else { when released } + break; + } + return true; + }; + +/* +void keyboard_pre_init_user(void) { + // Set our LED pins as output + setPinOutput(D5); + setPinOutput(B0); +} + +bool led_update_user(led_t led_state) { + writePin(D5, !led_state.num_lock); + writePin(B0, !led_state.caps_lock); + return false; // prevent keyboard from processing state +} +*/ + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_HOME] = { ENCODER_CCW_CW(LCTL(KC_V), LCTL(KC_C)) }, + [_SYMBOLS] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_RAISE] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_LOWER] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_ADJUST] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_EXTRAS] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_FN] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, +}; + + +oled_rotation_t oled_init_user(oled_rotation_t rotation){ + return OLED_ROTATION_270; +} + +/* +bool oled_task_user(void) { + uint8_t modifiers = get_mods() | get_oneshot_mods(); + + oled_set_cursor(0, 11); + oled_write_P(PSTR("SHIFT"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); + oled_write_P(PSTR("CNTRL"), (modifiers & MOD_MASK_CTRL)); + + return true; +} +*/ + +#ifdef OLED_ENABLE +bool oled_task_user(void) { + // Host Keyboard Layer Status + oled_write_P(PSTR("LAYER\n-----\n"), false); + + switch (get_highest_layer(layer_state)) { + case _LOWER: + oled_write_P(PSTR("LOWER"), false); + break; + case _RAISE: + oled_write_P(PSTR("RAISE"), false); + break; + case _EXTRAS: + oled_write_P(PSTR("EXTRA"), false); + break; + case _FN: + oled_write_P(PSTR("FUNCT"), false); + break; + case _ADJUST: + oled_write_P(PSTR(" ADJ "), false); + break; + case _SYMBOLS: + oled_write_P(PSTR("SYMB"), false); + break; + default: + // Or use the write_ln shortcut over adding '\n' to the end of your string + oled_write_ln_P(PSTR("HOME"), false); + } + +// Host Keyboard LED Status + // led_t led_state = host_keyboard_led_state(); + // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + return false; +} +#endif + diff --git a/keyboards/hazel/satpad/keymaps/17APR23/keymap.c b/keyboards/hazel/satpad/keymaps/17APR23/keymap.c new file mode 100644 index 000000000000..b162e6eb453f --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/17APR23/keymap.c @@ -0,0 +1,219 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#include QMK_KEYBOARD_H +#include "miketronic.h" + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Workman + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ TAB │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ BSPC│ + * │ ESC │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ ; │ ; │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ TAB │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ │ + * │SHIFT│ │ │ ┃ EX ┃ │ │ ┃ ┃ │ │ENTER│ENTER│ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │SHIFT| Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ / │ UP | + * │ │ │ │ │ │ │ │ │ │ , │ . │ │RIGHT| + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ FN │CTRL │ OS │ ALT │LOWER│ │ │ │RAISE│ SS │CLIP │COPY │ DN │ + * │ │ │ │ │ │ │ │ │ │ │ │PASTE│LEFT │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ +/* Workman Home Layer + * ,----------------------------------------------------------------------------. + * | | | | | | | | | | | | + * | Q | D | R | W | B | | J | F | U | P | ; | + * |Escape| FN | | |SYMBOL| |SYMBOL| | | |BKSPC | + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | A | S | H | T | G | | Y | N | E | O | I | + * | Shift| | |EXTRAS| OSkey| | OSkey| | | | Enter| + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | Z | X | M | C | V | | K | L | Space| Space| /\ | + * | FN | CTRL | OS | ALT |LOWER | | RAISE| Alt | , | . | | + * '----------------------------------------------------------------------------' + * + * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca + * + */ + [_WM] = LAYOUT ( + _____________WORKMAN_311_001_L_____________, _____________WORKMAN_311_001_R_____________, + _____________WORKMAN_311_002_L_____________, _____________WORKMAN_311_002_R_____________, + _____________WORKMAN_311_003_L_____________, _____________WORKMAN_311_003_R_____________ + ), + + [_QW] = LAYOUT_3x11_wrapper ( + _____________WORKMAN_311_001_L_____________, _____________WORKMAN_311_001_R_____________, + _____________WORKMAN_311_002_L_____________, _____________WORKMAN_311_002_R_____________, + _____________WORKMAN_311_003_L_____________, _____________WORKMAN_311_003_R_____________ + ), + + +/* LOWER LAYER + * ,----------------------------------------------------------------------------. + * | | | | | | | | & | * | ( | ) | + * | () | [] | / \ | | | | / \ | 7 | 8 | 9 | 0 | + * | | | | | | | ____ | ____ | ____ | ____ | Shift| + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | $ | % | ^ | | + * | @ # | & % | | | | | [ ] | 4 | 5 | 6 | Del | + * | | | | | | | ____ | ____ | ____ | ____ | Shift| + * | -----+------+------+------+------+------|------+------+------+------+------| + * | | | | | XXXX | | | ! | @ | # | | + * | | | | | XXXX | | | 1 | 2 | 3 | . | + * | | | | | XXXX | | ____ | ____ | ____ | ____ | Enter| + * '----------------------------------------------------------------------------' + */ + [_LOWER] = LAYOUT_3x11_wrapper ( + T_XX, T_YY, T_SL, XXXX, XXXX, _______, T_SL, KC_7, KC_8, KC_9, MT(MOD_RSFT, KC_0), + T_ATH, T_PRAM, _______, XXXX, XXXX, _______, T_YY, KC_4, KC_5, KC_6, MT(MOD_RSFT, KC_DEL), + XXXX, XXXX, XXXX, XXXX, _______, KC_ENT, _______, KC_1, KC_2, KC_3, T_DENT + ), + + + + + + [_RAISE] = LAYOUT_3x11_wrapper ( + QK_BOOT, DB_TOGG, _______, _______, MAKE, _______, T_SL, KC_F7, KC_F8, KC_F9, KC_F10, \ + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, T_UMIN, KC_F4, KC_F5, KC_F6, KC_F11, \ + _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_ENT, _______, KC_F1, KC_F2, KC_F3, KC_F12 \ + ), + + + + /* EXTRAS + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ ! │ │ │ │ │ │ │ /\ │ [ │ ] │ ; │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ │ │ ┃EXTRA┃ │ │ ┃ ┃ ( │ ) │ ' │ + * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ , │ . │ ? │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + */ + + [_EXTRAS] = LAYOUT_3x11_wrapper ( + KC_EXLM, _______, _______, _______, _______, _______, _______, T_SL, KC_LBRC, KC_RBRC, KC_SCLN, + KC_LSFT, _______, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_QUOT, + _______, _______, _______, _______, _______, KC_ENT, _______, _______, KC_COMM, KC_DOT, KC_QUES +), + + +/* FUNCTION LAYER + * ,----------------------------------------------------------------------------. + * |1COPY | | | | | | | | | | | + * |2PASTE| CLIP | SS | | | | / \ | | UP | |DELETE| + * | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | TAB | M05 | M06 | M07 | M08 | | | LEFT | DOWN | RIGHT| UP | + * | Shift| | | | | | | | | | RIGHT| + * |------+------+------+------+------+------+------+------+------+------+------| + * | XXXX | | | | | | | | | | | + * | XXXX | M01 | M02 | M03 | M04 | | | ? | , | . | DOWN | + * | XXXX | | | | | | | ! | ____ | ____ | LEFT | + * '----------------------------------------------------------------------------' + */ + + [_FN] = LAYOUT_3x11_wrapper ( + T_CP, CLIP, SS, _______, _______, _______, T_SL, _______, KC_UP, _______, KC_DEL, + KC_TAB, M05, M06, M07, M08, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, T_UR, + _______, M01, M02, M03, M04, KC_ENT, _______, T_QEXC, KC_COMM, KC_DOT, T_DL + ), + + +/* SYMBOLS + * ,----------------------------------------------------------------------------. + * | | | | | XXXX | | XXXX | | | | | + * | $ | ^ | < | > | XXXX | | XXXX | | | [ | ] | - | + * | | | | | XXXX | | XXXX | | | | | + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | % | : | ; | + | = | | | | ( | ) | _ | + * | | | | | | | | | | | | + * | -----+------+------+------+------+------|------+------+------+------+------| + * | | | | | | | | | | | | + * | & | ' | " | * | # | | ! | ? | / | \ | @ | + * | | | | | | | | | | | | + * '----------------------------------------------------------------------------' + * + * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca + */ + [_SYMB] = LAYOUT_3x11_wrapper ( + KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXX, _______, XXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, + KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, + KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_ENT, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT + ), + + + +}; + + + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_WM] = { ENCODER_CCW_CW(LCTL(KC_V), LCTL(KC_C)) }, + [_QW] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_LOWER] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_RAISE] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_EX] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_FN] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_SYMB] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) } +}; + + +oled_rotation_t oled_init_user(oled_rotation_t rotation){ + return OLED_ROTATION_270; +} + + + +#ifdef OLED_ENABLE +bool oled_task_user(void) { + // Host Keyboard Layer Status + oled_write_P(PSTR("LAYER\n-----\n"), false); + + switch (get_highest_layer(layer_state)) { + case _WM: + oled_write_P(PSTR("WMAN"), false); + break; + case _QW: + oled_write_P(PSTR("QW"), false); + break; + case _LOWER: + oled_write_P(PSTR("LOWER"), false); + break; + case _RAISE: + oled_write_P(PSTR("RSE"), false); + break; + case _EX: + oled_write_P(PSTR(" EX "), false); + break; + case _FN: + oled_write_P(PSTR(" FN "), false); + break; + case _SYMB: + oled_write_P(PSTR("SYMB"), false); + break; + default: + // Or use the write_ln shortcut over adding '\n' to the end of your string + oled_write_ln_P(PSTR("HOME"), false); + } + +// Host Keyboard LED Status + // led_t led_state = host_keyboard_led_state(); + // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + return false; +} +#endif + diff --git a/keyboards/hazel/satpad/keymaps/17APR23/rules.mk b/keyboards/hazel/satpad/keymaps/17APR23/rules.mk new file mode 100644 index 000000000000..3386642e8384 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/17APR23/rules.mk @@ -0,0 +1,23 @@ +# Build Options (yes/no) +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +TAP_DANCE_ENABLE = yes +ENCODER_ENABLE = yes +ENCODER_MAP_ENABLE = yes +OLED_ENABLE = yes + +LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. + +AUTO_SHIFT_ENABLE = no # 24FEB23 Added 26FEB23 Removed +UNICODE_ENABLE = no # Unicode +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +RGBLIGHT_ENABLE = no +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) +AUDIO_ENABLE = no # Audio output on port C6 +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/config.h b/keyboards/hazel/satpad/keymaps/default/config.h new file mode 100644 index 000000000000..c6b2abb79748 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/default/config.h @@ -0,0 +1,19 @@ +#pragma once + + +#define TAPPING_TERM 200 +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT +#define TAPPING_FORCE_HOLD + +#define ONESHOT_TAP_TOGGLE 10 +#define ONESHOT_TIMEOUT 500 +#define COMBO_TERM 200 + +#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD + +// disable shit +#define NO_MUSIC_MODE + +#undef LOCKING_SUPPORT_ENABLE +#undef LOCKING_RESYNC_ENABLE \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c b/keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c new file mode 100644 index 000000000000..99fec7d54474 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c @@ -0,0 +1,132 @@ +#include QMK_KEYBOARD_H + + +enum satpad_layers { + _WORKMAN, + _LOWER +}; + + + +// COMBO DECLARATIONS ============================================================================ +enum satpad_combos { + COMBO_SHIFT, + COMBO_LENGTH +}; + + +// TAP DANCE DECLARATIONS ============================================================================ +enum satpad_tapdances { + TD_ZLOWER, + TD_QESC, + TD_ATAB, + TD_XCTL, + TD_MGUI, + TD_CALT, + TD_KSPC, + TD_VENT, + TD_XSCLN, // ; , : + TD_IQUOT, // Letter "i", quote + TD_UPRT, // up, right + TD_CP // copy, paste +}; + +#define ZLOWER LT(_LOWER, KC_Z) //Tap for 'Z', Hold for Lower layer +#define QESC TD(TD_QESC) //Tap for 'Q', Twice for 'ESC' +#define ATAB TD(TD_ATAB) //Tap for 'A', Twice for 'Tab' +#define KSPC TD(TD_KSPC) //Tap for 'Space', Twice for 'K' +#define VENT TD(TD_VENT) //Tap for 'Enter', Twice for 'V' +#define XSCLN TD(TD_XSCLN) //Tap for ';', Twice for ':' +#define IQUOT TD(TD_IQUOT) //Tap for 'I', Twice for Quotes +#define UPRT TD(TD_UPRT) // up, right +#define CP TD(TD_CP) //Tap for Copy, Twice for Paste +#define XCTL LCTL_T(KC_X) //Tap for 'X', Hold for 'Left Ctrl' +#define MGUI LGUI_T(KC_M) //Tap for 'M', Hold for 'Windows Key' +#define CALT LALT_T(KC_C) //Tap for 'C', Hold for 'Left Alt' +#define OSM_SFT OSM(MOD_LSFT) + + +uint16_t COMBO_LEN = COMBO_LENGTH; +const uint16_t PROGMEM combo_shift[] = { KC_W, KC_B, COMBO_END }; + + +combo_t key_combos[] = { + [COMBO_SHIFT] = COMBO(combo_shift, OSM_SFT) +}; + + +//Tap Dance Definitions +qk_tap_dance_action_t tap_dance_actions[] = { + [TD_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), + [TD_ATAB] = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB), + [TD_KSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_K), + [TD_VENT] = ACTION_TAP_DANCE_DOUBLE(KC_ENT, KC_V), + [TD_XSCLN] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_COLN), + [TD_IQUOT] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_QUOT), + [TD_UPRT] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_RGHT), + [TD_CP] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_C), LCTL(KC_V)) +}; + +const key_override_t **key_overrides = (const key_override_t *[]) { + NULL +}; + +#define ______ KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* WORKMAN + * ,---------------------------------------------------------------------------------------. + * | Q | D | R | W | B | | J | F | U | P |BKSPACE| + * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| + * | A | S | H | T | G | | Y | N | E | O | I " | + * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| + * | Z | X | M | C | V | M20 | K | L | , | . |Cpy/Pst| + * `---------------------------------------------------------------------------------------' + */ + + [_WORKMAN] = LAYOUT_3x11( + QESC, KC_D, KC_R, KC_W, KC_B, ______, KC_J, KC_F, KC_U, KC_P, KC_BSPC, \ + ATAB, KC_S, KC_H, KC_T, KC_G, ______, KC_Y, KC_N, KC_E, KC_O, IQUOT, \ + ZLOWER, XCTL, MGUI, CALT, VENT, KC_ENT, KSPC, KC_L, KC_COMM, KC_DOT, CP + ), + + + /* LOWER + * ,---------------------------------------------------------------------------------------. + * | RESET | BOOT | | | | | ; : | 7 | 8 | 9 | DEL | + * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| + * | | | | | | | | 4 | 5 | 6 |UP/RT | + * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| + * | | | | | | M20 | 0 | 1 | 2 | 3 | /\ | + * `---------------------------------------------------------------------------------------' + */ + [_LOWER] = LAYOUT_3x11( + QK_RBT, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, _______, XSCLN, KC_7, KC_8, KC_9, KC_DEL, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_4, KC_5, KC_6, UPRT, \ + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_0, KC_1, KC_2, KC_3, KC_SLSH + ), +}; + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_WORKMAN] = { ENCODER_CCW_CW(KC_SPC, OSM_SFT) }, + [_LOWER] = { ENCODER_CCW_CW(KC_SPC, OSM_SFT) }, +}; + +oled_rotation_t oled_init_user(oled_rotation_t rotation){ + return OLED_ROTATION_270; +} + +bool oled_task_user(void) { + uint8_t modifiers = get_mods() | get_oneshot_mods(); + + oled_set_cursor(0, 11); + oled_write_P(PSTR("SHIFT"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); + oled_write_P(PSTR("CNTRL"), (modifiers & MOD_MASK_CTRL)); + + return true; +} + + + + diff --git a/keyboards/hazel/satpad/keymaps/default/keymap.c b/keyboards/hazel/satpad/keymaps/default/keymap.c new file mode 100644 index 000000000000..99fec7d54474 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/default/keymap.c @@ -0,0 +1,132 @@ +#include QMK_KEYBOARD_H + + +enum satpad_layers { + _WORKMAN, + _LOWER +}; + + + +// COMBO DECLARATIONS ============================================================================ +enum satpad_combos { + COMBO_SHIFT, + COMBO_LENGTH +}; + + +// TAP DANCE DECLARATIONS ============================================================================ +enum satpad_tapdances { + TD_ZLOWER, + TD_QESC, + TD_ATAB, + TD_XCTL, + TD_MGUI, + TD_CALT, + TD_KSPC, + TD_VENT, + TD_XSCLN, // ; , : + TD_IQUOT, // Letter "i", quote + TD_UPRT, // up, right + TD_CP // copy, paste +}; + +#define ZLOWER LT(_LOWER, KC_Z) //Tap for 'Z', Hold for Lower layer +#define QESC TD(TD_QESC) //Tap for 'Q', Twice for 'ESC' +#define ATAB TD(TD_ATAB) //Tap for 'A', Twice for 'Tab' +#define KSPC TD(TD_KSPC) //Tap for 'Space', Twice for 'K' +#define VENT TD(TD_VENT) //Tap for 'Enter', Twice for 'V' +#define XSCLN TD(TD_XSCLN) //Tap for ';', Twice for ':' +#define IQUOT TD(TD_IQUOT) //Tap for 'I', Twice for Quotes +#define UPRT TD(TD_UPRT) // up, right +#define CP TD(TD_CP) //Tap for Copy, Twice for Paste +#define XCTL LCTL_T(KC_X) //Tap for 'X', Hold for 'Left Ctrl' +#define MGUI LGUI_T(KC_M) //Tap for 'M', Hold for 'Windows Key' +#define CALT LALT_T(KC_C) //Tap for 'C', Hold for 'Left Alt' +#define OSM_SFT OSM(MOD_LSFT) + + +uint16_t COMBO_LEN = COMBO_LENGTH; +const uint16_t PROGMEM combo_shift[] = { KC_W, KC_B, COMBO_END }; + + +combo_t key_combos[] = { + [COMBO_SHIFT] = COMBO(combo_shift, OSM_SFT) +}; + + +//Tap Dance Definitions +qk_tap_dance_action_t tap_dance_actions[] = { + [TD_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), + [TD_ATAB] = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB), + [TD_KSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_K), + [TD_VENT] = ACTION_TAP_DANCE_DOUBLE(KC_ENT, KC_V), + [TD_XSCLN] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_COLN), + [TD_IQUOT] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_QUOT), + [TD_UPRT] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_RGHT), + [TD_CP] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_C), LCTL(KC_V)) +}; + +const key_override_t **key_overrides = (const key_override_t *[]) { + NULL +}; + +#define ______ KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* WORKMAN + * ,---------------------------------------------------------------------------------------. + * | Q | D | R | W | B | | J | F | U | P |BKSPACE| + * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| + * | A | S | H | T | G | | Y | N | E | O | I " | + * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| + * | Z | X | M | C | V | M20 | K | L | , | . |Cpy/Pst| + * `---------------------------------------------------------------------------------------' + */ + + [_WORKMAN] = LAYOUT_3x11( + QESC, KC_D, KC_R, KC_W, KC_B, ______, KC_J, KC_F, KC_U, KC_P, KC_BSPC, \ + ATAB, KC_S, KC_H, KC_T, KC_G, ______, KC_Y, KC_N, KC_E, KC_O, IQUOT, \ + ZLOWER, XCTL, MGUI, CALT, VENT, KC_ENT, KSPC, KC_L, KC_COMM, KC_DOT, CP + ), + + + /* LOWER + * ,---------------------------------------------------------------------------------------. + * | RESET | BOOT | | | | | ; : | 7 | 8 | 9 | DEL | + * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| + * | | | | | | | | 4 | 5 | 6 |UP/RT | + * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| + * | | | | | | M20 | 0 | 1 | 2 | 3 | /\ | + * `---------------------------------------------------------------------------------------' + */ + [_LOWER] = LAYOUT_3x11( + QK_RBT, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, _______, XSCLN, KC_7, KC_8, KC_9, KC_DEL, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_4, KC_5, KC_6, UPRT, \ + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_0, KC_1, KC_2, KC_3, KC_SLSH + ), +}; + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_WORKMAN] = { ENCODER_CCW_CW(KC_SPC, OSM_SFT) }, + [_LOWER] = { ENCODER_CCW_CW(KC_SPC, OSM_SFT) }, +}; + +oled_rotation_t oled_init_user(oled_rotation_t rotation){ + return OLED_ROTATION_270; +} + +bool oled_task_user(void) { + uint8_t modifiers = get_mods() | get_oneshot_mods(); + + oled_set_cursor(0, 11); + oled_write_P(PSTR("SHIFT"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); + oled_write_P(PSTR("CNTRL"), (modifiers & MOD_MASK_CTRL)); + + return true; +} + + + + diff --git a/keyboards/hazel/satpad/keymaps/default/rules.mk b/keyboards/hazel/satpad/keymaps/default/rules.mk new file mode 100644 index 000000000000..dc00b90873cc --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/default/rules.mk @@ -0,0 +1,7 @@ +CAPS_WORD_ENABLE = yes +GRAVE_ESC_ENABLE = no +SPACE_CADET_ENABLE = no + +KEY_OVERRIDE_ENABLE = yes +COMBO_ENABLE = yes +TAP_DANCE_ENABLE = no diff --git a/keyboards/hazel/satpad/keymaps/miketronic/config.h b/keyboards/hazel/satpad/keymaps/miketronic/config.h new file mode 100644 index 000000000000..2e5f8fe2dc5c --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/miketronic/config.h @@ -0,0 +1,78 @@ +#pragma once +#include "config_common.h" + +// bootloader (first top leftmost key) +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 1 + +#define MATRIX_ROWS 7 +#define MATRIX_COLS 6 + +#define MATRIX_ROW_PINS { B3, B2, B6, D3, D2, D4, E6 } +#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7 } + +#define DIODE_DIRECTION COL2ROW + +#define DEBOUNCE 5 + +#define ENCODERS_PAD_A {B4} +#define ENCODERS_PAD_B {B5} + + + + +// Behaviors That Can Be Configured + + +#define TAPPING_TERM 175 + // how long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too + +#define PERMISSIVE_HOLD + // makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM + +#define IGNORE_MOD_TAP_INTERRUPT + // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. + +#define TAPPING_FORCE_HOLD + // makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap) + // Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) + + +/* + #define TAPPING_TERM_PER_KEY + // enables handling for per key TAPPING_TERM settings + + #define RETRO_TAPPING + // tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release + + #define TAPPING_TOGGLE 2 + // how many taps before triggering the toggle + + #define LEADER_TIMEOUT 300 + // how long before the leader key times out + // If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. + + #define LEADER_PER_KEY_TIMING + // sets the timer for leader key chords to run on each key press rather than overall + + #define LEADER_KEY_STRICT_KEY_PROCESSING + // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. + + #define ONESHOT_TIMEOUT 300 + // how long before oneshot times out + + #define ONESHOT_TAP_TOGGLE 2 + // how many taps before oneshot toggle is triggered + + #define COMBO_COUNT 2 + // Set this to the number of combos that you're using in the Combo feature. + + #define COMBO_TERM 200 + // how long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined. + + #define TAP_CODE_DELAY 100 + // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds. + + #define TAP_HOLD_CAPS_DELAY 80 + // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS. The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher. +*/ diff --git a/keyboards/hazel/satpad/keymaps/miketronic/keymap - plain.c b/keyboards/hazel/satpad/keymaps/miketronic/keymap - plain.c new file mode 100644 index 000000000000..47a5e10a1149 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/miketronic/keymap - plain.c @@ -0,0 +1,284 @@ +#include QMK_KEYBOARD_H + + +enum layers { + _HOME, // home base layer + _LOWER, + _RAISE, + _ADJUST, + _FUNCTION, + _SYMBOLS, + _ARROWPAD, +}; + +// TAP DANCE DECLARATIONS ============================================================================ +enum { + T_BR = 0, // [, ] + // T_PA, // (, ) + T_SL, // slash, backslash + // T_UPRT, // up, right + // T_DNLT, // down, left + T_QUOTE, // quote, double quote + T_DOTENT, // dot, enter + T_TSPC, // T, space + T_COMMSPC, // space, comma + T_DOTSPC, // space, dot + T_QEXC, // Tap once for ?, twice for ! + T_QESC, // Tap once for "q", twice for escape + // T_NENT, // N, enter + // T_TE, // tab, escape + T_CP, // copy, paste +}; + +//TAP DANCE DEFINITIONS =========================================== +qk_tap_dance_action_t tap_dance_actions[] = { + [T_BR] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), // Tap once for [, twice for ] + // [T_PA] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN), + [T_SL] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_BSLS), + // [T_UPRT] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_RGHT), + // [T_DNLT] = ACTION_TAP_DANCE_DOUBLE(KC_DOWN, KC_LEFT), + [T_QUOTE] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_DQUO), // Tap once for quote, twice for double quote + [T_DOTENT] = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_ENT), // Tap once for dot, twice for enter + [T_TSPC] = ACTION_TAP_DANCE_DOUBLE(KC_T, KC_SPC), // Tap once for "t", twice for space + [T_COMMSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_COMM), // Tap once for space, twice for comm + [T_DOTSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_DOT), // Tap once for space, twice for dot + [T_QEXC] = ACTION_TAP_DANCE_DOUBLE(KC_QUES, KC_EXLM), // Tap once for ?, twice for ! + [T_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), // Tap once for "q", twice for escape + // [T_NENT] = ACTION_TAP_DANCE_DOUBLE(KC_N, KC_ENT), // Tap once for "n", twice for enter + // [T_TE] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_ESC), // Tap once for tab, twice for esc + [T_CP] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_C), LCTL(KC_V)), + //[X_CTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, x_finished, x_reset) + +}; + +#define XXXX KC_NO + +// Defines for task manager and such +#define CALTDEL LCTL(LALT(KC_DEL)) +// #define TSKMGR LCTL(LSFT(KC_ESC)) +#define CLIP LCTL(LALT(KC_Q)) // Clipboard +#define SS LCTL(LALT(KC_G)) // Greenshot region + + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +/* + * LEGEND: + * + * ,--------------------------------. + * | Top row: shifted character | + * | Central row: standard char | + * | Bottom row: hold modifier | + * `--------------------------------' + * + * "____" means free to be assigned + * + */ + +/* Workman Home Layer + * ,----------------------------------------------------------------------------. + * | | | | | | | | | | | | + * | Q | D | R | W | B | | J | F | U | P | BKSPC| + * |Escape| FUNCT| | |SYMBOL| |SYMBOL| | | | Shift| + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | A | S | H | T | G | | Y | N | E | O | I | + * | Shift| | |2x SPC| OSkey| | OSkey| | | | Shift| + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | Z | X | M | C | V | | K | L | Space| Space| | + * | FUNCT| CTRL | OS | ALT |LOWER | | RAISE| Alt | , | . | Enter| + * '----------------------------------------------------------------------------' + * + * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca + * + */ + [_HOME] = LAYOUT_3x11( + TD(T_QESC), LT(_FUNCTION, KC_D), KC_R, KC_W, LT(_SYMBOLS, KC_B), XXXX, LT(_SYMBOLS, KC_J), KC_F, KC_U, KC_P, MT(MOD_RSFT, KC_BSPC), + MT(MOD_LSFT, KC_A), KC_S, KC_H, TD(T_TSPC), MT(MOD_LGUI, KC_G), XXXX, MT(MOD_RGUI, KC_Y), KC_N, KC_E, KC_O, MT(MOD_RSFT, KC_I), + LT(_FUNCTION, KC_Z), MT(MOD_LCTL, KC_X), MT(MOD_LGUI, KC_M), MT(MOD_LALT, KC_C), LT(_LOWER, KC_V), XXXX, LT(_RAISE, KC_K), MT(MOD_LALT, KC_L), TD(T_COMMSPC), TD(T_DOTSPC), KC_ENT + ), + + + + +/* LOWER LAYER + * ,----------------------------------------------------------------------------. + * | | | | | | | | & | * | ( | ) | + * | | VOL+ | | | | | / \ | 7 | 8 | 9 | 0 | + * | | | | | | | ____ | ____ | ____ | ____ | Shift| + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | $ | % | ^ | | + * | TAB | MUTE | | | | | [ ] | 4 | 5 | 6 | Del | + * | Shift| | | | | | ____ | ____ | ____ | ____ | Shift| + * | -----+------+------+------+------+------|------+------+------+------+------| + * | | | | | XXXX | | | ! | @ | # | | + * | | VOL- | | | XXXX | | | 1 | 2 | 3 | . | + * | | | | | XXXX | | ____ | ____ | ____ | ____ | Enter| + * '----------------------------------------------------------------------------' + */ + [_LOWER] = LAYOUT_3x11( + XXXX, KC_VOLU, XXXX, XXXX, XXXX, XXXX, TD(T_SL), KC_7, KC_8, KC_9, MT(MOD_RSFT, KC_0), + MT(MOD_LSFT, KC_TAB), KC_MUTE, XXXX, XXXX, XXXX, XXXX, TD(T_BR), KC_4, KC_5, KC_6, MT(MOD_RSFT, KC_DEL), + XXXX, KC_VOLD, XXXX, XXXX, _______, XXXX, _______, KC_1, KC_2, KC_3, TD(T_DOTENT) + ), + +/* RAISE LAYER + * ,----------------------------------------------------------------------------. + * | ! | @ | # | $ | % | | ^ | & | * | ( | ) | + * | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | + * | ____ | ____ | ____ | ____ | ____ | | ____ | ____ | Alt | Ctrl | Shift| + * |------+------+------+------+------+------+------+------+------+------+------| + * | | ~ | _ | + | { | | _ | | | : | " | | + * | TAB | ` | - | = | [ | | - | \ | ; | ' | Del | + * | Shift| ____ | ____ | AltGr| OSkey| | OSkey| AltGr| ____ | ____ | Shift| + * | -----+------+------+------+------+------|------+------+------+------+------| + * | | | | | | | XXXX | > | ? | | | + * | |BackSp| Del | Enter| | | XXXX | . | / | Enter| | + * | | Ctrl | Alt | ____ | ____ | | XXXX | Alt | Ctrl | Shift| | + * '----------------------------------------------------------------------------' + */ + [_RAISE] = LAYOUT_3x11( + KC_1, KC_2, KC_3, KC_4, KC_5, _______, KC_6, KC_7, MT(MOD_LALT, KC_8), MT(MOD_RCTL,KC_9), MT(MOD_RSFT, KC_0), + MT(MOD_LSFT, KC_TAB), KC_GRV, KC_MINS, MT(MOD_RALT, KC_EQL), MT(MOD_LGUI, KC_LBRC), _______, KC_MINS, MT(MOD_RALT, KC_BSLS), KC_SCLN, KC_QUOT, MT(MOD_RSFT, KC_DEL), + KC_LEFT, MT(KC_LCTL, KC_BSPC), MT(KC_LALT, KC_DEL), KC_ENT, _______, XXXX, _______, MT(MOD_LALT, KC_DOT), MT(MOD_RCTL, KC_SLSH), MT(MOD_RSFT, KC_ENT), KC_RGHT + ), + +/* ADJUST LAYER (LOWER + RAISE) + * ,----------------------------------------------------------------------------. + * | | | | | | | | | | | | + * | BOOT | | | | | | | | | |CALTDEL| + * | | ____ | ____ | ____ | ____ | | ____ | ____ | ____ | ____ | ____ | + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | TAB | | | | | | | | | | Del | + * | Shift| ____ | ____ | ____ | ____ | | ____ | ____ | ____ | ____ | Shift| + * | -----+------+------+------+------+------|------+------+------+------+------| + * | | | | | XXXX | | XXXX | | | | | + * | | CTRL | ALT | Enter| XXXX | | XXXX | | | | . | + * | | | | Shift| XXXX | | XXXX | ____ | ____ | ____ | Enter| + * '----------------------------------------------------------------------------' + */ + [_ADJUST] = LAYOUT_3x11( + QK_BOOT, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, CALTDEL, + MT(MOD_LSFT, KC_TAB), XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, MT(MOD_RSFT, KC_DEL), + XXXX, XXXX, XXXX, XXXX, _______, XXXX, _______, XXXX, XXXX, XXXX, MT(KC_ENT, KC_DOT) + ), + +/* FUNCTION LAYER + * ,----------------------------------------------------------------------------. + * |1COPY | | | | | | | | | | | + * |2PASTE| CLIP | SS | | | | | | UP | |DELETE| + * | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | TAB | M05 | M06 | M07 | M08 | | | LEFT | DOWN | RIGHT| " ' | + * | Shift| | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------| + * | XXXX | | | | | | | | | | | + * | XXXX | M01 | M02 | M03 | M04 | | | ? | , | . | ? | + * | XXXX | | | | | | | ! | ____ | ____ | ! | + * '----------------------------------------------------------------------------' + */ + + [_FUNCTION] = LAYOUT_3x11( + TD(T_CP), CLIP, SS, XXXX, XXXX, XXXX, XXXX, XXXX, KC_UP, XXXX, KC_DEL, + MT(MOD_LSFT, KC_TAB), XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, KC_LEFT, KC_DOWN, KC_RGHT, TD(T_QUOTE), + _______, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, TD(T_QEXC), KC_COMM, KC_DOT, TD(T_QEXC) + ), + + +/* SYMBOLS + * ,----------------------------------------------------------------------------. + * | | | | | XXXX | | XXXX | | | | | + * | $ | ^ | < | > | XXXX | | XXXX | | | [ | ] | - | + * | | | | | XXXX | | XXXX | | | | | + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | % | : | ; | + | = | | | | ( | ) | _ | + * | | | | | | | | | | | | + * | -----+------+------+------+------+------|------+------+------+------+------| + * | | | | | | | | | | | | + * | & | ' | " | * | # | | ! | ? | / | \ | @ | + * | | | | | | | | | | | | + * '----------------------------------------------------------------------------' + * + * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca + */ + [_SYMBOLS] = LAYOUT_3x11( + KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXX, _______, XXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, + KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, + KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, _______, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT + ), + + + +}; + +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} + +void matrix_init_user(void) { + // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values + // set num lock on at start (for numonly layer to work) + if (!host_keyboard_led_state().num_lock) { + tap_code(KC_NUM_LOCK); + } +} + +void matrix_scan_user(void) { +} + + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_HOME] = { ENCODER_CCW_CW(LCTL(KC_V), LCTL(KC_C)) }, + [_SYMBOLS] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_RAISE] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_LOWER] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_ADJUST] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_FUNCTION] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, +}; + + +oled_rotation_t oled_init_user(oled_rotation_t rotation){ + return OLED_ROTATION_270; +} + +#ifdef OLED_ENABLE +bool oled_task_user(void) { + // Host Keyboard Layer Status + oled_write_P(PSTR("LAYER\n-----\n"), false); + + switch (get_highest_layer(layer_state)) { + case _LOWER: + oled_write_P(PSTR("LOWER"), false); + break; + case _RAISE: + oled_write_P(PSTR("RAISE"), false); + break; + case _FUNCTION: + oled_write_P(PSTR("FUNCT"), false); + break; + case _ADJUST: + oled_write_P(PSTR(" ADJ "), false); + break; + case _SYMBOLS: + oled_write_P(PSTR("SYMB"), false); + break; + default: + // Or use the write_ln shortcut over adding '\n' to the end of your string + oled_write_ln_P(PSTR("HOME"), false); + } + +// Host Keyboard LED Status + // led_t led_state = host_keyboard_led_state(); + // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + return false; +} +#endif + diff --git a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c new file mode 100644 index 000000000000..b162e6eb453f --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c @@ -0,0 +1,219 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#include QMK_KEYBOARD_H +#include "miketronic.h" + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Workman + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ TAB │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ BSPC│ + * │ ESC │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ ; │ ; │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ TAB │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ │ + * │SHIFT│ │ │ ┃ EX ┃ │ │ ┃ ┃ │ │ENTER│ENTER│ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │SHIFT| Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ / │ UP | + * │ │ │ │ │ │ │ │ │ │ , │ . │ │RIGHT| + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ FN │CTRL │ OS │ ALT │LOWER│ │ │ │RAISE│ SS │CLIP │COPY │ DN │ + * │ │ │ │ │ │ │ │ │ │ │ │PASTE│LEFT │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ +/* Workman Home Layer + * ,----------------------------------------------------------------------------. + * | | | | | | | | | | | | + * | Q | D | R | W | B | | J | F | U | P | ; | + * |Escape| FN | | |SYMBOL| |SYMBOL| | | |BKSPC | + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | A | S | H | T | G | | Y | N | E | O | I | + * | Shift| | |EXTRAS| OSkey| | OSkey| | | | Enter| + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | Z | X | M | C | V | | K | L | Space| Space| /\ | + * | FN | CTRL | OS | ALT |LOWER | | RAISE| Alt | , | . | | + * '----------------------------------------------------------------------------' + * + * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca + * + */ + [_WM] = LAYOUT ( + _____________WORKMAN_311_001_L_____________, _____________WORKMAN_311_001_R_____________, + _____________WORKMAN_311_002_L_____________, _____________WORKMAN_311_002_R_____________, + _____________WORKMAN_311_003_L_____________, _____________WORKMAN_311_003_R_____________ + ), + + [_QW] = LAYOUT_3x11_wrapper ( + _____________WORKMAN_311_001_L_____________, _____________WORKMAN_311_001_R_____________, + _____________WORKMAN_311_002_L_____________, _____________WORKMAN_311_002_R_____________, + _____________WORKMAN_311_003_L_____________, _____________WORKMAN_311_003_R_____________ + ), + + +/* LOWER LAYER + * ,----------------------------------------------------------------------------. + * | | | | | | | | & | * | ( | ) | + * | () | [] | / \ | | | | / \ | 7 | 8 | 9 | 0 | + * | | | | | | | ____ | ____ | ____ | ____ | Shift| + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | $ | % | ^ | | + * | @ # | & % | | | | | [ ] | 4 | 5 | 6 | Del | + * | | | | | | | ____ | ____ | ____ | ____ | Shift| + * | -----+------+------+------+------+------|------+------+------+------+------| + * | | | | | XXXX | | | ! | @ | # | | + * | | | | | XXXX | | | 1 | 2 | 3 | . | + * | | | | | XXXX | | ____ | ____ | ____ | ____ | Enter| + * '----------------------------------------------------------------------------' + */ + [_LOWER] = LAYOUT_3x11_wrapper ( + T_XX, T_YY, T_SL, XXXX, XXXX, _______, T_SL, KC_7, KC_8, KC_9, MT(MOD_RSFT, KC_0), + T_ATH, T_PRAM, _______, XXXX, XXXX, _______, T_YY, KC_4, KC_5, KC_6, MT(MOD_RSFT, KC_DEL), + XXXX, XXXX, XXXX, XXXX, _______, KC_ENT, _______, KC_1, KC_2, KC_3, T_DENT + ), + + + + + + [_RAISE] = LAYOUT_3x11_wrapper ( + QK_BOOT, DB_TOGG, _______, _______, MAKE, _______, T_SL, KC_F7, KC_F8, KC_F9, KC_F10, \ + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, T_UMIN, KC_F4, KC_F5, KC_F6, KC_F11, \ + _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_ENT, _______, KC_F1, KC_F2, KC_F3, KC_F12 \ + ), + + + + /* EXTRAS + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ ! │ │ │ │ │ │ │ /\ │ [ │ ] │ ; │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ │ │ ┃EXTRA┃ │ │ ┃ ┃ ( │ ) │ ' │ + * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ , │ . │ ? │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + */ + + [_EXTRAS] = LAYOUT_3x11_wrapper ( + KC_EXLM, _______, _______, _______, _______, _______, _______, T_SL, KC_LBRC, KC_RBRC, KC_SCLN, + KC_LSFT, _______, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_QUOT, + _______, _______, _______, _______, _______, KC_ENT, _______, _______, KC_COMM, KC_DOT, KC_QUES +), + + +/* FUNCTION LAYER + * ,----------------------------------------------------------------------------. + * |1COPY | | | | | | | | | | | + * |2PASTE| CLIP | SS | | | | / \ | | UP | |DELETE| + * | | | | | | | | | | | | + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | TAB | M05 | M06 | M07 | M08 | | | LEFT | DOWN | RIGHT| UP | + * | Shift| | | | | | | | | | RIGHT| + * |------+------+------+------+------+------+------+------+------+------+------| + * | XXXX | | | | | | | | | | | + * | XXXX | M01 | M02 | M03 | M04 | | | ? | , | . | DOWN | + * | XXXX | | | | | | | ! | ____ | ____ | LEFT | + * '----------------------------------------------------------------------------' + */ + + [_FN] = LAYOUT_3x11_wrapper ( + T_CP, CLIP, SS, _______, _______, _______, T_SL, _______, KC_UP, _______, KC_DEL, + KC_TAB, M05, M06, M07, M08, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, T_UR, + _______, M01, M02, M03, M04, KC_ENT, _______, T_QEXC, KC_COMM, KC_DOT, T_DL + ), + + +/* SYMBOLS + * ,----------------------------------------------------------------------------. + * | | | | | XXXX | | XXXX | | | | | + * | $ | ^ | < | > | XXXX | | XXXX | | | [ | ] | - | + * | | | | | XXXX | | XXXX | | | | | + * |------+------+------+------+------+------+------+------+------+------+------| + * | | | | | | | | | | | | + * | % | : | ; | + | = | | | | ( | ) | _ | + * | | | | | | | | | | | | + * | -----+------+------+------+------+------|------+------+------+------+------| + * | | | | | | | | | | | | + * | & | ' | " | * | # | | ! | ? | / | \ | @ | + * | | | | | | | | | | | | + * '----------------------------------------------------------------------------' + * + * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca + */ + [_SYMB] = LAYOUT_3x11_wrapper ( + KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXX, _______, XXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, + KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, + KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_ENT, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT + ), + + + +}; + + + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_WM] = { ENCODER_CCW_CW(LCTL(KC_V), LCTL(KC_C)) }, + [_QW] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_LOWER] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_RAISE] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_EX] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_FN] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, + [_SYMB] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) } +}; + + +oled_rotation_t oled_init_user(oled_rotation_t rotation){ + return OLED_ROTATION_270; +} + + + +#ifdef OLED_ENABLE +bool oled_task_user(void) { + // Host Keyboard Layer Status + oled_write_P(PSTR("LAYER\n-----\n"), false); + + switch (get_highest_layer(layer_state)) { + case _WM: + oled_write_P(PSTR("WMAN"), false); + break; + case _QW: + oled_write_P(PSTR("QW"), false); + break; + case _LOWER: + oled_write_P(PSTR("LOWER"), false); + break; + case _RAISE: + oled_write_P(PSTR("RSE"), false); + break; + case _EX: + oled_write_P(PSTR(" EX "), false); + break; + case _FN: + oled_write_P(PSTR(" FN "), false); + break; + case _SYMB: + oled_write_P(PSTR("SYMB"), false); + break; + default: + // Or use the write_ln shortcut over adding '\n' to the end of your string + oled_write_ln_P(PSTR("HOME"), false); + } + +// Host Keyboard LED Status + // led_t led_state = host_keyboard_led_state(); + // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + return false; +} +#endif + diff --git a/keyboards/hazel/satpad/keymaps/miketronic/readme.md b/keyboards/hazel/satpad/keymaps/miketronic/readme.md new file mode 100644 index 000000000000..8fe7a60679e2 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/miketronic/readme.md @@ -0,0 +1,17 @@ +# The 25% SuperMicro keyboard +## A full featured keymap on Gherkin compatible with a pure "Alpha 26" layout + +With this configuration the "SuperMicro" layout first experimented on the plank-like jj40 is being ported to a more proper board, and with the last changes, this layout has been made compatible also to a "26 keys" one. So you can now choose to leave all 30 keys on the keyboard, or remove the two on the bottom line corners to have the "old" and comfortable 28 keys layout, or remove also space and enter to have the simplest "pure alpha" one! And even the intermediate 27 keys one is an interesting compatible option! + +This keymap is for a generic usage, trying to avoid as much gimmick as possible (considering the number of keys) and retain muscle memory from people used to the standard Qwerty 104 keys one. Functions and numbers (with related symbols) are on the first row as expected; other examples of design coherency include the symbols on the central row laid out in the same order as you'll find on a standard full keyboard, and the cursor movement aligned to the common unix vi standard ("hjkl", and for symmetry "sdfg" for home/pgdn/pgup/end). I've personally used this layout for months on my home PC in parallel to my portable work PC. + +Relying just on the alphabetic keys this layout can be also very easily ported and tested on any qmk supported keyboard (ok, butterstick excluded). + +The image below explains the main layers activated respectively with F, N or both modifiers pressed together. In addition to them there are available 5 layers that can be personalized as needed or completely removed without losing any functionality; three of them are currently setup in the default keymap for cursors/mouse, numpad and media (activated with q, w and e respectively). + +![layers](https://github.com/stevexyz/qmk_firmware/blob/master/keyboards/40percentclub/gherkin/keymaps/stevexyz/newlayout26272830.jpg) + +![prototype](https://github.com/stevexyz/qmk_firmware/blob/master/keyboards/40percentclub/gherkin/keymaps/stevexyz/gherkin28.jpeg) + +Happy hacking! +_Stefano diff --git a/keyboards/hazel/satpad/keymaps/miketronic/rules - backup.mk b/keyboards/hazel/satpad/keymaps/miketronic/rules - backup.mk new file mode 100644 index 000000000000..b693b8e30592 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/miketronic/rules - backup.mk @@ -0,0 +1,17 @@ +# Build Options (yes/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 +BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI support +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +TAP_DANCE_ENABLE = no +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) + +NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +RGBLIGHT_ENABLE = no diff --git a/keyboards/hazel/satpad/keymaps/miketronic/rules.mk b/keyboards/hazel/satpad/keymaps/miketronic/rules.mk new file mode 100644 index 000000000000..3386642e8384 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/miketronic/rules.mk @@ -0,0 +1,23 @@ +# Build Options (yes/no) +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +TAP_DANCE_ENABLE = yes +ENCODER_ENABLE = yes +ENCODER_MAP_ENABLE = yes +OLED_ENABLE = yes + +LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. + +AUTO_SHIFT_ENABLE = no # 24FEB23 Added 26FEB23 Removed +UNICODE_ENABLE = no # Unicode +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +RGBLIGHT_ENABLE = no +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) +AUDIO_ENABLE = no # Audio output on port C6 +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID \ No newline at end of file diff --git a/keyboards/hazel/satpad/readme.md b/keyboards/hazel/satpad/readme.md new file mode 100644 index 000000000000..a82402695893 --- /dev/null +++ b/keyboards/hazel/satpad/readme.md @@ -0,0 +1,15 @@ +# SatPad + +30% orthlinear keyboard + +## Keyboard Info +* Maintainer: [jasonhazel](https://github.com/jasonhazel) +* Hardware Supported: [SatPad](https://github.com/jasonhazel/satpad) +* Hardware Availbility: Print PCB with gerber files in repository + +## Build +Make example (after setting up build environment): + + make jasonhazel/satpad:default + +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/hazel/satpad/rules.mk b/keyboards/hazel/satpad/rules.mk new file mode 100644 index 000000000000..94cca2df737a --- /dev/null +++ b/keyboards/hazel/satpad/rules.mk @@ -0,0 +1,24 @@ +# Build Options (yes/no) +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +TAP_DANCE_ENABLE = yes +ENCODER_ENABLE = yes +ENCODER_MAP_ENABLE = yes +OLED_ENABLE = yes + +LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. + + +AUTO_SHIFT_ENABLE = no # 24FEB23 Added 26FEB23 Removed +UNICODE_ENABLE = no # Unicode +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +RGBLIGHT_ENABLE = no +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) +AUDIO_ENABLE = no # Audio output on port C6 +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID \ No newline at end of file diff --git a/keyboards/hazel/satpad/satpad.c b/keyboards/hazel/satpad/satpad.c new file mode 100644 index 000000000000..b99372114afb --- /dev/null +++ b/keyboards/hazel/satpad/satpad.c @@ -0,0 +1 @@ +#include "satpad.h" \ No newline at end of file diff --git a/keyboards/hazel/satpad/satpad.h b/keyboards/hazel/satpad/satpad.h new file mode 100644 index 000000000000..3aa6e186c031 --- /dev/null +++ b/keyboards/hazel/satpad/satpad.h @@ -0,0 +1,32 @@ +#pragma once + +#include "quantum.h" + +#define ___ KC_NO + +/* + * ,---------------------------------------------------------------------------------------. + * | L00 | L01 | L02 | L03 | L04 | | R00 | R01 | R02 | R03 | R04 | + * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| + * | L10 | L11 | L12 | L13 | L14 | | R10 | R11 | R12 | R13 | R14 | + * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| + * | L20 | L21 | L22 | L23 | L24 | M00 | R20 | R21 | R22 | R23 | R24 | + * `---------------------------------------------------------------------------------------' + */ + + +#define LAYOUT_3x11( \ + L00, L01, L02, L03, L04, M00, R00, R01, R02, R03, R04, \ + L10, L11, L12, L13, L14, M10, R10, R11, R12, R13, R14, \ + L20, L21, L22, L23, L24, M20, R20, R21, R22, R23, R24 \ +) { \ + { L00, L01, L02, L03, L04, ___ }, \ + { L10, L11, L12, L13, L14, ___ }, \ + { L20, L21, L22, L23, L24, ___ }, \ + { R04, R03, R02, R01, R00, ___ }, \ + { R14, R13, R12, R11, R10, ___ }, \ + { R24, R23, R22, R21, R20, ___ }, \ + { ___, ___, ___, ___, ___, M20 } \ +} + +#define LAYOUT LAYOUT_3x11 \ No newline at end of file diff --git a/users/miketronic b/users/miketronic new file mode 160000 index 000000000000..5621787c26d1 --- /dev/null +++ b/users/miketronic @@ -0,0 +1 @@ +Subproject commit 5621787c26d1204cb2ccd89c65c8b9eefe34c2e5 From f35ad1400ea270a6f770a18a88b7d12694ff42c7 Mon Sep 17 00:00:00 2001 From: Sepultor Date: Tue, 18 Apr 2023 09:30:35 -0500 Subject: [PATCH 02/61] userspace updates --- .../pi40/keymaps/miketronic/config1.h | 72 --- .../pi40/keymaps/miketronic/rules1.mk | 71 --- keyboards/hazel/satpad/config.h | 6 - keyboards/hazel/satpad/info.json | 60 ++- .../hazel/satpad/keymaps/17APR23/config.h | 78 ---- .../satpad/keymaps/17APR23/keymap - BAK.c | 435 ------------------ .../hazel/satpad/keymaps/17APR23/keymap.c | 219 --------- .../hazel/satpad/keymaps/17APR23/rules.mk | 23 - .../hazel/satpad/keymaps/miketronic/config.h | 78 ---- .../keymaps/miketronic/keymap - plain.c | 284 ------------ .../hazel/satpad/keymaps/miketronic/keymap.c | 79 +--- .../hazel/satpad/keymaps/miketronic/readme.md | 17 - .../keymaps/miketronic/rules - backup.mk | 17 - .../hazel/satpad/keymaps/miketronic/rules.mk | 23 - keyboards/hazel/satpad/rules.mk | 39 +- keyboards/hazel/satpad/satpad.h | 4 +- 16 files changed, 86 insertions(+), 1419 deletions(-) delete mode 100644 keyboards/1upkeyboards/pi40/keymaps/miketronic/config1.h delete mode 100644 keyboards/1upkeyboards/pi40/keymaps/miketronic/rules1.mk delete mode 100644 keyboards/hazel/satpad/keymaps/17APR23/config.h delete mode 100644 keyboards/hazel/satpad/keymaps/17APR23/keymap - BAK.c delete mode 100644 keyboards/hazel/satpad/keymaps/17APR23/keymap.c delete mode 100644 keyboards/hazel/satpad/keymaps/17APR23/rules.mk delete mode 100644 keyboards/hazel/satpad/keymaps/miketronic/config.h delete mode 100644 keyboards/hazel/satpad/keymaps/miketronic/keymap - plain.c delete mode 100644 keyboards/hazel/satpad/keymaps/miketronic/readme.md delete mode 100644 keyboards/hazel/satpad/keymaps/miketronic/rules - backup.mk delete mode 100644 keyboards/hazel/satpad/keymaps/miketronic/rules.mk diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/config1.h b/keyboards/1upkeyboards/pi40/keymaps/miketronic/config1.h deleted file mode 100644 index c85792b459f5..000000000000 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/config1.h +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B -// SPDX-License-Identifier: GPL-2.0+ - -#pragma once - -// specific defines example -// #if defined(TAP_DANCE_ENABLE) && defined(KEYBOARD_lets_split_rev2) || defined(KEYBOARD_keebio_iris_rev2) - - - -// Common QMK settings -#define DEBOUNCE 10 -#if defined(TAP_DANCE_ENABLE) - #define TAP_CODE_DELAY 5 - #define TAP_HOLD_CAPS_DELAY 25 -#endif -#define ENCODER_RESOLUTION 4 - - - -////////////// -// For Pi40 // -////////////// -#if defined(KEYBOARD_1upkeyboards_pi40_mit_v1_0) - -// Tapping Config -// https://docs.qmk.fm/#/tap_hold?id=tapping_term -// https://docs.qmk.fm/#/ChangeLog/20230226?id=quick-tap-term - -// Tap-hold settings - #if defined(TAP_DANCE_ENABLE) - #define TAPPING_TERM 170 - #define TAPPING_TERM_PER_KEY - #define QUICK_TAP_TERM TAPPING_TERM / 2 - #define QUICK_TAP_TERM_PER_KEY - #endif - -#define PERMISSIVE_HOLD_PER_KEY -#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY - -#endif - - - - - - -//////////////// -// For SATPAD // -//////////////// -#if defined(KEYBOARD_jasonhazel_satpad) - -// bootloader (first top leftmost key) -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 1 - -#define MATRIX_ROWS 7 -#define MATRIX_COLS 6 - -#define MATRIX_ROW_PINS { B3, B2, B6, D3, D2, D4, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7 } - -#define DIODE_DIRECTION COL2ROW - -#define DEBOUNCE 5 - -#define ENCODERS_PAD_A {B4} -#define ENCODERS_PAD_B {B5} - -#endif - - diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules1.mk b/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules1.mk deleted file mode 100644 index 4d31f9c6cada..000000000000 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules1.mk +++ /dev/null @@ -1,71 +0,0 @@ - -# Common feature for all keyboards -BOOTMAGIC_ENABLE = yes -EXTRAKEY_ENABLE = yes -TAP_DANCE_ENABLE = yes -MACROS_ENABLED = yes -RGBLIGHT_ENABLE = no -RGB_MATRIX_ENABLE = no - -# idobao/id75 -ifeq ($(strip $(KEYBOARD)), idobao/id75/v1) - RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow - LEADER_ENABLE = yes - NKRO_ENABLE = yes - AUTO_SHIFT_ENABLE = no # Removed 09MAR23 - VIA_ENABLE = no - MOUSEKEY_ENABLE = no - EXTRAKEY_ENABLE = no - CONSOLE_ENABLE = no - COMMAND_ENABLE = no -endif - -# Satpad -ifeq ($(strip $(KEYBOARD)), jasonhazel/satpad) - BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite - MOUSEKEY_ENABLE = yes # Mouse keys - EXTRAKEY_ENABLE = yes # Audio control and System control - NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work - ENCODER_ENABLE = yes - ENCODER_MAP_ENABLE = yes - OLED_ENABLE = yes - LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. - AUTO_SHIFT_ENABLE = no # 24FEB23 Added 26FEB23 Removed - UNICODE_ENABLE = no # Unicode - CONSOLE_ENABLE = no # Console for debug - COMMAND_ENABLE = no # Commands for debug and configuration - RGBLIGHT_ENABLE = no - BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality - SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) - AUDIO_ENABLE = no # Audio output on port C6 - MIDI_ENABLE = no # MIDI support - BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -endif - - -# 1upkeyboards/pi40 -ifeq ($(strip $(KEYBOARD)), 1upkeyboards/pi40/mit_v1_0) - BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite - MOUSEKEY_ENABLE = no # Mouse keys - 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 - - AUTO_SHIFT_ENABLE = no - CONSOLE_ENABLE = no # Console for debug - COMMAND_ENABLE = no # Commands for debug and configuration - BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality - RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow - AUDIO_ENABLE = no # Audio output - - RGB_MATRIX_ENABLE = yes - RGB_MATRIX_DRIVER = WS2812 - WS2812_DRIVER = vendor - ENCODER_ENABLE = yes - ENCODER_MAP_ENABLE = yes - OLED_ENABLE = yes - OLED_DRIVER = SSD1306 -endif - - diff --git a/keyboards/hazel/satpad/config.h b/keyboards/hazel/satpad/config.h index a04faf4d8a6b..1b4793a1d545 100644 --- a/keyboards/hazel/satpad/config.h +++ b/keyboards/hazel/satpad/config.h @@ -1,17 +1,11 @@ #pragma once -#include "config_common.h" - #define MATRIX_ROWS 7 #define MATRIX_COLS 6 #define MATRIX_ROW_PINS { B3, B2, B6, D3, D2, D4, E6 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7 } -#define DIODE_DIRECTION COL2ROW - -#define DEBOUNCE 5 - #define ENCODERS_PAD_A {B4} #define ENCODERS_PAD_B {B5} diff --git a/keyboards/hazel/satpad/info.json b/keyboards/hazel/satpad/info.json index 61a6fc14eb57..2d9c8cd6190c 100644 --- a/keyboards/hazel/satpad/info.json +++ b/keyboards/hazel/satpad/info.json @@ -1,9 +1,55 @@ { - "keyboard_name": "SatPad", - "manufacturer": "jasonhazel", - "usb": { - "vid": "0x4A48", - "pid": "0x7370", - "device_version": "0.0.1" - } + "manufacturer": "jasonhazel", + "keyboard_name": "satpad", + "maintainer": "jasonhazel", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { }, + "matrix_pins": { }, + "processor": "atmega32u4", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x7370", + "vid": "0x4A48" + }, + "layouts": { + "LAYOUT_ortho_3x11": { + "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": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "x": 2, "y": 1 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [1, 4], "x": 4, "y": 1 }, + { "matrix": [1, 5], "x": 5, "y": 1 }, + { "matrix": [1, 6], "x": 6, "y": 1 }, + { "matrix": [1, 7], "x": 7, "y": 1 }, + { "matrix": [1, 8], "x": 8, "y": 1 }, + { "matrix": [1, 9], "x": 9, "y": 1 }, + { "matrix": [1, 10], "x": 10, "y": 1 }, + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 }, + { "matrix": [2, 3], "x": 3, "y": 2 }, + { "matrix": [2, 4], "x": 4, "y": 2 }, + { "matrix": [2, 5], "x": 5, "y": 2 }, + { "matrix": [2, 6], "x": 6, "y": 2 }, + { "matrix": [2, 7], "x": 7, "y": 2 }, + { "matrix": [2, 8], "x": 8, "y": 2 }, + { "matrix": [2, 9], "x": 9, "y": 2 }, + { "matrix": [2, 10], "x": 10, "y": 2 } + ] + } + } } \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/17APR23/config.h b/keyboards/hazel/satpad/keymaps/17APR23/config.h deleted file mode 100644 index 2e5f8fe2dc5c..000000000000 --- a/keyboards/hazel/satpad/keymaps/17APR23/config.h +++ /dev/null @@ -1,78 +0,0 @@ -#pragma once -#include "config_common.h" - -// bootloader (first top leftmost key) -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 1 - -#define MATRIX_ROWS 7 -#define MATRIX_COLS 6 - -#define MATRIX_ROW_PINS { B3, B2, B6, D3, D2, D4, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7 } - -#define DIODE_DIRECTION COL2ROW - -#define DEBOUNCE 5 - -#define ENCODERS_PAD_A {B4} -#define ENCODERS_PAD_B {B5} - - - - -// Behaviors That Can Be Configured - - -#define TAPPING_TERM 175 - // how long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too - -#define PERMISSIVE_HOLD - // makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM - -#define IGNORE_MOD_TAP_INTERRUPT - // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. - -#define TAPPING_FORCE_HOLD - // makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap) - // Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) - - -/* - #define TAPPING_TERM_PER_KEY - // enables handling for per key TAPPING_TERM settings - - #define RETRO_TAPPING - // tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release - - #define TAPPING_TOGGLE 2 - // how many taps before triggering the toggle - - #define LEADER_TIMEOUT 300 - // how long before the leader key times out - // If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. - - #define LEADER_PER_KEY_TIMING - // sets the timer for leader key chords to run on each key press rather than overall - - #define LEADER_KEY_STRICT_KEY_PROCESSING - // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. - - #define ONESHOT_TIMEOUT 300 - // how long before oneshot times out - - #define ONESHOT_TAP_TOGGLE 2 - // how many taps before oneshot toggle is triggered - - #define COMBO_COUNT 2 - // Set this to the number of combos that you're using in the Combo feature. - - #define COMBO_TERM 200 - // how long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined. - - #define TAP_CODE_DELAY 100 - // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds. - - #define TAP_HOLD_CAPS_DELAY 80 - // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS. The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher. -*/ diff --git a/keyboards/hazel/satpad/keymaps/17APR23/keymap - BAK.c b/keyboards/hazel/satpad/keymaps/17APR23/keymap - BAK.c deleted file mode 100644 index c04d49b74212..000000000000 --- a/keyboards/hazel/satpad/keymaps/17APR23/keymap - BAK.c +++ /dev/null @@ -1,435 +0,0 @@ -//24MAR23 -#include QMK_KEYBOARD_H - - -enum layers { - _HOME, // home base layer - _LOWER, - _RAISE, - _ADJUST, - _EXTRAS, - _FN, - _SYMBOLS -}; - -// TAP DANCE DECLARATIONS ============================================================================ -enum { - T_BR = 0, // [, ] - // T_PA, // (, ) - T_SL, // slash, backslash - T_UR, // up, right - T_DL, // down, left - T_UMIN, // underscore, minus - T_QUOTE, // quote, double quote - T_DOTENT, // dot, enter - T_IENT, // I, enter - T_TSPC, // T, space - T_COMMSPC, // space, comma - T_DOTSPC, // space, dot - T_QEXC, // Tap once for ?, twice for ! - T_QESC, // Tap once for "q", twice for escape - // T_NENT, // N, enter - // T_TE, // tab, escape - T_CP, // copy, paste - T_XX, // open/close paren - T_YY, // open/close brackets - T_ATH, // @, # - T_PRAM, // %, & - T_SBAK, // Tap once for semicolon, twice for backspace -}; - - -//TAP DANCE DEFINITIONS =========================================== -qk_tap_dance_action_t tap_dance_actions[] = { - [T_BR] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), // Tap once for [, twice for ] - // [T_PA] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN), - [T_SL] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_BSLS), - [T_UR] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_RGHT), - [T_DL] = ACTION_TAP_DANCE_DOUBLE(KC_DOWN, KC_LEFT), - [T_UMIN] = ACTION_TAP_DANCE_DOUBLE(KC_UNDS, KC_MINS), // Tap once for Underscore, twice for Minus - [T_QUOTE] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_DQUO), // Tap once for quote, twice for double quote - [T_DOTENT] = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_ENT), // Tap once for dot, twice for enter - [T_IENT] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_ENT), // Tap once for I, twice for enter - [T_TSPC] = ACTION_TAP_DANCE_DOUBLE(KC_T, KC_SPC), // Tap once for "t", twice for space - [T_COMMSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_COMM), // Tap once for space, twice for comm - [T_DOTSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_DOT), // Tap once for space, twice for dot - [T_QEXC] = ACTION_TAP_DANCE_DOUBLE(KC_QUES, KC_EXLM), // Tap once for ?, twice for ! - [T_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), // Tap once for "q", twice for escape - // [T_NENT] = ACTION_TAP_DANCE_DOUBLE(KC_N, KC_ENT), // Tap once for "n", twice for enter - // [T_TE] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_ESC), // Tap once for tab, twice for esc - [T_CP] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_C), LCTL(KC_V)), - [T_XX] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN), - [T_YY] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), - [T_ATH] = ACTION_TAP_DANCE_DOUBLE(KC_AT, KC_HASH), - [T_PRAM] = ACTION_TAP_DANCE_DOUBLE(KC_PERC, KC_AMPR), - [T_SBAK] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_BSPC), // Tap once for semicolon, twice for backspace - //[X_CTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, x_finished, x_reset) - -}; - -#define XXXX KC_NO - -// Defines for task manager and such -#define CALTDEL LCTL(LALT(KC_DEL)) -// #define TSKMGR LCTL(LSFT(KC_ESC)) -#define CLIP LCTL(LALT(KC_Q)) // Clipboard -#define SS LCTL(LALT(KC_G)) // Greenshot region -#define FNZ LT(_FN, KC_Z) // Z when tapped, FN layer MO -#define CTRLX MT(MOD_LCTL, KC_X) // X when tapped, Ctrl when held -#define TBSHFT MT(MOD_LSFT, KC_TAB) // Tab when tapped, Shift when held -// #define LOWER MO(_LOWER) -// #define RAISE MO(_RAISE) - -/* ========================================================================== - MACROS - ========================================================================== -*/ - -// Macro Declarations -enum custom_keycodes { - CK_TRIPLEZERO = SAFE_RANGE, - M01, - M02, - M03, - M04, - M05, - M06, - M07, - M08 -}; - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* - * LEGEND: - * - * ,--------------------------------. - * | Top row: shifted character | - * | Central row: standard char | - * | Bottom row: hold modifier | - * `--------------------------------' - * - * "____" means free to be assigned - * - */ - -/* Workman Home Layer - * ,----------------------------------------------------------------------------. - * | | | | | | | | | | | | - * | Q | D | R | W | B | | J | F | U | P | ; | - * |Escape| FN | | |SYMBOL| |SYMBOL| | | |BKSPC | - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | A | S | H | T | G | | Y | N | E | O | I | - * | Shift| | |EXTRAS| OSkey| | OSkey| | | | Enter| - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | Z | X | M | C | V | | K | L | Space| Space| /\ | - * | FN | CTRL | OS | ALT |LOWER | | RAISE| Alt | , | . | | - * '----------------------------------------------------------------------------' - * - * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca - * - */ - [_HOME] = LAYOUT_3x11( - T_QESC, LT(_FN, KC_D), KC_R, KC_W, LT(_SYMBOLS, KC_B), XXXX, LT(_SYMBOLS, KC_J), KC_F, KC_U, KC_P, T_SBAK, - MT(MOD_LSFT, KC_A), KC_S, KC_H, LT(_EXTRAS, KC_T), MT(MOD_LGUI, KC_G), XXXX, MT(MOD_RGUI, KC_Y), KC_N, KC_E, KC_O, T_IENT, - FNZ, CTRLX, MT(MOD_LGUI, KC_M), MT(MOD_LALT, KC_C), LT(_LOWER, KC_V), XXXX, LT(_RAISE, KC_K), MT(MOD_LALT, KC_L), TD(T_COMMSPC), TD(T_DOTSPC), KC_SLSH - ), - - - - -/* LOWER LAYER - * ,----------------------------------------------------------------------------. - * | | | | | | | | & | * | ( | ) | - * | () | [] | / \ | | | | / \ | 7 | 8 | 9 | 0 | - * | | | | | | | ____ | ____ | ____ | ____ | Shift| - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | $ | % | ^ | | - * | @ # | & % | | | | | [ ] | 4 | 5 | 6 | Del | - * | | | | | | | ____ | ____ | ____ | ____ | Shift| - * | -----+------+------+------+------+------|------+------+------+------+------| - * | | | | | XXXX | | | ! | @ | # | | - * | | | | | XXXX | | | 1 | 2 | 3 | . | - * | | | | | XXXX | | ____ | ____ | ____ | ____ | Enter| - * '----------------------------------------------------------------------------' - */ - [_LOWER] = LAYOUT_3x11( - T_XX, T_YY, T_SL, XXXX, XXXX, XXXX, T_SL, KC_7, KC_8, KC_9, MT(MOD_RSFT, KC_0), - T_ATH, T_PRAM, _______, XXXX, XXXX, XXXX, T_YY, KC_4, KC_5, KC_6, MT(MOD_RSFT, KC_DEL), - XXXX, XXXX, XXXX, XXXX, _______, XXXX, _______, KC_1, KC_2, KC_3, TD(T_DOTENT) - ), - -/* RAISE LAYER - * ,----------------------------------------------------------------------------. - * | ! | @ | # | $ | % | | ^ | & | * | ( | ) | - * | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - * | ____ | ____ | ____ | ____ | ____ | | ____ | ____ | Alt | Ctrl | Shift| - * |------+------+------+------+------+------+------+------+------+------+------| - * | | ~ | _ | + | { | | _ | | | : | " | | - * | TAB | ` | - | = | [ | | - | \ | ; | ' | Del | - * | Shift| ____ | ____ | AltGr| OSkey| | ____ | AltGr| ____ | ____ | Shift| - * | -----+------+------+------+------+------|------+------+------+------+------| - * | | | | | | | XXXX | > | ? | | | - * | |BackSp| Del | Enter| | | XXXX | . | / | Enter| | - * | | Ctrl | Alt | ____ | ____ | | XXXX | Alt | Ctrl | Shift| | - * '----------------------------------------------------------------------------' - */ - [_RAISE] = LAYOUT_3x11( - KC_1, KC_2, KC_3, KC_4, KC_5, _______, KC_6, KC_7, MT(MOD_LALT, KC_8), MT(MOD_RCTL,KC_9), MT(MOD_RSFT, KC_0), - TBSHFT, KC_GRV, KC_MINS, MT(MOD_RALT, KC_EQL), MT(MOD_LGUI, KC_LBRC), _______, T_UMIN, MT(MOD_RALT, KC_BSLS), KC_SCLN, KC_QUOT, MT(MOD_RSFT, KC_DEL), - KC_LEFT, MT(KC_LCTL, KC_BSPC), MT(KC_LALT, KC_DEL), KC_ENT, _______, XXXX, _______, MT(MOD_LALT, KC_DOT), MT(MOD_RCTL, KC_SLSH), MT(MOD_RSFT, KC_ENT), KC_RGHT - ), - -/* ADJUST LAYER (LOWER + RAISE) - * ,----------------------------------------------------------------------------. - * | | | | | | | | | | | | - * | BOOT | | | | | | | | | |CALTDEL| - * | | ____ | ____ | ____ | ____ | | ____ | ____ | ____ | ____ | ____ | - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | TAB | | | | | | | | | | Del | - * | Shift| ____ | ____ | ____ | ____ | | ____ | ____ | ____ | ____ | Shift| - * | -----+------+------+------+------+------|------+------+------+------+------| - * | | | | | XXXX | | XXXX | | | | | - * | | | | | XXXX | | XXXX | | | | . | - * | | | | | XXXX | | XXXX | ____ | ____ | ____ | Enter| - * '----------------------------------------------------------------------------' - */ - [_ADJUST] = LAYOUT_3x11( - QK_BOOT, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, CALTDEL, - TBSHFT, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, MT(MOD_RSFT, KC_DEL), - XXXX, XXXX, XXXX, XXXX, _______, XXXX, _______, XXXX, XXXX, XXXX, MT(KC_ENT, KC_DOT) - ), - -/* EXTRAS LAYER - * ,----------------------------------------------------------------------------. - * | | | | | | | | | | | | - * | ! | | | | | | /\ | | | | ; | - * | | ____ | ____ | ____ | ____ | | ____ | ____ | ____ | ____ | ____ | - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * |SHIFT | | |EXTRAS| | | | | | | ' | - * | | ____ | ____ | ____ | ____ | | ____ | ____ | ____ | ____ | ____ | - * | -----+------+------+------+------+------|------+------+------+------+------| - * | | | | | | | | | | | | - * | | | | | | | | | , | . | ? | - * | | | | | | | | ____ | ____ | ____ | ____ | - * '----------------------------------------------------------------------------' - */ - [_EXTRAS] = LAYOUT_3x11( - KC_EXLM, XXXX, XXXX, XXXX, XXXX, XXXX, TD(T_SL), XXXX, XXXX, XXXX, KC_SCLN, - KC_LSFT, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, KC_QUOT, - XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, KC_COMM, KC_DOT, KC_QUES - ), - - -/* FUNCTION LAYER - * ,----------------------------------------------------------------------------. - * |1COPY | | | | | | | | | | | - * |2PASTE| CLIP | SS | | | | / \ | | UP | |DELETE| - * | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | TAB | M05 | M06 | M07 | M08 | | | LEFT | DOWN | RIGHT| UP | - * | Shift| | | | | | | | | | RIGHT| - * |------+------+------+------+------+------+------+------+------+------+------| - * | XXXX | | | | | | | | | | | - * | XXXX | M01 | M02 | M03 | M04 | | | ? | , | . | DOWN | - * | XXXX | | | | | | | ! | ____ | ____ | LEFT | - * '----------------------------------------------------------------------------' - */ - - [_FN] = LAYOUT_3x11( - TD(T_CP), CLIP, SS, XXXX, XXXX, XXXX, TD(T_SL), XXXX, KC_UP, XXXX, KC_DEL, - TBSHFT, M05, M06, M07, M08, XXXX, XXXX, KC_LEFT, KC_DOWN, KC_RGHT, TD(T_UR), - _______, M01, M02, M03, M04, XXXX, XXXX, XXXX, XXXX, XXXX, TD(T_DL) - ), - - -/* SYMBOLS - * ,----------------------------------------------------------------------------. - * | | | | | XXXX | | XXXX | | | | | - * | $ | ^ | < | > | XXXX | | XXXX | | | [ | ] | - | - * | | | | | XXXX | | XXXX | | | | | - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | % | : | ; | + | = | | | | ( | ) | _ | - * | | | | | | | | | | | | - * | -----+------+------+------+------+------|------+------+------+------+------| - * | | | | | | | | | | | | - * | & | ' | " | * | # | | ! | ? | / | \ | @ | - * | | | | | | | | | | | | - * '----------------------------------------------------------------------------' - * - * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca - */ - [_SYMBOLS] = LAYOUT_3x11( - KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXX, _______, XXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, - KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, - KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, _______, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT - ), - - - -}; - -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} - -void matrix_init_user(void) { - // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values - // set num lock on at start (for numonly layer to work) - if (!host_keyboard_led_state().num_lock) { - tap_code(KC_NUM_LOCK); - } -} - -void matrix_scan_user(void) { -} - - -// Macro Definitions -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch(keycode) { - - case M01: - if (record->event.pressed) { - SEND_STRING("//a11"); - } - break; - - case M02: - if (record->event.pressed) { - SEND_STRING("//a12"); - } - break; - - case M03: - if (record->event.pressed) { - SEND_STRING("//a08"); - } - break; - - case M04: - if (record->event.pressed) { - SEND_STRING("//a09"); - } - break; - - case M05: - if (record->event.pressed) { - SEND_STRING("//th"); - } - break; - - case M06: - if (record->event.pressed) { - SEND_STRING("//re"); - } - break; - - case M07: - if (record->event.pressed) { - SEND_STRING("//yw"); - } - break; - - case M08: - if (record->event.pressed) { - tap_random_base64(); - } - break; - - case CK_TRIPLEZERO: - if (record->event.pressed) { - SEND_STRING("000"); - } // else { when released } - break; - } - return true; - }; - -/* -void keyboard_pre_init_user(void) { - // Set our LED pins as output - setPinOutput(D5); - setPinOutput(B0); -} - -bool led_update_user(led_t led_state) { - writePin(D5, !led_state.num_lock); - writePin(B0, !led_state.caps_lock); - return false; // prevent keyboard from processing state -} -*/ - -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_HOME] = { ENCODER_CCW_CW(LCTL(KC_V), LCTL(KC_C)) }, - [_SYMBOLS] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_RAISE] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_LOWER] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_ADJUST] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_EXTRAS] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_FN] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, -}; - - -oled_rotation_t oled_init_user(oled_rotation_t rotation){ - return OLED_ROTATION_270; -} - -/* -bool oled_task_user(void) { - uint8_t modifiers = get_mods() | get_oneshot_mods(); - - oled_set_cursor(0, 11); - oled_write_P(PSTR("SHIFT"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); - oled_write_P(PSTR("CNTRL"), (modifiers & MOD_MASK_CTRL)); - - return true; -} -*/ - -#ifdef OLED_ENABLE -bool oled_task_user(void) { - // Host Keyboard Layer Status - oled_write_P(PSTR("LAYER\n-----\n"), false); - - switch (get_highest_layer(layer_state)) { - case _LOWER: - oled_write_P(PSTR("LOWER"), false); - break; - case _RAISE: - oled_write_P(PSTR("RAISE"), false); - break; - case _EXTRAS: - oled_write_P(PSTR("EXTRA"), false); - break; - case _FN: - oled_write_P(PSTR("FUNCT"), false); - break; - case _ADJUST: - oled_write_P(PSTR(" ADJ "), false); - break; - case _SYMBOLS: - oled_write_P(PSTR("SYMB"), false); - break; - default: - // Or use the write_ln shortcut over adding '\n' to the end of your string - oled_write_ln_P(PSTR("HOME"), false); - } - -// Host Keyboard LED Status - // led_t led_state = host_keyboard_led_state(); - // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - return false; -} -#endif - diff --git a/keyboards/hazel/satpad/keymaps/17APR23/keymap.c b/keyboards/hazel/satpad/keymaps/17APR23/keymap.c deleted file mode 100644 index b162e6eb453f..000000000000 --- a/keyboards/hazel/satpad/keymaps/17APR23/keymap.c +++ /dev/null @@ -1,219 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B -// SPDX-License-Identifier: GPL-2.0+ - -#include QMK_KEYBOARD_H -#include "miketronic.h" - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* Workman - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ TAB │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ BSPC│ - * │ ESC │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ ; │ ; │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ TAB │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ │ - * │SHIFT│ │ │ ┃ EX ┃ │ │ ┃ ┃ │ │ENTER│ENTER│ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │SHIFT| Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ / │ UP | - * │ │ │ │ │ │ │ │ │ │ , │ . │ │RIGHT| - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ FN │CTRL │ OS │ ALT │LOWER│ │ │ │RAISE│ SS │CLIP │COPY │ DN │ - * │ │ │ │ │ │ │ │ │ │ │ │PASTE│LEFT │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ -/* Workman Home Layer - * ,----------------------------------------------------------------------------. - * | | | | | | | | | | | | - * | Q | D | R | W | B | | J | F | U | P | ; | - * |Escape| FN | | |SYMBOL| |SYMBOL| | | |BKSPC | - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | A | S | H | T | G | | Y | N | E | O | I | - * | Shift| | |EXTRAS| OSkey| | OSkey| | | | Enter| - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | Z | X | M | C | V | | K | L | Space| Space| /\ | - * | FN | CTRL | OS | ALT |LOWER | | RAISE| Alt | , | . | | - * '----------------------------------------------------------------------------' - * - * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca - * - */ - [_WM] = LAYOUT ( - _____________WORKMAN_311_001_L_____________, _____________WORKMAN_311_001_R_____________, - _____________WORKMAN_311_002_L_____________, _____________WORKMAN_311_002_R_____________, - _____________WORKMAN_311_003_L_____________, _____________WORKMAN_311_003_R_____________ - ), - - [_QW] = LAYOUT_3x11_wrapper ( - _____________WORKMAN_311_001_L_____________, _____________WORKMAN_311_001_R_____________, - _____________WORKMAN_311_002_L_____________, _____________WORKMAN_311_002_R_____________, - _____________WORKMAN_311_003_L_____________, _____________WORKMAN_311_003_R_____________ - ), - - -/* LOWER LAYER - * ,----------------------------------------------------------------------------. - * | | | | | | | | & | * | ( | ) | - * | () | [] | / \ | | | | / \ | 7 | 8 | 9 | 0 | - * | | | | | | | ____ | ____ | ____ | ____ | Shift| - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | $ | % | ^ | | - * | @ # | & % | | | | | [ ] | 4 | 5 | 6 | Del | - * | | | | | | | ____ | ____ | ____ | ____ | Shift| - * | -----+------+------+------+------+------|------+------+------+------+------| - * | | | | | XXXX | | | ! | @ | # | | - * | | | | | XXXX | | | 1 | 2 | 3 | . | - * | | | | | XXXX | | ____ | ____ | ____ | ____ | Enter| - * '----------------------------------------------------------------------------' - */ - [_LOWER] = LAYOUT_3x11_wrapper ( - T_XX, T_YY, T_SL, XXXX, XXXX, _______, T_SL, KC_7, KC_8, KC_9, MT(MOD_RSFT, KC_0), - T_ATH, T_PRAM, _______, XXXX, XXXX, _______, T_YY, KC_4, KC_5, KC_6, MT(MOD_RSFT, KC_DEL), - XXXX, XXXX, XXXX, XXXX, _______, KC_ENT, _______, KC_1, KC_2, KC_3, T_DENT - ), - - - - - - [_RAISE] = LAYOUT_3x11_wrapper ( - QK_BOOT, DB_TOGG, _______, _______, MAKE, _______, T_SL, KC_F7, KC_F8, KC_F9, KC_F10, \ - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, T_UMIN, KC_F4, KC_F5, KC_F6, KC_F11, \ - _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_ENT, _______, KC_F1, KC_F2, KC_F3, KC_F12 \ - ), - - - - /* EXTRAS - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ ! │ │ │ │ │ │ │ /\ │ [ │ ] │ ; │ - * │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ │ │ ┃EXTRA┃ │ │ ┃ ┃ ( │ ) │ ' │ - * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ , │ . │ ? │ - * │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - */ - - [_EXTRAS] = LAYOUT_3x11_wrapper ( - KC_EXLM, _______, _______, _______, _______, _______, _______, T_SL, KC_LBRC, KC_RBRC, KC_SCLN, - KC_LSFT, _______, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_QUOT, - _______, _______, _______, _______, _______, KC_ENT, _______, _______, KC_COMM, KC_DOT, KC_QUES -), - - -/* FUNCTION LAYER - * ,----------------------------------------------------------------------------. - * |1COPY | | | | | | | | | | | - * |2PASTE| CLIP | SS | | | | / \ | | UP | |DELETE| - * | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | TAB | M05 | M06 | M07 | M08 | | | LEFT | DOWN | RIGHT| UP | - * | Shift| | | | | | | | | | RIGHT| - * |------+------+------+------+------+------+------+------+------+------+------| - * | XXXX | | | | | | | | | | | - * | XXXX | M01 | M02 | M03 | M04 | | | ? | , | . | DOWN | - * | XXXX | | | | | | | ! | ____ | ____ | LEFT | - * '----------------------------------------------------------------------------' - */ - - [_FN] = LAYOUT_3x11_wrapper ( - T_CP, CLIP, SS, _______, _______, _______, T_SL, _______, KC_UP, _______, KC_DEL, - KC_TAB, M05, M06, M07, M08, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, T_UR, - _______, M01, M02, M03, M04, KC_ENT, _______, T_QEXC, KC_COMM, KC_DOT, T_DL - ), - - -/* SYMBOLS - * ,----------------------------------------------------------------------------. - * | | | | | XXXX | | XXXX | | | | | - * | $ | ^ | < | > | XXXX | | XXXX | | | [ | ] | - | - * | | | | | XXXX | | XXXX | | | | | - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | % | : | ; | + | = | | | | ( | ) | _ | - * | | | | | | | | | | | | - * | -----+------+------+------+------+------|------+------+------+------+------| - * | | | | | | | | | | | | - * | & | ' | " | * | # | | ! | ? | / | \ | @ | - * | | | | | | | | | | | | - * '----------------------------------------------------------------------------' - * - * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca - */ - [_SYMB] = LAYOUT_3x11_wrapper ( - KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXX, _______, XXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, - KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, - KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_ENT, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT - ), - - - -}; - - - -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_WM] = { ENCODER_CCW_CW(LCTL(KC_V), LCTL(KC_C)) }, - [_QW] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_LOWER] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_RAISE] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_EX] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_FN] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_SYMB] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) } -}; - - -oled_rotation_t oled_init_user(oled_rotation_t rotation){ - return OLED_ROTATION_270; -} - - - -#ifdef OLED_ENABLE -bool oled_task_user(void) { - // Host Keyboard Layer Status - oled_write_P(PSTR("LAYER\n-----\n"), false); - - switch (get_highest_layer(layer_state)) { - case _WM: - oled_write_P(PSTR("WMAN"), false); - break; - case _QW: - oled_write_P(PSTR("QW"), false); - break; - case _LOWER: - oled_write_P(PSTR("LOWER"), false); - break; - case _RAISE: - oled_write_P(PSTR("RSE"), false); - break; - case _EX: - oled_write_P(PSTR(" EX "), false); - break; - case _FN: - oled_write_P(PSTR(" FN "), false); - break; - case _SYMB: - oled_write_P(PSTR("SYMB"), false); - break; - default: - // Or use the write_ln shortcut over adding '\n' to the end of your string - oled_write_ln_P(PSTR("HOME"), false); - } - -// Host Keyboard LED Status - // led_t led_state = host_keyboard_led_state(); - // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - return false; -} -#endif - diff --git a/keyboards/hazel/satpad/keymaps/17APR23/rules.mk b/keyboards/hazel/satpad/keymaps/17APR23/rules.mk deleted file mode 100644 index 3386642e8384..000000000000 --- a/keyboards/hazel/satpad/keymaps/17APR23/rules.mk +++ /dev/null @@ -1,23 +0,0 @@ -# Build Options (yes/no) -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -TAP_DANCE_ENABLE = yes -ENCODER_ENABLE = yes -ENCODER_MAP_ENABLE = yes -OLED_ENABLE = yes - -LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. - -AUTO_SHIFT_ENABLE = no # 24FEB23 Added 26FEB23 Removed -UNICODE_ENABLE = no # Unicode -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -RGBLIGHT_ENABLE = no -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) -AUDIO_ENABLE = no # Audio output on port C6 -MIDI_ENABLE = no # MIDI support -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/config.h b/keyboards/hazel/satpad/keymaps/miketronic/config.h deleted file mode 100644 index 2e5f8fe2dc5c..000000000000 --- a/keyboards/hazel/satpad/keymaps/miketronic/config.h +++ /dev/null @@ -1,78 +0,0 @@ -#pragma once -#include "config_common.h" - -// bootloader (first top leftmost key) -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 1 - -#define MATRIX_ROWS 7 -#define MATRIX_COLS 6 - -#define MATRIX_ROW_PINS { B3, B2, B6, D3, D2, D4, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7 } - -#define DIODE_DIRECTION COL2ROW - -#define DEBOUNCE 5 - -#define ENCODERS_PAD_A {B4} -#define ENCODERS_PAD_B {B5} - - - - -// Behaviors That Can Be Configured - - -#define TAPPING_TERM 175 - // how long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too - -#define PERMISSIVE_HOLD - // makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM - -#define IGNORE_MOD_TAP_INTERRUPT - // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. - -#define TAPPING_FORCE_HOLD - // makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap) - // Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle) - - -/* - #define TAPPING_TERM_PER_KEY - // enables handling for per key TAPPING_TERM settings - - #define RETRO_TAPPING - // tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release - - #define TAPPING_TOGGLE 2 - // how many taps before triggering the toggle - - #define LEADER_TIMEOUT 300 - // how long before the leader key times out - // If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped. - - #define LEADER_PER_KEY_TIMING - // sets the timer for leader key chords to run on each key press rather than overall - - #define LEADER_KEY_STRICT_KEY_PROCESSING - // Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A. - - #define ONESHOT_TIMEOUT 300 - // how long before oneshot times out - - #define ONESHOT_TAP_TOGGLE 2 - // how many taps before oneshot toggle is triggered - - #define COMBO_COUNT 2 - // Set this to the number of combos that you're using in the Combo feature. - - #define COMBO_TERM 200 - // how long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined. - - #define TAP_CODE_DELAY 100 - // Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds. - - #define TAP_HOLD_CAPS_DELAY 80 - // Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPS_LOCK keycode, as this has some special handling on MacOS. The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher. -*/ diff --git a/keyboards/hazel/satpad/keymaps/miketronic/keymap - plain.c b/keyboards/hazel/satpad/keymaps/miketronic/keymap - plain.c deleted file mode 100644 index 47a5e10a1149..000000000000 --- a/keyboards/hazel/satpad/keymaps/miketronic/keymap - plain.c +++ /dev/null @@ -1,284 +0,0 @@ -#include QMK_KEYBOARD_H - - -enum layers { - _HOME, // home base layer - _LOWER, - _RAISE, - _ADJUST, - _FUNCTION, - _SYMBOLS, - _ARROWPAD, -}; - -// TAP DANCE DECLARATIONS ============================================================================ -enum { - T_BR = 0, // [, ] - // T_PA, // (, ) - T_SL, // slash, backslash - // T_UPRT, // up, right - // T_DNLT, // down, left - T_QUOTE, // quote, double quote - T_DOTENT, // dot, enter - T_TSPC, // T, space - T_COMMSPC, // space, comma - T_DOTSPC, // space, dot - T_QEXC, // Tap once for ?, twice for ! - T_QESC, // Tap once for "q", twice for escape - // T_NENT, // N, enter - // T_TE, // tab, escape - T_CP, // copy, paste -}; - -//TAP DANCE DEFINITIONS =========================================== -qk_tap_dance_action_t tap_dance_actions[] = { - [T_BR] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), // Tap once for [, twice for ] - // [T_PA] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN), - [T_SL] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_BSLS), - // [T_UPRT] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_RGHT), - // [T_DNLT] = ACTION_TAP_DANCE_DOUBLE(KC_DOWN, KC_LEFT), - [T_QUOTE] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_DQUO), // Tap once for quote, twice for double quote - [T_DOTENT] = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_ENT), // Tap once for dot, twice for enter - [T_TSPC] = ACTION_TAP_DANCE_DOUBLE(KC_T, KC_SPC), // Tap once for "t", twice for space - [T_COMMSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_COMM), // Tap once for space, twice for comm - [T_DOTSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_DOT), // Tap once for space, twice for dot - [T_QEXC] = ACTION_TAP_DANCE_DOUBLE(KC_QUES, KC_EXLM), // Tap once for ?, twice for ! - [T_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), // Tap once for "q", twice for escape - // [T_NENT] = ACTION_TAP_DANCE_DOUBLE(KC_N, KC_ENT), // Tap once for "n", twice for enter - // [T_TE] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_ESC), // Tap once for tab, twice for esc - [T_CP] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_C), LCTL(KC_V)), - //[X_CTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, x_finished, x_reset) - -}; - -#define XXXX KC_NO - -// Defines for task manager and such -#define CALTDEL LCTL(LALT(KC_DEL)) -// #define TSKMGR LCTL(LSFT(KC_ESC)) -#define CLIP LCTL(LALT(KC_Q)) // Clipboard -#define SS LCTL(LALT(KC_G)) // Greenshot region - - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* - * LEGEND: - * - * ,--------------------------------. - * | Top row: shifted character | - * | Central row: standard char | - * | Bottom row: hold modifier | - * `--------------------------------' - * - * "____" means free to be assigned - * - */ - -/* Workman Home Layer - * ,----------------------------------------------------------------------------. - * | | | | | | | | | | | | - * | Q | D | R | W | B | | J | F | U | P | BKSPC| - * |Escape| FUNCT| | |SYMBOL| |SYMBOL| | | | Shift| - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | A | S | H | T | G | | Y | N | E | O | I | - * | Shift| | |2x SPC| OSkey| | OSkey| | | | Shift| - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | Z | X | M | C | V | | K | L | Space| Space| | - * | FUNCT| CTRL | OS | ALT |LOWER | | RAISE| Alt | , | . | Enter| - * '----------------------------------------------------------------------------' - * - * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca - * - */ - [_HOME] = LAYOUT_3x11( - TD(T_QESC), LT(_FUNCTION, KC_D), KC_R, KC_W, LT(_SYMBOLS, KC_B), XXXX, LT(_SYMBOLS, KC_J), KC_F, KC_U, KC_P, MT(MOD_RSFT, KC_BSPC), - MT(MOD_LSFT, KC_A), KC_S, KC_H, TD(T_TSPC), MT(MOD_LGUI, KC_G), XXXX, MT(MOD_RGUI, KC_Y), KC_N, KC_E, KC_O, MT(MOD_RSFT, KC_I), - LT(_FUNCTION, KC_Z), MT(MOD_LCTL, KC_X), MT(MOD_LGUI, KC_M), MT(MOD_LALT, KC_C), LT(_LOWER, KC_V), XXXX, LT(_RAISE, KC_K), MT(MOD_LALT, KC_L), TD(T_COMMSPC), TD(T_DOTSPC), KC_ENT - ), - - - - -/* LOWER LAYER - * ,----------------------------------------------------------------------------. - * | | | | | | | | & | * | ( | ) | - * | | VOL+ | | | | | / \ | 7 | 8 | 9 | 0 | - * | | | | | | | ____ | ____ | ____ | ____ | Shift| - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | $ | % | ^ | | - * | TAB | MUTE | | | | | [ ] | 4 | 5 | 6 | Del | - * | Shift| | | | | | ____ | ____ | ____ | ____ | Shift| - * | -----+------+------+------+------+------|------+------+------+------+------| - * | | | | | XXXX | | | ! | @ | # | | - * | | VOL- | | | XXXX | | | 1 | 2 | 3 | . | - * | | | | | XXXX | | ____ | ____ | ____ | ____ | Enter| - * '----------------------------------------------------------------------------' - */ - [_LOWER] = LAYOUT_3x11( - XXXX, KC_VOLU, XXXX, XXXX, XXXX, XXXX, TD(T_SL), KC_7, KC_8, KC_9, MT(MOD_RSFT, KC_0), - MT(MOD_LSFT, KC_TAB), KC_MUTE, XXXX, XXXX, XXXX, XXXX, TD(T_BR), KC_4, KC_5, KC_6, MT(MOD_RSFT, KC_DEL), - XXXX, KC_VOLD, XXXX, XXXX, _______, XXXX, _______, KC_1, KC_2, KC_3, TD(T_DOTENT) - ), - -/* RAISE LAYER - * ,----------------------------------------------------------------------------. - * | ! | @ | # | $ | % | | ^ | & | * | ( | ) | - * | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - * | ____ | ____ | ____ | ____ | ____ | | ____ | ____ | Alt | Ctrl | Shift| - * |------+------+------+------+------+------+------+------+------+------+------| - * | | ~ | _ | + | { | | _ | | | : | " | | - * | TAB | ` | - | = | [ | | - | \ | ; | ' | Del | - * | Shift| ____ | ____ | AltGr| OSkey| | OSkey| AltGr| ____ | ____ | Shift| - * | -----+------+------+------+------+------|------+------+------+------+------| - * | | | | | | | XXXX | > | ? | | | - * | |BackSp| Del | Enter| | | XXXX | . | / | Enter| | - * | | Ctrl | Alt | ____ | ____ | | XXXX | Alt | Ctrl | Shift| | - * '----------------------------------------------------------------------------' - */ - [_RAISE] = LAYOUT_3x11( - KC_1, KC_2, KC_3, KC_4, KC_5, _______, KC_6, KC_7, MT(MOD_LALT, KC_8), MT(MOD_RCTL,KC_9), MT(MOD_RSFT, KC_0), - MT(MOD_LSFT, KC_TAB), KC_GRV, KC_MINS, MT(MOD_RALT, KC_EQL), MT(MOD_LGUI, KC_LBRC), _______, KC_MINS, MT(MOD_RALT, KC_BSLS), KC_SCLN, KC_QUOT, MT(MOD_RSFT, KC_DEL), - KC_LEFT, MT(KC_LCTL, KC_BSPC), MT(KC_LALT, KC_DEL), KC_ENT, _______, XXXX, _______, MT(MOD_LALT, KC_DOT), MT(MOD_RCTL, KC_SLSH), MT(MOD_RSFT, KC_ENT), KC_RGHT - ), - -/* ADJUST LAYER (LOWER + RAISE) - * ,----------------------------------------------------------------------------. - * | | | | | | | | | | | | - * | BOOT | | | | | | | | | |CALTDEL| - * | | ____ | ____ | ____ | ____ | | ____ | ____ | ____ | ____ | ____ | - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | TAB | | | | | | | | | | Del | - * | Shift| ____ | ____ | ____ | ____ | | ____ | ____ | ____ | ____ | Shift| - * | -----+------+------+------+------+------|------+------+------+------+------| - * | | | | | XXXX | | XXXX | | | | | - * | | CTRL | ALT | Enter| XXXX | | XXXX | | | | . | - * | | | | Shift| XXXX | | XXXX | ____ | ____ | ____ | Enter| - * '----------------------------------------------------------------------------' - */ - [_ADJUST] = LAYOUT_3x11( - QK_BOOT, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, CALTDEL, - MT(MOD_LSFT, KC_TAB), XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, MT(MOD_RSFT, KC_DEL), - XXXX, XXXX, XXXX, XXXX, _______, XXXX, _______, XXXX, XXXX, XXXX, MT(KC_ENT, KC_DOT) - ), - -/* FUNCTION LAYER - * ,----------------------------------------------------------------------------. - * |1COPY | | | | | | | | | | | - * |2PASTE| CLIP | SS | | | | | | UP | |DELETE| - * | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | TAB | M05 | M06 | M07 | M08 | | | LEFT | DOWN | RIGHT| " ' | - * | Shift| | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------| - * | XXXX | | | | | | | | | | | - * | XXXX | M01 | M02 | M03 | M04 | | | ? | , | . | ? | - * | XXXX | | | | | | | ! | ____ | ____ | ! | - * '----------------------------------------------------------------------------' - */ - - [_FUNCTION] = LAYOUT_3x11( - TD(T_CP), CLIP, SS, XXXX, XXXX, XXXX, XXXX, XXXX, KC_UP, XXXX, KC_DEL, - MT(MOD_LSFT, KC_TAB), XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, KC_LEFT, KC_DOWN, KC_RGHT, TD(T_QUOTE), - _______, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, TD(T_QEXC), KC_COMM, KC_DOT, TD(T_QEXC) - ), - - -/* SYMBOLS - * ,----------------------------------------------------------------------------. - * | | | | | XXXX | | XXXX | | | | | - * | $ | ^ | < | > | XXXX | | XXXX | | | [ | ] | - | - * | | | | | XXXX | | XXXX | | | | | - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | % | : | ; | + | = | | | | ( | ) | _ | - * | | | | | | | | | | | | - * | -----+------+------+------+------+------|------+------+------+------+------| - * | | | | | | | | | | | | - * | & | ' | " | * | # | | ! | ? | / | \ | @ | - * | | | | | | | | | | | | - * '----------------------------------------------------------------------------' - * - * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca - */ - [_SYMBOLS] = LAYOUT_3x11( - KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXX, _______, XXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, - KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, - KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, _______, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT - ), - - - -}; - -layer_state_t layer_state_set_user(layer_state_t state) { - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} - -void matrix_init_user(void) { - // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values - // set num lock on at start (for numonly layer to work) - if (!host_keyboard_led_state().num_lock) { - tap_code(KC_NUM_LOCK); - } -} - -void matrix_scan_user(void) { -} - - -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_HOME] = { ENCODER_CCW_CW(LCTL(KC_V), LCTL(KC_C)) }, - [_SYMBOLS] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_RAISE] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_LOWER] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_ADJUST] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_FUNCTION] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, -}; - - -oled_rotation_t oled_init_user(oled_rotation_t rotation){ - return OLED_ROTATION_270; -} - -#ifdef OLED_ENABLE -bool oled_task_user(void) { - // Host Keyboard Layer Status - oled_write_P(PSTR("LAYER\n-----\n"), false); - - switch (get_highest_layer(layer_state)) { - case _LOWER: - oled_write_P(PSTR("LOWER"), false); - break; - case _RAISE: - oled_write_P(PSTR("RAISE"), false); - break; - case _FUNCTION: - oled_write_P(PSTR("FUNCT"), false); - break; - case _ADJUST: - oled_write_P(PSTR(" ADJ "), false); - break; - case _SYMBOLS: - oled_write_P(PSTR("SYMB"), false); - break; - default: - // Or use the write_ln shortcut over adding '\n' to the end of your string - oled_write_ln_P(PSTR("HOME"), false); - } - -// Host Keyboard LED Status - // led_t led_state = host_keyboard_led_state(); - // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - return false; -} -#endif - diff --git a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c index b162e6eb453f..949707297b7a 100644 --- a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c +++ b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c @@ -22,25 +22,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │ │ │ │ │PASTE│LEFT │ * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ -/* Workman Home Layer - * ,----------------------------------------------------------------------------. - * | | | | | | | | | | | | - * | Q | D | R | W | B | | J | F | U | P | ; | - * |Escape| FN | | |SYMBOL| |SYMBOL| | | |BKSPC | - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | A | S | H | T | G | | Y | N | E | O | I | - * | Shift| | |EXTRAS| OSkey| | OSkey| | | | Enter| - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | Z | X | M | C | V | | K | L | Space| Space| /\ | - * | FN | CTRL | OS | ALT |LOWER | | RAISE| Alt | , | . | | - * '----------------------------------------------------------------------------' - * + /* WORKMAN + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ + * │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ + * │SHIFT│ │ ┃ EX ┃ │ │ ┃ ┃ │ │ENTER│ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ Z │ X │ M │ C │ │ │ │ │ , │ . │ ? │ + * │ FN │ CTRL│ OS │ ALT │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca * */ - [_WM] = LAYOUT ( + [_WM] = LAYOUT_3x11_wrapper ( _____________WORKMAN_311_001_L_____________, _____________WORKMAN_311_001_R_____________, _____________WORKMAN_311_002_L_____________, _____________WORKMAN_311_002_R_____________, _____________WORKMAN_311_003_L_____________, _____________WORKMAN_311_003_R_____________ @@ -99,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ */ - [_EXTRAS] = LAYOUT_3x11_wrapper ( + [_EX] = LAYOUT_3x11_wrapper ( KC_EXLM, _______, _______, _______, _______, _______, _______, T_SL, KC_LBRC, KC_RBRC, KC_SCLN, KC_LSFT, _______, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_QUOT, _______, _______, _______, _______, _______, KC_ENT, _______, _______, KC_COMM, KC_DOT, KC_QUES @@ -168,52 +164,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_SYMB] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) } }; - -oled_rotation_t oled_init_user(oled_rotation_t rotation){ - return OLED_ROTATION_270; -} - - - -#ifdef OLED_ENABLE -bool oled_task_user(void) { - // Host Keyboard Layer Status - oled_write_P(PSTR("LAYER\n-----\n"), false); - - switch (get_highest_layer(layer_state)) { - case _WM: - oled_write_P(PSTR("WMAN"), false); - break; - case _QW: - oled_write_P(PSTR("QW"), false); - break; - case _LOWER: - oled_write_P(PSTR("LOWER"), false); - break; - case _RAISE: - oled_write_P(PSTR("RSE"), false); - break; - case _EX: - oled_write_P(PSTR(" EX "), false); - break; - case _FN: - oled_write_P(PSTR(" FN "), false); - break; - case _SYMB: - oled_write_P(PSTR("SYMB"), false); - break; - default: - // Or use the write_ln shortcut over adding '\n' to the end of your string - oled_write_ln_P(PSTR("HOME"), false); - } - -// Host Keyboard LED Status - // led_t led_state = host_keyboard_led_state(); - // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - return false; -} -#endif - diff --git a/keyboards/hazel/satpad/keymaps/miketronic/readme.md b/keyboards/hazel/satpad/keymaps/miketronic/readme.md deleted file mode 100644 index 8fe7a60679e2..000000000000 --- a/keyboards/hazel/satpad/keymaps/miketronic/readme.md +++ /dev/null @@ -1,17 +0,0 @@ -# The 25% SuperMicro keyboard -## A full featured keymap on Gherkin compatible with a pure "Alpha 26" layout - -With this configuration the "SuperMicro" layout first experimented on the plank-like jj40 is being ported to a more proper board, and with the last changes, this layout has been made compatible also to a "26 keys" one. So you can now choose to leave all 30 keys on the keyboard, or remove the two on the bottom line corners to have the "old" and comfortable 28 keys layout, or remove also space and enter to have the simplest "pure alpha" one! And even the intermediate 27 keys one is an interesting compatible option! - -This keymap is for a generic usage, trying to avoid as much gimmick as possible (considering the number of keys) and retain muscle memory from people used to the standard Qwerty 104 keys one. Functions and numbers (with related symbols) are on the first row as expected; other examples of design coherency include the symbols on the central row laid out in the same order as you'll find on a standard full keyboard, and the cursor movement aligned to the common unix vi standard ("hjkl", and for symmetry "sdfg" for home/pgdn/pgup/end). I've personally used this layout for months on my home PC in parallel to my portable work PC. - -Relying just on the alphabetic keys this layout can be also very easily ported and tested on any qmk supported keyboard (ok, butterstick excluded). - -The image below explains the main layers activated respectively with F, N or both modifiers pressed together. In addition to them there are available 5 layers that can be personalized as needed or completely removed without losing any functionality; three of them are currently setup in the default keymap for cursors/mouse, numpad and media (activated with q, w and e respectively). - -![layers](https://github.com/stevexyz/qmk_firmware/blob/master/keyboards/40percentclub/gherkin/keymaps/stevexyz/newlayout26272830.jpg) - -![prototype](https://github.com/stevexyz/qmk_firmware/blob/master/keyboards/40percentclub/gherkin/keymaps/stevexyz/gherkin28.jpeg) - -Happy hacking! -_Stefano diff --git a/keyboards/hazel/satpad/keymaps/miketronic/rules - backup.mk b/keyboards/hazel/satpad/keymaps/miketronic/rules - backup.mk deleted file mode 100644 index b693b8e30592..000000000000 --- a/keyboards/hazel/satpad/keymaps/miketronic/rules - backup.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Build Options (yes/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 -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI support -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 -TAP_DANCE_ENABLE = no -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) - -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -RGBLIGHT_ENABLE = no diff --git a/keyboards/hazel/satpad/keymaps/miketronic/rules.mk b/keyboards/hazel/satpad/keymaps/miketronic/rules.mk deleted file mode 100644 index 3386642e8384..000000000000 --- a/keyboards/hazel/satpad/keymaps/miketronic/rules.mk +++ /dev/null @@ -1,23 +0,0 @@ -# Build Options (yes/no) -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -TAP_DANCE_ENABLE = yes -ENCODER_ENABLE = yes -ENCODER_MAP_ENABLE = yes -OLED_ENABLE = yes - -LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. - -AUTO_SHIFT_ENABLE = no # 24FEB23 Added 26FEB23 Removed -UNICODE_ENABLE = no # Unicode -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -RGBLIGHT_ENABLE = no -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) -AUDIO_ENABLE = no # Audio output on port C6 -MIDI_ENABLE = no # MIDI support -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID \ No newline at end of file diff --git a/keyboards/hazel/satpad/rules.mk b/keyboards/hazel/satpad/rules.mk index 94cca2df737a..d7c47ed8ef25 100644 --- a/keyboards/hazel/satpad/rules.mk +++ b/keyboards/hazel/satpad/rules.mk @@ -1,24 +1,21 @@ -# Build Options (yes/no) -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -TAP_DANCE_ENABLE = yes -ENCODER_ENABLE = yes -ENCODER_MAP_ENABLE = yes -OLED_ENABLE = yes +MCU = atmega32u4 +BOOTLOADER = caterina -LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. +LTO_ENABLE = yes +BOOTMAGIC_ENABLE = yes +EXTRAKEY_ENABLE = yes +NKRO_ENABLE = yes +ENCODER_ENABLE = yes +ENCODER_MAP_ENABLE = yes +MOUSEKEY_ENABLE = yes +OLED_ENABLE = yes -AUTO_SHIFT_ENABLE = no # 24FEB23 Added 26FEB23 Removed -UNICODE_ENABLE = no # Unicode -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -RGBLIGHT_ENABLE = no -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) -AUDIO_ENABLE = no # Audio output on port C6 -MIDI_ENABLE = no # MIDI support -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID \ No newline at end of file +MAGIC_ENABLE = no +CONSOLE_ENABLE = no +COMMAND_ENABLE = no +BACKLIGHT_ENABLE = no +AUDIO_ENABLE = no +RGBLIGHT_ENABLE = no +MUSIC_ENABLE = no +MAGIC_ENABLE = no \ No newline at end of file diff --git a/keyboards/hazel/satpad/satpad.h b/keyboards/hazel/satpad/satpad.h index 3aa6e186c031..0125f85752b5 100644 --- a/keyboards/hazel/satpad/satpad.h +++ b/keyboards/hazel/satpad/satpad.h @@ -20,8 +20,8 @@ L10, L11, L12, L13, L14, M10, R10, R11, R12, R13, R14, \ L20, L21, L22, L23, L24, M20, R20, R21, R22, R23, R24 \ ) { \ - { L00, L01, L02, L03, L04, ___ }, \ - { L10, L11, L12, L13, L14, ___ }, \ + { L00, L01, L02, L03, L04, M00 }, \ + { L10, L11, L12, L13, L14, M10 }, \ { L20, L21, L22, L23, L24, ___ }, \ { R04, R03, R02, R01, R00, ___ }, \ { R14, R13, R12, R11, R10, ___ }, \ From 58f39ddc85148118b44ca6e7da8d177659556765 Mon Sep 17 00:00:00 2001 From: miketronic Date: Wed, 19 Apr 2023 12:28:59 -0500 Subject: [PATCH 03/61] userspace updates --- .../pi40/keymaps/miketronic/keymap.c | 62 ++--- keyboards/hazel/satpad/config.h | 17 +- keyboards/hazel/satpad/info.json | 101 +++++--- .../satpad/keymaps/default/keymap - SATCOPY.c | 132 ---------- .../hazel/satpad/keymaps/default/keymap.c | 146 +++-------- .../hazel/satpad/keymaps/default/rules.mk | 22 +- .../hazel/satpad/keymaps/miketronic/keymap.c | 232 ++++++++++++------ keyboards/hazel/satpad/readme.md | 15 -- keyboards/hazel/satpad/rules.mk | 22 +- keyboards/hazel/satpad/satpad.c | 25 +- keyboards/hazel/satpad/satpad.h | 32 --- 11 files changed, 326 insertions(+), 480 deletions(-) delete mode 100644 keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c delete mode 100644 keyboards/hazel/satpad/readme.md delete mode 100644 keyboards/hazel/satpad/satpad.h diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c index 132145534074..3df21d90a79e 100644 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c @@ -35,11 +35,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_QW] = LAYOUT_ortho_4x12_wrapper ( - RGB_TOG, \ - KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, \ - KC_ESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, \ - KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT, \ - FN, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_DOWN, KC_UP, KC_RGHT, T_DL \ + RGB_TOG, + KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, + KC_ESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, + KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT, + FN, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_DOWN, KC_UP, KC_RGHT, TD_DL ), @@ -47,10 +47,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Lower * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ () │ [] │ /\ │ │ │ │ │ │ │ 7 │ 8 │ 9 │ 0 │ + * │ │ () │ [] │ /\ │ │ │ │ │ │ 7 │ 8 │ 9 │ 0 │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ @ # │ & % │ │ ┃ ┃ │ │ ┃ ┃ 4 │ 5 │ 6 │ │ + * │ │ @ # │ & % │ ┃ ┃ │ │ ┃ ┃ 4 │ 5 │ 6 │ │ * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ * │ │ │ │ │ │ │ │ │ │ 1 │ 2 │ 3 │ UP │ @@ -62,10 +62,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LOWER] = LAYOUT_ortho_4x12_wrapper ( KC_MUTE, \ - T_XX, T_YY, T_SL, _______, _______, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, \ - T_ATH, T_PRAM, _______, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, T_UR, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, KC_SPC, T_DENT, T_DL \ + _______, TD_XX, TD_YY, TD_SL, _______, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, \ + _______, TD_ATH, TD_PRAM, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, TD_UR, \ + _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, KC_SPC, TD_DENT, TD_DL \ ), @@ -85,11 +85,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_RAISE] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, \ - QK_BOOT, DB_TOGG, _______, _______, MAKE, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, \ - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, KC_F4, KC_F5, KC_F6, KC_F11, \ - _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, T_UMIN, KC_F1, KC_F2, KC_F3, KC_F12, \ - _______, WM, QW, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + KC_MUTE, + QK_BOOT, DB_TOGG, _______, _______, MAKE, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, KC_F4, KC_F5, KC_F6, KC_F11, + _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, TD_UMIN, KC_F1, KC_F2, KC_F3, KC_F12, + _______, WM, QW, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), @@ -110,10 +110,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_EX] = LAYOUT_ortho_4x12_wrapper ( KC_MUTE, \ - _______, KC_EXLM, _______, _______, _______, _______, _______, T_SL, KC_LBRC, KC_RBRC, KC_SCLN, _______, \ + _______, KC_EXLM, _______, _______, _______, _______, _______, TD_SL, KC_LBRC, KC_RBRC, KC_SCLN, _______, \ KC_LSFT, _______, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_QUOT, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_QUES, _______, \ - _______, _______, _______, _______, _______, T_SE, T_SE, _______, _______, _______, _______, _______ \ + _______, _______, _______, _______, _______, TD_SE, TD_SE, _______, _______, _______, _______, _______ \ ), @@ -134,23 +134,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_FN] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, \ - T_CP, CLIP, SS, _______, _______, _______, _______, T_SL, _______, KC_UP, _______, KC_DEL, \ - KC_TAB, M05, M06, M07, M08, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, T_UR, \ - _______, M01, M02, M03, M04, _______, _______, _______, T_QEXC, KC_COMM, KC_DOT, T_DL, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + KC_MUTE, + TD_CP, CLIP, SS, _______, _______, _______, _______, TD_SL, _______, KC_UP, _______, KC_DEL, + KC_TAB, M05, M06, M07, M08, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, TD_UR, + _______, M01, M02, M03, M04, _______, _______, _______, TD_QEXC, KC_COMM, KC_DOT, TD_DL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), /* SYMBOLS * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ $ | ^ | < | > │ SYMB│ │ │ │ SYMB│ | | [ | ] | - | + * │ | $ | ^ | < | > │ SYMB│ │ SYMB│ | | [ | ] | - | | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ % | : | ; | + ┃ = ┃ │ │ ┃ ┃ | ( | ) | _ | + * │ | % | : | ; ┃ + ┃ = │ │ ┃ ┃ ( | ) | _ | | * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * | & | ' | " | * | # | │ │ | ! | ? | / | \ | @ | + * | | & | ' | " | * | # │ │ ! | ? | / | \ | @ | | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ * │ FN │ │ │ │ │ │ │ │ │ │ │ │ │ @@ -159,11 +159,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_SYMB] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, \ - KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, _______, _______, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, \ - KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, \ - KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, _______, _______, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, \ - _______, WM, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ + KC_MUTE, + _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, + _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, + _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, + _______, WM, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/hazel/satpad/config.h b/keyboards/hazel/satpad/config.h index 1b4793a1d545..7b9637ef9c2c 100644 --- a/keyboards/hazel/satpad/config.h +++ b/keyboards/hazel/satpad/config.h @@ -1,16 +1 @@ -#pragma once - -#define MATRIX_ROWS 7 -#define MATRIX_COLS 6 - -#define MATRIX_ROW_PINS { B3, B2, B6, D3, D2, D4, E6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7 } - -#define ENCODERS_PAD_A {B4} -#define ENCODERS_PAD_B {B5} - -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 1 - -#define AUTO_SHIFT_TIMEOUT 150 -#define AUTO_SHIFT_MODIFIERS \ No newline at end of file +#pragma once \ No newline at end of file diff --git a/keyboards/hazel/satpad/info.json b/keyboards/hazel/satpad/info.json index 2d9c8cd6190c..3caad7bb2e05 100644 --- a/keyboards/hazel/satpad/info.json +++ b/keyboards/hazel/satpad/info.json @@ -1,55 +1,82 @@ { - "manufacturer": "jasonhazel", - "keyboard_name": "satpad", - "maintainer": "jasonhazel", - "bootloader": "atmel-dfu", - "diode_direction": "COL2ROW", - "features": { }, - "matrix_pins": { }, - "processor": "atmega32u4", - "url": "", - "usb": { - "device_version": "1.0.0", - "pid": "0x7370", - "vid": "0x4A48" - }, - "layouts": { - "LAYOUT_ortho_3x11": { - "layout": [ + "keyboard_name": "SatPad", + "manufacturer": "jasonhazel", + "usb": { + "vid": "0x4A48", + "pid": "0x7370", + "device_version": "0.0.1" + }, + "matrix_size": { + "cols": 6, + "rows": 7 + }, + "diode_direction": "COL2ROW", + "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "mousekey": true, + "nkro": false, + "encoder": true + }, + "matrix_pins": { + "rows": ["B3", "B2", "B6", "D3", "D2", "D4", "E6"], + "cols": ["F4", "F5", "F6", "F7", "B1", "D7"] + }, + "encoder": { + "rotary": [ + { "pin_a": "B4", "pin_b": "B5" } + ] + }, + "bootmagic": { + "enabled": true, + "matrix": [0,0] + }, + "processor": "atmega32u4", + "url": "https://github.com/jasonhazel/satpad", + "layouts": { + "LAYOUT": { + "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 }, { "matrix": [0, 2], "x": 2, "y": 0 }, { "matrix": [0, 3], "x": 3, "y": 0 }, { "matrix": [0, 4], "x": 4, "y": 0 }, - { "matrix": [0, 5], "x": 5, "y": 0 }, - { "matrix": [0, 6], "x": 6, "y": 0 }, - { "matrix": [0, 7], "x": 7, "y": 0 }, - { "matrix": [0, 8], "x": 8, "y": 0 }, - { "matrix": [0, 9], "x": 9, "y": 0 }, - { "matrix": [0, 10], "x": 10, "y": 0 }, + + { "matrix": [3, 4], "x": 6, "y": 0 }, + { "matrix": [3, 3], "x": 7, "y": 0 }, + { "matrix": [3, 2], "x": 8, "y": 0 }, + { "matrix": [3, 1], "x": 9, "y": 0 }, + { "matrix": [3, 0], "x": 10, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1 }, { "matrix": [1, 1], "x": 1, "y": 1 }, { "matrix": [1, 2], "x": 2, "y": 1 }, { "matrix": [1, 3], "x": 3, "y": 1 }, { "matrix": [1, 4], "x": 4, "y": 1 }, - { "matrix": [1, 5], "x": 5, "y": 1 }, - { "matrix": [1, 6], "x": 6, "y": 1 }, - { "matrix": [1, 7], "x": 7, "y": 1 }, - { "matrix": [1, 8], "x": 8, "y": 1 }, - { "matrix": [1, 9], "x": 9, "y": 1 }, - { "matrix": [1, 10], "x": 10, "y": 1 }, + + { "matrix": [4, 4], "x": 6, "y": 1 }, + { "matrix": [4, 3], "x": 7, "y": 1 }, + { "matrix": [4, 2], "x": 8, "y": 1 }, + { "matrix": [4, 1], "x": 9, "y": 1 }, + { "matrix": [4, 0], "x": 10, "y": 1 }, + { "matrix": [2, 0], "x": 0, "y": 2 }, { "matrix": [2, 1], "x": 1, "y": 2 }, { "matrix": [2, 2], "x": 2, "y": 2 }, { "matrix": [2, 3], "x": 3, "y": 2 }, { "matrix": [2, 4], "x": 4, "y": 2 }, - { "matrix": [2, 5], "x": 5, "y": 2 }, - { "matrix": [2, 6], "x": 6, "y": 2 }, - { "matrix": [2, 7], "x": 7, "y": 2 }, - { "matrix": [2, 8], "x": 8, "y": 2 }, - { "matrix": [2, 9], "x": 9, "y": 2 }, - { "matrix": [2, 10], "x": 10, "y": 2 } - ] - } + + { "matrix": [6, 5], "x": 5, "y": 2 }, + + { "matrix": [5, 4], "x": 6, "y": 2 }, + { "matrix": [5, 3], "x": 7, "y": 2 }, + { "matrix": [5, 2], "x": 8, "y": 2 }, + { "matrix": [5, 1], "x": 9, "y": 2 }, + { "matrix": [5, 0], "x": 10, "y": 2 } + + ] } + } } \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c b/keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c deleted file mode 100644 index 99fec7d54474..000000000000 --- a/keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c +++ /dev/null @@ -1,132 +0,0 @@ -#include QMK_KEYBOARD_H - - -enum satpad_layers { - _WORKMAN, - _LOWER -}; - - - -// COMBO DECLARATIONS ============================================================================ -enum satpad_combos { - COMBO_SHIFT, - COMBO_LENGTH -}; - - -// TAP DANCE DECLARATIONS ============================================================================ -enum satpad_tapdances { - TD_ZLOWER, - TD_QESC, - TD_ATAB, - TD_XCTL, - TD_MGUI, - TD_CALT, - TD_KSPC, - TD_VENT, - TD_XSCLN, // ; , : - TD_IQUOT, // Letter "i", quote - TD_UPRT, // up, right - TD_CP // copy, paste -}; - -#define ZLOWER LT(_LOWER, KC_Z) //Tap for 'Z', Hold for Lower layer -#define QESC TD(TD_QESC) //Tap for 'Q', Twice for 'ESC' -#define ATAB TD(TD_ATAB) //Tap for 'A', Twice for 'Tab' -#define KSPC TD(TD_KSPC) //Tap for 'Space', Twice for 'K' -#define VENT TD(TD_VENT) //Tap for 'Enter', Twice for 'V' -#define XSCLN TD(TD_XSCLN) //Tap for ';', Twice for ':' -#define IQUOT TD(TD_IQUOT) //Tap for 'I', Twice for Quotes -#define UPRT TD(TD_UPRT) // up, right -#define CP TD(TD_CP) //Tap for Copy, Twice for Paste -#define XCTL LCTL_T(KC_X) //Tap for 'X', Hold for 'Left Ctrl' -#define MGUI LGUI_T(KC_M) //Tap for 'M', Hold for 'Windows Key' -#define CALT LALT_T(KC_C) //Tap for 'C', Hold for 'Left Alt' -#define OSM_SFT OSM(MOD_LSFT) - - -uint16_t COMBO_LEN = COMBO_LENGTH; -const uint16_t PROGMEM combo_shift[] = { KC_W, KC_B, COMBO_END }; - - -combo_t key_combos[] = { - [COMBO_SHIFT] = COMBO(combo_shift, OSM_SFT) -}; - - -//Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { - [TD_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), - [TD_ATAB] = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB), - [TD_KSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_K), - [TD_VENT] = ACTION_TAP_DANCE_DOUBLE(KC_ENT, KC_V), - [TD_XSCLN] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_COLN), - [TD_IQUOT] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_QUOT), - [TD_UPRT] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_RGHT), - [TD_CP] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_C), LCTL(KC_V)) -}; - -const key_override_t **key_overrides = (const key_override_t *[]) { - NULL -}; - -#define ______ KC_NO - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* WORKMAN - * ,---------------------------------------------------------------------------------------. - * | Q | D | R | W | B | | J | F | U | P |BKSPACE| - * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| - * | A | S | H | T | G | | Y | N | E | O | I " | - * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| - * | Z | X | M | C | V | M20 | K | L | , | . |Cpy/Pst| - * `---------------------------------------------------------------------------------------' - */ - - [_WORKMAN] = LAYOUT_3x11( - QESC, KC_D, KC_R, KC_W, KC_B, ______, KC_J, KC_F, KC_U, KC_P, KC_BSPC, \ - ATAB, KC_S, KC_H, KC_T, KC_G, ______, KC_Y, KC_N, KC_E, KC_O, IQUOT, \ - ZLOWER, XCTL, MGUI, CALT, VENT, KC_ENT, KSPC, KC_L, KC_COMM, KC_DOT, CP - ), - - - /* LOWER - * ,---------------------------------------------------------------------------------------. - * | RESET | BOOT | | | | | ; : | 7 | 8 | 9 | DEL | - * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| - * | | | | | | | | 4 | 5 | 6 |UP/RT | - * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| - * | | | | | | M20 | 0 | 1 | 2 | 3 | /\ | - * `---------------------------------------------------------------------------------------' - */ - [_LOWER] = LAYOUT_3x11( - QK_RBT, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, _______, XSCLN, KC_7, KC_8, KC_9, KC_DEL, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_4, KC_5, KC_6, UPRT, \ - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_0, KC_1, KC_2, KC_3, KC_SLSH - ), -}; - -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_WORKMAN] = { ENCODER_CCW_CW(KC_SPC, OSM_SFT) }, - [_LOWER] = { ENCODER_CCW_CW(KC_SPC, OSM_SFT) }, -}; - -oled_rotation_t oled_init_user(oled_rotation_t rotation){ - return OLED_ROTATION_270; -} - -bool oled_task_user(void) { - uint8_t modifiers = get_mods() | get_oneshot_mods(); - - oled_set_cursor(0, 11); - oled_write_P(PSTR("SHIFT"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); - oled_write_P(PSTR("CNTRL"), (modifiers & MOD_MASK_CTRL)); - - return true; -} - - - - diff --git a/keyboards/hazel/satpad/keymaps/default/keymap.c b/keyboards/hazel/satpad/keymaps/default/keymap.c index 99fec7d54474..5f863022f2ee 100644 --- a/keyboards/hazel/satpad/keymaps/default/keymap.c +++ b/keyboards/hazel/satpad/keymaps/default/keymap.c @@ -1,132 +1,62 @@ #include QMK_KEYBOARD_H - -enum satpad_layers { - _WORKMAN, - _LOWER +enum layers { + _BASE, + LAYER_LENGTH }; - - -// COMBO DECLARATIONS ============================================================================ -enum satpad_combos { - COMBO_SHIFT, - COMBO_LENGTH +enum combos { + COMBO_SPACE, + COMBO_BACKSP, + COMBO_ENTER, + COMBO_TAB, + COMBO_ESC, + COMBO_LENGTH }; - -// TAP DANCE DECLARATIONS ============================================================================ -enum satpad_tapdances { - TD_ZLOWER, - TD_QESC, - TD_ATAB, - TD_XCTL, - TD_MGUI, - TD_CALT, - TD_KSPC, - TD_VENT, - TD_XSCLN, // ; , : - TD_IQUOT, // Letter "i", quote - TD_UPRT, // up, right - TD_CP // copy, paste -}; - -#define ZLOWER LT(_LOWER, KC_Z) //Tap for 'Z', Hold for Lower layer -#define QESC TD(TD_QESC) //Tap for 'Q', Twice for 'ESC' -#define ATAB TD(TD_ATAB) //Tap for 'A', Twice for 'Tab' -#define KSPC TD(TD_KSPC) //Tap for 'Space', Twice for 'K' -#define VENT TD(TD_VENT) //Tap for 'Enter', Twice for 'V' -#define XSCLN TD(TD_XSCLN) //Tap for ';', Twice for ':' -#define IQUOT TD(TD_IQUOT) //Tap for 'I', Twice for Quotes -#define UPRT TD(TD_UPRT) // up, right -#define CP TD(TD_CP) //Tap for Copy, Twice for Paste -#define XCTL LCTL_T(KC_X) //Tap for 'X', Hold for 'Left Ctrl' -#define MGUI LGUI_T(KC_M) //Tap for 'M', Hold for 'Windows Key' -#define CALT LALT_T(KC_C) //Tap for 'C', Hold for 'Left Alt' -#define OSM_SFT OSM(MOD_LSFT) - - uint16_t COMBO_LEN = COMBO_LENGTH; -const uint16_t PROGMEM combo_shift[] = { KC_W, KC_B, COMBO_END }; - +const uint16_t PROGMEM combo_space[] = { KC_N, KC_M, COMBO_END }; +const uint16_t PROGMEM combo_backspace[] = { KC_O, KC_P, COMBO_END }; +const uint16_t PROGMEM combo_enter[] = { KC_L, KC_QUOT, COMBO_END }; +const uint16_t PROGMEM combo_tab[] = { KC_A, KC_S, COMBO_END }; +const uint16_t PROGMEM combo_esc[] = { KC_Q, KC_W, COMBO_END }; -combo_t key_combos[] = { - [COMBO_SHIFT] = COMBO(combo_shift, OSM_SFT) +combo_t key_combos[] = { + [COMBO_SPACE] = COMBO(combo_space, KC_SPC), + [COMBO_BACKSP] = COMBO(combo_backspace, KC_BSPC), + [COMBO_ENTER] = COMBO(combo_enter, KC_ENT), + [COMBO_TAB] = COMBO(combo_tab, KC_TAB), + [COMBO_ESC] = COMBO(combo_esc, KC_ESC) }; +enum tapdances { + TD_QESC, + TAPDANCE_LENGTH +}; -//Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), - [TD_ATAB] = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB), - [TD_KSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_K), - [TD_VENT] = ACTION_TAP_DANCE_DOUBLE(KC_ENT, KC_V), - [TD_XSCLN] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_COLN), - [TD_IQUOT] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_QUOT), - [TD_UPRT] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_RGHT), - [TD_CP] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_C), LCTL(KC_V)) }; const key_override_t **key_overrides = (const key_override_t *[]) { NULL }; -#define ______ KC_NO +#define QESC TD(TD_QESC) +#define BSFT LSFT_T(KC_B) +#define VCTL LCTL_T(KC_V) +#define CGUI LGUI_T(KC_C) +#define XALT LALT_T(KC_X) +#define ______ KC_NO const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* WORKMAN - * ,---------------------------------------------------------------------------------------. - * | Q | D | R | W | B | | J | F | U | P |BKSPACE| - * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| - * | A | S | H | T | G | | Y | N | E | O | I " | - * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| - * | Z | X | M | C | V | M20 | K | L | , | . |Cpy/Pst| - * `---------------------------------------------------------------------------------------' - */ - - [_WORKMAN] = LAYOUT_3x11( - QESC, KC_D, KC_R, KC_W, KC_B, ______, KC_J, KC_F, KC_U, KC_P, KC_BSPC, \ - ATAB, KC_S, KC_H, KC_T, KC_G, ______, KC_Y, KC_N, KC_E, KC_O, IQUOT, \ - ZLOWER, XCTL, MGUI, CALT, VENT, KC_ENT, KSPC, KC_L, KC_COMM, KC_DOT, CP - ), - - - /* LOWER - * ,---------------------------------------------------------------------------------------. - * | RESET | BOOT | | | | | ; : | 7 | 8 | 9 | DEL | - * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| - * | | | | | | | | 4 | 5 | 6 |UP/RT | - * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| - * | | | | | | M20 | 0 | 1 | 2 | 3 | /\ | - * `---------------------------------------------------------------------------------------' - */ - [_LOWER] = LAYOUT_3x11( - QK_RBT, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, _______, XSCLN, KC_7, KC_8, KC_9, KC_DEL, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_4, KC_5, KC_6, UPRT, \ - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_0, KC_1, KC_2, KC_3, KC_SLSH + [_BASE] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ + KC_Z, XALT, CGUI, VCTL, BSFT, KC_SPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH ), }; const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_WORKMAN] = { ENCODER_CCW_CW(KC_SPC, OSM_SFT) }, - [_LOWER] = { ENCODER_CCW_CW(KC_SPC, OSM_SFT) }, -}; - -oled_rotation_t oled_init_user(oled_rotation_t rotation){ - return OLED_ROTATION_270; -} - -bool oled_task_user(void) { - uint8_t modifiers = get_mods() | get_oneshot_mods(); - - oled_set_cursor(0, 11); - oled_write_P(PSTR("SHIFT"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); - oled_write_P(PSTR("CNTRL"), (modifiers & MOD_MASK_CTRL)); - - return true; -} - - - - + [_BASE] = { ENCODER_CCW_CW(KC_DOWN, KC_UP) }, +}; \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/rules.mk b/keyboards/hazel/satpad/keymaps/default/rules.mk index dc00b90873cc..fb4dbb68160f 100644 --- a/keyboards/hazel/satpad/keymaps/default/rules.mk +++ b/keyboards/hazel/satpad/keymaps/default/rules.mk @@ -1,7 +1,17 @@ -CAPS_WORD_ENABLE = yes -GRAVE_ESC_ENABLE = no -SPACE_CADET_ENABLE = no +GRAVE_ESC_ENABLE = no +SPACE_CADET_ENABLE = no -KEY_OVERRIDE_ENABLE = yes -COMBO_ENABLE = yes -TAP_DANCE_ENABLE = no +CAPS_WORD_ENABLE = yes +KEY_OVERRIDE_ENABLE = yes +COMBO_ENABLE = yes +TAP_DANCE_ENABLE = yes +OLED_ENABLE = yes +OLED_DRIVER = SSD1306 +ENCODER_MAP_ENABLE = yes + +# OLED WIDGETS + +# WPM_ENABLE = no +# KEYCOUNT_ENABLE = yes +# KEYLOG_ENABLE = no +# KEYLOG_DEBUG = no \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c index 949707297b7a..b1e9a0f29c3a 100644 --- a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c +++ b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c @@ -7,21 +7,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Workman - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ TAB │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ BSPC│ - * │ ESC │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ ; │ ; │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ TAB │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ │ - * │SHIFT│ │ │ ┃ EX ┃ │ │ ┃ ┃ │ │ENTER│ENTER│ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │SHIFT| Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ / │ UP | - * │ │ │ │ │ │ │ │ │ │ , │ . │ │RIGHT| - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ FN │CTRL │ OS │ ALT │LOWER│ │ │ │RAISE│ SS │CLIP │COPY │ DN │ - * │ │ │ │ │ │ │ │ │ │ │ │PASTE│LEFT │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ /* WORKMAN * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ * │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ @@ -30,12 +15,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ * │SHIFT│ │ ┃ EX ┃ │ │ ┃ ┃ │ │ENTER│ * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ Z │ X │ M │ C │ │ │ │ │ , │ . │ ? │ - * │ FN │ CTRL│ OS │ ALT │ │ │ │ │ │ │ │ + * │ Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ / │ + * │ FN │ CTRL│ OS │ ALT │LOWER│ │RAISE│ ALT │ , │ . │ │ * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca - * - */ + * + */ + [_WM] = LAYOUT_3x11_wrapper ( _____________WORKMAN_311_001_L_____________, _____________WORKMAN_311_001_R_____________, _____________WORKMAN_311_002_L_____________, _____________WORKMAN_311_002_R_____________, @@ -49,35 +34,45 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), -/* LOWER LAYER - * ,----------------------------------------------------------------------------. - * | | | | | | | | & | * | ( | ) | - * | () | [] | / \ | | | | / \ | 7 | 8 | 9 | 0 | - * | | | | | | | ____ | ____ | ____ | ____ | Shift| - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | $ | % | ^ | | - * | @ # | & % | | | | | [ ] | 4 | 5 | 6 | Del | - * | | | | | | | ____ | ____ | ____ | ____ | Shift| - * | -----+------+------+------+------+------|------+------+------+------+------| - * | | | | | XXXX | | | ! | @ | # | | - * | | | | | XXXX | | | 1 | 2 | 3 | . | - * | | | | | XXXX | | ____ | ____ | ____ | ____ | Enter| - * '----------------------------------------------------------------------------' - */ + /* LOWER + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ () │ [] │ /\ │ │ │ │ /\ │ 7 │ 8 │ 9 │ 0 │ + * │ │ │ │ │ │ │ │ │ │ │SHIFT│ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ @ # │ & % │ ┃ ┃ │ │ [] ┃ 4 ┃ 5 │ 6 │ DEL │ + * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │SHIFT│ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ 1 │ 2 │ 3 │ . │ + * │ │ │ │ │LOWER│ │ │ │ │ │ ENT │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + * + */ + [_LOWER] = LAYOUT_3x11_wrapper ( - T_XX, T_YY, T_SL, XXXX, XXXX, _______, T_SL, KC_7, KC_8, KC_9, MT(MOD_RSFT, KC_0), - T_ATH, T_PRAM, _______, XXXX, XXXX, _______, T_YY, KC_4, KC_5, KC_6, MT(MOD_RSFT, KC_DEL), - XXXX, XXXX, XXXX, XXXX, _______, KC_ENT, _______, KC_1, KC_2, KC_3, T_DENT + TD_XX, TD_YY, TD_SL, XXXX, XXXX, TD_SL, KC_7, KC_8, KC_9, MT(MOD_RSFT, KC_0), + TD_ATH, TD_PRAM, _______, XXXX, XXXX, TD_YY, KC_4, KC_5, KC_6, MT(MOD_RSFT, KC_DEL), + XXXX, XXXX, XXXX, XXXX, _______, KC_ENT, _______, KC_1, KC_2, KC_3, TD_DENT ), - - + /* RAISE + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ BOOT│DEBUG│ │ │ MAKE│ │ /\ │ F7 │ F8 │ F9 │ F10 │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ │ RGB │ RGB ┃ RGB ┃ RGB │ │ _ ┃ F4 ┃ F5 │ F6 │ F11 │ + * │ │ TOG │ MOD ┃ HUI ┃ HUD │ │ - ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ RGB │ RGB │ RGB │ RGB │ │ │ F1 │ F2 │ F3 │ F12 │ + * │ │ SAI │ SAD │ VAI │ VAD │ │RAISE│ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + * + */ [_RAISE] = LAYOUT_3x11_wrapper ( - QK_BOOT, DB_TOGG, _______, _______, MAKE, _______, T_SL, KC_F7, KC_F8, KC_F9, KC_F10, \ - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, T_UMIN, KC_F4, KC_F5, KC_F6, KC_F11, \ - _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_ENT, _______, KC_F1, KC_F2, KC_F3, KC_F12 \ + QK_BOOT, DB_TOGG, _______, _______, MAKE, TD_SL, KC_F7, KC_F8, KC_F9, KC_F10, + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, TD_UMIN, KC_F4, KC_F5, KC_F6, KC_F11, + _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_ENT, _______, KC_F1, KC_F2, KC_F3, KC_F12 ), @@ -96,55 +91,50 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_EX] = LAYOUT_3x11_wrapper ( - KC_EXLM, _______, _______, _______, _______, _______, _______, T_SL, KC_LBRC, KC_RBRC, KC_SCLN, - KC_LSFT, _______, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_QUOT, - _______, _______, _______, _______, _______, KC_ENT, _______, _______, KC_COMM, KC_DOT, KC_QUES + KC_EXLM, _______, _______, _______, _______, _______, TD_SL, KC_LBRC, KC_RBRC, KC_SCLN, + KC_LSFT, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_QUOT, + _______, _______, _______, _______, _______, KC_ENT, _______, _______, KC_COMM, KC_DOT, KC_QUES ), -/* FUNCTION LAYER - * ,----------------------------------------------------------------------------. - * |1COPY | | | | | | | | | | | - * |2PASTE| CLIP | SS | | | | / \ | | UP | |DELETE| - * | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | TAB | M05 | M06 | M07 | M08 | | | LEFT | DOWN | RIGHT| UP | - * | Shift| | | | | | | | | | RIGHT| - * |------+------+------+------+------+------+------+------+------+------+------| - * | XXXX | | | | | | | | | | | - * | XXXX | M01 | M02 | M03 | M04 | | | ? | , | . | DOWN | - * | XXXX | | | | | | | ! | ____ | ____ | LEFT | - * '----------------------------------------------------------------------------' + + /* FUNCTION + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │COPY │CLIP │ SS │ │ │ │ │ /\ │ UP │ │ DEL │ + * │PASTE│ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ TAB │ M05 │ M06 ┃ M07 ┃ M08 │ │ ┃ LEFT┃ DOWN│RIGHT│ UP │ + * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │RIGHT│ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ M01 │ M02 │ M03 │ M04 │ │ │ ? │ , │ . │ DOWN│ + * │ FN │ │ │ │ │ │ │ ! │ │ │ LEFT│ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ */ [_FN] = LAYOUT_3x11_wrapper ( - T_CP, CLIP, SS, _______, _______, _______, T_SL, _______, KC_UP, _______, KC_DEL, - KC_TAB, M05, M06, M07, M08, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, T_UR, - _______, M01, M02, M03, M04, KC_ENT, _______, T_QEXC, KC_COMM, KC_DOT, T_DL + TD_CP, CLIP, SS, _______, _______, TD_SL, _______, KC_UP, _______, KC_DEL, + KC_TAB, M05, M06, M07, M08, _______, KC_LEFT, KC_DOWN, KC_RGHT, TD_UR, + _______, M01, M02, M03, M04, KC_ENT, _______, TD_QEXC, KC_COMM, KC_DOT, TD_DL ), -/* SYMBOLS - * ,----------------------------------------------------------------------------. - * | | | | | XXXX | | XXXX | | | | | - * | $ | ^ | < | > | XXXX | | XXXX | | | [ | ] | - | - * | | | | | XXXX | | XXXX | | | | | - * |------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | | | - * | % | : | ; | + | = | | | | ( | ) | _ | - * | | | | | | | | | | | | - * | -----+------+------+------+------+------|------+------+------+------+------| - * | | | | | | | | | | | | - * | & | ' | " | * | # | | ! | ? | / | \ | @ | - * | | | | | | | | | | | | - * '----------------------------------------------------------------------------' - * - * http://www.keyboard-layout-editor.com/#/gists/fcc6c759cf335abf31f6c200db3b9aca + + /* SYMBOLS + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ $ │ ^ │ < │ > │ │ │ │ | │ [ │ ] │ - │ + * │ │ │ │ │ SYMB│ │ SYMB│ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ % │ : │ ; ┃ + ┃ = │ │ ┃ ┃ ( │ ) │ _ │ + * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ & │ ' │ " │ * │ # │ │ ! │ ? │ / │ \ │ @ │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ */ + [_SYMB] = LAYOUT_3x11_wrapper ( - KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXX, _______, XXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, - KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, + KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXX, XXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, + KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_ENT, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT ), @@ -153,6 +143,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; +void matrix_init_user(void) { + // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values + // set num lock on at start (for numonly layer to work) + if (!host_keyboard_led_state().num_lock) { + tap_code(KC_NUM_LOCK); + } +} + +void matrix_scan_user(void) { +} + +/* +void keyboard_pre_init_user(void) { + // Set our LED pins as output + setPinOutput(D5); + setPinOutput(B0); +} + +bool led_update_user(led_t led_state) { + writePin(D5, !led_state.num_lock); + writePin(B0, !led_state.caps_lock); + return false; // prevent keyboard from processing state +} +*/ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_WM] = { ENCODER_CCW_CW(LCTL(KC_V), LCTL(KC_C)) }, @@ -163,4 +177,60 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_FN] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, [_SYMB] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) } }; + + +oled_rotation_t oled_init_user(oled_rotation_t rotation){ + return OLED_ROTATION_270; +} + +/* +bool oled_task_user(void) { + uint8_t modifiers = get_mods() | get_oneshot_mods(); + + oled_set_cursor(0, 11); + oled_write_P(PSTR("SHIFT"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); + oled_write_P(PSTR("CNTRL"), (modifiers & MOD_MASK_CTRL)); + + return true; +} +*/ + +#ifdef OLED_ENABLE +bool oled_task_user(void) { + // Host Keyboard Layer Status + oled_write_P(PSTR("LAYER\n-----\n"), false); + + switch (get_highest_layer(layer_state)) { + case _LOWER: + oled_write_P(PSTR("LOWER"), false); + break; + case _RAISE: + oled_write_P(PSTR("RAISE"), false); + break; + case _EX: + oled_write_P(PSTR("EXTRA"), false); + break; + case _FN: + oled_write_P(PSTR("FUNCT"), false); + break; + case _WM: + oled_write_P(PSTR("WMAN"), false); + break; + case _SYMB: + oled_write_P(PSTR("SYMB"), false); + break; + default: + // Or use the write_ln shortcut over adding '\n' to the end of your string + oled_write_ln_P(PSTR("HOME"), false); + } + +// Host Keyboard LED Status + // led_t led_state = host_keyboard_led_state(); + // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + return false; +} +#endif diff --git a/keyboards/hazel/satpad/readme.md b/keyboards/hazel/satpad/readme.md deleted file mode 100644 index a82402695893..000000000000 --- a/keyboards/hazel/satpad/readme.md +++ /dev/null @@ -1,15 +0,0 @@ -# SatPad - -30% orthlinear keyboard - -## Keyboard Info -* Maintainer: [jasonhazel](https://github.com/jasonhazel) -* Hardware Supported: [SatPad](https://github.com/jasonhazel/satpad) -* Hardware Availbility: Print PCB with gerber files in repository - -## Build -Make example (after setting up build environment): - - make jasonhazel/satpad:default - -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/hazel/satpad/rules.mk b/keyboards/hazel/satpad/rules.mk index d7c47ed8ef25..978dae94bbb4 100644 --- a/keyboards/hazel/satpad/rules.mk +++ b/keyboards/hazel/satpad/rules.mk @@ -1,21 +1 @@ -MCU = atmega32u4 -BOOTLOADER = caterina - -LTO_ENABLE = yes - -BOOTMAGIC_ENABLE = yes -EXTRAKEY_ENABLE = yes -NKRO_ENABLE = yes -ENCODER_ENABLE = yes -ENCODER_MAP_ENABLE = yes -MOUSEKEY_ENABLE = yes -OLED_ENABLE = yes - -MAGIC_ENABLE = no -CONSOLE_ENABLE = no -COMMAND_ENABLE = no -BACKLIGHT_ENABLE = no -AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no -MUSIC_ENABLE = no -MAGIC_ENABLE = no \ No newline at end of file +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/hazel/satpad/satpad.c b/keyboards/hazel/satpad/satpad.c index b99372114afb..238a1502eec2 100644 --- a/keyboards/hazel/satpad/satpad.c +++ b/keyboards/hazel/satpad/satpad.c @@ -1 +1,24 @@ -#include "satpad.h" \ No newline at end of file +#include QMK_KEYBOARD_H +#include + +#ifdef OLED_ENABLE + oled_rotation_t oled_init_kb(oled_rotation_t rotation) { + return OLED_ROTATION_270; + }; + + + bool oled_task_kb(void) { + if (oled_task_user()) { + oled_set_cursor(0,0); + oled_write_P(PSTR("SAT PAD"), false); + uint8_t modifiers = get_mods() | get_oneshot_mods(); + + oled_set_cursor(1,14); + oled_write_P(PSTR("S"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); + oled_write_P(PSTR("C"), (modifiers & MOD_MASK_CTRL)); + oled_write_P(PSTR("A"), (modifiers & MOD_MASK_ALT)); + oled_write_P(PSTR("G"), (modifiers & MOD_MASK_GUI)); + } + return true; + }; +#endif \ No newline at end of file diff --git a/keyboards/hazel/satpad/satpad.h b/keyboards/hazel/satpad/satpad.h deleted file mode 100644 index 0125f85752b5..000000000000 --- a/keyboards/hazel/satpad/satpad.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -/* - * ,---------------------------------------------------------------------------------------. - * | L00 | L01 | L02 | L03 | L04 | | R00 | R01 | R02 | R03 | R04 | - * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| - * | L10 | L11 | L12 | L13 | L14 | | R10 | R11 | R12 | R13 | R14 | - * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| - * | L20 | L21 | L22 | L23 | L24 | M00 | R20 | R21 | R22 | R23 | R24 | - * `---------------------------------------------------------------------------------------' - */ - - -#define LAYOUT_3x11( \ - L00, L01, L02, L03, L04, M00, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, M10, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, M20, R20, R21, R22, R23, R24 \ -) { \ - { L00, L01, L02, L03, L04, M00 }, \ - { L10, L11, L12, L13, L14, M10 }, \ - { L20, L21, L22, L23, L24, ___ }, \ - { R04, R03, R02, R01, R00, ___ }, \ - { R14, R13, R12, R11, R10, ___ }, \ - { R24, R23, R22, R21, R20, ___ }, \ - { ___, ___, ___, ___, ___, M20 } \ -} - -#define LAYOUT LAYOUT_3x11 \ No newline at end of file From bfeacaac1f888f1e05fa77cf28be7c90ff789118 Mon Sep 17 00:00:00 2001 From: miketronic Date: Wed, 19 Apr 2023 13:12:02 -0500 Subject: [PATCH 04/61] userspace updates --- .../pi40/keymaps/miketronic/keymap.c | 42 +++++++++---------- .../hazel/satpad/keymaps/miketronic/keymap.c | 14 +++---- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c index 3df21d90a79e..c0a75d18cd24 100644 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c @@ -27,11 +27,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_WM] = LAYOUT_ortho_4x12_wrapper ( - RGB_TOG, \ - _____________WORKMAN_412_001_L_____________, _____________WORKMAN_412_001_R_____________, \ - _____________WORKMAN_412_002_L_____________, _____________WORKMAN_412_002_R_____________, \ - _____________WORKMAN_412_003_L_____________, _____________WORKMAN_412_003_R_____________, \ - _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ \ + RGB_TOG, + _____________WORKMAN_412_001_L_____________, _____________WORKMAN_412_001_R_____________, + _____________WORKMAN_412_002_L_____________, _____________WORKMAN_412_002_R_____________, + _____________WORKMAN_412_003_L_____________, _____________WORKMAN_412_003_R_____________, + _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ ), [_QW] = LAYOUT_ortho_4x12_wrapper ( @@ -61,11 +61,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_LOWER] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, \ - _______, TD_XX, TD_YY, TD_SL, _______, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, \ - _______, TD_ATH, TD_PRAM, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, TD_UR, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, KC_SPC, TD_DENT, TD_DL \ + KC_MUTE, + _______, TD_XX, TD_YY, TD_SL, _______, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, + _______, TD_ATH, TD_PRAM, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, TD_UR, + _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, KC_SPC, TD_DENT, TD_DL ), @@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* EXTRAS * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ ! │ │ │ │ │ │ │ │ /\ | [ | ] | ; │ │ + * │ │ ! │ │ │ │ │ │ │ /\ | [ | ] | ; │ │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ * │SHIFT│ | |EXTRA┃ ┃ │ │ ┃ ┃ ( | ) | ' | │ @@ -109,11 +109,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_EX] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, \ - _______, KC_EXLM, _______, _______, _______, _______, _______, TD_SL, KC_LBRC, KC_RBRC, KC_SCLN, _______, \ - KC_LSFT, _______, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_QUOT, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_QUES, _______, \ - _______, _______, _______, _______, _______, TD_SE, TD_SE, _______, _______, _______, _______, _______ \ + KC_MUTE, + _______, KC_EXLM, _______, _______, _______, _______, _______, TD_SL, KC_LBRC, KC_RBRC, KC_SCLN, _______, + KC_LSFT, _______, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_QUOT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_QUES, _______, + _______, _______, _______, _______, _______, TD_SE, TD_SE, _______, _______, _______, _______, _______ ), @@ -134,11 +134,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_FN] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - TD_CP, CLIP, SS, _______, _______, _______, _______, TD_SL, _______, KC_UP, _______, KC_DEL, - KC_TAB, M05, M06, M07, M08, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, TD_UR, - _______, M01, M02, M03, M04, _______, _______, _______, TD_QEXC, KC_COMM, KC_DOT, TD_DL, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + KC_MUTE, + TD_CP, CLIP, SS, _______, _______, _______, _______, TD_SL, _______, KC_UP, _______, KC_DEL, + KC_TAB, M05, M06, M07, M08, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, TD_UR, + _______, M01, M02, M03, M04, _______, _______, _______, TD_QEXC, KC_COMM, KC_DOT, TD_DL, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c index b1e9a0f29c3a..b9909b1eb2fe 100644 --- a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c +++ b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c @@ -49,9 +49,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LOWER] = LAYOUT_3x11_wrapper ( - TD_XX, TD_YY, TD_SL, XXXX, XXXX, TD_SL, KC_7, KC_8, KC_9, MT(MOD_RSFT, KC_0), + TD_XX, TD_YY, TD_SL, XXXX, XXXX, TD_SL, KC_7, KC_8, KC_9, MT(MOD_RSFT, KC_0), TD_ATH, TD_PRAM, _______, XXXX, XXXX, TD_YY, KC_4, KC_5, KC_6, MT(MOD_RSFT, KC_DEL), - XXXX, XXXX, XXXX, XXXX, _______, KC_ENT, _______, KC_1, KC_2, KC_3, TD_DENT + XXXX, XXXX, XXXX, XXXX, _______, KC_ENT, _______, KC_1, KC_2, KC_3, TD_DENT ), @@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = LAYOUT_3x11_wrapper ( QK_BOOT, DB_TOGG, _______, _______, MAKE, TD_SL, KC_F7, KC_F8, KC_F9, KC_F10, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, TD_UMIN, KC_F4, KC_F5, KC_F6, KC_F11, - _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_ENT, _______, KC_F1, KC_F2, KC_F3, KC_F12 + _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_ENT, _______, KC_F1, KC_F2, KC_F3, KC_F12 ), @@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_EX] = LAYOUT_3x11_wrapper ( - KC_EXLM, _______, _______, _______, _______, _______, TD_SL, KC_LBRC, KC_RBRC, KC_SCLN, + KC_EXLM, _______, _______, _______, _______, _______, TD_SL, KC_LBRC, KC_RBRC, KC_SCLN, KC_LSFT, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_QUOT, _______, _______, _______, _______, _______, KC_ENT, _______, _______, KC_COMM, KC_DOT, KC_QUES ), @@ -112,9 +112,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FN] = LAYOUT_3x11_wrapper ( - TD_CP, CLIP, SS, _______, _______, TD_SL, _______, KC_UP, _______, KC_DEL, - KC_TAB, M05, M06, M07, M08, _______, KC_LEFT, KC_DOWN, KC_RGHT, TD_UR, - _______, M01, M02, M03, M04, KC_ENT, _______, TD_QEXC, KC_COMM, KC_DOT, TD_DL + TD_CP, CLIP, SS, _______, _______, TD_SL, _______, KC_UP, _______, KC_DEL, + KC_TAB, M05, M06, M07, M08, _______, KC_LEFT, KC_DOWN, KC_RGHT, TD_UR, + _______, M01, M02, M03, M04, KC_ENT, _______, TD_QEXC, KC_COMM, KC_DOT, TD_DL ), From 7fbf6f1ff9853afe28ff7b5ef3705b485027cc9b Mon Sep 17 00:00:00 2001 From: miketronic Date: Wed, 19 Apr 2023 14:20:59 -0500 Subject: [PATCH 05/61] userspace updates --- .../pi40/keymaps/miketronic/keymap.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c index c0a75d18cd24..43da42f44434 100644 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c @@ -47,25 +47,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Lower * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ │ () │ [] │ /\ │ │ │ │ │ │ 7 │ 8 │ 9 │ 0 │ + * │ │ () │ [] │ /\ │ │ │ │ │ 7 │ 8 │ 9 │ 0 │ │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ │ @ # │ & % │ ┃ ┃ │ │ ┃ ┃ 4 │ 5 │ 6 │ │ + * │ │ @ # │ & % │ ┃ ┃ │ │ ┃ 4 ┃ 5 │ 6 │ │ │ * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ │ 1 │ 2 │ 3 │ UP │ + * │ │ │ │ │ │ │ │ │ 1 │ 2 │ 3 │ │ UP │ * │ │ │ │ │ │ │ │ │ │ │ │ │RIGHT│ * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │LOWER│ │ │ │ │BPSC │ SPC │ . │ DN │ - * │ │ │ │ │ │ │ │ │ │ │ │ ENT │LEFT │ + * │ │ │ │ │LOWER│ │ │ │BPSC │ SPC │ . │ │ DN │ + * │ │ │ │ │ │ │ │ │ │ │ ENT │ │LEFT │ * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_LOWER] = LAYOUT_ortho_4x12_wrapper ( KC_MUTE, - _______, TD_XX, TD_YY, TD_SL, _______, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, - _______, TD_ATH, TD_PRAM, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, TD_UR, - _______, _______, _______, _______, _______, _______, _______, _______, KC_BSPC, KC_SPC, TD_DENT, TD_DL + _______, TD_XX, TD_YY, TD_SL, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, _______, + _______, TD_ATH, TD_PRAM, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, _______, TD_UR, + _______, _______, _______, _______, _______, _______, _______, KC_BSPC, KC_SPC, TD_DENT,_______, TD_DL ), From 63ab3f019fb879533bb0d0d5325d99a89e6373c0 Mon Sep 17 00:00:00 2001 From: miketronic Date: Thu, 20 Apr 2023 08:11:36 -0500 Subject: [PATCH 06/61] userspace --- .../miketronic/.vscode/c_cpp_properties.json | 18 +++++++++ .../keymaps/miketronic/.vscode/launch.json | 24 ++++++++++++ .../keymaps/miketronic/.vscode/settings.json | 37 +++++++++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 keyboards/hazel/satpad/keymaps/miketronic/.vscode/c_cpp_properties.json create mode 100644 keyboards/hazel/satpad/keymaps/miketronic/.vscode/launch.json create mode 100644 keyboards/hazel/satpad/keymaps/miketronic/.vscode/settings.json diff --git a/keyboards/hazel/satpad/keymaps/miketronic/.vscode/c_cpp_properties.json b/keyboards/hazel/satpad/keymaps/miketronic/.vscode/c_cpp_properties.json new file mode 100644 index 000000000000..cea4d3f4e0ee --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/miketronic/.vscode/c_cpp_properties.json @@ -0,0 +1,18 @@ +{ + "configurations": [ + { + "name": "windows-gcc-x64", + "includePath": [ + "${workspaceFolder}/**" + ], + "compilerPath": "gcc", + "cStandard": "${default}", + "cppStandard": "${default}", + "intelliSenseMode": "windows-gcc-x64", + "compilerArgs": [ + "" + ] + } + ], + "version": 4 +} \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/.vscode/launch.json b/keyboards/hazel/satpad/keymaps/miketronic/.vscode/launch.json new file mode 100644 index 000000000000..4b4c43febeb1 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/miketronic/.vscode/launch.json @@ -0,0 +1,24 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "C/C++ Runner: Debug Session", + "type": "cppdbg", + "request": "launch", + "args": [], + "stopAtEntry": false, + "externalConsole": true, + "cwd": "c:/Users/mbarnoski/qmk_firmware/keyboards/hazel/satpad/keymaps/miketronic", + "program": "c:/Users/mbarnoski/qmk_firmware/keyboards/hazel/satpad/keymaps/miketronic/build/Debug/outDebug", + "MIMode": "gdb", + "miDebuggerPath": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + } + ] +} \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/.vscode/settings.json b/keyboards/hazel/satpad/keymaps/miketronic/.vscode/settings.json new file mode 100644 index 000000000000..450db55faaa2 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/miketronic/.vscode/settings.json @@ -0,0 +1,37 @@ +{ + "C_Cpp_Runner.cCompilerPath": "gcc", + "C_Cpp_Runner.cppCompilerPath": "g++", + "C_Cpp_Runner.debuggerPath": "gdb", + "C_Cpp_Runner.cStandard": "", + "C_Cpp_Runner.cppStandard": "", + "C_Cpp_Runner.msvcBatchPath": "C:/Program Files/Microsoft Visual Studio/VR_NR/Community/VC/Auxiliary/Build/vcvarsall.bat", + "C_Cpp_Runner.useMsvc": false, + "C_Cpp_Runner.warnings": [ + "-Wall", + "-Wextra", + "-Wpedantic", + "-Wshadow", + "-Wformat=2", + "-Wconversion", + "-Wnull-dereference", + "-Wsign-conversion" + ], + "C_Cpp_Runner.enableWarnings": true, + "C_Cpp_Runner.warningsAsError": false, + "C_Cpp_Runner.compilerArgs": [], + "C_Cpp_Runner.linkerArgs": [], + "C_Cpp_Runner.includePaths": [], + "C_Cpp_Runner.includeSearch": [ + "*", + "**/*" + ], + "C_Cpp_Runner.excludeSearch": [ + "**/build", + "**/build/**", + "**/.*", + "**/.*/**", + "**/.vscode", + "**/.vscode/**" + ], + "C_Cpp_Runner.useAddressSanitizer": false +} \ No newline at end of file From bea4244c442e5b307c4372e561d713fa15c70e2d Mon Sep 17 00:00:00 2001 From: miketronic Date: Thu, 20 Apr 2023 09:23:20 -0500 Subject: [PATCH 07/61] removed submodule --- users/miketronic | 1 - 1 file changed, 1 deletion(-) delete mode 160000 users/miketronic diff --git a/users/miketronic b/users/miketronic deleted file mode 160000 index 5621787c26d1..000000000000 --- a/users/miketronic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5621787c26d1204cb2ccd89c65c8b9eefe34c2e5 From 1206f72d164bb34fe3d641cac64301c5b5eb8b32 Mon Sep 17 00:00:00 2001 From: miketronic Date: Thu, 20 Apr 2023 10:55:47 -0500 Subject: [PATCH 08/61] userspace clean-up --- users/miketronic/config.h | 64 ++++++++++++ users/miketronic/miketronic.c | 45 +++++++++ users/miketronic/miketronic.h | 60 ++++++++++++ users/miketronic/process_records.c | 151 +++++++++++++++++++++++++++++ users/miketronic/process_records.h | 33 +++++++ users/miketronic/rules.mk | 91 +++++++++++++++++ users/miketronic/tapdances.c | 33 +++++++ users/miketronic/tapdances.h | 57 +++++++++++ users/miketronic/wrappers.h | 136 ++++++++++++++++++++++++++ 9 files changed, 670 insertions(+) create mode 100644 users/miketronic/config.h create mode 100644 users/miketronic/miketronic.c create mode 100644 users/miketronic/miketronic.h create mode 100644 users/miketronic/process_records.c create mode 100644 users/miketronic/process_records.h create mode 100644 users/miketronic/rules.mk create mode 100644 users/miketronic/tapdances.c create mode 100644 users/miketronic/tapdances.h create mode 100644 users/miketronic/wrappers.h diff --git a/users/miketronic/config.h b/users/miketronic/config.h new file mode 100644 index 000000000000..c528351e8e2d --- /dev/null +++ b/users/miketronic/config.h @@ -0,0 +1,64 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#pragma once + +// specific defines example +// #if defined(TAP_DANCE_ENABLE) && defined(KEYBOARD_lets_split_rev2) || defined(KEYBOARD_keebio_iris_rev2) + + + +// Common QMK settings +#define DEBOUNCE 10 +#if defined(TAP_DANCE_ENABLE) + #define TAP_CODE_DELAY 5 + #define TAP_HOLD_CAPS_DELAY 25 +#endif +#define ENCODER_RESOLUTION 4 +#define MACRO_TIMER 5 + + +////////////// +// For Pi40 // +////////////// +#if defined(KEYBOARD_1upkeyboards_pi40_mit_v1_0) + +// Tapping Config +// https://docs.qmk.fm/#/tap_hold?id=tapping_term +// https://docs.qmk.fm/#/ChangeLog/20230226?id=quick-tap-term + +// Tap-hold settings + #if defined(TAP_DANCE_ENABLE) + #define TAPPING_TERM 170 + #define TAPPING_TERM_PER_KEY + #define QUICK_TAP_TERM TAPPING_TERM / 2 + #define QUICK_TAP_TERM_PER_KEY + #endif + +#define PERMISSIVE_HOLD_PER_KEY +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY + +#endif + + + + + + +//////////////// +// For SATPAD // +//////////////// +#if defined(KEYBOARD_hazel_satpad) + +// Tap-hold settings + #if defined(TAP_DANCE_ENABLE) + #define TAPPING_TERM 170 + #define TAPPING_TERM_PER_KEY + #define QUICK_TAP_TERM TAPPING_TERM / 2 + #define QUICK_TAP_TERM_PER_KEY + #endif + +#define PERMISSIVE_HOLD_PER_KEY +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY + +#endif diff --git a/users/miketronic/miketronic.c b/users/miketronic/miketronic.c new file mode 100644 index 000000000000..64621a06a998 --- /dev/null +++ b/users/miketronic/miketronic.c @@ -0,0 +1,45 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#include "miketronic.h" + +// Add reconfigurable functions here, for keymap customization +// This allows for a global, userspace functions, and continued +// customization of the keymap. Use _keymap instead of _user +// functions in the keymaps + + +// In keymaps, instead of writing _user functions, write _keymap functions +// The __attribute__((weak)) allows for empty definitions here, and during +// compilation, if these functions are defined elsewhere, they are written +// over. This allows to include custom code from keymaps in the generic code +// in this file. + + + + +__attribute__ ((weak)) void matrix_init_keymap(void) { } +__attribute__ ((weak)) void matrix_scan_keymap(void) { } +__attribute__ ((weak)) void led_set_keymap(uint8_t usb_led) { } + +__attribute__ ((weak)) layer_state_t layer_state_set_keymap (layer_state_t state) { + return state; +} +// Init effect for RGB boards only +#ifdef RGB_MATRIX_ENABLE +void matrix_init_user(void) { + rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); +} +#endif + + +/* + +layer_state_t layer_state_set_user(layer_state_t state) { + state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +#ifdef CONSOLE_ENABLE + uprintf("LAYER: %u\n", state); +#endif + return state; +} + */ diff --git a/users/miketronic/miketronic.h b/users/miketronic/miketronic.h new file mode 100644 index 000000000000..9b6721995dbb --- /dev/null +++ b/users/miketronic/miketronic.h @@ -0,0 +1,60 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#pragma once +#include QMK_KEYBOARD_H + +#include "quantum.h" +#include "wrappers.h" +#include "action.h" +#include "version.h" +#include "tapdances.h" +#include "process_records.h" + + +enum layer_names { + _WM = SAFE_RANGE, + _QW, + _LOWER, + _RAISE, + _EX, + _FN, + _SYMB +}; + + +// Layer macros +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) +#define FN MO(_FN) +#define EX MO(_EX) +#define TEX LT(_EX, KC_T) // Tap for "T", hold for Extras layer +#define BSYM LT(_SYMB, KC_B) // Tap for "B", hold for Symbols layer +#define JSYM LT(_SYMB, KC_J) // Tap for "J", hold for Symbols layer +#define FNZ LT(_FN, KC_Z) // Tap for "Z", hold for FN layer +#define VLOWER LT(_LOWER, KC_V) // Tap for "V", hold for Lower layer +#define KRAISE LT(_RAISE, KC_K) // Tap for "K", hold for Raise layer + +// Mod Tap +#define ASFT MT(MOD_LSFT, KC_A) // Tap for "A", hold for Shift +#define GGUI MT(MOD_LGUI, KC_G) // Tap for "G", hold for OS Key +#define MGUI MT(MOD_LGUI, KC_M) // Tap for "M", hold for OS Key +#define CTRLX MT(MOD_LCTL, KC_X) // Tap for "X", hold for Ctrl +#define CALT MT(MOD_LALT, KC_C) // Tap for "C", hold for Alt +#define L_ALT MT(MOD_RALT, KC_L) // Tap for "L", hold for Alt +#define TBSHFT MT(MOD_LSFT, KC_TAB) // Tap for Tab, hold for Shift +#define SLSHFT MT(MOD_RSFT, KC_SLSH) // Tap for Slash, hold for Shift + +// MISC +#define CALTDEL LCTL(LALT(KC_DEL)) // Ctrl Alt Del +#define TSKMGR LCTL(LSFT(KC_ESC)) // Task Manager +#define CLIP LCTL(LALT(KC_Q)) // Clipboard +#define SS LCTL(LALT(KC_G)) // Greenshot region +#define NUM LSFT(KC_3) +#define AT LSFT(KC_2) +#define COPY LCTL(KC_C) +#define PASTE LCTL(KC_V) +#define XXXX KC_NO +#define XXXXXXX KC_NO +#define XXXXXXXX KC_NO +#define ________ KC_TRNS \ No newline at end of file diff --git a/users/miketronic/process_records.c b/users/miketronic/process_records.c new file mode 100644 index 000000000000..89440d4ed838 --- /dev/null +++ b/users/miketronic/process_records.c @@ -0,0 +1,151 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#include "miketronic.h" +#include "process_records.h" + +__attribute__ ((weak)) +bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + return true; +} + +__attribute__ ((weak)) +bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { + return true; +} + + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { +#ifdef CONSOLE_ENABLE + uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed); +#endif + + + switch(keycode) { + + case VERSION: + if (!record->event.pressed) { + send_string_with_delay_P(PSTR(QMK_KEYBOARD ":" QMK_KEYMAP "\nVersion:" QMK_VERSION ", built: " QMK_BUILDDATE "\n"), MACRO_TIMER); + } + break; + + case MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader + if (!record->event.pressed) { + uint8_t temp_mod = get_mods(); + uint8_t temp_osm = get_oneshot_mods(); + clear_mods(); clear_oneshot_mods(); + SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); + #ifndef FLASH_BOOTLOADER + if ((temp_mod | temp_osm) & MOD_MASK_SHIFT) + #endif + { + SEND_STRING(":flash"); + } + if ((temp_mod | temp_osm) & MOD_MASK_CTRL) { + SEND_STRING(" -j8 --output-sync"); + } + tap_code(KC_ENT); + set_mods(temp_mod); + } + break; + + + case M01: + if (record->event.pressed) { + SEND_STRING("//a11"); + } + break; + + case M02: + if (record->event.pressed) { + SEND_STRING("//a12"); + } + break; + + case M03: + if (record->event.pressed) { + SEND_STRING("//a08"); + } + break; + + case M04: + if (record->event.pressed) { + SEND_STRING("//a09"); + } + break; + + case M05: + if (record->event.pressed) { + SEND_STRING("//th"); + } + break; + + case M06: + if (record->event.pressed) { + SEND_STRING("//re"); + } + break; + + case M07: + if (record->event.pressed) { + SEND_STRING("//yw"); + } + break; + + case M08: + if (record->event.pressed) { + tap_random_base64(); + } + break; + +#if defined(KEYBOARD_1upkeyboards_pi40_v1_0) && defined(RGBLIGHT_ENABLE) + case WM: + if (record->event.pressed) { + set_single_persistent_default_layer(_WM); + rgblight_sethsv_noeeprom(HSV_WHITE); + } + break; + + case QW: + if (record->event.pressed) { + set_single_persistent_default_layer(_QW); + rgblight_sethsv_noeeprom(HSV_MAGENTA); + } + break; + + case RGB1: + if (record->event.pressed) { + rgblight_sethsv_noeeprom(HSV_BLUE); + } + break; + + case RGB2: + if (record->event.pressed) { + rgblight_sethsv_noeeprom(HSV_RED); + } + break; + + case RGB3: + if (record->event.pressed) { + rgblight_sethsv_noeeprom(HSV_ORANGE); + } + break; + + case RGB4: + if (record->event.pressed) { + rgblight_sethsv_noeeprom(HSV_YELLOW); + } + break; + + case RGB5: + if (record->event.pressed) { + rgblight_sethsv_noeeprom(HSV_GREEN); + } + break; +#endif + + } + return process_record_keymap(keycode, record) && + process_record_secrets(keycode, record); +} + diff --git a/users/miketronic/process_records.h b/users/miketronic/process_records.h new file mode 100644 index 000000000000..f4aa5b605eae --- /dev/null +++ b/users/miketronic/process_records.h @@ -0,0 +1,33 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#pragma once +#include "miketronic.h" + + +bool process_record_secrets(uint16_t keycode, keyrecord_t *record); +bool process_record_keymap(uint16_t keycode, keyrecord_t *record); + +enum custom_keycodes { + WM = SAFE_RANGE, + QW, + MAKE, + VERSION, + M01, + M02, + M03, + M04, + M05, + M06, + M07, + M08, + M09, + M10, + M11, + M12, + RGB1, + RGB2, + RGB3, + RGB4, + RGB5 +}; diff --git a/users/miketronic/rules.mk b/users/miketronic/rules.mk new file mode 100644 index 000000000000..3c217d9073e1 --- /dev/null +++ b/users/miketronic/rules.mk @@ -0,0 +1,91 @@ +SRC += miketronic.c tapdances.c process_records.c + + +# Common feature for all keyboards +BOOTMAGIC_ENABLE = yes +EXTRAKEY_ENABLE = yes +TAP_DANCE_ENABLE = yes +MACROS_ENABLED = yes +RGBLIGHT_ENABLE = no +RGB_MATRIX_ENABLE = no + +# idobao/id75 +ifeq ($(strip $(KEYBOARD)), idobao/id75/v1) + RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow + LEADER_ENABLE = yes + NKRO_ENABLE = yes + AUTO_SHIFT_ENABLE = no + VIA_ENABLE = no + MOUSEKEY_ENABLE = no + EXTRAKEY_ENABLE = no + CONSOLE_ENABLE = no + COMMAND_ENABLE = no +endif + +# Satpad +ifeq ($(strip $(KEYBOARD)), hazel/satpad) + BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite + MOUSEKEY_ENABLE = yes # Mouse keys + EXTRAKEY_ENABLE = yes # Audio control and System control + NKRO_ENABLE = yes # USB Nkey Rollover + CAPS_WORD_ENABLE = yes + KEY_OVERRIDE_ENABLE = yes + TAP_DANCE_ENABLE = yes + OLED_ENABLE = yes + OLED_DRIVER = SSD1306 + ENCODER_ENABLE = yes + ENCODER_MAP_ENABLE = yes + + + LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. + AUTO_SHIFT_ENABLE = no + UNICODE_ENABLE = no # Unicode + CONSOLE_ENABLE = no # Console for debug + COMMAND_ENABLE = no # Commands for debug and configuration + RGBLIGHT_ENABLE = no + BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality + SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) + AUDIO_ENABLE = no # Audio output on port C6 + MIDI_ENABLE = no # MIDI support + BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID + GRAVE_ESC_ENABLE = no + SPACE_CADET_ENABLE = no + COMBO_ENABLE = no + + # OLED WIDGETS + + # WPM_ENABLE = no + # KEYCOUNT_ENABLE = yes + # KEYLOG_ENABLE = no + # KEYLOG_DEBUG = no +endif + + +# 1upkeyboards/pi40 +ifeq ($(strip $(KEYBOARD)), 1upkeyboards/pi40/mit_v1_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 + + AUTO_SHIFT_ENABLE = no + CONSOLE_ENABLE = no # Console for debug + COMMAND_ENABLE = no # Commands for debug and configuration + BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality + RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow + AUDIO_ENABLE = no # Audio output + MOUSEKEY_ENABLE = no # Mouse keys + + RGB_MATRIX_ENABLE = yes + RGB_MATRIX_DRIVER = WS2812 + WS2812_DRIVER = vendor + ENCODER_ENABLE = yes + ENCODER_MAP_ENABLE = yes + OLED_ENABLE = yes + OLED_DRIVER = SSD1306 +endif + + + + diff --git a/users/miketronic/tapdances.c b/users/miketronic/tapdances.c new file mode 100644 index 000000000000..d032c3035095 --- /dev/null +++ b/users/miketronic/tapdances.c @@ -0,0 +1,33 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#include "miketronic.h" +#include "tapdances.h" + + +tap_dance_action_t tap_dance_actions[] = { + + [T_BRC] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), // Tap once for Left Brace, twice for Right Brace + [T_MIN] = ACTION_TAP_DANCE_DOUBLE(KC_MINUS, KC_EQUAL), // Minus, Equals + [T_UMIN] = ACTION_TAP_DANCE_DOUBLE(KC_UNDS, KC_MINS), // Underscore, Minus + [T_GESC] = ACTION_TAP_DANCE_DOUBLE(KC_GRAVE, KC_ESCAPE), // Grave, Escape + [T_SE] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT), // Space, Enter + [T_MULTDIV] = ACTION_TAP_DANCE_DOUBLE(KC_PAST, KC_PSLS), // Multiply, Divide + [T_UR] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_RGHT), // Up, Right + [T_DL] = ACTION_TAP_DANCE_DOUBLE(KC_DOWN, KC_LEFT), // Down, Left + [T_CP] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_C), LCTL(KC_V)), // Copy, Paste + [T_DENT] = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_ENT), // Dot, Enter + [T_IENT] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_ENT), // "I", Enter + [T_CSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_COMM), // Space, Comma + [T_DSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_DOT), // Space, Dot + [T_QEXC] = ACTION_TAP_DANCE_DOUBLE(KC_QUES, KC_EXLM), // ?, ! + [T_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), // "q", Escape + [T_TE] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_ESC), // Tab, Escape + [T_20] = ACTION_TAP_DANCE_DOUBLE(KC_2, KC_0), // "2", "0" + [T_SL] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_BSLS), // Slash, Backslash + [T_XX] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN), // Left Paren, Right Paren + [T_YY] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), // Left Bracket, Right Bracket + [T_ATH] = ACTION_TAP_DANCE_DOUBLE(KC_AT, KC_HASH), + [T_PRAM] = ACTION_TAP_DANCE_DOUBLE(KC_PERC, KC_AMPR) +}; + diff --git a/users/miketronic/tapdances.h b/users/miketronic/tapdances.h new file mode 100644 index 000000000000..8135bac2695b --- /dev/null +++ b/users/miketronic/tapdances.h @@ -0,0 +1,57 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#pragma once +#include "quantum.h" + + +#define TD_BRC TD(T_BRC) +#define TD_ATH TD(T_ATH) +#define TD_CSPC TD(T_CSPC) +#define TD_DSPC TD(T_DSPC) +#define TD_CP TD(T_CP) +#define TD_DENT TD(T_DENT) +#define TD_IENT TD(T_IENT) +#define TD_MIN TD(T_MIN) +#define TD_UMIN TD(T_UMIN) +#define TD_GESC TD(T_GESC) +#define TD_QESC TD(T_QESC) +#define TD_QEXC TD(T_QEXC) +#define TD_PRAM TD(T_PRAM) +#define TD_SE TD(T_SE) +#define TD_MD TD(T_MULTDIV) +#define TD_UR TD(T_UR) +#define TD_DL TD(T_DL) +#define TD_TE TD(T_TE) +#define TD_20 TD(T_20) +#define TD_SL TD(T_SL) +#define TD_XX TD(T_XX) +#define TD_YY TD(T_YY) + + + +// Tap Dance +enum tapdance_id{ + T_BRC = 0, + T_ATH, + T_CSPC, + T_DSPC, + T_CP, + T_DENT, + T_IENT, + T_MIN, + T_UMIN, + T_GESC, + T_QESC, + T_QEXC, + T_SE, + T_MULTDIV, + T_UR, + T_DL, + T_TE, + T_20, + T_SL, + T_XX, + T_YY, + T_PRAM +}; \ No newline at end of file diff --git a/users/miketronic/wrappers.h b/users/miketronic/wrappers.h new file mode 100644 index 000000000000..c855a5d86d16 --- /dev/null +++ b/users/miketronic/wrappers.h @@ -0,0 +1,136 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#pragma once +#include "miketronic.h" + +/* Pattern adapted from users/drashna/wrapper.h + Define per-layout keymap sections. Also requires a wrapper. + + Example: + + #define LAYOUT_:name_wrapper(...) LAYOUT_:name(__VA_ARGS__) + + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_MODS] = LAYOUT_:name _wrapper( + _______, ___________________BLANK___________________, ... + ... + ), + } +*/ + + +// clang-format off +#define LAYOUT_ortho_4x12_wrapper(...) LAYOUT_ortho_4x12(__VA_ARGS__) +#define LAYOUT_3x11_wrapper(...) LAYOUT(__VA_ARGS__) + + +#define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, KC_R, KC_T +#define _________________QWERTY_L2_________________ KC_A, KC_S, KC_D, KC_F, KC_G +#define _________________QWERTY_L3_________________ FNZ, KC_X, KC_C, VLOWER, KC_B + +#define _________________QWERTY_R1_________________ KC_Y, KC_U, KC_I, KC_O, KC_P +#define _________________QWERTY_R2_________________ KC_H, KC_J, KRAISE, KC_L, KC_SCLN +#define _________________QWERTY_R3_________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH + +#define _________________WORKMAN_1_________________ KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN +#define _________________WORKMAN_2_________________ KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, LT_MC(KC_I) +#define _________________WORKMAN_3_________________ KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLASH + +#define _________________WORKMAN_L1________________ KC_Q, KC_D, KC_R, KC_W, KC_B +#define _________________WORKMAN_L2________________ KC_A, KC_S, KC_H, KC_T, KC_G +#define _________________WORKMAN_L3________________ KC_Z, KC_X, KC_M, KC_C, KC_V + +#define _________________WORKMAN_R1________________ KC_J, KC_F, KC_U, KC_P, KC_SCLN +#define _________________WORKMAN_R2________________ KC_Y, KC_N, KC_E, KC_O, LT_MC(KC_I) +#define _________________WORKMAN_R3________________ KC_K, KC_L, KC_COMM, KC_DOT, KC_SLASH + + + +#define ________________NUMBER_LEFT________________ KC_1, KC_2, KC_3, KC_4, KC_5 +#define ________________NUMBER_RIGHT_______________ KC_6, KC_7, KC_8, KC_9, KC_0 +#define _________________FUNC_LEFT_________________ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 +#define _________________FUNC_RIGHT________________ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 + +#define __________________LONG_FUNC_LEFT___________________ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6 +#define __________________LONG_FUNC_RIGHT__________________ KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 + +#define _________________BLANK_5___________________ _______, _______, _______, _______, _______ +#define _________________BLANK_6___________________ _______, _______, _______, _______, _______, _______ + +#define _________________LOWER_L1__________________ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC +#define _________________LOWER_L2__________________ _________________FUNC_LEFT_________________ +#define _________________LOWER_L3__________________ _________________FUNC_RIGHT________________ + +#define _________________LOWER_R1__________________ KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN +#define _________________LOWER_R2__________________ _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR +#define _________________LOWER_R3__________________ _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + +#define _______________LOWER_412_L1________________ TD_XX, TD_YY, TD_SL, _______, _______, _______ +#define _______________LOWER_412_L2________________ TD_ATH, TD_PRAM, _______, _______, _______, _______ +#define _______________LOWER_412_L3________________ _______, _______, _______, _______, _______, _______ +#define _______________LOWER_412_L4________________ _______, _______, _______, _______, _______, _______ + +#define _______________LOWER_412_R1________________ _______, _______, KC_7, KC_8, KC_9, KC_0 +#define _______________LOWER_412_R2________________ _______, _______, KC_4, KC_5, KC_6, _______ +#define _______________LOWER_412_R3________________ _______, _______, KC_1, KC_2, KC_3, TD_UR +#define _______________LOWER_412_R4________________ _______, _______, KC_BSPC, KC_SPC, TD_DENT, TD_DL + + + +#define _________________RAISE_L1__________________ ________________NUMBER_LEFT________________ +#define _________________RAISE_L2__________________ ___________________BLANK___________________ +#define _________________RAISE_L3__________________ ___________________BLANK___________________ + +#define _________________RAISE_R1__________________ ________________NUMBER_RIGHT_______________ +#define _________________RAISE_R2__________________ _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC +#define _________________RAISE_R3__________________ _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END + +#define _______________RAISE_412_L1________________ QK_BOOT, DB_TOGG, _______, _______, _______, _______ +#define _______________RAISE_412_L2________________ _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______ +#define _______________RAISE_412_L3________________ _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______ + +#define _______________RAISE_412_R1________________ _______, _______, KC_F7, KC_F8, KC_F9, KC_F10 +#define _______________RAISE_412_R2________________ _______, _______, KC_F4, KC_F5, KC_F6, KC_F11 +#define _______________RAISE_412_R3________________ _______, TD_UMIN, KC_F1, KC_F2, KC_F3, KC_F12 + +#define _________________ADJUST_L1_________________ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG +#define _________________ADJUST_L2_________________ MU_TOGG, CK_TOGG, AU_ON, AU_OFF, AG_NORM +#define _________________ADJUST_L3_________________ RGB_RMOD,RGB_HUD,RGB_SAD, RGB_VAD, KC_RGB_T + +#define _________________ADJUST_R1_________________ KC_SEC1, KC_SEC2, KC_SEC3, KC_SEC4, KC_SEC5 +#define _________________ADJUST_R2_________________ AG_SWAP, QWERTY, COLEMAK, DVORAK, WORKMAN +#define _________________ADJUST_R3_________________ MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT + +#define _____________WORKMAN_310_001_L_____________ TD_QESC, KC_D, KC_R, KC_W, BSYM +#define _____________WORKMAN_310_001_R_____________ JSYM, KC_F, KC_U, KC_P, KC_BSPC +#define _____________WORKMAN_310_002_L_____________ ASFT, KC_S, KC_H, TEX, KC_G +#define _____________WORKMAN_310_002_R_____________ KC_Y, KC_N, KC_E, KC_O, TD_IENT +#define _____________WORKMAN_310_003_L_____________ FNZ, CTRLX, MGUI, CALT, VLOWER +#define _____________WORKMAN_310_003_R_____________ KRAISE, L_ALT, TD_CSPC, TD_DSPC, KC_SLSH +#define _____________WORKMAN_310_004_L_____________ FN, KC_LCTL, KC_LGUI, KC_LALT, LOWER +#define _____________WORKMAN_310_004_R_____________ RAISE, SS, CLIP, TD_CP, FN + +#define _____________WORKMAN_410_003_L_____________ FNZ, KC_X, KC_M, KC_C, KC_V +#define _____________WORKMAN_410_003_R_____________ KC_K, KC_L, TD_CSPC, TD_DSPC, SLSHFT + +#define _____________WORKMAN_311_001_L_____________ TD_QESC, KC_D, KC_R, KC_W, BSYM +#define _____________WORKMAN_311_001_R_____________ JSYM, KC_F, KC_U, KC_P, KC_BSPC +#define _____________WORKMAN_311_002_L_____________ ASFT, KC_S, KC_H, TEX, GGUI +#define _____________WORKMAN_311_002_R_____________ KC_Y, KC_N, KC_E, KC_O, TD_IENT +#define _____________WORKMAN_311_003_L_____________ FNZ, CTRLX, MGUI, CALT, VLOWER, KC_ENT +#define _____________WORKMAN_311_003_R_____________ KRAISE, L_ALT, TD_CSPC, TD_DSPC, KC_SLSH + + +#define _____________WORKMAN_412_001_L_____________ TD_TE, TD_QESC, KC_D, KC_R, KC_W, BSYM +#define _____________WORKMAN_412_001_R_____________ JSYM, KC_F, KC_U, KC_P, KC_BSPC, KC_BSPC +#define _____________WORKMAN_412_002_L_____________ TBSHFT, KC_A, KC_S, KC_H, TEX, KC_G +#define _____________WORKMAN_412_002_R_____________ KC_Y, KC_N, KC_E, KC_O, TD_IENT, KC_ENT +#define _____________WORKMAN_412_003_L_____________ KC_LSFT, KC_Z, KC_X, KC_M, KC_C, KC_V +#define _____________WORKMAN_412_003_R_____________ KC_K, KC_L, TD_CSPC, TD_DSPC, KC_SLSH, TD_UR +#define _____________WORKMAN_412_004_L_____________ FN, KC_LCTL, KC_LGUI, KC_LALT, LOWER, TD_SE +#define _____________WORKMAN_412_004_R_____________ TD_SE, RAISE, SS, CLIP, TD_CP, TD_DL + + + +// clang-format on \ No newline at end of file From cd60d28c2f1558a69027a134a37f347fb42797e5 Mon Sep 17 00:00:00 2001 From: miketronic Date: Thu, 20 Apr 2023 12:09:12 -0500 Subject: [PATCH 09/61] Userspace updates --- users/miketronic/readme.md | 124 +++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 users/miketronic/readme.md diff --git a/users/miketronic/readme.md b/users/miketronic/readme.md new file mode 100644 index 000000000000..c1dd12128954 --- /dev/null +++ b/users/miketronic/readme.md @@ -0,0 +1,124 @@ +Copyright 2023 @miketronic -- Mike B +SPDX-License-Identifier: GPL-2.0+ + +# Layout for ortho 4x12 and 3x10 boards +# My current daily drivers: Planck, Pi40 and Satpad + +**Objective:** I tried to make layouts with core functions that are able to be present on the 3x10 boards and adapt those to the "middle 3x10" of the 4x12 boards to make going back and forth between the two board sizes easier. + + +##### My Main Layer - Workman + +* Tab: when held, operates as shift. +* Enter: when held, operates as shift. +* MENU: perform right-click + +| | | | | | | | | | | | | +| ---- |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| ----:| +| Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | +| Tab | A | S | D | F | G | H | J | K | L | ;: | Enter| +| Shft | Z | X | C | V | B | N | M | ,< | .> | /? | Shft | +| Fn | Ctrl | Alt | GUI |Lower | Bksp |Space |Raise | Shift| MENU | Ctrl | Fn2 | + +##### Main Colemak-DHm Layer + +| | | | | | | | | | | | | +| ---- |:----:| :---:|:---:|:-----:|:----:|:-----:|:-----:|:-----:|:----:|:----:| ----:| +| Esc | Q | W | F | P | B | J | L | U | Y | ;: | Bksp | +| Tab | A | R | S | T | G | M | N | E | I | O | Enter| +| Shft | Z | X | C | D | V | K | H | ,< | .> | /? | Shft | +| Fn | Ctrl | Alt | GUI | Lower | Bksp | Space | Raise | Shift | MENU | Ctrl | Fn2 | + +##### Function Layer +Activated when `fn` held in the above `qwerty` layer. + +| | | | | | | | | | | | | +| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| +| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | +| 1! | 2" | 3£ | 4$ | 5% | 6^ | 7& | 8* | 9( | 0) | ~ |INSERT| +| Shift | \| | `¬ | #~ | * | -_ | =+ | \| | [{ | ]} | '@ |Shift | +| Fn | Ctrl | Alt | GUI |Lower | Bksp |Space |Mouse | MENU | Alt | Ctrl | Fn2 | + +##### Lower Layer +Activated when `Lower` is held in the above `qwerty` layer. + +* Numbers are along the top row, their shifted counterparts are on row 2. +* WrdBks: `backspace` with `ctrl` applied. I.e. delete a word. +* WrdDel: `delete` with `ctrl` applied. I.e. forward delete a word. + +| | | | | | | | | | | | | +| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| +| 1! | 2" | 3£ | 4$ | 5% | 6^ | 7& | 8* | 9( | 0) | DEL | Bksp | +| ! | " | £ | $ | % | ^ | & | * | ( | ) |WrdDel|WrdBks| +| Shift | \| | `¬ | #~ | '@ | -_ | =+ | #~ | [{ | ]} | '@ |Shift | +| | | | |Lower | Del |Space | | Next | Vol- | Vol+ | Play | + +##### Raise Layer +Activated when `Raise` is held in the above `qwerty` layer. + +* Preferred layer for typing brackets. +* Allows for cursor navigation to be used solely with the right hand. +* WRDSEL: Select the word where the cursor is. +* |< and >|: Apply `ctrl` to `left` and `right` respectively for word jumping. + +| | | | | | | | | | | | | +| :---: |:----:| :---:| :---:| :---:| :---:| :---: | :---:| :---:| :---:| :---: | :---:| +| ` | |WRDSEL| [ | ] | | | PGUP | HOME |PGDOWN| |PRNTSC| +| ` | | | ( | ) | | | HOME | UP | END | |ZOOM +| +| | | | { | } | ||<| LEFT | DOWN |RIGHT |>||ZOOM -| +| Mouse | | | | | Alt | Enter |Raise | | | | | + +##### Lower + Raise +Activated when `Lower` and `Raise` are held together in the above `qwerty` layer. + +* Audio controls in the same position as cursor keys from the `Raise` layer. +* ????: Runs a macro for outputting a text string. Do not use this store passwords. +* Reset: Enter bootloader for flashing firmware to the keyboard. +* CAPS: Toggle caps lock. +* Macro functions: Allows recording of macros. To start recording the macro, press either REC1 or REC2. +To finish the recording, press STOP. To replay the macro, press either PLAY1 or PLAY2. +* MAC: Toggle MAC OS extensions to layers. This allows MLWR to be enabled with LOWER, +MRSE with RAISE, MFNC with FUNC and MFNC2 with FUNC2 respectively. + +| | | | | | | | | | | | | +| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|:-------:| +| ???? | Reset|Qwerty| | | REC1 | REC2 | | | | | Del | +| CAPS | | | | | PLAY1|PLAY2 | Mute | Vol+ | Play | | Qwerty | +| MAC | | | | | STOP1|STOP2 | Prev | Vol- | Next | | Colemak | +| | | | | | | | | DYN | | | | + +##### Function 2 Layer +Activated when `fn` held in the above `qwerty` layer. +* WRDSEL: Select the word where the cursor is. +* LNDEL: Delete the line where the cursor is. +* LNSEL: Select the line where the cursor is. +* DUP: Duplicate the selected text. +* LNJOIN: Join the line where the cursor is with the following line. +* MODE: Print either `PC` or `OSX` depending on what layer mode is active. + +| | | | | | | | | | | | | +| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| +| | |WRDSEL| | | | LNDEL| | | | | | +| | | LNSEL| DUP | | | | |LNJOIN| | | | +| | UNDO | CUT | COPY | PASTE| | | | | | | MODE | +| | | | | | | | | | | | | + +##### Mouse Layer +Activated when `fn` and `raise` held together. + +| | | | | | | | | | | | | +| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| +| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | | +| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | | +| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | | +| | | | | | | | | | | | | + +##### Number Pad Layout +Activated when holding `Esc` key. + +| | | | | | | | | | | | | +| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| +| | | | | | |NMLOCK| 7 | 8 | 9 | / | | +| | | | | | | | 4 | 5 | 6 | * | | +| | | | | | | | 1 | 2 | 3 | + | | +| | | | | | | | 0 | . | , | - | | From 8f59c1af78ea9bf45f3887347123ee0110153f25 Mon Sep 17 00:00:00 2001 From: miketronic Date: Thu, 20 Apr 2023 12:28:43 -0500 Subject: [PATCH 10/61] readme update --- users/miketronic/readme.md | 123 ++++--------------------------------- 1 file changed, 12 insertions(+), 111 deletions(-) diff --git a/users/miketronic/readme.md b/users/miketronic/readme.md index c1dd12128954..619a84ec2e66 100644 --- a/users/miketronic/readme.md +++ b/users/miketronic/readme.md @@ -9,116 +9,17 @@ SPDX-License-Identifier: GPL-2.0+ ##### My Main Layer - Workman -* Tab: when held, operates as shift. -* Enter: when held, operates as shift. -* MENU: perform right-click - | | | | | | | | | | | | | | ---- |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| ----:| -| Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | -| Tab | A | S | D | F | G | H | J | K | L | ;: | Enter| -| Shft | Z | X | C | V | B | N | M | ,< | .> | /? | Shft | -| Fn | Ctrl | Alt | GUI |Lower | Bksp |Space |Raise | Shift| MENU | Ctrl | Fn2 | - -##### Main Colemak-DHm Layer - -| | | | | | | | | | | | | -| ---- |:----:| :---:|:---:|:-----:|:----:|:-----:|:-----:|:-----:|:----:|:----:| ----:| -| Esc | Q | W | F | P | B | J | L | U | Y | ;: | Bksp | -| Tab | A | R | S | T | G | M | N | E | I | O | Enter| -| Shft | Z | X | C | D | V | K | H | ,< | .> | /? | Shft | -| Fn | Ctrl | Alt | GUI | Lower | Bksp | Space | Raise | Shift | MENU | Ctrl | Fn2 | - -##### Function Layer -Activated when `fn` held in the above `qwerty` layer. - -| | | | | | | | | | | | | -| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| -| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | -| 1! | 2" | 3£ | 4$ | 5% | 6^ | 7& | 8* | 9( | 0) | ~ |INSERT| -| Shift | \| | `¬ | #~ | * | -_ | =+ | \| | [{ | ]} | '@ |Shift | -| Fn | Ctrl | Alt | GUI |Lower | Bksp |Space |Mouse | MENU | Alt | Ctrl | Fn2 | - -##### Lower Layer -Activated when `Lower` is held in the above `qwerty` layer. - -* Numbers are along the top row, their shifted counterparts are on row 2. -* WrdBks: `backspace` with `ctrl` applied. I.e. delete a word. -* WrdDel: `delete` with `ctrl` applied. I.e. forward delete a word. - -| | | | | | | | | | | | | -| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| -| 1! | 2" | 3£ | 4$ | 5% | 6^ | 7& | 8* | 9( | 0) | DEL | Bksp | -| ! | " | £ | $ | % | ^ | & | * | ( | ) |WrdDel|WrdBks| -| Shift | \| | `¬ | #~ | '@ | -_ | =+ | #~ | [{ | ]} | '@ |Shift | -| | | | |Lower | Del |Space | | Next | Vol- | Vol+ | Play | - -##### Raise Layer -Activated when `Raise` is held in the above `qwerty` layer. - -* Preferred layer for typing brackets. -* Allows for cursor navigation to be used solely with the right hand. -* WRDSEL: Select the word where the cursor is. -* |< and >|: Apply `ctrl` to `left` and `right` respectively for word jumping. - -| | | | | | | | | | | | | -| :---: |:----:| :---:| :---:| :---:| :---:| :---: | :---:| :---:| :---:| :---: | :---:| -| ` | |WRDSEL| [ | ] | | | PGUP | HOME |PGDOWN| |PRNTSC| -| ` | | | ( | ) | | | HOME | UP | END | |ZOOM +| -| | | | { | } | ||<| LEFT | DOWN |RIGHT |>||ZOOM -| -| Mouse | | | | | Alt | Enter |Raise | | | | | - -##### Lower + Raise -Activated when `Lower` and `Raise` are held together in the above `qwerty` layer. - -* Audio controls in the same position as cursor keys from the `Raise` layer. -* ????: Runs a macro for outputting a text string. Do not use this store passwords. -* Reset: Enter bootloader for flashing firmware to the keyboard. -* CAPS: Toggle caps lock. -* Macro functions: Allows recording of macros. To start recording the macro, press either REC1 or REC2. -To finish the recording, press STOP. To replay the macro, press either PLAY1 or PLAY2. -* MAC: Toggle MAC OS extensions to layers. This allows MLWR to be enabled with LOWER, -MRSE with RAISE, MFNC with FUNC and MFNC2 with FUNC2 respectively. - -| | | | | | | | | | | | | -| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|:-------:| -| ???? | Reset|Qwerty| | | REC1 | REC2 | | | | | Del | -| CAPS | | | | | PLAY1|PLAY2 | Mute | Vol+ | Play | | Qwerty | -| MAC | | | | | STOP1|STOP2 | Prev | Vol- | Next | | Colemak | -| | | | | | | | | DYN | | | | - -##### Function 2 Layer -Activated when `fn` held in the above `qwerty` layer. -* WRDSEL: Select the word where the cursor is. -* LNDEL: Delete the line where the cursor is. -* LNSEL: Select the line where the cursor is. -* DUP: Duplicate the selected text. -* LNJOIN: Join the line where the cursor is with the following line. -* MODE: Print either `PC` or `OSX` depending on what layer mode is active. - -| | | | | | | | | | | | | -| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| -| | |WRDSEL| | | | LNDEL| | | | | | -| | | LNSEL| DUP | | | | |LNJOIN| | | | -| | UNDO | CUT | COPY | PASTE| | | | | | | MODE | -| | | | | | | | | | | | | - -##### Mouse Layer -Activated when `fn` and `raise` held together. - -| | | | | | | | | | | | | -| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| -| ESC | | | | | | W_L | W_UP | BTN3 | W_DWN| W_R | | -| ACC0 | ACC1 | ACC2 | | | | | BTN1 | UP | BTN2 | | | -| ACC0 | ACC1 | ACC2 | | | | | LEFT | DOWN | RIGHT| | | -| | | | | | | | | | | | | - -##### Number Pad Layout -Activated when holding `Esc` key. - -| | | | | | | | | | | | | -| :---: | :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| -| | | | | | |NMLOCK| 7 | 8 | 9 | / | | -| | | | | | | | 4 | 5 | 6 | * | | -| | | | | | | | 1 | 2 | 3 | + | | -| | | | | | | | 0 | . | , | - | | +| Tab/Esc | Q/Esc | D | R | W | B/SYM | J/SYM | F | U | P | BSPC | BSPC | +| Tab/Shift | A | S | H | T/EX | G | Y | N | E | O | I/Enter | Enter| +| Shft | Z | X | M | C | V | K | L | Spc/, | Spc/. | / | Up/Right | +| FN | Ctrl | OS | Alt |Lower | Spc/Enter |Spc/Enter |Raise | SS| Clip | CopyPaste | Dn/Left | + +SYM - Symbols layer on hold +FN - Function layer on hold +EX - Extras layer on hold +Clip - Macro to my clipboard app (Ditto) +SS - Greenshot screenshot region + +##### Will add the other layers as I find time \ No newline at end of file From 486b4e9ce7f7011e22085613b1865533ab8fdc09 Mon Sep 17 00:00:00 2001 From: miketronic Date: Thu, 20 Apr 2023 14:49:10 -0500 Subject: [PATCH 11/61] Removed = SAFE_RANGE at line 15 Can I remove and edit here, or do I need another PR? --- users/miketronic/miketronic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/miketronic/miketronic.h b/users/miketronic/miketronic.h index 9b6721995dbb..7235634a1a95 100644 --- a/users/miketronic/miketronic.h +++ b/users/miketronic/miketronic.h @@ -13,7 +13,7 @@ enum layer_names { - _WM = SAFE_RANGE, + _WM, _QW, _LOWER, _RAISE, @@ -57,4 +57,4 @@ enum layer_names { #define XXXX KC_NO #define XXXXXXX KC_NO #define XXXXXXXX KC_NO -#define ________ KC_TRNS \ No newline at end of file +#define ________ KC_TRNS From 3c90a700565e6f888c015b576f8df367864aaca8 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 21 Apr 2023 07:34:48 -0500 Subject: [PATCH 12/61] Delete keyboards/hazel/satpad directory --- keyboards/hazel/satpad/config.h | 1 - keyboards/hazel/satpad/info.json | 82 ------ .../hazel/satpad/keymaps/default/config.h | 19 -- .../hazel/satpad/keymaps/default/keymap.c | 62 ----- .../hazel/satpad/keymaps/default/rules.mk | 17 -- .../miketronic/.vscode/c_cpp_properties.json | 18 -- .../keymaps/miketronic/.vscode/launch.json | 24 -- .../keymaps/miketronic/.vscode/settings.json | 37 --- .../hazel/satpad/keymaps/miketronic/keymap.c | 236 ------------------ keyboards/hazel/satpad/rules.mk | 1 - keyboards/hazel/satpad/satpad.c | 24 -- 11 files changed, 521 deletions(-) delete mode 100644 keyboards/hazel/satpad/config.h delete mode 100644 keyboards/hazel/satpad/info.json delete mode 100644 keyboards/hazel/satpad/keymaps/default/config.h delete mode 100644 keyboards/hazel/satpad/keymaps/default/keymap.c delete mode 100644 keyboards/hazel/satpad/keymaps/default/rules.mk delete mode 100644 keyboards/hazel/satpad/keymaps/miketronic/.vscode/c_cpp_properties.json delete mode 100644 keyboards/hazel/satpad/keymaps/miketronic/.vscode/launch.json delete mode 100644 keyboards/hazel/satpad/keymaps/miketronic/.vscode/settings.json delete mode 100644 keyboards/hazel/satpad/keymaps/miketronic/keymap.c delete mode 100644 keyboards/hazel/satpad/rules.mk delete mode 100644 keyboards/hazel/satpad/satpad.c diff --git a/keyboards/hazel/satpad/config.h b/keyboards/hazel/satpad/config.h deleted file mode 100644 index 7b9637ef9c2c..000000000000 --- a/keyboards/hazel/satpad/config.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once \ No newline at end of file diff --git a/keyboards/hazel/satpad/info.json b/keyboards/hazel/satpad/info.json deleted file mode 100644 index 3caad7bb2e05..000000000000 --- a/keyboards/hazel/satpad/info.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "keyboard_name": "SatPad", - "manufacturer": "jasonhazel", - "usb": { - "vid": "0x4A48", - "pid": "0x7370", - "device_version": "0.0.1" - }, - "matrix_size": { - "cols": 6, - "rows": 7 - }, - "diode_direction": "COL2ROW", - "bootloader": "caterina", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "mousekey": true, - "nkro": false, - "encoder": true - }, - "matrix_pins": { - "rows": ["B3", "B2", "B6", "D3", "D2", "D4", "E6"], - "cols": ["F4", "F5", "F6", "F7", "B1", "D7"] - }, - "encoder": { - "rotary": [ - { "pin_a": "B4", "pin_b": "B5" } - ] - }, - "bootmagic": { - "enabled": true, - "matrix": [0,0] - }, - "processor": "atmega32u4", - "url": "https://github.com/jasonhazel/satpad", - "layouts": { - "LAYOUT": { - "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 1], "x": 1, "y": 0 }, - { "matrix": [0, 2], "x": 2, "y": 0 }, - { "matrix": [0, 3], "x": 3, "y": 0 }, - { "matrix": [0, 4], "x": 4, "y": 0 }, - - { "matrix": [3, 4], "x": 6, "y": 0 }, - { "matrix": [3, 3], "x": 7, "y": 0 }, - { "matrix": [3, 2], "x": 8, "y": 0 }, - { "matrix": [3, 1], "x": 9, "y": 0 }, - { "matrix": [3, 0], "x": 10, "y": 0 }, - - { "matrix": [1, 0], "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1, "y": 1 }, - { "matrix": [1, 2], "x": 2, "y": 1 }, - { "matrix": [1, 3], "x": 3, "y": 1 }, - { "matrix": [1, 4], "x": 4, "y": 1 }, - - { "matrix": [4, 4], "x": 6, "y": 1 }, - { "matrix": [4, 3], "x": 7, "y": 1 }, - { "matrix": [4, 2], "x": 8, "y": 1 }, - { "matrix": [4, 1], "x": 9, "y": 1 }, - { "matrix": [4, 0], "x": 10, "y": 1 }, - - { "matrix": [2, 0], "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1, "y": 2 }, - { "matrix": [2, 2], "x": 2, "y": 2 }, - { "matrix": [2, 3], "x": 3, "y": 2 }, - { "matrix": [2, 4], "x": 4, "y": 2 }, - - { "matrix": [6, 5], "x": 5, "y": 2 }, - - { "matrix": [5, 4], "x": 6, "y": 2 }, - { "matrix": [5, 3], "x": 7, "y": 2 }, - { "matrix": [5, 2], "x": 8, "y": 2 }, - { "matrix": [5, 1], "x": 9, "y": 2 }, - { "matrix": [5, 0], "x": 10, "y": 2 } - - ] - } - } -} \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/config.h b/keyboards/hazel/satpad/keymaps/default/config.h deleted file mode 100644 index c6b2abb79748..000000000000 --- a/keyboards/hazel/satpad/keymaps/default/config.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - - -#define TAPPING_TERM 200 -#define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD - -#define ONESHOT_TAP_TOGGLE 10 -#define ONESHOT_TIMEOUT 500 -#define COMBO_TERM 200 - -#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD - -// disable shit -#define NO_MUSIC_MODE - -#undef LOCKING_SUPPORT_ENABLE -#undef LOCKING_RESYNC_ENABLE \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/keymap.c b/keyboards/hazel/satpad/keymaps/default/keymap.c deleted file mode 100644 index 5f863022f2ee..000000000000 --- a/keyboards/hazel/satpad/keymaps/default/keymap.c +++ /dev/null @@ -1,62 +0,0 @@ -#include QMK_KEYBOARD_H - -enum layers { - _BASE, - LAYER_LENGTH -}; - -enum combos { - COMBO_SPACE, - COMBO_BACKSP, - COMBO_ENTER, - COMBO_TAB, - COMBO_ESC, - COMBO_LENGTH -}; - -uint16_t COMBO_LEN = COMBO_LENGTH; -const uint16_t PROGMEM combo_space[] = { KC_N, KC_M, COMBO_END }; -const uint16_t PROGMEM combo_backspace[] = { KC_O, KC_P, COMBO_END }; -const uint16_t PROGMEM combo_enter[] = { KC_L, KC_QUOT, COMBO_END }; -const uint16_t PROGMEM combo_tab[] = { KC_A, KC_S, COMBO_END }; -const uint16_t PROGMEM combo_esc[] = { KC_Q, KC_W, COMBO_END }; - -combo_t key_combos[] = { - [COMBO_SPACE] = COMBO(combo_space, KC_SPC), - [COMBO_BACKSP] = COMBO(combo_backspace, KC_BSPC), - [COMBO_ENTER] = COMBO(combo_enter, KC_ENT), - [COMBO_TAB] = COMBO(combo_tab, KC_TAB), - [COMBO_ESC] = COMBO(combo_esc, KC_ESC) -}; - -enum tapdances { - TD_QESC, - TAPDANCE_LENGTH -}; - -tap_dance_action_t tap_dance_actions[] = { - [TD_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), -}; - -const key_override_t **key_overrides = (const key_override_t *[]) { - NULL -}; - -#define QESC TD(TD_QESC) -#define BSFT LSFT_T(KC_B) -#define VCTL LCTL_T(KC_V) -#define CGUI LGUI_T(KC_C) -#define XALT LALT_T(KC_X) - -#define ______ KC_NO -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ - KC_Z, XALT, CGUI, VCTL, BSFT, KC_SPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH - ), -}; - -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_BASE] = { ENCODER_CCW_CW(KC_DOWN, KC_UP) }, -}; \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/rules.mk b/keyboards/hazel/satpad/keymaps/default/rules.mk deleted file mode 100644 index fb4dbb68160f..000000000000 --- a/keyboards/hazel/satpad/keymaps/default/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -GRAVE_ESC_ENABLE = no -SPACE_CADET_ENABLE = no - -CAPS_WORD_ENABLE = yes -KEY_OVERRIDE_ENABLE = yes -COMBO_ENABLE = yes -TAP_DANCE_ENABLE = yes -OLED_ENABLE = yes -OLED_DRIVER = SSD1306 -ENCODER_MAP_ENABLE = yes - -# OLED WIDGETS - -# WPM_ENABLE = no -# KEYCOUNT_ENABLE = yes -# KEYLOG_ENABLE = no -# KEYLOG_DEBUG = no \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/.vscode/c_cpp_properties.json b/keyboards/hazel/satpad/keymaps/miketronic/.vscode/c_cpp_properties.json deleted file mode 100644 index cea4d3f4e0ee..000000000000 --- a/keyboards/hazel/satpad/keymaps/miketronic/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "configurations": [ - { - "name": "windows-gcc-x64", - "includePath": [ - "${workspaceFolder}/**" - ], - "compilerPath": "gcc", - "cStandard": "${default}", - "cppStandard": "${default}", - "intelliSenseMode": "windows-gcc-x64", - "compilerArgs": [ - "" - ] - } - ], - "version": 4 -} \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/.vscode/launch.json b/keyboards/hazel/satpad/keymaps/miketronic/.vscode/launch.json deleted file mode 100644 index 4b4c43febeb1..000000000000 --- a/keyboards/hazel/satpad/keymaps/miketronic/.vscode/launch.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "C/C++ Runner: Debug Session", - "type": "cppdbg", - "request": "launch", - "args": [], - "stopAtEntry": false, - "externalConsole": true, - "cwd": "c:/Users/mbarnoski/qmk_firmware/keyboards/hazel/satpad/keymaps/miketronic", - "program": "c:/Users/mbarnoski/qmk_firmware/keyboards/hazel/satpad/keymaps/miketronic/build/Debug/outDebug", - "MIMode": "gdb", - "miDebuggerPath": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - } - ] -} \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/.vscode/settings.json b/keyboards/hazel/satpad/keymaps/miketronic/.vscode/settings.json deleted file mode 100644 index 450db55faaa2..000000000000 --- a/keyboards/hazel/satpad/keymaps/miketronic/.vscode/settings.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "C_Cpp_Runner.cCompilerPath": "gcc", - "C_Cpp_Runner.cppCompilerPath": "g++", - "C_Cpp_Runner.debuggerPath": "gdb", - "C_Cpp_Runner.cStandard": "", - "C_Cpp_Runner.cppStandard": "", - "C_Cpp_Runner.msvcBatchPath": "C:/Program Files/Microsoft Visual Studio/VR_NR/Community/VC/Auxiliary/Build/vcvarsall.bat", - "C_Cpp_Runner.useMsvc": false, - "C_Cpp_Runner.warnings": [ - "-Wall", - "-Wextra", - "-Wpedantic", - "-Wshadow", - "-Wformat=2", - "-Wconversion", - "-Wnull-dereference", - "-Wsign-conversion" - ], - "C_Cpp_Runner.enableWarnings": true, - "C_Cpp_Runner.warningsAsError": false, - "C_Cpp_Runner.compilerArgs": [], - "C_Cpp_Runner.linkerArgs": [], - "C_Cpp_Runner.includePaths": [], - "C_Cpp_Runner.includeSearch": [ - "*", - "**/*" - ], - "C_Cpp_Runner.excludeSearch": [ - "**/build", - "**/build/**", - "**/.*", - "**/.*/**", - "**/.vscode", - "**/.vscode/**" - ], - "C_Cpp_Runner.useAddressSanitizer": false -} \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c deleted file mode 100644 index b9909b1eb2fe..000000000000 --- a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c +++ /dev/null @@ -1,236 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B -// SPDX-License-Identifier: GPL-2.0+ - -#include QMK_KEYBOARD_H -#include "miketronic.h" - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* WORKMAN - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ - * │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ - * │SHIFT│ │ ┃ EX ┃ │ │ ┃ ┃ │ │ENTER│ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ / │ - * │ FN │ CTRL│ OS │ ALT │LOWER│ │RAISE│ ALT │ , │ . │ │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - * - */ - - [_WM] = LAYOUT_3x11_wrapper ( - _____________WORKMAN_311_001_L_____________, _____________WORKMAN_311_001_R_____________, - _____________WORKMAN_311_002_L_____________, _____________WORKMAN_311_002_R_____________, - _____________WORKMAN_311_003_L_____________, _____________WORKMAN_311_003_R_____________ - ), - - [_QW] = LAYOUT_3x11_wrapper ( - _____________WORKMAN_311_001_L_____________, _____________WORKMAN_311_001_R_____________, - _____________WORKMAN_311_002_L_____________, _____________WORKMAN_311_002_R_____________, - _____________WORKMAN_311_003_L_____________, _____________WORKMAN_311_003_R_____________ - ), - - - /* LOWER - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ () │ [] │ /\ │ │ │ │ /\ │ 7 │ 8 │ 9 │ 0 │ - * │ │ │ │ │ │ │ │ │ │ │SHIFT│ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ @ # │ & % │ ┃ ┃ │ │ [] ┃ 4 ┃ 5 │ 6 │ DEL │ - * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │SHIFT│ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ 1 │ 2 │ 3 │ . │ - * │ │ │ │ │LOWER│ │ │ │ │ │ ENT │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - * - */ - - [_LOWER] = LAYOUT_3x11_wrapper ( - TD_XX, TD_YY, TD_SL, XXXX, XXXX, TD_SL, KC_7, KC_8, KC_9, MT(MOD_RSFT, KC_0), - TD_ATH, TD_PRAM, _______, XXXX, XXXX, TD_YY, KC_4, KC_5, KC_6, MT(MOD_RSFT, KC_DEL), - XXXX, XXXX, XXXX, XXXX, _______, KC_ENT, _______, KC_1, KC_2, KC_3, TD_DENT - ), - - - /* RAISE - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ BOOT│DEBUG│ │ │ MAKE│ │ /\ │ F7 │ F8 │ F9 │ F10 │ - * │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ │ RGB │ RGB ┃ RGB ┃ RGB │ │ _ ┃ F4 ┃ F5 │ F6 │ F11 │ - * │ │ TOG │ MOD ┃ HUI ┃ HUD │ │ - ┃ ┃ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ │ RGB │ RGB │ RGB │ RGB │ │ │ F1 │ F2 │ F3 │ F12 │ - * │ │ SAI │ SAD │ VAI │ VAD │ │RAISE│ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - * - */ - - [_RAISE] = LAYOUT_3x11_wrapper ( - QK_BOOT, DB_TOGG, _______, _______, MAKE, TD_SL, KC_F7, KC_F8, KC_F9, KC_F10, - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, TD_UMIN, KC_F4, KC_F5, KC_F6, KC_F11, - _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_ENT, _______, KC_F1, KC_F2, KC_F3, KC_F12 - ), - - - - /* EXTRAS - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ ! │ │ │ │ │ │ │ /\ │ [ │ ] │ ; │ - * │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ │ │ ┃EXTRA┃ │ │ ┃ ┃ ( │ ) │ ' │ - * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ , │ . │ ? │ - * │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - */ - - [_EX] = LAYOUT_3x11_wrapper ( - KC_EXLM, _______, _______, _______, _______, _______, TD_SL, KC_LBRC, KC_RBRC, KC_SCLN, - KC_LSFT, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_QUOT, - _______, _______, _______, _______, _______, KC_ENT, _______, _______, KC_COMM, KC_DOT, KC_QUES -), - - - - /* FUNCTION - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │COPY │CLIP │ SS │ │ │ │ │ /\ │ UP │ │ DEL │ - * │PASTE│ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ TAB │ M05 │ M06 ┃ M07 ┃ M08 │ │ ┃ LEFT┃ DOWN│RIGHT│ UP │ - * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │RIGHT│ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ │ M01 │ M02 │ M03 │ M04 │ │ │ ? │ , │ . │ DOWN│ - * │ FN │ │ │ │ │ │ │ ! │ │ │ LEFT│ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - */ - - [_FN] = LAYOUT_3x11_wrapper ( - TD_CP, CLIP, SS, _______, _______, TD_SL, _______, KC_UP, _______, KC_DEL, - KC_TAB, M05, M06, M07, M08, _______, KC_LEFT, KC_DOWN, KC_RGHT, TD_UR, - _______, M01, M02, M03, M04, KC_ENT, _______, TD_QEXC, KC_COMM, KC_DOT, TD_DL - ), - - - - /* SYMBOLS - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ $ │ ^ │ < │ > │ │ │ │ | │ [ │ ] │ - │ - * │ │ │ │ │ SYMB│ │ SYMB│ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ % │ : │ ; ┃ + ┃ = │ │ ┃ ┃ ( │ ) │ _ │ - * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ & │ ' │ " │ * │ # │ │ ! │ ? │ / │ \ │ @ │ - * │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - */ - - [_SYMB] = LAYOUT_3x11_wrapper ( - KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXX, XXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, - KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, - KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_ENT, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT - ), - - - -}; - - -void matrix_init_user(void) { - // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values - // set num lock on at start (for numonly layer to work) - if (!host_keyboard_led_state().num_lock) { - tap_code(KC_NUM_LOCK); - } -} - -void matrix_scan_user(void) { -} - -/* -void keyboard_pre_init_user(void) { - // Set our LED pins as output - setPinOutput(D5); - setPinOutput(B0); -} - -bool led_update_user(led_t led_state) { - writePin(D5, !led_state.num_lock); - writePin(B0, !led_state.caps_lock); - return false; // prevent keyboard from processing state -} -*/ - -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_WM] = { ENCODER_CCW_CW(LCTL(KC_V), LCTL(KC_C)) }, - [_QW] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_LOWER] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_RAISE] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_EX] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_FN] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) }, - [_SYMB] = { ENCODER_CCW_CW(KC_SPC, KC_ENT) } -}; - - -oled_rotation_t oled_init_user(oled_rotation_t rotation){ - return OLED_ROTATION_270; -} - -/* -bool oled_task_user(void) { - uint8_t modifiers = get_mods() | get_oneshot_mods(); - - oled_set_cursor(0, 11); - oled_write_P(PSTR("SHIFT"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); - oled_write_P(PSTR("CNTRL"), (modifiers & MOD_MASK_CTRL)); - - return true; -} -*/ - -#ifdef OLED_ENABLE -bool oled_task_user(void) { - // Host Keyboard Layer Status - oled_write_P(PSTR("LAYER\n-----\n"), false); - - switch (get_highest_layer(layer_state)) { - case _LOWER: - oled_write_P(PSTR("LOWER"), false); - break; - case _RAISE: - oled_write_P(PSTR("RAISE"), false); - break; - case _EX: - oled_write_P(PSTR("EXTRA"), false); - break; - case _FN: - oled_write_P(PSTR("FUNCT"), false); - break; - case _WM: - oled_write_P(PSTR("WMAN"), false); - break; - case _SYMB: - oled_write_P(PSTR("SYMB"), false); - break; - default: - // Or use the write_ln shortcut over adding '\n' to the end of your string - oled_write_ln_P(PSTR("HOME"), false); - } - -// Host Keyboard LED Status - // led_t led_state = host_keyboard_led_state(); - // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - return false; -} -#endif - diff --git a/keyboards/hazel/satpad/rules.mk b/keyboards/hazel/satpad/rules.mk deleted file mode 100644 index 978dae94bbb4..000000000000 --- a/keyboards/hazel/satpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/hazel/satpad/satpad.c b/keyboards/hazel/satpad/satpad.c deleted file mode 100644 index 238a1502eec2..000000000000 --- a/keyboards/hazel/satpad/satpad.c +++ /dev/null @@ -1,24 +0,0 @@ -#include QMK_KEYBOARD_H -#include - -#ifdef OLED_ENABLE - oled_rotation_t oled_init_kb(oled_rotation_t rotation) { - return OLED_ROTATION_270; - }; - - - bool oled_task_kb(void) { - if (oled_task_user()) { - oled_set_cursor(0,0); - oled_write_P(PSTR("SAT PAD"), false); - uint8_t modifiers = get_mods() | get_oneshot_mods(); - - oled_set_cursor(1,14); - oled_write_P(PSTR("S"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); - oled_write_P(PSTR("C"), (modifiers & MOD_MASK_CTRL)); - oled_write_P(PSTR("A"), (modifiers & MOD_MASK_ALT)); - oled_write_P(PSTR("G"), (modifiers & MOD_MASK_GUI)); - } - return true; - }; -#endif \ No newline at end of file From 0fc17bdf54eec417a4377e901a5d5a310ce503cc Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 21 Apr 2023 07:40:42 -0500 Subject: [PATCH 13/61] userspace update --- .gitignore | 3 ++ .../miketronic/.vscode/c_cpp_properties.json | 18 +++++++++ users/miketronic/.vscode/launch.json | 24 ++++++++++++ users/miketronic/.vscode/settings.json | 37 +++++++++++++++++++ users/miketronic/miketronic.h | 2 +- 5 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 users/miketronic/.vscode/c_cpp_properties.json create mode 100644 users/miketronic/.vscode/launch.json create mode 100644 users/miketronic/.vscode/settings.json diff --git a/.gitignore b/.gitignore index 5fdf770d31cb..7c1a02fbf6de 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,9 @@ quantum/version.h /keyboards/**/kb.h /keyboards/**/kb.c +# keyboards +/keyboards/hazel/satpad + # Eclipse/PyCharm/Other IDE Settings *.iml .browse.VC.db* diff --git a/users/miketronic/.vscode/c_cpp_properties.json b/users/miketronic/.vscode/c_cpp_properties.json new file mode 100644 index 000000000000..cea4d3f4e0ee --- /dev/null +++ b/users/miketronic/.vscode/c_cpp_properties.json @@ -0,0 +1,18 @@ +{ + "configurations": [ + { + "name": "windows-gcc-x64", + "includePath": [ + "${workspaceFolder}/**" + ], + "compilerPath": "gcc", + "cStandard": "${default}", + "cppStandard": "${default}", + "intelliSenseMode": "windows-gcc-x64", + "compilerArgs": [ + "" + ] + } + ], + "version": 4 +} \ No newline at end of file diff --git a/users/miketronic/.vscode/launch.json b/users/miketronic/.vscode/launch.json new file mode 100644 index 000000000000..172013757420 --- /dev/null +++ b/users/miketronic/.vscode/launch.json @@ -0,0 +1,24 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "C/C++ Runner: Debug Session", + "type": "cppdbg", + "request": "launch", + "args": [], + "stopAtEntry": false, + "externalConsole": true, + "cwd": "c:/Users/mbarnoski/qmk_firmware/users/miketronic", + "program": "c:/Users/mbarnoski/qmk_firmware/users/miketronic/build/Debug/outDebug", + "MIMode": "gdb", + "miDebuggerPath": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + } + ] +} \ No newline at end of file diff --git a/users/miketronic/.vscode/settings.json b/users/miketronic/.vscode/settings.json new file mode 100644 index 000000000000..bfd774548678 --- /dev/null +++ b/users/miketronic/.vscode/settings.json @@ -0,0 +1,37 @@ +{ + "C_Cpp_Runner.cCompilerPath": "gcc", + "C_Cpp_Runner.cppCompilerPath": "g++", + "C_Cpp_Runner.debuggerPath": "gdb", + "C_Cpp_Runner.cStandard": "", + "C_Cpp_Runner.cppStandard": "", + "C_Cpp_Runner.msvcBatchPath": "", + "C_Cpp_Runner.useMsvc": false, + "C_Cpp_Runner.warnings": [ + "-Wall", + "-Wextra", + "-Wpedantic", + "-Wshadow", + "-Wformat=2", + "-Wconversion", + "-Wnull-dereference", + "-Wsign-conversion" + ], + "C_Cpp_Runner.enableWarnings": true, + "C_Cpp_Runner.warningsAsError": false, + "C_Cpp_Runner.compilerArgs": [], + "C_Cpp_Runner.linkerArgs": [], + "C_Cpp_Runner.includePaths": [], + "C_Cpp_Runner.includeSearch": [ + "*", + "**/*" + ], + "C_Cpp_Runner.excludeSearch": [ + "**/build", + "**/build/**", + "**/.*", + "**/.*/**", + "**/.vscode", + "**/.vscode/**" + ], + "C_Cpp_Runner.useAddressSanitizer": false +} \ No newline at end of file diff --git a/users/miketronic/miketronic.h b/users/miketronic/miketronic.h index 9b6721995dbb..ce8ee72fe242 100644 --- a/users/miketronic/miketronic.h +++ b/users/miketronic/miketronic.h @@ -13,7 +13,7 @@ enum layer_names { - _WM = SAFE_RANGE, + _WM, _QW, _LOWER, _RAISE, From 9eed50532a2ed6bd6d3fcb3b305eeaf6bafa10b4 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 21 Apr 2023 09:44:26 -0500 Subject: [PATCH 14/61] Update .gitignore --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7c1a02fbf6de..5fdf770d31cb 100644 --- a/.gitignore +++ b/.gitignore @@ -40,9 +40,6 @@ quantum/version.h /keyboards/**/kb.h /keyboards/**/kb.c -# keyboards -/keyboards/hazel/satpad - # Eclipse/PyCharm/Other IDE Settings *.iml .browse.VC.db* From 762aa0aa63942a6aee35e88047c6a33934376c57 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 21 Apr 2023 09:45:18 -0500 Subject: [PATCH 15/61] Delete users/miketronic/.vscode directory --- .../miketronic/.vscode/c_cpp_properties.json | 18 --------- users/miketronic/.vscode/launch.json | 24 ------------ users/miketronic/.vscode/settings.json | 37 ------------------- 3 files changed, 79 deletions(-) delete mode 100644 users/miketronic/.vscode/c_cpp_properties.json delete mode 100644 users/miketronic/.vscode/launch.json delete mode 100644 users/miketronic/.vscode/settings.json diff --git a/users/miketronic/.vscode/c_cpp_properties.json b/users/miketronic/.vscode/c_cpp_properties.json deleted file mode 100644 index cea4d3f4e0ee..000000000000 --- a/users/miketronic/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "configurations": [ - { - "name": "windows-gcc-x64", - "includePath": [ - "${workspaceFolder}/**" - ], - "compilerPath": "gcc", - "cStandard": "${default}", - "cppStandard": "${default}", - "intelliSenseMode": "windows-gcc-x64", - "compilerArgs": [ - "" - ] - } - ], - "version": 4 -} \ No newline at end of file diff --git a/users/miketronic/.vscode/launch.json b/users/miketronic/.vscode/launch.json deleted file mode 100644 index 172013757420..000000000000 --- a/users/miketronic/.vscode/launch.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "C/C++ Runner: Debug Session", - "type": "cppdbg", - "request": "launch", - "args": [], - "stopAtEntry": false, - "externalConsole": true, - "cwd": "c:/Users/mbarnoski/qmk_firmware/users/miketronic", - "program": "c:/Users/mbarnoski/qmk_firmware/users/miketronic/build/Debug/outDebug", - "MIMode": "gdb", - "miDebuggerPath": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - } - ] -} \ No newline at end of file diff --git a/users/miketronic/.vscode/settings.json b/users/miketronic/.vscode/settings.json deleted file mode 100644 index bfd774548678..000000000000 --- a/users/miketronic/.vscode/settings.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "C_Cpp_Runner.cCompilerPath": "gcc", - "C_Cpp_Runner.cppCompilerPath": "g++", - "C_Cpp_Runner.debuggerPath": "gdb", - "C_Cpp_Runner.cStandard": "", - "C_Cpp_Runner.cppStandard": "", - "C_Cpp_Runner.msvcBatchPath": "", - "C_Cpp_Runner.useMsvc": false, - "C_Cpp_Runner.warnings": [ - "-Wall", - "-Wextra", - "-Wpedantic", - "-Wshadow", - "-Wformat=2", - "-Wconversion", - "-Wnull-dereference", - "-Wsign-conversion" - ], - "C_Cpp_Runner.enableWarnings": true, - "C_Cpp_Runner.warningsAsError": false, - "C_Cpp_Runner.compilerArgs": [], - "C_Cpp_Runner.linkerArgs": [], - "C_Cpp_Runner.includePaths": [], - "C_Cpp_Runner.includeSearch": [ - "*", - "**/*" - ], - "C_Cpp_Runner.excludeSearch": [ - "**/build", - "**/build/**", - "**/.*", - "**/.*/**", - "**/.vscode", - "**/.vscode/**" - ], - "C_Cpp_Runner.useAddressSanitizer": false -} \ No newline at end of file From 38ba4f77eceab93e9fb5bc7e7d5ce81960434d04 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 21 Apr 2023 09:47:52 -0500 Subject: [PATCH 16/61] Update config.h --- users/miketronic/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/users/miketronic/config.h b/users/miketronic/config.h index c528351e8e2d..3ad56ac4df05 100644 --- a/users/miketronic/config.h +++ b/users/miketronic/config.h @@ -41,10 +41,6 @@ #endif - - - - //////////////// // For SATPAD // //////////////// From d295161e3fe043ebc1e1be5b944956a2f493ef20 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 21 Apr 2023 09:49:03 -0500 Subject: [PATCH 17/61] Update miketronic.h --- users/miketronic/miketronic.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/users/miketronic/miketronic.h b/users/miketronic/miketronic.h index 7235634a1a95..f63a403f2958 100644 --- a/users/miketronic/miketronic.h +++ b/users/miketronic/miketronic.h @@ -46,10 +46,10 @@ enum layer_names { #define SLSHFT MT(MOD_RSFT, KC_SLSH) // Tap for Slash, hold for Shift // MISC -#define CALTDEL LCTL(LALT(KC_DEL)) // Ctrl Alt Del -#define TSKMGR LCTL(LSFT(KC_ESC)) // Task Manager -#define CLIP LCTL(LALT(KC_Q)) // Clipboard -#define SS LCTL(LALT(KC_G)) // Greenshot region +#define CALTDEL LCTL(LALT(KC_DEL)) // Ctrl Alt Del +#define TSKMGR LCTL(LSFT(KC_ESC)) // Task Manager +#define CLIP LCTL(LALT(KC_Q)) // Clipboard (Ditto) +#define SS LCTL(LALT(KC_G)) // Greenshot region #define NUM LSFT(KC_3) #define AT LSFT(KC_2) #define COPY LCTL(KC_C) From 0381dcc94298d049035e431a1339e66232211d23 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 21 Apr 2023 09:51:00 -0500 Subject: [PATCH 18/61] Update rules.mk --- users/miketronic/rules.mk | 88 +++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/users/miketronic/rules.mk b/users/miketronic/rules.mk index 3c217d9073e1..abd196795f87 100644 --- a/users/miketronic/rules.mk +++ b/users/miketronic/rules.mk @@ -24,66 +24,66 @@ endif # Satpad ifeq ($(strip $(KEYBOARD)), hazel/satpad) - BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite - MOUSEKEY_ENABLE = yes # Mouse keys - EXTRAKEY_ENABLE = yes # Audio control and System control - NKRO_ENABLE = yes # USB Nkey Rollover + BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite + MOUSEKEY_ENABLE = yes # Mouse keys + EXTRAKEY_ENABLE = yes # Audio control and System control + NKRO_ENABLE = yes # USB Nkey Rollover CAPS_WORD_ENABLE = yes KEY_OVERRIDE_ENABLE = yes TAP_DANCE_ENABLE = yes - OLED_ENABLE = yes - OLED_DRIVER = SSD1306 + OLED_ENABLE = yes + OLED_DRIVER = SSD1306 ENCODER_ENABLE = yes ENCODER_MAP_ENABLE = yes LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. - AUTO_SHIFT_ENABLE = no - UNICODE_ENABLE = no # Unicode - CONSOLE_ENABLE = no # Console for debug - COMMAND_ENABLE = no # Commands for debug and configuration - RGBLIGHT_ENABLE = no - BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality - SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) - AUDIO_ENABLE = no # Audio output on port C6 - MIDI_ENABLE = no # MIDI support - BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID - GRAVE_ESC_ENABLE = no - SPACE_CADET_ENABLE = no - COMBO_ENABLE = no + AUTO_SHIFT_ENABLE = no + UNICODE_ENABLE = no # Unicode + CONSOLE_ENABLE = no # Console for debug + COMMAND_ENABLE = no # Commands for debug and configuration + RGBLIGHT_ENABLE = no + BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality + SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) + AUDIO_ENABLE = no # Audio output on port C6 + MIDI_ENABLE = no # MIDI support + BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID + GRAVE_ESC_ENABLE = no + SPACE_CADET_ENABLE = no + COMBO_ENABLE = no # OLED WIDGETS - # WPM_ENABLE = no - # KEYCOUNT_ENABLE = yes - # KEYLOG_ENABLE = no - # KEYLOG_DEBUG = no + # WPM_ENABLE = no + # KEYCOUNT_ENABLE = yes + # KEYLOG_ENABLE = no + # KEYLOG_DEBUG = no endif # 1upkeyboards/pi40 ifeq ($(strip $(KEYBOARD)), 1upkeyboards/pi40/mit_v1_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 - - AUTO_SHIFT_ENABLE = no - CONSOLE_ENABLE = no # Console for debug - COMMAND_ENABLE = no # Commands for debug and configuration - BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality - RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow - AUDIO_ENABLE = no # Audio output - MOUSEKEY_ENABLE = no # Mouse keys - - RGB_MATRIX_ENABLE = yes - RGB_MATRIX_DRIVER = WS2812 - WS2812_DRIVER = vendor - ENCODER_ENABLE = yes - ENCODER_MAP_ENABLE = yes - OLED_ENABLE = yes - OLED_DRIVER = SSD1306 + 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 + + AUTO_SHIFT_ENABLE = no + CONSOLE_ENABLE = no # Console for debug + COMMAND_ENABLE = no # Commands for debug and configuration + BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality + RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow + AUDIO_ENABLE = no # Audio output + MOUSEKEY_ENABLE = no # Mouse keys + + RGB_MATRIX_ENABLE = yes + RGB_MATRIX_DRIVER = WS2812 + WS2812_DRIVER = vendor + ENCODER_ENABLE = yes + ENCODER_MAP_ENABLE = yes + OLED_ENABLE = yes + OLED_DRIVER = SSD1306 endif From 42e351e4d41f9e5e34fbad75f037f1e8620f0f64 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 21 Apr 2023 09:53:49 -0500 Subject: [PATCH 19/61] Update tapdances.c --- users/miketronic/tapdances.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/users/miketronic/tapdances.c b/users/miketronic/tapdances.c index d032c3035095..5fcf66062b11 100644 --- a/users/miketronic/tapdances.c +++ b/users/miketronic/tapdances.c @@ -7,27 +7,27 @@ tap_dance_action_t tap_dance_actions[] = { - [T_BRC] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), // Tap once for Left Brace, twice for Right Brace - [T_MIN] = ACTION_TAP_DANCE_DOUBLE(KC_MINUS, KC_EQUAL), // Minus, Equals - [T_UMIN] = ACTION_TAP_DANCE_DOUBLE(KC_UNDS, KC_MINS), // Underscore, Minus + [T_BRC] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), // Tap once for Left Brace, twice for Right Brace + [T_MIN] = ACTION_TAP_DANCE_DOUBLE(KC_MINUS, KC_EQUAL), // Minus, Equals + [T_UMIN] = ACTION_TAP_DANCE_DOUBLE(KC_UNDS, KC_MINS), // Underscore, Minus [T_GESC] = ACTION_TAP_DANCE_DOUBLE(KC_GRAVE, KC_ESCAPE), // Grave, Escape - [T_SE] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT), // Space, Enter - [T_MULTDIV] = ACTION_TAP_DANCE_DOUBLE(KC_PAST, KC_PSLS), // Multiply, Divide - [T_UR] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_RGHT), // Up, Right - [T_DL] = ACTION_TAP_DANCE_DOUBLE(KC_DOWN, KC_LEFT), // Down, Left + [T_SE] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_ENT), // Space, Enter + [T_MULTDIV] = ACTION_TAP_DANCE_DOUBLE(KC_PAST, KC_PSLS), // Multiply, Divide + [T_UR] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_RGHT), // Up, Right + [T_DL] = ACTION_TAP_DANCE_DOUBLE(KC_DOWN, KC_LEFT), // Down, Left [T_CP] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_C), LCTL(KC_V)), // Copy, Paste [T_DENT] = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_ENT), // Dot, Enter [T_IENT] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_ENT), // "I", Enter [T_CSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_COMM), // Space, Comma [T_DSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_DOT), // Space, Dot - [T_QEXC] = ACTION_TAP_DANCE_DOUBLE(KC_QUES, KC_EXLM), // ?, ! + [T_QEXC] = ACTION_TAP_DANCE_DOUBLE(KC_QUES, KC_EXLM), // "?", "!" [T_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), // "q", Escape [T_TE] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_ESC), // Tab, Escape [T_20] = ACTION_TAP_DANCE_DOUBLE(KC_2, KC_0), // "2", "0" [T_SL] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_BSLS), // Slash, Backslash [T_XX] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, KC_RPRN), // Left Paren, Right Paren [T_YY] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), // Left Bracket, Right Bracket - [T_ATH] = ACTION_TAP_DANCE_DOUBLE(KC_AT, KC_HASH), - [T_PRAM] = ACTION_TAP_DANCE_DOUBLE(KC_PERC, KC_AMPR) + [T_ATH] = ACTION_TAP_DANCE_DOUBLE(KC_AT, KC_HASH), // "@", "#" + [T_PRAM] = ACTION_TAP_DANCE_DOUBLE(KC_PERC, KC_AMPR) // "%", "&" }; From 5f8eb531ae307c15e8048b6c9b6ff4ac723c2037 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 21 Apr 2023 15:27:46 -0500 Subject: [PATCH 20/61] Update users/miketronic/process_records.h Co-authored-by: Drashna Jaelre --- users/miketronic/process_records.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/miketronic/process_records.h b/users/miketronic/process_records.h index f4aa5b605eae..82782f817d68 100644 --- a/users/miketronic/process_records.h +++ b/users/miketronic/process_records.h @@ -9,7 +9,7 @@ bool process_record_secrets(uint16_t keycode, keyrecord_t *record); bool process_record_keymap(uint16_t keycode, keyrecord_t *record); enum custom_keycodes { - WM = SAFE_RANGE, + WM = QK_USER, QW, MAKE, VERSION, From de3f0398126bb24741878a61792f7d03767511e2 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 21 Apr 2023 15:43:14 -0500 Subject: [PATCH 21/61] Update keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c index 43da42f44434..eeeb8611f1c9 100644 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c @@ -1,7 +1,6 @@ // Copyright 2023 @miketronic -- Mike B // SPDX-License-Identifier: GPL-2.0+ -#include QMK_KEYBOARD_H #include "miketronic.h" From 61cc282ba25cbb3439fdf018bdba042fa54e3833 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 21 Apr 2023 15:48:27 -0500 Subject: [PATCH 22/61] Update users/miketronic/miketronic.c Co-authored-by: Drashna Jaelre --- users/miketronic/miketronic.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/users/miketronic/miketronic.c b/users/miketronic/miketronic.c index 64621a06a998..730a243fef44 100644 --- a/users/miketronic/miketronic.c +++ b/users/miketronic/miketronic.c @@ -26,11 +26,12 @@ __attribute__ ((weak)) layer_state_t layer_state_set_keymap (layer_state_t state return state; } // Init effect for RGB boards only -#ifdef RGB_MATRIX_ENABLE void matrix_init_user(void) { +#ifdef RGB_MATRIX_ENABLE rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); -} #endif + matrix_init_keymap(); +} /* From 0e693163ba225858b82de9952fca5df9c6264b40 Mon Sep 17 00:00:00 2001 From: miketronic Date: Sat, 22 Apr 2023 07:48:52 -0500 Subject: [PATCH 23/61] keymap refactor --- keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c index eeeb8611f1c9..9e3a2a6fa6f9 100644 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c @@ -167,8 +167,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; +#ifndef NUM_DIRECTIONS +# define NUM_DIRECTIONS 2 +#endif + #if defined(ENCODER_MAP_ENABLE) && defined(KEYBOARD_1upkeyboards_pi40_mit_v1_0) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_WM] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) }, [_QW] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_LOWER] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, From d90a33bad4910df1c7225821bb94e1bffba6ed25 Mon Sep 17 00:00:00 2001 From: miketronic Date: Sat, 22 Apr 2023 07:50:26 -0500 Subject: [PATCH 24/61] userspace config refactor --- users/miketronic/config.h | 42 ++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/users/miketronic/config.h b/users/miketronic/config.h index 3ad56ac4df05..64df1e64b2aa 100644 --- a/users/miketronic/config.h +++ b/users/miketronic/config.h @@ -6,18 +6,15 @@ // specific defines example // #if defined(TAP_DANCE_ENABLE) && defined(KEYBOARD_lets_split_rev2) || defined(KEYBOARD_keebio_iris_rev2) - - // Common QMK settings #define DEBOUNCE 10 #if defined(TAP_DANCE_ENABLE) - #define TAP_CODE_DELAY 5 - #define TAP_HOLD_CAPS_DELAY 25 +# define TAP_CODE_DELAY 5 +# define TAP_HOLD_CAPS_DELAY 25 #endif #define ENCODER_RESOLUTION 4 #define MACRO_TIMER 5 - ////////////// // For Pi40 // ////////////// @@ -28,33 +25,32 @@ // https://docs.qmk.fm/#/ChangeLog/20230226?id=quick-tap-term // Tap-hold settings - #if defined(TAP_DANCE_ENABLE) - #define TAPPING_TERM 170 - #define TAPPING_TERM_PER_KEY - #define QUICK_TAP_TERM TAPPING_TERM / 2 - #define QUICK_TAP_TERM_PER_KEY - #endif +# if defined(TAP_DANCE_ENABLE) +# define TAPPING_TERM 170 +# define TAPPING_TERM_PER_KEY +# define QUICK_TAP_TERM TAPPING_TERM / 2 +# define QUICK_TAP_TERM_PER_KEY +# endif -#define PERMISSIVE_HOLD_PER_KEY -#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY +# define PERMISSIVE_HOLD_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY #endif - //////////////// // For SATPAD // //////////////// #if defined(KEYBOARD_hazel_satpad) // Tap-hold settings - #if defined(TAP_DANCE_ENABLE) - #define TAPPING_TERM 170 - #define TAPPING_TERM_PER_KEY - #define QUICK_TAP_TERM TAPPING_TERM / 2 - #define QUICK_TAP_TERM_PER_KEY - #endif - -#define PERMISSIVE_HOLD_PER_KEY -#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY +# if defined(TAP_DANCE_ENABLE) +# define TAPPING_TERM 170 +# define TAPPING_TERM_PER_KEY +# define QUICK_TAP_TERM TAPPING_TERM / 2 +# define QUICK_TAP_TERM_PER_KEY +# endif + +# define PERMISSIVE_HOLD_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY #endif From a53d90ddc6b3b2e642a6d2a47e17619c0783fe21 Mon Sep 17 00:00:00 2001 From: miketronic Date: Sat, 22 Apr 2023 07:53:20 -0500 Subject: [PATCH 25/61] userspace name.c refactor --- users/miketronic/miketronic.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/users/miketronic/miketronic.c b/users/miketronic/miketronic.c index 730a243fef44..95efba4559f6 100644 --- a/users/miketronic/miketronic.c +++ b/users/miketronic/miketronic.c @@ -25,7 +25,10 @@ __attribute__ ((weak)) void led_set_keymap(uint8_t usb_led) { } __attribute__ ((weak)) layer_state_t layer_state_set_keymap (layer_state_t state) { return state; } + + // Init effect for RGB boards only +// Study documentation. housekeeping_task_user, and keyboard_post_init_user are better options for the init and scan functions. @drashna void matrix_init_user(void) { #ifdef RGB_MATRIX_ENABLE rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); From 5611ac2934286b57dade90bb9a7810fd3e8c0415 Mon Sep 17 00:00:00 2001 From: miketronic Date: Sat, 22 Apr 2023 07:55:48 -0500 Subject: [PATCH 26/61] userspace process_records.c refactor --- users/miketronic/process_records.c | 235 +++++++++++++---------------- 1 file changed, 103 insertions(+), 132 deletions(-) diff --git a/users/miketronic/process_records.c b/users/miketronic/process_records.c index 89440d4ed838..09305e931e4b 100644 --- a/users/miketronic/process_records.c +++ b/users/miketronic/process_records.c @@ -4,148 +4,119 @@ #include "miketronic.h" #include "process_records.h" -__attribute__ ((weak)) -bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - return true; +__attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + return true; } -__attribute__ ((weak)) -bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { - return true; +__attribute__((weak)) bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { + return true; } - bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef CONSOLE_ENABLE - uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed); + uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed); #endif + switch (keycode) { + case VERSION: + if (!record->event.pressed) { + send_string_with_delay_P(PSTR(QMK_KEYBOARD ":" QMK_KEYMAP "\nVersion:" QMK_VERSION ", built: " QMK_BUILDDATE "\n"), MACRO_TIMER); + } + break; - switch(keycode) { + case M01: + if (record->event.pressed) { + SEND_STRING("//a11"); + } + break; - case VERSION: - if (!record->event.pressed) { - send_string_with_delay_P(PSTR(QMK_KEYBOARD ":" QMK_KEYMAP "\nVersion:" QMK_VERSION ", built: " QMK_BUILDDATE "\n"), MACRO_TIMER); - } - break; + case M02: + if (record->event.pressed) { + SEND_STRING("//a12"); + } + break; - case MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader - if (!record->event.pressed) { - uint8_t temp_mod = get_mods(); - uint8_t temp_osm = get_oneshot_mods(); - clear_mods(); clear_oneshot_mods(); - SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP); - #ifndef FLASH_BOOTLOADER - if ((temp_mod | temp_osm) & MOD_MASK_SHIFT) - #endif - { - SEND_STRING(":flash"); - } - if ((temp_mod | temp_osm) & MOD_MASK_CTRL) { - SEND_STRING(" -j8 --output-sync"); - } - tap_code(KC_ENT); - set_mods(temp_mod); - } - break; - - - case M01: - if (record->event.pressed) { - SEND_STRING("//a11"); - } - break; - - case M02: - if (record->event.pressed) { - SEND_STRING("//a12"); - } - break; - - case M03: - if (record->event.pressed) { - SEND_STRING("//a08"); - } - break; - - case M04: - if (record->event.pressed) { - SEND_STRING("//a09"); - } - break; - - case M05: - if (record->event.pressed) { - SEND_STRING("//th"); - } - break; - - case M06: - if (record->event.pressed) { - SEND_STRING("//re"); - } - break; - - case M07: - if (record->event.pressed) { - SEND_STRING("//yw"); - } - break; - - case M08: - if (record->event.pressed) { - tap_random_base64(); - } - break; - -#if defined(KEYBOARD_1upkeyboards_pi40_v1_0) && defined(RGBLIGHT_ENABLE) - case WM: - if (record->event.pressed) { - set_single_persistent_default_layer(_WM); - rgblight_sethsv_noeeprom(HSV_WHITE); - } - break; - - case QW: - if (record->event.pressed) { - set_single_persistent_default_layer(_QW); - rgblight_sethsv_noeeprom(HSV_MAGENTA); - } - break; - - case RGB1: - if (record->event.pressed) { - rgblight_sethsv_noeeprom(HSV_BLUE); - } - break; - - case RGB2: - if (record->event.pressed) { - rgblight_sethsv_noeeprom(HSV_RED); - } - break; - - case RGB3: - if (record->event.pressed) { - rgblight_sethsv_noeeprom(HSV_ORANGE); - } - break; - - case RGB4: - if (record->event.pressed) { - rgblight_sethsv_noeeprom(HSV_YELLOW); - } - break; - - case RGB5: - if (record->event.pressed) { - rgblight_sethsv_noeeprom(HSV_GREEN); - } - break; -#endif + case M03: + if (record->event.pressed) { + SEND_STRING("//a08"); + } + break; - } - return process_record_keymap(keycode, record) && - process_record_secrets(keycode, record); -} + case M04: + if (record->event.pressed) { + SEND_STRING("//a09"); + } + break; + + case M05: + if (record->event.pressed) { + SEND_STRING("//th"); + } + break; + + case M06: + if (record->event.pressed) { + SEND_STRING("//re"); + } + break; + + case M07: + if (record->event.pressed) { + SEND_STRING("//yw"); + } + break; + case M08: + if (record->event.pressed) { + tap_random_base64(); + } + break; + +#if defined(KEYBOARD_1upkeyboards_pi40_v1_0) && defined(RGBLIGHT_ENABLE) + case WM: + if (record->event.pressed) { + set_single_persistent_default_layer(_WM); + rgblight_sethsv_noeeprom(HSV_WHITE); + } + break; + + case QW: + if (record->event.pressed) { + set_single_persistent_default_layer(_QW); + rgblight_sethsv_noeeprom(HSV_MAGENTA); + } + break; + + case RGB1: + if (record->event.pressed) { + rgblight_sethsv_noeeprom(HSV_BLUE); + } + break; + + case RGB2: + if (record->event.pressed) { + rgblight_sethsv_noeeprom(HSV_RED); + } + break; + + case RGB3: + if (record->event.pressed) { + rgblight_sethsv_noeeprom(HSV_ORANGE); + } + break; + + case RGB4: + if (record->event.pressed) { + rgblight_sethsv_noeeprom(HSV_YELLOW); + } + break; + + case RGB5: + if (record->event.pressed) { + rgblight_sethsv_noeeprom(HSV_GREEN); + } + break; +#endif + } + return process_record_keymap(keycode, record) && process_record_secrets(keycode, record); +} From c23a7517ca1e4498abe574857f7c0e178a80b619 Mon Sep 17 00:00:00 2001 From: miketronic Date: Sat, 22 Apr 2023 08:05:45 -0500 Subject: [PATCH 27/61] wrappers.h qk_make --- users/miketronic/wrappers.h | 55 +++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/users/miketronic/wrappers.h b/users/miketronic/wrappers.h index c855a5d86d16..4a4e67fbfe99 100644 --- a/users/miketronic/wrappers.h +++ b/users/miketronic/wrappers.h @@ -6,11 +6,8 @@ /* Pattern adapted from users/drashna/wrapper.h Define per-layout keymap sections. Also requires a wrapper. - Example: - #define LAYOUT_:name_wrapper(...) LAYOUT_:name(__VA_ARGS__) - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_MODS] = LAYOUT_:name _wrapper( _______, ___________________BLANK___________________, ... @@ -22,6 +19,7 @@ // clang-format off #define LAYOUT_ortho_4x12_wrapper(...) LAYOUT_ortho_4x12(__VA_ARGS__) +#define LAYOUT_planck_grid_wrapper(...) LAYOUT_planck_grid(__VA_ARGS__) #define LAYOUT_3x11_wrapper(...) LAYOUT(__VA_ARGS__) @@ -52,8 +50,8 @@ #define _________________FUNC_LEFT_________________ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 #define _________________FUNC_RIGHT________________ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 -#define __________________LONG_FUNC_LEFT___________________ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6 -#define __________________LONG_FUNC_RIGHT__________________ KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 +#define ______________LONG_FUNC_LEFT_______________ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6 +#define ______________LONG_FUNC_RIGHT______________ KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 #define _________________BLANK_5___________________ _______, _______, _______, _______, _______ #define _________________BLANK_6___________________ _______, _______, _______, _______, _______, _______ @@ -66,15 +64,15 @@ #define _________________LOWER_R2__________________ _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR #define _________________LOWER_R3__________________ _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT -#define _______________LOWER_412_L1________________ TD_XX, TD_YY, TD_SL, _______, _______, _______ -#define _______________LOWER_412_L2________________ TD_ATH, TD_PRAM, _______, _______, _______, _______ +#define _______________LOWER_412_L1________________ _______, TD_XX, TD_YY, TD_SL, _______, _______ +#define _______________LOWER_412_L2________________ _______, TD_ATH, TD_PRAM, _______, _______, _______ #define _______________LOWER_412_L3________________ _______, _______, _______, _______, _______, _______ #define _______________LOWER_412_L4________________ _______, _______, _______, _______, _______, _______ -#define _______________LOWER_412_R1________________ _______, _______, KC_7, KC_8, KC_9, KC_0 -#define _______________LOWER_412_R2________________ _______, _______, KC_4, KC_5, KC_6, _______ -#define _______________LOWER_412_R3________________ _______, _______, KC_1, KC_2, KC_3, TD_UR -#define _______________LOWER_412_R4________________ _______, _______, KC_BSPC, KC_SPC, TD_DENT, TD_DL +#define _______________LOWER_412_R1________________ _______, KC_7, KC_8, KC_9, _______, _______ +#define _______________LOWER_412_R2________________ _______, KC_4, KC_5, KC_6, _______, _______ +#define _______________LOWER_412_R3________________ KC_0, KC_1, TD_20, KC_3, _______, TD_UR +#define _______________LOWER_412_R4________________ _______, _______, KC_BSPC, KC_SPC, TD_DENT, TD_DL @@ -86,14 +84,40 @@ #define _________________RAISE_R2__________________ _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC #define _________________RAISE_R3__________________ _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END -#define _______________RAISE_412_L1________________ QK_BOOT, DB_TOGG, _______, _______, _______, _______ -#define _______________RAISE_412_L2________________ _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______ -#define _______________RAISE_412_L3________________ _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______ +#define _______________RAISE_412_L1________________ QK_BOOT, DB_TOGG, _______, _______, _______, QK_MAKE +#define _______________RAISE_412_L2________________ _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, WM +#define _______________RAISE_412_L3________________ _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, QW #define _______________RAISE_412_R1________________ _______, _______, KC_F7, KC_F8, KC_F9, KC_F10 #define _______________RAISE_412_R2________________ _______, _______, KC_F4, KC_F5, KC_F6, KC_F11 #define _______________RAISE_412_R3________________ _______, TD_UMIN, KC_F1, KC_F2, KC_F3, KC_F12 + + +#define ______________EXTRAS_412_L1________________ _______, KC_EXLM, _______, _______, _______, _______ +#define ______________EXTRAS_412_L2________________ KC_LSFT, _______, _______, _______, _______, _______ +#define ______________EXTRAS_412_L3________________ _______, _______, _______, _______, _______, _______ +#define ______________EXTRAS_412_L4________________ _______, _______, _______, _______, _______, TD_SE + +#define ______________EXTRAS_412_R1________________ _______, T_SL, KC_LBRC, KC_RBRC, KC_SCLN, _______ +#define ______________EXTRAS_412_R2________________ _______, _______, KC_LPRN, KC_RPRN, KC_QUOT, _______ +#define ______________EXTRAS_412_R3________________ _______, _______, KC_COMM, KC_DOT, KC_QUES, _______ +#define ______________EXTRAS_412_R4________________ TD_SE, _______, _______, _______, _______, _______ + + + +#define _____________FUNCTION_412_L1_______________ TD_CP, CLIP, SS, _______, _______, CCCV +#define _____________FUNCTION_412_L2_______________ KC_TAB, M05, M06, M07, M08, _______ +#define _____________FUNCTION_412_L3_______________ _______, M01, M02, M03, M04, _______ +#define _____________FUNCTION_412_L4_______________ _______, _______, _______, _______, _______, _______ + +#define _____________FUNCTION_412_R1_______________ _______, T_SL, KC_UP, _______, _______, KC_DEL +#define _____________FUNCTION_412_R2_______________ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, T_UR +#define _____________FUNCTION_412_R3_______________ _______, _______, T_QEXC, KC_COMM, KC_DOT, T_DL +#define _____________FUNCTION_412_R4_______________ _______, _______, _______, _______, _______, _______ + + + #define _________________ADJUST_L1_________________ RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_TOG #define _________________ADJUST_L2_________________ MU_TOGG, CK_TOGG, AU_ON, AU_OFF, AG_NORM #define _________________ADJUST_L3_________________ RGB_RMOD,RGB_HUD,RGB_SAD, RGB_VAD, KC_RGB_T @@ -102,6 +126,8 @@ #define _________________ADJUST_R2_________________ AG_SWAP, QWERTY, COLEMAK, DVORAK, WORKMAN #define _________________ADJUST_R3_________________ MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT + + #define _____________WORKMAN_310_001_L_____________ TD_QESC, KC_D, KC_R, KC_W, BSYM #define _____________WORKMAN_310_001_R_____________ JSYM, KC_F, KC_U, KC_P, KC_BSPC #define _____________WORKMAN_310_002_L_____________ ASFT, KC_S, KC_H, TEX, KC_G @@ -121,7 +147,6 @@ #define _____________WORKMAN_311_003_L_____________ FNZ, CTRLX, MGUI, CALT, VLOWER, KC_ENT #define _____________WORKMAN_311_003_R_____________ KRAISE, L_ALT, TD_CSPC, TD_DSPC, KC_SLSH - #define _____________WORKMAN_412_001_L_____________ TD_TE, TD_QESC, KC_D, KC_R, KC_W, BSYM #define _____________WORKMAN_412_001_R_____________ JSYM, KC_F, KC_U, KC_P, KC_BSPC, KC_BSPC #define _____________WORKMAN_412_002_L_____________ TBSHFT, KC_A, KC_S, KC_H, TEX, KC_G From b2cc1cd500ccf8feb0594b830c9309360f47ff47 Mon Sep 17 00:00:00 2001 From: miketronic Date: Sat, 22 Apr 2023 08:09:14 -0500 Subject: [PATCH 28/61] process_records.h qk_user --- users/miketronic/config.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/miketronic/config.h b/users/miketronic/config.h index 64df1e64b2aa..cf30b3305bec 100644 --- a/users/miketronic/config.h +++ b/users/miketronic/config.h @@ -14,6 +14,7 @@ #endif #define ENCODER_RESOLUTION 4 #define MACRO_TIMER 5 +#define ENABLE_COMPILE_KEYCODE ////////////// // For Pi40 // From 4515d38f3f69d00cb6e47dcb5d929261ada3ee43 Mon Sep 17 00:00:00 2001 From: miketronic Date: Sat, 22 Apr 2023 10:49:22 -0500 Subject: [PATCH 29/61] rules.mk refactor --- .../pi40/keymaps/miketronic/rules.mk | 30 +++++++ users/miketronic/rules.mk | 85 ------------------- 2 files changed, 30 insertions(+), 85 deletions(-) create mode 100644 keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk b/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk new file mode 100644 index 000000000000..2f79bdfa8acc --- /dev/null +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk @@ -0,0 +1,30 @@ +# Common feature for all keyboards +BOOTMAGIC_ENABLE = yes +EXTRAKEY_ENABLE = yes +TAP_DANCE_ENABLE = yes +MACROS_ENABLED = yes +RGBLIGHT_ENABLE = no +RGB_MATRIX_ENABLE = no + +# Keyboard specific +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 + +AUTO_SHIFT_ENABLE = no +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +MOUSEKEY_ENABLE = no # Mouse keys + +RGB_MATRIX_ENABLE = yes +RGB_MATRIX_DRIVER = WS2812 +WS2812_DRIVER = vendor +ENCODER_ENABLE = yes +ENCODER_MAP_ENABLE = yes +OLED_ENABLE = yes +OLED_DRIVER = SSD1306 \ No newline at end of file diff --git a/users/miketronic/rules.mk b/users/miketronic/rules.mk index abd196795f87..4d00cb78e290 100644 --- a/users/miketronic/rules.mk +++ b/users/miketronic/rules.mk @@ -1,91 +1,6 @@ SRC += miketronic.c tapdances.c process_records.c -# Common feature for all keyboards -BOOTMAGIC_ENABLE = yes -EXTRAKEY_ENABLE = yes -TAP_DANCE_ENABLE = yes -MACROS_ENABLED = yes -RGBLIGHT_ENABLE = no -RGB_MATRIX_ENABLE = no - -# idobao/id75 -ifeq ($(strip $(KEYBOARD)), idobao/id75/v1) - RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow - LEADER_ENABLE = yes - NKRO_ENABLE = yes - AUTO_SHIFT_ENABLE = no - VIA_ENABLE = no - MOUSEKEY_ENABLE = no - EXTRAKEY_ENABLE = no - CONSOLE_ENABLE = no - COMMAND_ENABLE = no -endif - -# Satpad -ifeq ($(strip $(KEYBOARD)), hazel/satpad) - BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite - MOUSEKEY_ENABLE = yes # Mouse keys - EXTRAKEY_ENABLE = yes # Audio control and System control - NKRO_ENABLE = yes # USB Nkey Rollover - CAPS_WORD_ENABLE = yes - KEY_OVERRIDE_ENABLE = yes - TAP_DANCE_ENABLE = yes - OLED_ENABLE = yes - OLED_DRIVER = SSD1306 - ENCODER_ENABLE = yes - ENCODER_MAP_ENABLE = yes - - - LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. - AUTO_SHIFT_ENABLE = no - UNICODE_ENABLE = no # Unicode - CONSOLE_ENABLE = no # Console for debug - COMMAND_ENABLE = no # Commands for debug and configuration - RGBLIGHT_ENABLE = no - BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality - SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) - AUDIO_ENABLE = no # Audio output on port C6 - MIDI_ENABLE = no # MIDI support - BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID - GRAVE_ESC_ENABLE = no - SPACE_CADET_ENABLE = no - COMBO_ENABLE = no - - # OLED WIDGETS - - # WPM_ENABLE = no - # KEYCOUNT_ENABLE = yes - # KEYLOG_ENABLE = no - # KEYLOG_DEBUG = no -endif - - -# 1upkeyboards/pi40 -ifeq ($(strip $(KEYBOARD)), 1upkeyboards/pi40/mit_v1_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 - - AUTO_SHIFT_ENABLE = no - CONSOLE_ENABLE = no # Console for debug - COMMAND_ENABLE = no # Commands for debug and configuration - BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality - RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow - AUDIO_ENABLE = no # Audio output - MOUSEKEY_ENABLE = no # Mouse keys - - RGB_MATRIX_ENABLE = yes - RGB_MATRIX_DRIVER = WS2812 - WS2812_DRIVER = vendor - ENCODER_ENABLE = yes - ENCODER_MAP_ENABLE = yes - OLED_ENABLE = yes - OLED_DRIVER = SSD1306 -endif - From e32f94840320b5df94059ef56a8e8648b69a9317 Mon Sep 17 00:00:00 2001 From: miketronic Date: Sat, 22 Apr 2023 10:57:47 -0500 Subject: [PATCH 30/61] rules.mk refactor --- .../pi40/keymaps/miketronic/rules.mk | 16 +++++----------- users/miketronic/rules.mk | 5 ----- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk b/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk index 2f79bdfa8acc..c6e22d2107fe 100644 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk @@ -1,18 +1,12 @@ # Common feature for all keyboards -BOOTMAGIC_ENABLE = yes -EXTRAKEY_ENABLE = yes -TAP_DANCE_ENABLE = yes +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 -RGBLIGHT_ENABLE = no -RGB_MATRIX_ENABLE = no -# Keyboard specific -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 +# Keyboard specific AUTO_SHIFT_ENABLE = no CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration diff --git a/users/miketronic/rules.mk b/users/miketronic/rules.mk index 4d00cb78e290..bc31f607601c 100644 --- a/users/miketronic/rules.mk +++ b/users/miketronic/rules.mk @@ -1,6 +1 @@ SRC += miketronic.c tapdances.c process_records.c - - - - - From 90e5b110897e169db85f6df2063ea574d9e4f657 Mon Sep 17 00:00:00 2001 From: miketronic Date: Sat, 22 Apr 2023 11:20:03 -0500 Subject: [PATCH 31/61] rules.mk refactor --- .../pi40/keymaps/miketronic/keymap.c | 68 +++++++++---------- users/miketronic/wrappers.h | 6 +- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c index 9e3a2a6fa6f9..ca21038af64e 100644 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c @@ -34,11 +34,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_QW] = LAYOUT_ortho_4x12_wrapper ( - RGB_TOG, - KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, - KC_ESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, - KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT, - FN, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_DOWN, KC_UP, KC_RGHT, TD_DL + RGB_TOG, + KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, + KC_ESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, + KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT, + _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ ), @@ -46,25 +46,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Lower * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ │ () │ [] │ /\ │ │ │ │ │ 7 │ 8 │ 9 │ 0 │ │ + * │ │ () │ [] │ /\ │ │ │ │ │ 7 │ 8 │ 9 │ │ │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ * │ │ @ # │ & % │ ┃ ┃ │ │ ┃ 4 ┃ 5 │ 6 │ │ │ * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ 1 │ 2 │ 3 │ │ UP │ - * │ │ │ │ │ │ │ │ │ │ │ │ │RIGHT│ + * │ │ │ │ │ │ │ │ 0 │ 1 │ 2 │ 3 │ │ UP │ + * │ │ │ │ │ │ │ │ │ │ 0 │ │ │RIGHT│ * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ * │ │ │ │ │LOWER│ │ │ │BPSC │ SPC │ . │ │ DN │ * │ │ │ │ │ │ │ │ │ │ │ ENT │ │LEFT │ * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_LOWER] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - _______, TD_XX, TD_YY, TD_SL, _______, _______, _______, KC_7, KC_8, KC_9, KC_0, _______, - _______, TD_ATH, TD_PRAM, _______, _______, _______, _______, KC_4, KC_5, KC_6, _______, _______, - _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, _______, TD_UR, - _______, _______, _______, _______, _______, _______, _______, KC_BSPC, KC_SPC, TD_DENT,_______, TD_DL + KC_MUTE, + _______________LOWER_412_L1________________, _______________LOWER_412_R1________________, + _______________LOWER_412_L2________________, _______________LOWER_412_R2________________, + _______________LOWER_412_L3________________, _______________LOWER_412_R3________________, + _______________LOWER_412_L4________________, _______________LOWER_412_R4________________ ), @@ -73,10 +73,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │BOOT │DEBUG│ │ │ │MAKE │ │ │ │ F7 │ F8 │ F9 │ F10 │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ │ RGB | RGB | RGB ┃ RGB ┃ │ │ ┃ / \ ┃ F4 │ F5 │ F6 │ F11 │ + * │ │ RGB | RGB | RGB ┃ RGB ┃ WM │ │ ┃ / \ ┃ F4 │ F5 │ F6 │ F11 │ * │ │ TOG │ MOD │ HUI ┃ HUD ┃ │ │ ┃ ┃ │ │ │ │ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │ │ RGB │ RGB │ RGB │ RGB │ │ │ │ _ │ F1 | F2 | F3 │ F12 │ + * │ │ RGB │ RGB │ RGB │ RGB │ QW │ │ │ _ │ F1 | F2 | F3 │ F12 │ * │ │ SAI │ SAD │ VAI │ VAD │ │ │ │ - │ │ │ │ │ * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ * │ │ │ │ │ │ │ │ │RAISE│ │ │ │ │ @@ -84,11 +84,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_RAISE] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - QK_BOOT, DB_TOGG, _______, _______, MAKE, _______, _______, _______, KC_F7, KC_F8, KC_F9, KC_F10, - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, KC_F4, KC_F5, KC_F6, KC_F11, - _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, TD_UMIN, KC_F1, KC_F2, KC_F3, KC_F12, - _______, WM, QW, _______, _______, _______, _______, _______, _______, _______, _______, _______ + KC_MUTE, + _______________RAISE_412_L1________________, _______________RAISE_412_R1________________, + _______________RAISE_412_L2________________, _______________RAISE_412_R2________________, + _______________RAISE_412_L3________________, _______________RAISE_412_R3________________, + _________________BLANK_6___________________, _________________BLANK_6___________________ ), @@ -103,16 +103,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │ │ │ , | . | ? │ │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ FN │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_EX] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - _______, KC_EXLM, _______, _______, _______, _______, _______, TD_SL, KC_LBRC, KC_RBRC, KC_SCLN, _______, - KC_LSFT, _______, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_QUOT, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_QUES, _______, - _______, _______, _______, _______, _______, TD_SE, TD_SE, _______, _______, _______, _______, _______ + KC_MUTE, + ______________EXTRAS_412_L1________________, ______________EXTRAS_412_R1________________, + ______________EXTRAS_412_L2________________, ______________EXTRAS_412_R2________________, + ______________EXTRAS_412_L3________________, ______________EXTRAS_412_R3________________, + ______________EXTRAS_412_L4________________, ______________EXTRAS_412_R4________________ ), @@ -128,16 +128,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ │ , | . | ? │DOWN │ * │ │ │ │ │ │ │ │ │ │ │ │ │LEFT │ * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ FN │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_FN] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - TD_CP, CLIP, SS, _______, _______, _______, _______, TD_SL, _______, KC_UP, _______, KC_DEL, - KC_TAB, M05, M06, M07, M08, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, TD_UR, - _______, M01, M02, M03, M04, _______, _______, _______, TD_QEXC, KC_COMM, KC_DOT, TD_DL, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + KC_MUTE, + _____________FUNCTION_412_L1_______________, _____________FUNCTION_412_R1_______________, + _____________FUNCTION_412_L2_______________, _____________FUNCTION_412_R2_______________, + _____________FUNCTION_412_L3_______________, _____________FUNCTION_412_R3_______________, + _____________FUNCTION_412_L4_______________, _____________FUNCTION_412_R4_______________ ), @@ -152,7 +152,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | & | ' | " | * | # │ │ ! | ? | / | \ | @ | | * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ FN │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ @@ -162,7 +162,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, - _______, WM, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/users/miketronic/wrappers.h b/users/miketronic/wrappers.h index 4a4e67fbfe99..25e49481e667 100644 --- a/users/miketronic/wrappers.h +++ b/users/miketronic/wrappers.h @@ -106,7 +106,7 @@ -#define _____________FUNCTION_412_L1_______________ TD_CP, CLIP, SS, _______, _______, CCCV +#define _____________FUNCTION_412_L1_______________ CCCV, CLIP, SS, _______, _______, _______ #define _____________FUNCTION_412_L2_______________ KC_TAB, M05, M06, M07, M08, _______ #define _____________FUNCTION_412_L3_______________ _______, M01, M02, M03, M04, _______ #define _____________FUNCTION_412_L4_______________ _______, _______, _______, _______, _______, _______ @@ -135,7 +135,7 @@ #define _____________WORKMAN_310_003_L_____________ FNZ, CTRLX, MGUI, CALT, VLOWER #define _____________WORKMAN_310_003_R_____________ KRAISE, L_ALT, TD_CSPC, TD_DSPC, KC_SLSH #define _____________WORKMAN_310_004_L_____________ FN, KC_LCTL, KC_LGUI, KC_LALT, LOWER -#define _____________WORKMAN_310_004_R_____________ RAISE, SS, CLIP, TD_CP, FN +#define _____________WORKMAN_310_004_R_____________ RAISE, SS, CLIP, CCCV, FN #define _____________WORKMAN_410_003_L_____________ FNZ, KC_X, KC_M, KC_C, KC_V #define _____________WORKMAN_410_003_R_____________ KC_K, KC_L, TD_CSPC, TD_DSPC, SLSHFT @@ -154,7 +154,7 @@ #define _____________WORKMAN_412_003_L_____________ KC_LSFT, KC_Z, KC_X, KC_M, KC_C, KC_V #define _____________WORKMAN_412_003_R_____________ KC_K, KC_L, TD_CSPC, TD_DSPC, KC_SLSH, TD_UR #define _____________WORKMAN_412_004_L_____________ FN, KC_LCTL, KC_LGUI, KC_LALT, LOWER, TD_SE -#define _____________WORKMAN_412_004_R_____________ TD_SE, RAISE, SS, CLIP, TD_CP, TD_DL +#define _____________WORKMAN_412_004_R_____________ TD_SE, RAISE, SS, CLIP, CCCV, TD_DL From 593605e5717af785c3e210d346bec1b55dd69fbd Mon Sep 17 00:00:00 2001 From: miketronic Date: Sat, 22 Apr 2023 11:31:29 -0500 Subject: [PATCH 32/61] rules.mk refactor --- users/miketronic/process_records.c | 12 ++++++++++++ users/miketronic/process_records.h | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/users/miketronic/process_records.c b/users/miketronic/process_records.c index 09305e931e4b..1769ee2cf3e8 100644 --- a/users/miketronic/process_records.c +++ b/users/miketronic/process_records.c @@ -72,6 +72,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } break; + case CCCV: // One key copy/paste + if (record->event.pressed) { + copy_paste_timer = timer_read(); + } else { + if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) { // Hold, copy + tap_code16(LCTL(KC_C)); + } else { // Tap, paste + tap_code16(LCTL(KC_V)); + } + } + break; + #if defined(KEYBOARD_1upkeyboards_pi40_v1_0) && defined(RGBLIGHT_ENABLE) case WM: if (record->event.pressed) { diff --git a/users/miketronic/process_records.h b/users/miketronic/process_records.h index 82782f817d68..cc585c405c46 100644 --- a/users/miketronic/process_records.h +++ b/users/miketronic/process_records.h @@ -29,5 +29,6 @@ enum custom_keycodes { RGB2, RGB3, RGB4, - RGB5 + RGB5, + CCCV }; From 422ebf4c18c71d3f57d7d3eae1aedd5f306f89ad Mon Sep 17 00:00:00 2001 From: miketronic Date: Sat, 22 Apr 2023 13:50:39 -0500 Subject: [PATCH 33/61] rules.mk refactor --- users/miketronic/process_records.h | 1 + 1 file changed, 1 insertion(+) diff --git a/users/miketronic/process_records.h b/users/miketronic/process_records.h index cc585c405c46..bb923cb422a8 100644 --- a/users/miketronic/process_records.h +++ b/users/miketronic/process_records.h @@ -7,6 +7,7 @@ bool process_record_secrets(uint16_t keycode, keyrecord_t *record); bool process_record_keymap(uint16_t keycode, keyrecord_t *record); +uint16_t copy_paste_timer; enum custom_keycodes { WM = QK_USER, From 3cfd189965db654e4da8fc71c153eefde8796574 Mon Sep 17 00:00:00 2001 From: miketronic Date: Tue, 25 Apr 2023 16:16:43 -0500 Subject: [PATCH 34/61] miketronic.c refactor --- users/miketronic/miketronic.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/users/miketronic/miketronic.c b/users/miketronic/miketronic.c index 95efba4559f6..9ed8acd76db0 100644 --- a/users/miketronic/miketronic.c +++ b/users/miketronic/miketronic.c @@ -28,12 +28,14 @@ __attribute__ ((weak)) layer_state_t layer_state_set_keymap (layer_state_t state // Init effect for RGB boards only -// Study documentation. housekeeping_task_user, and keyboard_post_init_user are better options for the init and scan functions. @drashna -void matrix_init_user(void) { +// https://github.com/qmk/qmk_firmware/blob/master/docs/custom_quantum_functions.md +void keyboard_post_init_user(void) { #ifdef RGB_MATRIX_ENABLE + rgblight_enable_noeeprom(); // enables Rgb, without saving settings + rgblight_sethsv_noeeprom(180, 255, 255); // sets the color to teal/cyan without saving rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); #endif - matrix_init_keymap(); + matrix_init_keymap(); } From 3589619011963b72d8ed590af045e6c88e60f7b5 Mon Sep 17 00:00:00 2001 From: miketronic Date: Wed, 26 Apr 2023 07:52:01 -0500 Subject: [PATCH 35/61] userspace files refactoring --- .../pi40/keymaps/miketronic/config.h | 13 +++++ .../miketronic/.vscode/c_cpp_properties.json | 18 +++++++ users/miketronic/.vscode/launch.json | 24 ++++++++++ users/miketronic/.vscode/settings.json | 38 +++++++++++++++ users/miketronic/config.h | 47 +------------------ users/miketronic/miketronic.c | 36 +++----------- users/miketronic/miketronic.h | 8 ++-- users/miketronic/process_records.c | 3 -- users/miketronic/rules.mk | 5 +- 9 files changed, 109 insertions(+), 83 deletions(-) create mode 100644 keyboards/1upkeyboards/pi40/keymaps/miketronic/config.h create mode 100644 users/miketronic/.vscode/c_cpp_properties.json create mode 100644 users/miketronic/.vscode/launch.json create mode 100644 users/miketronic/.vscode/settings.json diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/config.h b/keyboards/1upkeyboards/pi40/keymaps/miketronic/config.h new file mode 100644 index 000000000000..506a22e3f5e5 --- /dev/null +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/config.h @@ -0,0 +1,13 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#pragma once + +# define TAPPING_TERM 170 +# define TAPPING_TERM_PER_KEY +# define QUICK_TAP_TERM TAPPING_TERM / 2 +# define QUICK_TAP_TERM_PER_KEY +# define PERMISSIVE_HOLD_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY + + diff --git a/users/miketronic/.vscode/c_cpp_properties.json b/users/miketronic/.vscode/c_cpp_properties.json new file mode 100644 index 000000000000..cea4d3f4e0ee --- /dev/null +++ b/users/miketronic/.vscode/c_cpp_properties.json @@ -0,0 +1,18 @@ +{ + "configurations": [ + { + "name": "windows-gcc-x64", + "includePath": [ + "${workspaceFolder}/**" + ], + "compilerPath": "gcc", + "cStandard": "${default}", + "cppStandard": "${default}", + "intelliSenseMode": "windows-gcc-x64", + "compilerArgs": [ + "" + ] + } + ], + "version": 4 +} \ No newline at end of file diff --git a/users/miketronic/.vscode/launch.json b/users/miketronic/.vscode/launch.json new file mode 100644 index 000000000000..172013757420 --- /dev/null +++ b/users/miketronic/.vscode/launch.json @@ -0,0 +1,24 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "C/C++ Runner: Debug Session", + "type": "cppdbg", + "request": "launch", + "args": [], + "stopAtEntry": false, + "externalConsole": true, + "cwd": "c:/Users/mbarnoski/qmk_firmware/users/miketronic", + "program": "c:/Users/mbarnoski/qmk_firmware/users/miketronic/build/Debug/outDebug", + "MIMode": "gdb", + "miDebuggerPath": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + } + ] +} \ No newline at end of file diff --git a/users/miketronic/.vscode/settings.json b/users/miketronic/.vscode/settings.json new file mode 100644 index 000000000000..65c81b6209a6 --- /dev/null +++ b/users/miketronic/.vscode/settings.json @@ -0,0 +1,38 @@ +{ + "C_Cpp_Runner.cCompilerPath": "gcc", + "C_Cpp_Runner.cppCompilerPath": "g++", + "C_Cpp_Runner.debuggerPath": "gdb", + "C_Cpp_Runner.cStandard": "", + "C_Cpp_Runner.cppStandard": "", + "C_Cpp_Runner.msvcBatchPath": "", + "C_Cpp_Runner.useMsvc": false, + "C_Cpp_Runner.warnings": [ + "-Wall", + "-Wextra", + "-Wpedantic", + "-Wshadow", + "-Wformat=2", + "-Wconversion", + "-Wnull-dereference", + "-Wsign-conversion" + ], + "C_Cpp_Runner.enableWarnings": true, + "C_Cpp_Runner.warningsAsError": false, + "C_Cpp_Runner.compilerArgs": [], + "C_Cpp_Runner.linkerArgs": [], + "C_Cpp_Runner.includePaths": [], + "C_Cpp_Runner.includeSearch": [ + "*", + "**/*" + ], + "C_Cpp_Runner.excludeSearch": [ + "**/build", + "**/build/**", + "**/.*", + "**/.*/**", + "**/.vscode", + "**/.vscode/**" + ], + "C_Cpp_Runner.useAddressSanitizer": false, + "C_Cpp_Runner.showCompilationTime": false +} \ No newline at end of file diff --git a/users/miketronic/config.h b/users/miketronic/config.h index cf30b3305bec..4123caa5bc62 100644 --- a/users/miketronic/config.h +++ b/users/miketronic/config.h @@ -3,55 +3,10 @@ #pragma once -// specific defines example -// #if defined(TAP_DANCE_ENABLE) && defined(KEYBOARD_lets_split_rev2) || defined(KEYBOARD_keebio_iris_rev2) - -// Common QMK settings #define DEBOUNCE 10 #if defined(TAP_DANCE_ENABLE) # define TAP_CODE_DELAY 5 # define TAP_HOLD_CAPS_DELAY 25 #endif -#define ENCODER_RESOLUTION 4 #define MACRO_TIMER 5 -#define ENABLE_COMPILE_KEYCODE - -////////////// -// For Pi40 // -////////////// -#if defined(KEYBOARD_1upkeyboards_pi40_mit_v1_0) - -// Tapping Config -// https://docs.qmk.fm/#/tap_hold?id=tapping_term -// https://docs.qmk.fm/#/ChangeLog/20230226?id=quick-tap-term - -// Tap-hold settings -# if defined(TAP_DANCE_ENABLE) -# define TAPPING_TERM 170 -# define TAPPING_TERM_PER_KEY -# define QUICK_TAP_TERM TAPPING_TERM / 2 -# define QUICK_TAP_TERM_PER_KEY -# endif - -# define PERMISSIVE_HOLD_PER_KEY -# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY - -#endif - -//////////////// -// For SATPAD // -//////////////// -#if defined(KEYBOARD_hazel_satpad) - -// Tap-hold settings -# if defined(TAP_DANCE_ENABLE) -# define TAPPING_TERM 170 -# define TAPPING_TERM_PER_KEY -# define QUICK_TAP_TERM TAPPING_TERM / 2 -# define QUICK_TAP_TERM_PER_KEY -# endif - -# define PERMISSIVE_HOLD_PER_KEY -# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY - -#endif +#define ENABLE_COMPILE_KEYCODE \ No newline at end of file diff --git a/users/miketronic/miketronic.c b/users/miketronic/miketronic.c index 9ed8acd76db0..eb6364eb9506 100644 --- a/users/miketronic/miketronic.c +++ b/users/miketronic/miketronic.c @@ -3,29 +3,6 @@ #include "miketronic.h" -// Add reconfigurable functions here, for keymap customization -// This allows for a global, userspace functions, and continued -// customization of the keymap. Use _keymap instead of _user -// functions in the keymaps - - -// In keymaps, instead of writing _user functions, write _keymap functions -// The __attribute__((weak)) allows for empty definitions here, and during -// compilation, if these functions are defined elsewhere, they are written -// over. This allows to include custom code from keymaps in the generic code -// in this file. - - - - -__attribute__ ((weak)) void matrix_init_keymap(void) { } -__attribute__ ((weak)) void matrix_scan_keymap(void) { } -__attribute__ ((weak)) void led_set_keymap(uint8_t usb_led) { } - -__attribute__ ((weak)) layer_state_t layer_state_set_keymap (layer_state_t state) { - return state; -} - // Init effect for RGB boards only // https://github.com/qmk/qmk_firmware/blob/master/docs/custom_quantum_functions.md @@ -35,17 +12,18 @@ void keyboard_post_init_user(void) { rgblight_sethsv_noeeprom(180, 255, 255); // sets the color to teal/cyan without saving rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); #endif - matrix_init_keymap(); + keyboard_post_init_keymap(); } -/* - +__attribute__ ((weak)) layer_state_t layer_state_set_keymap (layer_state_t state) { + return state; +} layer_state_t layer_state_set_user(layer_state_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); + state = update_tri_layer_state(state, _LOWER, _RAISE, _SYMB); + state = layer_state_set_keymap(state); #ifdef CONSOLE_ENABLE uprintf("LAYER: %u\n", state); #endif return state; -} - */ +} \ No newline at end of file diff --git a/users/miketronic/miketronic.h b/users/miketronic/miketronic.h index f63a403f2958..c40943cf3a28 100644 --- a/users/miketronic/miketronic.h +++ b/users/miketronic/miketronic.h @@ -8,9 +8,10 @@ #include "wrappers.h" #include "action.h" #include "version.h" -#include "tapdances.h" #include "process_records.h" - +#ifdef TAP_DANCE_ENABLE +# include "tapdances.h" +#endif enum layer_names { _WM, @@ -54,7 +55,6 @@ enum layer_names { #define AT LSFT(KC_2) #define COPY LCTL(KC_C) #define PASTE LCTL(KC_V) +#define ____ KC_TRNS #define XXXX KC_NO #define XXXXXXX KC_NO -#define XXXXXXXX KC_NO -#define ________ KC_TRNS diff --git a/users/miketronic/process_records.c b/users/miketronic/process_records.c index 1769ee2cf3e8..2cd732d59b2a 100644 --- a/users/miketronic/process_records.c +++ b/users/miketronic/process_records.c @@ -13,9 +13,6 @@ __attribute__((weak)) bool process_record_secrets(uint16_t keycode, keyrecord_t } bool process_record_user(uint16_t keycode, keyrecord_t *record) { -#ifdef CONSOLE_ENABLE - uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed); -#endif switch (keycode) { case VERSION: diff --git a/users/miketronic/rules.mk b/users/miketronic/rules.mk index bc31f607601c..bbd3e4131e08 100644 --- a/users/miketronic/rules.mk +++ b/users/miketronic/rules.mk @@ -1 +1,4 @@ -SRC += miketronic.c tapdances.c process_records.c +SRC += miketronic.c process_records.c +ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) + SRC += $(USER_PATH)/tapdances.c +endif From a26d7f1cf82c66f6406d0e24effa28d3d7b524cc Mon Sep 17 00:00:00 2001 From: miketronic Date: Wed, 26 Apr 2023 08:27:53 -0500 Subject: [PATCH 36/61] name.c refactoring --- users/miketronic/miketronic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/users/miketronic/miketronic.c b/users/miketronic/miketronic.c index eb6364eb9506..7478ee87c708 100644 --- a/users/miketronic/miketronic.c +++ b/users/miketronic/miketronic.c @@ -4,8 +4,9 @@ #include "miketronic.h" +__attribute__ ((weak)) void keyboard_post_init_keymap(void) { } + // Init effect for RGB boards only -// https://github.com/qmk/qmk_firmware/blob/master/docs/custom_quantum_functions.md void keyboard_post_init_user(void) { #ifdef RGB_MATRIX_ENABLE rgblight_enable_noeeprom(); // enables Rgb, without saving settings From 003fa91156ec727b3d1fc1dabc87665419ef8b2a Mon Sep 17 00:00:00 2001 From: miketronic Date: Wed, 26 Apr 2023 11:07:25 -0500 Subject: [PATCH 37/61] process_records.c refactor --- users/miketronic/process_records.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/miketronic/process_records.c b/users/miketronic/process_records.c index 2cd732d59b2a..86abab6724fe 100644 --- a/users/miketronic/process_records.c +++ b/users/miketronic/process_records.c @@ -116,7 +116,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case RGB4: if (record->event.pressed) { - rgblight_sethsv_noeeprom(HSV_YELLOW); + rgblight_sethsv_noeeprom(HSV_WHITE); } break; From 0c8c0064ec9d31e16cbdaaee320976d145de024d Mon Sep 17 00:00:00 2001 From: miketronic Date: Wed, 26 Apr 2023 11:08:12 -0500 Subject: [PATCH 38/61] wrappers.h refactor --- users/miketronic/wrappers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/miketronic/wrappers.h b/users/miketronic/wrappers.h index 25e49481e667..240c925c47f8 100644 --- a/users/miketronic/wrappers.h +++ b/users/miketronic/wrappers.h @@ -109,7 +109,7 @@ #define _____________FUNCTION_412_L1_______________ CCCV, CLIP, SS, _______, _______, _______ #define _____________FUNCTION_412_L2_______________ KC_TAB, M05, M06, M07, M08, _______ #define _____________FUNCTION_412_L3_______________ _______, M01, M02, M03, M04, _______ -#define _____________FUNCTION_412_L4_______________ _______, _______, _______, _______, _______, _______ +#define _____________FUNCTION_412_L4_______________ _______, RGB1, RGB2, RGB3, RGB4, _______ #define _____________FUNCTION_412_R1_______________ _______, T_SL, KC_UP, _______, _______, KC_DEL #define _____________FUNCTION_412_R2_______________ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, T_UR From 81c13a2e4284a3689ed30130a134eb3536b01092 Mon Sep 17 00:00:00 2001 From: miketronic Date: Wed, 26 Apr 2023 11:10:23 -0500 Subject: [PATCH 39/61] keymap updates --- .../pi40/keymaps/miketronic/keymap.c | 4 +- .../pi40/keymaps/miketronic/rules.mk | 4 +- keyboards/planck/keymaps/miketronic/config.h | 11 ++ keyboards/planck/keymaps/miketronic/keymap.c | 172 ++++++++++++++++++ keyboards/planck/keymaps/miketronic/rules.mk | 6 + 5 files changed, 193 insertions(+), 4 deletions(-) create mode 100644 keyboards/planck/keymaps/miketronic/config.h create mode 100644 keyboards/planck/keymaps/miketronic/keymap.c create mode 100644 keyboards/planck/keymaps/miketronic/rules.mk diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c index ca21038af64e..ae71be571b74 100644 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c @@ -173,12 +173,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) && defined(KEYBOARD_1upkeyboards_pi40_mit_v1_0) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_WM] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) }, + [_WM] = { ENCODER_CCW_CW(LCTL(KC_V), LCTL(KC_C)) }, [_QW] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_LOWER] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_RAISE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_EX] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_FN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_FN] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, [_SYMB] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } }; #endif \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk b/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk index c6e22d2107fe..c8d72f5df4c5 100644 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk @@ -1,6 +1,6 @@ # Common feature for all keyboards -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -EXTRAKEY_ENABLE = yes # Audio control and System control +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 diff --git a/keyboards/planck/keymaps/miketronic/config.h b/keyboards/planck/keymaps/miketronic/config.h new file mode 100644 index 000000000000..53d7545ae23c --- /dev/null +++ b/keyboards/planck/keymaps/miketronic/config.h @@ -0,0 +1,11 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#pragma once + +# define TAPPING_TERM 170 +# define TAPPING_TERM_PER_KEY +# define QUICK_TAP_TERM TAPPING_TERM / 2 +# define QUICK_TAP_TERM_PER_KEY +# define PERMISSIVE_HOLD_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY \ No newline at end of file diff --git a/keyboards/planck/keymaps/miketronic/keymap.c b/keyboards/planck/keymaps/miketronic/keymap.c new file mode 100644 index 000000000000..d1b5aa8ff8ad --- /dev/null +++ b/keyboards/planck/keymaps/miketronic/keymap.c @@ -0,0 +1,172 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#include "miketronic.h" + + + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Workman + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ TAB │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ BSPC│ + * │ ESC │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ ; │ ; │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ TAB │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ │ + * │SHIFT│ │ │ ┃ EX ┃ │ │ ┃ ┃ │ │ENTER│ENTER│ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │SHIFT| Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ / │ UP | + * │ │ │ │ │ │ │ │ │ │ , │ . │ │RIGHT| + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ FN │CTRL │ OS │ ALT │LOWER│ │ │ │RAISE│ SS │CLIP │COPY │ DN │ + * │ │ │ │ │ │ │ │ │ │ │ │PASTE│LEFT │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + + [_WM] = LAYOUT_planck_grid_wrapper( + _____________WORKMAN_412_001_L_____________, _____________WORKMAN_412_001_R_____________, + _____________WORKMAN_412_002_L_____________, _____________WORKMAN_412_002_R_____________, + _____________WORKMAN_412_003_L_____________, _____________WORKMAN_412_003_R_____________, + _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ + ), + + [_QW] = LAYOUT_planck_grid_wrapper( + KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, + KC_ESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, + KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT, + _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ + ), + + + /* Lower + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ │ () │ [] │ /\ │ │ │ │ │ 7 │ 8 │ 9 │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ │ @ # │ & % │ ┃ ┃ │ │ ┃ 4 ┃ 5 │ 6 │ │ │ + * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ 0 │ 1 │ 2 │ 3 │ │ UP │ + * │ │ │ │ │ │ │ │ │ │ 0 │ │ │RIGHT│ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │LOWER│ │ │ │BPSC │ SPC │ . │ │ DN │ + * │ │ │ │ │ │ │ │ │ │ │ ENT │ │LEFT │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + [_LOWER] = LAYOUT_planck_grid_wrapper ( + _______________LOWER_412_L1________________, _______________LOWER_412_R1________________, + _______________LOWER_412_L2________________, _______________LOWER_412_R2________________, + _______________LOWER_412_L3________________, _______________LOWER_412_R3________________, + _______________LOWER_412_L4________________, _______________LOWER_412_R4________________ + ), + + + /* RAISE + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │BOOT │DEBUG│ │ │ │MAKE │ │ │ │ F7 │ F8 │ F9 │ F10 │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ │ RGB | RGB | RGB ┃ RGB ┃ WM │ │ ┃ / \ ┃ F4 │ F5 │ F6 │ F11 │ + * │ │ TOG │ MOD │ HUI ┃ HUD ┃ │ │ ┃ ┃ │ │ │ │ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │ │ RGB │ RGB │ RGB │ RGB │ QW │ │ │ _ │ F1 | F2 | F3 │ F12 │ + * │ │ SAI │ SAD │ VAI │ VAD │ │ │ │ - │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │RAISE│ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + [_RAISE] = LAYOUT_planck_grid_wrapper( + _______________RAISE_412_L1________________, _______________RAISE_412_R1________________, + _______________RAISE_412_L2________________, _______________RAISE_412_R2________________, + _______________RAISE_412_L3________________, _______________RAISE_412_R3________________, + _________________BLANK_6___________________, _________________BLANK_6___________________ + ), + + + /* EXTRAS + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ │ ! │ │ │ │ │ │ │ /\ | [ | ] | ; │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │SHIFT│ | | ┃EXTRA┃ │ │ ┃ ┃ ( | ) | ' | │ + * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ , | . | ? │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + [_EX] = LAYOUT_planck_grid_wrapper( + ______________EXTRAS_412_L1________________, ______________EXTRAS_412_R1________________, + ______________EXTRAS_412_L2________________, ______________EXTRAS_412_R2________________, + ______________EXTRAS_412_L3________________, ______________EXTRAS_412_R3________________, + ______________EXTRAS_412_L4________________, ______________EXTRAS_412_R4________________ + ), + + + /* FUNCTION + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │COPY │CLIP │ SS │ │ │ │ │ │ /\ │ │ UP │ │ DEL │ + * │PASTE│ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │TAB │ M05 | M06 | M07 ┃ M08 ┃ │ │ ┃ ┃LEFT │DOWN │RIGHT│UP │ + * │SHIFT│ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │RIGHT│ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ │ , | . | ? │DOWN │ + * │ │ │ │ │ │ │ │ │ │ │ │ │LEFT │ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + [_FN] = LAYOUT_planck_grid_wrapper( + _____________FUNCTION_412_L1_______________, _____________FUNCTION_412_R1_______________, + _____________FUNCTION_412_L2_______________, _____________FUNCTION_412_R2_______________, + _____________FUNCTION_412_L3_______________, _____________FUNCTION_412_R3_______________, + _____________FUNCTION_412_L4_______________, _____________FUNCTION_412_R4_______________ + ), + + + /* SYMBOLS + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ | $ | ^ | < | > │ SYMB│ │ SYMB│ | | [ | ] | - | | + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ | % | : | ; ┃ + ┃ = │ │ ┃ ┃ ( | ) | _ | | + * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * | | & | ' | " | * | # │ │ ! | ? | / | \ | @ | | + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + [_SYMB] = LAYOUT_planck_grid_wrapper( + _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, + _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, + _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) + +}; + +#ifndef NUM_DIRECTIONS +# define NUM_DIRECTIONS 2 +#endif + +#if defined(ENCODER_MAP_ENABLE) && defined(KEYBOARD_planck_rev6) +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(KC_VOLD, KC_VOLU) }, + [_RAISE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_EX] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_FN] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [_SYMB] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } +}; +#endif \ No newline at end of file diff --git a/keyboards/planck/keymaps/miketronic/rules.mk b/keyboards/planck/keymaps/miketronic/rules.mk new file mode 100644 index 000000000000..f2da8c984082 --- /dev/null +++ b/keyboards/planck/keymaps/miketronic/rules.mk @@ -0,0 +1,6 @@ + +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 From 2e6e3206a57cc2a4d9d9041b7fd45c52c83fae6b Mon Sep 17 00:00:00 2001 From: miketronic Date: Wed, 26 Apr 2023 14:00:27 -0500 Subject: [PATCH 40/61] keymap refactor --- keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c | 6 +++--- users/miketronic/wrappers.h | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c index ae71be571b74..b1c7b27b6575 100644 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c @@ -175,9 +175,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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(KC_VOLD, KC_VOLU) }, - [_RAISE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_EX] = { 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) } }; diff --git a/users/miketronic/wrappers.h b/users/miketronic/wrappers.h index 240c925c47f8..f3ffe14f64f2 100644 --- a/users/miketronic/wrappers.h +++ b/users/miketronic/wrappers.h @@ -20,7 +20,12 @@ // clang-format off #define LAYOUT_ortho_4x12_wrapper(...) LAYOUT_ortho_4x12(__VA_ARGS__) #define LAYOUT_planck_grid_wrapper(...) LAYOUT_planck_grid(__VA_ARGS__) -#define LAYOUT_3x11_wrapper(...) LAYOUT(__VA_ARGS__) +#if (defined(KEYBOARD_hazel_satpad)) +# define LAYOUT_3x11_wrapper(...) LAYOUT(__VA_ARGS__) +#endif +#if (defined(KEYBOARD_mechwild_bde_rev2)) +# define LAYOUT_3x14_wrapper(...) LAYOUT(__VA_ARGS__) +#endif #define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, KC_R, KC_T From 6c274a97c9506a83a3be55f5b40938e75deeac5a Mon Sep 17 00:00:00 2001 From: miketronic Date: Wed, 26 Apr 2023 14:00:53 -0500 Subject: [PATCH 41/61] Delete c_cpp_properties.json --- users/miketronic/.vscode/c_cpp_properties.json | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 users/miketronic/.vscode/c_cpp_properties.json diff --git a/users/miketronic/.vscode/c_cpp_properties.json b/users/miketronic/.vscode/c_cpp_properties.json deleted file mode 100644 index cea4d3f4e0ee..000000000000 --- a/users/miketronic/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "configurations": [ - { - "name": "windows-gcc-x64", - "includePath": [ - "${workspaceFolder}/**" - ], - "compilerPath": "gcc", - "cStandard": "${default}", - "cppStandard": "${default}", - "intelliSenseMode": "windows-gcc-x64", - "compilerArgs": [ - "" - ] - } - ], - "version": 4 -} \ No newline at end of file From 4e9e1439ccebe2b5810f2ce0857f8bbf75804768 Mon Sep 17 00:00:00 2001 From: miketronic Date: Wed, 26 Apr 2023 14:01:31 -0500 Subject: [PATCH 42/61] Delete launch.json --- users/miketronic/.vscode/launch.json | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 users/miketronic/.vscode/launch.json diff --git a/users/miketronic/.vscode/launch.json b/users/miketronic/.vscode/launch.json deleted file mode 100644 index 172013757420..000000000000 --- a/users/miketronic/.vscode/launch.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "C/C++ Runner: Debug Session", - "type": "cppdbg", - "request": "launch", - "args": [], - "stopAtEntry": false, - "externalConsole": true, - "cwd": "c:/Users/mbarnoski/qmk_firmware/users/miketronic", - "program": "c:/Users/mbarnoski/qmk_firmware/users/miketronic/build/Debug/outDebug", - "MIMode": "gdb", - "miDebuggerPath": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - } - ] -} \ No newline at end of file From 75633a0d35c638936539d8622ef3a7143baac321 Mon Sep 17 00:00:00 2001 From: miketronic Date: Wed, 26 Apr 2023 14:01:40 -0500 Subject: [PATCH 43/61] Delete settings.json --- users/miketronic/.vscode/settings.json | 38 -------------------------- 1 file changed, 38 deletions(-) delete mode 100644 users/miketronic/.vscode/settings.json diff --git a/users/miketronic/.vscode/settings.json b/users/miketronic/.vscode/settings.json deleted file mode 100644 index 65c81b6209a6..000000000000 --- a/users/miketronic/.vscode/settings.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "C_Cpp_Runner.cCompilerPath": "gcc", - "C_Cpp_Runner.cppCompilerPath": "g++", - "C_Cpp_Runner.debuggerPath": "gdb", - "C_Cpp_Runner.cStandard": "", - "C_Cpp_Runner.cppStandard": "", - "C_Cpp_Runner.msvcBatchPath": "", - "C_Cpp_Runner.useMsvc": false, - "C_Cpp_Runner.warnings": [ - "-Wall", - "-Wextra", - "-Wpedantic", - "-Wshadow", - "-Wformat=2", - "-Wconversion", - "-Wnull-dereference", - "-Wsign-conversion" - ], - "C_Cpp_Runner.enableWarnings": true, - "C_Cpp_Runner.warningsAsError": false, - "C_Cpp_Runner.compilerArgs": [], - "C_Cpp_Runner.linkerArgs": [], - "C_Cpp_Runner.includePaths": [], - "C_Cpp_Runner.includeSearch": [ - "*", - "**/*" - ], - "C_Cpp_Runner.excludeSearch": [ - "**/build", - "**/build/**", - "**/.*", - "**/.*/**", - "**/.vscode", - "**/.vscode/**" - ], - "C_Cpp_Runner.useAddressSanitizer": false, - "C_Cpp_Runner.showCompilationTime": false -} \ No newline at end of file From 8004ad4dbf7850ab424a235c29851b2f584dd563 Mon Sep 17 00:00:00 2001 From: miketronic Date: Sun, 30 Apr 2023 09:39:00 -0500 Subject: [PATCH 44/61] userspace refactor --- .../pi40/mit_v1_0/keymaps/miketronic/config.h | 13 ++ .../pi40/mit_v1_0/keymaps/miketronic/keymap.c | 184 ++++++++++++++++++ .../pi40/mit_v1_0/keymaps/miketronic/rules.mk | 24 +++ .../bde/rev2/keymaps/miketronic/config.h | 11 ++ .../bde/rev2/keymaps/miketronic/keymap.c | 156 +++++++++++++++ .../bde/rev2/keymaps/miketronic/rules.mk | 10 + keyboards/planck/keymaps/miketronic/keymap.c | 20 +- users/miketronic/process_records.c | 34 ++++ users/miketronic/process_records.h | 3 + users/miketronic/wrappers.h | 62 ++++-- 10 files changed, 494 insertions(+), 23 deletions(-) create mode 100644 keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h create mode 100644 keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/keymap.c create mode 100644 keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk create mode 100644 keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h create mode 100644 keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c create mode 100644 keyboards/mechwild/bde/rev2/keymaps/miketronic/rules.mk diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h new file mode 100644 index 000000000000..506a22e3f5e5 --- /dev/null +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h @@ -0,0 +1,13 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#pragma once + +# define TAPPING_TERM 170 +# define TAPPING_TERM_PER_KEY +# define QUICK_TAP_TERM TAPPING_TERM / 2 +# define QUICK_TAP_TERM_PER_KEY +# define PERMISSIVE_HOLD_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY + + diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/keymap.c b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/keymap.c new file mode 100644 index 000000000000..b1c7b27b6575 --- /dev/null +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/keymap.c @@ -0,0 +1,184 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#include "miketronic.h" + + + + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Workman + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ TAB │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ BSPC│ + * │ ESC │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ ; │ ; │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ TAB │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ │ + * │SHIFT│ │ │ ┃ EX ┃ │ │ ┃ ┃ │ │ENTER│ENTER│ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │SHIFT| Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ / │ UP | + * │ │ │ │ │ │ │ │ │ │ , │ . │ │RIGHT| + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ FN │CTRL │ OS │ ALT │LOWER│ │ │ │RAISE│ SS │CLIP │COPY │ DN │ + * │ │ │ │ │ │ │ │ │ │ │ │PASTE│LEFT │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + + [_WM] = LAYOUT_ortho_4x12_wrapper ( + RGB_TOG, + _____________WORKMAN_412_001_L_____________, _____________WORKMAN_412_001_R_____________, + _____________WORKMAN_412_002_L_____________, _____________WORKMAN_412_002_R_____________, + _____________WORKMAN_412_003_L_____________, _____________WORKMAN_412_003_R_____________, + _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ + ), + + [_QW] = LAYOUT_ortho_4x12_wrapper ( + RGB_TOG, + KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, + KC_ESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, + KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT, + _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ + ), + + + + + /* Lower + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ │ () │ [] │ /\ │ │ │ │ │ 7 │ 8 │ 9 │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ │ @ # │ & % │ ┃ ┃ │ │ ┃ 4 ┃ 5 │ 6 │ │ │ + * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ 0 │ 1 │ 2 │ 3 │ │ UP │ + * │ │ │ │ │ │ │ │ │ │ 0 │ │ │RIGHT│ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │LOWER│ │ │ │BPSC │ SPC │ . │ │ DN │ + * │ │ │ │ │ │ │ │ │ │ │ ENT │ │LEFT │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + [_LOWER] = LAYOUT_ortho_4x12_wrapper ( + KC_MUTE, + _______________LOWER_412_L1________________, _______________LOWER_412_R1________________, + _______________LOWER_412_L2________________, _______________LOWER_412_R2________________, + _______________LOWER_412_L3________________, _______________LOWER_412_R3________________, + _______________LOWER_412_L4________________, _______________LOWER_412_R4________________ + ), + + + /* RAISE + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │BOOT │DEBUG│ │ │ │MAKE │ │ │ │ F7 │ F8 │ F9 │ F10 │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ │ RGB | RGB | RGB ┃ RGB ┃ WM │ │ ┃ / \ ┃ F4 │ F5 │ F6 │ F11 │ + * │ │ TOG │ MOD │ HUI ┃ HUD ┃ │ │ ┃ ┃ │ │ │ │ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │ │ RGB │ RGB │ RGB │ RGB │ QW │ │ │ _ │ F1 | F2 | F3 │ F12 │ + * │ │ SAI │ SAD │ VAI │ VAD │ │ │ │ - │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │RAISE│ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + [_RAISE] = LAYOUT_ortho_4x12_wrapper ( + KC_MUTE, + _______________RAISE_412_L1________________, _______________RAISE_412_R1________________, + _______________RAISE_412_L2________________, _______________RAISE_412_R2________________, + _______________RAISE_412_L3________________, _______________RAISE_412_R3________________, + _________________BLANK_6___________________, _________________BLANK_6___________________ + ), + + + /* EXTRAS + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ │ ! │ │ │ │ │ │ │ /\ | [ | ] | ; │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │SHIFT│ | |EXTRA┃ ┃ │ │ ┃ ┃ ( | ) | ' | │ + * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ , | . | ? │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + [_EX] = LAYOUT_ortho_4x12_wrapper ( + KC_MUTE, + ______________EXTRAS_412_L1________________, ______________EXTRAS_412_R1________________, + ______________EXTRAS_412_L2________________, ______________EXTRAS_412_R2________________, + ______________EXTRAS_412_L3________________, ______________EXTRAS_412_R3________________, + ______________EXTRAS_412_L4________________, ______________EXTRAS_412_R4________________ + ), + + + + /* FUNCTION + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │COPY │CLIP │ SS │ │ │ │ │ │ /\ │ │ UP │ │ DEL │ + * │PASTE│ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │TAB │ M05 | M06 | M07 ┃ M08 ┃ │ │ ┃ ┃LEFT │DOWN │RIGHT│UP │ + * │SHIFT│ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │RIGHT│ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ │ , | . | ? │DOWN │ + * │ │ │ │ │ │ │ │ │ │ │ │ │LEFT │ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + [_FN] = LAYOUT_ortho_4x12_wrapper ( + KC_MUTE, + _____________FUNCTION_412_L1_______________, _____________FUNCTION_412_R1_______________, + _____________FUNCTION_412_L2_______________, _____________FUNCTION_412_R2_______________, + _____________FUNCTION_412_L3_______________, _____________FUNCTION_412_R3_______________, + _____________FUNCTION_412_L4_______________, _____________FUNCTION_412_R4_______________ + ), + + + /* SYMBOLS + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ | $ | ^ | < | > │ SYMB│ │ SYMB│ | | [ | ] | - | | + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ | % | : | ; ┃ + ┃ = │ │ ┃ ┃ ( | ) | _ | | + * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * | | & | ' | " | * | # │ │ ! | ? | / | \ | @ | | + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + + [_SYMB] = LAYOUT_ortho_4x12_wrapper ( + KC_MUTE, + _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, + _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, + _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) + +}; + +#ifndef NUM_DIRECTIONS +# define NUM_DIRECTIONS 2 +#endif + +#if defined(ENCODER_MAP_ENABLE) && defined(KEYBOARD_1upkeyboards_pi40_mit_v1_0) +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 \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk new file mode 100644 index 000000000000..c8d72f5df4c5 --- /dev/null +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk @@ -0,0 +1,24 @@ +# Common feature for all keyboards +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 + + +# Keyboard specific +AUTO_SHIFT_ENABLE = no +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +MOUSEKEY_ENABLE = no # Mouse keys + +RGB_MATRIX_ENABLE = yes +RGB_MATRIX_DRIVER = WS2812 +WS2812_DRIVER = vendor +ENCODER_ENABLE = yes +ENCODER_MAP_ENABLE = yes +OLED_ENABLE = yes +OLED_DRIVER = SSD1306 \ No newline at end of file diff --git a/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h b/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h new file mode 100644 index 000000000000..3a5bd8518493 --- /dev/null +++ b/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h @@ -0,0 +1,11 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#pragma once + +# define TAPPING_TERM 150 +# define TAPPING_TERM_PER_KEY +# define QUICK_TAP_TERM TAPPING_TERM / 2 +# define QUICK_TAP_TERM_PER_KEY +# define PERMISSIVE_HOLD_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY diff --git a/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c b/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c new file mode 100644 index 000000000000..1a8b91ef091b --- /dev/null +++ b/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c @@ -0,0 +1,156 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#include "miketronic.h" + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* WORKMAN + * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ + * │ Q │ D │ R │ W │ B │ J │ F │ U │ P │ BSPC│ BSPC│ M08 │ M08 │MUTE │ + * │ ESC │ │ │ │ SYM │ SYM │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ A │ S │ H ┃ T ┃ G │ Y ┃ N ┃ E │ O │ I │ENTER│ M08 │ () │UP │ + * │SHIFT│ │ ┃ EX ┃ │ ┃ ┃ │ │ENTER│ │ │ │RIGHT│ + * ├─────┼─────┼─────╄━━━━━╃─────┼─────╄━━━━━╃─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ Z │ X │ M │ C │ V │ K │ L │ SPC │ SPC │ / │ \ │ @ # │ [] │DOWN │ + * │ FN │ CTRL│ OS │ ALT │LOWER│RAISE│ ALT │ , │ . │ │ │ │ <> │LEFT │ + * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ + * + */ + + [_WM] = LAYOUT_3x14_wrapper ( + _____________WORKMAN_310_001_L_____________, _____________WORKMAN_310_001_R_____________, _________FOUR_001__________, + _____________WORKMAN_310_002_L_____________, _____________WORKMAN_310_002_R_____________, _________FOUR_002__________, + _____________WORKMAN_310_003_L_____________, _____________WORKMAN_310_003_R_____________, _________FOUR_003__________ + ), + + [_QW] = LAYOUT_3x14_wrapper ( + _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, _________FOUR_001__________, + _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, _________FOUR_002__________, + _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, _________FOUR_003__________ + ), + + + /* LOWER + * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ + * │ () │ [] │ /\ │ │ │ │ 7 │ 8 │ 9 │ 0 │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ @ # │ & % │ ┃ ┃ │ ┃ 4 ┃ 5 │ 6 │ │ │ │ │ │ + * │ │ │ ┃ ┃ │ ┃ ┃ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┼─────╄━━━━━╃─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ 0 │ 1 │ 2 │ 3 │ . │ │ │ │ │ + * │ │ │ │ │LOWER│ │ │ 0 │ │ ENT │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ + * + */ + + [_LOWER] = LAYOUT_3x14_wrapper ( + _______________LOWER_310_L1________________, _______________LOWER_310_R1________________, _________FOUR_001__________, + _______________LOWER_310_L2________________, _______________LOWER_310_R2________________, _________FOUR_002__________, + _______________LOWER_310_L3________________, _______________LOWER_310_R3________________, _________FOUR_003__________ + ), + + + /* RAISE + * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ + * │ BOOT│DEBUG│ │ │ MAKE│ │ F7 │ F8 │ F9 │ F10 │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ 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________________, _______________RAISE_310_R1________________, _________FOUR_001__________, + _______________RAISE_310_L2________________, _______________RAISE_310_R2________________, _________FOUR_002__________, + _______________RAISE_310_L3________________, _______________RAISE_310_R3________________, _________FOUR_003__________ + ), + + + /* EXTRAS + * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ + * │ ! │ │ │ │ │ │ /\ | () | [] | ; │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ ┃EXTRA┃ │ ┃ @ # ┃ & % | | ' | │ │ │ │ + * │ │ │ ┃ ┃ │ ┃ ┃ _ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┼─────╄━━━━━╃─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ , | . | ? │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ + */ + + [_EX] = LAYOUT_3x14_wrapper ( + ______________EXTRAS_310_L1________________, ______________EXTRAS_310_R1________________, _________FOUR_001__________, + ______________EXTRAS_310_L2________________, ______________EXTRAS_310_R2________________, _________FOUR_002__________, + ______________EXTRAS_310_L3________________, ______________EXTRAS_310_R3________________, _________FOUR_003__________ +), + + + /* FUNCTION + * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ + * │COPY │CLIP │ SS │ │ │ │ /\ │ UP │ | │ │ │ │ │ + * │PASTE│ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ TAB │ M05 │ M06 ┃ M07 ┃ M08 │ ┃ LEFT┃ DOWN│RIGHT| | │ │ │ │ + * │ │ │ ┃ ┃ │ ┃ ┃ _ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┼─────╄━━━━━╃─────┼─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ M01 │ M02 │ M03 │ M04 │ │ │ , | . | ? │ │ │ │ │ + * │ FN │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ + */ + + [_FN] = LAYOUT_3x14_wrapper ( + _____________FUNCTION_310_L1_______________, _____________FUNCTION_310_R1_______________, _________FOUR_001__________, + _____________FUNCTION_310_L2_______________, _____________FUNCTION_310_R2_______________, _________FOUR_002__________, + _____________FUNCTION_310_L3_______________, _____________FUNCTION_310_R3_______________, _________FOUR_003__________ + ), + + + + /* SYMBOLS + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ $ │ ^ │ < │ > │ │ │ │ | │ [ │ ] │ - │ + * │ │ │ │ │ SYMB│ │ SYMB│ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ % │ : │ ; ┃ + ┃ = │ │ ┃ ┃ ( │ ) │ _ │ + * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ & │ ' │ " │ * │ # │ │ ! │ ? │ / │ \ │ @ │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + */ + + [_SYMB] = LAYOUT_3x14_wrapper ( + KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXX, XXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, KC_A, KC_A, KC_A, KC_A, + KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, KC_A, KC_A, KC_A, KC_A, + KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_ENT, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, KC_A, KC_A, KC_A + ), + + + +}; + + +#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 \ 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 new file mode 100644 index 000000000000..1b11143fd13d --- /dev/null +++ b/keyboards/mechwild/bde/rev2/keymaps/miketronic/rules.mk @@ -0,0 +1,10 @@ +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 + +ENCODER_ENABLE = yes +ENCODER_MAP_ENABLE = yes +OLED_ENABLE = yes # Enable OLED Screen +OLED_DRIVER = SSD1306 # Set OLED Driver diff --git a/keyboards/planck/keymaps/miketronic/keymap.c b/keyboards/planck/keymaps/miketronic/keymap.c index d1b5aa8ff8ad..9911a9bfb417 100644 --- a/keyboards/planck/keymaps/miketronic/keymap.c +++ b/keyboards/planck/keymaps/miketronic/keymap.c @@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │SHIFT| Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ / │ UP | * │ │ │ │ │ │ │ │ │ │ , │ . │ │RIGHT| * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ FN │CTRL │ OS │ ALT │LOWER│ │ │ │RAISE│ SS │CLIP │COPY │ DN │ + * │ FN │CTRL │ OS │ ALT │LOWER│ │ │ │RAISE│ SS │CLIP │COPY │ DN │ * │ │ │ │ │ │ │ │ │ │ │ │PASTE│LEFT │ * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Lower * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ * │ │ () │ [] │ /\ │ │ │ │ │ 7 │ 8 │ 9 │ │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ <> │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ * │ │ @ # │ & % │ ┃ ┃ │ │ ┃ 4 ┃ 5 │ 6 │ │ │ * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │BOOT │DEBUG│ │ │ │MAKE │ │ │ │ F7 │ F8 │ F9 │ F10 │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ │ RGB | RGB | RGB ┃ RGB ┃ WM │ │ ┃ / \ ┃ F4 │ F5 │ F6 │ F11 │ + * │ │ RGB | RGB | RGB ┃ RGB ┃ WM │ │ ┃ ┃ F4 │ F5 │ F6 │ F11 │ * │ │ TOG │ MOD │ HUI ┃ HUD ┃ │ │ ┃ ┃ │ │ │ │ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ * │ │ RGB │ RGB │ RGB │ RGB │ QW │ │ │ _ │ F1 | F2 | F3 │ F12 │ @@ -87,10 +87,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* EXTRAS * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ │ ! │ │ │ │ │ │ │ /\ | [ | ] | ; │ │ + * │ │ ! │ │ │ │ │ │ │ /\ | () | [] | ; │ │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │SHIFT│ | | ┃EXTRA┃ │ │ ┃ ┃ ( | ) | ' | │ + * │SHIFT│ | | ┃EXTRA┃ │ │ ┃ @ # ┃ & % | | ' | │ * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ * │ │ │ │ │ │ │ │ │ │ , | . | ? │ │ @@ -110,16 +110,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* FUNCTION * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │COPY │CLIP │ SS │ │ │ │ │ │ /\ │ │ UP │ │ DEL │ + * │COPY │CLIP │ SS │ │ │ │ │ │ /\ │ UP │ │ │ DEL │ * │PASTE│ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │TAB │ M05 | M06 | M07 ┃ M08 ┃ │ │ ┃ ┃LEFT │DOWN │RIGHT│UP │ - * │SHIFT│ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │RIGHT│ + * │TAB │ M05 | M06 | M07 ┃ M08 ┃ │ │ ┃LEFT ┃DOWN │RIGHT│ │UP │ + * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │RIGHT│ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ │ , | . | ? │DOWN │ * │ │ │ │ │ │ │ │ │ │ │ │ │LEFT │ * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │RGB1 │RGB2 │RGB3 │RGB4 │ │ │ │ │ │ │ │ │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ @@ -147,7 +147,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_SYMB] = LAYOUT_planck_grid_wrapper( - _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, + _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXXXXX, XXXXXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/users/miketronic/process_records.c b/users/miketronic/process_records.c index 86abab6724fe..b4e9c9d930d9 100644 --- a/users/miketronic/process_records.c +++ b/users/miketronic/process_records.c @@ -12,6 +12,7 @@ __attribute__((weak)) bool process_record_secrets(uint16_t keycode, keyrecord_t return true; } + bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { @@ -81,6 +82,39 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } break; + case IENTER: // Tap for letter "i", slight hold for "enter" + if (record->event.pressed) { + copy_paste_timer = timer_read(); + } else { + if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) { // Hold, enter + tap_code16(KC_ENT); + } else { // Tap, "i" + tap_code16(KC_I); + } + } + break; + + case PRN: + if (record->event.pressed) { + SEND_STRING("()"); + tap_code(KC_LEFT); + } + break; + + case BRACES: + if (record->event.pressed) { + uint8_t shifted = get_mods() & (MOD_MASK_SHIFT); + if (shifted) { + unregister_code(KC_LSFT); + unregister_code(KC_RSFT); + SEND_STRING("<>"SS_TAP(X_LEFT)); + } + else { + SEND_STRING("[]"SS_TAP(X_LEFT)); + } + } + break; + #if defined(KEYBOARD_1upkeyboards_pi40_v1_0) && defined(RGBLIGHT_ENABLE) case WM: if (record->event.pressed) { diff --git a/users/miketronic/process_records.h b/users/miketronic/process_records.h index bb923cb422a8..17737490a177 100644 --- a/users/miketronic/process_records.h +++ b/users/miketronic/process_records.h @@ -31,5 +31,8 @@ enum custom_keycodes { RGB3, RGB4, RGB5, + IENTER, + PRN, + BRACES, CCCV }; diff --git a/users/miketronic/wrappers.h b/users/miketronic/wrappers.h index f3ffe14f64f2..6d744d12fa68 100644 --- a/users/miketronic/wrappers.h +++ b/users/miketronic/wrappers.h @@ -69,8 +69,16 @@ #define _________________LOWER_R2__________________ _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR #define _________________LOWER_R3__________________ _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT -#define _______________LOWER_412_L1________________ _______, TD_XX, TD_YY, TD_SL, _______, _______ -#define _______________LOWER_412_L2________________ _______, TD_ATH, TD_PRAM, _______, _______, _______ +#define _______________LOWER_310_L1________________ PRN, BRACES, TD_SL, _______, _______ +#define _______________LOWER_310_L2________________ TD_ATH, TD_PRAM, _______, _______, _______ +#define _______________LOWER_310_L3________________ _______, _______, _______, _______, _______ + +#define _______________LOWER_310_R1________________ _______, KC_7, KC_8, KC_9, _______ +#define _______________LOWER_310_R2________________ _______, KC_4, KC_5, KC_6, _______ +#define _______________LOWER_310_R3________________ KC_0, KC_1, TD_20, KC_3, TD_DENT + +#define _______________LOWER_412_L1________________ _______, PRN, BRACES, TD_SL, _______, _______ +#define _______________LOWER_412_L2________________ _______, TD_ATH, TD_PRAM, _______, _______, _______ #define _______________LOWER_412_L3________________ _______, _______, _______, _______, _______, _______ #define _______________LOWER_412_L4________________ _______, _______, _______, _______, _______, _______ @@ -89,6 +97,14 @@ #define _________________RAISE_R2__________________ _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC #define _________________RAISE_R3__________________ _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END +#define _______________RAISE_310_L1________________ QK_BOOT, DB_TOGG, _______, _______, QK_MAKE +#define _______________RAISE_310_L2________________ _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD +#define _______________RAISE_310_L3________________ _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD + +#define _______________RAISE_310_R1________________ _______, KC_F7, KC_F8, KC_F9, KC_F10 +#define _______________RAISE_310_R2________________ TD_UMIN, KC_F4, KC_F5, KC_F6, KC_F11 +#define _______________RAISE_310_R3________________ _______, KC_F1, KC_F2, KC_F3, KC_F12 + #define _______________RAISE_412_L1________________ QK_BOOT, DB_TOGG, _______, _______, _______, QK_MAKE #define _______________RAISE_412_L2________________ _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, WM #define _______________RAISE_412_L3________________ _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, QW @@ -99,18 +115,34 @@ +#define ______________EXTRAS_310_L1________________ KC_EXLM, _______, _______, _______, _______ +#define ______________EXTRAS_310_L2________________ _______, _______, _______, _______, _______ +#define ______________EXTRAS_310_L3________________ _______, _______, _______, _______, _______ + +#define ______________EXTRAS_310_R1________________ _______, TD_SL, PRN, BRACES, KC_SCLN +#define ______________EXTRAS_310_R2________________ _______, TD_ATH, TD_PRAM, _______, KC_QUOT +#define ______________EXTRAS_310_R3________________ _______, _______, KC_COMM, KC_DOT, KC_QUES + #define ______________EXTRAS_412_L1________________ _______, KC_EXLM, _______, _______, _______, _______ #define ______________EXTRAS_412_L2________________ KC_LSFT, _______, _______, _______, _______, _______ #define ______________EXTRAS_412_L3________________ _______, _______, _______, _______, _______, _______ #define ______________EXTRAS_412_L4________________ _______, _______, _______, _______, _______, TD_SE -#define ______________EXTRAS_412_R1________________ _______, T_SL, KC_LBRC, KC_RBRC, KC_SCLN, _______ -#define ______________EXTRAS_412_R2________________ _______, _______, KC_LPRN, KC_RPRN, KC_QUOT, _______ -#define ______________EXTRAS_412_R3________________ _______, _______, KC_COMM, KC_DOT, KC_QUES, _______ +#define ______________EXTRAS_412_R1________________ _______, TD_SL, PRN, BRACES, KC_SCLN, _______ +#define ______________EXTRAS_412_R2________________ _______, TD_ATH, TD_PRAM, _______, KC_QUOT, _______ +#define ______________EXTRAS_412_R3________________ _______, _______, KC_COMM, KC_DOT, KC_QUES, _______ #define ______________EXTRAS_412_R4________________ TD_SE, _______, _______, _______, _______, _______ +#define _____________FUNCTION_310_L1_______________ CCCV, CLIP, SS, _______, _______ +#define _____________FUNCTION_310_L2_______________ KC_TAB, M05, M06, M07, M08 +#define _____________FUNCTION_310_L3_______________ _______, M01, M02, M03, M04 + +#define _____________FUNCTION_310_R1_______________ _______, T_SL, KC_UP, _______, _______ +#define _____________FUNCTION_310_R2_______________ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______ +#define _____________FUNCTION_310_R3_______________ _______, _______, KC_COMM, KC_DOT, KC_QUES + #define _____________FUNCTION_412_L1_______________ CCCV, CLIP, SS, _______, _______, _______ #define _____________FUNCTION_412_L2_______________ KC_TAB, M05, M06, M07, M08, _______ #define _____________FUNCTION_412_L3_______________ _______, M01, M02, M03, M04, _______ @@ -118,7 +150,7 @@ #define _____________FUNCTION_412_R1_______________ _______, T_SL, KC_UP, _______, _______, KC_DEL #define _____________FUNCTION_412_R2_______________ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, T_UR -#define _____________FUNCTION_412_R3_______________ _______, _______, T_QEXC, KC_COMM, KC_DOT, T_DL +#define _____________FUNCTION_412_R3_______________ _______, _______, KC_COMM, KC_DOT, KC_QUES, T_DL #define _____________FUNCTION_412_R4_______________ _______, _______, _______, _______, _______, _______ @@ -132,30 +164,34 @@ #define _________________ADJUST_R3_________________ MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT +#define _________FOUR_001__________ KC_BSPC, M08, M08, KC_MUTE +#define _________FOUR_002__________ KC_ENT, M08, PRN, TD_UR +#define _________FOUR_003__________ KC_BSLS, TD_ATH, BRACES, TD_DL + #define _____________WORKMAN_310_001_L_____________ TD_QESC, KC_D, KC_R, KC_W, BSYM #define _____________WORKMAN_310_001_R_____________ JSYM, KC_F, KC_U, KC_P, KC_BSPC #define _____________WORKMAN_310_002_L_____________ ASFT, KC_S, KC_H, TEX, KC_G -#define _____________WORKMAN_310_002_R_____________ KC_Y, KC_N, KC_E, KC_O, TD_IENT +#define _____________WORKMAN_310_002_R_____________ KC_Y, KC_N, KC_E, KC_O, IENTER #define _____________WORKMAN_310_003_L_____________ FNZ, CTRLX, MGUI, CALT, VLOWER -#define _____________WORKMAN_310_003_R_____________ KRAISE, L_ALT, TD_CSPC, TD_DSPC, KC_SLSH +#define _____________WORKMAN_310_003_R_____________ KRAISE, KC_L, TD_CSPC, TD_DSPC, SLSHFT #define _____________WORKMAN_310_004_L_____________ FN, KC_LCTL, KC_LGUI, KC_LALT, LOWER #define _____________WORKMAN_310_004_R_____________ RAISE, SS, CLIP, CCCV, FN -#define _____________WORKMAN_410_003_L_____________ FNZ, KC_X, KC_M, KC_C, KC_V -#define _____________WORKMAN_410_003_R_____________ KC_K, KC_L, TD_CSPC, TD_DSPC, SLSHFT +#define _____________WORKMAN_410_003_L_____________ FNZ, KC_X, KC_M, KC_C, KC_V +#define _____________WORKMAN_410_003_R_____________ KC_K, KC_L, TD_CSPC, TD_DSPC, SLSHFT #define _____________WORKMAN_311_001_L_____________ TD_QESC, KC_D, KC_R, KC_W, BSYM #define _____________WORKMAN_311_001_R_____________ JSYM, KC_F, KC_U, KC_P, KC_BSPC #define _____________WORKMAN_311_002_L_____________ ASFT, KC_S, KC_H, TEX, GGUI -#define _____________WORKMAN_311_002_R_____________ KC_Y, KC_N, KC_E, KC_O, TD_IENT +#define _____________WORKMAN_311_002_R_____________ KC_Y, KC_N, KC_E, KC_O, IENTER #define _____________WORKMAN_311_003_L_____________ FNZ, CTRLX, MGUI, CALT, VLOWER, KC_ENT -#define _____________WORKMAN_311_003_R_____________ KRAISE, L_ALT, TD_CSPC, TD_DSPC, KC_SLSH +#define _____________WORKMAN_311_003_R_____________ KRAISE, KC_L, TD_CSPC, TD_DSPC, SLSHFT #define _____________WORKMAN_412_001_L_____________ TD_TE, TD_QESC, KC_D, KC_R, KC_W, BSYM #define _____________WORKMAN_412_001_R_____________ JSYM, KC_F, KC_U, KC_P, KC_BSPC, KC_BSPC #define _____________WORKMAN_412_002_L_____________ TBSHFT, KC_A, KC_S, KC_H, TEX, KC_G -#define _____________WORKMAN_412_002_R_____________ KC_Y, KC_N, KC_E, KC_O, TD_IENT, KC_ENT +#define _____________WORKMAN_412_002_R_____________ KC_Y, KC_N, KC_E, KC_O, IENTER, KC_ENT #define _____________WORKMAN_412_003_L_____________ KC_LSFT, KC_Z, KC_X, KC_M, KC_C, KC_V #define _____________WORKMAN_412_003_R_____________ KC_K, KC_L, TD_CSPC, TD_DSPC, KC_SLSH, TD_UR #define _____________WORKMAN_412_004_L_____________ FN, KC_LCTL, KC_LGUI, KC_LALT, LOWER, TD_SE From 82357ed763333dfc7e80f162cc696e76131b9b0b Mon Sep 17 00:00:00 2001 From: miketronic Date: Sun, 30 Apr 2023 10:29:56 -0500 Subject: [PATCH 45/61] Delete keyboards/1upkeyboards/pi40/keymaps/miketronic directory --- .../pi40/keymaps/miketronic/config.h | 13 -- .../pi40/keymaps/miketronic/keymap.c | 184 ------------------ .../pi40/keymaps/miketronic/rules.mk | 24 --- 3 files changed, 221 deletions(-) delete mode 100644 keyboards/1upkeyboards/pi40/keymaps/miketronic/config.h delete mode 100644 keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c delete mode 100644 keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/config.h b/keyboards/1upkeyboards/pi40/keymaps/miketronic/config.h deleted file mode 100644 index 506a22e3f5e5..000000000000 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/config.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B -// SPDX-License-Identifier: GPL-2.0+ - -#pragma once - -# define TAPPING_TERM 170 -# define TAPPING_TERM_PER_KEY -# define QUICK_TAP_TERM TAPPING_TERM / 2 -# define QUICK_TAP_TERM_PER_KEY -# define PERMISSIVE_HOLD_PER_KEY -# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY - - diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c deleted file mode 100644 index b1c7b27b6575..000000000000 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c +++ /dev/null @@ -1,184 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B -// SPDX-License-Identifier: GPL-2.0+ - -#include "miketronic.h" - - - - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* Workman - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ TAB │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ BSPC│ - * │ ESC │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ ; │ ; │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ TAB │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ │ - * │SHIFT│ │ │ ┃ EX ┃ │ │ ┃ ┃ │ │ENTER│ENTER│ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │SHIFT| Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ / │ UP | - * │ │ │ │ │ │ │ │ │ │ , │ . │ │RIGHT| - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ FN │CTRL │ OS │ ALT │LOWER│ │ │ │RAISE│ SS │CLIP │COPY │ DN │ - * │ │ │ │ │ │ │ │ │ │ │ │PASTE│LEFT │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ - - [_WM] = LAYOUT_ortho_4x12_wrapper ( - RGB_TOG, - _____________WORKMAN_412_001_L_____________, _____________WORKMAN_412_001_R_____________, - _____________WORKMAN_412_002_L_____________, _____________WORKMAN_412_002_R_____________, - _____________WORKMAN_412_003_L_____________, _____________WORKMAN_412_003_R_____________, - _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ - ), - - [_QW] = LAYOUT_ortho_4x12_wrapper ( - RGB_TOG, - KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, - KC_ESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, - KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT, - _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ - ), - - - - - /* Lower - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ │ () │ [] │ /\ │ │ │ │ │ 7 │ 8 │ 9 │ │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ │ @ # │ & % │ ┃ ┃ │ │ ┃ 4 ┃ 5 │ 6 │ │ │ - * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ 0 │ 1 │ 2 │ 3 │ │ UP │ - * │ │ │ │ │ │ │ │ │ │ 0 │ │ │RIGHT│ - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │LOWER│ │ │ │BPSC │ SPC │ . │ │ DN │ - * │ │ │ │ │ │ │ │ │ │ │ ENT │ │LEFT │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ - [_LOWER] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - _______________LOWER_412_L1________________, _______________LOWER_412_R1________________, - _______________LOWER_412_L2________________, _______________LOWER_412_R2________________, - _______________LOWER_412_L3________________, _______________LOWER_412_R3________________, - _______________LOWER_412_L4________________, _______________LOWER_412_R4________________ - ), - - - /* RAISE - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │BOOT │DEBUG│ │ │ │MAKE │ │ │ │ F7 │ F8 │ F9 │ F10 │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ │ RGB | RGB | RGB ┃ RGB ┃ WM │ │ ┃ / \ ┃ F4 │ F5 │ F6 │ F11 │ - * │ │ TOG │ MOD │ HUI ┃ HUD ┃ │ │ ┃ ┃ │ │ │ │ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │ │ RGB │ RGB │ RGB │ RGB │ QW │ │ │ _ │ F1 | F2 | F3 │ F12 │ - * │ │ SAI │ SAD │ VAI │ VAD │ │ │ │ - │ │ │ │ │ - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │RAISE│ │ │ │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ - [_RAISE] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - _______________RAISE_412_L1________________, _______________RAISE_412_R1________________, - _______________RAISE_412_L2________________, _______________RAISE_412_R2________________, - _______________RAISE_412_L3________________, _______________RAISE_412_R3________________, - _________________BLANK_6___________________, _________________BLANK_6___________________ - ), - - - /* EXTRAS - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ │ ! │ │ │ │ │ │ │ /\ | [ | ] | ; │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │SHIFT│ | |EXTRA┃ ┃ │ │ ┃ ┃ ( | ) | ' | │ - * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ │ , | . | ? │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ - [_EX] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - ______________EXTRAS_412_L1________________, ______________EXTRAS_412_R1________________, - ______________EXTRAS_412_L2________________, ______________EXTRAS_412_R2________________, - ______________EXTRAS_412_L3________________, ______________EXTRAS_412_R3________________, - ______________EXTRAS_412_L4________________, ______________EXTRAS_412_R4________________ - ), - - - - /* FUNCTION - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │COPY │CLIP │ SS │ │ │ │ │ │ /\ │ │ UP │ │ DEL │ - * │PASTE│ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │TAB │ M05 | M06 | M07 ┃ M08 ┃ │ │ ┃ ┃LEFT │DOWN │RIGHT│UP │ - * │SHIFT│ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │RIGHT│ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ │ , | . | ? │DOWN │ - * │ │ │ │ │ │ │ │ │ │ │ │ │LEFT │ - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ - [_FN] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - _____________FUNCTION_412_L1_______________, _____________FUNCTION_412_R1_______________, - _____________FUNCTION_412_L2_______________, _____________FUNCTION_412_R2_______________, - _____________FUNCTION_412_L3_______________, _____________FUNCTION_412_R3_______________, - _____________FUNCTION_412_L4_______________, _____________FUNCTION_412_R4_______________ - ), - - - /* SYMBOLS - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ | $ | ^ | < | > │ SYMB│ │ SYMB│ | | [ | ] | - | | - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ | % | : | ; ┃ + ┃ = │ │ ┃ ┃ ( | ) | _ | | - * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * | | & | ' | " | * | # │ │ ! | ? | / | \ | @ | | - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ - - [_SYMB] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, - _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, - _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) - -}; - -#ifndef NUM_DIRECTIONS -# define NUM_DIRECTIONS 2 -#endif - -#if defined(ENCODER_MAP_ENABLE) && defined(KEYBOARD_1upkeyboards_pi40_mit_v1_0) -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 \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk b/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk deleted file mode 100644 index c8d72f5df4c5..000000000000 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/rules.mk +++ /dev/null @@ -1,24 +0,0 @@ -# Common feature for all keyboards -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 - - -# Keyboard specific -AUTO_SHIFT_ENABLE = no -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -MOUSEKEY_ENABLE = no # Mouse keys - -RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 -WS2812_DRIVER = vendor -ENCODER_ENABLE = yes -ENCODER_MAP_ENABLE = yes -OLED_ENABLE = yes -OLED_DRIVER = SSD1306 \ No newline at end of file From d072eba0890278b571921b1dfb13834bc94bb2e0 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 5 May 2023 13:26:07 -0500 Subject: [PATCH 46/61] userspace refactor --- .../pi40/keymaps/miketronic/config.h | 2 +- .../pi40/keymaps/miketronic/keymap.c | 129 ++++++---- .../pi40/mit_v1_0/keymaps/miketronic/config.h | 2 +- .../pi40/mit_v1_0/keymaps/miketronic/keymap.c | 127 ++++++---- .../bad_wings/keymaps/miketronic/config.h | 19 ++ .../bad_wings/keymaps/miketronic/keymap.c | 190 +++++++++++++++ .../bad_wings/keymaps/miketronic/rules.mk | 30 +++ keyboards/hazel/satpad/config.h | 1 + keyboards/hazel/satpad/info.json | 82 +++++++ .../hazel/satpad/keymaps/default/config.h | 19 ++ .../hazel/satpad/keymaps/default/keymap.c | 62 +++++ .../hazel/satpad/keymaps/default/rules.mk | 17 ++ .../hazel/satpad/keymaps/miketronic/config.h | 8 + .../hazel/satpad/keymaps/miketronic/keymap.c | 225 ++++++++++++++++++ .../hazel/satpad/keymaps/miketronic/rules.mk | 38 +++ keyboards/hazel/satpad/rules.mk | 1 + keyboards/hazel/satpad/satpad.c | 24 ++ .../idobao/id75/keymaps/miketronic/config.h | 29 +++ .../idobao/id75/keymaps/miketronic/keymap.c | 204 ++++++++++++++++ .../idobao/id75/keymaps/miketronic/rules.mk | 15 ++ .../bde/rev2/keymaps/miketronic/keymap.c | 74 +++--- keyboards/planck/keymaps/miketronic/config.h | 2 +- keyboards/planck/keymaps/miketronic/keymap.c | 28 +-- .../miketronic/.vscode/c_cpp_properties.json | 18 ++ users/miketronic/.vscode/launch.json | 24 ++ users/miketronic/.vscode/settings.json | 38 +++ users/miketronic/miketronic.c | 15 +- users/miketronic/miketronic.h | 20 +- users/miketronic/process_records.c | 16 +- users/miketronic/wrappers.h | 98 +++++--- 30 files changed, 1341 insertions(+), 216 deletions(-) create mode 100644 keyboards/hazel/bad_wings/keymaps/miketronic/config.h create mode 100644 keyboards/hazel/bad_wings/keymaps/miketronic/keymap.c create mode 100644 keyboards/hazel/bad_wings/keymaps/miketronic/rules.mk create mode 100644 keyboards/hazel/satpad/config.h create mode 100644 keyboards/hazel/satpad/info.json create mode 100644 keyboards/hazel/satpad/keymaps/default/config.h create mode 100644 keyboards/hazel/satpad/keymaps/default/keymap.c create mode 100644 keyboards/hazel/satpad/keymaps/default/rules.mk create mode 100644 keyboards/hazel/satpad/keymaps/miketronic/config.h create mode 100644 keyboards/hazel/satpad/keymaps/miketronic/keymap.c create mode 100644 keyboards/hazel/satpad/keymaps/miketronic/rules.mk create mode 100644 keyboards/hazel/satpad/rules.mk create mode 100644 keyboards/hazel/satpad/satpad.c create mode 100644 keyboards/idobao/id75/keymaps/miketronic/config.h create mode 100644 keyboards/idobao/id75/keymaps/miketronic/keymap.c create mode 100644 keyboards/idobao/id75/keymaps/miketronic/rules.mk create mode 100644 users/miketronic/.vscode/c_cpp_properties.json create mode 100644 users/miketronic/.vscode/launch.json create mode 100644 users/miketronic/.vscode/settings.json diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/config.h b/keyboards/1upkeyboards/pi40/keymaps/miketronic/config.h index 506a22e3f5e5..66b9224406e5 100644 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/config.h +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/config.h @@ -3,7 +3,7 @@ #pragma once -# define TAPPING_TERM 170 +# define TAPPING_TERM 160 // 30APR23 was 170 # define TAPPING_TERM_PER_KEY # define QUICK_TAP_TERM TAPPING_TERM / 2 # define QUICK_TAP_TERM_PER_KEY diff --git a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c index b1c7b27b6575..ceda7111d50f 100644 --- a/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c +++ b/keyboards/1upkeyboards/pi40/keymaps/miketronic/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Workman * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ * │ TAB │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ BSPC│ - * │ ESC │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ ; │ ; │ + * │ ESC │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ * │ TAB │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ │ * │SHIFT│ │ │ ┃ EX ┃ │ │ ┃ ┃ │ │ENTER│ENTER│ @@ -26,19 +26,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_WM] = LAYOUT_ortho_4x12_wrapper ( - RGB_TOG, - _____________WORKMAN_412_001_L_____________, _____________WORKMAN_412_001_R_____________, - _____________WORKMAN_412_002_L_____________, _____________WORKMAN_412_002_R_____________, - _____________WORKMAN_412_003_L_____________, _____________WORKMAN_412_003_R_____________, - _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ + RGB_TOG, + _____________WORKMAN_412_001_L_____________, _____________WORKMAN_412_001_R_____________, + _____________WORKMAN_412_002_L_____________, _____________WORKMAN_412_002_R_____________, + _____________WORKMAN_412_003_L_____________, _____________WORKMAN_412_003_R_____________, + _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ ), [_QW] = LAYOUT_ortho_4x12_wrapper ( - RGB_TOG, - KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, - KC_ESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, - KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT, - _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ + RGB_TOG, + KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, + KC_ESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, + KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT, + _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ ), @@ -60,11 +60,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_LOWER] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - _______________LOWER_412_L1________________, _______________LOWER_412_R1________________, - _______________LOWER_412_L2________________, _______________LOWER_412_R2________________, - _______________LOWER_412_L3________________, _______________LOWER_412_R3________________, - _______________LOWER_412_L4________________, _______________LOWER_412_R4________________ + KC_MUTE, + _______________LOWER_412_L1________________, _______________LOWER_412_R1________________, + _______________LOWER_412_L2________________, _______________LOWER_412_R2________________, + _______________LOWER_412_L3________________, _______________LOWER_412_R3________________, + _______________LOWER_412_L4________________, _______________LOWER_412_R4________________ ), @@ -83,21 +83,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ - [_RAISE] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - _______________RAISE_412_L1________________, _______________RAISE_412_R1________________, - _______________RAISE_412_L2________________, _______________RAISE_412_R2________________, - _______________RAISE_412_L3________________, _______________RAISE_412_R3________________, - _________________BLANK_6___________________, _________________BLANK_6___________________ - ), + [_RAISE] = LAYOUT_ortho_4x12_wrapper ( + KC_MUTE, + _______________RAISE_412_L1________________, _______________RAISE_412_R1________________, + _______________RAISE_412_L2________________, _______________RAISE_412_R2________________, + _______________RAISE_412_L3________________, _______________RAISE_412_R3________________, + _________________BLANK_6___________________, _________________BLANK_6___________________ + ), /* EXTRAS * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ │ ! │ │ │ │ │ │ │ /\ | [ | ] | ; │ │ + * │ │ ! │ │ │ │ │ │ │ /\ | () | [] | ; │ │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │SHIFT│ | |EXTRA┃ ┃ │ │ ┃ ┃ ( | ) | ' | │ + * │SHIFT│ | |EXTRA┃ ┃ │ │ ┃ @ # ┃ & % | | ' | │ * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ * │ │ │ │ │ │ │ │ │ │ , | . | ? │ │ @@ -108,36 +108,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_EX] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - ______________EXTRAS_412_L1________________, ______________EXTRAS_412_R1________________, - ______________EXTRAS_412_L2________________, ______________EXTRAS_412_R2________________, - ______________EXTRAS_412_L3________________, ______________EXTRAS_412_R3________________, - ______________EXTRAS_412_L4________________, ______________EXTRAS_412_R4________________ + KC_MUTE, + ______________EXTRAS_412_L1________________, ______________EXTRAS_412_R1________________, + ______________EXTRAS_412_L2________________, ______________EXTRAS_412_R2________________, + ______________EXTRAS_412_L3________________, ______________EXTRAS_412_R3________________, + ______________EXTRAS_412_L4________________, ______________EXTRAS_412_R4________________ ), /* FUNCTION * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │COPY │CLIP │ SS │ │ │ │ │ │ /\ │ │ UP │ │ DEL │ + * │COPY │CLIP │ SS │ │ │ │ │ │ /\ │ UP │ │ │ DEL │ * │PASTE│ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │TAB │ M05 | M06 | M07 ┃ M08 ┃ │ │ ┃ ┃LEFT │DOWN │RIGHT│UP │ + * │TAB │ M05 | M06 | M07 ┃ M08 ┃ │ │ ┃LEFT ┃DOWN │RIGHT│ │UP │ * │SHIFT│ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │RIGHT│ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ │ , | . | ? │DOWN │ * │ │ │ │ │ │ │ │ │ │ │ │ │LEFT │ * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │RGB1 │RGB2 │RGB3 │RGB4 │ │ │ │ │ │ │ │ │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_FN] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - _____________FUNCTION_412_L1_______________, _____________FUNCTION_412_R1_______________, - _____________FUNCTION_412_L2_______________, _____________FUNCTION_412_R2_______________, - _____________FUNCTION_412_L3_______________, _____________FUNCTION_412_R3_______________, - _____________FUNCTION_412_L4_______________, _____________FUNCTION_412_R4_______________ + KC_MUTE, + _____________FUNCTION_412_L1_______________, _____________FUNCTION_412_R1_______________, + _____________FUNCTION_412_L2_______________, _____________FUNCTION_412_R2_______________, + _____________FUNCTION_412_L3_______________, _____________FUNCTION_412_R3_______________, + _____________FUNCTION_412_L4_______________, _____________FUNCTION_412_R4_______________ ), @@ -158,11 +158,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_SYMB] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, - _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, - _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + KC_MUTE, + _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, + _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, + _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; @@ -181,4 +181,45 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_FN] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, [_SYMB] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } }; -#endif \ No newline at end of file +#endif + + +#ifdef OLED_ENABLE +bool oled_task_user(void) { + // Host Keyboard Layer Status + oled_write_P(PSTR("Layer: "), false); + + switch (get_highest_layer(layer_state)) { + case _LOWER: + oled_write_P(PSTR("LOWER"), false); + break; + case _RAISE: + oled_write_P(PSTR("RAISE"), false); + break; + case _EX: + oled_write_P(PSTR("EXTRA"), false); + break; + case _FN: + oled_write_P(PSTR("FUNCTION"), false); + break; + case _WM: + oled_write_P(PSTR("WORKMAN"), false); + break; + case _SYMB: + oled_write_P(PSTR("SYMBOLS"), false); + break; + default: + // Or use the write_ln shortcut over adding '\n' to the end of your string + oled_write_ln_P(PSTR("HOME"), false); + } + +// Host Keyboard LED Status + // led_t led_state = host_keyboard_led_state(); + // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + return false; +} +#endif + diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h index 506a22e3f5e5..66b9224406e5 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h @@ -3,7 +3,7 @@ #pragma once -# define TAPPING_TERM 170 +# define TAPPING_TERM 160 // 30APR23 was 170 # define TAPPING_TERM_PER_KEY # define QUICK_TAP_TERM TAPPING_TERM / 2 # define QUICK_TAP_TERM_PER_KEY diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/keymap.c b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/keymap.c index b1c7b27b6575..60e24c0d507d 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/keymap.c +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Workman * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ * │ TAB │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ BSPC│ - * │ ESC │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ ; │ ; │ + * │ ESC │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ * │ TAB │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ │ * │SHIFT│ │ │ ┃ EX ┃ │ │ ┃ ┃ │ │ENTER│ENTER│ @@ -26,19 +26,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_WM] = LAYOUT_ortho_4x12_wrapper ( - RGB_TOG, - _____________WORKMAN_412_001_L_____________, _____________WORKMAN_412_001_R_____________, - _____________WORKMAN_412_002_L_____________, _____________WORKMAN_412_002_R_____________, - _____________WORKMAN_412_003_L_____________, _____________WORKMAN_412_003_R_____________, - _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ + RGB_TOG, + _____________WORKMAN_412_001_L_____________, _____________WORKMAN_412_001_R_____________, + _____________WORKMAN_412_002_L_____________, _____________WORKMAN_412_002_R_____________, + _____________WORKMAN_412_003_L_____________, _____________WORKMAN_412_003_R_____________, + _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ ), [_QW] = LAYOUT_ortho_4x12_wrapper ( - RGB_TOG, - KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, - KC_ESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, - KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT, - _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ + RGB_TOG, + KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, + KC_ESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, + KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT, + _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ ), @@ -60,11 +60,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_LOWER] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - _______________LOWER_412_L1________________, _______________LOWER_412_R1________________, - _______________LOWER_412_L2________________, _______________LOWER_412_R2________________, - _______________LOWER_412_L3________________, _______________LOWER_412_R3________________, - _______________LOWER_412_L4________________, _______________LOWER_412_R4________________ + KC_MUTE, + _______________LOWER_412_L1________________, _______________LOWER_412_R1________________, + _______________LOWER_412_L2________________, _______________LOWER_412_R2________________, + _______________LOWER_412_L3________________, _______________LOWER_412_R3________________, + _______________LOWER_412_L4________________, _______________LOWER_412_R4________________ ), @@ -83,13 +83,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ - [_RAISE] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - _______________RAISE_412_L1________________, _______________RAISE_412_R1________________, - _______________RAISE_412_L2________________, _______________RAISE_412_R2________________, - _______________RAISE_412_L3________________, _______________RAISE_412_R3________________, - _________________BLANK_6___________________, _________________BLANK_6___________________ - ), + [_RAISE] = LAYOUT_ortho_4x12_wrapper ( + KC_MUTE, + _______________RAISE_412_L1________________, _______________RAISE_412_R1________________, + _______________RAISE_412_L2________________, _______________RAISE_412_R2________________, + _______________RAISE_412_L3________________, _______________RAISE_412_R3________________, + _________________BLANK_6___________________, _________________BLANK_6___________________ + ), /* EXTRAS @@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ ! │ │ │ │ │ │ │ /\ | [ | ] | ; │ │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │SHIFT│ | |EXTRA┃ ┃ │ │ ┃ ┃ ( | ) | ' | │ + * │SHIFT│ | |EXTRA┃ ┃ │ │ ┃ @ # ┃ & % | | ' | │ * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ * │ │ │ │ │ │ │ │ │ │ , | . | ? │ │ @@ -108,36 +108,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_EX] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - ______________EXTRAS_412_L1________________, ______________EXTRAS_412_R1________________, - ______________EXTRAS_412_L2________________, ______________EXTRAS_412_R2________________, - ______________EXTRAS_412_L3________________, ______________EXTRAS_412_R3________________, - ______________EXTRAS_412_L4________________, ______________EXTRAS_412_R4________________ + KC_MUTE, + ______________EXTRAS_412_L1________________, ______________EXTRAS_412_R1________________, + ______________EXTRAS_412_L2________________, ______________EXTRAS_412_R2________________, + ______________EXTRAS_412_L3________________, ______________EXTRAS_412_R3________________, + ______________EXTRAS_412_L4________________, ______________EXTRAS_412_R4________________ ), /* FUNCTION * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │COPY │CLIP │ SS │ │ │ │ │ │ /\ │ │ UP │ │ DEL │ + * │COPY │CLIP │ SS │ │ │ │ │ │ /\ │ UP │ │ │ DEL │ * │PASTE│ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │TAB │ M05 | M06 | M07 ┃ M08 ┃ │ │ ┃ ┃LEFT │DOWN │RIGHT│UP │ + * │TAB │ M05 | M06 | M07 ┃ M08 ┃ │ │ ┃LEFT ┃DOWN │RIGHT│ │UP │ * │SHIFT│ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │RIGHT│ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ │ , | . | ? │DOWN │ * │ │ │ │ │ │ │ │ │ │ │ │ │LEFT │ * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │RGB1 │RGB2 │RGB3 │RGB4 │ │ │ │ │ │ │ │ │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_FN] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - _____________FUNCTION_412_L1_______________, _____________FUNCTION_412_R1_______________, - _____________FUNCTION_412_L2_______________, _____________FUNCTION_412_R2_______________, - _____________FUNCTION_412_L3_______________, _____________FUNCTION_412_R3_______________, - _____________FUNCTION_412_L4_______________, _____________FUNCTION_412_R4_______________ + KC_MUTE, + _____________FUNCTION_412_L1_______________, _____________FUNCTION_412_R1_______________, + _____________FUNCTION_412_L2_______________, _____________FUNCTION_412_R2_______________, + _____________FUNCTION_412_L3_______________, _____________FUNCTION_412_R3_______________, + _____________FUNCTION_412_L4_______________, _____________FUNCTION_412_R4_______________ ), @@ -158,11 +158,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_SYMB] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, - _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, - _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + KC_MUTE, + _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, + _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, + _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; @@ -181,4 +181,45 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_FN] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, [_SYMB] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } }; -#endif \ No newline at end of file +#endif + + +#ifdef OLED_ENABLE +bool oled_task_user(void) { + // Host Keyboard Layer Status + oled_write_P(PSTR("Layer: "), false); + + switch (get_highest_layer(layer_state)) { + case _LOWER: + oled_write_P(PSTR("LOWER"), false); + break; + case _RAISE: + oled_write_P(PSTR("RAISE"), false); + break; + case _EX: + oled_write_P(PSTR("EXTRA"), false); + break; + case _FN: + oled_write_P(PSTR("FUNCTION"), false); + break; + case _WM: + oled_write_P(PSTR("WORKMAN"), false); + break; + case _SYMB: + oled_write_P(PSTR("SYMBOLS"), false); + break; + default: + // Or use the write_ln shortcut over adding '\n' to the end of your string + oled_write_ln_P(PSTR("HOME"), false); + } + +// Host Keyboard LED Status + // led_t led_state = host_keyboard_led_state(); + // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + return false; +} +#endif + diff --git a/keyboards/hazel/bad_wings/keymaps/miketronic/config.h b/keyboards/hazel/bad_wings/keymaps/miketronic/config.h new file mode 100644 index 000000000000..6f568fd361b9 --- /dev/null +++ b/keyboards/hazel/bad_wings/keymaps/miketronic/config.h @@ -0,0 +1,19 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#pragma once + +# define TAPPING_TERM 170 +# define TAPPING_TERM_PER_KEY +# define QUICK_TAP_TERM TAPPING_TERM / 2 +# define QUICK_TAP_TERM_PER_KEY +# define PERMISSIVE_HOLD_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY +# define IGNORE_MOD_TAP_INTERRUPT +# define TAPPING_FORCE_HOLD +# define ONESHOT_TAP_TOGGLE 10 +# define ONESHOT_TIMEOUT 500 +# define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD +# define CIRQUE_PINNACLE_TAP_ENABLE +# define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_ABSOLUTE_MODE +# define CIRQUE_DEVICE_GESTURES_SCROLL_ENABLE \ No newline at end of file diff --git a/keyboards/hazel/bad_wings/keymaps/miketronic/keymap.c b/keyboards/hazel/bad_wings/keymaps/miketronic/keymap.c new file mode 100644 index 000000000000..013c8c1a5da3 --- /dev/null +++ b/keyboards/hazel/bad_wings/keymaps/miketronic/keymap.c @@ -0,0 +1,190 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#include "miketronic.h" + + +/* +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, 1, 2, 3); +} + + + [0] = LAYOUT_split_3x5_3( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ + KC_Z, LGUI_T(KC_X), LALT_T(KC_C), KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ + KC_LCTL, OSL(1), OSM(MOD_LSFT), KC_SPC, LT(2, KC_BSPC), KC_ENT + ), + [1] = LAYOUT_split_3x5_3( + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_RBRC, KC_RCBR, KC_RPRN, KC_RABK, KC_NO, \ + KC_GRV, KC_TILD, KC_UNDS, KC_EQL, KC_NO, KC_LBRC, KC_LCBR, KC_LPRN, KC_LABK, KC_BACKSLASH, \ + KC_NO, KC_NO, KC_PLUS, KC_MINS, KC_NO, KC_NO, KC_NO, KC_COLN, KC_DOT, KC_SCLN, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [2] = LAYOUT_split_3x5_3( + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_PIPE, KC_NO, \ + KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \ + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_DOT, KC_NO, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + [3] = LAYOUT_split_3x5_3( + KC_ESC, KC_F1, KC_F4, KC_F7, KC_F10, KC_NO, KC_HOME, KC_UP, KC_END, KC_BSPC, \ + KC_TAB, KC_F2, KC_F5, KC_F8, KC_F11, KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT, KC_ENT, \ + KC_NO, KC_F3, KC_F6, KC_F9, KC_F12, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_DEL, \ + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +*/ + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* WORKMAN + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ + * │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ + * │SHIFT│ │ ┃ EX ┃ │ │ ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ENTER│ + * │ FN │ CTRL│ OS │ ALT │LOWER│ │RAISE│ │ , │ . │ │ + * └─────┴─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┴─────┘ + * │OSM │SPACE│LOWER│ │RAISE│ENTER│COPY │ + * │SHIFT│ │ │ │ │ │PASTE│ + * └─────┴─────┴─────┘ └─────┴─────┴─────┘ +*/ + [_WM] = LAYOUT_split_3x5_3_wrapper ( + _____________WORKMAN_310_001_L_____________, _____________WORKMAN_310_001_R_____________, + _____________WORKMAN_310_002_L_____________, _____________WORKMAN_310_002_R_____________, + _____________WORKMAN_310_003_L_____________, _____________WORKMAN_310_003_R_____________, + _________3KEY_LEFT___________, _________3KEY_RIGHT__________ + ), + + [_QW] = LAYOUT_split_3x5_3_wrapper ( + _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, + _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, + _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, + _________3KEY_LEFT___________, _________3KEY_RIGHT__________ + ), + + + + /* LOWER + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ () │ [] │ /\ │ │ │ │ │ 7 │ 8 │ 9 │ │ + * │ │ <> │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ @ # │ & % │ ┃ ┃ │ │ . ┃ 4 ┃ 5 │ 6 │ UP │ + * │ │ │ ┃ ┃ │ │ENTER┃ ┃ │ │RIGHT│ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ │ │ │ │ │ 0 │ 1 │ 2 │ 3 │ DOWN│ + * │ │ │ │ │LOWER│ │ │ │ 0 │ │ LEFT│ + * └─────┴─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┴─────┘ + * │OSM │SPACE│LOWER│ │RAISE│ENTER│COPY │ + * │SHIFT│ │ │ │ │ │PASTE│ + * └─────┴─────┴─────┘ └─────┴─────┴─────┘ +*/ + [_LOWER] = LAYOUT_split_3x5_3_wrapper ( + _______________LOWER_310_L1________________, _______________LOWER_310_R1________________, + _______________LOWER_310_L2________________, _______________LOWER_310_R2________________, + _______________LOWER_310_L3________________, _______________LOWER_310_R3________________, + _________3KEY_LEFT___________, _________3KEY_RIGHT__________ + ), + + + + /* RAISE + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ BOOT│DEBUG│ │ │ MAKE│ │ │ F7 │ F8 │ F9 │ F10 │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ │ RGB │ RGB ┃ RGB ┃ RGB │ │ _ ┃ F4 ┃ F5 │ F6 │ F11 │ + * │ │ TOG │ MOD ┃ HUI ┃ HUD │ │ - ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ RGB │ RGB │ RGB │ RGB │ │ │ F1 │ F2 │ F3 │ F12 │ + * │ │ SAI │ SAD │ VAI │ VAD │ │RAISE│ │ │ │ │ + * └─────┴─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┴─────┘ + * │OSM │SPACE│LOWER│ │RAISE│ENTER│COPY │ + * │SHIFT│ │ │ │ │ │PASTE│ + * └─────┴─────┴─────┘ └─────┴─────┴─────┘ +*/ + [_RAISE] = LAYOUT_split_3x5_3_wrapper ( + _______________RAISE_310_L1________________, _______________RAISE_310_R1________________, + _______________RAISE_310_L2________________, _______________RAISE_310_R2________________, + _______________RAISE_310_L3________________, _______________RAISE_310_R3________________, + _________3KEY_LEFT___________, _________3KEY_RIGHT__________ + ), + + + + /* EXTRAS + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ ! │ │ │ │ │ │ │ /\ | () | [] | ; │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ │ │ ┃EXTRA┃ │ │ ┃ @ # ┃ & % | │ ' │ + * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ , │ . │ ? │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┴─────┘ + * │OSM │SPACE│LOWER│ │RAISE│ENTER│COPY │ + * │SHIFT│ │ │ │ │ │PASTE│ + * └─────┴─────┴─────┘ └─────┴─────┴─────┘ +*/ + [_EX] = LAYOUT_split_3x5_3_wrapper ( + ______________EXTRAS_310_L1________________, ______________EXTRAS_310_R1________________, + ______________EXTRAS_310_L2________________, ______________EXTRAS_310_R2________________, + ______________EXTRAS_310_L3________________, ______________EXTRAS_310_R3________________, + _________3KEY_LEFT___________, _________3KEY_RIGHT__________ + ), + + + + /* FUNCTION + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │COPY │CLIP │ SS │ │ │ │ │ /\ │ UP │ │ DEL │ + * │PASTE│ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ TAB │ M05 │ M06 ┃ M07 ┃ M08 │ │ ┃ LEFT┃ DOWN│RIGHT│ UP │ + * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │RIGHT│ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ , │ . │DOWN │ + * │ FN │ │ │ │ │ │ │ │ │ │LEFT │ + * └─────┴─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┴─────┘ + * │OSM │SPACE│LOWER│ │RAISE│ENTER│COPY │ + * │SHIFT│ │ │ │ │ │PASTE│ + * └─────┴─────┴─────┘ └─────┴─────┴─────┘ +*/ + [_FN] = LAYOUT_split_3x5_3_wrapper ( + _____________FUNCTION_310_L1_______________, _____________FUNCTION_310_R1_______________, + _____________FUNCTION_310_L2_______________, _____________FUNCTION_310_R2_______________, + _____________FUNCTION_310_L3_______________, _____________FUNCTION_310_R3_______________, + _________3KEY_LEFT___________, _________3KEY_RIGHT__________ + ), + + + + /* SYMBOLS + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ $ │ ^ │ < │ > │ │ │ │ | │ [ │ ] │ - │ + * │ │ │ │ │ SYMB│ │ SYMB│ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ % │ : │ ; ┃ + ┃ = │ │ ┃ ┃ ( │ ) │ _ │ + * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ & │ ' │ " │ * │ # │ │ ! │ ? │ / │ \ │ @ │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┴─────┘ + * │OSM │SPACE│LOWER│ │RAISE│ENTER│COPY │ + * │SHIFT│ │ │ │ │ │PASTE│ + * └─────┴─────┴─────┘ └─────┴─────┴─────┘ +*/ + [_SYMB] = LAYOUT_split_3x5_3_wrapper ( + KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXX, XXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, + KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, + KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, + _________3KEY_LEFT___________, _________3KEY_RIGHT__________ + ), + +}; \ No newline at end of file diff --git a/keyboards/hazel/bad_wings/keymaps/miketronic/rules.mk b/keyboards/hazel/bad_wings/keymaps/miketronic/rules.mk new file mode 100644 index 000000000000..a223448a6d4c --- /dev/null +++ b/keyboards/hazel/bad_wings/keymaps/miketronic/rules.mk @@ -0,0 +1,30 @@ +# Common feature for all keyboards +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 + +# Keyboard specific +MOUSEKEY_ENABLE = yes # Mouse keys +CAPS_WORD_ENABLE = yes +KEY_OVERRIDE_ENABLE = yes + + + LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. + AUTO_SHIFT_ENABLE = no + UNICODE_ENABLE = no # Unicode + CONSOLE_ENABLE = no # Console for debug + COMMAND_ENABLE = no # Commands for debug and configuration + RGBLIGHT_ENABLE = no + BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality + SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) + AUDIO_ENABLE = no # Audio output on port C6 + MIDI_ENABLE = no # MIDI support + BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID + GRAVE_ESC_ENABLE = no + SPACE_CADET_ENABLE = no + COMBO_ENABLE = no + OLED_ENABLE = no + ENCODER_ENABLE = no + ENCODER_MAP_ENABLE = no diff --git a/keyboards/hazel/satpad/config.h b/keyboards/hazel/satpad/config.h new file mode 100644 index 000000000000..7b9637ef9c2c --- /dev/null +++ b/keyboards/hazel/satpad/config.h @@ -0,0 +1 @@ +#pragma once \ No newline at end of file diff --git a/keyboards/hazel/satpad/info.json b/keyboards/hazel/satpad/info.json new file mode 100644 index 000000000000..3caad7bb2e05 --- /dev/null +++ b/keyboards/hazel/satpad/info.json @@ -0,0 +1,82 @@ +{ + "keyboard_name": "SatPad", + "manufacturer": "jasonhazel", + "usb": { + "vid": "0x4A48", + "pid": "0x7370", + "device_version": "0.0.1" + }, + "matrix_size": { + "cols": 6, + "rows": 7 + }, + "diode_direction": "COL2ROW", + "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "mousekey": true, + "nkro": false, + "encoder": true + }, + "matrix_pins": { + "rows": ["B3", "B2", "B6", "D3", "D2", "D4", "E6"], + "cols": ["F4", "F5", "F6", "F7", "B1", "D7"] + }, + "encoder": { + "rotary": [ + { "pin_a": "B4", "pin_b": "B5" } + ] + }, + "bootmagic": { + "enabled": true, + "matrix": [0,0] + }, + "processor": "atmega32u4", + "url": "https://github.com/jasonhazel/satpad", + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + + { "matrix": [3, 4], "x": 6, "y": 0 }, + { "matrix": [3, 3], "x": 7, "y": 0 }, + { "matrix": [3, 2], "x": 8, "y": 0 }, + { "matrix": [3, 1], "x": 9, "y": 0 }, + { "matrix": [3, 0], "x": 10, "y": 0 }, + + { "matrix": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "x": 2, "y": 1 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [1, 4], "x": 4, "y": 1 }, + + { "matrix": [4, 4], "x": 6, "y": 1 }, + { "matrix": [4, 3], "x": 7, "y": 1 }, + { "matrix": [4, 2], "x": 8, "y": 1 }, + { "matrix": [4, 1], "x": 9, "y": 1 }, + { "matrix": [4, 0], "x": 10, "y": 1 }, + + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 }, + { "matrix": [2, 3], "x": 3, "y": 2 }, + { "matrix": [2, 4], "x": 4, "y": 2 }, + + { "matrix": [6, 5], "x": 5, "y": 2 }, + + { "matrix": [5, 4], "x": 6, "y": 2 }, + { "matrix": [5, 3], "x": 7, "y": 2 }, + { "matrix": [5, 2], "x": 8, "y": 2 }, + { "matrix": [5, 1], "x": 9, "y": 2 }, + { "matrix": [5, 0], "x": 10, "y": 2 } + + ] + } + } +} \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/config.h b/keyboards/hazel/satpad/keymaps/default/config.h new file mode 100644 index 000000000000..c6b2abb79748 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/default/config.h @@ -0,0 +1,19 @@ +#pragma once + + +#define TAPPING_TERM 200 +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT +#define TAPPING_FORCE_HOLD + +#define ONESHOT_TAP_TOGGLE 10 +#define ONESHOT_TIMEOUT 500 +#define COMBO_TERM 200 + +#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD + +// disable shit +#define NO_MUSIC_MODE + +#undef LOCKING_SUPPORT_ENABLE +#undef LOCKING_RESYNC_ENABLE \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/keymap.c b/keyboards/hazel/satpad/keymaps/default/keymap.c new file mode 100644 index 000000000000..5f863022f2ee --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/default/keymap.c @@ -0,0 +1,62 @@ +#include QMK_KEYBOARD_H + +enum layers { + _BASE, + LAYER_LENGTH +}; + +enum combos { + COMBO_SPACE, + COMBO_BACKSP, + COMBO_ENTER, + COMBO_TAB, + COMBO_ESC, + COMBO_LENGTH +}; + +uint16_t COMBO_LEN = COMBO_LENGTH; +const uint16_t PROGMEM combo_space[] = { KC_N, KC_M, COMBO_END }; +const uint16_t PROGMEM combo_backspace[] = { KC_O, KC_P, COMBO_END }; +const uint16_t PROGMEM combo_enter[] = { KC_L, KC_QUOT, COMBO_END }; +const uint16_t PROGMEM combo_tab[] = { KC_A, KC_S, COMBO_END }; +const uint16_t PROGMEM combo_esc[] = { KC_Q, KC_W, COMBO_END }; + +combo_t key_combos[] = { + [COMBO_SPACE] = COMBO(combo_space, KC_SPC), + [COMBO_BACKSP] = COMBO(combo_backspace, KC_BSPC), + [COMBO_ENTER] = COMBO(combo_enter, KC_ENT), + [COMBO_TAB] = COMBO(combo_tab, KC_TAB), + [COMBO_ESC] = COMBO(combo_esc, KC_ESC) +}; + +enum tapdances { + TD_QESC, + TAPDANCE_LENGTH +}; + +tap_dance_action_t tap_dance_actions[] = { + [TD_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), +}; + +const key_override_t **key_overrides = (const key_override_t *[]) { + NULL +}; + +#define QESC TD(TD_QESC) +#define BSFT LSFT_T(KC_B) +#define VCTL LCTL_T(KC_V) +#define CGUI LGUI_T(KC_C) +#define XALT LALT_T(KC_X) + +#define ______ KC_NO +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ + KC_Z, XALT, CGUI, VCTL, BSFT, KC_SPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH + ), +}; + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_BASE] = { ENCODER_CCW_CW(KC_DOWN, KC_UP) }, +}; \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/rules.mk b/keyboards/hazel/satpad/keymaps/default/rules.mk new file mode 100644 index 000000000000..fb4dbb68160f --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/default/rules.mk @@ -0,0 +1,17 @@ +GRAVE_ESC_ENABLE = no +SPACE_CADET_ENABLE = no + +CAPS_WORD_ENABLE = yes +KEY_OVERRIDE_ENABLE = yes +COMBO_ENABLE = yes +TAP_DANCE_ENABLE = yes +OLED_ENABLE = yes +OLED_DRIVER = SSD1306 +ENCODER_MAP_ENABLE = yes + +# OLED WIDGETS + +# WPM_ENABLE = no +# KEYCOUNT_ENABLE = yes +# KEYLOG_ENABLE = no +# KEYLOG_DEBUG = no \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/config.h b/keyboards/hazel/satpad/keymaps/miketronic/config.h new file mode 100644 index 000000000000..278d0b0fbe65 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/miketronic/config.h @@ -0,0 +1,8 @@ +#pragma once + +# define TAPPING_TERM 170 +# define TAPPING_TERM_PER_KEY +# define QUICK_TAP_TERM TAPPING_TERM / 2 +# define QUICK_TAP_TERM_PER_KEY +# define PERMISSIVE_HOLD_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c new file mode 100644 index 000000000000..80ae57c893f0 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c @@ -0,0 +1,225 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#include "miketronic.h" + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* WORKMAN + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ + * │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ + * │SHIFT│ │ ┃ EX ┃ │ │ ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ENTER│ + * │ FN │ CTRL│ OS │ ALT │LOWER│ │RAISE│ │ , │ . │ │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + * + */ + + [_WM] = LAYOUT_3x11_wrapper ( + _____________WORKMAN_311_001_L_____________, _____________WORKMAN_311_001_R_____________, + _____________WORKMAN_311_002_L_____________, _____________WORKMAN_311_002_R_____________, + _____________WORKMAN_311_003_L_____________, _____________WORKMAN_311_003_R_____________ + ), + + [_QW] = LAYOUT_3x11_wrapper ( + _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, + _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, + _________________QWERTY_L3_________________, KC_ENT, _________________QWERTY_R3_________________ + ), + + + /* LOWER + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ () │ [] │ /\ │ │ │ │ │ 7 │ 8 │ 9 │ │ + * │ │ <> │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ @ # │ & % │ ┃ ┃ │ │ . ┃ 4 ┃ 5 │ 6 │ UP │ + * │ │ │ ┃ ┃ │ │ENTER┃ ┃ │ │RIGHT│ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ │ │ │ │ │ 0 │ 1 │ 2 │ 3 │ DOWN│ + * │ │ │ │ │LOWER│ │ │ │ 0 │ │ LEFT│ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + * + */ + + [_LOWER] = LAYOUT_3x11_wrapper ( + _______________LOWER_310_L1________________, _______________LOWER_310_R1________________, + _______________LOWER_310_L2________________, _______________LOWER_310_R2________________, + _______________LOWER_310_L3________________, KC_ENT, _______________LOWER_310_R3________________ + ), + + + /* RAISE + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ BOOT│DEBUG│ │ │ MAKE│ │ │ F7 │ F8 │ F9 │ F10 │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ │ RGB │ RGB ┃ RGB ┃ RGB │ │ _ ┃ F4 ┃ F5 │ F6 │ F11 │ + * │ │ TOG │ MOD ┃ HUI ┃ HUD │ │ - ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ RGB │ RGB │ RGB │ RGB │ │ │ F1 │ F2 │ F3 │ F12 │ + * │ │ SAI │ SAD │ VAI │ VAD │ │RAISE│ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + * + */ + + [_RAISE] = LAYOUT_3x11_wrapper ( + _______________RAISE_310_L1________________, _______________RAISE_310_R1________________, + _______________RAISE_310_L2________________, _______________RAISE_310_R2________________, + _______________RAISE_310_L3________________, KC_ENT, _______________RAISE_310_R3________________ + ), + + + + /* EXTRAS + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ ! │ │ │ │ │ │ │ /\ | () | [] | ; │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ │ │ ┃EXTRA┃ │ │ ┃ @ # ┃ & % | │ ' │ + * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ , │ . │ ? │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + */ + + [_EX] = LAYOUT_3x11_wrapper ( + ______________EXTRAS_310_L1________________, ______________EXTRAS_310_R1________________, + ______________EXTRAS_310_L2________________, ______________EXTRAS_310_R2________________, + ______________EXTRAS_310_L3________________, KC_ENT, ______________EXTRAS_310_R3________________ +), + + + + /* FUNCTION + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │COPY │CLIP │ SS │ │ │ │ │ /\ │ UP │ │ DEL │ + * │PASTE│ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ TAB │ M05 │ M06 ┃ M07 ┃ M08 │ │ ┃ LEFT┃ DOWN│RIGHT│ UP │ + * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │RIGHT│ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ , │ . │DOWN │ + * │ FN │ │ │ │ │ │ │ │ │ │LEFT │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + */ + + [_FN] = LAYOUT_3x11_wrapper ( + _____________FUNCTION_310_L1_______________, _____________FUNCTION_310_R1_______________, + _____________FUNCTION_310_L2_______________, _____________FUNCTION_310_R2_______________, + _____________FUNCTION_310_L3_______________, KC_ENT, _____________FUNCTION_310_R3_______________ + ), + + + + /* SYMBOLS + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ $ │ ^ │ < │ > │ │ │ │ | │ [ │ ] │ - │ + * │ │ │ │ │ SYMB│ │ SYMB│ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ % │ : │ ; ┃ + ┃ = │ │ ┃ ┃ ( │ ) │ _ │ + * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ & │ ' │ " │ * │ # │ │ ! │ ? │ / │ \ │ @ │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + */ + + [_SYMB] = LAYOUT_3x11_wrapper ( + KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXX, XXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, + KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, + KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_ENT, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT + ), + + +}; + + +void matrix_init_user(void) { + // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values + // set num lock on at start (for numonly layer to work) + if (!host_keyboard_led_state().num_lock) { + tap_code(KC_NUM_LOCK); + } +} + +void matrix_scan_user(void) { +} + + +#ifndef NUM_DIRECTIONS +# define NUM_DIRECTIONS 2 +#endif + +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_SPC, KC_ENT) }, + [_LOWER] = { ENCODER_CCW_CW(____, ____) }, + [_RAISE] = { ENCODER_CCW_CW(____, ____) }, + [_EX] = { ENCODER_CCW_CW(____, ____) }, + [_FN] = { ENCODER_CCW_CW(____, ____) }, + [_SYMB] = { ENCODER_CCW_CW(____, ____) } +}; + + +oled_rotation_t oled_init_user(oled_rotation_t rotation){ + return OLED_ROTATION_270; +} + +/* +bool oled_task_user(void) { + uint8_t modifiers = get_mods() | get_oneshot_mods(); + + oled_set_cursor(0, 11); + oled_write_P(PSTR("SHIFT"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); + oled_write_P(PSTR("CNTRL"), (modifiers & MOD_MASK_CTRL)); + + return true; +} +*/ + +#ifdef OLED_ENABLE +bool oled_task_user(void) { + // Host Keyboard Layer Status + oled_write_P(PSTR("LAYER\n-----\n"), false); + + switch (get_highest_layer(layer_state)) { + case _LOWER: + oled_write_P(PSTR("LOWER"), false); + break; + case _RAISE: + oled_write_P(PSTR("RAISE"), false); + break; + case _EX: + oled_write_P(PSTR("EXTRA"), false); + break; + case _FN: + oled_write_P(PSTR("FUNCT"), false); + break; + case _WM: + oled_write_P(PSTR("WMAN"), false); + break; + case _SYMB: + oled_write_P(PSTR("SYMB"), false); + break; + default: + // Or use the write_ln shortcut over adding '\n' to the end of your string + oled_write_ln_P(PSTR("HOME"), false); + } + +// Host Keyboard LED Status + // led_t led_state = host_keyboard_led_state(); + // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + return false; +} +#endif + diff --git a/keyboards/hazel/satpad/keymaps/miketronic/rules.mk b/keyboards/hazel/satpad/keymaps/miketronic/rules.mk new file mode 100644 index 000000000000..16c8997b4e45 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/miketronic/rules.mk @@ -0,0 +1,38 @@ +# Common feature for all keyboards +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 + +# Keyboard specific +MOUSEKEY_ENABLE = yes # Mouse keys +CAPS_WORD_ENABLE = yes +KEY_OVERRIDE_ENABLE = yes +OLED_ENABLE = yes + OLED_DRIVER = SSD1306 + ENCODER_ENABLE = yes + ENCODER_MAP_ENABLE = yes + + + LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. + AUTO_SHIFT_ENABLE = no + UNICODE_ENABLE = no # Unicode + CONSOLE_ENABLE = no # Console for debug + COMMAND_ENABLE = no # Commands for debug and configuration + RGBLIGHT_ENABLE = no + BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality + SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) + AUDIO_ENABLE = no # Audio output on port C6 + MIDI_ENABLE = no # MIDI support + BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID + GRAVE_ESC_ENABLE = no + SPACE_CADET_ENABLE = no + COMBO_ENABLE = no + + # OLED WIDGETS + + # WPM_ENABLE = no + # KEYCOUNT_ENABLE = yes + # KEYLOG_ENABLE = no + # KEYLOG_DEBUG = no \ No newline at end of file diff --git a/keyboards/hazel/satpad/rules.mk b/keyboards/hazel/satpad/rules.mk new file mode 100644 index 000000000000..978dae94bbb4 --- /dev/null +++ b/keyboards/hazel/satpad/rules.mk @@ -0,0 +1 @@ +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/hazel/satpad/satpad.c b/keyboards/hazel/satpad/satpad.c new file mode 100644 index 000000000000..238a1502eec2 --- /dev/null +++ b/keyboards/hazel/satpad/satpad.c @@ -0,0 +1,24 @@ +#include QMK_KEYBOARD_H +#include + +#ifdef OLED_ENABLE + oled_rotation_t oled_init_kb(oled_rotation_t rotation) { + return OLED_ROTATION_270; + }; + + + bool oled_task_kb(void) { + if (oled_task_user()) { + oled_set_cursor(0,0); + oled_write_P(PSTR("SAT PAD"), false); + uint8_t modifiers = get_mods() | get_oneshot_mods(); + + oled_set_cursor(1,14); + oled_write_P(PSTR("S"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); + oled_write_P(PSTR("C"), (modifiers & MOD_MASK_CTRL)); + oled_write_P(PSTR("A"), (modifiers & MOD_MASK_ALT)); + oled_write_P(PSTR("G"), (modifiers & MOD_MASK_GUI)); + } + return true; + }; +#endif \ No newline at end of file diff --git a/keyboards/idobao/id75/keymaps/miketronic/config.h b/keyboards/idobao/id75/keymaps/miketronic/config.h new file mode 100644 index 000000000000..3453917e9296 --- /dev/null +++ b/keyboards/idobao/id75/keymaps/miketronic/config.h @@ -0,0 +1,29 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#pragma once + +# define USB_POLLING_INTERVAL_MS 1 +# undef RGBLIGHT_HUE_STEP +# define RGBLIGHT_HUE_STEP 1 +# undef RGBLIGHT_SAT_STEP +# define RGBLIGHT_SAT_STEP 1 +# undef RGBLIGHT_VAL_STEP +# define RGBLIGHT_VAL_STEP 1 +# define RGBLIGHT_SLEEP +# define RGBLIGHT_LAYERS +# define FORCE_NKRO + +# define TAPPING_TERM 160 // 30APR23 was 170 +# define TAPPING_TERM_PER_KEY +# define QUICK_TAP_TERM TAPPING_TERM / 2 +# define QUICK_TAP_TERM_PER_KEY +# define PERMISSIVE_HOLD_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY + +# define LEADER_NO_TIMEOUT +# define LEADER_TIMEOUT 300 +# define LEADER_PER_KEY_TIMING + + + diff --git a/keyboards/idobao/id75/keymaps/miketronic/keymap.c b/keyboards/idobao/id75/keymaps/miketronic/keymap.c new file mode 100644 index 000000000000..efd071fc35a7 --- /dev/null +++ b/keyboards/idobao/id75/keymaps/miketronic/keymap.c @@ -0,0 +1,204 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#include "miketronic.h" + + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + +/* WORKMAN + * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. + * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | TAB/ESC || Q || D || R || W || B SYM || 7 || 8 || 9 || J SYM || F || U || P || BSPC || BSPC | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | TAB/SHFT || A || S || H || T EX || G || 4 || 5 || 6 || Y || N || E || O || I || ENTER | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | LSHIFT || Z || X || M || C || V || 1 || 2 0 || 3 || K || L || , SPC || . SPC ||SHFT/ENT || Up/Rght | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | FN || LCTRL || GUI || LALT || LOWER || Space || Space || . Enter || Enter || Enter || RAISE || SS || CLIP ||CopyPaste|| Dn/Left | + * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' + */ + + [_WM] = LAYOUT_ortho_5x15_wrapper ( + _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, + _____________WORKMAN_412_001_L_____________, ________3KEY_ID75_02_________, _____________WORKMAN_412_001_R_____________, + _____________WORKMAN_412_002_L_____________, ________3KEY_ID75_03_________, _____________WORKMAN_412_002_R_____________, + _____________WORKMAN_412_003_L_____________, ________3KEY_ID75_04_________, _____________WORKMAN_412_003_R_____________, + _____________WORKMAN_ID75_BOT_L____________, ________3KEY_ID75_05_________, _____________WORKMAN_ID75_BOT_R____________ + ), + + + [_QW] = LAYOUT_ortho_5x15_wrapper ( + KC_ESC, _________________QWERTY_L1_________________, ________3KEY_ID75_01_________, _________________QWERTY_R1_________________, KC_BSPC, + KC_TAB, _________________QWERTY_L1_________________, ________3KEY_ID75_02_________, _________________QWERTY_R1_________________, BRACES, + KC_LSFT, _________________QWERTY_L2_________________, ________3KEY_ID75_03_________, _________________QWERTY_R2_________________, KC_QUOT, + FN, _________________QWERTY_L3_________________, ________3KEY_ID75_04_________, _________________QWERTY_R3_________________, TD_UR, + _____________WORKMAN_ID75_BOT_L____________, ________3KEY_ID75_05_________, _____________WORKMAN_ID75_BOT_R____________ + ), + + + +/* LOWER + * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. + * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || () || [] || /\ || || || 7 || 8 || 9 || || 7 || 8 || 9 || || | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || @ # || & % || || || || 4 || 5 || 6 || || 4 || 5 || 6 || || | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || || || || || || 1 || 2 0 || 3 || 0 || 1 || 2 0 || 3 || || Up/Rght | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || || || || || || Space || . Enter || Enter || || BSPC || SPC || . Enter || || Dn/Left | + * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' + */ + + [_LOWER] = LAYOUT_ortho_5x15_wrapper ( + _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, + _______________LOWER_412_L1________________, ________3KEY_ID75_02_________, _______________LOWER_412_R1________________, + _______________LOWER_412_L2________________, ________3KEY_ID75_03_________, _______________LOWER_412_R2________________, + _______________LOWER_412_L3________________, ________3KEY_ID75_04_________, _______________LOWER_412_R3________________, + _______________LOWER_412_L4________________, ________3KEY_ID75_05_________, _______________LOWER_412_R4________________ + ), + + + +/* RAISE + * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. + * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | BOOT || DEBUG || || || || MAKE || 7 || 8 || 9 || || || F7 || F8 || F9 || F10 | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || RGB TOG || RGB MOD || RGB HUI || RGB HUD || || 4 || 5 || 6 || || / \ || F4 || F5 || F6 || F11 | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || RGB SAI || RGB SAD || RGB VAI || RGB VAD || || 1 || 2 0 || 3 || || _ - || F1 || F2 || F3 || F12 | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || || || || || || Space || . Enter || Enter || || RAISE || || || || | + * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' + */ + + [_RAISE] = LAYOUT_ortho_5x15_wrapper ( + _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, + _______________RAISE_412_L1________________, ________3KEY_ID75_02_________, _______________RAISE_412_R1________________, + _______________RAISE_412_L2________________, ________3KEY_ID75_03_________, _______________RAISE_412_R2________________, + _______________RAISE_412_L3________________, ________3KEY_ID75_04_________, _______________RAISE_412_R3________________, + _________________BLANK_6___________________, ________3KEY_ID75_05_________, _________________BLANK_6___________________ + ), + + + +/* EXTRAS + * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. + * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || ! || || || || || 7 || 8 || 9 || || /\ || () || [] || ; || | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | SHIFT || || || || EXTRAS || || 4 || 5 || 6 || || @ # || & % || || ' || | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || || || || || || 1 || 2 0 || 3 || || || , || . || ? || Up/Rght | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || || || || || || Space || . Enter || Enter || || || || || || | + * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' + */ + + [_EX] = LAYOUT_ortho_5x15_wrapper ( + _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, + ______________EXTRAS_412_L1________________, ________3KEY_ID75_02_________, ______________EXTRAS_412_R1________________, + ______________EXTRAS_412_L2________________, ________3KEY_ID75_03_________, ______________EXTRAS_412_R2________________, + ______________EXTRAS_412_L3________________, ________3KEY_ID75_04_________, ______________EXTRAS_412_R3________________, + ______________EXTRAS_412_L4________________, ________3KEY_ID75_05_________, ______________EXTRAS_412_R4________________ + ), + + +/* FUNCTION (_FN) + * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. + * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | TAB ||Macro 09 ||Macro 10 ||Macro 11 ||Macro 12 || || 7 || 8 || 9 || || / \ || UP || || || DEL | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | TAB SHFT ||Macro 05 ||Macro 06 ||Macro 07 ||Macro 08 || || 4 || 5 || 6 || || LEFT || DOWN || RIGHT || || | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | ||Macro 01 ||Macro 02 ||Macro 03 ||Macro 04 || || 1 || 2 0 || 3 || || || , || . || ? || UP RIGHT| + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || RGB1 || RGB2 || RGB3 || RBG4 || || Space || . Enter || Enter || || || || || || DN LEFT | + * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' + */ + + [_FN] = LAYOUT_ortho_5x15_wrapper ( + _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, ____________FUNCTION_ID75_TOP_R____________, + _____________FUNCTION_412_L1_______________, ________3KEY_ID75_02_________, _____________FUNCTION_412_L1_______________, + _____________FUNCTION_412_L2_______________, ________3KEY_ID75_03_________, _____________FUNCTION_412_L2_______________, + _____________FUNCTION_412_L3_______________, ________3KEY_ID75_04_________, _____________FUNCTION_412_L3_______________, + _____________FUNCTION_412_L4_______________, ________3KEY_ID75_05_________, _____________FUNCTION_412_L4_______________ + ), + + + + /* SYMBOLS + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ | $ | ^ | < | > │ SYMB│ │ SYMB│ | | [ | ] | - | | + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ | % | : | ; ┃ + ┃ = │ │ ┃ ┃ ( | ) | _ | | + * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * | | & | ' | " | * | # │ │ ! | ? | / | \ | @ | | + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + + [_SYMB] = LAYOUT_ortho_5x15_wrapper ( + KC_ESC, _______, _______, _______, _______, _______, ________3KEY_ID75_01_________, RGB1, RGB2, RGB3, RGB4, RGB5, KC_DEL, + _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, ________3KEY_ID75_02_________, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, + _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, ________3KEY_ID75_03_________, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, + _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, ________3KEY_ID75_04_________, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, + _________________BLANK_6___________________, ________3KEY_ID75_05_________, _________________BLANK_6___________________ + ), + + +}; + +#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/idobao/id75/keymaps/miketronic/rules.mk b/keyboards/idobao/id75/keymaps/miketronic/rules.mk new file mode 100644 index 000000000000..7f805ec70e14 --- /dev/null +++ b/keyboards/idobao/id75/keymaps/miketronic/rules.mk @@ -0,0 +1,15 @@ +# Common feature for all keyboards +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 + +# Keyboard specific +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +LEADER_ENABLE = yes +AUTO_SHIFT_ENABLE = no +VIA_ENABLE = no +MOUSEKEY_ENABLE = no +CONSOLE_ENABLE = no +COMMAND_ENABLE = no diff --git a/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c b/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c index 1a8b91ef091b..c92fa73f157e 100644 --- a/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c +++ b/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c @@ -8,34 +8,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* WORKMAN * ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┐ - * │ Q │ D │ R │ W │ B │ J │ F │ U │ P │ BSPC│ BSPC│ M08 │ M08 │MUTE │ - * │ ESC │ │ │ │ SYM │ SYM │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - * │ A │ S │ H ┃ T ┃ G │ Y ┃ N ┃ E │ O │ I │ENTER│ M08 │ () │UP │ - * │SHIFT│ │ ┃ EX ┃ │ ┃ ┃ │ │ENTER│ │ │ │RIGHT│ - * ├─────┼─────┼─────╄━━━━━╃─────┼─────╄━━━━━╃─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - * │ Z │ X │ M │ C │ V │ K │ L │ SPC │ SPC │ / │ \ │ @ # │ [] │DOWN │ - * │ FN │ CTRL│ OS │ ALT │LOWER│RAISE│ ALT │ , │ . │ │ │ │ <> │LEFT │ + * │ 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_____________, _____________WORKMAN_310_001_R_____________, _________FOUR_001__________, - _____________WORKMAN_310_002_L_____________, _____________WORKMAN_310_002_R_____________, _________FOUR_002__________, - _____________WORKMAN_310_003_L_____________, _____________WORKMAN_310_003_R_____________, _________FOUR_003__________ + _____________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_________________, _________________QWERTY_R1_________________, _________FOUR_001__________, - _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, _________FOUR_002__________, - _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, _________FOUR_003__________ + _________________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 │ │ │ │ │ + * │ () │ [] │ /\ │ │ │ │ 7 │ 8 │ 9 │ 0 │ │ │ │LEAD │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────╆━━━━━╅─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┼─────┼─────┼─────┤ * │ @ # │ & % │ ┃ ┃ │ ┃ 4 ┃ 5 │ 6 │ │ │ │ │ │ @@ -48,15 +48,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_LOWER] = LAYOUT_3x14_wrapper ( - _______________LOWER_310_L1________________, _______________LOWER_310_R1________________, _________FOUR_001__________, - _______________LOWER_310_L2________________, _______________LOWER_310_R2________________, _________FOUR_002__________, - _______________LOWER_310_L3________________, _______________LOWER_310_R3________________, _________FOUR_003__________ + _______________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 │ │ │ │ │ + * │ BOOT│DEBUG│ │ │ MAKE│ │ F7 │ F8 │ F9 │ F10 │ │ │ │LEAD │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────╆━━━━━╅─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┼─────┼─────┼─────┤ * │ │ RGB │ RGB ┃ RGB ┃ RGB │ _ ┃ F4 ┃ F5 │ F6 │ F11 │ │ │ │ │ @@ -69,15 +69,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_RAISE] = LAYOUT_3x14_wrapper ( - _______________RAISE_310_L1________________, _______________RAISE_310_R1________________, _________FOUR_001__________, - _______________RAISE_310_L2________________, _______________RAISE_310_R2________________, _________FOUR_002__________, - _______________RAISE_310_L3________________, _______________RAISE_310_R3________________, _________FOUR_003__________ + _______________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┃ │ ┃ @ # ┃ & % | | ' | │ │ │ │ @@ -89,29 +89,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_EX] = LAYOUT_3x14_wrapper ( - ______________EXTRAS_310_L1________________, ______________EXTRAS_310_R1________________, _________FOUR_001__________, - ______________EXTRAS_310_L2________________, ______________EXTRAS_310_R2________________, _________FOUR_002__________, - ______________EXTRAS_310_L3________________, ______________EXTRAS_310_R3________________, _________FOUR_003__________ + ______________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 │ | │ │ │ │ │ + * │COPY │CLIP │ SS │ │ │ │ │ │ | /\ │ UP │ │ DEL │LEAD │ * │PASTE│ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - * │ TAB │ M05 │ M06 ┃ M07 ┃ M08 │ ┃ LEFT┃ DOWN│RIGHT| | │ │ │ │ - * │ │ │ ┃ ┃ │ ┃ ┃ _ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┼─────╄━━━━━╃─────┼─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ M01 │ M02 │ M03 │ M04 │ │ │ , | . | ? │ │ │ │ │ - * │ FN │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┼─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │SHIFT│ M05 │ M06 ┃ M07 ┃ M08 │ │ │ │ ┃ LEFT┃ DOWN│RIGHT│ │ UP │ + * │ │ │ ┃ ┃ │ │ │ │ ┃ ┃ │ │ │RIGHT│ + * ├─────┼─────┼─────╄━━━━━╃─────┼─────┼─────┼─────┼─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * │ │ M01 │ M02 │ M03 │ M04 │ │ │ | | │ , │ . │ │DOWN │ + * │ FN │ │ │ │ │ │ │ │ │ │ │ │ │LEFT │ * └─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┴─────┘ */ [_FN] = LAYOUT_3x14_wrapper ( - _____________FUNCTION_310_L1_______________, _____________FUNCTION_310_R1_______________, _________FOUR_001__________, - _____________FUNCTION_310_L2_______________, _____________FUNCTION_310_R2_______________, _________FOUR_002__________, - _____________FUNCTION_310_L3_______________, _____________FUNCTION_310_R3_______________, _________FOUR_003__________ + _____________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 ), @@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_SYMB] = LAYOUT_3x14_wrapper ( - KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXX, XXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, KC_A, KC_A, KC_A, KC_A, + KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, KC_A, KC_A, KC_A, KC_A, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, KC_A, KC_A, KC_A, KC_A, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_ENT, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, KC_A, KC_A, KC_A ), diff --git a/keyboards/planck/keymaps/miketronic/config.h b/keyboards/planck/keymaps/miketronic/config.h index 53d7545ae23c..145b7067abcd 100644 --- a/keyboards/planck/keymaps/miketronic/config.h +++ b/keyboards/planck/keymaps/miketronic/config.h @@ -3,7 +3,7 @@ #pragma once -# define TAPPING_TERM 170 +# define TAPPING_TERM 150 // 30APR23 was 170 # define TAPPING_TERM_PER_KEY # define QUICK_TAP_TERM TAPPING_TERM / 2 # define QUICK_TAP_TERM_PER_KEY diff --git a/keyboards/planck/keymaps/miketronic/keymap.c b/keyboards/planck/keymaps/miketronic/keymap.c index 9911a9bfb417..02ce262f3ab6 100644 --- a/keyboards/planck/keymaps/miketronic/keymap.c +++ b/keyboards/planck/keymaps/miketronic/keymap.c @@ -11,12 +11,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Workman * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ * │ TAB │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ BSPC│ - * │ ESC │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ ; │ ; │ + * │ ESC │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ TAB │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ │ - * │SHIFT│ │ │ ┃ EX ┃ │ │ ┃ ┃ │ │ENTER│ENTER│ + * │ TAB │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ENTER│ + * │SHIFT│ │ │ ┃ EX ┃ │ │ ┃ ┃ │ │ │ │ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │SHIFT| Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ / │ UP | + * │SHIFT| Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ENTER│ UP | * │ │ │ │ │ │ │ │ │ │ , │ . │ │RIGHT| * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ * │ FN │CTRL │ OS │ ALT │LOWER│ │ │ │RAISE│ SS │CLIP │COPY │ DN │ @@ -44,14 +44,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ │ () │ [] │ /\ │ │ │ │ │ 7 │ 8 │ 9 │ │ │ * │ │ │ <> │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ │ @ # │ & % │ ┃ ┃ │ │ ┃ 4 ┃ 5 │ 6 │ │ │ - * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ + * │ │ @ # │ & % │ ┃ ┃ │ │ . ┃ 4 ┃ 5 │ 6 │ │ │ + * │ │ │ │ ┃ ┃ │ │ENTER┃ ┃ │ │ │ │ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ * │ │ │ │ │ │ │ │ 0 │ 1 │ 2 │ 3 │ │ UP │ * │ │ │ │ │ │ │ │ │ │ 0 │ │ │RIGHT│ * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ * │ │ │ │ │LOWER│ │ │ │BPSC │ SPC │ . │ │ DN │ - * │ │ │ │ │ │ │ │ │ │ │ ENT │ │LEFT │ + * │ │ │ │ │ │ │ │ │ │ │ENTER│ │LEFT │ * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_LOWER] = LAYOUT_planck_grid_wrapper ( @@ -67,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │BOOT │DEBUG│ │ │ │MAKE │ │ │ │ F7 │ F8 │ F9 │ F10 │ * │ │ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ │ RGB | RGB | RGB ┃ RGB ┃ WM │ │ ┃ ┃ F4 │ F5 │ F6 │ F11 │ + * │ │ RGB | RGB | RGB ┃ RGB ┃ WM │ │ ┃ /\ ┃ F4 │ F5 │ F6 │ F11 │ * │ │ TOG │ MOD │ HUI ┃ HUD ┃ │ │ ┃ ┃ │ │ │ │ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ * │ │ RGB │ RGB │ RGB │ RGB │ QW │ │ │ _ │ F1 | F2 | F3 │ F12 │ @@ -113,14 +113,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │COPY │CLIP │ SS │ │ │ │ │ │ /\ │ UP │ │ │ DEL │ * │PASTE│ │ │ │ │ │ │ │ │ │ │ │ │ * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │TAB │ M05 | M06 | M07 ┃ M08 ┃ │ │ ┃LEFT ┃DOWN │RIGHT│ │UP │ - * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │RIGHT│ + * │TAB │ M05 | M06 | M07 ┃ M08 ┃ │ │ ┃LEFT ┃DOWN │RIGHT│ │ │ + * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ │ , | . | ? │DOWN │ - * │ │ │ │ │ │ │ │ │ │ │ │ │LEFT │ + * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ │ , | . | ? │UP │ + * │ │ │ │ │ │ │ │ │ │ │ │ │RIGHT│ * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │RGB1 │RGB2 │RGB3 │RGB4 │ │ │ │ │ │ │ │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │RGB1 │RGB2 │RGB3 │RGB4 │ │ │ │ │ │ │ │DOWN │ + * │ │ │ │ │ │ │ │ │ │ │ │ │LEFT │ * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_FN] = LAYOUT_planck_grid_wrapper( diff --git a/users/miketronic/.vscode/c_cpp_properties.json b/users/miketronic/.vscode/c_cpp_properties.json new file mode 100644 index 000000000000..cea4d3f4e0ee --- /dev/null +++ b/users/miketronic/.vscode/c_cpp_properties.json @@ -0,0 +1,18 @@ +{ + "configurations": [ + { + "name": "windows-gcc-x64", + "includePath": [ + "${workspaceFolder}/**" + ], + "compilerPath": "gcc", + "cStandard": "${default}", + "cppStandard": "${default}", + "intelliSenseMode": "windows-gcc-x64", + "compilerArgs": [ + "" + ] + } + ], + "version": 4 +} \ No newline at end of file diff --git a/users/miketronic/.vscode/launch.json b/users/miketronic/.vscode/launch.json new file mode 100644 index 000000000000..172013757420 --- /dev/null +++ b/users/miketronic/.vscode/launch.json @@ -0,0 +1,24 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "C/C++ Runner: Debug Session", + "type": "cppdbg", + "request": "launch", + "args": [], + "stopAtEntry": false, + "externalConsole": true, + "cwd": "c:/Users/mbarnoski/qmk_firmware/users/miketronic", + "program": "c:/Users/mbarnoski/qmk_firmware/users/miketronic/build/Debug/outDebug", + "MIMode": "gdb", + "miDebuggerPath": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + } + ] +} \ No newline at end of file diff --git a/users/miketronic/.vscode/settings.json b/users/miketronic/.vscode/settings.json new file mode 100644 index 000000000000..65c81b6209a6 --- /dev/null +++ b/users/miketronic/.vscode/settings.json @@ -0,0 +1,38 @@ +{ + "C_Cpp_Runner.cCompilerPath": "gcc", + "C_Cpp_Runner.cppCompilerPath": "g++", + "C_Cpp_Runner.debuggerPath": "gdb", + "C_Cpp_Runner.cStandard": "", + "C_Cpp_Runner.cppStandard": "", + "C_Cpp_Runner.msvcBatchPath": "", + "C_Cpp_Runner.useMsvc": false, + "C_Cpp_Runner.warnings": [ + "-Wall", + "-Wextra", + "-Wpedantic", + "-Wshadow", + "-Wformat=2", + "-Wconversion", + "-Wnull-dereference", + "-Wsign-conversion" + ], + "C_Cpp_Runner.enableWarnings": true, + "C_Cpp_Runner.warningsAsError": false, + "C_Cpp_Runner.compilerArgs": [], + "C_Cpp_Runner.linkerArgs": [], + "C_Cpp_Runner.includePaths": [], + "C_Cpp_Runner.includeSearch": [ + "*", + "**/*" + ], + "C_Cpp_Runner.excludeSearch": [ + "**/build", + "**/build/**", + "**/.*", + "**/.*/**", + "**/.vscode", + "**/.vscode/**" + ], + "C_Cpp_Runner.useAddressSanitizer": false, + "C_Cpp_Runner.showCompilationTime": false +} \ No newline at end of file diff --git a/users/miketronic/miketronic.c b/users/miketronic/miketronic.c index 7478ee87c708..3c47a72462f6 100644 --- a/users/miketronic/miketronic.c +++ b/users/miketronic/miketronic.c @@ -10,21 +10,8 @@ __attribute__ ((weak)) void keyboard_post_init_keymap(void) { } void keyboard_post_init_user(void) { #ifdef RGB_MATRIX_ENABLE rgblight_enable_noeeprom(); // enables Rgb, without saving settings - rgblight_sethsv_noeeprom(180, 255, 255); // sets the color to teal/cyan without saving + rgblight_sethsv_noeeprom(HSV_ORANGE); // sets the color without saving rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); #endif keyboard_post_init_keymap(); -} - - -__attribute__ ((weak)) layer_state_t layer_state_set_keymap (layer_state_t state) { - return state; -} -layer_state_t layer_state_set_user(layer_state_t state) { - state = update_tri_layer_state(state, _LOWER, _RAISE, _SYMB); - state = layer_state_set_keymap(state); -#ifdef CONSOLE_ENABLE - uprintf("LAYER: %u\n", state); -#endif - return state; } \ No newline at end of file diff --git a/users/miketronic/miketronic.h b/users/miketronic/miketronic.h index c40943cf3a28..8c9b9024a095 100644 --- a/users/miketronic/miketronic.h +++ b/users/miketronic/miketronic.h @@ -45,16 +45,18 @@ enum layer_names { #define L_ALT MT(MOD_RALT, KC_L) // Tap for "L", hold for Alt #define TBSHFT MT(MOD_LSFT, KC_TAB) // Tap for Tab, hold for Shift #define SLSHFT MT(MOD_RSFT, KC_SLSH) // Tap for Slash, hold for Shift +#define SFT_ENT RSFT_T(KC_ENT) // Tap for Enter, hold for Shift +#define OSSFT OSM(MOD_LSFT) // One shot left Shift // MISC #define CALTDEL LCTL(LALT(KC_DEL)) // Ctrl Alt Del -#define TSKMGR LCTL(LSFT(KC_ESC)) // Task Manager -#define CLIP LCTL(LALT(KC_Q)) // Clipboard (Ditto) -#define SS LCTL(LALT(KC_G)) // Greenshot region -#define NUM LSFT(KC_3) -#define AT LSFT(KC_2) -#define COPY LCTL(KC_C) -#define PASTE LCTL(KC_V) -#define ____ KC_TRNS -#define XXXX KC_NO +#define TSKMGR LCTL(LSFT(KC_ESC)) // Task Manager +#define CLIP LCTL(LALT(KC_Q)) // Clipboard (Ditto) +#define SS LCTL(LALT(KC_G)) // Greenshot region +#define NUM LSFT(KC_3) +#define AT LSFT(KC_2) +#define COPY LCTL(KC_C) +#define PASTE LCTL(KC_V) +#define ____ KC_TRNS +#define XXXX KC_NO #define XXXXXXX KC_NO diff --git a/users/miketronic/process_records.c b/users/miketronic/process_records.c index b4e9c9d930d9..5c60ddf10030 100644 --- a/users/miketronic/process_records.c +++ b/users/miketronic/process_records.c @@ -115,21 +115,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } break; -#if defined(KEYBOARD_1upkeyboards_pi40_v1_0) && defined(RGBLIGHT_ENABLE) - case WM: - if (record->event.pressed) { - set_single_persistent_default_layer(_WM); - rgblight_sethsv_noeeprom(HSV_WHITE); - } - break; - - case QW: - if (record->event.pressed) { - set_single_persistent_default_layer(_QW); - rgblight_sethsv_noeeprom(HSV_MAGENTA); - } - break; - +#if defined(RGBLIGHT_ENABLE) case RGB1: if (record->event.pressed) { rgblight_sethsv_noeeprom(HSV_BLUE); diff --git a/users/miketronic/wrappers.h b/users/miketronic/wrappers.h index 6d744d12fa68..c0e526a3dd5f 100644 --- a/users/miketronic/wrappers.h +++ b/users/miketronic/wrappers.h @@ -18,14 +18,26 @@ // clang-format off -#define LAYOUT_ortho_4x12_wrapper(...) LAYOUT_ortho_4x12(__VA_ARGS__) -#define LAYOUT_planck_grid_wrapper(...) LAYOUT_planck_grid(__VA_ARGS__) +# define LAYOUT_ortho_4x12_wrapper(...) LAYOUT_ortho_4x12(__VA_ARGS__) +# define LAYOUT_planck_grid_wrapper(...) LAYOUT_planck_grid(__VA_ARGS__) #if (defined(KEYBOARD_hazel_satpad)) # define LAYOUT_3x11_wrapper(...) LAYOUT(__VA_ARGS__) #endif #if (defined(KEYBOARD_mechwild_bde_rev2)) # define LAYOUT_3x14_wrapper(...) LAYOUT(__VA_ARGS__) #endif +#if (defined(KEYBOARD_hazel_bad_wings)) +# define LAYOUT_split_3x5_3_wrapper(...) LAYOUT_split_3x5_3(__VA_ARGS__) +#endif +#if (defined(KEYBOARD_idobao_id75_v1)) +# define LAYOUT_ortho_5x15_wrapper(...) LAYOUT_ortho_5x15(__VA_ARGS__) +#endif + + +#define _________NUMBER_01__________ KC_7, KC_8, KC_9 +#define _________NUMBER_02__________ KC_4, KC_5, KC_6 +#define _________NUMBER_03__________ KC_1, TD_20, KC_3 + #define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, KC_R, KC_T @@ -36,18 +48,6 @@ #define _________________QWERTY_R2_________________ KC_H, KC_J, KRAISE, KC_L, KC_SCLN #define _________________QWERTY_R3_________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH -#define _________________WORKMAN_1_________________ KC_Q, KC_D, KC_R, KC_W, KC_B, KC_J, KC_F, KC_U, KC_P, KC_SCLN -#define _________________WORKMAN_2_________________ KC_A, KC_S, KC_H, KC_T, KC_G, KC_Y, KC_N, KC_E, KC_O, LT_MC(KC_I) -#define _________________WORKMAN_3_________________ KC_Z, KC_X, KC_M, KC_C, KC_V, KC_K, KC_L, KC_COMM, KC_DOT, KC_SLASH - -#define _________________WORKMAN_L1________________ KC_Q, KC_D, KC_R, KC_W, KC_B -#define _________________WORKMAN_L2________________ KC_A, KC_S, KC_H, KC_T, KC_G -#define _________________WORKMAN_L3________________ KC_Z, KC_X, KC_M, KC_C, KC_V - -#define _________________WORKMAN_R1________________ KC_J, KC_F, KC_U, KC_P, KC_SCLN -#define _________________WORKMAN_R2________________ KC_Y, KC_N, KC_E, KC_O, LT_MC(KC_I) -#define _________________WORKMAN_R3________________ KC_K, KC_L, KC_COMM, KC_DOT, KC_SLASH - #define ________________NUMBER_LEFT________________ KC_1, KC_2, KC_3, KC_4, KC_5 @@ -74,8 +74,8 @@ #define _______________LOWER_310_L3________________ _______, _______, _______, _______, _______ #define _______________LOWER_310_R1________________ _______, KC_7, KC_8, KC_9, _______ -#define _______________LOWER_310_R2________________ _______, KC_4, KC_5, KC_6, _______ -#define _______________LOWER_310_R3________________ KC_0, KC_1, TD_20, KC_3, TD_DENT +#define _______________LOWER_310_R2________________ TD_DENT, KC_4, KC_5, KC_6, TD_UR +#define _______________LOWER_310_R3________________ KC_0, KC_1, TD_20, KC_3, TD_DL #define _______________LOWER_412_L1________________ _______, PRN, BRACES, TD_SL, _______, _______ #define _______________LOWER_412_L2________________ _______, TD_ATH, TD_PRAM, _______, _______, _______ @@ -83,7 +83,7 @@ #define _______________LOWER_412_L4________________ _______, _______, _______, _______, _______, _______ #define _______________LOWER_412_R1________________ _______, KC_7, KC_8, KC_9, _______, _______ -#define _______________LOWER_412_R2________________ _______, KC_4, KC_5, KC_6, _______, _______ +#define _______________LOWER_412_R2________________ TD_DENT, KC_4, KC_5, KC_6, _______, _______ #define _______________LOWER_412_R3________________ KC_0, KC_1, TD_20, KC_3, _______, TD_UR #define _______________LOWER_412_R4________________ _______, _______, KC_BSPC, KC_SPC, TD_DENT, TD_DL @@ -120,7 +120,7 @@ #define ______________EXTRAS_310_L3________________ _______, _______, _______, _______, _______ #define ______________EXTRAS_310_R1________________ _______, TD_SL, PRN, BRACES, KC_SCLN -#define ______________EXTRAS_310_R2________________ _______, TD_ATH, TD_PRAM, _______, KC_QUOT +#define ______________EXTRAS_310_R2________________ QK_LEAD, TD_ATH, TD_PRAM, _______, KC_QUOT #define ______________EXTRAS_310_R3________________ _______, _______, KC_COMM, KC_DOT, KC_QUES #define ______________EXTRAS_412_L1________________ _______, KC_EXLM, _______, _______, _______, _______ @@ -129,29 +129,41 @@ #define ______________EXTRAS_412_L4________________ _______, _______, _______, _______, _______, TD_SE #define ______________EXTRAS_412_R1________________ _______, TD_SL, PRN, BRACES, KC_SCLN, _______ -#define ______________EXTRAS_412_R2________________ _______, TD_ATH, TD_PRAM, _______, KC_QUOT, _______ +#define ______________EXTRAS_412_R2________________ QK_LEAD, TD_ATH, TD_PRAM, _______, KC_QUOT, _______ #define ______________EXTRAS_412_R3________________ _______, _______, KC_COMM, KC_DOT, KC_QUES, _______ #define ______________EXTRAS_412_R4________________ TD_SE, _______, _______, _______, _______, _______ #define _____________FUNCTION_310_L1_______________ CCCV, CLIP, SS, _______, _______ -#define _____________FUNCTION_310_L2_______________ KC_TAB, M05, M06, M07, M08 +#define _____________FUNCTION_310_L2_______________ TBSHFT, M05, M06, M07, M08 #define _____________FUNCTION_310_L3_______________ _______, M01, M02, M03, M04 -#define _____________FUNCTION_310_R1_______________ _______, T_SL, KC_UP, _______, _______ -#define _____________FUNCTION_310_R2_______________ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______ -#define _____________FUNCTION_310_R3_______________ _______, _______, KC_COMM, KC_DOT, KC_QUES +#define _____________FUNCTION_310_R1_______________ _______, TD_SL, KC_UP, _______, KC_DEL +#define _____________FUNCTION_310_R2_______________ _______, KC_LEFT, KC_DOWN, KC_RGHT, TD_UR +#define _____________FUNCTION_310_R3_______________ _______, _______, KC_COMM, KC_DOT, TD_DL #define _____________FUNCTION_412_L1_______________ CCCV, CLIP, SS, _______, _______, _______ -#define _____________FUNCTION_412_L2_______________ KC_TAB, M05, M06, M07, M08, _______ +#define _____________FUNCTION_412_L2_______________ TBSHFT, M05, M06, M07, M08, _______ #define _____________FUNCTION_412_L3_______________ _______, M01, M02, M03, M04, _______ #define _____________FUNCTION_412_L4_______________ _______, RGB1, RGB2, RGB3, RGB4, _______ #define _____________FUNCTION_412_R1_______________ _______, T_SL, KC_UP, _______, _______, KC_DEL -#define _____________FUNCTION_412_R2_______________ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, T_UR -#define _____________FUNCTION_412_R3_______________ _______, _______, KC_COMM, KC_DOT, KC_QUES, T_DL -#define _____________FUNCTION_412_R4_______________ _______, _______, _______, _______, _______, _______ +#define _____________FUNCTION_412_R2_______________ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______ +#define _____________FUNCTION_412_R3_______________ _______, _______, KC_COMM, KC_DOT, KC_QUES, T_UR +#define _____________FUNCTION_412_R4_______________ _______, _______, _______, _______, _______, T_DL + +#define ____________FUNCTION_ID75_TOP_R____________ M06, M07, M08, M09, M10, KC_DEL + + + +#define _____________SYMBOLS_310_L1________________ KC_DLR, KC_CIRC, KC_LABK, KC_RABK, ____ +#define _____________SYMBOLS_310_L2________________ KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL +#define _____________SYMBOLS_310_L3________________ KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH + +#define _____________SYMBOLS_310_R1________________ ____, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS +#define _____________SYMBOLS_310_R2________________ XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS +#define _____________SYMBOLS_310_R3________________ KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT @@ -168,35 +180,47 @@ #define _________FOUR_002__________ KC_ENT, M08, PRN, TD_UR #define _________FOUR_003__________ KC_BSLS, TD_ATH, BRACES, TD_DL +#define _________3KEY_LEFT___________ OSSFT, KC_SPC, LOWER +#define _________3KEY_RIGHT__________ RAISE, KC_ENT, CCCV + +#define ________3KEY_ID75_01_________ OSSFT, QK_LEAD, LOWER +#define ________3KEY_ID75_02_________ KC_7, KC_8, KC_9 +#define ________3KEY_ID75_03_________ KC_4, KC_5, KC_6 +#define ________3KEY_ID75_04_________ KC_1, TD_20, KC_3 +#define ________3KEY_ID75_05_________ KC_SPC, TD_DENT, KC_ENT + #define _____________WORKMAN_310_001_L_____________ TD_QESC, KC_D, KC_R, KC_W, BSYM #define _____________WORKMAN_310_001_R_____________ JSYM, KC_F, KC_U, KC_P, KC_BSPC #define _____________WORKMAN_310_002_L_____________ ASFT, KC_S, KC_H, TEX, KC_G -#define _____________WORKMAN_310_002_R_____________ KC_Y, KC_N, KC_E, KC_O, IENTER +#define _____________WORKMAN_310_002_R_____________ KC_Y, KC_N, KC_E, KC_O, KC_I #define _____________WORKMAN_310_003_L_____________ FNZ, CTRLX, MGUI, CALT, VLOWER -#define _____________WORKMAN_310_003_R_____________ KRAISE, KC_L, TD_CSPC, TD_DSPC, SLSHFT +#define _____________WORKMAN_310_003_R_____________ KRAISE, KC_L, TD_CSPC, TD_DSPC, SFT_ENT #define _____________WORKMAN_310_004_L_____________ FN, KC_LCTL, KC_LGUI, KC_LALT, LOWER #define _____________WORKMAN_310_004_R_____________ RAISE, SS, CLIP, CCCV, FN #define _____________WORKMAN_410_003_L_____________ FNZ, KC_X, KC_M, KC_C, KC_V -#define _____________WORKMAN_410_003_R_____________ KC_K, KC_L, TD_CSPC, TD_DSPC, SLSHFT +#define _____________WORKMAN_410_003_R_____________ KC_K, KC_L, TD_CSPC, TD_DSPC, SFT_ENT #define _____________WORKMAN_311_001_L_____________ TD_QESC, KC_D, KC_R, KC_W, BSYM #define _____________WORKMAN_311_001_R_____________ JSYM, KC_F, KC_U, KC_P, KC_BSPC -#define _____________WORKMAN_311_002_L_____________ ASFT, KC_S, KC_H, TEX, GGUI -#define _____________WORKMAN_311_002_R_____________ KC_Y, KC_N, KC_E, KC_O, IENTER +#define _____________WORKMAN_311_002_L_____________ ASFT, KC_S, KC_H, TEX, KC_G +#define _____________WORKMAN_311_002_R_____________ KC_Y, KC_N, KC_E, KC_O, KC_I #define _____________WORKMAN_311_003_L_____________ FNZ, CTRLX, MGUI, CALT, VLOWER, KC_ENT -#define _____________WORKMAN_311_003_R_____________ KRAISE, KC_L, TD_CSPC, TD_DSPC, SLSHFT +#define _____________WORKMAN_311_003_R_____________ KRAISE, KC_L, TD_CSPC, TD_DSPC, SFT_ENT #define _____________WORKMAN_412_001_L_____________ TD_TE, TD_QESC, KC_D, KC_R, KC_W, BSYM #define _____________WORKMAN_412_001_R_____________ JSYM, KC_F, KC_U, KC_P, KC_BSPC, KC_BSPC #define _____________WORKMAN_412_002_L_____________ TBSHFT, KC_A, KC_S, KC_H, TEX, KC_G -#define _____________WORKMAN_412_002_R_____________ KC_Y, KC_N, KC_E, KC_O, IENTER, KC_ENT +#define _____________WORKMAN_412_002_R_____________ KC_Y, KC_N, KC_E, KC_O, KC_I, KC_ENT #define _____________WORKMAN_412_003_L_____________ KC_LSFT, KC_Z, KC_X, KC_M, KC_C, KC_V -#define _____________WORKMAN_412_003_R_____________ KC_K, KC_L, TD_CSPC, TD_DSPC, KC_SLSH, TD_UR +#define _____________WORKMAN_412_003_R_____________ KC_K, KC_L, TD_CSPC, TD_DSPC, SFT_ENT, TD_UR #define _____________WORKMAN_412_004_L_____________ FN, KC_LCTL, KC_LGUI, KC_LALT, LOWER, TD_SE -#define _____________WORKMAN_412_004_R_____________ TD_SE, RAISE, SS, CLIP, CCCV, TD_DL - +#define _____________WORKMAN_412_004_R_____________ TD_SE, RAISE, SS, CLIP, CCCV, TD_DL +#define _____________WORKMAN_ID75_TOP_L____________ KC_ESC, M01, M02, M03, M04, M05 +#define _____________WORKMAN_ID75_TOP_R____________ M06, M07, M08, M09, M10, KC_BSPC +#define _____________WORKMAN_ID75_BOT_L____________ FN, KC_LCTL, KC_LGUI, KC_LALT, LOWER, KC_SPC +#define _____________WORKMAN_ID75_BOT_R____________ KC_ENT, RAISE, SS, CLIP, CCCV, TD_DL // clang-format on \ No newline at end of file From 67427f7479ac28eaae96ba88fef2ea9ecaabf41f Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 5 May 2023 13:41:04 -0500 Subject: [PATCH 47/61] Delete keyboards/hazel/satpad directory --- keyboards/hazel/satpad/config.h | 1 - keyboards/hazel/satpad/info.json | 82 ------- .../hazel/satpad/keymaps/default/config.h | 19 -- .../hazel/satpad/keymaps/default/keymap.c | 62 ----- .../hazel/satpad/keymaps/default/rules.mk | 17 -- .../hazel/satpad/keymaps/miketronic/config.h | 8 - .../hazel/satpad/keymaps/miketronic/keymap.c | 225 ------------------ .../hazel/satpad/keymaps/miketronic/rules.mk | 38 --- keyboards/hazel/satpad/rules.mk | 1 - keyboards/hazel/satpad/satpad.c | 24 -- 10 files changed, 477 deletions(-) delete mode 100644 keyboards/hazel/satpad/config.h delete mode 100644 keyboards/hazel/satpad/info.json delete mode 100644 keyboards/hazel/satpad/keymaps/default/config.h delete mode 100644 keyboards/hazel/satpad/keymaps/default/keymap.c delete mode 100644 keyboards/hazel/satpad/keymaps/default/rules.mk delete mode 100644 keyboards/hazel/satpad/keymaps/miketronic/config.h delete mode 100644 keyboards/hazel/satpad/keymaps/miketronic/keymap.c delete mode 100644 keyboards/hazel/satpad/keymaps/miketronic/rules.mk delete mode 100644 keyboards/hazel/satpad/rules.mk delete mode 100644 keyboards/hazel/satpad/satpad.c diff --git a/keyboards/hazel/satpad/config.h b/keyboards/hazel/satpad/config.h deleted file mode 100644 index 7b9637ef9c2c..000000000000 --- a/keyboards/hazel/satpad/config.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once \ No newline at end of file diff --git a/keyboards/hazel/satpad/info.json b/keyboards/hazel/satpad/info.json deleted file mode 100644 index 3caad7bb2e05..000000000000 --- a/keyboards/hazel/satpad/info.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "keyboard_name": "SatPad", - "manufacturer": "jasonhazel", - "usb": { - "vid": "0x4A48", - "pid": "0x7370", - "device_version": "0.0.1" - }, - "matrix_size": { - "cols": 6, - "rows": 7 - }, - "diode_direction": "COL2ROW", - "bootloader": "caterina", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "mousekey": true, - "nkro": false, - "encoder": true - }, - "matrix_pins": { - "rows": ["B3", "B2", "B6", "D3", "D2", "D4", "E6"], - "cols": ["F4", "F5", "F6", "F7", "B1", "D7"] - }, - "encoder": { - "rotary": [ - { "pin_a": "B4", "pin_b": "B5" } - ] - }, - "bootmagic": { - "enabled": true, - "matrix": [0,0] - }, - "processor": "atmega32u4", - "url": "https://github.com/jasonhazel/satpad", - "layouts": { - "LAYOUT": { - "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 1], "x": 1, "y": 0 }, - { "matrix": [0, 2], "x": 2, "y": 0 }, - { "matrix": [0, 3], "x": 3, "y": 0 }, - { "matrix": [0, 4], "x": 4, "y": 0 }, - - { "matrix": [3, 4], "x": 6, "y": 0 }, - { "matrix": [3, 3], "x": 7, "y": 0 }, - { "matrix": [3, 2], "x": 8, "y": 0 }, - { "matrix": [3, 1], "x": 9, "y": 0 }, - { "matrix": [3, 0], "x": 10, "y": 0 }, - - { "matrix": [1, 0], "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1, "y": 1 }, - { "matrix": [1, 2], "x": 2, "y": 1 }, - { "matrix": [1, 3], "x": 3, "y": 1 }, - { "matrix": [1, 4], "x": 4, "y": 1 }, - - { "matrix": [4, 4], "x": 6, "y": 1 }, - { "matrix": [4, 3], "x": 7, "y": 1 }, - { "matrix": [4, 2], "x": 8, "y": 1 }, - { "matrix": [4, 1], "x": 9, "y": 1 }, - { "matrix": [4, 0], "x": 10, "y": 1 }, - - { "matrix": [2, 0], "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1, "y": 2 }, - { "matrix": [2, 2], "x": 2, "y": 2 }, - { "matrix": [2, 3], "x": 3, "y": 2 }, - { "matrix": [2, 4], "x": 4, "y": 2 }, - - { "matrix": [6, 5], "x": 5, "y": 2 }, - - { "matrix": [5, 4], "x": 6, "y": 2 }, - { "matrix": [5, 3], "x": 7, "y": 2 }, - { "matrix": [5, 2], "x": 8, "y": 2 }, - { "matrix": [5, 1], "x": 9, "y": 2 }, - { "matrix": [5, 0], "x": 10, "y": 2 } - - ] - } - } -} \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/config.h b/keyboards/hazel/satpad/keymaps/default/config.h deleted file mode 100644 index c6b2abb79748..000000000000 --- a/keyboards/hazel/satpad/keymaps/default/config.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - - -#define TAPPING_TERM 200 -#define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD - -#define ONESHOT_TAP_TOGGLE 10 -#define ONESHOT_TIMEOUT 500 -#define COMBO_TERM 200 - -#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD - -// disable shit -#define NO_MUSIC_MODE - -#undef LOCKING_SUPPORT_ENABLE -#undef LOCKING_RESYNC_ENABLE \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/keymap.c b/keyboards/hazel/satpad/keymaps/default/keymap.c deleted file mode 100644 index 5f863022f2ee..000000000000 --- a/keyboards/hazel/satpad/keymaps/default/keymap.c +++ /dev/null @@ -1,62 +0,0 @@ -#include QMK_KEYBOARD_H - -enum layers { - _BASE, - LAYER_LENGTH -}; - -enum combos { - COMBO_SPACE, - COMBO_BACKSP, - COMBO_ENTER, - COMBO_TAB, - COMBO_ESC, - COMBO_LENGTH -}; - -uint16_t COMBO_LEN = COMBO_LENGTH; -const uint16_t PROGMEM combo_space[] = { KC_N, KC_M, COMBO_END }; -const uint16_t PROGMEM combo_backspace[] = { KC_O, KC_P, COMBO_END }; -const uint16_t PROGMEM combo_enter[] = { KC_L, KC_QUOT, COMBO_END }; -const uint16_t PROGMEM combo_tab[] = { KC_A, KC_S, COMBO_END }; -const uint16_t PROGMEM combo_esc[] = { KC_Q, KC_W, COMBO_END }; - -combo_t key_combos[] = { - [COMBO_SPACE] = COMBO(combo_space, KC_SPC), - [COMBO_BACKSP] = COMBO(combo_backspace, KC_BSPC), - [COMBO_ENTER] = COMBO(combo_enter, KC_ENT), - [COMBO_TAB] = COMBO(combo_tab, KC_TAB), - [COMBO_ESC] = COMBO(combo_esc, KC_ESC) -}; - -enum tapdances { - TD_QESC, - TAPDANCE_LENGTH -}; - -tap_dance_action_t tap_dance_actions[] = { - [TD_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), -}; - -const key_override_t **key_overrides = (const key_override_t *[]) { - NULL -}; - -#define QESC TD(TD_QESC) -#define BSFT LSFT_T(KC_B) -#define VCTL LCTL_T(KC_V) -#define CGUI LGUI_T(KC_C) -#define XALT LALT_T(KC_X) - -#define ______ KC_NO -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ - KC_Z, XALT, CGUI, VCTL, BSFT, KC_SPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH - ), -}; - -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_BASE] = { ENCODER_CCW_CW(KC_DOWN, KC_UP) }, -}; \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/rules.mk b/keyboards/hazel/satpad/keymaps/default/rules.mk deleted file mode 100644 index fb4dbb68160f..000000000000 --- a/keyboards/hazel/satpad/keymaps/default/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -GRAVE_ESC_ENABLE = no -SPACE_CADET_ENABLE = no - -CAPS_WORD_ENABLE = yes -KEY_OVERRIDE_ENABLE = yes -COMBO_ENABLE = yes -TAP_DANCE_ENABLE = yes -OLED_ENABLE = yes -OLED_DRIVER = SSD1306 -ENCODER_MAP_ENABLE = yes - -# OLED WIDGETS - -# WPM_ENABLE = no -# KEYCOUNT_ENABLE = yes -# KEYLOG_ENABLE = no -# KEYLOG_DEBUG = no \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/config.h b/keyboards/hazel/satpad/keymaps/miketronic/config.h deleted file mode 100644 index 278d0b0fbe65..000000000000 --- a/keyboards/hazel/satpad/keymaps/miketronic/config.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -# define TAPPING_TERM 170 -# define TAPPING_TERM_PER_KEY -# define QUICK_TAP_TERM TAPPING_TERM / 2 -# define QUICK_TAP_TERM_PER_KEY -# define PERMISSIVE_HOLD_PER_KEY -# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c deleted file mode 100644 index 80ae57c893f0..000000000000 --- a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c +++ /dev/null @@ -1,225 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B -// SPDX-License-Identifier: GPL-2.0+ - -#include "miketronic.h" - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* WORKMAN - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ - * │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ - * │SHIFT│ │ ┃ EX ┃ │ │ ┃ ┃ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ENTER│ - * │ FN │ CTRL│ OS │ ALT │LOWER│ │RAISE│ │ , │ . │ │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - * - */ - - [_WM] = LAYOUT_3x11_wrapper ( - _____________WORKMAN_311_001_L_____________, _____________WORKMAN_311_001_R_____________, - _____________WORKMAN_311_002_L_____________, _____________WORKMAN_311_002_R_____________, - _____________WORKMAN_311_003_L_____________, _____________WORKMAN_311_003_R_____________ - ), - - [_QW] = LAYOUT_3x11_wrapper ( - _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, - _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, - _________________QWERTY_L3_________________, KC_ENT, _________________QWERTY_R3_________________ - ), - - - /* LOWER - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ () │ [] │ /\ │ │ │ │ │ 7 │ 8 │ 9 │ │ - * │ │ <> │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ @ # │ & % │ ┃ ┃ │ │ . ┃ 4 ┃ 5 │ 6 │ UP │ - * │ │ │ ┃ ┃ │ │ENTER┃ ┃ │ │RIGHT│ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ │ │ │ │ │ │ 0 │ 1 │ 2 │ 3 │ DOWN│ - * │ │ │ │ │LOWER│ │ │ │ 0 │ │ LEFT│ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - * - */ - - [_LOWER] = LAYOUT_3x11_wrapper ( - _______________LOWER_310_L1________________, _______________LOWER_310_R1________________, - _______________LOWER_310_L2________________, _______________LOWER_310_R2________________, - _______________LOWER_310_L3________________, KC_ENT, _______________LOWER_310_R3________________ - ), - - - /* RAISE - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ BOOT│DEBUG│ │ │ MAKE│ │ │ F7 │ F8 │ F9 │ F10 │ - * │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ │ RGB │ RGB ┃ RGB ┃ RGB │ │ _ ┃ F4 ┃ F5 │ F6 │ F11 │ - * │ │ TOG │ MOD ┃ HUI ┃ HUD │ │ - ┃ ┃ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ │ RGB │ RGB │ RGB │ RGB │ │ │ F1 │ F2 │ F3 │ F12 │ - * │ │ SAI │ SAD │ VAI │ VAD │ │RAISE│ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - * - */ - - [_RAISE] = LAYOUT_3x11_wrapper ( - _______________RAISE_310_L1________________, _______________RAISE_310_R1________________, - _______________RAISE_310_L2________________, _______________RAISE_310_R2________________, - _______________RAISE_310_L3________________, KC_ENT, _______________RAISE_310_R3________________ - ), - - - - /* EXTRAS - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ ! │ │ │ │ │ │ │ /\ | () | [] | ; │ - * │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ │ │ ┃EXTRA┃ │ │ ┃ @ # ┃ & % | │ ' │ - * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ , │ . │ ? │ - * │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - */ - - [_EX] = LAYOUT_3x11_wrapper ( - ______________EXTRAS_310_L1________________, ______________EXTRAS_310_R1________________, - ______________EXTRAS_310_L2________________, ______________EXTRAS_310_R2________________, - ______________EXTRAS_310_L3________________, KC_ENT, ______________EXTRAS_310_R3________________ -), - - - - /* FUNCTION - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │COPY │CLIP │ SS │ │ │ │ │ /\ │ UP │ │ DEL │ - * │PASTE│ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ TAB │ M05 │ M06 ┃ M07 ┃ M08 │ │ ┃ LEFT┃ DOWN│RIGHT│ UP │ - * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │RIGHT│ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ , │ . │DOWN │ - * │ FN │ │ │ │ │ │ │ │ │ │LEFT │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - */ - - [_FN] = LAYOUT_3x11_wrapper ( - _____________FUNCTION_310_L1_______________, _____________FUNCTION_310_R1_______________, - _____________FUNCTION_310_L2_______________, _____________FUNCTION_310_R2_______________, - _____________FUNCTION_310_L3_______________, KC_ENT, _____________FUNCTION_310_R3_______________ - ), - - - - /* SYMBOLS - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ $ │ ^ │ < │ > │ │ │ │ | │ [ │ ] │ - │ - * │ │ │ │ │ SYMB│ │ SYMB│ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ % │ : │ ; ┃ + ┃ = │ │ ┃ ┃ ( │ ) │ _ │ - * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ & │ ' │ " │ * │ # │ │ ! │ ? │ / │ \ │ @ │ - * │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - */ - - [_SYMB] = LAYOUT_3x11_wrapper ( - KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXX, XXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, - KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, - KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_ENT, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT - ), - - -}; - - -void matrix_init_user(void) { - // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values - // set num lock on at start (for numonly layer to work) - if (!host_keyboard_led_state().num_lock) { - tap_code(KC_NUM_LOCK); - } -} - -void matrix_scan_user(void) { -} - - -#ifndef NUM_DIRECTIONS -# define NUM_DIRECTIONS 2 -#endif - -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_SPC, KC_ENT) }, - [_LOWER] = { ENCODER_CCW_CW(____, ____) }, - [_RAISE] = { ENCODER_CCW_CW(____, ____) }, - [_EX] = { ENCODER_CCW_CW(____, ____) }, - [_FN] = { ENCODER_CCW_CW(____, ____) }, - [_SYMB] = { ENCODER_CCW_CW(____, ____) } -}; - - -oled_rotation_t oled_init_user(oled_rotation_t rotation){ - return OLED_ROTATION_270; -} - -/* -bool oled_task_user(void) { - uint8_t modifiers = get_mods() | get_oneshot_mods(); - - oled_set_cursor(0, 11); - oled_write_P(PSTR("SHIFT"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); - oled_write_P(PSTR("CNTRL"), (modifiers & MOD_MASK_CTRL)); - - return true; -} -*/ - -#ifdef OLED_ENABLE -bool oled_task_user(void) { - // Host Keyboard Layer Status - oled_write_P(PSTR("LAYER\n-----\n"), false); - - switch (get_highest_layer(layer_state)) { - case _LOWER: - oled_write_P(PSTR("LOWER"), false); - break; - case _RAISE: - oled_write_P(PSTR("RAISE"), false); - break; - case _EX: - oled_write_P(PSTR("EXTRA"), false); - break; - case _FN: - oled_write_P(PSTR("FUNCT"), false); - break; - case _WM: - oled_write_P(PSTR("WMAN"), false); - break; - case _SYMB: - oled_write_P(PSTR("SYMB"), false); - break; - default: - // Or use the write_ln shortcut over adding '\n' to the end of your string - oled_write_ln_P(PSTR("HOME"), false); - } - -// Host Keyboard LED Status - // led_t led_state = host_keyboard_led_state(); - // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - return false; -} -#endif - diff --git a/keyboards/hazel/satpad/keymaps/miketronic/rules.mk b/keyboards/hazel/satpad/keymaps/miketronic/rules.mk deleted file mode 100644 index 16c8997b4e45..000000000000 --- a/keyboards/hazel/satpad/keymaps/miketronic/rules.mk +++ /dev/null @@ -1,38 +0,0 @@ -# Common feature for all keyboards -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 - -# Keyboard specific -MOUSEKEY_ENABLE = yes # Mouse keys -CAPS_WORD_ENABLE = yes -KEY_OVERRIDE_ENABLE = yes -OLED_ENABLE = yes - OLED_DRIVER = SSD1306 - ENCODER_ENABLE = yes - ENCODER_MAP_ENABLE = yes - - - LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. - AUTO_SHIFT_ENABLE = no - UNICODE_ENABLE = no # Unicode - CONSOLE_ENABLE = no # Console for debug - COMMAND_ENABLE = no # Commands for debug and configuration - RGBLIGHT_ENABLE = no - BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality - SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) - AUDIO_ENABLE = no # Audio output on port C6 - MIDI_ENABLE = no # MIDI support - BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID - GRAVE_ESC_ENABLE = no - SPACE_CADET_ENABLE = no - COMBO_ENABLE = no - - # OLED WIDGETS - - # WPM_ENABLE = no - # KEYCOUNT_ENABLE = yes - # KEYLOG_ENABLE = no - # KEYLOG_DEBUG = no \ No newline at end of file diff --git a/keyboards/hazel/satpad/rules.mk b/keyboards/hazel/satpad/rules.mk deleted file mode 100644 index 978dae94bbb4..000000000000 --- a/keyboards/hazel/satpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/hazel/satpad/satpad.c b/keyboards/hazel/satpad/satpad.c deleted file mode 100644 index 238a1502eec2..000000000000 --- a/keyboards/hazel/satpad/satpad.c +++ /dev/null @@ -1,24 +0,0 @@ -#include QMK_KEYBOARD_H -#include - -#ifdef OLED_ENABLE - oled_rotation_t oled_init_kb(oled_rotation_t rotation) { - return OLED_ROTATION_270; - }; - - - bool oled_task_kb(void) { - if (oled_task_user()) { - oled_set_cursor(0,0); - oled_write_P(PSTR("SAT PAD"), false); - uint8_t modifiers = get_mods() | get_oneshot_mods(); - - oled_set_cursor(1,14); - oled_write_P(PSTR("S"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); - oled_write_P(PSTR("C"), (modifiers & MOD_MASK_CTRL)); - oled_write_P(PSTR("A"), (modifiers & MOD_MASK_ALT)); - oled_write_P(PSTR("G"), (modifiers & MOD_MASK_GUI)); - } - return true; - }; -#endif \ No newline at end of file From de64fdadac8cbb04684f76dab7b30bbc2a832c34 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 5 May 2023 13:42:28 -0500 Subject: [PATCH 48/61] Delete users/miketronic/.vscode directory --- .../miketronic/.vscode/c_cpp_properties.json | 18 --------- users/miketronic/.vscode/launch.json | 24 ------------ users/miketronic/.vscode/settings.json | 38 ------------------- 3 files changed, 80 deletions(-) delete mode 100644 users/miketronic/.vscode/c_cpp_properties.json delete mode 100644 users/miketronic/.vscode/launch.json delete mode 100644 users/miketronic/.vscode/settings.json diff --git a/users/miketronic/.vscode/c_cpp_properties.json b/users/miketronic/.vscode/c_cpp_properties.json deleted file mode 100644 index cea4d3f4e0ee..000000000000 --- a/users/miketronic/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "configurations": [ - { - "name": "windows-gcc-x64", - "includePath": [ - "${workspaceFolder}/**" - ], - "compilerPath": "gcc", - "cStandard": "${default}", - "cppStandard": "${default}", - "intelliSenseMode": "windows-gcc-x64", - "compilerArgs": [ - "" - ] - } - ], - "version": 4 -} \ No newline at end of file diff --git a/users/miketronic/.vscode/launch.json b/users/miketronic/.vscode/launch.json deleted file mode 100644 index 172013757420..000000000000 --- a/users/miketronic/.vscode/launch.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "C/C++ Runner: Debug Session", - "type": "cppdbg", - "request": "launch", - "args": [], - "stopAtEntry": false, - "externalConsole": true, - "cwd": "c:/Users/mbarnoski/qmk_firmware/users/miketronic", - "program": "c:/Users/mbarnoski/qmk_firmware/users/miketronic/build/Debug/outDebug", - "MIMode": "gdb", - "miDebuggerPath": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - } - ] -} \ No newline at end of file diff --git a/users/miketronic/.vscode/settings.json b/users/miketronic/.vscode/settings.json deleted file mode 100644 index 65c81b6209a6..000000000000 --- a/users/miketronic/.vscode/settings.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "C_Cpp_Runner.cCompilerPath": "gcc", - "C_Cpp_Runner.cppCompilerPath": "g++", - "C_Cpp_Runner.debuggerPath": "gdb", - "C_Cpp_Runner.cStandard": "", - "C_Cpp_Runner.cppStandard": "", - "C_Cpp_Runner.msvcBatchPath": "", - "C_Cpp_Runner.useMsvc": false, - "C_Cpp_Runner.warnings": [ - "-Wall", - "-Wextra", - "-Wpedantic", - "-Wshadow", - "-Wformat=2", - "-Wconversion", - "-Wnull-dereference", - "-Wsign-conversion" - ], - "C_Cpp_Runner.enableWarnings": true, - "C_Cpp_Runner.warningsAsError": false, - "C_Cpp_Runner.compilerArgs": [], - "C_Cpp_Runner.linkerArgs": [], - "C_Cpp_Runner.includePaths": [], - "C_Cpp_Runner.includeSearch": [ - "*", - "**/*" - ], - "C_Cpp_Runner.excludeSearch": [ - "**/build", - "**/build/**", - "**/.*", - "**/.*/**", - "**/.vscode", - "**/.vscode/**" - ], - "C_Cpp_Runner.useAddressSanitizer": false, - "C_Cpp_Runner.showCompilationTime": false -} \ No newline at end of file From 2f9275226113e3b45ac3ae44ed1d2e671de3701d Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 5 May 2023 13:59:04 -0500 Subject: [PATCH 49/61] Delete keyboards/idobao/id75/keymaps/miketronic directory --- .../idobao/id75/keymaps/miketronic/config.h | 29 --- .../idobao/id75/keymaps/miketronic/keymap.c | 204 ------------------ .../idobao/id75/keymaps/miketronic/rules.mk | 15 -- 3 files changed, 248 deletions(-) delete mode 100644 keyboards/idobao/id75/keymaps/miketronic/config.h delete mode 100644 keyboards/idobao/id75/keymaps/miketronic/keymap.c delete mode 100644 keyboards/idobao/id75/keymaps/miketronic/rules.mk diff --git a/keyboards/idobao/id75/keymaps/miketronic/config.h b/keyboards/idobao/id75/keymaps/miketronic/config.h deleted file mode 100644 index 3453917e9296..000000000000 --- a/keyboards/idobao/id75/keymaps/miketronic/config.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B -// SPDX-License-Identifier: GPL-2.0+ - -#pragma once - -# define USB_POLLING_INTERVAL_MS 1 -# undef RGBLIGHT_HUE_STEP -# define RGBLIGHT_HUE_STEP 1 -# undef RGBLIGHT_SAT_STEP -# define RGBLIGHT_SAT_STEP 1 -# undef RGBLIGHT_VAL_STEP -# define RGBLIGHT_VAL_STEP 1 -# define RGBLIGHT_SLEEP -# define RGBLIGHT_LAYERS -# define FORCE_NKRO - -# define TAPPING_TERM 160 // 30APR23 was 170 -# define TAPPING_TERM_PER_KEY -# define QUICK_TAP_TERM TAPPING_TERM / 2 -# define QUICK_TAP_TERM_PER_KEY -# define PERMISSIVE_HOLD_PER_KEY -# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY - -# define LEADER_NO_TIMEOUT -# define LEADER_TIMEOUT 300 -# define LEADER_PER_KEY_TIMING - - - diff --git a/keyboards/idobao/id75/keymaps/miketronic/keymap.c b/keyboards/idobao/id75/keymaps/miketronic/keymap.c deleted file mode 100644 index efd071fc35a7..000000000000 --- a/keyboards/idobao/id75/keymaps/miketronic/keymap.c +++ /dev/null @@ -1,204 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B -// SPDX-License-Identifier: GPL-2.0+ - -#include "miketronic.h" - - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - -/* WORKMAN - * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. - * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | TAB/ESC || Q || D || R || W || B SYM || 7 || 8 || 9 || J SYM || F || U || P || BSPC || BSPC | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | TAB/SHFT || A || S || H || T EX || G || 4 || 5 || 6 || Y || N || E || O || I || ENTER | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | LSHIFT || Z || X || M || C || V || 1 || 2 0 || 3 || K || L || , SPC || . SPC ||SHFT/ENT || Up/Rght | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | FN || LCTRL || GUI || LALT || LOWER || Space || Space || . Enter || Enter || Enter || RAISE || SS || CLIP ||CopyPaste|| Dn/Left | - * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' - */ - - [_WM] = LAYOUT_ortho_5x15_wrapper ( - _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, - _____________WORKMAN_412_001_L_____________, ________3KEY_ID75_02_________, _____________WORKMAN_412_001_R_____________, - _____________WORKMAN_412_002_L_____________, ________3KEY_ID75_03_________, _____________WORKMAN_412_002_R_____________, - _____________WORKMAN_412_003_L_____________, ________3KEY_ID75_04_________, _____________WORKMAN_412_003_R_____________, - _____________WORKMAN_ID75_BOT_L____________, ________3KEY_ID75_05_________, _____________WORKMAN_ID75_BOT_R____________ - ), - - - [_QW] = LAYOUT_ortho_5x15_wrapper ( - KC_ESC, _________________QWERTY_L1_________________, ________3KEY_ID75_01_________, _________________QWERTY_R1_________________, KC_BSPC, - KC_TAB, _________________QWERTY_L1_________________, ________3KEY_ID75_02_________, _________________QWERTY_R1_________________, BRACES, - KC_LSFT, _________________QWERTY_L2_________________, ________3KEY_ID75_03_________, _________________QWERTY_R2_________________, KC_QUOT, - FN, _________________QWERTY_L3_________________, ________3KEY_ID75_04_________, _________________QWERTY_R3_________________, TD_UR, - _____________WORKMAN_ID75_BOT_L____________, ________3KEY_ID75_05_________, _____________WORKMAN_ID75_BOT_R____________ - ), - - - -/* LOWER - * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. - * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || () || [] || /\ || || || 7 || 8 || 9 || || 7 || 8 || 9 || || | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || @ # || & % || || || || 4 || 5 || 6 || || 4 || 5 || 6 || || | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || || || || || || 1 || 2 0 || 3 || 0 || 1 || 2 0 || 3 || || Up/Rght | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || || || || || || Space || . Enter || Enter || || BSPC || SPC || . Enter || || Dn/Left | - * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' - */ - - [_LOWER] = LAYOUT_ortho_5x15_wrapper ( - _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, - _______________LOWER_412_L1________________, ________3KEY_ID75_02_________, _______________LOWER_412_R1________________, - _______________LOWER_412_L2________________, ________3KEY_ID75_03_________, _______________LOWER_412_R2________________, - _______________LOWER_412_L3________________, ________3KEY_ID75_04_________, _______________LOWER_412_R3________________, - _______________LOWER_412_L4________________, ________3KEY_ID75_05_________, _______________LOWER_412_R4________________ - ), - - - -/* RAISE - * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. - * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | BOOT || DEBUG || || || || MAKE || 7 || 8 || 9 || || || F7 || F8 || F9 || F10 | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || RGB TOG || RGB MOD || RGB HUI || RGB HUD || || 4 || 5 || 6 || || / \ || F4 || F5 || F6 || F11 | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || RGB SAI || RGB SAD || RGB VAI || RGB VAD || || 1 || 2 0 || 3 || || _ - || F1 || F2 || F3 || F12 | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || || || || || || Space || . Enter || Enter || || RAISE || || || || | - * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' - */ - - [_RAISE] = LAYOUT_ortho_5x15_wrapper ( - _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, - _______________RAISE_412_L1________________, ________3KEY_ID75_02_________, _______________RAISE_412_R1________________, - _______________RAISE_412_L2________________, ________3KEY_ID75_03_________, _______________RAISE_412_R2________________, - _______________RAISE_412_L3________________, ________3KEY_ID75_04_________, _______________RAISE_412_R3________________, - _________________BLANK_6___________________, ________3KEY_ID75_05_________, _________________BLANK_6___________________ - ), - - - -/* EXTRAS - * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. - * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || ! || || || || || 7 || 8 || 9 || || /\ || () || [] || ; || | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | SHIFT || || || || EXTRAS || || 4 || 5 || 6 || || @ # || & % || || ' || | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || || || || || || 1 || 2 0 || 3 || || || , || . || ? || Up/Rght | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || || || || || || Space || . Enter || Enter || || || || || || | - * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' - */ - - [_EX] = LAYOUT_ortho_5x15_wrapper ( - _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, - ______________EXTRAS_412_L1________________, ________3KEY_ID75_02_________, ______________EXTRAS_412_R1________________, - ______________EXTRAS_412_L2________________, ________3KEY_ID75_03_________, ______________EXTRAS_412_R2________________, - ______________EXTRAS_412_L3________________, ________3KEY_ID75_04_________, ______________EXTRAS_412_R3________________, - ______________EXTRAS_412_L4________________, ________3KEY_ID75_05_________, ______________EXTRAS_412_R4________________ - ), - - -/* FUNCTION (_FN) - * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. - * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | TAB ||Macro 09 ||Macro 10 ||Macro 11 ||Macro 12 || || 7 || 8 || 9 || || / \ || UP || || || DEL | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | TAB SHFT ||Macro 05 ||Macro 06 ||Macro 07 ||Macro 08 || || 4 || 5 || 6 || || LEFT || DOWN || RIGHT || || | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | ||Macro 01 ||Macro 02 ||Macro 03 ||Macro 04 || || 1 || 2 0 || 3 || || || , || . || ? || UP RIGHT| - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || RGB1 || RGB2 || RGB3 || RBG4 || || Space || . Enter || Enter || || || || || || DN LEFT | - * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' - */ - - [_FN] = LAYOUT_ortho_5x15_wrapper ( - _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, ____________FUNCTION_ID75_TOP_R____________, - _____________FUNCTION_412_L1_______________, ________3KEY_ID75_02_________, _____________FUNCTION_412_L1_______________, - _____________FUNCTION_412_L2_______________, ________3KEY_ID75_03_________, _____________FUNCTION_412_L2_______________, - _____________FUNCTION_412_L3_______________, ________3KEY_ID75_04_________, _____________FUNCTION_412_L3_______________, - _____________FUNCTION_412_L4_______________, ________3KEY_ID75_05_________, _____________FUNCTION_412_L4_______________ - ), - - - - /* SYMBOLS - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ | $ | ^ | < | > │ SYMB│ │ SYMB│ | | [ | ] | - | | - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ | % | : | ; ┃ + ┃ = │ │ ┃ ┃ ( | ) | _ | | - * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * | | & | ' | " | * | # │ │ ! | ? | / | \ | @ | | - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ - - [_SYMB] = LAYOUT_ortho_5x15_wrapper ( - KC_ESC, _______, _______, _______, _______, _______, ________3KEY_ID75_01_________, RGB1, RGB2, RGB3, RGB4, RGB5, KC_DEL, - _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, ________3KEY_ID75_02_________, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, - _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, ________3KEY_ID75_03_________, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, - _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, ________3KEY_ID75_04_________, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, - _________________BLANK_6___________________, ________3KEY_ID75_05_________, _________________BLANK_6___________________ - ), - - -}; - -#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/idobao/id75/keymaps/miketronic/rules.mk b/keyboards/idobao/id75/keymaps/miketronic/rules.mk deleted file mode 100644 index 7f805ec70e14..000000000000 --- a/keyboards/idobao/id75/keymaps/miketronic/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Common feature for all keyboards -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 - -# Keyboard specific -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -LEADER_ENABLE = yes -AUTO_SHIFT_ENABLE = no -VIA_ENABLE = no -MOUSEKEY_ENABLE = no -CONSOLE_ENABLE = no -COMMAND_ENABLE = no From ea1acdc80d154d2a0df0ef5937d0e7e5bc3345e8 Mon Sep 17 00:00:00 2001 From: miketronic Date: Tue, 9 May 2023 15:35:47 -0500 Subject: [PATCH 50/61] userspace updates --- .../bad_wings/keymaps/miketronic/config.h | 18 +++-- .../bad_wings/keymaps/miketronic/keymap.c | 70 ++++++++++++++++++- .../bad_wings/keymaps/miketronic/rules.mk | 1 + .../hazel/satpad/keymaps/miketronic/config.h | 14 +++- .../hazel/satpad/keymaps/miketronic/keymap.c | 66 +++++++++++++++++ .../hazel/satpad/keymaps/miketronic/rules.mk | 5 +- .../bde/rev2/keymaps/miketronic/config.h | 11 ++- .../bde/rev2/keymaps/miketronic/keymap.c | 67 +++++++++++++++++- .../bde/rev2/keymaps/miketronic/rules.mk | 3 + .../miketronic/.vscode/c_cpp_properties.json | 18 ----- users/miketronic/.vscode/launch.json | 24 ------- users/miketronic/.vscode/settings.json | 38 ---------- users/miketronic/miketronic.h | 3 +- users/miketronic/wrappers.h | 6 +- 14 files changed, 244 insertions(+), 100 deletions(-) delete mode 100644 users/miketronic/.vscode/c_cpp_properties.json delete mode 100644 users/miketronic/.vscode/launch.json delete mode 100644 users/miketronic/.vscode/settings.json diff --git a/keyboards/hazel/bad_wings/keymaps/miketronic/config.h b/keyboards/hazel/bad_wings/keymaps/miketronic/config.h index 6f568fd361b9..f341cc92cd1c 100644 --- a/keyboards/hazel/bad_wings/keymaps/miketronic/config.h +++ b/keyboards/hazel/bad_wings/keymaps/miketronic/config.h @@ -3,17 +3,23 @@ #pragma once -# define TAPPING_TERM 170 +# define TAPPING_TERM 160 # define TAPPING_TERM_PER_KEY -# define QUICK_TAP_TERM TAPPING_TERM / 2 -# define QUICK_TAP_TERM_PER_KEY # define PERMISSIVE_HOLD_PER_KEY # define HOLD_ON_OTHER_KEY_PRESS_PER_KEY +# define QUICK_TAP_TERM TAPPING_TERM / 2 +# define QUICK_TAP_TERM_PER_KEY # define IGNORE_MOD_TAP_INTERRUPT -# define TAPPING_FORCE_HOLD + +# define LEADER_NO_TIMEOUT +# define LEADER_TIMEOUT 300 +# define LEADER_PER_KEY_TIMING + # define ONESHOT_TAP_TOGGLE 10 # define ONESHOT_TIMEOUT 500 # define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD # define CIRQUE_PINNACLE_TAP_ENABLE -# define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_ABSOLUTE_MODE -# define CIRQUE_DEVICE_GESTURES_SCROLL_ENABLE \ No newline at end of file +# define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE +# define CIRQUE_PINNACLE_ATTENUATION_4X +# define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE +//# define CIRQUE_DEVICE_GESTURES_SCROLL_ENABLE \ No newline at end of file diff --git a/keyboards/hazel/bad_wings/keymaps/miketronic/keymap.c b/keyboards/hazel/bad_wings/keymaps/miketronic/keymap.c index 013c8c1a5da3..3ebcc79fded7 100644 --- a/keyboards/hazel/bad_wings/keymaps/miketronic/keymap.c +++ b/keyboards/hazel/bad_wings/keymaps/miketronic/keymap.c @@ -187,4 +187,72 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _________3KEY_LEFT___________, _________3KEY_RIGHT__________ ), -}; \ No newline at end of file +}; + + +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 +} + diff --git a/keyboards/hazel/bad_wings/keymaps/miketronic/rules.mk b/keyboards/hazel/bad_wings/keymaps/miketronic/rules.mk index a223448a6d4c..72c338c1574c 100644 --- a/keyboards/hazel/bad_wings/keymaps/miketronic/rules.mk +++ b/keyboards/hazel/bad_wings/keymaps/miketronic/rules.mk @@ -9,6 +9,7 @@ MACROS_ENABLED = yes MOUSEKEY_ENABLE = yes # Mouse keys CAPS_WORD_ENABLE = yes KEY_OVERRIDE_ENABLE = yes +LEADER_ENABLE = yes LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. diff --git a/keyboards/hazel/satpad/keymaps/miketronic/config.h b/keyboards/hazel/satpad/keymaps/miketronic/config.h index 278d0b0fbe65..52b33b524b60 100644 --- a/keyboards/hazel/satpad/keymaps/miketronic/config.h +++ b/keyboards/hazel/satpad/keymaps/miketronic/config.h @@ -1,8 +1,16 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + #pragma once -# define TAPPING_TERM 170 +# define TAPPING_TERM 160 # define TAPPING_TERM_PER_KEY +# define PERMISSIVE_HOLD_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY # define QUICK_TAP_TERM TAPPING_TERM / 2 # define QUICK_TAP_TERM_PER_KEY -# define PERMISSIVE_HOLD_PER_KEY -# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY \ No newline at end of file +# define IGNORE_MOD_TAP_INTERRUPT + +# define LEADER_NO_TIMEOUT +# define LEADER_TIMEOUT 300 +# define LEADER_PER_KEY_TIMING \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c index 80ae57c893f0..10328a109ad3 100644 --- a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c +++ b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c @@ -223,3 +223,69 @@ bool oled_task_user(void) { } #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/hazel/satpad/keymaps/miketronic/rules.mk b/keyboards/hazel/satpad/keymaps/miketronic/rules.mk index 16c8997b4e45..c58396744112 100644 --- a/keyboards/hazel/satpad/keymaps/miketronic/rules.mk +++ b/keyboards/hazel/satpad/keymaps/miketronic/rules.mk @@ -6,10 +6,11 @@ NKRO_ENABLE = yes # Enable N-Key Rollover MACROS_ENABLED = yes # Keyboard specific -MOUSEKEY_ENABLE = yes # Mouse keys +MOUSEKEY_ENABLE = yes # Mouse keys +LEADER_ENABLE = yes CAPS_WORD_ENABLE = yes KEY_OVERRIDE_ENABLE = yes -OLED_ENABLE = yes +OLED_ENABLE = yes OLED_DRIVER = SSD1306 ENCODER_ENABLE = yes ENCODER_MAP_ENABLE = yes diff --git a/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h b/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h index 3a5bd8518493..52b33b524b60 100644 --- a/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h +++ b/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h @@ -3,9 +3,14 @@ #pragma once -# define TAPPING_TERM 150 +# define TAPPING_TERM 160 # define TAPPING_TERM_PER_KEY -# define QUICK_TAP_TERM TAPPING_TERM / 2 -# define QUICK_TAP_TERM_PER_KEY # define PERMISSIVE_HOLD_PER_KEY # define HOLD_ON_OTHER_KEY_PRESS_PER_KEY +# define QUICK_TAP_TERM TAPPING_TERM / 2 +# define QUICK_TAP_TERM_PER_KEY +# define IGNORE_MOD_TAP_INTERRUPT + +# define LEADER_NO_TIMEOUT +# define LEADER_TIMEOUT 300 +# define LEADER_PER_KEY_TIMING \ No newline at end of file diff --git a/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c b/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c index c92fa73f157e..1ece2e662db8 100644 --- a/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c +++ b/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c @@ -153,4 +153,69 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_FN] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, [_SYMB] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } }; -#endif \ No newline at end of file +#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 index 1b11143fd13d..540fbaecb220 100644 --- a/keyboards/mechwild/bde/rev2/keymaps/miketronic/rules.mk +++ b/keyboards/mechwild/bde/rev2/keymaps/miketronic/rules.mk @@ -3,8 +3,11 @@ 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 OLED_DRIVER = SSD1306 # Set OLED Driver + +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow \ No newline at end of file diff --git a/users/miketronic/.vscode/c_cpp_properties.json b/users/miketronic/.vscode/c_cpp_properties.json deleted file mode 100644 index cea4d3f4e0ee..000000000000 --- a/users/miketronic/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "configurations": [ - { - "name": "windows-gcc-x64", - "includePath": [ - "${workspaceFolder}/**" - ], - "compilerPath": "gcc", - "cStandard": "${default}", - "cppStandard": "${default}", - "intelliSenseMode": "windows-gcc-x64", - "compilerArgs": [ - "" - ] - } - ], - "version": 4 -} \ No newline at end of file diff --git a/users/miketronic/.vscode/launch.json b/users/miketronic/.vscode/launch.json deleted file mode 100644 index 172013757420..000000000000 --- a/users/miketronic/.vscode/launch.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "C/C++ Runner: Debug Session", - "type": "cppdbg", - "request": "launch", - "args": [], - "stopAtEntry": false, - "externalConsole": true, - "cwd": "c:/Users/mbarnoski/qmk_firmware/users/miketronic", - "program": "c:/Users/mbarnoski/qmk_firmware/users/miketronic/build/Debug/outDebug", - "MIMode": "gdb", - "miDebuggerPath": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - } - ] - } - ] -} \ No newline at end of file diff --git a/users/miketronic/.vscode/settings.json b/users/miketronic/.vscode/settings.json deleted file mode 100644 index 65c81b6209a6..000000000000 --- a/users/miketronic/.vscode/settings.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "C_Cpp_Runner.cCompilerPath": "gcc", - "C_Cpp_Runner.cppCompilerPath": "g++", - "C_Cpp_Runner.debuggerPath": "gdb", - "C_Cpp_Runner.cStandard": "", - "C_Cpp_Runner.cppStandard": "", - "C_Cpp_Runner.msvcBatchPath": "", - "C_Cpp_Runner.useMsvc": false, - "C_Cpp_Runner.warnings": [ - "-Wall", - "-Wextra", - "-Wpedantic", - "-Wshadow", - "-Wformat=2", - "-Wconversion", - "-Wnull-dereference", - "-Wsign-conversion" - ], - "C_Cpp_Runner.enableWarnings": true, - "C_Cpp_Runner.warningsAsError": false, - "C_Cpp_Runner.compilerArgs": [], - "C_Cpp_Runner.linkerArgs": [], - "C_Cpp_Runner.includePaths": [], - "C_Cpp_Runner.includeSearch": [ - "*", - "**/*" - ], - "C_Cpp_Runner.excludeSearch": [ - "**/build", - "**/build/**", - "**/.*", - "**/.*/**", - "**/.vscode", - "**/.vscode/**" - ], - "C_Cpp_Runner.useAddressSanitizer": false, - "C_Cpp_Runner.showCompilationTime": false -} \ No newline at end of file diff --git a/users/miketronic/miketronic.h b/users/miketronic/miketronic.h index 8c9b9024a095..4032215a1d7b 100644 --- a/users/miketronic/miketronic.h +++ b/users/miketronic/miketronic.h @@ -37,7 +37,8 @@ enum layer_names { #define KRAISE LT(_RAISE, KC_K) // Tap for "K", hold for Raise layer // Mod Tap -#define ASFT MT(MOD_LSFT, KC_A) // Tap for "A", hold for Shift +//#define ASFT MT(MOD_LSFT, KC_A) // Tap for "A", hold for Shift +#define ASFT SFT_T(KC_A) // Tap for "A", hold for Shift #define GGUI MT(MOD_LGUI, KC_G) // Tap for "G", hold for OS Key #define MGUI MT(MOD_LGUI, KC_M) // Tap for "M", hold for OS Key #define CTRLX MT(MOD_LCTL, KC_X) // Tap for "X", hold for Ctrl diff --git a/users/miketronic/wrappers.h b/users/miketronic/wrappers.h index c0e526a3dd5f..7d955f4172a9 100644 --- a/users/miketronic/wrappers.h +++ b/users/miketronic/wrappers.h @@ -98,7 +98,7 @@ #define _________________RAISE_R3__________________ _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END #define _______________RAISE_310_L1________________ QK_BOOT, DB_TOGG, _______, _______, QK_MAKE -#define _______________RAISE_310_L2________________ _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD +#define _______________RAISE_310_L2________________ KC_LSFT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD #define _______________RAISE_310_L3________________ _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD #define _______________RAISE_310_R1________________ _______, KC_F7, KC_F8, KC_F9, KC_F10 @@ -106,7 +106,7 @@ #define _______________RAISE_310_R3________________ _______, KC_F1, KC_F2, KC_F3, KC_F12 #define _______________RAISE_412_L1________________ QK_BOOT, DB_TOGG, _______, _______, _______, QK_MAKE -#define _______________RAISE_412_L2________________ _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, WM +#define _______________RAISE_412_L2________________ KC_LSFT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, WM #define _______________RAISE_412_L3________________ _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, QW #define _______________RAISE_412_R1________________ _______, _______, KC_F7, KC_F8, KC_F9, KC_F10 @@ -116,7 +116,7 @@ #define ______________EXTRAS_310_L1________________ KC_EXLM, _______, _______, _______, _______ -#define ______________EXTRAS_310_L2________________ _______, _______, _______, _______, _______ +#define ______________EXTRAS_310_L2________________ KC_LSFT, _______, _______, _______, _______ #define ______________EXTRAS_310_L3________________ _______, _______, _______, _______, _______ #define ______________EXTRAS_310_R1________________ _______, TD_SL, PRN, BRACES, KC_SCLN From 3c576f1aaa3c1a468cec55887e7878a51489cb8b Mon Sep 17 00:00:00 2001 From: miketronic Date: Thu, 11 May 2023 09:10:40 -0500 Subject: [PATCH 51/61] userspace add --- .../pi40/mit_v1_0/keymaps/miketronic/config.h | 11 +- .../pi40/mit_v1_0/keymaps/miketronic/keymap.c | 75 ++++- .../pi40/mit_v1_0/keymaps/miketronic/rules.mk | 1 + keyboards/hazel/satpad/config.h | 1 + keyboards/hazel/satpad/info.json | 82 +++++ .../hazel/satpad/keymaps/default/config.h | 19 ++ .../satpad/keymaps/default/keymap - SATCOPY.c | 132 ++++++++ .../hazel/satpad/keymaps/default/keymap.c | 62 ++++ .../hazel/satpad/keymaps/default/rules.mk | 17 + .../hazel/satpad/keymaps/miketronic/config.h | 16 + .../hazel/satpad/keymaps/miketronic/keymap.c | 290 ++++++++++++++++++ .../hazel/satpad/keymaps/miketronic/rules.mk | 39 +++ keyboards/hazel/satpad/rules.mk | 1 + keyboards/hazel/satpad/satpad.c | 24 ++ .../idobao/id75/keymaps/miketronic/config.h | 30 ++ .../idobao/id75/keymaps/miketronic/keymap.c | 233 ++++++++++++++ .../idobao/id75/keymaps/miketronic/rules.mk | 15 + .../bde/rev2/keymaps/miketronic/keymap.c | 6 +- keyboards/planck/keymaps/miketronic/config.h | 12 +- keyboards/planck/keymaps/miketronic/keymap.c | 75 ++++- keyboards/planck/keymaps/miketronic/rules.mk | 7 + .../miketronic/.vscode/c_cpp_properties.json | 16 + 22 files changed, 1145 insertions(+), 19 deletions(-) create mode 100644 keyboards/hazel/satpad/config.h create mode 100644 keyboards/hazel/satpad/info.json create mode 100644 keyboards/hazel/satpad/keymaps/default/config.h create mode 100644 keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c create mode 100644 keyboards/hazel/satpad/keymaps/default/keymap.c create mode 100644 keyboards/hazel/satpad/keymaps/default/rules.mk create mode 100644 keyboards/hazel/satpad/keymaps/miketronic/config.h create mode 100644 keyboards/hazel/satpad/keymaps/miketronic/keymap.c create mode 100644 keyboards/hazel/satpad/keymaps/miketronic/rules.mk create mode 100644 keyboards/hazel/satpad/rules.mk create mode 100644 keyboards/hazel/satpad/satpad.c create mode 100644 keyboards/idobao/id75/keymaps/miketronic/config.h create mode 100644 keyboards/idobao/id75/keymaps/miketronic/keymap.c create mode 100644 keyboards/idobao/id75/keymaps/miketronic/rules.mk create mode 100644 users/miketronic/.vscode/c_cpp_properties.json diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h index 66b9224406e5..5a1153c42db0 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h @@ -3,11 +3,16 @@ #pragma once -# define TAPPING_TERM 160 // 30APR23 was 170 +# define TAPPING_TERM 160 # define TAPPING_TERM_PER_KEY -# define QUICK_TAP_TERM TAPPING_TERM / 2 -# define QUICK_TAP_TERM_PER_KEY # define PERMISSIVE_HOLD_PER_KEY # define HOLD_ON_OTHER_KEY_PRESS_PER_KEY +# define QUICK_TAP_TERM TAPPING_TERM / 2 +# define QUICK_TAP_TERM_PER_KEY +# define IGNORE_MOD_TAP_INTERRUPT + +# define LEADER_NO_TIMEOUT +# define LEADER_TIMEOUT 300 +# define LEADER_PER_KEY_TIMING diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/keymap.c b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/keymap.c index 60e24c0d507d..636aad675bc7 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/keymap.c +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/keymap.c @@ -158,11 +158,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_SYMB] = LAYOUT_ortho_4x12_wrapper ( - KC_MUTE, - _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, - _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, - _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + KC_MUTE, + _______, _____________SYMBOLS_310_L1________________, _____________SYMBOLS_310_R1________________, _______, + _______, _____________SYMBOLS_310_L2________________, _____________SYMBOLS_310_R2________________, _______, + _______, _____________SYMBOLS_310_L3________________, _____________SYMBOLS_310_R3________________, _______, + _________________BLANK_6___________________, _________________BLANK_6___________________ ) }; @@ -223,3 +223,68 @@ bool oled_task_user(void) { } #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/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk index c8d72f5df4c5..96f930ffa10a 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/rules.mk @@ -15,6 +15,7 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output MOUSEKEY_ENABLE = no # Mouse keys +LEADER_ENABLE = yes RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 WS2812_DRIVER = vendor diff --git a/keyboards/hazel/satpad/config.h b/keyboards/hazel/satpad/config.h new file mode 100644 index 000000000000..7b9637ef9c2c --- /dev/null +++ b/keyboards/hazel/satpad/config.h @@ -0,0 +1 @@ +#pragma once \ No newline at end of file diff --git a/keyboards/hazel/satpad/info.json b/keyboards/hazel/satpad/info.json new file mode 100644 index 000000000000..3caad7bb2e05 --- /dev/null +++ b/keyboards/hazel/satpad/info.json @@ -0,0 +1,82 @@ +{ + "keyboard_name": "SatPad", + "manufacturer": "jasonhazel", + "usb": { + "vid": "0x4A48", + "pid": "0x7370", + "device_version": "0.0.1" + }, + "matrix_size": { + "cols": 6, + "rows": 7 + }, + "diode_direction": "COL2ROW", + "bootloader": "caterina", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "mousekey": true, + "nkro": false, + "encoder": true + }, + "matrix_pins": { + "rows": ["B3", "B2", "B6", "D3", "D2", "D4", "E6"], + "cols": ["F4", "F5", "F6", "F7", "B1", "D7"] + }, + "encoder": { + "rotary": [ + { "pin_a": "B4", "pin_b": "B5" } + ] + }, + "bootmagic": { + "enabled": true, + "matrix": [0,0] + }, + "processor": "atmega32u4", + "url": "https://github.com/jasonhazel/satpad", + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + + { "matrix": [3, 4], "x": 6, "y": 0 }, + { "matrix": [3, 3], "x": 7, "y": 0 }, + { "matrix": [3, 2], "x": 8, "y": 0 }, + { "matrix": [3, 1], "x": 9, "y": 0 }, + { "matrix": [3, 0], "x": 10, "y": 0 }, + + { "matrix": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "x": 2, "y": 1 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [1, 4], "x": 4, "y": 1 }, + + { "matrix": [4, 4], "x": 6, "y": 1 }, + { "matrix": [4, 3], "x": 7, "y": 1 }, + { "matrix": [4, 2], "x": 8, "y": 1 }, + { "matrix": [4, 1], "x": 9, "y": 1 }, + { "matrix": [4, 0], "x": 10, "y": 1 }, + + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 }, + { "matrix": [2, 3], "x": 3, "y": 2 }, + { "matrix": [2, 4], "x": 4, "y": 2 }, + + { "matrix": [6, 5], "x": 5, "y": 2 }, + + { "matrix": [5, 4], "x": 6, "y": 2 }, + { "matrix": [5, 3], "x": 7, "y": 2 }, + { "matrix": [5, 2], "x": 8, "y": 2 }, + { "matrix": [5, 1], "x": 9, "y": 2 }, + { "matrix": [5, 0], "x": 10, "y": 2 } + + ] + } + } +} \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/config.h b/keyboards/hazel/satpad/keymaps/default/config.h new file mode 100644 index 000000000000..c6b2abb79748 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/default/config.h @@ -0,0 +1,19 @@ +#pragma once + + +#define TAPPING_TERM 200 +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT +#define TAPPING_FORCE_HOLD + +#define ONESHOT_TAP_TOGGLE 10 +#define ONESHOT_TIMEOUT 500 +#define COMBO_TERM 200 + +#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD + +// disable shit +#define NO_MUSIC_MODE + +#undef LOCKING_SUPPORT_ENABLE +#undef LOCKING_RESYNC_ENABLE \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c b/keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c new file mode 100644 index 000000000000..99fec7d54474 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c @@ -0,0 +1,132 @@ +#include QMK_KEYBOARD_H + + +enum satpad_layers { + _WORKMAN, + _LOWER +}; + + + +// COMBO DECLARATIONS ============================================================================ +enum satpad_combos { + COMBO_SHIFT, + COMBO_LENGTH +}; + + +// TAP DANCE DECLARATIONS ============================================================================ +enum satpad_tapdances { + TD_ZLOWER, + TD_QESC, + TD_ATAB, + TD_XCTL, + TD_MGUI, + TD_CALT, + TD_KSPC, + TD_VENT, + TD_XSCLN, // ; , : + TD_IQUOT, // Letter "i", quote + TD_UPRT, // up, right + TD_CP // copy, paste +}; + +#define ZLOWER LT(_LOWER, KC_Z) //Tap for 'Z', Hold for Lower layer +#define QESC TD(TD_QESC) //Tap for 'Q', Twice for 'ESC' +#define ATAB TD(TD_ATAB) //Tap for 'A', Twice for 'Tab' +#define KSPC TD(TD_KSPC) //Tap for 'Space', Twice for 'K' +#define VENT TD(TD_VENT) //Tap for 'Enter', Twice for 'V' +#define XSCLN TD(TD_XSCLN) //Tap for ';', Twice for ':' +#define IQUOT TD(TD_IQUOT) //Tap for 'I', Twice for Quotes +#define UPRT TD(TD_UPRT) // up, right +#define CP TD(TD_CP) //Tap for Copy, Twice for Paste +#define XCTL LCTL_T(KC_X) //Tap for 'X', Hold for 'Left Ctrl' +#define MGUI LGUI_T(KC_M) //Tap for 'M', Hold for 'Windows Key' +#define CALT LALT_T(KC_C) //Tap for 'C', Hold for 'Left Alt' +#define OSM_SFT OSM(MOD_LSFT) + + +uint16_t COMBO_LEN = COMBO_LENGTH; +const uint16_t PROGMEM combo_shift[] = { KC_W, KC_B, COMBO_END }; + + +combo_t key_combos[] = { + [COMBO_SHIFT] = COMBO(combo_shift, OSM_SFT) +}; + + +//Tap Dance Definitions +qk_tap_dance_action_t tap_dance_actions[] = { + [TD_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), + [TD_ATAB] = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB), + [TD_KSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_K), + [TD_VENT] = ACTION_TAP_DANCE_DOUBLE(KC_ENT, KC_V), + [TD_XSCLN] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_COLN), + [TD_IQUOT] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_QUOT), + [TD_UPRT] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_RGHT), + [TD_CP] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_C), LCTL(KC_V)) +}; + +const key_override_t **key_overrides = (const key_override_t *[]) { + NULL +}; + +#define ______ KC_NO + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* WORKMAN + * ,---------------------------------------------------------------------------------------. + * | Q | D | R | W | B | | J | F | U | P |BKSPACE| + * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| + * | A | S | H | T | G | | Y | N | E | O | I " | + * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| + * | Z | X | M | C | V | M20 | K | L | , | . |Cpy/Pst| + * `---------------------------------------------------------------------------------------' + */ + + [_WORKMAN] = LAYOUT_3x11( + QESC, KC_D, KC_R, KC_W, KC_B, ______, KC_J, KC_F, KC_U, KC_P, KC_BSPC, \ + ATAB, KC_S, KC_H, KC_T, KC_G, ______, KC_Y, KC_N, KC_E, KC_O, IQUOT, \ + ZLOWER, XCTL, MGUI, CALT, VENT, KC_ENT, KSPC, KC_L, KC_COMM, KC_DOT, CP + ), + + + /* LOWER + * ,---------------------------------------------------------------------------------------. + * | RESET | BOOT | | | | | ; : | 7 | 8 | 9 | DEL | + * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| + * | | | | | | | | 4 | 5 | 6 |UP/RT | + * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| + * | | | | | | M20 | 0 | 1 | 2 | 3 | /\ | + * `---------------------------------------------------------------------------------------' + */ + [_LOWER] = LAYOUT_3x11( + QK_RBT, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, _______, XSCLN, KC_7, KC_8, KC_9, KC_DEL, \ + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_4, KC_5, KC_6, UPRT, \ + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_0, KC_1, KC_2, KC_3, KC_SLSH + ), +}; + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_WORKMAN] = { ENCODER_CCW_CW(KC_SPC, OSM_SFT) }, + [_LOWER] = { ENCODER_CCW_CW(KC_SPC, OSM_SFT) }, +}; + +oled_rotation_t oled_init_user(oled_rotation_t rotation){ + return OLED_ROTATION_270; +} + +bool oled_task_user(void) { + uint8_t modifiers = get_mods() | get_oneshot_mods(); + + oled_set_cursor(0, 11); + oled_write_P(PSTR("SHIFT"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); + oled_write_P(PSTR("CNTRL"), (modifiers & MOD_MASK_CTRL)); + + return true; +} + + + + diff --git a/keyboards/hazel/satpad/keymaps/default/keymap.c b/keyboards/hazel/satpad/keymaps/default/keymap.c new file mode 100644 index 000000000000..5f863022f2ee --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/default/keymap.c @@ -0,0 +1,62 @@ +#include QMK_KEYBOARD_H + +enum layers { + _BASE, + LAYER_LENGTH +}; + +enum combos { + COMBO_SPACE, + COMBO_BACKSP, + COMBO_ENTER, + COMBO_TAB, + COMBO_ESC, + COMBO_LENGTH +}; + +uint16_t COMBO_LEN = COMBO_LENGTH; +const uint16_t PROGMEM combo_space[] = { KC_N, KC_M, COMBO_END }; +const uint16_t PROGMEM combo_backspace[] = { KC_O, KC_P, COMBO_END }; +const uint16_t PROGMEM combo_enter[] = { KC_L, KC_QUOT, COMBO_END }; +const uint16_t PROGMEM combo_tab[] = { KC_A, KC_S, COMBO_END }; +const uint16_t PROGMEM combo_esc[] = { KC_Q, KC_W, COMBO_END }; + +combo_t key_combos[] = { + [COMBO_SPACE] = COMBO(combo_space, KC_SPC), + [COMBO_BACKSP] = COMBO(combo_backspace, KC_BSPC), + [COMBO_ENTER] = COMBO(combo_enter, KC_ENT), + [COMBO_TAB] = COMBO(combo_tab, KC_TAB), + [COMBO_ESC] = COMBO(combo_esc, KC_ESC) +}; + +enum tapdances { + TD_QESC, + TAPDANCE_LENGTH +}; + +tap_dance_action_t tap_dance_actions[] = { + [TD_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), +}; + +const key_override_t **key_overrides = (const key_override_t *[]) { + NULL +}; + +#define QESC TD(TD_QESC) +#define BSFT LSFT_T(KC_B) +#define VCTL LCTL_T(KC_V) +#define CGUI LGUI_T(KC_C) +#define XALT LALT_T(KC_X) + +#define ______ KC_NO +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT( + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ + KC_Z, XALT, CGUI, VCTL, BSFT, KC_SPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH + ), +}; + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [_BASE] = { ENCODER_CCW_CW(KC_DOWN, KC_UP) }, +}; \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/rules.mk b/keyboards/hazel/satpad/keymaps/default/rules.mk new file mode 100644 index 000000000000..fb4dbb68160f --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/default/rules.mk @@ -0,0 +1,17 @@ +GRAVE_ESC_ENABLE = no +SPACE_CADET_ENABLE = no + +CAPS_WORD_ENABLE = yes +KEY_OVERRIDE_ENABLE = yes +COMBO_ENABLE = yes +TAP_DANCE_ENABLE = yes +OLED_ENABLE = yes +OLED_DRIVER = SSD1306 +ENCODER_MAP_ENABLE = yes + +# OLED WIDGETS + +# WPM_ENABLE = no +# KEYCOUNT_ENABLE = yes +# KEYLOG_ENABLE = no +# KEYLOG_DEBUG = no \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/config.h b/keyboards/hazel/satpad/keymaps/miketronic/config.h new file mode 100644 index 000000000000..52b33b524b60 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/miketronic/config.h @@ -0,0 +1,16 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#pragma once + +# define TAPPING_TERM 160 +# define TAPPING_TERM_PER_KEY +# define PERMISSIVE_HOLD_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY +# define QUICK_TAP_TERM TAPPING_TERM / 2 +# define QUICK_TAP_TERM_PER_KEY +# define IGNORE_MOD_TAP_INTERRUPT + +# define LEADER_NO_TIMEOUT +# define LEADER_TIMEOUT 300 +# define LEADER_PER_KEY_TIMING \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c new file mode 100644 index 000000000000..88da53700196 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c @@ -0,0 +1,290 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#include "miketronic.h" + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* WORKMAN + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ + * │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ + * │SHIFT│ │ ┃ EX ┃ │ │ ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ENTER│ + * │ FN │ CTRL│ OS │ ALT │LOWER│ │RAISE│ │ , │ . │ │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + * + */ + + [_WM] = LAYOUT_3x11_wrapper ( + _____________WORKMAN_311_001_L_____________, _____________WORKMAN_311_001_R_____________, + _____________WORKMAN_311_002_L_____________, _____________WORKMAN_311_002_R_____________, + _____________WORKMAN_311_003_L_____________, _____________WORKMAN_311_003_R_____________ + ), + + [_QW] = LAYOUT_3x11_wrapper ( + _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, + _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, + _________________QWERTY_L3_________________, KC_ENT, _________________QWERTY_R3_________________ + ), + + + /* LOWER + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ () │ [] │ /\ │ │ │ │ │ 7 │ 8 │ 9 │ │ + * │ │ <> │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ @ # │ & % │ ┃ ┃ │ │ . ┃ 4 ┃ 5 │ 6 │ UP │ + * │ │ │ ┃ ┃ │ │ENTER┃ ┃ │ │RIGHT│ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ │ │ │ │ │ 0 │ 1 │ 2 │ 3 │ DOWN│ + * │ │ │ │ │LOWER│ │ │ │ 0 │ │ LEFT│ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + * + */ + + [_LOWER] = LAYOUT_3x11_wrapper ( + _______________LOWER_310_L1________________, _______________LOWER_310_R1________________, + _______________LOWER_310_L2________________, _______________LOWER_310_R2________________, + _______________LOWER_310_L3________________, KC_ENT, _______________LOWER_310_R3________________ + ), + + + /* RAISE + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ BOOT│DEBUG│ │ │ MAKE│ │ │ F7 │ F8 │ F9 │ F10 │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ │ RGB │ RGB ┃ RGB ┃ RGB │ │ _ ┃ F4 ┃ F5 │ F6 │ F11 │ + * │ │ TOG │ MOD ┃ HUI ┃ HUD │ │ - ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ RGB │ RGB │ RGB │ RGB │ │ │ F1 │ F2 │ F3 │ F12 │ + * │ │ SAI │ SAD │ VAI │ VAD │ │RAISE│ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + * + */ + + [_RAISE] = LAYOUT_3x11_wrapper ( + _______________RAISE_310_L1________________, _______________RAISE_310_R1________________, + _______________RAISE_310_L2________________, _______________RAISE_310_R2________________, + _______________RAISE_310_L3________________, KC_ENT, _______________RAISE_310_R3________________ + ), + + + + /* EXTRAS + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ ! │ │ │ │ │ │ │ /\ | () | [] | ; │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ │ │ ┃EXTRA┃ │ │ ┃ @ # ┃ & % | │ ' │ + * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ , │ . │ ? │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + */ + + [_EX] = LAYOUT_3x11_wrapper ( + ______________EXTRAS_310_L1________________, ______________EXTRAS_310_R1________________, + ______________EXTRAS_310_L2________________, ______________EXTRAS_310_R2________________, + ______________EXTRAS_310_L3________________, KC_ENT, ______________EXTRAS_310_R3________________ +), + + + + /* FUNCTION + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │COPY │CLIP │ SS │ │ │ │ │ /\ │ UP │ │ DEL │ + * │PASTE│ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ TAB │ M05 │ M06 ┃ M07 ┃ M08 │ │ ┃ LEFT┃ DOWN│RIGHT│ UP │ + * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │RIGHT│ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ , │ . │DOWN │ + * │ FN │ │ │ │ │ │ │ │ │ │LEFT │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + */ + + [_FN] = LAYOUT_3x11_wrapper ( + _____________FUNCTION_310_L1_______________, _____________FUNCTION_310_R1_______________, + _____________FUNCTION_310_L2_______________, _____________FUNCTION_310_R2_______________, + _____________FUNCTION_310_L3_______________, KC_ENT, _____________FUNCTION_310_R3_______________ + ), + + + + /* SYMBOLS + * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ + * │ $ │ ^ │ < │ > │ │ │ │ | │ [ │ ] │ - │ + * │ │ │ │ │ SYMB│ │ SYMB│ │ │ │ │ + * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ + * │ % │ : │ ; ┃ + ┃ = │ │ ┃ ┃ ( │ ) │ _ │ + * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ + * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ + * │ & │ ' │ " │ * │ # │ │ ! │ ? │ / │ \ │ @ │ + * │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ + */ + + [_SYMB] = LAYOUT_3x11_wrapper ( + _____________SYMBOLS_310_L1________________, _____________SYMBOLS_310_R1________________, + _____________SYMBOLS_310_L2________________, _____________SYMBOLS_310_R2________________, + _____________SYMBOLS_310_L3________________, KC_ENT, _____________SYMBOLS_310_R3________________ + ), + + +}; + + +void matrix_init_user(void) { + // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values + // set num lock on at start (for numonly layer to work) + if (!host_keyboard_led_state().num_lock) { + tap_code(KC_NUM_LOCK); + } +} + +void matrix_scan_user(void) { +} + + +#ifndef NUM_DIRECTIONS +# define NUM_DIRECTIONS 2 +#endif + +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_SPC, KC_ENT) }, + [_LOWER] = { ENCODER_CCW_CW(____, ____) }, + [_RAISE] = { ENCODER_CCW_CW(____, ____) }, + [_EX] = { ENCODER_CCW_CW(____, ____) }, + [_FN] = { ENCODER_CCW_CW(____, ____) }, + [_SYMB] = { ENCODER_CCW_CW(____, ____) } +}; + + +oled_rotation_t oled_init_user(oled_rotation_t rotation){ + return OLED_ROTATION_270; +} + +/* +bool oled_task_user(void) { + uint8_t modifiers = get_mods() | get_oneshot_mods(); + + oled_set_cursor(0, 11); + oled_write_P(PSTR("SHIFT"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); + oled_write_P(PSTR("CNTRL"), (modifiers & MOD_MASK_CTRL)); + + return true; +} +*/ + +#ifdef OLED_ENABLE +bool oled_task_user(void) { + // Host Keyboard Layer Status + oled_write_P(PSTR("LAYER\n-----\n"), false); + + switch (get_highest_layer(layer_state)) { + case _LOWER: + oled_write_P(PSTR("LOWER"), false); + break; + case _RAISE: + oled_write_P(PSTR("RAISE"), false); + break; + case _EX: + oled_write_P(PSTR("EXTRA"), false); + break; + case _FN: + oled_write_P(PSTR("FUNCT"), false); + break; + case _WM: + oled_write_P(PSTR("WMAN"), false); + break; + case _SYMB: + oled_write_P(PSTR("SYMB"), false); + break; + default: + // Or use the write_ln shortcut over adding '\n' to the end of your string + oled_write_ln_P(PSTR("HOME"), false); + } + +// Host Keyboard LED Status + // led_t led_state = host_keyboard_led_state(); + // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); + // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); + // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); + + return false; +} +#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/hazel/satpad/keymaps/miketronic/rules.mk b/keyboards/hazel/satpad/keymaps/miketronic/rules.mk new file mode 100644 index 000000000000..dea36e4e8549 --- /dev/null +++ b/keyboards/hazel/satpad/keymaps/miketronic/rules.mk @@ -0,0 +1,39 @@ +# Common feature for all keyboards +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 + +# Keyboard specific +MOUSEKEY_ENABLE = yes # Mouse keys +CAPS_WORD_ENABLE = yes +KEY_OVERRIDE_ENABLE = yes +LEADER_ENABLE = yes +OLED_ENABLE = yes + OLED_DRIVER = SSD1306 + ENCODER_ENABLE = yes + ENCODER_MAP_ENABLE = yes + + + LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. + AUTO_SHIFT_ENABLE = no + UNICODE_ENABLE = no # Unicode + CONSOLE_ENABLE = no # Console for debug + COMMAND_ENABLE = no # Commands for debug and configuration + RGBLIGHT_ENABLE = no + BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality + SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) + AUDIO_ENABLE = no # Audio output on port C6 + MIDI_ENABLE = no # MIDI support + BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID + GRAVE_ESC_ENABLE = no + SPACE_CADET_ENABLE = no + COMBO_ENABLE = no + + # OLED WIDGETS + + # WPM_ENABLE = no + # KEYCOUNT_ENABLE = yes + # KEYLOG_ENABLE = no + # KEYLOG_DEBUG = no \ No newline at end of file diff --git a/keyboards/hazel/satpad/rules.mk b/keyboards/hazel/satpad/rules.mk new file mode 100644 index 000000000000..978dae94bbb4 --- /dev/null +++ b/keyboards/hazel/satpad/rules.mk @@ -0,0 +1 @@ +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/hazel/satpad/satpad.c b/keyboards/hazel/satpad/satpad.c new file mode 100644 index 000000000000..238a1502eec2 --- /dev/null +++ b/keyboards/hazel/satpad/satpad.c @@ -0,0 +1,24 @@ +#include QMK_KEYBOARD_H +#include + +#ifdef OLED_ENABLE + oled_rotation_t oled_init_kb(oled_rotation_t rotation) { + return OLED_ROTATION_270; + }; + + + bool oled_task_kb(void) { + if (oled_task_user()) { + oled_set_cursor(0,0); + oled_write_P(PSTR("SAT PAD"), false); + uint8_t modifiers = get_mods() | get_oneshot_mods(); + + oled_set_cursor(1,14); + oled_write_P(PSTR("S"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); + oled_write_P(PSTR("C"), (modifiers & MOD_MASK_CTRL)); + oled_write_P(PSTR("A"), (modifiers & MOD_MASK_ALT)); + oled_write_P(PSTR("G"), (modifiers & MOD_MASK_GUI)); + } + return true; + }; +#endif \ No newline at end of file diff --git a/keyboards/idobao/id75/keymaps/miketronic/config.h b/keyboards/idobao/id75/keymaps/miketronic/config.h new file mode 100644 index 000000000000..d59a1301eee3 --- /dev/null +++ b/keyboards/idobao/id75/keymaps/miketronic/config.h @@ -0,0 +1,30 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#pragma once + +# define USB_POLLING_INTERVAL_MS 1 +# undef RGBLIGHT_HUE_STEP +# define RGBLIGHT_HUE_STEP 1 +# undef RGBLIGHT_SAT_STEP +# define RGBLIGHT_SAT_STEP 1 +# undef RGBLIGHT_VAL_STEP +# define RGBLIGHT_VAL_STEP 1 +# define RGBLIGHT_SLEEP +# define RGBLIGHT_LAYERS +# define FORCE_NKRO + +# define TAPPING_TERM 160 +# define TAPPING_TERM_PER_KEY +# define PERMISSIVE_HOLD_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY +# define QUICK_TAP_TERM TAPPING_TERM / 2 +# define QUICK_TAP_TERM_PER_KEY +# define IGNORE_MOD_TAP_INTERRUPT + +# define LEADER_NO_TIMEOUT +# define LEADER_TIMEOUT 300 +# define LEADER_PER_KEY_TIMING + + + diff --git a/keyboards/idobao/id75/keymaps/miketronic/keymap.c b/keyboards/idobao/id75/keymaps/miketronic/keymap.c new file mode 100644 index 000000000000..2b7e68375425 --- /dev/null +++ b/keyboards/idobao/id75/keymaps/miketronic/keymap.c @@ -0,0 +1,233 @@ +// Copyright 2023 @miketronic -- Mike B +// SPDX-License-Identifier: GPL-2.0+ + +#include "miketronic.h" + + + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + +/* WORKMAN + * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. + * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | TAB/ESC || Q || D || R || W || B SYM || 7 || 8 || 9 || J SYM || F || U || P || BSPC || BSPC | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | TAB/SHFT || A || S || H || T EX || G || 4 || 5 || 6 || Y || N || E || O || I || ENTER | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | LSHIFT || Z || X || M || C || V || 1 || 2 0 || 3 || K || L || , SPC || . SPC ||SHFT/ENT || Up/Rght | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | FN || LCTRL || GUI || LALT || LOWER || Space || Space || . Enter || Enter || Enter || RAISE || SS || CLIP ||CopyPaste|| Dn/Left | + * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' + */ + + [_WM] = LAYOUT_ortho_5x15_wrapper ( + _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, + _____________WORKMAN_412_001_L_____________, ________3KEY_ID75_02_________, _____________WORKMAN_412_001_R_____________, + _____________WORKMAN_412_002_L_____________, ________3KEY_ID75_03_________, _____________WORKMAN_412_002_R_____________, + _____________WORKMAN_412_003_L_____________, ________3KEY_ID75_04_________, _____________WORKMAN_412_003_R_____________, + _____________WORKMAN_ID75_BOT_L____________, ________3KEY_ID75_05_________, _____________WORKMAN_ID75_BOT_R____________ + ), + + + [_QW] = LAYOUT_ortho_5x15_wrapper ( + KC_ESC, _________________QWERTY_L1_________________, ________3KEY_ID75_01_________, _________________QWERTY_R1_________________, KC_BSPC, + KC_TAB, _________________QWERTY_L1_________________, ________3KEY_ID75_02_________, _________________QWERTY_R1_________________, BRACES, + KC_LSFT, _________________QWERTY_L2_________________, ________3KEY_ID75_03_________, _________________QWERTY_R2_________________, KC_QUOT, + FN, _________________QWERTY_L3_________________, ________3KEY_ID75_04_________, _________________QWERTY_R3_________________, TD_UR, + _____________WORKMAN_ID75_BOT_L____________, ________3KEY_ID75_05_________, _____________WORKMAN_ID75_BOT_R____________ + ), + + + +/* LOWER + * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. + * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || () || [] || /\ || || || 7 || 8 || 9 || || 7 || 8 || 9 || || | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || @ # || & % || || || || 4 || 5 || 6 || || 4 || 5 || 6 || || | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || || || || || || 1 || 2 0 || 3 || 0 || 1 || 2 0 || 3 || || Up/Rght | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || || || || || || Space || . Enter || Enter || || BSPC || SPC || . Enter || || Dn/Left | + * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' + */ + + [_LOWER] = LAYOUT_ortho_5x15_wrapper ( + _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, + _______________LOWER_412_L1________________, ________3KEY_ID75_02_________, _______________LOWER_412_R1________________, + _______________LOWER_412_L2________________, ________3KEY_ID75_03_________, _______________LOWER_412_R2________________, + _______________LOWER_412_L3________________, ________3KEY_ID75_04_________, _______________LOWER_412_R3________________, + _______________LOWER_412_L4________________, ________3KEY_ID75_05_________, _______________LOWER_412_R4________________ + ), + + + +/* RAISE + * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. + * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | BOOT || DEBUG || || || || MAKE || 7 || 8 || 9 || || || F7 || F8 || F9 || F10 | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || RGB TOG || RGB MOD || RGB HUI || RGB HUD || || 4 || 5 || 6 || || / \ || F4 || F5 || F6 || F11 | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || RGB SAI || RGB SAD || RGB VAI || RGB VAD || || 1 || 2 0 || 3 || || _ - || F1 || F2 || F3 || F12 | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || || || || || || Space || . Enter || Enter || || RAISE || || || || | + * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' + */ + + [_RAISE] = LAYOUT_ortho_5x15_wrapper ( + _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, + _______________RAISE_412_L1________________, ________3KEY_ID75_02_________, _______________RAISE_412_R1________________, + _______________RAISE_412_L2________________, ________3KEY_ID75_03_________, _______________RAISE_412_R2________________, + _______________RAISE_412_L3________________, ________3KEY_ID75_04_________, _______________RAISE_412_R3________________, + _________________BLANK_6___________________, ________3KEY_ID75_05_________, _________________BLANK_6___________________ + ), + + + +/* EXTRAS + * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. + * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || ! || || || || || 7 || 8 || 9 || || /\ || () || [] || ; || | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | SHIFT || || || || EXTRAS || || 4 || 5 || 6 || || @ # || & % || || ' || | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || || || || || || 1 || 2 0 || 3 || || || , || . || ? || Up/Rght | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || || || || || || Space || . Enter || Enter || || || || || || | + * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' + */ + + [_EX] = LAYOUT_ortho_5x15_wrapper ( + _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, + ______________EXTRAS_412_L1________________, ________3KEY_ID75_02_________, ______________EXTRAS_412_R1________________, + ______________EXTRAS_412_L2________________, ________3KEY_ID75_03_________, ______________EXTRAS_412_R2________________, + ______________EXTRAS_412_L3________________, ________3KEY_ID75_04_________, ______________EXTRAS_412_R3________________, + ______________EXTRAS_412_L4________________, ________3KEY_ID75_05_________, ______________EXTRAS_412_R4________________ + ), + + +/* FUNCTION (_FN) + * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. + * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | TAB ||Macro 09 ||Macro 10 ||Macro 11 ||Macro 12 || || 7 || 8 || 9 || || / \ || UP || || || DEL | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | TAB SHFT ||Macro 05 ||Macro 06 ||Macro 07 ||Macro 08 || || 4 || 5 || 6 || || LEFT || DOWN || RIGHT || || | + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | ||Macro 01 ||Macro 02 ||Macro 03 ||Macro 04 || || 1 || 2 0 || 3 || || || , || . || ? || UP RIGHT| + * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| + * | || RGB1 || RGB2 || RGB3 || RBG4 || || Space || . Enter || Enter || || || || || || DN LEFT | + * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' + */ + + [_FN] = LAYOUT_ortho_5x15_wrapper ( + _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, ____________FUNCTION_ID75_TOP_R____________, + _____________FUNCTION_412_L1_______________, ________3KEY_ID75_02_________, _____________FUNCTION_412_L1_______________, + _____________FUNCTION_412_L2_______________, ________3KEY_ID75_03_________, _____________FUNCTION_412_L2_______________, + _____________FUNCTION_412_L3_______________, ________3KEY_ID75_04_________, _____________FUNCTION_412_L3_______________, + _____________FUNCTION_412_L4_______________, ________3KEY_ID75_05_________, _____________FUNCTION_412_L4_______________ + ), + + + + /* SYMBOLS + * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ + * │ | $ | ^ | < | > │ SYMB│ │ SYMB│ | | [ | ] | - | | + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ + * │ | % | : | ; ┃ + ┃ = │ │ ┃ ┃ ( | ) | _ | | + * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ + * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ + * | | & | ' | " | * | # │ │ ! | ? | / | \ | @ | | + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ + */ + + [_SYMB] = LAYOUT_ortho_5x15_wrapper ( + KC_ESC, _______, _______, _______, _______, _______, ________3KEY_ID75_01_________, RGB1, RGB2, RGB3, RGB4, RGB5, KC_DEL, + _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, ________3KEY_ID75_02_________, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, + _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, ________3KEY_ID75_03_________, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, + _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, ________3KEY_ID75_04_________, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, + _________________BLANK_6___________________, ________3KEY_ID75_05_________, _________________BLANK_6___________________ + ), + + +}; + + + + +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 +} + diff --git a/keyboards/idobao/id75/keymaps/miketronic/rules.mk b/keyboards/idobao/id75/keymaps/miketronic/rules.mk new file mode 100644 index 000000000000..7f805ec70e14 --- /dev/null +++ b/keyboards/idobao/id75/keymaps/miketronic/rules.mk @@ -0,0 +1,15 @@ +# Common feature for all keyboards +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 + +# Keyboard specific +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +LEADER_ENABLE = yes +AUTO_SHIFT_ENABLE = no +VIA_ENABLE = no +MOUSEKEY_ENABLE = no +CONSOLE_ENABLE = no +COMMAND_ENABLE = no diff --git a/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c b/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c index 1ece2e662db8..e8a26fd28a22 100644 --- a/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c +++ b/keyboards/mechwild/bde/rev2/keymaps/miketronic/keymap.c @@ -130,9 +130,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_SYMB] = LAYOUT_3x14_wrapper ( - KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, KC_A, KC_A, KC_A, KC_A, - KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, XXXX, XXXX, KC_LPRN, KC_RPRN, KC_UNDS, KC_A, KC_A, KC_A, KC_A, - KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_ENT, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, KC_A, KC_A, KC_A + _____________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 ), diff --git a/keyboards/planck/keymaps/miketronic/config.h b/keyboards/planck/keymaps/miketronic/config.h index 145b7067abcd..954a92314f7b 100644 --- a/keyboards/planck/keymaps/miketronic/config.h +++ b/keyboards/planck/keymaps/miketronic/config.h @@ -3,9 +3,15 @@ #pragma once -# define TAPPING_TERM 150 // 30APR23 was 170 +# define TAPPING_TERM 160 # define TAPPING_TERM_PER_KEY +# define PERMISSIVE_HOLD_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY # define QUICK_TAP_TERM TAPPING_TERM / 2 # define QUICK_TAP_TERM_PER_KEY -# define PERMISSIVE_HOLD_PER_KEY -# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY \ No newline at end of file +# define IGNORE_MOD_TAP_INTERRUPT +# define MIDI_BASIC + +# define LEADER_NO_TIMEOUT +# define LEADER_TIMEOUT 300 +# define LEADER_PER_KEY_TIMING \ No newline at end of file diff --git a/keyboards/planck/keymaps/miketronic/keymap.c b/keyboards/planck/keymaps/miketronic/keymap.c index 02ce262f3ab6..bbb3f34b56d0 100644 --- a/keyboards/planck/keymaps/miketronic/keymap.c +++ b/keyboards/planck/keymaps/miketronic/keymap.c @@ -147,10 +147,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ */ [_SYMB] = LAYOUT_planck_grid_wrapper( - _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, XXXXXXX, XXXXXXX, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, - _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, - _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _____________SYMBOLS_310_L1________________, _____________SYMBOLS_310_R1________________, _______, + _______, _____________SYMBOLS_310_L3________________, _____________SYMBOLS_310_R2________________, _______, + _______, _____________SYMBOLS_310_L3________________, _____________SYMBOLS_310_R3________________, _______, + _________________BLANK_6___________________, _________________BLANK_6___________________ ) }; @@ -169,4 +169,69 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_FN] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, [_SYMB] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) } }; -#endif \ No newline at end of file +#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/planck/keymaps/miketronic/rules.mk b/keyboards/planck/keymaps/miketronic/rules.mk index f2da8c984082..20c0c0b9436f 100644 --- a/keyboards/planck/keymaps/miketronic/rules.mk +++ b/keyboards/planck/keymaps/miketronic/rules.mk @@ -4,3 +4,10 @@ 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 +DIP_SWITCH_ENABLE = yes + +AUDIO_ENABLE = yes # Audio output +RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. +WS2812_DRIVER = pwm diff --git a/users/miketronic/.vscode/c_cpp_properties.json b/users/miketronic/.vscode/c_cpp_properties.json new file mode 100644 index 000000000000..b1f27e894500 --- /dev/null +++ b/users/miketronic/.vscode/c_cpp_properties.json @@ -0,0 +1,16 @@ +{ + "configurations": [ + { + "name": "Win32", + "includePath": [ + "${workspaceFolder}/**" + ], + "defines": [ + "_DEBUG", + "UNICODE", + "_UNICODE" + ] + } + ], + "version": 4 +} \ No newline at end of file From 9ddd4a4a5d3c58699088da5f019534694a73041f Mon Sep 17 00:00:00 2001 From: miketronic Date: Thu, 11 May 2023 09:12:26 -0500 Subject: [PATCH 52/61] Delete keyboards/hazel/satpad directory --- keyboards/hazel/satpad/config.h | 1 - keyboards/hazel/satpad/info.json | 82 ----- .../hazel/satpad/keymaps/default/config.h | 19 -- .../satpad/keymaps/default/keymap - SATCOPY.c | 132 -------- .../hazel/satpad/keymaps/default/keymap.c | 62 ---- .../hazel/satpad/keymaps/default/rules.mk | 17 - .../hazel/satpad/keymaps/miketronic/config.h | 16 - .../hazel/satpad/keymaps/miketronic/keymap.c | 290 ------------------ .../hazel/satpad/keymaps/miketronic/rules.mk | 39 --- keyboards/hazel/satpad/rules.mk | 1 - keyboards/hazel/satpad/satpad.c | 24 -- 11 files changed, 683 deletions(-) delete mode 100644 keyboards/hazel/satpad/config.h delete mode 100644 keyboards/hazel/satpad/info.json delete mode 100644 keyboards/hazel/satpad/keymaps/default/config.h delete mode 100644 keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c delete mode 100644 keyboards/hazel/satpad/keymaps/default/keymap.c delete mode 100644 keyboards/hazel/satpad/keymaps/default/rules.mk delete mode 100644 keyboards/hazel/satpad/keymaps/miketronic/config.h delete mode 100644 keyboards/hazel/satpad/keymaps/miketronic/keymap.c delete mode 100644 keyboards/hazel/satpad/keymaps/miketronic/rules.mk delete mode 100644 keyboards/hazel/satpad/rules.mk delete mode 100644 keyboards/hazel/satpad/satpad.c diff --git a/keyboards/hazel/satpad/config.h b/keyboards/hazel/satpad/config.h deleted file mode 100644 index 7b9637ef9c2c..000000000000 --- a/keyboards/hazel/satpad/config.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once \ No newline at end of file diff --git a/keyboards/hazel/satpad/info.json b/keyboards/hazel/satpad/info.json deleted file mode 100644 index 3caad7bb2e05..000000000000 --- a/keyboards/hazel/satpad/info.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "keyboard_name": "SatPad", - "manufacturer": "jasonhazel", - "usb": { - "vid": "0x4A48", - "pid": "0x7370", - "device_version": "0.0.1" - }, - "matrix_size": { - "cols": 6, - "rows": 7 - }, - "diode_direction": "COL2ROW", - "bootloader": "caterina", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "mousekey": true, - "nkro": false, - "encoder": true - }, - "matrix_pins": { - "rows": ["B3", "B2", "B6", "D3", "D2", "D4", "E6"], - "cols": ["F4", "F5", "F6", "F7", "B1", "D7"] - }, - "encoder": { - "rotary": [ - { "pin_a": "B4", "pin_b": "B5" } - ] - }, - "bootmagic": { - "enabled": true, - "matrix": [0,0] - }, - "processor": "atmega32u4", - "url": "https://github.com/jasonhazel/satpad", - "layouts": { - "LAYOUT": { - "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 1], "x": 1, "y": 0 }, - { "matrix": [0, 2], "x": 2, "y": 0 }, - { "matrix": [0, 3], "x": 3, "y": 0 }, - { "matrix": [0, 4], "x": 4, "y": 0 }, - - { "matrix": [3, 4], "x": 6, "y": 0 }, - { "matrix": [3, 3], "x": 7, "y": 0 }, - { "matrix": [3, 2], "x": 8, "y": 0 }, - { "matrix": [3, 1], "x": 9, "y": 0 }, - { "matrix": [3, 0], "x": 10, "y": 0 }, - - { "matrix": [1, 0], "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1, "y": 1 }, - { "matrix": [1, 2], "x": 2, "y": 1 }, - { "matrix": [1, 3], "x": 3, "y": 1 }, - { "matrix": [1, 4], "x": 4, "y": 1 }, - - { "matrix": [4, 4], "x": 6, "y": 1 }, - { "matrix": [4, 3], "x": 7, "y": 1 }, - { "matrix": [4, 2], "x": 8, "y": 1 }, - { "matrix": [4, 1], "x": 9, "y": 1 }, - { "matrix": [4, 0], "x": 10, "y": 1 }, - - { "matrix": [2, 0], "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1, "y": 2 }, - { "matrix": [2, 2], "x": 2, "y": 2 }, - { "matrix": [2, 3], "x": 3, "y": 2 }, - { "matrix": [2, 4], "x": 4, "y": 2 }, - - { "matrix": [6, 5], "x": 5, "y": 2 }, - - { "matrix": [5, 4], "x": 6, "y": 2 }, - { "matrix": [5, 3], "x": 7, "y": 2 }, - { "matrix": [5, 2], "x": 8, "y": 2 }, - { "matrix": [5, 1], "x": 9, "y": 2 }, - { "matrix": [5, 0], "x": 10, "y": 2 } - - ] - } - } -} \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/config.h b/keyboards/hazel/satpad/keymaps/default/config.h deleted file mode 100644 index c6b2abb79748..000000000000 --- a/keyboards/hazel/satpad/keymaps/default/config.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - - -#define TAPPING_TERM 200 -#define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD - -#define ONESHOT_TAP_TOGGLE 10 -#define ONESHOT_TIMEOUT 500 -#define COMBO_TERM 200 - -#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD - -// disable shit -#define NO_MUSIC_MODE - -#undef LOCKING_SUPPORT_ENABLE -#undef LOCKING_RESYNC_ENABLE \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c b/keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c deleted file mode 100644 index 99fec7d54474..000000000000 --- a/keyboards/hazel/satpad/keymaps/default/keymap - SATCOPY.c +++ /dev/null @@ -1,132 +0,0 @@ -#include QMK_KEYBOARD_H - - -enum satpad_layers { - _WORKMAN, - _LOWER -}; - - - -// COMBO DECLARATIONS ============================================================================ -enum satpad_combos { - COMBO_SHIFT, - COMBO_LENGTH -}; - - -// TAP DANCE DECLARATIONS ============================================================================ -enum satpad_tapdances { - TD_ZLOWER, - TD_QESC, - TD_ATAB, - TD_XCTL, - TD_MGUI, - TD_CALT, - TD_KSPC, - TD_VENT, - TD_XSCLN, // ; , : - TD_IQUOT, // Letter "i", quote - TD_UPRT, // up, right - TD_CP // copy, paste -}; - -#define ZLOWER LT(_LOWER, KC_Z) //Tap for 'Z', Hold for Lower layer -#define QESC TD(TD_QESC) //Tap for 'Q', Twice for 'ESC' -#define ATAB TD(TD_ATAB) //Tap for 'A', Twice for 'Tab' -#define KSPC TD(TD_KSPC) //Tap for 'Space', Twice for 'K' -#define VENT TD(TD_VENT) //Tap for 'Enter', Twice for 'V' -#define XSCLN TD(TD_XSCLN) //Tap for ';', Twice for ':' -#define IQUOT TD(TD_IQUOT) //Tap for 'I', Twice for Quotes -#define UPRT TD(TD_UPRT) // up, right -#define CP TD(TD_CP) //Tap for Copy, Twice for Paste -#define XCTL LCTL_T(KC_X) //Tap for 'X', Hold for 'Left Ctrl' -#define MGUI LGUI_T(KC_M) //Tap for 'M', Hold for 'Windows Key' -#define CALT LALT_T(KC_C) //Tap for 'C', Hold for 'Left Alt' -#define OSM_SFT OSM(MOD_LSFT) - - -uint16_t COMBO_LEN = COMBO_LENGTH; -const uint16_t PROGMEM combo_shift[] = { KC_W, KC_B, COMBO_END }; - - -combo_t key_combos[] = { - [COMBO_SHIFT] = COMBO(combo_shift, OSM_SFT) -}; - - -//Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { - [TD_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), - [TD_ATAB] = ACTION_TAP_DANCE_DOUBLE(KC_A, KC_TAB), - [TD_KSPC] = ACTION_TAP_DANCE_DOUBLE(KC_SPC, KC_K), - [TD_VENT] = ACTION_TAP_DANCE_DOUBLE(KC_ENT, KC_V), - [TD_XSCLN] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_COLN), - [TD_IQUOT] = ACTION_TAP_DANCE_DOUBLE(KC_I, KC_QUOT), - [TD_UPRT] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_RGHT), - [TD_CP] = ACTION_TAP_DANCE_DOUBLE(LCTL(KC_C), LCTL(KC_V)) -}; - -const key_override_t **key_overrides = (const key_override_t *[]) { - NULL -}; - -#define ______ KC_NO - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* WORKMAN - * ,---------------------------------------------------------------------------------------. - * | Q | D | R | W | B | | J | F | U | P |BKSPACE| - * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| - * | A | S | H | T | G | | Y | N | E | O | I " | - * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| - * | Z | X | M | C | V | M20 | K | L | , | . |Cpy/Pst| - * `---------------------------------------------------------------------------------------' - */ - - [_WORKMAN] = LAYOUT_3x11( - QESC, KC_D, KC_R, KC_W, KC_B, ______, KC_J, KC_F, KC_U, KC_P, KC_BSPC, \ - ATAB, KC_S, KC_H, KC_T, KC_G, ______, KC_Y, KC_N, KC_E, KC_O, IQUOT, \ - ZLOWER, XCTL, MGUI, CALT, VENT, KC_ENT, KSPC, KC_L, KC_COMM, KC_DOT, CP - ), - - - /* LOWER - * ,---------------------------------------------------------------------------------------. - * | RESET | BOOT | | | | | ; : | 7 | 8 | 9 | DEL | - * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| - * | | | | | | | | 4 | 5 | 6 |UP/RT | - * |-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------| - * | | | | | | M20 | 0 | 1 | 2 | 3 | /\ | - * `---------------------------------------------------------------------------------------' - */ - [_LOWER] = LAYOUT_3x11( - QK_RBT, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, _______, XSCLN, KC_7, KC_8, KC_9, KC_DEL, \ - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_4, KC_5, KC_6, UPRT, \ - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_0, KC_1, KC_2, KC_3, KC_SLSH - ), -}; - -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_WORKMAN] = { ENCODER_CCW_CW(KC_SPC, OSM_SFT) }, - [_LOWER] = { ENCODER_CCW_CW(KC_SPC, OSM_SFT) }, -}; - -oled_rotation_t oled_init_user(oled_rotation_t rotation){ - return OLED_ROTATION_270; -} - -bool oled_task_user(void) { - uint8_t modifiers = get_mods() | get_oneshot_mods(); - - oled_set_cursor(0, 11); - oled_write_P(PSTR("SHIFT"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); - oled_write_P(PSTR("CNTRL"), (modifiers & MOD_MASK_CTRL)); - - return true; -} - - - - diff --git a/keyboards/hazel/satpad/keymaps/default/keymap.c b/keyboards/hazel/satpad/keymaps/default/keymap.c deleted file mode 100644 index 5f863022f2ee..000000000000 --- a/keyboards/hazel/satpad/keymaps/default/keymap.c +++ /dev/null @@ -1,62 +0,0 @@ -#include QMK_KEYBOARD_H - -enum layers { - _BASE, - LAYER_LENGTH -}; - -enum combos { - COMBO_SPACE, - COMBO_BACKSP, - COMBO_ENTER, - COMBO_TAB, - COMBO_ESC, - COMBO_LENGTH -}; - -uint16_t COMBO_LEN = COMBO_LENGTH; -const uint16_t PROGMEM combo_space[] = { KC_N, KC_M, COMBO_END }; -const uint16_t PROGMEM combo_backspace[] = { KC_O, KC_P, COMBO_END }; -const uint16_t PROGMEM combo_enter[] = { KC_L, KC_QUOT, COMBO_END }; -const uint16_t PROGMEM combo_tab[] = { KC_A, KC_S, COMBO_END }; -const uint16_t PROGMEM combo_esc[] = { KC_Q, KC_W, COMBO_END }; - -combo_t key_combos[] = { - [COMBO_SPACE] = COMBO(combo_space, KC_SPC), - [COMBO_BACKSP] = COMBO(combo_backspace, KC_BSPC), - [COMBO_ENTER] = COMBO(combo_enter, KC_ENT), - [COMBO_TAB] = COMBO(combo_tab, KC_TAB), - [COMBO_ESC] = COMBO(combo_esc, KC_ESC) -}; - -enum tapdances { - TD_QESC, - TAPDANCE_LENGTH -}; - -tap_dance_action_t tap_dance_actions[] = { - [TD_QESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC), -}; - -const key_override_t **key_overrides = (const key_override_t *[]) { - NULL -}; - -#define QESC TD(TD_QESC) -#define BSFT LSFT_T(KC_B) -#define VCTL LCTL_T(KC_V) -#define CGUI LGUI_T(KC_C) -#define XALT LALT_T(KC_X) - -#define ______ KC_NO -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ - KC_Z, XALT, CGUI, VCTL, BSFT, KC_SPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH - ), -}; - -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [_BASE] = { ENCODER_CCW_CW(KC_DOWN, KC_UP) }, -}; \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/default/rules.mk b/keyboards/hazel/satpad/keymaps/default/rules.mk deleted file mode 100644 index fb4dbb68160f..000000000000 --- a/keyboards/hazel/satpad/keymaps/default/rules.mk +++ /dev/null @@ -1,17 +0,0 @@ -GRAVE_ESC_ENABLE = no -SPACE_CADET_ENABLE = no - -CAPS_WORD_ENABLE = yes -KEY_OVERRIDE_ENABLE = yes -COMBO_ENABLE = yes -TAP_DANCE_ENABLE = yes -OLED_ENABLE = yes -OLED_DRIVER = SSD1306 -ENCODER_MAP_ENABLE = yes - -# OLED WIDGETS - -# WPM_ENABLE = no -# KEYCOUNT_ENABLE = yes -# KEYLOG_ENABLE = no -# KEYLOG_DEBUG = no \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/config.h b/keyboards/hazel/satpad/keymaps/miketronic/config.h deleted file mode 100644 index 52b33b524b60..000000000000 --- a/keyboards/hazel/satpad/keymaps/miketronic/config.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B -// SPDX-License-Identifier: GPL-2.0+ - -#pragma once - -# define TAPPING_TERM 160 -# define TAPPING_TERM_PER_KEY -# define PERMISSIVE_HOLD_PER_KEY -# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY -# define QUICK_TAP_TERM TAPPING_TERM / 2 -# define QUICK_TAP_TERM_PER_KEY -# define IGNORE_MOD_TAP_INTERRUPT - -# define LEADER_NO_TIMEOUT -# define LEADER_TIMEOUT 300 -# define LEADER_PER_KEY_TIMING \ No newline at end of file diff --git a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c b/keyboards/hazel/satpad/keymaps/miketronic/keymap.c deleted file mode 100644 index 88da53700196..000000000000 --- a/keyboards/hazel/satpad/keymaps/miketronic/keymap.c +++ /dev/null @@ -1,290 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B -// SPDX-License-Identifier: GPL-2.0+ - -#include "miketronic.h" - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* WORKMAN - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ - * │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ - * │SHIFT│ │ ┃ EX ┃ │ │ ┃ ┃ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ENTER│ - * │ FN │ CTRL│ OS │ ALT │LOWER│ │RAISE│ │ , │ . │ │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - * - */ - - [_WM] = LAYOUT_3x11_wrapper ( - _____________WORKMAN_311_001_L_____________, _____________WORKMAN_311_001_R_____________, - _____________WORKMAN_311_002_L_____________, _____________WORKMAN_311_002_R_____________, - _____________WORKMAN_311_003_L_____________, _____________WORKMAN_311_003_R_____________ - ), - - [_QW] = LAYOUT_3x11_wrapper ( - _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, - _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, - _________________QWERTY_L3_________________, KC_ENT, _________________QWERTY_R3_________________ - ), - - - /* LOWER - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ () │ [] │ /\ │ │ │ │ │ 7 │ 8 │ 9 │ │ - * │ │ <> │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ @ # │ & % │ ┃ ┃ │ │ . ┃ 4 ┃ 5 │ 6 │ UP │ - * │ │ │ ┃ ┃ │ │ENTER┃ ┃ │ │RIGHT│ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ │ │ │ │ │ │ 0 │ 1 │ 2 │ 3 │ DOWN│ - * │ │ │ │ │LOWER│ │ │ │ 0 │ │ LEFT│ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - * - */ - - [_LOWER] = LAYOUT_3x11_wrapper ( - _______________LOWER_310_L1________________, _______________LOWER_310_R1________________, - _______________LOWER_310_L2________________, _______________LOWER_310_R2________________, - _______________LOWER_310_L3________________, KC_ENT, _______________LOWER_310_R3________________ - ), - - - /* RAISE - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ BOOT│DEBUG│ │ │ MAKE│ │ │ F7 │ F8 │ F9 │ F10 │ - * │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ │ RGB │ RGB ┃ RGB ┃ RGB │ │ _ ┃ F4 ┃ F5 │ F6 │ F11 │ - * │ │ TOG │ MOD ┃ HUI ┃ HUD │ │ - ┃ ┃ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ │ RGB │ RGB │ RGB │ RGB │ │ │ F1 │ F2 │ F3 │ F12 │ - * │ │ SAI │ SAD │ VAI │ VAD │ │RAISE│ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - * - */ - - [_RAISE] = LAYOUT_3x11_wrapper ( - _______________RAISE_310_L1________________, _______________RAISE_310_R1________________, - _______________RAISE_310_L2________________, _______________RAISE_310_R2________________, - _______________RAISE_310_L3________________, KC_ENT, _______________RAISE_310_R3________________ - ), - - - - /* EXTRAS - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ ! │ │ │ │ │ │ │ /\ | () | [] | ; │ - * │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ │ │ ┃EXTRA┃ │ │ ┃ @ # ┃ & % | │ ' │ - * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ , │ . │ ? │ - * │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - */ - - [_EX] = LAYOUT_3x11_wrapper ( - ______________EXTRAS_310_L1________________, ______________EXTRAS_310_R1________________, - ______________EXTRAS_310_L2________________, ______________EXTRAS_310_R2________________, - ______________EXTRAS_310_L3________________, KC_ENT, ______________EXTRAS_310_R3________________ -), - - - - /* FUNCTION - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │COPY │CLIP │ SS │ │ │ │ │ /\ │ UP │ │ DEL │ - * │PASTE│ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ TAB │ M05 │ M06 ┃ M07 ┃ M08 │ │ ┃ LEFT┃ DOWN│RIGHT│ UP │ - * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │RIGHT│ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ , │ . │DOWN │ - * │ FN │ │ │ │ │ │ │ │ │ │LEFT │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - */ - - [_FN] = LAYOUT_3x11_wrapper ( - _____________FUNCTION_310_L1_______________, _____________FUNCTION_310_R1_______________, - _____________FUNCTION_310_L2_______________, _____________FUNCTION_310_R2_______________, - _____________FUNCTION_310_L3_______________, KC_ENT, _____________FUNCTION_310_R3_______________ - ), - - - - /* SYMBOLS - * ┌─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┐ - * │ $ │ ^ │ < │ > │ │ │ │ | │ [ │ ] │ - │ - * │ │ │ │ │ SYMB│ │ SYMB│ │ │ │ │ - * ├─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┤ - * │ % │ : │ ; ┃ + ┃ = │ │ ┃ ┃ ( │ ) │ _ │ - * │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ - * ├─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┤ - * │ & │ ' │ " │ * │ # │ │ ! │ ? │ / │ \ │ @ │ - * │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┘ - */ - - [_SYMB] = LAYOUT_3x11_wrapper ( - _____________SYMBOLS_310_L1________________, _____________SYMBOLS_310_R1________________, - _____________SYMBOLS_310_L2________________, _____________SYMBOLS_310_R2________________, - _____________SYMBOLS_310_L3________________, KC_ENT, _____________SYMBOLS_310_R3________________ - ), - - -}; - - -void matrix_init_user(void) { - // eeconfig_init(); // reset keyboard to a standard default state; useful when new releases messup with eeprom values - // set num lock on at start (for numonly layer to work) - if (!host_keyboard_led_state().num_lock) { - tap_code(KC_NUM_LOCK); - } -} - -void matrix_scan_user(void) { -} - - -#ifndef NUM_DIRECTIONS -# define NUM_DIRECTIONS 2 -#endif - -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_SPC, KC_ENT) }, - [_LOWER] = { ENCODER_CCW_CW(____, ____) }, - [_RAISE] = { ENCODER_CCW_CW(____, ____) }, - [_EX] = { ENCODER_CCW_CW(____, ____) }, - [_FN] = { ENCODER_CCW_CW(____, ____) }, - [_SYMB] = { ENCODER_CCW_CW(____, ____) } -}; - - -oled_rotation_t oled_init_user(oled_rotation_t rotation){ - return OLED_ROTATION_270; -} - -/* -bool oled_task_user(void) { - uint8_t modifiers = get_mods() | get_oneshot_mods(); - - oled_set_cursor(0, 11); - oled_write_P(PSTR("SHIFT"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); - oled_write_P(PSTR("CNTRL"), (modifiers & MOD_MASK_CTRL)); - - return true; -} -*/ - -#ifdef OLED_ENABLE -bool oled_task_user(void) { - // Host Keyboard Layer Status - oled_write_P(PSTR("LAYER\n-----\n"), false); - - switch (get_highest_layer(layer_state)) { - case _LOWER: - oled_write_P(PSTR("LOWER"), false); - break; - case _RAISE: - oled_write_P(PSTR("RAISE"), false); - break; - case _EX: - oled_write_P(PSTR("EXTRA"), false); - break; - case _FN: - oled_write_P(PSTR("FUNCT"), false); - break; - case _WM: - oled_write_P(PSTR("WMAN"), false); - break; - case _SYMB: - oled_write_P(PSTR("SYMB"), false); - break; - default: - // Or use the write_ln shortcut over adding '\n' to the end of your string - oled_write_ln_P(PSTR("HOME"), false); - } - -// Host Keyboard LED Status - // led_t led_state = host_keyboard_led_state(); - // oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - // oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false); - // oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false); - - return false; -} -#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/hazel/satpad/keymaps/miketronic/rules.mk b/keyboards/hazel/satpad/keymaps/miketronic/rules.mk deleted file mode 100644 index dea36e4e8549..000000000000 --- a/keyboards/hazel/satpad/keymaps/miketronic/rules.mk +++ /dev/null @@ -1,39 +0,0 @@ -# Common feature for all keyboards -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 - -# Keyboard specific -MOUSEKEY_ENABLE = yes # Mouse keys -CAPS_WORD_ENABLE = yes -KEY_OVERRIDE_ENABLE = yes -LEADER_ENABLE = yes -OLED_ENABLE = yes - OLED_DRIVER = SSD1306 - ENCODER_ENABLE = yes - ENCODER_MAP_ENABLE = yes - - - LTO_ENABLE = no # Enabled this causes longer build time, but smaller file. - AUTO_SHIFT_ENABLE = no - UNICODE_ENABLE = no # Unicode - CONSOLE_ENABLE = no # Console for debug - COMMAND_ENABLE = no # Commands for debug and configuration - RGBLIGHT_ENABLE = no - BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality - SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend (it uses the same timer as BACKLIGHT_ENABLE) - AUDIO_ENABLE = no # Audio output on port C6 - MIDI_ENABLE = no # MIDI support - BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID - GRAVE_ESC_ENABLE = no - SPACE_CADET_ENABLE = no - COMBO_ENABLE = no - - # OLED WIDGETS - - # WPM_ENABLE = no - # KEYCOUNT_ENABLE = yes - # KEYLOG_ENABLE = no - # KEYLOG_DEBUG = no \ No newline at end of file diff --git a/keyboards/hazel/satpad/rules.mk b/keyboards/hazel/satpad/rules.mk deleted file mode 100644 index 978dae94bbb4..000000000000 --- a/keyboards/hazel/satpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/hazel/satpad/satpad.c b/keyboards/hazel/satpad/satpad.c deleted file mode 100644 index 238a1502eec2..000000000000 --- a/keyboards/hazel/satpad/satpad.c +++ /dev/null @@ -1,24 +0,0 @@ -#include QMK_KEYBOARD_H -#include - -#ifdef OLED_ENABLE - oled_rotation_t oled_init_kb(oled_rotation_t rotation) { - return OLED_ROTATION_270; - }; - - - bool oled_task_kb(void) { - if (oled_task_user()) { - oled_set_cursor(0,0); - oled_write_P(PSTR("SAT PAD"), false); - uint8_t modifiers = get_mods() | get_oneshot_mods(); - - oled_set_cursor(1,14); - oled_write_P(PSTR("S"), (modifiers & MOD_MASK_SHIFT) || is_caps_word_on()); - oled_write_P(PSTR("C"), (modifiers & MOD_MASK_CTRL)); - oled_write_P(PSTR("A"), (modifiers & MOD_MASK_ALT)); - oled_write_P(PSTR("G"), (modifiers & MOD_MASK_GUI)); - } - return true; - }; -#endif \ No newline at end of file From d22f25ed0d6e4146d1d6eed89af07ff14e169b05 Mon Sep 17 00:00:00 2001 From: miketronic Date: Thu, 11 May 2023 09:16:43 -0500 Subject: [PATCH 53/61] Delete c_cpp_properties.json --- users/miketronic/.vscode/c_cpp_properties.json | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 users/miketronic/.vscode/c_cpp_properties.json diff --git a/users/miketronic/.vscode/c_cpp_properties.json b/users/miketronic/.vscode/c_cpp_properties.json deleted file mode 100644 index b1f27e894500..000000000000 --- a/users/miketronic/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "configurations": [ - { - "name": "Win32", - "includePath": [ - "${workspaceFolder}/**" - ], - "defines": [ - "_DEBUG", - "UNICODE", - "_UNICODE" - ] - } - ], - "version": 4 -} \ No newline at end of file From d64ca4286044b40105bb397d0ae195a91f9fdc05 Mon Sep 17 00:00:00 2001 From: miketronic Date: Thu, 11 May 2023 09:40:48 -0500 Subject: [PATCH 54/61] Delete keyboards/planck/keymaps/miketronic directory --- keyboards/planck/keymaps/miketronic/config.h | 17 -- keyboards/planck/keymaps/miketronic/keymap.c | 237 ------------------- keyboards/planck/keymaps/miketronic/rules.mk | 13 - 3 files changed, 267 deletions(-) delete mode 100644 keyboards/planck/keymaps/miketronic/config.h delete mode 100644 keyboards/planck/keymaps/miketronic/keymap.c delete mode 100644 keyboards/planck/keymaps/miketronic/rules.mk diff --git a/keyboards/planck/keymaps/miketronic/config.h b/keyboards/planck/keymaps/miketronic/config.h deleted file mode 100644 index 954a92314f7b..000000000000 --- a/keyboards/planck/keymaps/miketronic/config.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B -// SPDX-License-Identifier: GPL-2.0+ - -#pragma once - -# define TAPPING_TERM 160 -# define TAPPING_TERM_PER_KEY -# define PERMISSIVE_HOLD_PER_KEY -# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY -# define QUICK_TAP_TERM TAPPING_TERM / 2 -# define QUICK_TAP_TERM_PER_KEY -# define IGNORE_MOD_TAP_INTERRUPT -# define MIDI_BASIC - -# define LEADER_NO_TIMEOUT -# define LEADER_TIMEOUT 300 -# define LEADER_PER_KEY_TIMING \ No newline at end of file diff --git a/keyboards/planck/keymaps/miketronic/keymap.c b/keyboards/planck/keymaps/miketronic/keymap.c deleted file mode 100644 index bbb3f34b56d0..000000000000 --- a/keyboards/planck/keymaps/miketronic/keymap.c +++ /dev/null @@ -1,237 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B -// SPDX-License-Identifier: GPL-2.0+ - -#include "miketronic.h" - - - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* Workman - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ TAB │ Q │ D │ R │ W │ B │ │ J │ F │ U │ P │ BSPC│ BSPC│ - * │ ESC │ ESC │ │ │ │ SYM │ │ SYM │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ TAB │ A │ S │ H ┃ T ┃ G │ │ Y ┃ N ┃ E │ O │ I │ENTER│ - * │SHIFT│ │ │ ┃ EX ┃ │ │ ┃ ┃ │ │ │ │ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │SHIFT| Z │ X │ M │ C │ V │ │ K │ L │ SPC │ SPC │ENTER│ UP | - * │ │ │ │ │ │ │ │ │ │ , │ . │ │RIGHT| - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ FN │CTRL │ OS │ ALT │LOWER│ │ │ │RAISE│ SS │CLIP │COPY │ DN │ - * │ │ │ │ │ │ │ │ │ │ │ │PASTE│LEFT │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ - - [_WM] = LAYOUT_planck_grid_wrapper( - _____________WORKMAN_412_001_L_____________, _____________WORKMAN_412_001_R_____________, - _____________WORKMAN_412_002_L_____________, _____________WORKMAN_412_002_R_____________, - _____________WORKMAN_412_003_L_____________, _____________WORKMAN_412_003_R_____________, - _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ - ), - - [_QW] = LAYOUT_planck_grid_wrapper( - KC_TAB, _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, - KC_ESC, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, KC_QUOT, - KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, KC_ENT, - _____________WORKMAN_412_004_L_____________, _____________WORKMAN_412_004_R_____________ - ), - - - /* Lower - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ │ () │ [] │ /\ │ │ │ │ │ 7 │ 8 │ 9 │ │ │ - * │ │ │ <> │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ │ @ # │ & % │ ┃ ┃ │ │ . ┃ 4 ┃ 5 │ 6 │ │ │ - * │ │ │ │ ┃ ┃ │ │ENTER┃ ┃ │ │ │ │ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ 0 │ 1 │ 2 │ 3 │ │ UP │ - * │ │ │ │ │ │ │ │ │ │ 0 │ │ │RIGHT│ - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │LOWER│ │ │ │BPSC │ SPC │ . │ │ DN │ - * │ │ │ │ │ │ │ │ │ │ │ENTER│ │LEFT │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ - [_LOWER] = LAYOUT_planck_grid_wrapper ( - _______________LOWER_412_L1________________, _______________LOWER_412_R1________________, - _______________LOWER_412_L2________________, _______________LOWER_412_R2________________, - _______________LOWER_412_L3________________, _______________LOWER_412_R3________________, - _______________LOWER_412_L4________________, _______________LOWER_412_R4________________ - ), - - - /* RAISE - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │BOOT │DEBUG│ │ │ │MAKE │ │ │ │ F7 │ F8 │ F9 │ F10 │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ │ RGB | RGB | RGB ┃ RGB ┃ WM │ │ ┃ /\ ┃ F4 │ F5 │ F6 │ F11 │ - * │ │ TOG │ MOD │ HUI ┃ HUD ┃ │ │ ┃ ┃ │ │ │ │ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │ │ RGB │ RGB │ RGB │ RGB │ QW │ │ │ _ │ F1 | F2 | F3 │ F12 │ - * │ │ SAI │ SAD │ VAI │ VAD │ │ │ │ - │ │ │ │ │ - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │RAISE│ │ │ │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ - [_RAISE] = LAYOUT_planck_grid_wrapper( - _______________RAISE_412_L1________________, _______________RAISE_412_R1________________, - _______________RAISE_412_L2________________, _______________RAISE_412_R2________________, - _______________RAISE_412_L3________________, _______________RAISE_412_R3________________, - _________________BLANK_6___________________, _________________BLANK_6___________________ - ), - - - /* EXTRAS - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ │ ! │ │ │ │ │ │ │ /\ | () | [] | ; │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │SHIFT│ | | ┃EXTRA┃ │ │ ┃ @ # ┃ & % | | ' | │ - * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ │ , | . | ? │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ - [_EX] = LAYOUT_planck_grid_wrapper( - ______________EXTRAS_412_L1________________, ______________EXTRAS_412_R1________________, - ______________EXTRAS_412_L2________________, ______________EXTRAS_412_R2________________, - ______________EXTRAS_412_L3________________, ______________EXTRAS_412_R3________________, - ______________EXTRAS_412_L4________________, ______________EXTRAS_412_R4________________ - ), - - - /* FUNCTION - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │COPY │CLIP │ SS │ │ │ │ │ │ /\ │ UP │ │ │ DEL │ - * │PASTE│ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │TAB │ M05 | M06 | M07 ┃ M08 ┃ │ │ ┃LEFT ┃DOWN │RIGHT│ │ │ - * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * │ │ M01 │ M02 │ M03 │ M04 │ │ │ │ │ , | . | ? │UP │ - * │ │ │ │ │ │ │ │ │ │ │ │ │RIGHT│ - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │RGB1 │RGB2 │RGB3 │RGB4 │ │ │ │ │ │ │ │DOWN │ - * │ │ │ │ │ │ │ │ │ │ │ │ │LEFT │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ - [_FN] = LAYOUT_planck_grid_wrapper( - _____________FUNCTION_412_L1_______________, _____________FUNCTION_412_R1_______________, - _____________FUNCTION_412_L2_______________, _____________FUNCTION_412_R2_______________, - _____________FUNCTION_412_L3_______________, _____________FUNCTION_412_R3_______________, - _____________FUNCTION_412_L4_______________, _____________FUNCTION_412_R4_______________ - ), - - - /* SYMBOLS - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ | $ | ^ | < | > │ SYMB│ │ SYMB│ | | [ | ] | - | | - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ | % | : | ; ┃ + ┃ = │ │ ┃ ┃ ( | ) | _ | | - * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * | | & | ' | " | * | # │ │ ! | ? | / | \ | @ | | - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ - [_SYMB] = LAYOUT_planck_grid_wrapper( - _______, _____________SYMBOLS_310_L1________________, _____________SYMBOLS_310_R1________________, _______, - _______, _____________SYMBOLS_310_L3________________, _____________SYMBOLS_310_R2________________, _______, - _______, _____________SYMBOLS_310_L3________________, _____________SYMBOLS_310_R3________________, _______, - _________________BLANK_6___________________, _________________BLANK_6___________________ - ) - -}; - -#ifndef NUM_DIRECTIONS -# define NUM_DIRECTIONS 2 -#endif - -#if defined(ENCODER_MAP_ENABLE) && defined(KEYBOARD_planck_rev6) -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(KC_VOLD, KC_VOLU) }, - [_RAISE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_EX] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [_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/planck/keymaps/miketronic/rules.mk b/keyboards/planck/keymaps/miketronic/rules.mk deleted file mode 100644 index 20c0c0b9436f..000000000000 --- a/keyboards/planck/keymaps/miketronic/rules.mk +++ /dev/null @@ -1,13 +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 -DIP_SWITCH_ENABLE = yes - -AUDIO_ENABLE = yes # Audio output -RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -WS2812_DRIVER = pwm From 0c6eb11f106ce98589d7900026366a386e4d51ff Mon Sep 17 00:00:00 2001 From: miketronic Date: Thu, 11 May 2023 09:41:22 -0500 Subject: [PATCH 55/61] Delete keyboards/idobao/id75/keymaps/miketronic directory --- .../idobao/id75/keymaps/miketronic/config.h | 30 --- .../idobao/id75/keymaps/miketronic/keymap.c | 233 ------------------ .../idobao/id75/keymaps/miketronic/rules.mk | 15 -- 3 files changed, 278 deletions(-) delete mode 100644 keyboards/idobao/id75/keymaps/miketronic/config.h delete mode 100644 keyboards/idobao/id75/keymaps/miketronic/keymap.c delete mode 100644 keyboards/idobao/id75/keymaps/miketronic/rules.mk diff --git a/keyboards/idobao/id75/keymaps/miketronic/config.h b/keyboards/idobao/id75/keymaps/miketronic/config.h deleted file mode 100644 index d59a1301eee3..000000000000 --- a/keyboards/idobao/id75/keymaps/miketronic/config.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B -// SPDX-License-Identifier: GPL-2.0+ - -#pragma once - -# define USB_POLLING_INTERVAL_MS 1 -# undef RGBLIGHT_HUE_STEP -# define RGBLIGHT_HUE_STEP 1 -# undef RGBLIGHT_SAT_STEP -# define RGBLIGHT_SAT_STEP 1 -# undef RGBLIGHT_VAL_STEP -# define RGBLIGHT_VAL_STEP 1 -# define RGBLIGHT_SLEEP -# define RGBLIGHT_LAYERS -# define FORCE_NKRO - -# define TAPPING_TERM 160 -# define TAPPING_TERM_PER_KEY -# define PERMISSIVE_HOLD_PER_KEY -# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY -# define QUICK_TAP_TERM TAPPING_TERM / 2 -# define QUICK_TAP_TERM_PER_KEY -# define IGNORE_MOD_TAP_INTERRUPT - -# define LEADER_NO_TIMEOUT -# define LEADER_TIMEOUT 300 -# define LEADER_PER_KEY_TIMING - - - diff --git a/keyboards/idobao/id75/keymaps/miketronic/keymap.c b/keyboards/idobao/id75/keymaps/miketronic/keymap.c deleted file mode 100644 index 2b7e68375425..000000000000 --- a/keyboards/idobao/id75/keymaps/miketronic/keymap.c +++ /dev/null @@ -1,233 +0,0 @@ -// Copyright 2023 @miketronic -- Mike B -// SPDX-License-Identifier: GPL-2.0+ - -#include "miketronic.h" - - - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - -/* WORKMAN - * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. - * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | TAB/ESC || Q || D || R || W || B SYM || 7 || 8 || 9 || J SYM || F || U || P || BSPC || BSPC | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | TAB/SHFT || A || S || H || T EX || G || 4 || 5 || 6 || Y || N || E || O || I || ENTER | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | LSHIFT || Z || X || M || C || V || 1 || 2 0 || 3 || K || L || , SPC || . SPC ||SHFT/ENT || Up/Rght | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | FN || LCTRL || GUI || LALT || LOWER || Space || Space || . Enter || Enter || Enter || RAISE || SS || CLIP ||CopyPaste|| Dn/Left | - * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' - */ - - [_WM] = LAYOUT_ortho_5x15_wrapper ( - _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, - _____________WORKMAN_412_001_L_____________, ________3KEY_ID75_02_________, _____________WORKMAN_412_001_R_____________, - _____________WORKMAN_412_002_L_____________, ________3KEY_ID75_03_________, _____________WORKMAN_412_002_R_____________, - _____________WORKMAN_412_003_L_____________, ________3KEY_ID75_04_________, _____________WORKMAN_412_003_R_____________, - _____________WORKMAN_ID75_BOT_L____________, ________3KEY_ID75_05_________, _____________WORKMAN_ID75_BOT_R____________ - ), - - - [_QW] = LAYOUT_ortho_5x15_wrapper ( - KC_ESC, _________________QWERTY_L1_________________, ________3KEY_ID75_01_________, _________________QWERTY_R1_________________, KC_BSPC, - KC_TAB, _________________QWERTY_L1_________________, ________3KEY_ID75_02_________, _________________QWERTY_R1_________________, BRACES, - KC_LSFT, _________________QWERTY_L2_________________, ________3KEY_ID75_03_________, _________________QWERTY_R2_________________, KC_QUOT, - FN, _________________QWERTY_L3_________________, ________3KEY_ID75_04_________, _________________QWERTY_R3_________________, TD_UR, - _____________WORKMAN_ID75_BOT_L____________, ________3KEY_ID75_05_________, _____________WORKMAN_ID75_BOT_R____________ - ), - - - -/* LOWER - * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. - * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || () || [] || /\ || || || 7 || 8 || 9 || || 7 || 8 || 9 || || | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || @ # || & % || || || || 4 || 5 || 6 || || 4 || 5 || 6 || || | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || || || || || || 1 || 2 0 || 3 || 0 || 1 || 2 0 || 3 || || Up/Rght | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || || || || || || Space || . Enter || Enter || || BSPC || SPC || . Enter || || Dn/Left | - * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' - */ - - [_LOWER] = LAYOUT_ortho_5x15_wrapper ( - _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, - _______________LOWER_412_L1________________, ________3KEY_ID75_02_________, _______________LOWER_412_R1________________, - _______________LOWER_412_L2________________, ________3KEY_ID75_03_________, _______________LOWER_412_R2________________, - _______________LOWER_412_L3________________, ________3KEY_ID75_04_________, _______________LOWER_412_R3________________, - _______________LOWER_412_L4________________, ________3KEY_ID75_05_________, _______________LOWER_412_R4________________ - ), - - - -/* RAISE - * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. - * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | BOOT || DEBUG || || || || MAKE || 7 || 8 || 9 || || || F7 || F8 || F9 || F10 | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || RGB TOG || RGB MOD || RGB HUI || RGB HUD || || 4 || 5 || 6 || || / \ || F4 || F5 || F6 || F11 | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || RGB SAI || RGB SAD || RGB VAI || RGB VAD || || 1 || 2 0 || 3 || || _ - || F1 || F2 || F3 || F12 | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || || || || || || Space || . Enter || Enter || || RAISE || || || || | - * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' - */ - - [_RAISE] = LAYOUT_ortho_5x15_wrapper ( - _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, - _______________RAISE_412_L1________________, ________3KEY_ID75_02_________, _______________RAISE_412_R1________________, - _______________RAISE_412_L2________________, ________3KEY_ID75_03_________, _______________RAISE_412_R2________________, - _______________RAISE_412_L3________________, ________3KEY_ID75_04_________, _______________RAISE_412_R3________________, - _________________BLANK_6___________________, ________3KEY_ID75_05_________, _________________BLANK_6___________________ - ), - - - -/* EXTRAS - * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. - * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || ! || || || || || 7 || 8 || 9 || || /\ || () || [] || ; || | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | SHIFT || || || || EXTRAS || || 4 || 5 || 6 || || @ # || & % || || ' || | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || || || || || || 1 || 2 0 || 3 || || || , || . || ? || Up/Rght | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || || || || || || Space || . Enter || Enter || || || || || || | - * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' - */ - - [_EX] = LAYOUT_ortho_5x15_wrapper ( - _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, _____________WORKMAN_ID75_TOP_R____________, - ______________EXTRAS_412_L1________________, ________3KEY_ID75_02_________, ______________EXTRAS_412_R1________________, - ______________EXTRAS_412_L2________________, ________3KEY_ID75_03_________, ______________EXTRAS_412_R2________________, - ______________EXTRAS_412_L3________________, ________3KEY_ID75_04_________, ______________EXTRAS_412_R3________________, - ______________EXTRAS_412_L4________________, ________3KEY_ID75_05_________, ______________EXTRAS_412_R4________________ - ), - - -/* FUNCTION (_FN) - * .--------------------------------------------------------------------------------------------------------------------------------------------------------------------. - * | ESC || Macro01 || Macro02 || Macro03 || Macro04 || Macro05 || OS SHFT || LEADER || || Macro06 || Macro07 || Macro08 || Macro09 || Macro10 || BSPC | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | TAB ||Macro 09 ||Macro 10 ||Macro 11 ||Macro 12 || || 7 || 8 || 9 || || / \ || UP || || || DEL | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | TAB SHFT ||Macro 05 ||Macro 06 ||Macro 07 ||Macro 08 || || 4 || 5 || 6 || || LEFT || DOWN || RIGHT || || | - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | ||Macro 01 ||Macro 02 ||Macro 03 ||Macro 04 || || 1 || 2 0 || 3 || || || , || . || ? || UP RIGHT| - * |----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------+----------| - * | || RGB1 || RGB2 || RGB3 || RBG4 || || Space || . Enter || Enter || || || || || || DN LEFT | - * '--------------------------------------------------------------------------------------------------------------------------------------------------------------------' - */ - - [_FN] = LAYOUT_ortho_5x15_wrapper ( - _____________WORKMAN_ID75_TOP_L____________, ________3KEY_ID75_01_________, ____________FUNCTION_ID75_TOP_R____________, - _____________FUNCTION_412_L1_______________, ________3KEY_ID75_02_________, _____________FUNCTION_412_L1_______________, - _____________FUNCTION_412_L2_______________, ________3KEY_ID75_03_________, _____________FUNCTION_412_L2_______________, - _____________FUNCTION_412_L3_______________, ________3KEY_ID75_04_________, _____________FUNCTION_412_L3_______________, - _____________FUNCTION_412_L4_______________, ________3KEY_ID75_05_________, _____________FUNCTION_412_L4_______________ - ), - - - - /* SYMBOLS - * ┌─────┬─────┬─────┬─────┬─────┬─────┐ ┌─────┬─────┬─────┬─────┬─────┬─────┐ - * │ | $ | ^ | < | > │ SYMB│ │ SYMB│ | | [ | ] | - | | - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────╆━━━━━╅─────┤ ├─────╆━━━━━╅─────┼─────┼─────┼─────┤ - * │ | % | : | ; ┃ + ┃ = │ │ ┃ ┃ ( | ) | _ | | - * │ │ │ │ ┃ ┃ │ │ ┃ ┃ │ │ │ │ - * ├─────┼─────┼─────┼─────╄━━━━━╃─────┤ ├─────╄━━━━━╃─────┼─────┼─────┼─────┤ - * | | & | ' | " | * | # │ │ ! | ? | / | \ | @ | | - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * ├─────┼─────┼─────┼─────┼─────┼─────┤ ├─────┼─────┼─────┼─────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * └─────┴─────┴─────┴─────┴─────┴─────┘ └─────┴─────┴─────┴─────┴─────┴─────┘ - */ - - [_SYMB] = LAYOUT_ortho_5x15_wrapper ( - KC_ESC, _______, _______, _______, _______, _______, ________3KEY_ID75_01_________, RGB1, RGB2, RGB3, RGB4, RGB5, KC_DEL, - _______, KC_DLR, KC_CIRC, KC_LABK, KC_RABK, _______, ________3KEY_ID75_02_________, _______, KC_PIPE, KC_LBRC, KC_RBRC, KC_MINS, _______, - _______, KC_PERC, KC_COLN, KC_SCLN, KC_PLUS, KC_EQL, ________3KEY_ID75_03_________, _______, _______, KC_LPRN, KC_RPRN, KC_UNDS, _______, - _______, KC_AMPR, KC_QUOT, KC_DQUO, KC_ASTR, KC_HASH, ________3KEY_ID75_04_________, KC_EXLM, KC_QUES, KC_SLSH, KC_BSLS, KC_AT, _______, - _________________BLANK_6___________________, ________3KEY_ID75_05_________, _________________BLANK_6___________________ - ), - - -}; - - - - -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 -} - diff --git a/keyboards/idobao/id75/keymaps/miketronic/rules.mk b/keyboards/idobao/id75/keymaps/miketronic/rules.mk deleted file mode 100644 index 7f805ec70e14..000000000000 --- a/keyboards/idobao/id75/keymaps/miketronic/rules.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Common feature for all keyboards -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 - -# Keyboard specific -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -LEADER_ENABLE = yes -AUTO_SHIFT_ENABLE = no -VIA_ENABLE = no -MOUSEKEY_ENABLE = no -CONSOLE_ENABLE = no -COMMAND_ENABLE = no From 73193c512e23a4785c78d6edde74ffdd8af80ac4 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 7 Jul 2023 20:05:51 -0400 Subject: [PATCH 56/61] Update config.h --- .../hazel/bad_wings/keymaps/miketronic/config.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/keyboards/hazel/bad_wings/keymaps/miketronic/config.h b/keyboards/hazel/bad_wings/keymaps/miketronic/config.h index f341cc92cd1c..50c61c710819 100644 --- a/keyboards/hazel/bad_wings/keymaps/miketronic/config.h +++ b/keyboards/hazel/bad_wings/keymaps/miketronic/config.h @@ -5,21 +5,13 @@ # define TAPPING_TERM 160 # define TAPPING_TERM_PER_KEY -# define PERMISSIVE_HOLD_PER_KEY -# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS # define QUICK_TAP_TERM TAPPING_TERM / 2 # define QUICK_TAP_TERM_PER_KEY # define IGNORE_MOD_TAP_INTERRUPT -# define LEADER_NO_TIMEOUT -# define LEADER_TIMEOUT 300 -# define LEADER_PER_KEY_TIMING - -# define ONESHOT_TAP_TOGGLE 10 -# define ONESHOT_TIMEOUT 500 -# define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD # define CIRQUE_PINNACLE_TAP_ENABLE # define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE # define CIRQUE_PINNACLE_ATTENUATION_4X # define CIRQUE_PINNACLE_POSITION_MODE CIRQUE_PINNACLE_RELATIVE_MODE -//# define CIRQUE_DEVICE_GESTURES_SCROLL_ENABLE \ No newline at end of file +//# define CIRQUE_DEVICE_GESTURES_SCROLL_ENABLE From 74c60954ca839c65c22e0488a9bb3171cc46609b Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 7 Jul 2023 20:07:09 -0400 Subject: [PATCH 57/61] Update config.h --- keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h b/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h index 52b33b524b60..cd608844f4a8 100644 --- a/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h +++ b/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h @@ -5,12 +5,7 @@ # define TAPPING_TERM 160 # define TAPPING_TERM_PER_KEY -# define PERMISSIVE_HOLD_PER_KEY -# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS # define QUICK_TAP_TERM TAPPING_TERM / 2 # define QUICK_TAP_TERM_PER_KEY # define IGNORE_MOD_TAP_INTERRUPT - -# define LEADER_NO_TIMEOUT -# define LEADER_TIMEOUT 300 -# define LEADER_PER_KEY_TIMING \ No newline at end of file From 8ff08777bd0b652565ba4e7651761bf71feef82a Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 7 Jul 2023 20:08:03 -0400 Subject: [PATCH 58/61] Update config.h --- .../1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h index 5a1153c42db0..cec83897aec2 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h @@ -5,14 +5,10 @@ # define TAPPING_TERM 160 # define TAPPING_TERM_PER_KEY -# define PERMISSIVE_HOLD_PER_KEY -# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY +# define HOLD_ON_OTHER_KEY_PRESS # define QUICK_TAP_TERM TAPPING_TERM / 2 # define QUICK_TAP_TERM_PER_KEY # define IGNORE_MOD_TAP_INTERRUPT -# define LEADER_NO_TIMEOUT -# define LEADER_TIMEOUT 300 -# define LEADER_PER_KEY_TIMING From 7e2e17b9e5a0e4cc471e32c2359ab10a1c3a2a22 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 7 Jul 2023 20:52:17 -0400 Subject: [PATCH 59/61] Update config.h --- keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h index cec83897aec2..834b7ee0ab23 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/keymaps/miketronic/config.h @@ -8,7 +8,6 @@ # define HOLD_ON_OTHER_KEY_PRESS # define QUICK_TAP_TERM TAPPING_TERM / 2 # define QUICK_TAP_TERM_PER_KEY -# define IGNORE_MOD_TAP_INTERRUPT From 2e289bfda3b106149e1e51edfc3f6338176b8730 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 7 Jul 2023 20:52:46 -0400 Subject: [PATCH 60/61] Update config.h --- keyboards/hazel/bad_wings/keymaps/miketronic/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/hazel/bad_wings/keymaps/miketronic/config.h b/keyboards/hazel/bad_wings/keymaps/miketronic/config.h index 50c61c710819..1f5c059c0049 100644 --- a/keyboards/hazel/bad_wings/keymaps/miketronic/config.h +++ b/keyboards/hazel/bad_wings/keymaps/miketronic/config.h @@ -8,7 +8,6 @@ # define HOLD_ON_OTHER_KEY_PRESS # define QUICK_TAP_TERM TAPPING_TERM / 2 # define QUICK_TAP_TERM_PER_KEY -# define IGNORE_MOD_TAP_INTERRUPT # define CIRQUE_PINNACLE_TAP_ENABLE # define CIRQUE_PINNACLE_SECONDARY_TAP_ENABLE From a606c1cf1c8dda21a2c0dd061f77d64ff46559f8 Mon Sep 17 00:00:00 2001 From: miketronic Date: Fri, 7 Jul 2023 20:53:15 -0400 Subject: [PATCH 61/61] Update config.h --- keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h b/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h index cd608844f4a8..658c829f048a 100644 --- a/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h +++ b/keyboards/mechwild/bde/rev2/keymaps/miketronic/config.h @@ -8,4 +8,3 @@ # define HOLD_ON_OTHER_KEY_PRESS # define QUICK_TAP_TERM TAPPING_TERM / 2 # define QUICK_TAP_TERM_PER_KEY -# define IGNORE_MOD_TAP_INTERRUPT