diff options
Diffstat (limited to 'keyboards/splitkb')
23 files changed, 196 insertions, 286 deletions
diff --git a/keyboards/splitkb/kyria/config.h b/keyboards/splitkb/kyria/config.h deleted file mode 100644 index 6216e2e40c..0000000000 --- a/keyboards/splitkb/kyria/config.h +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 splitkb.com <support@splitkb.com> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once diff --git a/keyboards/splitkb/kyria/keymaps/artflag/keymap.c b/keyboards/splitkb/kyria/keymaps/artflag/keymap.c index a49eaafb89..311a1c75e2 100644 --- a/keyboards/splitkb/kyria/keymaps/artflag/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/artflag/keymap.c @@ -9,7 +9,7 @@ enum { CT_CLN, // Reverses colon and semicolon and triggers semicolon on tap dance. }; -void dance_cln_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_cln_finished(tap_dance_state_t *state, void *user_data) { if (state->count == 1) { register_code16(KC_COLN); } else { @@ -17,7 +17,7 @@ void dance_cln_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void dance_cln_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_cln_reset(tap_dance_state_t *state, void *user_data) { if (state->count == 1) { unregister_code16(KC_COLN); } else { @@ -26,7 +26,7 @@ void dance_cln_reset(qk_tap_dance_state_t *state, void *user_data) { } // All tap dance functions would go here. -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [CT_CLN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_cln_finished, dance_cln_reset), }; diff --git a/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c b/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c index c98219a755..cb8eb1e1e7 100644 --- a/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/asapjockey/keymap.c @@ -171,16 +171,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -LEADER_EXTERNS(); - -void matrix_scan_user(void) { - LEADER_DICTIONARY() { - leading = false; - leader_end(); - - SEQ_ONE_KEY(KC_F) { // Shift + Ctrl + F - tap_code16(S(C(KC_F))); - } +void leader_end_user(void) { + if (leader_sequence_one_key(KC_F)) { // Shift + Ctrl + F + tap_code16(S(C(KC_F))); } } diff --git a/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c b/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c index a375c5cc4d..4a4bf91177 100644 --- a/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/cjuniet/keymap.c @@ -31,8 +31,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; -LEADER_EXTERNS(); - void keyboard_post_init_user(void) { led_t led_state = host_keyboard_led_state(); if (!led_state.num_lock) { @@ -44,25 +42,20 @@ layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _SYMBOLS, _NUMBERS, _SPECIALS); } -void matrix_scan_user(void) { - LEADER_DICTIONARY() { - leading = false; - leader_end(); - - // Lock screen (macOS) - SEQ_ONE_KEY(KC_ESC) { - tap_code16(LCTL(LGUI(KC_Q))); - } +void leader_end_user(void) { + // Lock screen (macOS) + if (leader_sequence_one_key(KC_ESC)) { + tap_code16(LCTL(LGUI(KC_Q))); + } - // Escape-Shift-Z-Z (VIM) - SEQ_ONE_KEY(KC_Z) { - SEND_STRING(SS_TAP(X_ESC) SS_LSFT("zz")); - } + // Escape-Shift-Z-Z (VIM) + if (leader_sequence_one_key(KC_Z)) { + SEND_STRING(SS_TAP(X_ESC) SS_LSFT("zz")); + } - // Dead grave accent (macOS) - SEQ_ONE_KEY(KC_E) { - tap_code16(LALT(KC_GRAVE)); - } + // Dead grave accent (macOS) + if (leader_sequence_one_key(KC_E)) { + tap_code16(LALT(KC_GRAVE)); } } diff --git a/keyboards/splitkb/kyria/keymaps/corodiak/keymap.c b/keyboards/splitkb/kyria/keymaps/corodiak/keymap.c index 2a28d49752..c0ed9f133c 100644 --- a/keyboards/splitkb/kyria/keymaps/corodiak/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/corodiak/keymap.c @@ -274,48 +274,41 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; }; -LEADER_EXTERNS(); - -void matrix_scan_user(void) { - LEADER_DICTIONARY() { - leading = false; - leader_end(); +void leader_end_user(void) { + // Set current OS indicator to macOs + if (leader_sequence_one_key(KC_M)) { + user_config.osIsWindows = false; + eeconfig_update_user(user_config.raw); + } - // Set current OS indicator to macOs - SEQ_ONE_KEY(KC_M) { - user_config.osIsWindows = false; - eeconfig_update_user(user_config.raw); - } + // Set current OS indicator to Windows + if (leader_sequence_one_key(KC_W)) { + user_config.osIsWindows = true; + eeconfig_update_user(user_config.raw); + } - // Set current OS indicator to Windows - SEQ_ONE_KEY(KC_W) { - user_config.osIsWindows = true; - eeconfig_update_user(user_config.raw); - } - - // Screenshot - SEQ_ONE_KEY(KC_S) { - if (user_config.osIsWindows == 1) { - tap_code16(S(G(KC_S))); - } else if (user_config.osIsWindows == 0) { - tap_code16(S(G(KC_4))); - } + // Screenshot + if (leader_sequence_one_key(KC_S)) { + if (user_config.osIsWindows == 1) { + tap_code16(S(G(KC_S))); + } else if (user_config.osIsWindows == 0) { + tap_code16(S(G(KC_4))); } + } - // Video - SEQ_ONE_KEY(KC_V) { - if (user_config.osIsWindows == 0) { - tap_code16(S(G(KC_5))); - } + // Video + if (leader_sequence_one_key(KC_V)) { + if (user_config.osIsWindows == 0) { + tap_code16(S(G(KC_5))); } + } - // Sleep - SEQ_ONE_KEY(KC_P) { - if (user_config.osIsWindows == 1) { - SEND_STRING(SS_LGUI("x") "u" "h"); - } else if (user_config.osIsWindows == 0) { - tap_code16(A(G(KC_PWR))); - } + // Sleep + if (leader_sequence_one_key(KC_P)) { + if (user_config.osIsWindows == 1) { + SEND_STRING(SS_LGUI("x") "u" "h"); + } else if (user_config.osIsWindows == 0) { + tap_code16(A(G(KC_PWR))); } } } diff --git a/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c b/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c index 1abf865010..9c31e2617c 100644 --- a/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/cwebster2/keymap.c @@ -252,7 +252,7 @@ bool led_update_user(led_t led_state) { #endif #ifdef OLED_ENABLE -void suspend_power_down_user() { +void suspend_power_down_user(void) { oled_clear(); oled_off(); } diff --git a/keyboards/splitkb/kyria/keymaps/jhelvy/config.h b/keyboards/splitkb/kyria/keymaps/jhelvy/config.h index 86f3d5b5c3..518c9378e4 100644 --- a/keyboards/splitkb/kyria/keymaps/jhelvy/config.h +++ b/keyboards/splitkb/kyria/keymaps/jhelvy/config.h @@ -22,7 +22,7 @@ #define ENCODER_RESOLUTION 2 -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define TAPPING_TERM 200 #define AUTO_SHIFT_TIMEOUT 150 diff --git a/keyboards/splitkb/kyria/keymaps/lms_ace01/keymap.c b/keyboards/splitkb/kyria/keymaps/lms_ace01/keymap.c index b2ba6b71eb..6e709b01a6 100644 --- a/keyboards/splitkb/kyria/keymaps/lms_ace01/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/lms_ace01/keymap.c @@ -130,21 +130,21 @@ static td_tap_t td_tap_state = { .state = TD_NONE }; -td_state_t td_current (qk_tap_dance_state_t *state); -void td_kc_ly_finished(qk_tap_dance_state_t *state, void *user_data); -void td_kc_ly_reset (qk_tap_dance_state_t *state, void *user_data); +td_state_t td_current (tap_dance_state_t *state); +void td_kc_ly_finished(tap_dance_state_t *state, void *user_data); +void td_kc_ly_reset (tap_dance_state_t *state, void *user_data); -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TAB] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_CAPS), - [ESC] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset, \ + [ESC] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset, &((td_user_data_t) { KC_ESC, { _NAVIGATION, _QWERTY_ES, _QWERTY_ES }})), - [SPC] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset, \ + [SPC] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset, &((td_user_data_t) { KC_SPC, { _SYMBOL , _QWERTY_ES, _QWERTY_ES }})), - [ENT] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset, \ + [ENT] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset, &((td_user_data_t) { KC_ENT, { _SYMBOL , _QWERTY_ES, _QWERTY_ES }})), - [LWR] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset, \ + [LWR] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset, &((td_user_data_t) { KC_NO, { _NAVIGATION, _GIT_CMDS , _QWERTY_ES }})), - [RAI] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset, \ + [RAI] = ACTION_TAP_DANCE_FN_ADVANCED_USER(NULL, td_kc_ly_finished, td_kc_ly_reset, &((td_user_data_t) { KC_NO, { _FN_NUMPAD , _GIT_CMDS , _QWERTY_ES }})) }; #endif @@ -505,7 +505,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { * TAP DANCE FUNCTIONS */ #ifdef TAP_DANCE_ENABLE -td_state_t td_current(qk_tap_dance_state_t *state) { +td_state_t td_current(tap_dance_state_t *state) { switch (state->count) { case 1: return ((!state->pressed) ? TD_SINGLE_TAP : TD_SINGLE_HOLD); @@ -516,7 +516,7 @@ td_state_t td_current(qk_tap_dance_state_t *state) { } } -void td_kc_ly_finished(qk_tap_dance_state_t *state, void *user_data) { +void td_kc_ly_finished(tap_dance_state_t *state, void *user_data) { td_tap_state.state = td_current(state); uint16_t keycode = ((td_user_data_t *)user_data)->keycode; uint8_t *layer_arr = ((td_user_data_t *)user_data)->layer; @@ -576,7 +576,7 @@ void td_kc_ly_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void td_kc_ly_reset(qk_tap_dance_state_t *state, void *user_data) { +void td_kc_ly_reset(tap_dance_state_t *state, void *user_data) { uint8_t *layer_arr = ((td_user_data_t *)user_data)->layer; if (td_tap_state.state == TD_SINGLE_HOLD) { diff --git a/keyboards/splitkb/kyria/keymaps/lw/keymap.c b/keyboards/splitkb/kyria/keymaps/lw/keymap.c index 0e25d2cdf3..1ff1f54d05 100644 --- a/keyboards/splitkb/kyria/keymaps/lw/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/lw/keymap.c @@ -40,7 +40,7 @@ enum unicode_names { DEGREE, }; -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { [APOST] = 0x0027, // ' [QUOTE] = 0x0022, // " [ACUTE] = 0x00B4, // ยด diff --git a/keyboards/splitkb/kyria/keymaps/mattir/keymap.c b/keyboards/splitkb/kyria/keymaps/mattir/keymap.c index 5f97c40765..5bc0b8215e 100644 --- a/keyboards/splitkb/kyria/keymaps/mattir/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/mattir/keymap.c @@ -56,11 +56,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; +void leader_end_user(void) { + if (leader_sequence_one_key(KC_A)) { + tap_code16(SGUI(KC_L)); + } + if (leader_sequence_two_keys(KC_S, KC_S)) { + tap_code16(SGUI(KC_5)); + } +} + bool is_cmd_tab_active = false; uint16_t cmd_tab_timer = 0; -LEADER_EXTERNS(); - void matrix_scan_user(void) { if (is_cmd_tab_active) { if (timer_elapsed(cmd_tab_timer) > 1000) { @@ -68,18 +75,6 @@ void matrix_scan_user(void) { is_cmd_tab_active = false; } } - - LEADER_DICTIONARY() { - leading = false; - leader_end(); - - SEQ_ONE_KEY(KC_A) { - tap_code16(SGUI(KC_L)); - } - SEQ_TWO_KEYS(KC_S, KC_S) { - tap_code16(SGUI(KC_5)); - } - } } #ifdef OLED_ENABLE diff --git a/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c b/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c index 0d09bcce74..f42889da90 100644 --- a/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/mattir2/keymap.c @@ -49,18 +49,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; -LEADER_EXTERNS(); - -void matrix_scan_user(void) { - LEADER_DICTIONARY() { - leading = false; - leader_end(); - - SEQ_ONE_KEY(KC_A) { - tap_code16(SGUI(KC_L)); - } - SEQ_TWO_KEYS(KC_S, KC_S) { - tap_code16(SGUI(KC_5)); - } +void leader_end_user(void) { + if (leader_sequence_one_key(KC_A)) { + tap_code16(SGUI(KC_L)); + } + if (leader_sequence_two_keys(KC_S, KC_S)) { + tap_code16(SGUI(KC_5)); } } diff --git a/keyboards/splitkb/kyria/keymaps/muppetjones/config.h b/keyboards/splitkb/kyria/keymaps/muppetjones/config.h index 92d495be4a..b6351869fe 100644 --- a/keyboards/splitkb/kyria/keymaps/muppetjones/config.h +++ b/keyboards/splitkb/kyria/keymaps/muppetjones/config.h @@ -43,7 +43,7 @@ #define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 // Reduce firmware size // https://thomasbaart.nl/2018/12/01/reducing-firmware-size-in-qmk/ diff --git a/keyboards/splitkb/kyria/keymaps/ohlin/config.h b/keyboards/splitkb/kyria/keymaps/ohlin/config.h index 238206a49e..4451ff731c 100644 --- a/keyboards/splitkb/kyria/keymaps/ohlin/config.h +++ b/keyboards/splitkb/kyria/keymaps/ohlin/config.h @@ -26,4 +26,4 @@ // Prevent normal rollover on alphas from accidentally triggering mods. #define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -#define TAPPING_FORCE_HOLD
\ No newline at end of file +#define QUICK_TAP_TERM 0 diff --git a/keyboards/splitkb/kyria/keymaps/pierrec83/config.h b/keyboards/splitkb/kyria/keymaps/pierrec83/config.h index 816dd16312..b4f3f32255 100644 --- a/keyboards/splitkb/kyria/keymaps/pierrec83/config.h +++ b/keyboards/splitkb/kyria/keymaps/pierrec83/config.h @@ -44,7 +44,7 @@ #define TAPPING_TERM 200 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 // Allows to use either side as the master. Look at the documentation for info: // https://docs.qmk.fm/#/config_options?id=setting-handedness #define EE_HANDS diff --git a/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c b/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c index 1a351803a2..2233e9b01b 100644 --- a/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/plattfot/keymap.c @@ -400,82 +400,76 @@ bool encoder_update_user(uint8_t index, bool clockwise) { } #endif -LEADER_EXTERNS(); - -void matrix_scan_user(void) { - LEADER_DICTIONARY() { - leading = false; - leader_end(); - // Sway navigation - SEQ_ONE_KEY(KC_Q) { // Jump to workspace 1 - SEND_STRING(SS_LGUI("1")); - } - SEQ_ONE_KEY(KC_W) { // Jump to workspace 2 - SEND_STRING(SS_LGUI("2")); - } - SEQ_ONE_KEY(KC_E) { // Jump to workspace 3 - SEND_STRING(SS_LGUI("3")); - } - SEQ_ONE_KEY(KC_R) { // Jump to workspace 4 - SEND_STRING(SS_LGUI("4")); - } - SEQ_ONE_KEY(KC_T) { // Jump to workspace 5 - SEND_STRING(SS_LGUI("5")); - } +void leader_end_user(void) { + // Sway navigation + if (leader_sequence_one_key(KC_Q)) { // Jump to workspace 1 + SEND_STRING(SS_LGUI("1")); + } + if (leader_sequence_one_key(KC_W)) { // Jump to workspace 2 + SEND_STRING(SS_LGUI("2")); + } + if (leader_sequence_one_key(KC_E)) { // Jump to workspace 3 + SEND_STRING(SS_LGUI("3")); + } + if (leader_sequence_one_key(KC_R)) { // Jump to workspace 4 + SEND_STRING(SS_LGUI("4")); + } + if (leader_sequence_one_key(KC_T)) { // Jump to workspace 5 + SEND_STRING(SS_LGUI("5")); + } - SEQ_ONE_KEY(KC_Y) { // Jump to workspace 6 - SEND_STRING(SS_LGUI("6")); - } - SEQ_ONE_KEY(KC_U) { // Jump to workspace 7 - SEND_STRING(SS_LGUI("7")); - } - SEQ_ONE_KEY(KC_I) { // Jump to workspace 8 - SEND_STRING(SS_LGUI("8")); - } - SEQ_ONE_KEY(KC_O) { // Jump to workspace 9 - SEND_STRING(SS_LGUI("9")); - } - SEQ_ONE_KEY(KC_P) { // Jump to workspace 0 - SEND_STRING(SS_LGUI("0")); - } - SEQ_ONE_KEY(KC_G) { // View scratch pad - SEND_STRING(SS_LGUI("-")); - } + if (leader_sequence_one_key(KC_Y)) { // Jump to workspace 6 + SEND_STRING(SS_LGUI("6")); + } + if (leader_sequence_one_key(KC_U)) { // Jump to workspace 7 + SEND_STRING(SS_LGUI("7")); + } + if (leader_sequence_one_key(KC_I)) { // Jump to workspace 8 + SEND_STRING(SS_LGUI("8")); + } + if (leader_sequence_one_key(KC_O)) { // Jump to workspace 9 + SEND_STRING(SS_LGUI("9")); + } + if (leader_sequence_one_key(KC_P)) { // Jump to workspace 0 + SEND_STRING(SS_LGUI("0")); + } + if (leader_sequence_one_key(KC_G)) { // View scratch pad + SEND_STRING(SS_LGUI("-")); + } - // Sway move window - SEQ_TWO_KEYS(KC_M, KC_Q) { // Move to workspace 1 - SEND_STRING(SS_LSFT(SS_LGUI("1"))); - } - SEQ_TWO_KEYS(KC_M, KC_W) { // Move to workspace 2 - SEND_STRING(SS_LSFT(SS_LGUI("2"))); - } - SEQ_TWO_KEYS(KC_M, KC_E) { // Move to workspace 3 - SEND_STRING(SS_LSFT(SS_LGUI("3"))); - } - SEQ_TWO_KEYS(KC_M, KC_R) { // Move to workspace 4 - SEND_STRING(SS_LSFT(SS_LGUI("4"))); - } - SEQ_TWO_KEYS(KC_M, KC_T) { // Move to workspace 5 - SEND_STRING(SS_LSFT(SS_LGUI("5"))); - } + // Sway move window + if (leader_sequence_two_keys(KC_M, KC_Q)) { // Move to workspace 1 + SEND_STRING(SS_LSFT(SS_LGUI("1"))); + } + if (leader_sequence_two_keys(KC_M, KC_W)) { // Move to workspace 2 + SEND_STRING(SS_LSFT(SS_LGUI("2"))); + } + if (leader_sequence_two_keys(KC_M, KC_E)) { // Move to workspace 3 + SEND_STRING(SS_LSFT(SS_LGUI("3"))); + } + if (leader_sequence_two_keys(KC_M, KC_R)) { // Move to workspace 4 + SEND_STRING(SS_LSFT(SS_LGUI("4"))); + } + if (leader_sequence_two_keys(KC_M, KC_T)) { // Move to workspace 5 + SEND_STRING(SS_LSFT(SS_LGUI("5"))); + } - SEQ_TWO_KEYS(KC_M, KC_Y) { // Move to workspace 6 - SEND_STRING(SS_LSFT(SS_LGUI("6"))); - } - SEQ_TWO_KEYS(KC_M, KC_U) { // Move to workspace 7 - SEND_STRING(SS_LSFT(SS_LGUI("7"))); - } - SEQ_TWO_KEYS(KC_M, KC_I) { // Move to workspace 8 - SEND_STRING(SS_LSFT(SS_LGUI("8"))); - } - SEQ_TWO_KEYS(KC_M, KC_O) { // Move to workspace 9 - SEND_STRING(SS_LSFT(SS_LGUI("9"))); - } - SEQ_TWO_KEYS(KC_M, KC_P) { // Move to workspace 0 - SEND_STRING(SS_LSFT(SS_LGUI("0"))); - } - SEQ_TWO_KEYS(KC_M, KC_G) { // Move to scratch pad - SEND_STRING(SS_LSFT(SS_LGUI("-"))); - } + if (leader_sequence_two_keys(KC_M, KC_Y)) { // Move to workspace 6 + SEND_STRING(SS_LSFT(SS_LGUI("6"))); + } + if (leader_sequence_two_keys(KC_M, KC_U)) { // Move to workspace 7 + SEND_STRING(SS_LSFT(SS_LGUI("7"))); + } + if (leader_sequence_two_keys(KC_M, KC_I)) { // Move to workspace 8 + SEND_STRING(SS_LSFT(SS_LGUI("8"))); + } + if (leader_sequence_two_keys(KC_M, KC_O)) { // Move to workspace 9 + SEND_STRING(SS_LSFT(SS_LGUI("9"))); + } + if (leader_sequence_two_keys(KC_M, KC_P)) { // Move to workspace 0 + SEND_STRING(SS_LSFT(SS_LGUI("0"))); + } + if (leader_sequence_two_keys(KC_M, KC_G)) { // Move to scratch pad + SEND_STRING(SS_LSFT(SS_LGUI("-"))); } } diff --git a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c index 420d9a89af..3ed7dbee6e 100644 --- a/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c +++ b/keyboards/splitkb/kyria/keymaps/thomasbaart/keymap.c @@ -173,12 +173,54 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } +void leader_end_user(void) { + if (leader_sequence_one_key(KC_C)) { // Inline Code + SEND_STRING("`` " SS_TAP(X_LEFT) SS_TAP(X_LEFT)); + } + if (leader_sequence_one_key(KC_P)) { // Invoke Password Manager + SEND_STRING(SS_LCTL(SS_LALT("\\"))); + } + if (leader_sequence_one_key(KC_S)) { // Windows screenshot + SEND_STRING(SS_LGUI("\nS")); + } + if (leader_sequence_two_keys(KC_F, KC_P)) { // Fusion Projection prefix + SEND_STRING("[Projection] "); + } + if (leader_sequence_two_keys(KC_B, KC_B)) { // Basecone invoice description + SEND_STRING("[Leveranciersnaam] [Factuurnummer]"); + } + if (leader_sequence_two_keys(KC_E, KC_S)) { // Support email splitkb + SEND_STRING("support@splitkb.com"); + } + if (leader_sequence_two_keys(KC_E, KC_T)) { // Email splitkb + SEND_STRING("thomas@splitkb.com"); + } + if (leader_sequence_two_keys(KC_E, KC_P)) { // Email personal + SEND_STRING("mail@thomasbaart.nl"); + } + if (leader_sequence_two_keys(KC_S, KC_D)) { // Splitkb documentation + SEND_STRING("https://docs.splitkb.com/"); + } + if (leader_sequence_two_keys(KC_S, KC_V)) { // Splitkb VAT number + SEND_STRING("NL210593349B01"); + } + if (leader_sequence_two_keys(KC_B, KC_C)) { // Discord bongocat + SEND_STRING(":bongocat:\n"); + } + if (leader_sequence_two_keys(KC_C, KC_B)) { // Discord code block + SEND_STRING("```c" SS_LSFT("\n\n") "``` " SS_TAP(X_UP)); + } + if (leader_sequence_two_keys(KC_Y, KC_S)) { // Greeting + SEND_STRING("Yours sincerely,\n\nThomas Baart"); + } + if (leader_sequence_three_keys(KC_M, KC_V, KC_G)) { // Greeting + SEND_STRING("Met vriendelijke groet,\n\nThomas Baart"); + } +} bool is_alt_tab_active = false; uint16_t alt_tab_timer = 0; -LEADER_EXTERNS(); - void matrix_scan_user(void) { if (is_alt_tab_active) { if (timer_elapsed(alt_tab_timer) > 1000) { @@ -186,54 +228,6 @@ void matrix_scan_user(void) { is_alt_tab_active = false; } } - - LEADER_DICTIONARY() { - leading = false; - leader_end(); - - SEQ_ONE_KEY(KC_C) { // Inline Code - SEND_STRING("`` " SS_TAP(X_LEFT) SS_TAP(X_LEFT)); - } - SEQ_ONE_KEY(KC_P) { // Invoke Password Manager - SEND_STRING(SS_LCTL(SS_LALT("\\"))); - } - SEQ_ONE_KEY(KC_S) { // Windows screenshot - SEND_STRING(SS_LGUI("\nS")); - } - SEQ_TWO_KEYS(KC_F, KC_P) { // Fusion Projection prefix - SEND_STRING("[Projection] "); - } - SEQ_TWO_KEYS(KC_B, KC_B) { // Basecone invoice description - SEND_STRING("[Leveranciersnaam] [Factuurnummer]"); - } - SEQ_TWO_KEYS(KC_E, KC_S) { // Support email splitkb - SEND_STRING("support@splitkb.com"); - } - SEQ_TWO_KEYS(KC_E, KC_T) { // Email splitkb - SEND_STRING("thomas@splitkb.com"); - } - SEQ_TWO_KEYS(KC_E, KC_P) { // Email personal - SEND_STRING("mail@thomasbaart.nl"); - } - SEQ_TWO_KEYS(KC_S, KC_D) { // Splitkb documentation - SEND_STRING("https://docs.splitkb.com/"); - } - SEQ_TWO_KEYS(KC_S, KC_V) { // Splitkb VAT number - SEND_STRING("NL210593349B01"); - } - SEQ_TWO_KEYS(KC_B, KC_C) { // Discord bongocat - SEND_STRING(":bongocat:\n"); - } - SEQ_TWO_KEYS(KC_C, KC_B) { // Discord code block - SEND_STRING("```c" SS_LSFT("\n\n") "``` " SS_TAP(X_UP)); - } - SEQ_TWO_KEYS(KC_Y, KC_S) { // Greeting - SEND_STRING("Yours sincerely,\n\nThomas Baart"); - } - SEQ_THREE_KEYS(KC_M, KC_V, KC_G) { // Greeting - SEND_STRING("Met vriendelijke groet,\n\nThomas Baart"); - } - } } #ifdef OLED_ENABLE diff --git a/keyboards/splitkb/kyria/keymaps/winternebs/config.h b/keyboards/splitkb/kyria/keymaps/winternebs/config.h index 1df48a1f49..f0632e90ae 100755 --- a/keyboards/splitkb/kyria/keymaps/winternebs/config.h +++ b/keyboards/splitkb/kyria/keymaps/winternebs/config.h @@ -27,5 +27,5 @@ #define NO_ACTION_MACRO #define NO_ACTION_FUNCTION #define NO_ACTION_ONESHOT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/config.h b/keyboards/splitkb/kyria/keymaps/zigotica/config.h index b59e04474b..8c4e8dfece 100644 --- a/keyboards/splitkb/kyria/keymaps/zigotica/config.h +++ b/keyboards/splitkb/kyria/keymaps/zigotica/config.h @@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TERM 350 #define PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #define LEADER_PER_KEY_TIMING #define LEADER_TIMEOUT 300 diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h index 7bc756c042..0cb7e01811 100644 --- a/keyboards/splitkb/kyria/rev1/config.h +++ b/keyboards/splitkb/kyria/rev1/config.h @@ -40,12 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. */ diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h index 1733eddf9a..9988c942e8 100644 --- a/keyboards/splitkb/kyria/rev2/config.h +++ b/keyboards/splitkb/kyria/rev2/config.h @@ -50,12 +50,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT #define MATRIX_MASKED // actual mask is defined by `matrix_mask` in `rev2.c` -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. */ diff --git a/keyboards/splitkb/zima/config.h b/keyboards/splitkb/zima/config.h index 35782781c1..c4782567ff 100644 --- a/keyboards/splitkb/zima/config.h +++ b/keyboards/splitkb/zima/config.h @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 4 @@ -57,17 +56,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_TWINKLE -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -// #define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -// #define LOCKING_RESYNC_ENABLE - #define FB_ERM_LRA 0 #define FB_BRAKEFACTOR 3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */ #define FB_LOOPGAIN 1 /* For Low:0, Medium:1, High:2, Very High:3 */ diff --git a/keyboards/splitkb/zima/info.json b/keyboards/splitkb/zima/info.json index 0afcbe5b6e..744efd5b76 100644 --- a/keyboards/splitkb/zima/info.json +++ b/keyboards/splitkb/zima/info.json @@ -8,6 +8,8 @@ "pid": "0xF75B", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x3": { "layout": [ diff --git a/keyboards/splitkb/zima/rules.mk b/keyboards/splitkb/zima/rules.mk index 4de2f506eb..fb9a585656 100644 --- a/keyboards/splitkb/zima/rules.mk +++ b/keyboards/splitkb/zima/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |