diff options
Diffstat (limited to 'users')
123 files changed, 463 insertions, 1587 deletions
diff --git a/users/333fred/333fred.c b/users/333fred/333fred.c index c035493e37..e75a862a3e 100644 --- a/users/333fred/333fred.c +++ b/users/333fred/333fred.c @@ -31,7 +31,7 @@ typedef enum { static tap_dance_state_enum tap_dance_state; static bool tap_dance_active = false; -void tap_dance_sym_vim_finished(qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_sym_vim_finished(tap_dance_state_t *state, void *user_data) { // Determine the current state if (state->count == 1) { if (state->interrupted || state->pressed == 0) tap_dance_state = SINGLE_TAP; @@ -60,7 +60,7 @@ void tap_dance_sym_vim_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void tap_dance_sym_vim_reset(qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_sym_vim_reset(tap_dance_state_t *state, void *user_data) { switch(tap_dance_state) { case SINGLE_TAP: clear_oneshot_layer_state(ONESHOT_PRESSED); @@ -74,7 +74,7 @@ void tap_dance_sym_vim_reset(qk_tap_dance_state_t *state, void *user_data) { } } -void tap_dance_copy_paste_finished(qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_copy_paste_finished(tap_dance_state_t *state, void *user_data) { bool is_paste = state->count == 2; // If either the one-shot shift is set, or if shift is being held, count as shift being held. // We'll clear the one-shot shift if it was held @@ -103,7 +103,7 @@ void tap_dance_copy_paste_finished(qk_tap_dance_state_t *state, void *user_data) } } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_SYM_VIM] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_dance_sym_vim_finished, tap_dance_sym_vim_reset), [TD_COPY_PASTE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_dance_copy_paste_finished, NULL) }; diff --git a/users/333fred/333fred.h b/users/333fred/333fred.h index 0532ff2df7..e8473e7ce1 100644 --- a/users/333fred/333fred.h +++ b/users/333fred/333fred.h @@ -45,7 +45,7 @@ enum custom_keys { PSCREEN_APP }; -void tap_dance_sym_vim_finished(qk_tap_dance_state_t*, void*); -void tap_dance_sym_vim_reset(qk_tap_dance_state_t*, void*); +void tap_dance_sym_vim_finished(tap_dance_state_t*, void*); +void tap_dance_sym_vim_reset(tap_dance_state_t*, void*); void tap_dance_process_keycode(uint16_t); bool try_handle_macro(uint16_t keycode, keyrecord_t *record); diff --git a/users/bcat/config.h b/users/bcat/config.h index 7bb5d71bae..b9eac74ff6 100644 --- a/users/bcat/config.h +++ b/users/bcat/config.h @@ -35,7 +35,7 @@ /* Turn off key repeat support of the tap keycode for tap-hold keys, enabling * holds to work correctly in quick succession after taps. */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 #if defined(OLED_ENABLE) /* The built-in OLED timeout wakes the OLED screen every time the buffer is diff --git a/users/billypython/tap_dance.c b/users/billypython/tap_dance.c index 74ae166393..c55f9e9133 100644 --- a/users/billypython/tap_dance.c +++ b/users/billypython/tap_dance.c @@ -2,11 +2,11 @@ #define ACTION_TAP_DANCE_DOUBLE_MODS(mod1, mod2) { \ .fn = { td_double_mods_each, NULL, td_double_mods_reset }, \ - .user_data = &(qk_tap_dance_pair_t){ mod1, mod2 }, \ + .user_data = &(tap_dance_pair_t){ mod1, mod2 }, \ } -void td_double_mods_each(qk_tap_dance_state_t *state, void *user_data) { - qk_tap_dance_pair_t *mods = (qk_tap_dance_pair_t *)user_data; +void td_double_mods_each(tap_dance_state_t *state, void *user_data) { + tap_dance_pair_t *mods = (tap_dance_pair_t *)user_data; // Single tap → mod1, double tap → mod2, triple tap etc. → mod1+mod2 if (state->count == 1 || state->count == 3) { register_code(mods->kc1); @@ -18,8 +18,8 @@ void td_double_mods_each(qk_tap_dance_state_t *state, void *user_data) { state->weak_mods &= ~(MOD_BIT(mods->kc1) | MOD_BIT(mods->kc2)); } -void td_double_mods_reset(qk_tap_dance_state_t *state, void *user_data) { - qk_tap_dance_pair_t *mods = (qk_tap_dance_pair_t *)user_data; +void td_double_mods_reset(tap_dance_state_t *state, void *user_data) { + tap_dance_pair_t *mods = (tap_dance_pair_t *)user_data; if (state->count == 1 || state->count >= 3) { unregister_code(mods->kc1); } @@ -28,6 +28,6 @@ void td_double_mods_reset(qk_tap_dance_state_t *state, void *user_data) { } } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_RSF_RCT] = ACTION_TAP_DANCE_DOUBLE_MODS(KC_RSFT, KC_RCTL), }; diff --git a/users/brandonschlack/process_records.c b/users/brandonschlack/process_records.c index 892bc7e062..f40eeaf8b6 100644 --- a/users/brandonschlack/process_records.c +++ b/users/brandonschlack/process_records.c @@ -141,14 +141,14 @@ void matrix_scan_cmd_tab(void) { * * Sends 'qmk compile -kb keyboard -km keymap' command to compile firmware * Uses 'qmk flash' and resets keyboard, if flash_bootloader set to true - * Sends CTPC and/or FORCE_LAYOUT parameters if built with those options + * Sends CONVERT_TO and/or FORCE_LAYOUT parameters if built with those options */ void send_make_command(bool flash_bootloader) { #ifdef FORCE_LAYOUT // Add layout string if built with FORCE_LAYOUT SEND_STRING("FORCE_LAYOUT=" FORCE_LAYOUT " "); #endif -#ifdef CONVERT_TO_PROTON_C // Add CTPC if built with CONVERT_TO_PROTON_C - SEND_STRING("CTPC=yes "); +#ifdef CONVERT_TO_PROTON_C // Add CONVERT_TO if built with converter + SEND_STRING("CONVERT_TO=proton_c "); #endif SEND_STRING("qmk "); if (flash_bootloader) { diff --git a/users/brandonschlack/tap_dances.c b/users/brandonschlack/tap_dances.c index 861b31805b..4a4a530ff2 100644 --- a/users/brandonschlack/tap_dances.c +++ b/users/brandonschlack/tap_dances.c @@ -16,7 +16,7 @@ #include "tap_dances.h" #include "process_keycode/process_tap_dance.h" -int cur_dance (qk_tap_dance_state_t *state) { +int cur_dance (tap_dance_state_t *state) { if (state->count == 1) { if (state->interrupted || !state->pressed) return SINGLE_TAP; else return SINGLE_HOLD; @@ -35,8 +35,8 @@ int cur_dance (qk_tap_dance_state_t *state) { __attribute__ ((weak)) void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { }; -void td_trigger_layer_finished (qk_tap_dance_state_t *state, void *user_data) { - qk_tap_dance_trigger_layer_t *data = (qk_tap_dance_trigger_layer_t *)user_data; +void td_trigger_layer_finished (tap_dance_state_t *state, void *user_data) { + tap_dance_trigger_layer_t *data = (tap_dance_trigger_layer_t *)user_data; data->state = cur_dance(state); if (data->state == data->trigger) { @@ -46,8 +46,8 @@ void td_trigger_layer_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void td_trigger_layer_reset (qk_tap_dance_state_t *state, void *user_data) { - qk_tap_dance_trigger_layer_t *data = (qk_tap_dance_trigger_layer_t *)user_data; +void td_trigger_layer_reset (tap_dance_state_t *state, void *user_data) { + tap_dance_trigger_layer_t *data = (tap_dance_trigger_layer_t *)user_data; if (data->state == data->trigger) { switch (data->trigger) { case SINGLE_HOLD: @@ -63,8 +63,8 @@ void td_trigger_layer_reset (qk_tap_dance_state_t *state, void *user_data) { } /* Tap Dance: Layer Mod. Toggles Layer when tapped, Mod when held. */ -void td_layer_mod_each(qk_tap_dance_state_t *state, void *user_data) { - qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data; +void td_layer_mod_each(tap_dance_state_t *state, void *user_data) { + tap_dance_dual_role_t *data = (tap_dance_dual_role_t *)user_data; // Single tap → toggle layer, Single hold → mod if (state->pressed) { @@ -74,16 +74,16 @@ void td_layer_mod_each(qk_tap_dance_state_t *state, void *user_data) { } } -void td_layer_mod_finished(qk_tap_dance_state_t *state, void *user_data) { - qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data; +void td_layer_mod_finished(tap_dance_state_t *state, void *user_data) { + tap_dance_dual_role_t *data = (tap_dance_dual_role_t *)user_data; if (state->count == 1 && !state->pressed) { layer_invert(data->layer); } } -void td_layer_mod_reset(qk_tap_dance_state_t *state, void *user_data) { - qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data; +void td_layer_mod_reset(tap_dance_state_t *state, void *user_data) { + tap_dance_dual_role_t *data = (tap_dance_dual_role_t *)user_data; if (state->count == 1) { unregister_code(data->kc); diff --git a/users/brandonschlack/tap_dances.h b/users/brandonschlack/tap_dances.h index 3747619a5e..62c585631e 100644 --- a/users/brandonschlack/tap_dances.h +++ b/users/brandonschlack/tap_dances.h @@ -29,7 +29,7 @@ enum tap_dance_states { TRIPLE_HOLD = 7 }; -int cur_dance (qk_tap_dance_state_t *state); +int cur_dance (tap_dance_state_t *state); void process_tap_dance_keycode (bool reset, uint8_t toggle_layer); /* Tap Dance: Trigger Layer @@ -41,12 +41,12 @@ typedef struct { uint8_t trigger; uint8_t layer; uint8_t state; -} qk_tap_dance_trigger_layer_t; +} tap_dance_trigger_layer_t; #define ACTION_TAP_DANCE_TRIGGER_LAYER(trigger, layer) { \ .fn = { NULL, td_trigger_layer_finished, td_trigger_layer_reset }, \ - .user_data = (void *)&((qk_tap_dance_trigger_layer_t) { trigger, layer, 0 }), \ + .user_data = (void *)&((tap_dance_trigger_layer_t) { trigger, layer, 0 }), \ } -void td_trigger_layer_finished (qk_tap_dance_state_t *state, void *user_data); -void td_trigger_layer_reset (qk_tap_dance_state_t *state, void *user_data); +void td_trigger_layer_finished (tap_dance_state_t *state, void *user_data); +void td_trigger_layer_reset (tap_dance_state_t *state, void *user_data); diff --git a/users/charlesrocket/apl.c b/users/charlesrocket/apl.c index 63d835c909..92c1ea9f3d 100644 --- a/users/charlesrocket/apl.c +++ b/users/charlesrocket/apl.c @@ -99,7 +99,7 @@ enum unicode_names { QUAD_COLON }; -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { [DIAMOND] = 0x25CA, // ◊ 0 [QUAD_DIAMOND] = 0x233A, // ⌺ [DIAERESIS] = 0x00A8, // ¨ diff --git a/users/curry/tap_dances.c b/users/curry/tap_dances.c index 166ea2c686..86a8f679d2 100644 --- a/users/curry/tap_dances.c +++ b/users/curry/tap_dances.c @@ -1,4 +1,4 @@ #include "tap_dances.h" #include "curry.h" -qk_tap_dance_action_t tap_dance_actions[] = {}; +tap_dance_action_t tap_dance_actions[] = {}; diff --git a/users/cwebster2/config.h b/users/cwebster2/config.h index 78733687cc..313e6d533f 100644 --- a/users/cwebster2/config.h +++ b/users/cwebster2/config.h @@ -18,7 +18,7 @@ #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 #define TAPPING_TERM_PER_KEY -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 #undef PERMISSIVE_HOLD #define IGNORE_MOD_TAP_INTERRUPT #define NO_ACTION_ONESHOT diff --git a/users/d4mation/tap-dance.c b/users/d4mation/tap-dance.c index 77d09962d6..928a932611 100644 --- a/users/d4mation/tap-dance.c +++ b/users/d4mation/tap-dance.c @@ -1,6 +1,6 @@ #include "tap-dance.h" -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { /* Tap once/hold for Shift, tap twice for Caps Lock */ [SHIFT_CAPS] = ACTION_TAP_DANCE_DOUBLE( KC_LSFT, KC_CAPS ) };
\ No newline at end of file diff --git a/users/danielo515/danielo515.c b/users/danielo515/danielo515.c index 9b09aed9d7..ea91ec55bf 100644 --- a/users/danielo515/danielo515.c +++ b/users/danielo515/danielo515.c @@ -7,9 +7,9 @@ bool onMac = true; LEADER_EXTERNS(); # ifdef RGBLIGHT_ENABLE -void leader_start() { rgblight_setrgb_range(5, 100, 199, 10, 15); }; +void leader_start_user() { rgblight_setrgb_range(5, 100, 199, 10, 15); }; -void leader_end() { rgblight_setrgb_range(200, 200, 255, 10, 15); }; +void leader_end_user() { rgblight_setrgb_range(200, 200, 255, 10, 15); }; # endif void matrix_scan_user(void) { diff --git a/users/danielo515/tap_dance.c b/users/danielo515/tap_dance.c index a07b4c792f..b69ee715d4 100644 --- a/users/danielo515/tap_dance.c +++ b/users/danielo515/tap_dance.c @@ -1,7 +1,7 @@ #include "tap_dance.h" //**************** Definitions needed for quad function to work *********************// #ifdef QUAD_DANCE -int cur_dance(qk_tap_dance_state_t *state) +int cur_dance(tap_dance_state_t *state) { if (state->count == 1) { @@ -30,8 +30,8 @@ int cur_dance(qk_tap_dance_state_t *state) # endif // Slightly better tap dance double: interruption sends double single and any number over double sends the single that number of times -void qk_tap_dance_pair_finished_safe(qk_tap_dance_state_t *state, void *user_data) { - qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; +void tap_dance_pair_finished_safe(tap_dance_state_t *state, void *user_data) { + tap_dance_pair_t *pair = (tap_dance_pair_t *)user_data; int count = state->count; if (state->count == 2) { if (state->interrupted){ @@ -47,8 +47,8 @@ void qk_tap_dance_pair_finished_safe(qk_tap_dance_state_t *state, void *user_dat } } -void qk_tap_dance_pair_reset_safe(qk_tap_dance_state_t *state, void *user_data) { - qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; +void tap_dance_pair_reset_safe(tap_dance_state_t *state, void *user_data) { + tap_dance_pair_t *pair = (tap_dance_pair_t *)user_data; if (state->count == 2) { unregister_code16 (pair->kc2); return; @@ -58,7 +58,7 @@ void qk_tap_dance_pair_reset_safe(qk_tap_dance_state_t *state, void *user_data) //**************** Tap dance functions *********************// -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [COPY_CUT] = ACTION_TAP_DANCE_FN(td_copy_cut), [PASTE_DANCE] = ACTION_TAP_DANCE_FN(td_paste), [_TD_F1] = ACTION_TAP_DANCE_DOUBLE(KC_1, KC_F1), @@ -86,7 +86,7 @@ qk_tap_dance_action_t tap_dance_actions[] = { [_TD_PASTE] = ACTION_TAP_DANCE_FN(dance_paste) }; -void td_copy_cut(qk_tap_dance_state_t *state, void *user_data) +void td_copy_cut(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { @@ -99,7 +99,7 @@ void td_copy_cut(qk_tap_dance_state_t *state, void *user_data) reset_tap_dance(state); }; -void td_paste(qk_tap_dance_state_t *state, void *user_data) +void td_paste(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { @@ -113,7 +113,7 @@ void td_paste(qk_tap_dance_state_t *state, void *user_data) }; //===== The awesome tap dance for CUT, COPY and PASTE letters -void dance_copy (qk_tap_dance_state_t *state, void *user_data) { +void dance_copy (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { tap_code16(KC_C); } else if (state->interrupted) { tap_code16(KC_C);tap_code16(KC_C);} @@ -122,13 +122,13 @@ void dance_copy (qk_tap_dance_state_t *state, void *user_data) { reset_tap_dance (state); } -void dance_cut (qk_tap_dance_state_t *state, void *user_data) { +void dance_cut (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { tap_code16(KC_X); } else { CMD(KC_X); } reset_tap_dance (state); } -void dance_paste (qk_tap_dance_state_t *state, void *user_data) { +void dance_paste (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { tap_code16(KC_V); } diff --git a/users/danielo515/tap_dance.h b/users/danielo515/tap_dance.h index 880ad525ee..aaf3864841 100644 --- a/users/danielo515/tap_dance.h +++ b/users/danielo515/tap_dance.h @@ -4,8 +4,8 @@ extern bool onMac; #define ACTION_TAP_DANCE_DOUBLE_SAFE(kc1, kc2) { \ - .fn = { NULL, qk_tap_dance_pair_finished_safe, qk_tap_dance_pair_reset_safe }, \ - .user_data = (void *)&((qk_tap_dance_pair_t) { kc1, kc2 }), \ + .fn = { NULL, tap_dance_pair_finished_safe, tap_dance_pair_reset_safe }, \ + .user_data = (void *)&((tap_dance_pair_t) { kc1, kc2 }), \ } #ifdef QUAD_DANCE @@ -18,7 +18,7 @@ enum { DOUBLE_SINGLE_TAP = 5 //send SINGLE_TAP twice - NOT DOUBLE_TAP // Add more enums here if you want for triple, quadruple, etc. }; -int cur_dance (qk_tap_dance_state_t *state); +int cur_dance (tap_dance_state_t *state); # endif enum tap_dance { @@ -48,14 +48,14 @@ enum tap_dance { _TD_CUT, _TD_PASTE, }; -void qk_tap_dance_pair_finished_safe(qk_tap_dance_state_t *state, void *user_data); -void qk_tap_dance_pair_reset_safe(qk_tap_dance_state_t *state, void *user_data); -void td_copy_cut (qk_tap_dance_state_t *state, void *user_data); -void td_paste(qk_tap_dance_state_t *state, void *user_data); -int cur_dance (qk_tap_dance_state_t *state); -void dance_cut (qk_tap_dance_state_t *state, void *user_data); -void dance_copy (qk_tap_dance_state_t *state, void *user_data); -void dance_paste (qk_tap_dance_state_t *state, void *user_data); +void tap_dance_pair_finished_safe(tap_dance_state_t *state, void *user_data); +void tap_dance_pair_reset_safe(tap_dance_state_t *state, void *user_data); +void td_copy_cut (tap_dance_state_t *state, void *user_data); +void td_paste(tap_dance_state_t *state, void *user_data); +int cur_dance (tap_dance_state_t *state); +void dance_cut (tap_dance_state_t *state, void *user_data); +void dance_copy (tap_dance_state_t *state, void *user_data); +void dance_paste (tap_dance_state_t *state, void *user_data); // Ready to use Tap dance definitions, just put them on your layout #define TD_COPY TD(_TD_COPY) diff --git a/users/draevin/draevin.c b/users/draevin/draevin.c index 95570bf377..70b465a33d 100644 --- a/users/draevin/draevin.c +++ b/users/draevin/draevin.c @@ -54,6 +54,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS) // shift/caps TD }; diff --git a/users/drashna/config.h b/users/drashna/config.h index 5c5c131e36..9edbfff56b 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h @@ -81,9 +81,8 @@ #endif // !ONESHOT_TIMEOUT #if defined(PER_KEY_TAPPING) -# define IGNORE_MOD_TAP_INTERRUPT_PER_KEY # define PERMISSIVE_HOLD_PER_KEY -# define TAPPING_FORCE_HOLD_PER_KEY +# define QUICK_TAP_TERM_PER_KEY # define HOLD_ON_OTHER_KEY # define RETRO_TAPPING_PER_KEY # define HOLD_ON_OTHER_KEY_PRESS_PER_KEY diff --git a/users/drashna/keyrecords/tap_dance.md b/users/drashna/keyrecords/tap_dance.md index fef1435918..9dff96640f 100644 --- a/users/drashna/keyrecords/tap_dance.md +++ b/users/drashna/keyrecords/tap_dance.md @@ -30,7 +30,7 @@ These are the custom defined dances that I'm using. It sets up everything for l ```c //Tap Dance Definitions, sets the index and the keycode. -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { // tap once to disable, and more to enable timed micros [TD_D3_1] = ACTION_TAP_DANCE_DIABLO(0, KC_1), [TD_D3_2] = ACTION_TAP_DANCE_DIABLO(1, KC_2), @@ -82,7 +82,7 @@ The first part of the magic here is the `diablo_tapdance_master` function. The ```c // Cycle through the times for the macro, starting at 0, for disabled. -void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data) { +void diablo_tapdance_master(tap_dance_state_t *state, void *user_data) { diable_keys_t *diablo_keys = (diable_keys_t *)user_data; // Sets the keycode based on the index diablo_timer[diablo_keys->index].keycode = diablo_keys->keycode; diff --git a/users/drashna/keyrecords/tap_dances.c b/users/drashna/keyrecords/tap_dances.c index 7bdea3cae3..87739c2a18 100644 --- a/users/drashna/keyrecords/tap_dances.c +++ b/users/drashna/keyrecords/tap_dances.c @@ -17,7 +17,7 @@ uint8_t diablo_times[] = {0, 1, 3, 5, 10, 30}; * @param state Main data struction contining information about events * @param user_data Local data for the dance. Allows customization to be passed on to function */ -void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data) { +void diablo_tapdance_master(tap_dance_state_t *state, void *user_data) { diable_keys_t *diablo_keys = (diable_keys_t *)user_data; // Sets the keycode based on the index diablo_timer[diablo_keys->index].keycode = diablo_keys->keycode; @@ -40,7 +40,7 @@ void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data) { // clang-format on // Tap Dance Definitions, sets the index and the keycode. -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { // tap once to disable, and more to enable timed micros [TD_D3_1] = ACTION_TAP_DANCE_DIABLO(0, KC_1), [TD_D3_2] = ACTION_TAP_DANCE_DIABLO(1, KC_2), diff --git a/users/drashna/keyrecords/tapping.c b/users/drashna/keyrecords/tapping.c index 7496610c2f..6a26a02aca 100644 --- a/users/drashna/keyrecords/tapping.c +++ b/users/drashna/keyrecords/tapping.c @@ -42,29 +42,14 @@ __attribute__((weak)) bool get_hold_on_other_key_press(uint16_t keycode, keyreco } #endif // HOLD_ON_OTHER_KEY_PRESS_PER_KEY -#ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY -__attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { - // 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 true; - // 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; - switch (keycode) { - default: - return true; - } -} -#endif // IGNORE_MOD_TAP_INTERRUPT_PER_KEY - -#ifdef TAPPING_FORCE_HOLD_PER_KEY -__attribute__((weak)) bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { +#ifdef QUICK_TAP_TERM_PER_KEY +__attribute__((weak)) uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { default: - return false; + return QUICK_TAP_TERM; } } -#endif // TAPPING_FORCE_HOLD_PER_KEY +#endif // QUICK_TAP_TERM_PER_KEY #ifdef RETRO_TAPPING_PER_KEY __attribute__((weak)) bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) { diff --git a/users/dshields/config.h b/users/dshields/config.h index 1420a9178f..279bcf217b 100644 --- a/users/dshields/config.h +++ b/users/dshields/config.h @@ -6,7 +6,7 @@ #define ONESHOT_TIMEOUT 3000 #define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD_PER_KEY -#define TAPPING_FORCE_HOLD_PER_KEY +#define QUICK_TAP_TERM_PER_KEY #define TAPPING_TERM 200 #define BACKLIGHT_BREATHING #define DYNAMIC_MACRO_NO_NESTING diff --git a/users/dshields/dshields.c b/users/dshields/dshields.c index 46f0b33cd3..a8e1333104 100644 --- a/users/dshields/dshields.c +++ b/users/dshields/dshields.c @@ -29,7 +29,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { +uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case MT_A: case MT_S: @@ -39,9 +39,9 @@ bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { case MT_K: case MT_L: case MT_SCLN: - return true; + return 0; default: - return false; + return QUICK_TAP_TERM; } } @@ -55,4 +55,3 @@ bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) { return false; } } - diff --git a/users/dvorak_42_key/dvorak_42_key.c b/users/dvorak_42_key/dvorak_42_key.c index f4ec3cd06e..99cfd8cb7d 100644 --- a/users/dvorak_42_key/dvorak_42_key.c +++ b/users/dvorak_42_key/dvorak_42_key.c @@ -5,7 +5,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { // tap dance processing - qk_tap_dance_action_t *action; + tap_dance_action_t *action; switch (keycode) { case TD(TD_DEL_WORD_DEL): // list all tap dance keycodes with tap-hold configurations action = &tap_dance_actions[TD_INDEX(keycode)]; @@ -167,7 +167,7 @@ bool caps_word_press_user(uint16_t keycode) { } -void tap_dance_tap_hold_finished(qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_tap_hold_finished(tap_dance_state_t *state, void *user_data) { tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)user_data; if (state->pressed) { @@ -185,7 +185,7 @@ void tap_dance_tap_hold_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void tap_dance_tap_hold_reset(qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_tap_hold_reset(tap_dance_state_t *state, void *user_data) { tap_dance_tap_hold_t *tap_hold = (tap_dance_tap_hold_t *)user_data; if (tap_hold->held) { @@ -196,7 +196,7 @@ void tap_dance_tap_hold_reset(qk_tap_dance_state_t *state, void *user_data) { // Tap Dance definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { // Tap once for Escape, twice for Caps Lock // [TD_BSPC_CTL_BSPC] = ACTION_TAP_DANCE_DOUBLE(KC_BSPC, RCTL(KC_BSPC)), // [TD_BSPC_CTL_BSPC_IOS] = ACTION_TAP_DANCE_DOUBLE(KC_BSPC, LALT(KC_BSPC)), diff --git a/users/edvorakjp/edvorakjp_tap_dance.c b/users/edvorakjp/edvorakjp_tap_dance.c index 69fcbac1ca..d2c9f2b0e9 100644 --- a/users/edvorakjp/edvorakjp_tap_dance.c +++ b/users/edvorakjp/edvorakjp_tap_dance.c @@ -14,7 +14,7 @@ typedef struct { } td_status_t; static td_status_t td_status = {NONE, NONE}; -uint8_t cur_dance(qk_tap_dance_state_t *state) { +uint8_t cur_dance(tap_dance_state_t *state) { if (state->interrupted || !state->pressed) { return state->count == 1 ? SINGLE_TAP : DOUBLE_TAP; } else { @@ -22,7 +22,7 @@ uint8_t cur_dance(qk_tap_dance_state_t *state) { } } -void td_lower_finished(qk_tap_dance_state_t *state, void *user_data) { +void td_lower_finished(tap_dance_state_t *state, void *user_data) { td_status.lower = cur_dance(state); switch (td_status.lower) { case SINGLE_TAP: @@ -36,7 +36,7 @@ void td_lower_finished(qk_tap_dance_state_t *state, void *user_data) { layer_on(L_EDVORAKJP_LOWER); } -void td_lower_reset(qk_tap_dance_state_t *state, void *user_data) { +void td_lower_reset(tap_dance_state_t *state, void *user_data) { switch (td_status.lower) { case DOUBLE_TAP: unregister_code(KC_ESC); @@ -46,7 +46,7 @@ void td_lower_reset(qk_tap_dance_state_t *state, void *user_data) { td_status.lower = NONE; } -void td_raise_finished(qk_tap_dance_state_t *state, void *user_data) { +void td_raise_finished(tap_dance_state_t *state, void *user_data) { td_status.raise = cur_dance(state); switch (td_status.raise) { case DOUBLE_TAP: @@ -58,12 +58,12 @@ void td_raise_finished(qk_tap_dance_state_t *state, void *user_data) { layer_on(L_EDVORAKJP_RAISE); } -void td_raise_reset(qk_tap_dance_state_t *state, void *user_data) { +void td_raise_reset(tap_dance_state_t *state, void *user_data) { layer_off(L_EDVORAKJP_RAISE); td_status.raise = NONE; } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_EDVORAKJP_LOWER] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_lower_finished, td_lower_reset), [TD_EDVORAKJP_RAISE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_raise_finished, td_raise_reset), }; diff --git a/users/ericgebhart/extensions/keycodes.h b/users/ericgebhart/extensions/keycodes.h index a3c5d72a09..eafdfbad43 100755 --- a/users/ericgebhart/extensions/keycodes.h +++ b/users/ericgebhart/extensions/keycodes.h @@ -515,9 +515,9 @@ enum { int on_qwerty(void); #ifdef TAP_DANCES_ENABLE -int cur_dance (qk_tap_dance_state_t *state); +int cur_dance (tap_dance_state_t *state); //for the x tap dance. Put it here so it can be used in any keymap -void x_finished (qk_tap_dance_state_t *state, void *user_data); -void x_reset (qk_tap_dance_state_t *state, void *user_data); +void x_finished (tap_dance_state_t *state, void *user_data); +void x_reset (tap_dance_state_t *state, void *user_data); #endif diff --git a/users/ericgebhart/extensions/tap_dances.c b/users/ericgebhart/extensions/tap_dances.c index b292dab678..8b1fea15e8 100755 --- a/users/ericgebhart/extensions/tap_dances.c +++ b/users/ericgebhart/extensions/tap_dances.c @@ -22,7 +22,7 @@ #include "action_layer.h" #include "process_keycode/process_tap_dance.h" -void tap_dance_mouse_btns (qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_mouse_btns (tap_dance_state_t *state, void *user_data) { switch(state->count){ case 1: register_code(KC_BTN1); @@ -72,7 +72,7 @@ static void switch_default_layer(uint8_t layer) { } */ -void tap_dance_df_bepo_layers_switch (qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_df_bepo_layers_switch (tap_dance_state_t *state, void *user_data) { switch(state->count){ case 1: switch_default_layer(_DVORAK_BP); @@ -89,7 +89,7 @@ void tap_dance_df_bepo_layers_switch (qk_tap_dance_state_t *state, void *user_da reset_tap_dance(state); } -void tap_dance_layer_switch (qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_layer_switch (tap_dance_state_t *state, void *user_data) { switch(state->count){ case 1: if(on_qwerty()) @@ -115,7 +115,7 @@ void tap_dance_layer_switch (qk_tap_dance_state_t *state, void *user_data) { reset_tap_dance(state); } -void tap_dance_default_layer_switch (qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_default_layer_switch (tap_dance_state_t *state, void *user_data) { switch(state->count){ case 1: switch_default_layer(_DVORAK); @@ -178,7 +178,7 @@ void switch_default_layer_on_bepo(int count) { // a qwerty software keyboard and a bepo software keyboard. // if shifted, choose layers based on the other software keyboard, otherwise choose only // layers that work on the current software keyboard. -void tap_dance_default_os_layer_switch (qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_default_os_layer_switch (tap_dance_state_t *state, void *user_data) { //uint8_t shifted = (get_mods() & MOD_BIT(KC_LSFT|KC_RSFT)); bool shifted = ( keyboard_report->mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)) ); int qwerty = on_qwerty(); @@ -230,7 +230,7 @@ void tap_dance_default_os_layer_switch (qk_tap_dance_state_t *state, void *user_ * For the third point, there does exist the 'DOUBLE_SINGLE_TAP', however this is not fully tested * */ -int cur_dance (qk_tap_dance_state_t *state) { +int cur_dance (tap_dance_state_t *state) { if (state->count == 1) { if (state->interrupted || !state->pressed) return SINGLE_TAP; //key has not been interrupted, but they key is still held. Means you want to send a 'HOLD'. @@ -257,7 +257,7 @@ int cur_dance (qk_tap_dance_state_t *state) { } //Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { //Tap once for Esc, twice for Caps Lock [TD_ESC_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS), [TD_TAB_BKTAB] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, LSFT(KC_TAB)), diff --git a/users/ericgebhart/rules.mk b/users/ericgebhart/rules.mk index a6eddc2d87..8ec481c17a 100755 --- a/users/ericgebhart/rules.mk +++ b/users/ericgebhart/rules.mk @@ -45,7 +45,7 @@ VPATH += $(USER_PATH)/oled # SERIAL_DRIVER = usart # AUDIO_ENABLE = no # LTO_ENABLE = no -# CONVERT_TO_PROTON_C = yes +# CONVERT_TO=proton_c # so the keyboard's code doesn't add stuff we don't need. # when we use our own oled renders. diff --git a/users/greatwizard/tap_dances.c b/users/greatwizard/tap_dances.c index c6be995c45..ca2c33824f 100644 --- a/users/greatwizard/tap_dances.c +++ b/users/greatwizard/tap_dances.c @@ -15,7 +15,7 @@ */ #include "tap_dances.h" -uint8_t cur_dance(qk_tap_dance_state_t *state) { +uint8_t cur_dance(tap_dance_state_t *state) { if (state->count == 1) { if (state->interrupted || !state->pressed) return SINGLE_TAP; else return SINGLE_HOLD; @@ -36,7 +36,7 @@ static tap tap_state = { }; #ifdef TAP_DANCE_LALT_GIT -void lalt_finished(qk_tap_dance_state_t *state, void *user_data) { +void lalt_finished(tap_dance_state_t *state, void *user_data) { tap_state.state = cur_dance(state); switch (tap_state.state) { case SINGLE_HOLD: @@ -49,7 +49,7 @@ void lalt_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void lalt_reset(qk_tap_dance_state_t *state, void *user_data) { +void lalt_reset(tap_dance_state_t *state, void *user_data) { switch (tap_state.state) { case SINGLE_HOLD: unregister_mods(MOD_BIT(KC_LALT)); @@ -65,7 +65,7 @@ void lalt_reset(qk_tap_dance_state_t *state, void *user_data) { #ifdef TAP_DANCE_LSFT_CAPS # ifdef LAYERS_PROGRAMMER -void pg_lsft_finished(qk_tap_dance_state_t *state, void *user_data) { +void pg_lsft_finished(tap_dance_state_t *state, void *user_data) { tap_state.state = cur_dance(state); switch (tap_state.state) { case SINGLE_HOLD: @@ -80,7 +80,7 @@ void pg_lsft_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void pg_lsft_reset(qk_tap_dance_state_t *state, void *user_data) { +void pg_lsft_reset(tap_dance_state_t *state, void *user_data) { switch (tap_state.state) { case SINGLE_HOLD: unregister_mods(MOD_BIT(KC_LSFT)); @@ -92,7 +92,7 @@ void pg_lsft_reset(qk_tap_dance_state_t *state, void *user_data) { # endif #endif -qk_tap_dance_action_t tap_dance_actions[] = { +dance_action_t tap_dance_actions[] = { #ifdef TAP_DANCE_LALT_GIT [TD_LALT_GIT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, lalt_finished, lalt_reset), #endif diff --git a/users/greatwizard/tap_dances.h b/users/greatwizard/tap_dances.h index 944ae45553..19819125b5 100644 --- a/users/greatwizard/tap_dances.h +++ b/users/greatwizard/tap_dances.h @@ -45,18 +45,18 @@ enum { #endif }; -uint8_t cur_dance(qk_tap_dance_state_t *state); +uint8_t cur_dance(tap_dance_state_t *state); #ifdef TAP_DANCE_LALT_GIT -void lalt_finished(qk_tap_dance_state_t *state, void *user_data); -void lalt_reset(qk_tap_dance_state_t *state, void *user_data); +void lalt_finished(tap_dance_state_t *state, void *user_data); +void lalt_reset(tap_dance_state_t *state, void *user_data); # define TD_LALT TD(TD_LALT_GIT) #endif #ifdef TAP_DANCE_LSFT_CAPS # ifdef LAYERS_PROGRAMMER -void pg_lsft_finished(qk_tap_dance_state_t *state, void *user_data); -void pg_lsft_reset(qk_tap_dance_state_t *state, void *user_data); +void pg_lsft_finished(tap_dance_state_t *state, void *user_data); +void pg_lsft_reset(tap_dance_state_t *state, void *user_data); # endif #endif diff --git a/users/haervig/haervig.c b/users/haervig/haervig.c index d03b43edc1..7a0d1aaadf 100644 --- a/users/haervig/haervig.c +++ b/users/haervig/haervig.c @@ -164,21 +164,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { case CU_2: NORM_ALGR(DK_2, KC_NUHS) case CU_4: - if (record->event.pressed) { \ - timer_timeout(); \ - if (lshift || rshift) { \ - register_code(KC_LSFT); \ - register_code(KC_ALGR); \ - unregister_code(KC_3); \ - tap_code(KC_3); \ - unregister_code(KC_3); \ - } else { \ - unregister_code(KC_4); \ - tap_code(KC_4); \ - } \ - unregister_code(KC_ALGR); \ - unregister_code(KC_LSFT); \ - } \ + if (record->event.pressed) { + timer_timeout(); + if (lshift || rshift) { + register_code(KC_LSFT); + register_code(KC_ALGR); + unregister_code(KC_3); + tap_code(KC_3); + unregister_code(KC_3); + } else { + unregister_code(KC_4); + tap_code(KC_4); + } + unregister_code(KC_ALGR); + unregister_code(KC_LSFT); + } return false; case CU_6: SHIFT_NORM(DK_6, KC_RBRC) diff --git a/users/hvp/tap_dances.c b/users/hvp/tap_dances.c index 1269d5f272..51e227737a 100644 --- a/users/hvp/tap_dances.c +++ b/users/hvp/tap_dances.c @@ -2,7 +2,7 @@ // Tap dance function for enable swedish characters on first layer. Unregister to not let tap bleed over to next keypress. // Tap dance 1 -void dance_1_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_1_finished(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { tap_code(KC_SCLN); } else { @@ -10,7 +10,7 @@ void dance_1_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void dance_1_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_1_reset(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { unregister_code(KC_SCLN); } else { @@ -19,7 +19,7 @@ void dance_1_reset(qk_tap_dance_state_t *state, void *user_data) { } // Tap dance 2 -void dance_2_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_2_finished(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { tap_code(KC_QUOT); } else { @@ -27,7 +27,7 @@ void dance_2_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void dance_2_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_2_reset(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { unregister_code(KC_QUOT); } else { @@ -36,7 +36,7 @@ void dance_2_reset(qk_tap_dance_state_t *state, void *user_data) { } // Tap dance 3 -void dance_3_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_3_finished(tap_dance_state_t *state, void *user_data) { // if (state->count == 2) if (state->count == 2) { tap_code(KC_SLSH); @@ -45,7 +45,7 @@ void dance_3_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void dance_3_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_3_reset(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { unregister_code(KC_SLSH); } else { @@ -54,7 +54,7 @@ void dance_3_reset(qk_tap_dance_state_t *state, void *user_data) { } // Tap dance 4 -void dance_4_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_4_finished(tap_dance_state_t *state, void *user_data) { // if (state->count == 2) if (state->count == 2) { tap_code(KC_DOT); @@ -63,7 +63,7 @@ void dance_4_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void dance_4_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_4_reset(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { unregister_code(KC_DOT); } else { @@ -72,7 +72,7 @@ void dance_4_reset(qk_tap_dance_state_t *state, void *user_data) { } // Tap dance 5 -void dance_5_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_5_finished(tap_dance_state_t *state, void *user_data) { // if (state->count == 2) if (state->count == 2) { tap_code(KC_DOT); @@ -81,7 +81,7 @@ void dance_5_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void dance_5_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_5_reset(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { unregister_code(KC_DOT); } else { @@ -90,7 +90,7 @@ void dance_5_reset(qk_tap_dance_state_t *state, void *user_data) { } // Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { // simple tap dance [TD1] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_1_finished, dance_1_reset), diff --git a/users/imchipwood/imchipwood.c b/users/imchipwood/imchipwood.c index b019012a71..9d111c015b 100644 --- a/users/imchipwood/imchipwood.c +++ b/users/imchipwood/imchipwood.c @@ -18,7 +18,7 @@ static td_state_t td_state[3]; // determine the tapdance state to return -int cur_dance(qk_tap_dance_state_t *state) { +int cur_dance(tap_dance_state_t *state) { if (state->count == 1) { if (state->interrupted || !state->pressed) { return SINGLE_TAP; @@ -33,7 +33,7 @@ int cur_dance(qk_tap_dance_state_t *state) { } // any number higher than the maximum state value you return above } -void altf2_finished(qk_tap_dance_state_t *state, void *user_data) { +void altf2_finished(tap_dance_state_t *state, void *user_data) { td_state[0] = cur_dance(state); switch (td_state[0]) { case SINGLE_TAP: @@ -49,7 +49,7 @@ void altf2_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void altf2_reset(qk_tap_dance_state_t *state, void *user_data) { +void altf2_reset(tap_dance_state_t *state, void *user_data) { switch (td_state[0]) { case SINGLE_TAP: unregister_code(KC_F2); @@ -65,7 +65,7 @@ void altf2_reset(qk_tap_dance_state_t *state, void *user_data) { } -void ctlf5_finished(qk_tap_dance_state_t *state, void *user_data) { +void ctlf5_finished(tap_dance_state_t *state, void *user_data) { td_state[1] = cur_dance(state); switch (td_state[1]) { case SINGLE_TAP: @@ -81,7 +81,7 @@ void ctlf5_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void ctlf5_reset(qk_tap_dance_state_t *state, void *user_data) { +void ctlf5_reset(tap_dance_state_t *state, void *user_data) { switch (td_state[1]) { case SINGLE_TAP: unregister_code(KC_F5); @@ -96,7 +96,7 @@ void ctlf5_reset(qk_tap_dance_state_t *state, void *user_data) { } } -void altf7_finished(qk_tap_dance_state_t *state, void *user_data) { +void altf7_finished(tap_dance_state_t *state, void *user_data) { td_state[2] = cur_dance(state); switch (td_state[2]) { case SINGLE_TAP: @@ -112,7 +112,7 @@ void altf7_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void altf7_reset(qk_tap_dance_state_t *state, void *user_data) { +void altf7_reset(tap_dance_state_t *state, void *user_data) { switch (td_state[2]) { case SINGLE_TAP: unregister_code(KC_F7); @@ -127,7 +127,7 @@ void altf7_reset(qk_tap_dance_state_t *state, void *user_data) { } } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [ALT_F2] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, altf2_finished, altf2_reset), [CTL_F5] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctlf5_finished, ctlf5_reset), [ALT_F7] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, altf7_finished, altf7_reset), diff --git a/users/imchipwood/imchipwood.h b/users/imchipwood/imchipwood.h index 64726a862b..1e4bc3f744 100644 --- a/users/imchipwood/imchipwood.h +++ b/users/imchipwood/imchipwood.h @@ -41,11 +41,11 @@ enum td_keycodes { typedef enum { SINGLE_TAP, SINGLE_HOLD, DOUBLE_TAP } td_state_t; -int cur_dance(qk_tap_dance_state_t *state); - -void altf2_finished(qk_tap_dance_state_t *state, void *user_data); -void altf2_reset(qk_tap_dance_state_t *state, void *user_data); -void ctlf5_finished(qk_tap_dance_state_t *state, void *user_data); -void ctlf5_reset(qk_tap_dance_state_t *state, void *user_data); -void altf7_finished(qk_tap_dance_state_t *state, void *user_data); -void altf7_reset(qk_tap_dance_state_t *state, void *user_data); +int cur_dance(tap_dance_state_t *state); + +void altf2_finished(tap_dance_state_t *state, void *user_data); +void altf2_reset(tap_dance_state_t *state, void *user_data); +void ctlf5_finished(tap_dance_state_t *state, void *user_data); +void ctlf5_reset(tap_dance_state_t *state, void *user_data); +void altf7_finished(tap_dance_state_t *state, void *user_data); +void altf7_reset(tap_dance_state_t *state, void *user_data); diff --git a/users/jdelkins/jdelkins.c b/users/jdelkins/jdelkins.c index e7bef607c9..4f59e8901b 100644 --- a/users/jdelkins/jdelkins.c +++ b/users/jdelkins/jdelkins.c @@ -45,7 +45,7 @@ void send_secret_string(uint8_t n) { // To activate SINGLE_HOLD, you will need to hold for 200ms first. // This tap dance favors keys that are used frequently in typing like 'f' -int cur_dance(qk_tap_dance_state_t *state) { +int cur_dance(tap_dance_state_t *state) { if (state->count == 1) { // If count = 1, and it has been interrupted - it doesn't matter if it // is pressed or not: Send SINGLE_TAP @@ -84,7 +84,7 @@ int cur_dance(qk_tap_dance_state_t *state) { // This works well if you want this key to work as a "fast modifier". It favors // being held over being tapped. -int hold_cur_dance(qk_tap_dance_state_t *state) { +int hold_cur_dance(tap_dance_state_t *state) { if (state->count == 1) { if (state->interrupted) { if (!state->pressed) diff --git a/users/jdelkins/jdelkins.h b/users/jdelkins/jdelkins.h index ddec8dc4ae..7c9f2d021c 100644 --- a/users/jdelkins/jdelkins.h +++ b/users/jdelkins/jdelkins.h @@ -128,7 +128,7 @@ enum { TRIPLE_HOLD = 7 }; -int cur_dance(qk_tap_dance_state_t *state); // prefer tap -int hold_cur_dance(qk_tap_dance_state_t *state); // prefer hold +int cur_dance(tap_dance_state_t *state); // prefer tap +int hold_cur_dance(tap_dance_state_t *state); // prefer hold #endif // TAP_DANCE_ENABLE diff --git a/users/jonavin/jonavin.c b/users/jonavin/jonavin.c index f203bd77df..94173ac20e 100644 --- a/users/jonavin/jonavin.c +++ b/users/jonavin/jonavin.c @@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifdef TD_LSFT_CAPSLOCK_ENABLE // Tap once for shift, twice for Caps Lock but only if Win Key in not disabled - void dance_LSFT_finished(qk_tap_dance_state_t *state, void *user_data) { + void dance_LSFT_finished(tap_dance_state_t *state, void *user_data) { if (state->count == 1 || keymap_config.no_gui) { register_code16(KC_LSFT); } else { @@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. } } - void dance_LSFT_reset(qk_tap_dance_state_t *state, void *user_data) { + void dance_LSFT_reset(tap_dance_state_t *state, void *user_data) { if (state->count == 1 || keymap_config.no_gui) { unregister_code16(KC_LSFT); } else { @@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. } } - qk_tap_dance_action_t tap_dance_actions[] = { + tap_dance_action_t tap_dance_actions[] = { // Tap once for shift, twice for Caps Lock [TD_LSFT_CAPSLOCK] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS), [TD_LSFT_CAPS_WIN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LSFT_finished, dance_LSFT_reset), diff --git a/users/klackygears/klackygears.h b/users/klackygears/klackygears.h index 69f3279e2f..c131d46428 100644 --- a/users/klackygears/klackygears.h +++ b/users/klackygears/klackygears.h @@ -53,7 +53,7 @@ enum unicode_names { SNEK, }; -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { [BANG] = 0x203D, // ‽ [IRONY] = 0x2E2E, // ⸮ [SNEK] = 0x1F40D, // 🐍 diff --git a/users/klackygears/tap_dances.c b/users/klackygears/tap_dances.c index 9f706d2b7f..3749e0ed4e 100644 --- a/users/klackygears/tap_dances.c +++ b/users/klackygears/tap_dances.c @@ -1,7 +1,7 @@ #include "tap_dances.h" /* -void macroTogKey(qk_tap_dance_state_t *state, void *user_data) { +void macroTogKey(tap_dance_state_t *state, void *user_data) { keyrecord_t kr; if (state->count == 1) @@ -21,7 +21,7 @@ void macroTogKey(qk_tap_dance_state_t *state, void *user_data) { } } -void macroTogKey2(qk_tap_dance_state_t *state, void *user_data) { +void macroTogKey2(tap_dance_state_t *state, void *user_data) { keyrecord_t kr; if (state->count == 1) @@ -42,7 +42,7 @@ void macroTogKey2(qk_tap_dance_state_t *state, void *user_data) { } */ -void pstinsrt(qk_tap_dance_state_t *state, void *user_data) { +void pstinsrt(tap_dance_state_t *state, void *user_data) { if (state->count > 1) { register_code(KC_LALT); tap_code(KC_I); @@ -54,7 +54,7 @@ void pstinsrt(qk_tap_dance_state_t *state, void *user_data) { reset_tap_dance(state); } -void ccopy(qk_tap_dance_state_t *state, void *user_data) { +void ccopy(tap_dance_state_t *state, void *user_data) { if (state->count > 1) { tap_code16(C(KC_X)); @@ -65,7 +65,7 @@ void ccopy(qk_tap_dance_state_t *state, void *user_data) { reset_tap_dance(state); } -void pstspecial(qk_tap_dance_state_t *state, void *user_data) { +void pstspecial(tap_dance_state_t *state, void *user_data) { if (state->count > 1) { register_code(KC_LALT); tap_code(KC_E); @@ -82,7 +82,7 @@ void pstspecial(qk_tap_dance_state_t *state, void *user_data) { reset_tap_dance(state); } -void deldel(qk_tap_dance_state_t *state, void *user_data) { +void deldel(tap_dance_state_t *state, void *user_data) { if (state->count > 1) { register_code(KC_LALT); tap_code(KC_E); @@ -94,7 +94,7 @@ void deldel(qk_tap_dance_state_t *state, void *user_data) { reset_tap_dance(state); } -void findreplace(qk_tap_dance_state_t *state, void *user_data) { +void findreplace(tap_dance_state_t *state, void *user_data) { if (state->count > 1) { tap_code16(C(KC_H)); } else { @@ -103,7 +103,7 @@ void findreplace(qk_tap_dance_state_t *state, void *user_data) { reset_tap_dance(state); } -void cyclawin(qk_tap_dance_state_t *state, void *user_data) { +void cyclawin(tap_dance_state_t *state, void *user_data) { if (state->count > 1) { tap_code16(C(S(KC_F6))); } else { @@ -112,7 +112,7 @@ void cyclawin(qk_tap_dance_state_t *state, void *user_data) { reset_tap_dance(state); } -void SCRNSNP(qk_tap_dance_state_t *state, void *user_data) { +void SCRNSNP(tap_dance_state_t *state, void *user_data) { if (state->count > 1) { tap_code16(A(KC_PSCR)); } else { @@ -124,7 +124,7 @@ void SCRNSNP(qk_tap_dance_state_t *state, void *user_data) { reset_tap_dance(state); } -void mcccpy(qk_tap_dance_state_t *state, void *user_data) { +void mcccpy(tap_dance_state_t *state, void *user_data) { if (state->count > 1) { tap_code16(G(KC_X)); } else { @@ -133,7 +133,7 @@ void mcccpy(qk_tap_dance_state_t *state, void *user_data) { reset_tap_dance(state); } -void mcpstin(qk_tap_dance_state_t *state, void *user_data) { +void mcpstin(tap_dance_state_t *state, void *user_data) { if (state->count > 1) { tap_code16(G(KC_I)); } else { @@ -142,7 +142,7 @@ void mcpstin(qk_tap_dance_state_t *state, void *user_data) { reset_tap_dance(state); } -void enttab(qk_tap_dance_state_t *state, void *user_data) { +void enttab(tap_dance_state_t *state, void *user_data) { if (state->count > 1) { tap_code(KC_ENT); } else { @@ -151,7 +151,7 @@ void enttab(qk_tap_dance_state_t *state, void *user_data) { reset_tap_dance(state); } -void rgb_toggle(qk_tap_dance_state_t *state, void *user_data) { +void rgb_toggle(tap_dance_state_t *state, void *user_data) { #ifdef RGBLIGHT_ENABLE if (state->count == 1) { rgblight_step(); @@ -162,7 +162,7 @@ void rgb_toggle(qk_tap_dance_state_t *state, void *user_data) { } // Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_PSTI] = ACTION_TAP_DANCE_FN(pstinsrt), [TD_PTSP] = ACTION_TAP_DANCE_FN(pstspecial), [TD_FNDR] = ACTION_TAP_DANCE_FN(findreplace), diff --git a/users/konstantin/tap_dance.c b/users/konstantin/tap_dance.c index 57a29d98b8..38d00bf56c 100644 --- a/users/konstantin/tap_dance.c +++ b/users/konstantin/tap_dance.c @@ -19,11 +19,11 @@ #define ACTION_TAP_DANCE_DOUBLE_MOD(mod1, mod2) { \ .fn = { td_double_mod_each, NULL, td_double_mod_reset }, \ - .user_data = &(qk_tap_dance_pair_t){ mod1, mod2 }, \ + .user_data = &(tap_dance_pair_t){ mod1, mod2 }, \ } -void td_double_mod_each(qk_tap_dance_state_t *state, void *user_data) { - qk_tap_dance_pair_t *data = (qk_tap_dance_pair_t *)user_data; +void td_double_mod_each(tap_dance_state_t *state, void *user_data) { + tap_dance_pair_t *data = (tap_dance_pair_t *)user_data; // Single tap → mod1, double tap → mod2, triple tap etc. → mod1+mod2 if (state->count == 1 || state->count == 3) { @@ -36,8 +36,8 @@ void td_double_mod_each(qk_tap_dance_state_t *state, void *user_data) { state->weak_mods &= ~(MOD_BIT(data->kc1) | MOD_BIT(data->kc2)); } -void td_double_mod_reset(qk_tap_dance_state_t *state, void *user_data) { - qk_tap_dance_pair_t *data = (qk_tap_dance_pair_t *)user_data; +void td_double_mod_reset(tap_dance_state_t *state, void *user_data) { + tap_dance_pair_t *data = (tap_dance_pair_t *)user_data; if (state->count == 1 || state->count >= 3) { unregister_code(data->kc1); @@ -49,11 +49,11 @@ void td_double_mod_reset(qk_tap_dance_state_t *state, void *user_data) { #define ACTION_TAP_DANCE_MOD_LAYER(mod, layer) { \ .fn = { td_mod_layer_each, NULL, td_mod_layer_reset }, \ - .user_data = &(qk_tap_dance_dual_role_t){ mod, layer }, \ + .user_data = &(tap_dance_dual_role_t){ mod, layer }, \ } -void td_mod_layer_each(qk_tap_dance_state_t *state, void *user_data) { - qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data; +void td_mod_layer_each(tap_dance_state_t *state, void *user_data) { + tap_dance_dual_role_t *data = (tap_dance_dual_role_t *)user_data; // Single tap → mod, double tap → layer, triple tap etc. → mod+layer if (state->count == 1 || state->count == 3) { @@ -66,8 +66,8 @@ void td_mod_layer_each(qk_tap_dance_state_t *state, void *user_data) { } } -void td_mod_layer_reset(qk_tap_dance_state_t *state, void *user_data) { - qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data; +void td_mod_layer_reset(tap_dance_state_t *state, void *user_data) { + tap_dance_dual_role_t *data = (tap_dance_dual_role_t *)user_data; if (state->count == 1 || state->count >= 3) { unregister_code(data->kc); @@ -79,7 +79,7 @@ void td_mod_layer_reset(qk_tap_dance_state_t *state, void *user_data) { #define ACTION_TAP_DANCE_LAYER_MOD(layer, mod) { \ .fn = { td_layer_mod_each, NULL, td_layer_mod_reset }, \ - .user_data = &(qk_tap_dance_layer_mod_t){ layer, mod, 0, 0 }, \ + .user_data = &(tap_dance_layer_mod_t){ layer, mod, 0, 0 }, \ } typedef struct { @@ -87,10 +87,10 @@ typedef struct { uint16_t kc; bool layer_on; // Layer state when tap dance started bool started; -} qk_tap_dance_layer_mod_t; +} tap_dance_layer_mod_t; -void td_layer_mod_each(qk_tap_dance_state_t *state, void *user_data) { - qk_tap_dance_layer_mod_t *data = (qk_tap_dance_layer_mod_t *)user_data; +void td_layer_mod_each(tap_dance_state_t *state, void *user_data) { + tap_dance_layer_mod_t *data = (tap_dance_layer_mod_t *)user_data; if (!data->started) { data->layer_on = IS_LAYER_ON(data->layer); data->started = true; @@ -107,8 +107,8 @@ void td_layer_mod_each(qk_tap_dance_state_t *state, void *user_data) { } } -void td_layer_mod_reset(qk_tap_dance_state_t *state, void *user_data) { - qk_tap_dance_layer_mod_t *data = (qk_tap_dance_layer_mod_t *)user_data; +void td_layer_mod_reset(tap_dance_state_t *state, void *user_data) { + tap_dance_layer_mod_t *data = (tap_dance_layer_mod_t *)user_data; if ((state->count == 1 || state->count >= 3) && !data->layer_on) { layer_off(data->layer); @@ -120,7 +120,7 @@ void td_layer_mod_reset(qk_tap_dance_state_t *state, void *user_data) { data->started = false; } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_DST_A_R] = ACTION_TAP_DANCE_DOUBLE(DST_ADD, DST_REM), [TD_RAL_RGU] = ACTION_TAP_DANCE_DOUBLE_MOD(KC_RALT, KC_RGUI), diff --git a/users/konstantin/unicode.c b/users/konstantin/unicode.c index 4eae716afd..ed92b818b0 100644 --- a/users/konstantin/unicode.c +++ b/users/konstantin/unicode.c @@ -17,7 +17,7 @@ #include "unicode.h" #ifdef UNICODEMAP_ENABLE -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { FOREACH_UNICODE(UCM_ENTRY) }; #endif diff --git a/users/konstantin/unicode.h b/users/konstantin/unicode.h index 1a1eb60894..82caea7c9a 100644 --- a/users/konstantin/unicode.h +++ b/users/konstantin/unicode.h @@ -42,7 +42,7 @@ enum unicode_names { FOREACH_UNICODE(UCM_NAME) }; -extern const uint32_t PROGMEM unicode_map[]; +extern const uint32_t unicode_map[] PROGMEM; enum unicode_keycodes { FOREACH_UNICODE(UCM_KEYCODE) diff --git a/users/kuatsure/kuatsure.c b/users/kuatsure/kuatsure.c index 84afcc9623..bfdbdd4035 100644 --- a/users/kuatsure/kuatsure.c +++ b/users/kuatsure/kuatsure.c @@ -1,7 +1,7 @@ #include "kuatsure.h" #include "version.h" -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_LBRC] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LT), [TD_RBRC] = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_GT), [TD_SLSH] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_BSLS), diff --git a/users/kuchosauronad0/config.h b/users/kuchosauronad0/config.h index 9315f879ae..bc0fe67df8 100644 --- a/users/kuchosauronad0/config.h +++ b/users/kuchosauronad0/config.h @@ -70,7 +70,7 @@ // actually sends Ctrl-x. That's bad.) #define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define RETRO_TAPPING #ifndef TAPPING_TOGGLE diff --git a/users/kuchosauronad0/encoder.c b/users/kuchosauronad0/encoder.c index 9284a041c2..2578ddd873 100644 --- a/users/kuchosauronad0/encoder.c +++ b/users/kuchosauronad0/encoder.c @@ -57,8 +57,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) { } return true; } -const uint16_t PROGMEM encoder_actions[][9] = { \ +const uint16_t PROGMEM encoder_actions[][9] = { // None CTRL ALT SHIFT GUI CTRL+ALT CTRL+SHFT ALT+SHFT HYPER - { KC_PGDN, KC_DOWN, KC_AUDIO_VOL_UP, KC_END, KC_WWW_FORWARD, KC_AUDIO_MUTE, KC_RIGHT, LSFT(KC_TAB), KC_MEDIA_NEXT_TRACK}, \ + { KC_PGDN, KC_DOWN, KC_AUDIO_VOL_UP, KC_END, KC_WWW_FORWARD, KC_AUDIO_MUTE, KC_RIGHT, LSFT(KC_TAB), KC_MEDIA_NEXT_TRACK}, { KC_PGUP, KC_UP, KC_AUDIO_VOL_DOWN, KC_HOME, KC_WWW_BACK, KC_MEDIA_PLAY_PAUSE, KC_LEFT, KC_TAB, KC_MEDIA_PREV_TRACK} }; diff --git a/users/kuchosauronad0/leader.c b/users/kuchosauronad0/leader.c index ac2a6599a1..e8935ec401 100644 --- a/users/kuchosauronad0/leader.c +++ b/users/kuchosauronad0/leader.c @@ -93,7 +93,7 @@ void matrix_scan_user(void) { // matrix_scan_keymap(); } -void leader_start(void) { +void leader_start_user(void) { #ifdef RGBLIGHT_ENABLE rgblight_savebase(); rgblight_mode_noeeprom(1); @@ -101,7 +101,7 @@ void leader_start(void) { #endif } -void leader_end(void) { +void leader_end_user(void) { // pick color depending of success /fail // fade leader_start from 100 to 0 // fade new color from 0 to 100 to 0 diff --git a/users/kuchosauronad0/tap_dances.c b/users/kuchosauronad0/tap_dances.c index 7bdd3d3375..40d1c245e3 100644 --- a/users/kuchosauronad0/tap_dances.c +++ b/users/kuchosauronad0/tap_dances.c @@ -1,5 +1,5 @@ #include "tap_dances.h" -void td_parenthesis (qk_tap_dance_state_t *state, void *user_data) { +void td_parenthesis (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { // SEND_STRING ("\("); tap_code(KC_QUOT); @@ -23,7 +23,7 @@ void td_parenthesis (qk_tap_dance_state_t *state, void *user_data) { } } -void safe_reset(qk_tap_dance_state_t *state, void *user_data) { +void safe_reset(tap_dance_state_t *state, void *user_data) { if (state->count >= 3) { // Reset the keyboard if you tap the key more than three times reset_keyboard(); @@ -31,7 +31,7 @@ void safe_reset(qk_tap_dance_state_t *state, void *user_data) { } } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_RESET] = ACTION_TAP_DANCE_FN(safe_reset), [TD_NUM1] = ACTION_TAP_DANCE_DOUBLE(KC_1, KC_4), [TD_NUM2] = ACTION_TAP_DANCE_DOUBLE(KC_2, KC_5), diff --git a/users/kuchosauronad0/tap_dances.h b/users/kuchosauronad0/tap_dances.h index 19da8d69dc..818bbd7b93 100644 --- a/users/kuchosauronad0/tap_dances.h +++ b/users/kuchosauronad0/tap_dances.h @@ -23,4 +23,4 @@ enum { TD_ABR // single double angle brackets }; #endif // TAP_DANCE_ENABLE -void td_parenthesis (qk_tap_dance_state_t *state, void *user_data); +void td_parenthesis (tap_dance_state_t *state, void *user_data); diff --git a/users/kuchosauronad0/unicode.c b/users/kuchosauronad0/unicode.c index 8b312deb66..f0168cef9f 100644 --- a/users/kuchosauronad0/unicode.c +++ b/users/kuchosauronad0/unicode.c @@ -1,7 +1,7 @@ #include "unicode.h" //#ifdef UNICODEMAP_ENABLE -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { [BANG] = 0x0203D,// ‽ [IRONY] = 0x02E2E,// ⸮ [DEGREE] = 0x000B0,// ° diff --git a/users/losinggeneration/losinggeneration-keymap.h b/users/losinggeneration/losinggeneration-keymap.h index bb1c6cf697..14e25adecc 100644 --- a/users/losinggeneration/losinggeneration-keymap.h +++ b/users/losinggeneration/losinggeneration-keymap.h @@ -17,7 +17,7 @@ enum tap_dance_keycodes { Used to indicate a CTRL should be pressed on one press, or CTRL+ALT on a double tap */ -void dance_ctl_ctlalt_each(qk_tap_dance_state_t *state, void *user_data) { +void dance_ctl_ctlalt_each(tap_dance_state_t *state, void *user_data) { register_code(KC_LCTL); if(state->count > 1) { register_code(KC_LALT); @@ -25,7 +25,7 @@ void dance_ctl_ctlalt_each(qk_tap_dance_state_t *state, void *user_data) { } /* Used to release CTRL or the double tapped variant CTRL+ALT */ -void dance_ctl_ctlalt_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_ctl_ctlalt_reset(tap_dance_state_t *state, void *user_data) { unregister_code(KC_LCTL); if(state->count > 1) { unregister_code(KC_LALT); @@ -37,7 +37,7 @@ void dance_ctl_ctlalt_reset(qk_tap_dance_state_t *state, void *user_data) { Each is used to make sure ADJUST activates as soon as it's pressed the first time. */ -void dance_adj_each(qk_tap_dance_state_t *state, void *user_data) { +void dance_adj_each(tap_dance_state_t *state, void *user_data) { if(state->count == 1) { layer_on(_ADJUST); } else { @@ -46,7 +46,7 @@ void dance_adj_each(qk_tap_dance_state_t *state, void *user_data) { } /* Set NUMPAD layer on second tap and MOUSE layer on 3rd */ -void dance_adj_finish(qk_tap_dance_state_t *state, void *user_data) { +void dance_adj_finish(tap_dance_state_t *state, void *user_data) { switch(state->count) { case 1: break; case 2: @@ -62,7 +62,7 @@ void dance_adj_finish(qk_tap_dance_state_t *state, void *user_data) { } /* Turn off any layer that may have been tapped on */ -void dance_adj_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_adj_reset(tap_dance_state_t *state, void *user_data) { switch(state->count) { case 1: layer_off(_ADJUST); @@ -76,7 +76,7 @@ void dance_adj_reset(qk_tap_dance_state_t *state, void *user_data) { } } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_CTL_CTLALT] = ACTION_TAP_DANCE_FN_ADVANCED(dance_ctl_ctlalt_each, NULL, dance_ctl_ctlalt_reset), [TD_LGUI_RGUI] = ACTION_TAP_DANCE_DOUBLE(KC_LGUI, KC_RGUI), [TD_LALT_RALT] = ACTION_TAP_DANCE_DOUBLE(KC_LALT, KC_RALT), diff --git a/users/manna-harbour_miryoku/config.h b/users/manna-harbour_miryoku/config.h index 920003598e..429e08493d 100644 --- a/users/manna-harbour_miryoku/config.h +++ b/users/manna-harbour_miryoku/config.h @@ -15,7 +15,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 // Auto Shift #define NO_AUTO_SHIFT_ALPHA @@ -40,4 +40,3 @@ #define COMBO_TERM 200 #define EXTRA_SHORT_COMBOS #endif - diff --git a/users/manna-harbour_miryoku/manna-harbour_miryoku.c b/users/manna-harbour_miryoku/manna-harbour_miryoku.c index 5de5d9b129..389580759b 100644 --- a/users/manna-harbour_miryoku/manna-harbour_miryoku.c +++ b/users/manna-harbour_miryoku/manna-harbour_miryoku.c @@ -17,14 +17,14 @@ MIRYOKU_LAYER_LIST #undef MIRYOKU_X }; -void u_td_fn_boot(qk_tap_dance_state_t *state, void *user_data) { \ +void u_td_fn_boot(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { reset_keyboard(); } } #define MIRYOKU_X(LAYER, STRING) \ -void u_td_fn_U_##LAYER(qk_tap_dance_state_t *state, void *user_data) { \ +void u_td_fn_U_##LAYER(tap_dance_state_t *state, void *user_data) { \ if (state->count == 2) { \ default_layer_set((layer_state_t)1 << U_##LAYER); \ } \ @@ -32,7 +32,7 @@ void u_td_fn_U_##LAYER(qk_tap_dance_state_t *state, void *user_data) { \ MIRYOKU_LAYER_LIST #undef MIRYOKU_X -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [U_TD_BOOT] = ACTION_TAP_DANCE_FN(u_td_fn_boot), #define MIRYOKU_X(LAYER, STRING) [U_TD_U_##LAYER] = ACTION_TAP_DANCE_FN(u_td_fn_U_##LAYER), MIRYOKU_LAYER_LIST diff --git a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c index d36bf25b2c..17122f4a63 100644 --- a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c +++ b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c @@ -70,45 +70,45 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * --------------------------------------------------------------------------------- */ -[_QWERTY] = LAYOUT_local( \ -KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLD, KC_VOLU, TG(_CDH),\ -KC_GRAVE, KC_1, KC_2, KC_3 ,KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,\ -KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,KC_BSLS,\ -BKMV, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP,\ -KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT,KC_SLSH,KC_RSFT, KC_UP, KC_PGDN,\ +[_QWERTY] = LAYOUT_local( +KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLD, KC_VOLU, TG(_CDH), +KC_GRAVE, KC_1, KC_2, KC_3 ,KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, +KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,KC_BSLS, +BKMV, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, +KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT,KC_SLSH,KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, TT_SYM,KC_CDH, KC_LEFT, KC_DOWN, KC_RIGHT ), -[_CDH] = LAYOUT_local(\ -____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ -KC_GRAVE, KC_1, KC_2, KC_3 ,KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQL, KC_BSPC, KC_DEL,\ -KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, ____, ____, ____,\ -KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_2,\ -KC_LSFT, KC_Z, KC_X, KC_C, DHPASTE,KC_V, KC_K, KC_H, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, ____, KC_1,\ +[_CDH] = LAYOUT_local( +____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, +KC_GRAVE, KC_1, KC_2, KC_3 ,KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQL, KC_BSPC, KC_DEL, +KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, ____, ____, ____, +KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_2, +KC_LSFT, KC_Z, KC_X, KC_C, DHPASTE,KC_V, KC_K, KC_H, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, ____, KC_1, TG(_MOV), ____, ____ , ____, ____, ____, KC_QWERTY, ____, ____, ____ ), /* SYMBOL layer, several to chose from */ -[_SYM] = LAYOUT_wrapper(\ -____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ -____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ -____, _________________EXCEL_L1__________________, _________________EXCEL_R1__________________, ____, ____, ____,\ -____, _________________EXCEL_L2__________________, _________________EXCEL_R2__________________, KC_GRV, ____, ____,\ -____, _________________EXCEL_L3__________________, _________________EXCEL_R3__________________, B_SAVE, ____, ____,\ +[_SYM] = LAYOUT_wrapper( +____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, +____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, +____, _________________EXCEL_L1__________________, _________________EXCEL_R1__________________, ____, ____, ____, +____, _________________EXCEL_L2__________________, _________________EXCEL_R2__________________, KC_GRV, ____, ____, +____, _________________EXCEL_L3__________________, _________________EXCEL_R3__________________, B_SAVE, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____ ), #ifndef USE_BABLPASTE -[_MOV] = LAYOUT_local(\ -____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, ____ , \ -____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, \ -____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, KC_UP, XXXX, XXXX, XXXX, XXXX, XXXX, \ -____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, KC_LEFT, KC_DOWN, KC_RIGHT,XXXX, XXXX, XXXX, XXXX, \ -____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, \ +[_MOV] = LAYOUT_local( +____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, ____ , +____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, +____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, KC_UP, XXXX, XXXX, XXXX, XXXX, XXXX, +____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, KC_LEFT, KC_DOWN, KC_RIGHT,XXXX, XXXX, XXXX, XXXX, +____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, ____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX ) @@ -137,12 +137,12 @@ ____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX * `--------------------------------------------' `--------------------------------------------' */ -[_MOV] = LAYOUT_wrapper(\ - ____, ____________BABBLE_SWITCH_L________________, ____________BABBLE_SWITCH_R________________, XXXX, XXXX, XXXX, XXXX, ____, \ - ____, ____________BABBLE_MOV_LNUM________________, ____________BABBLE_MOV_RNUM________________, XXXX, XXXX, XXXX, XXXX,\ - ____, ____________BABBLE_MOV_L1__________________, ____________BABBLE_MOV_R1__________________, XXXX, XXXX, XXXX, \ - ____, ____________BABBLE_MOV_L2__________________, ____________BABBLE_MOV_R2__________________, XXXX, B_RUNAPP, XXXX,\ - ____, ____________BABBLE_MOV_L3__________________, ____________BABBLE_MOV_R2__________________, XXXX, XXXX, XXXX, \ +[_MOV] = LAYOUT_wrapper( + ____, ____________BABBLE_SWITCH_L________________, ____________BABBLE_SWITCH_R________________, XXXX, XXXX, XXXX, XXXX, ____, + ____, ____________BABBLE_MOV_LNUM________________, ____________BABBLE_MOV_RNUM________________, XXXX, XXXX, XXXX, XXXX, + ____, ____________BABBLE_MOV_L1__________________, ____________BABBLE_MOV_R1__________________, XXXX, XXXX, XXXX, + ____, ____________BABBLE_MOV_L2__________________, ____________BABBLE_MOV_R2__________________, XXXX, B_RUNAPP, XXXX, + ____, ____________BABBLE_MOV_L3__________________, ____________BABBLE_MOV_R2__________________, XXXX, XXXX, XXXX, ____, ____, ____, TG(_MOV), XXXX, XXXX, XXXX, XXXX, XXXX, XXXX ), // Move in a direction, deleting as we go, or do opposite of Mov layer action */ @@ -154,23 +154,23 @@ ____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX * 03 |Vsplit- | Cut | Copy | Paste |Paste | | App-- | ZoomOut| NewWin | ZoomIn | App+ | * `--------------------------------------------' `--------------------------------------------' */ -[_DMOV] = LAYOUT_wrapper(\ - ____, ____________BABBLE_SWITCH_L________________, ____________BABBLE_SWITCH_R________________, XXXX, XXXX, XXXX, ____, \ - ____, ____________BABBLE_MOV_LNUM________________, ____________BABBLE_MOV_RNUM________________, XXXX, XXXX, XXXX, XXXX, \ - ____, _________BABBLE_DELMOV_L1__________________ , _________BABBLE_DELMOV_R1__________________ , XXXX, XXXX, XXXX, \ - ____, _________BABBLE_DELMOV_L2__________________ , _________BABBLE_DELMOV_R2__________________ , XXXX, XXXX, XXXX,\ - ____, _________BABBLE_DELMOV_L3__________________ , _________BABBLE_DELMOV_R3__________________ , XXXX, XXXX, XXXX, \ +[_DMOV] = LAYOUT_wrapper( + ____, ____________BABBLE_SWITCH_L________________, ____________BABBLE_SWITCH_R________________, XXXX, XXXX, XXXX, ____, + ____, ____________BABBLE_MOV_LNUM________________, ____________BABBLE_MOV_RNUM________________, XXXX, XXXX, XXXX, XXXX, + ____, _________BABBLE_DELMOV_L1__________________ , _________BABBLE_DELMOV_R1__________________ , XXXX, XXXX, XXXX, + ____, _________BABBLE_DELMOV_L2__________________ , _________BABBLE_DELMOV_R2__________________ , XXXX, XXXX, XXXX, + ____, _________BABBLE_DELMOV_L3__________________ , _________BABBLE_DELMOV_R3__________________ , XXXX, XXXX, XXXX, ____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX ), #endif // Bablepaste /* -[_TRAN] = LAYOUT_local(\ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ - ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ +[_TRAN] = LAYOUT_local( + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, + ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____ ) */ diff --git a/users/mnil/mnil.c b/users/mnil/mnil.c index 00da6086ef..eb3b4a1c9d 100644 --- a/users/mnil/mnil.c +++ b/users/mnil/mnil.c @@ -54,7 +54,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { // Tap Dance // Determine the current tap dance state -int cur_dance(qk_tap_dance_state_t *state) { +int cur_dance(tap_dance_state_t *state) { if (state->count == 1) { if (state->interrupted || !state->pressed) return SINGLE_TAP; @@ -79,7 +79,7 @@ int cur_dance(qk_tap_dance_state_t *state) { static tap ae_tap_state = {.is_press_action = true, .state = 0}; -void ae_finished(qk_tap_dance_state_t *state, void *user_data) { +void ae_finished(tap_dance_state_t *state, void *user_data) { ae_tap_state.state = cur_dance(state); switch (ae_tap_state.state) { case SINGLE_TAP: @@ -95,7 +95,7 @@ void ae_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void ae_reset(qk_tap_dance_state_t *state, void *user_data) { +void ae_reset(tap_dance_state_t *state, void *user_data) { switch (ae_tap_state.state) { case SINGLE_TAP: unregister_code(KC_A); @@ -109,7 +109,7 @@ void ae_reset(qk_tap_dance_state_t *state, void *user_data) { static tap aa_tap_state = {.is_press_action = true, .state = 0}; -void aa_finished(qk_tap_dance_state_t *state, void *user_data) { +void aa_finished(tap_dance_state_t *state, void *user_data) { aa_tap_state.state = cur_dance(state); switch (aa_tap_state.state) { case SINGLE_TAP: @@ -126,7 +126,7 @@ void aa_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void aa_reset(qk_tap_dance_state_t *state, void *user_data) { +void aa_reset(tap_dance_state_t *state, void *user_data) { switch (aa_tap_state.state) { case SINGLE_TAP: unregister_code(SE_ODIA); @@ -139,7 +139,7 @@ void aa_reset(qk_tap_dance_state_t *state, void *user_data) { } // clang-format off -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [AAE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ae_finished, ae_reset), [OAA] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, aa_finished, aa_reset) }; diff --git a/users/muppetjones/config.h b/users/muppetjones/config.h index 3dd4d1b1b6..583567d4f3 100644 --- a/users/muppetjones/config.h +++ b/users/muppetjones/config.h @@ -34,7 +34,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 #endif diff --git a/users/muppetjones/features/dancelayers.c b/users/muppetjones/features/dancelayers.c index e7e5f2a6f2..3744950a4f 100644 --- a/users/muppetjones/features/dancelayers.c +++ b/users/muppetjones/features/dancelayers.c @@ -27,7 +27,7 @@ static td_tap_t lyr_tap_state = {.is_press_action = true, .state = TD_NONE}; * @param A tap dance state struct. * @return A struct. */ -td_state_t cur_dance(qk_tap_dance_state_t *state) { +td_state_t cur_dance(tap_dance_state_t *state) { switch (state->count) { case 1: if (!state->pressed) @@ -49,7 +49,7 @@ td_state_t cur_dance(qk_tap_dance_state_t *state) { } // Functions that control what our tap dance key does -__attribute__((weak)) void td_layer_finished(qk_tap_dance_state_t *state, void *user_data) { +__attribute__((weak)) void td_layer_finished(tap_dance_state_t *state, void *user_data) { lyr_tap_state.state = cur_dance(state); switch (lyr_tap_state.state) { case TD_1X_TAP: @@ -87,7 +87,7 @@ __attribute__((weak)) void td_layer_finished(qk_tap_dance_state_t *state, void * } } -__attribute__((weak)) void td_layer_reset(qk_tap_dance_state_t *state, void *user_data) { +__attribute__((weak)) void td_layer_reset(tap_dance_state_t *state, void *user_data) { // If the key was held down and now is released then switch off the layer if (lyr_tap_state.state == TD_1X_HOLD) { layer_off(_ADJUST); diff --git a/users/muppetjones/features/dancelayers.h b/users/muppetjones/features/dancelayers.h index 23defcca92..5f7440f48b 100644 --- a/users/muppetjones/features/dancelayers.h +++ b/users/muppetjones/features/dancelayers.h @@ -51,7 +51,7 @@ typedef struct { * @param A tap dance state struct. * @return A struct. */ -td_state_t cur_dance(qk_tap_dance_state_t *state); +td_state_t cur_dance(tap_dance_state_t *state); // Functions associated with individual tap dances @@ -63,7 +63,7 @@ td_state_t cur_dance(qk_tap_dance_state_t *state); * @param user_data Pointer to user data. * @return None. */ -void td_layer_finished(qk_tap_dance_state_t *state, void *user_data); +void td_layer_finished(tap_dance_state_t *state, void *user_data); /* @brief Reset tap dance actions. * @@ -73,10 +73,10 @@ void td_layer_finished(qk_tap_dance_state_t *state, void *user_data); * @param user_data Pointer to user data. * @return None. */ -void td_layer_reset(qk_tap_dance_state_t *state, void *user_data); +void td_layer_reset(tap_dance_state_t *state, void *user_data); /* Define tap dance actions. */ __attribute__((weak)) -qk_tap_dance_action_t tap_dance_actions[1] = {[TD_LAYERS] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, td_layer_finished, td_layer_reset, 275)}; +tap_dance_action_t tap_dance_actions[1] = {[TD_LAYERS] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, td_layer_finished, td_layer_reset, 275)}; #endif diff --git a/users/ninjonas/tap_dances.c b/users/ninjonas/tap_dances.c index 3e4cec9133..c03433e2d6 100644 --- a/users/ninjonas/tap_dances.c +++ b/users/ninjonas/tap_dances.c @@ -1,7 +1,7 @@ #include "ninjonas.h" //// BEGIN: Advanced Tap Dances -int cur_dance (qk_tap_dance_state_t *state) { +int cur_dance (tap_dance_state_t *state) { if (state->count == 1) { if (state->interrupted || !state->pressed) return SINGLE_TAP; //key has not been interrupted, but they key is still held. Means you want to send a 'HOLD'. @@ -34,7 +34,7 @@ static tap copy_paste_app_tap_state = { .state = 0 }; -void copy_paste_app_finished (qk_tap_dance_state_t *state, void *user_data) { +void copy_paste_app_finished (tap_dance_state_t *state, void *user_data) { copy_paste_app_tap_state.state = cur_dance(state); switch (copy_paste_app_tap_state.state) { case SINGLE_TAP: @@ -56,7 +56,7 @@ void copy_paste_app_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void copy_paste_app_reset (qk_tap_dance_state_t *state, void *user_data) { +void copy_paste_app_reset (tap_dance_state_t *state, void *user_data) { copy_paste_app_tap_state.state = 0; } // END: Copy, Paste, Apps @@ -67,7 +67,7 @@ static tap y_numpad_tap_state = { .state = 0 }; -void y_numpad_finished (qk_tap_dance_state_t *state, void *user_data) { +void y_numpad_finished (tap_dance_state_t *state, void *user_data) { y_numpad_tap_state.state = cur_dance(state); switch (y_numpad_tap_state.state) { case SINGLE_TAP: @@ -86,7 +86,7 @@ void y_numpad_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void y_numpad_reset (qk_tap_dance_state_t *state, void *user_data) { +void y_numpad_reset (tap_dance_state_t *state, void *user_data) { switch (y_numpad_tap_state.state) { case SINGLE_HOLD: unregister_code16(KC_Y); @@ -98,7 +98,7 @@ void y_numpad_reset (qk_tap_dance_state_t *state, void *user_data) { //// END: Advanced Tap Dances -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_ESC_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS), [TD_LBRC_BACK] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, LGUI(KC_LBRC)), [TD_RBRC_FWD] = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, LGUI(KC_RBRC)), diff --git a/users/nstickney/nstickney.c b/users/nstickney/nstickney.c index 94453ec340..b056e1cbaf 100644 --- a/users/nstickney/nstickney.c +++ b/users/nstickney/nstickney.c @@ -16,7 +16,7 @@ #include "nstickney.h" // Tap Dancing -void dance_layer(qk_tap_dance_state_t *state, void *user_data) { +void dance_layer(tap_dance_state_t *state, void *user_data) { switch (state->count) { case 1: tap_code(KC_APP); @@ -32,7 +32,7 @@ void dance_layer(qk_tap_dance_state_t *state, void *user_data) { } }; -void dance_lock_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_lock_finished(tap_dance_state_t *state, void *user_data) { switch (state->count) { case 1: register_code(KC_LGUI); @@ -51,7 +51,7 @@ void dance_lock_finished(qk_tap_dance_state_t *state, void *user_data) { } }; -void dance_lock_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_lock_reset(tap_dance_state_t *state, void *user_data) { switch (state->count) { case 1: unregister_code(KC_LGUI); @@ -70,7 +70,7 @@ void dance_lock_reset(qk_tap_dance_state_t *state, void *user_data) { } }; -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [LOCKS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_lock_finished, dance_lock_reset), [LAYERS] = ACTION_TAP_DANCE_FN(dance_layer) }; diff --git a/users/nstickney/unicodemap.h b/users/nstickney/unicodemap.h index 3b7d9e3053..4360504ecb 100644 --- a/users/nstickney/unicodemap.h +++ b/users/nstickney/unicodemap.h @@ -37,7 +37,7 @@ enum { CPL }; -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { [IEX] = 0xA1, // ¡ [SS2] = 0xB2, // ² [SS3] = 0xB3, // ³ diff --git a/users/pvinis/pvinis.c b/users/pvinis/pvinis.c index 96b01bb461..f3263f9bd5 100644 --- a/users/pvinis/pvinis.c +++ b/users/pvinis/pvinis.c @@ -75,7 +75,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } #ifdef TAP_DANCE_ENABLE -qk_tap_dance_action_t tap_dance_actions[] = {}; +tap_dance_action_t tap_dance_actions[] = {}; #endif void keyboard_post_init_rgb_light(void) { diff --git a/users/replicaJunction/features/.gitignore b/users/replicaJunction/features/.gitignore deleted file mode 100644 index 9b590ee802..0000000000 --- a/users/replicaJunction/features/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Do not include the secrets definitions -secret_definitions.h diff --git a/users/replicaJunction/features/caps_word.c b/users/replicaJunction/features/caps_word.c deleted file mode 100644 index 536da81ec7..0000000000 --- a/users/replicaJunction/features/caps_word.c +++ /dev/null @@ -1,105 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "caps_word.h" - -static bool is_caps_word_on = false; - -bool is_caps_word_enabled(void) { - return is_caps_word_on; -} - -void enable_caps_word(void) { - if (is_caps_word_on) return; - is_caps_word_on = true; - tap_code(KC_CAPS); -} - -void disable_caps_word(void) { - if (!is_caps_word_on) return; - is_caps_word_on = false; - tap_code(KC_CAPS); -} - -void toggle_caps_word(void) { - if (is_caps_word_on) { - disable_caps_word(); - } - else { - enable_caps_word(); - } -} - -bool should_terminate_caps_word(uint16_t keycode, const keyrecord_t *record) { - switch (keycode) { - // Keycodes which should not disable caps word mode - case KC_A ... KC_Z: - case KC_1 ... KC_0: - case KC_MINS: - case KC_UNDS: - case KC_BSPC: - return false; - - default: - if (record->event.pressed) { - return true; - } - return false; - } - - // Should be unreachable - return false; -} - - -bool process_record_caps_word(uint16_t keycode, const keyrecord_t *record) { - // Nothing in this function acts on key release - if (!record->event.pressed) { - return true; - } - - // Handle the custom keycodes that go with this feature - if (keycode == CAPWORD) { - enable_caps_word(); - return false; - } - - // If the behavior isn't enabled and the keypress isn't a keycode to - // toggle the behavior, allow QMK to handle the keypress as usual - if (!is_caps_word_on) { - return true; - } - - // Get the base keycode of a mod or layer tap key - switch (keycode) { - case QK_MOD_TAP ... QK_MOD_TAP_MAX: - case QK_LAYER_TAP ... QK_LAYER_TAP_MAX: - case QK_TAP_DANCE ... QK_TAP_DANCE_MAX: - // Earlier return if this has not been considered tapped yet - if (record->tap.count == 0) - return true; - keycode = keycode & 0xFF; - break; - default: - break; - } - - if (should_terminate_caps_word(keycode, record)) { - disable_caps_word(); - } - - return true; -} diff --git a/users/replicaJunction/features/caps_word.h b/users/replicaJunction/features/caps_word.h deleted file mode 100644 index 4182ce5829..0000000000 --- a/users/replicaJunction/features/caps_word.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once -#include QMK_KEYBOARD_H -#include "rj_keycodes.h" - -bool is_caps_word_enabled(void); -void enable_caps_word(void); -void disable_caps_word(void); -void toggle_caps_word(void); - -bool process_record_caps_word(uint16_t keycode, const keyrecord_t *record); diff --git a/users/replicaJunction/features/mouse_jiggle.c b/users/replicaJunction/features/mouse_jiggle.c deleted file mode 100644 index b2c451d33e..0000000000 --- a/users/replicaJunction/features/mouse_jiggle.c +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "mouse_jiggle.h" - -bool is_mouse_jiggle_active = false; - -void matrix_scan_mouse_jiggle(void) { - if (is_mouse_jiggle_active) { - tap_code(KC_MS_UP); - tap_code(KC_MS_DOWN); - } -} - -bool process_record_mouse_jiggle(uint16_t keycode, const keyrecord_t *record) { - if (!record->event.pressed) { - return true; - } - - if (is_mouse_jiggle_active) { - // If active, quit whenever another key is pressed - is_mouse_jiggle_active = false; - return true; - } - - if (keycode != MS_JIGL) { - return true; - } - - is_mouse_jiggle_active = true; - SEND_STRING("Mouse jiggler enabled"); - return false; -} diff --git a/users/replicaJunction/features/mouse_jiggle.h b/users/replicaJunction/features/mouse_jiggle.h deleted file mode 100644 index ba2c6e7570..0000000000 --- a/users/replicaJunction/features/mouse_jiggle.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once -#include QMK_KEYBOARD_H -#include "rj_keycodes.h" - -void matrix_scan_mouse_jiggle(void); - -bool process_record_mouse_jiggle(uint16_t keycode, const keyrecord_t *record); diff --git a/users/replicaJunction/features/num_word.c b/users/replicaJunction/features/num_word.c deleted file mode 100644 index 4cca5c19ae..0000000000 --- a/users/replicaJunction/features/num_word.c +++ /dev/null @@ -1,129 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "num_word.h" - -static uint16_t num_word_timer = 0; -static bool is_num_word_on = false; - -bool is_num_word_enabled(void) { - return is_num_word_on; -} - -void enable_num_word(void) { - if (is_num_word_on) return; - is_num_word_on = true; - layer_on(L_NUMBERS); -} - -void disable_num_word(void) { - if (!is_num_word_on) return; - is_num_word_on = false; - layer_off(L_NUMBERS); -} - -void toggle_num_word(void) { - if (is_num_word_on) { - disable_num_word(); - } - else { - enable_num_word(); - } -} - -bool should_terminate_num_word(uint16_t keycode, const keyrecord_t *record) { - switch (keycode) { - // Keycodes which should not disable num word mode. - // We could probably be more brief with these definitions by using - // a couple more ranges, but I believe "explicit is better than - // implicit" - case KC_1 ... KC_0: - case KC_EQL: - case KC_SCLN: - case KC_MINS: - case KC_DOT: - - // Numpad keycodes - case KC_P1 ... KC_P0: - case KC_PSLS ... KC_PPLS: - case KC_PDOT: - - // Misc - case KC_UNDS: - case KC_BSPC: - return false; - - default: - if (record->event.pressed) { - return true; - } - return false; - } - - // Should be unreachable - return false; -} - - -bool process_record_num_word(uint16_t keycode, const keyrecord_t *record) { - // Handle the custom keycodes that go with this feature - if (keycode == NUMWORD) { - if (record->event.pressed) { - enable_num_word(); - num_word_timer = timer_read(); - return false; - } - else { - if (timer_elapsed(num_word_timer) > TAPPING_TERM) { - // If the user held the key longer than TAPPING_TERM, - // consider it a hold, and disable the behavior on - // key release. - disable_num_word(); - return false; - } - } - } - - // Other than the custom keycodes, nothing else in this feature will - // activate if the behavior is not on, so allow QMK to handle the - // event as usual - if (!is_num_word_on) return true; - - // Nothing else acts on key release, either - if (!record->event.pressed) { - return true; - } - - // Get the base keycode of a mod or layer tap key - switch (keycode) { - case QK_MOD_TAP ... QK_MOD_TAP_MAX: - case QK_LAYER_TAP ... QK_LAYER_TAP_MAX: - case QK_TAP_DANCE ... QK_TAP_DANCE_MAX: - // Earlier return if this has not been considered tapped yet - if (record->tap.count == 0) - return true; - keycode = keycode & 0xFF; - break; - default: - break; - } - - if (should_terminate_num_word(keycode, record)) { - disable_num_word(); - } - - return true; -} diff --git a/users/replicaJunction/features/num_word.h b/users/replicaJunction/features/num_word.h deleted file mode 100644 index 194c4e2e0d..0000000000 --- a/users/replicaJunction/features/num_word.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once -#include QMK_KEYBOARD_H -#include "rj_keycodes.h" -#include "rj_layers.h" - -bool is_num_word_enabled(void); -void enable_num_word(void); -void disable_num_word(void); -void toggle_num_word(void); - -bool process_record_num_word(uint16_t keycode, const keyrecord_t *record); diff --git a/users/replicaJunction/features/secrets.c b/users/replicaJunction/features/secrets.c deleted file mode 100644 index 3e1ea283dc..0000000000 --- a/users/replicaJunction/features/secrets.c +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * 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/>. - */ - -// Before you can compile with this feature, you'll need to manually -// create a file in this directory called "secret_definitions.h" -// containing the data to be added. -// -// Example implementation: -// -// #pragma once -// static const char * const secrets[] = { -// "secret1", -// "secret2", -// "secret3", -// "secret4" -// } - -#include QMK_KEYBOARD_H -#include "replicaJunction.h" -#include "secrets.h" -#include "secret_definitions.h" - -#ifndef MACRO_TIMER -# define MACRO_TIMER 5 -#endif - -bool process_record_secrets(uint16_t keycode, const keyrecord_t *record) { - switch (keycode) { - case K_SECR1 ... K_SECR4: // Secrets! Externally defined strings, not stored in repo - if (!record->event.pressed) { - clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); - send_string_with_delay(secrets[keycode - K_SECR1], MACRO_TIMER); - } - return false; - } - - return true; -} diff --git a/users/replicaJunction/features/secrets.h b/users/replicaJunction/features/secrets.h deleted file mode 100644 index ef43962272..0000000000 --- a/users/replicaJunction/features/secrets.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once -#include QMK_KEYBOARD_H - -// NOTE: In some implementations of the "secrets" functionality, the -// secrets.h file is the file that actually contains secret text. -// -// This is not the case in my implementation. That file is called -// "secret_definitions.h", and it's in a local .gitignore file so it -// does not get committed. -// -// The inclusion of this file is not an error, and there is no sensitive -// text here. - -bool process_record_secrets(uint16_t keycode, const keyrecord_t *record); diff --git a/users/replicaJunction/features/super_alt_tab.c b/users/replicaJunction/features/super_alt_tab.c deleted file mode 100644 index 9759898c87..0000000000 --- a/users/replicaJunction/features/super_alt_tab.c +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "super_alt_tab.h" - -// https://docs.qmk.fm/#/feature_macros?id=super-alt%E2%86%AFtab - -bool is_alt_tab_active = false; -uint16_t alt_tab_timer = 0; - -void matrix_scan_super_alt_tab(void) { - if (is_alt_tab_active) { - if (timer_elapsed(alt_tab_timer) > USER_SUPER_ALT_TAB_TIMEOUT) { - unregister_code(KC_LALT); - is_alt_tab_active = false; - } - } -} - - -bool process_record_super_alt_tab(uint16_t keycode, const keyrecord_t *record) { - if (keycode != SALTTAB) { - return true; - } - - if (record->event.pressed) { - if (!is_alt_tab_active) { - is_alt_tab_active = true; - register_code(KC_LALT); - } - alt_tab_timer = timer_read(); - register_code(KC_TAB); - } - else { - unregister_code(KC_TAB); - } - - return false; -} diff --git a/users/replicaJunction/features/super_alt_tab.h b/users/replicaJunction/features/super_alt_tab.h deleted file mode 100644 index 8bdf2bc22e..0000000000 --- a/users/replicaJunction/features/super_alt_tab.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once -#include QMK_KEYBOARD_H -#include "rj_keycodes.h" - -#ifndef USER_SUPER_ALT_TAB_TIMEOUT -# define USER_SUPER_ALT_TAB_TIMEOUT 500 -#endif - -void matrix_scan_super_alt_tab(void); - -bool process_record_super_alt_tab(uint16_t keycode, const keyrecord_t *record); diff --git a/users/replicaJunction/keycode_aliases.h b/users/replicaJunction/keycode_aliases.h deleted file mode 100644 index b1006a863c..0000000000 --- a/users/replicaJunction/keycode_aliases.h +++ /dev/null @@ -1,85 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include QMK_KEYBOARD_H - -// Transparent, but indicates that this key must be blocked (for example, a layer shift key) -#define ooooooo KC_TRNS - - -#define SFT_TAB LSFT(KC_TAB) -#define WIN_TAB LGUI(KC_TAB) -#define WIN_L LGUI(KC_L) -#define WIN_V LGUI(KC_V) -#define ALT_F4 LALT(KC_F4) -#define CTL_DEL LCTL_T(KC_DEL) -#define CTL_ESC CTL_T(KC_ESC) -#define ALT_ENT ALT_T(KC_ENT) -#define ALT_TAB ALT_T(KC_TAB) - -#define OSM_LSF OSM(MOD_LSFT) -#define OSM_RSF OSM(MOD_RSFT) - -// OS shortcuts (Windows) -#define OS_COPY LCTL(KC_C) -#define OS_PAST LCTL(KC_V) -#define OS_CUT LCTL(KC_X) -#define OS_UNDO LCTL(KC_Z) -#define OS_SALL LCTL(KC_A) -#define OS_FIND LCTL(KC_F) - - -// Home row modifiers -#define GUI_A LGUI_T(KC_A) -#define ALT_R LALT_T(KC_R) -#define SFT_S LSFT_T(KC_S) -#define CRT_T LCTL_T(KC_T) // we can't call this CTL_T because that name is taken! - -#define CRT_N RCTL_T(KC_N) -#define SFT_E RSFT_T(KC_E) -#define ALT_I RALT_T(KC_I) -#define GUI_O RGUI_T(KC_O) - - -// Mouse keys -#define M_UP KC_MS_UP -#define M_DOWN KC_MS_DOWN -#define M_LEFT KC_MS_LEFT -#define M_RIGHT KC_MS_RIGHT -#define M_LCLIK KC_MS_BTN1 -#define M_RCLIK KC_MS_BTN2 -#define M_MCLIK KC_MS_BTN3 -#define M_WHLUP KC_WH_U -#define M_WHLDN KC_WH_D - - -// Windows 10 shortcuts: change desktop to the left/right -#define DESKLFT LCTL(LGUI(KC_LEFT)) -#define DESKRGT LCTL(LGUI(KC_RGHT)) - - -// Application-specific shortcuts - -// Search: defined in Everything Search Engine as the keypress to show/hide the window -#define SEARCH HYPR(KC_S) - -// Microsoft PowerToys hotkeys -// https://github.com/microsoft/PowerToys -#define PTYRUN LALT(KC_SPC) // PowerToys Run -#define PTYZONE LGUI(KC_GRV) // PowerToys FancyZones -#define PTYCOLR LGUI(LSFT(KC_C)) // PowerToys ColorPicker diff --git a/users/replicaJunction/matrix_scan.c b/users/replicaJunction/matrix_scan.c deleted file mode 100644 index 969799550a..0000000000 --- a/users/replicaJunction/matrix_scan.c +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include QMK_KEYBOARD_H -#include "replicaJunction.h" - -__attribute__ ((weak)) -void matrix_scan_user_kb(void) { } - -// Runs on every matrix scan. Be careful what goes here - you can really impact the -// responsiveness of your keyboard if you add too much in this function. -void matrix_scan_user(void) { -#ifdef USER_MOUSE_JIGGLE_ENABLE - matrix_scan_mouse_jiggle(); -#endif - -#ifdef USER_SUPER_ALT_TAB_ENABLE - matrix_scan_super_alt_tab(); -#endif - - matrix_scan_user_kb(); -} diff --git a/users/replicaJunction/process_records.c b/users/replicaJunction/process_records.c deleted file mode 100644 index abce215261..0000000000 --- a/users/replicaJunction/process_records.c +++ /dev/null @@ -1,149 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include QMK_KEYBOARD_H -#include "process_records.h" - -uint8_t mod_state; - - -__attribute__ ((weak)) -bool process_record_user_kb(uint16_t keycode, keyrecord_t *record) { - return true; -} - -// Runs for each key down or up event. -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - // Returning true here will cause QMK to continue handling the key normally. - // Returning false indicates that we've handled everything the keycode should do, and QMK - // should not continue handling the keypress. - // - // NOTE: There is also a process_record_kb function that can be defined in the keyboard- - // specific code. This allows the keyboard to have its own process_record function. - // This is supposed to be "higher" than the user function, meaning the kb function - // is shared for all keymaps for the keyboard. - // - // For this reason, I add my own function, called process_record_user_kb, and at the end - // of this function, I defer to that one if it exists. - // return process_record_user(keycode, record); - - - // Custom keycode / function handling, based on the core function - // process_record_quantum - // https://github.com/qmk/qmk_firmware/blob/master/quantum/quantum.c - - if (!( -#ifdef USER_CAPS_WORD_ENABLE - process_record_caps_word(keycode, record) && -#endif -#ifdef USER_MOUSE_JIGGLE_ENABLE - process_record_mouse_jiggle(keycode, record) && -#endif -#ifdef USER_NUM_WORD_ENABLE - process_record_num_word(keycode, record) && -#endif -#ifdef USER_SECRETS_ENABLE - process_record_secrets(keycode, record) && -#endif -#ifdef USER_SUPER_ALT_TAB_ENABLE - process_record_super_alt_tab(keycode, record) && -#endif - true)) { - return false; - } - - - // Miscellaneous keycode handling - mod_state = get_mods(); - - switch(keycode) - { - case QK_MAKE: { - if (record->event.pressed) - SEND_STRING("qmk compile --keyboard " QMK_KEYBOARD " --keymap " QMK_KEYMAP); - return false; - } - case QK_FLSH: { - if (record->event.pressed) { - SEND_STRING("qmk flash --keyboard " QMK_KEYBOARD " --keymap " QMK_KEYMAP); - } - return false; - } - case QK_VERS: { - if (record->event.pressed) { - SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE); - } - return false; - } - case PRG_EQ: { - if (record->event.pressed) { - SEND_STRING("=="); - } - return false; - } - case PRG_NE: { - if (record->event.pressed) { - SEND_STRING("!="); - } - return false; - } - case PRG_GEQ: { - if (record->event.pressed) { - SEND_STRING(">="); - } - return false; - } - case PRG_LEQ: { - if (record->event.pressed) { - SEND_STRING("<="); - } - return false; - } - case PRG_ARR: { - if (record->event.pressed) { - SEND_STRING("=>"); - } - return false; - } - - case PS_ITEM: { - if (record->event.pressed) { - SEND_STRING("$_"); - } - return false; - } - case FS_PIPE: { - if (record->event.pressed) { - SEND_STRING("|>"); - } - return false; - } - case FS_ARR: { - if (record->event.pressed) { - SEND_STRING("->"); - } - return false; - } - case SHEBANG: { - if (record->event.pressed) { - SEND_STRING("#!"); - } - return false; - } - } - - return process_record_user_kb(keycode, record); -} diff --git a/users/replicaJunction/process_records.h b/users/replicaJunction/process_records.h deleted file mode 100644 index 224bc6f4ff..0000000000 --- a/users/replicaJunction/process_records.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once -#include QMK_KEYBOARD_H -#include "replicaJunction.h" - -bool process_record_user_kb(uint16_t keycode, keyrecord_t *record); diff --git a/users/replicaJunction/readme.md b/users/replicaJunction/readme.md deleted file mode 100644 index 9d728f9029..0000000000 --- a/users/replicaJunction/readme.md +++ /dev/null @@ -1,93 +0,0 @@ -replicaJunction QMK Userspace -============================= - -# Overview -I alternate between a few keyboards, one of which is the 44-key Keyboardio Atreus. Small keyboards require a liberal use of layers. Even though larger keyboards don't rely on layers as heavily, my muscle memory adapted to my Atreus layout, so I've ended up building several of those features in my keymaps for larger boards as well. - -The result, I believe, is a good compromise between ergonomics and ease of use. - -The code in this userspace is designed to be very modular. I use a few different keyboards, and I'm constantly tweaking one or another, so I want the ability to add and remove features from the firmware at compile-time. While my endgame goal is to get all the layouts to be compatible, in practice, it's been years and I'm still not to that point... - -Modular code also means that it should be easy to identify and adapt specific pieces to your own firmware. - -## Keyboards and Keymaps - -The following keyboards use the files in this userspace: - -* [Atreus](../../keyboards/atreus/keymaps/replicaJunction/readme.md) (42-key) -* [Ergodox](../../layouts/community/ergodox/replicaJunction/readme.md) -* [Keyboardio Atreus](../../keyboards/keyboardio/atreus/keymaps/replicaJunction/readme.md) (44-key) -* [XD75](../../keyboards/xd75/keymaps/replicaJunction/readme.md) - -# Features - -* **Secrets**, as [explained by Drashna](https://github.com/qmk/qmk_firmware/blob/master/users/drashna/readme_secrets.md) -* **CAPSWORD** and **NUMWORD** -* Mouse jiggler -* Super alt-tab - -## Secrets -My implementation of the "secrets" concept is very similar to Drashna's, but I've chosen to allow most of the supporting code to be committed to the repo. The only thing missing is a file called `secret_definitions.h`, which contains the actual text contained in those macros. - -To use my implementation, create a file of that name in the same directory. Make sure you've got a `.gitignore` file in place, and add these contents to the definitions file: - -```c -#pragma once -static const char * const secrets[] = { - "secret1", - "secret2", - "secret3", - "secret4" -} -``` - -Change the quoted text to the text you'd like and you're golden. If you need more (or fewer) items, you'll probably need to adjust the code in `secrets.c` as well, since it looks for up to four items in a switch case. - -## CAPSWORD and NUMWORD -The concept here is simple: more often than you'd think, you need to type a single word in ALL CAPS. An easy example for me, as a programmer, is a constant value; in most programming languages, constants are typed in all caps by convention. - -You typically have a few choices, but each one comes with a drawback. Here are the options I'm aware of: - -* Use proper typing technique and alternate which hand holds Shift for each keypress - * This can often end up requiring you to switch / re-press Shift again and again, making this a tedious process -* Hold a single Shift key down - * This can lead to uncomfortable finger gymnastics -* Hit the Caps Lock key, then hit it again when you're done - * Requires you to remember to hit it again, meaning a higher cognitive load - * In some layouts for smaller keyboards, Caps Lock is not easily accessible (sometimes not mapped at all) - -The solution to this problem is CAPSWORD. When enabled, it activates Caps Lock and begins running an additional callback on each keypress. If the keypress is an alphanumeric key or one of a specific few symbols (such as the underscore), nothing happens. Otherwise, before processing the keypress, Caps Lock is disabled again. - -NUMWORD is a similar concept, but has a slightly more elaborate implementation. There's a bit of extra logic in the NUMWORD code that allows the keycode to act as a tap/hold key as well. Tapping enables NUMWORD while number keys are in use, while holding the key enables a number layer for the duration of the key hold and disables it again afterwards. - -**Note:** The implementation of NUMWORD requires that the keyboard's layer definitions be accessible in a header file. In my case, since I use a fairly standard set of layers, I've declared it in my userspace. - -## Mouse Jiggler -This adds a keycode that will move the mouse cursor on each matrix scan. Used to prevent the screen from locking if you're temporarily doing something else (working on a different machine, reading / writing, etc.). - -When you press the keycode, the keyboard will write the text "Mouse jiggler enabled" to signify that the behavior is active. I suggest opening a Notepad window before pressing the key. - -Pressing any key will automatically disable the feature again. This is because it causes a huge hit to the reliability and performance of the keyboard while it's active (adding stuff to every matrix scan will do that). I kept forgetting to turn it off before trying to use the keyboard again, so I decided to make it automatically disable itself. - -Enable this by setting `USER_MOUSE_JIGGLE_ENABLE = yes` in your `rules.mk` file. The feature also depends on the Mouse Keys feature, so ensure you don't disable `MOUSEKEY_ENABLE`. - -## Super Alt-Tab -Taken [straight out of the QMK documentation](https://docs.qmk.fm/#/feature_macros?id=super-alt%E2%86%AFtab), this is an easy way to shift between a couple different windows. I use it with a very low interval when I'm alternating back and forth between two known windows with no real need for the visual feedback and thought. If you want to be able to browse the open windows before the function releases Alt, I'd suggest raising `USER_SUPER_ALT_TAB_TIMEOUT` to a higher value. - -# Credits -I'm absolutely sure I've missed a few sources here. If you see something in my code that you think is yours and isn't credited here, I sincerely apologize. - -[bpruitt-goddard](https://github.com/qmk/qmk_firmware/blob/master/keyboards/ergodox_ez/keymaps/bpruitt-goddard/readme.md) -* Dynamic macro tap-dance (no longer used, but I did use this for a while) - -[Drashna](https://github.com/qmk/qmk_firmware/blob/master/users/drashna/readme.md) -* Secrets concept and basic implementation -* "Wrappers" concept (no longer used, but I did use this for a while) - -[Treeman](https://github.com/treeman/qmk_firmware/blob/master/keyboards/kyria/keymaps/treeman) -* CAPSWORD and NUMBERWORD concept - * I re-implented some of the code based on my own prefences, but I did use some implementation code from here - * [Treeman's blog post](https://www.jonashietala.se/blog/2021/06/03/the-t-34-keyboard-layout/) provides more context on these features, and is a great read - -[QMK issue #452](https://github.com/qmk/qmk_firmware/issues/452) -* Helped clarify a good organizational structure for the individual features in this userspace diff --git a/users/replicaJunction/replicaJunction.c b/users/replicaJunction/replicaJunction.c deleted file mode 100644 index 55d8b77166..0000000000 --- a/users/replicaJunction/replicaJunction.c +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include QMK_KEYBOARD_H -#include "replicaJunction.h" - -__attribute__ ((weak)) -void keyboard_post_init_user_kb(void) { } - -void keyboard_post_init_user(void) { - keyboard_post_init_user_kb(); -} diff --git a/users/replicaJunction/replicaJunction.h b/users/replicaJunction/replicaJunction.h deleted file mode 100644 index f3b7bcea0a..0000000000 --- a/users/replicaJunction/replicaJunction.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once -#include QMK_KEYBOARD_H -#include "rj_keycodes.h" -#include "rj_layers.h" -#include "keycode_aliases.h" -#include "version.h" - -#ifdef USER_CAPS_WORD_ENABLE -# include "features/caps_word.h" -#endif - -#ifdef USER_MOUSE_JIGGLE_ENABLE -# include "features/mouse_jiggle.h" -#endif - -#ifdef USER_NUM_WORD_ENABLE -# include "features/num_word.h" -#endif - -#ifdef USER_SECRETS_ENABLE -# include "features/secrets.h" -#endif - -#ifdef USER_SUPER_ALT_TAB_ENABLE -# include "features/super_alt_tab.h" -#endif diff --git a/users/replicaJunction/rj_keycodes.h b/users/replicaJunction/rj_keycodes.h deleted file mode 100644 index fde2698dfe..0000000000 --- a/users/replicaJunction/rj_keycodes.h +++ /dev/null @@ -1,63 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once -#include QMK_KEYBOARD_H - -// Custom keycodes and macros -enum userspace_custom_keycodes { - QK_MAKE = SAFE_RANGE, // QMK make command - QK_FLSH, // QMK flash command - QK_VERS, // QMK version - - // Programming macros - PRG_EQ, // == - PRG_NE, // != - PRG_GEQ, // >= - PRG_LEQ, // <= - PRG_ARR, // => - PS_ITEM, // $_ (PowerShell - $PSItem variable) - FS_PIPE, // |> (F# pipe operator) - FS_ARR, // -> (F# lambda / pattern matching) - SHEBANG, // #! - - // USER_CAPS_WORD_ENABLE - CAPWORD, - -#ifdef USER_NUM_WORD_ENABLE - NUMWORD, -#endif - - // USER_ENABLE_CUSTOM_SHIFT_CODES - // Custom characters that send different symbols than usual when shifted - KCC_COM, // , or ! - KCC_DOT, // . or @ - KCC_QUO, // ' or ~ - - // USER_MOUSE_JIGGLE_ENABLE - MS_JIGL, - - // USER_ENABLE_SUPER_ALT_TAB - SALTTAB, - - // USER_ENABLE_SECRETS - K_SECR1, - K_SECR2, - K_SECR3, - K_SECR4, - - DYNAMIC_MACRO_RANGE -}; diff --git a/users/replicaJunction/rj_layers.h b/users/replicaJunction/rj_layers.h deleted file mode 100644 index f6296af053..0000000000 --- a/users/replicaJunction/rj_layers.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2021 Joshua T. - * - * 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 - -enum rj_layers { - L_BASE, - -#ifdef USER_INCLUDE_QWERTY - L_QWERTY, -#endif - -#ifdef USER_INCLUDE_GAMING_LAYER - L_GAMING, -#endif - - L_NUMBERS, - L_SYMBOLS, - L_NAVIGATION, - L_FN, - -#ifdef USER_INCLUDE_MACRO_LAYER - L_MACROS, -#endif - - _LAYER_SAFE_RANGE -}; diff --git a/users/replicaJunction/rules.mk b/users/replicaJunction/rules.mk deleted file mode 100644 index addaa04d97..0000000000 --- a/users/replicaJunction/rules.mk +++ /dev/null @@ -1,33 +0,0 @@ -SRC += replicaJunction.c - -# Only load these source files if the features are enabled. Keyboards can -# enable or disable these features in their own rules.mk files. - -ifeq ($(strip $(USER_CAPS_WORD_ENABLE)), yes) - SRC += features/caps_word.c - OPT_DEFS += -DUSER_CAPS_WORD_ENABLE -endif - -ifeq ($(strip $(USER_MOUSE_JIGGLE_ENABLE)), yes) - SRC += features/mouse_jiggle.c - OPT_DEFS += -DUSER_MOUSE_JIGGLE_ENABLE -endif - -ifeq ($(strip $(USER_NUM_WORD_ENABLE)), yes) - SRC += features/num_word.c - OPT_DEFS += -DUSER_NUM_WORD_ENABLE -endif - -ifeq ($(strip $(USER_SECRETS_ENABLE)), yes) - SRC += features/secrets.c - OPT_DEFS += -DUSER_SECRETS_ENABLE -endif - -ifeq ($(strip $(USER_SUPER_ALT_TAB_ENABLE)), yes) - SRC += features/super_alt_tab.c - OPT_DEFS += -DUSER_SUPER_ALT_TAB_ENABLE -endif - -# Define these last so any other logic can set up some defines first -SRC += matrix_scan.c \ - process_records.c diff --git a/users/riblee/riblee.c b/users/riblee/riblee.c index 937e603b7a..4be43ba82c 100644 --- a/users/riblee/riblee.c +++ b/users/riblee/riblee.c @@ -18,7 +18,7 @@ #include <string.h> // Tap Dance functions -void dance_key_a (qk_tap_dance_state_t *state, void *user_data) { +void dance_key_a (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { SEND_STRING("a"); reset_tap_dance(state); @@ -33,7 +33,7 @@ void dance_key_a (qk_tap_dance_state_t *state, void *user_data) { } } -void dance_key_e (qk_tap_dance_state_t *state, void *user_data) { +void dance_key_e (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { SEND_STRING("e"); reset_tap_dance(state); @@ -48,7 +48,7 @@ void dance_key_e (qk_tap_dance_state_t *state, void *user_data) { } } -void dance_key_i (qk_tap_dance_state_t *state, void *user_data) { +void dance_key_i (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { SEND_STRING("i"); reset_tap_dance(state); @@ -63,7 +63,7 @@ void dance_key_i (qk_tap_dance_state_t *state, void *user_data) { } } -void dance_key_o (qk_tap_dance_state_t *state, void *user_data) { +void dance_key_o (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { SEND_STRING("o"); reset_tap_dance(state); @@ -94,7 +94,7 @@ void dance_key_o (qk_tap_dance_state_t *state, void *user_data) { } } -void dance_key_u (qk_tap_dance_state_t *state, void *user_data) { +void dance_key_u (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { SEND_STRING("u"); reset_tap_dance(state); diff --git a/users/riblee/riblee.h b/users/riblee/riblee.h index 786e4c31ab..910c57db69 100644 --- a/users/riblee/riblee.h +++ b/users/riblee/riblee.h @@ -49,11 +49,11 @@ enum { TD_U, }; -void dance_key_a (qk_tap_dance_state_t *, void *); -void dance_key_e (qk_tap_dance_state_t *, void *); -void dance_key_i (qk_tap_dance_state_t *, void *); -void dance_key_o (qk_tap_dance_state_t *, void *); -void dance_key_u (qk_tap_dance_state_t *, void *); +void dance_key_a (tap_dance_state_t *, void *); +void dance_key_e (tap_dance_state_t *, void *); +void dance_key_i (tap_dance_state_t *, void *); +void dance_key_o (tap_dance_state_t *, void *); +void dance_key_u (tap_dance_state_t *, void *); layer_state_t layer_state_set_user(layer_state_t); bool process_record_user(uint16_t keycode, keyrecord_t *record);
\ No newline at end of file diff --git a/users/ridingqwerty/config.h b/users/ridingqwerty/config.h index 6501efe62f..291c4877e1 100644 --- a/users/ridingqwerty/config.h +++ b/users/ridingqwerty/config.h @@ -5,7 +5,7 @@ #define TAPPING_TERM 175 #define MACRO_TIMER 5 -#define TAPPING_FORCE_HOLD_PER_KEY +#define QUICK_TAP_TERM_PER_KEY // testing #define TAPPING_TERM_PER_KEY //#define IGNORE_MOD_TAP_INTERRUPT // rolling R3 "zxcv", etc... diff --git a/users/ridingqwerty/ridingqwerty.c b/users/ridingqwerty/ridingqwerty.c index 8934b9365b..639bb8d2b3 100644 --- a/users/ridingqwerty/ridingqwerty.c +++ b/users/ridingqwerty/ridingqwerty.c @@ -55,11 +55,11 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { } }; -bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { - case NM(SCLN): - return true; - default: - return false; - } +uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case NM(SCLN): + return 0; + default: + return QUICK_TAP_TERM; + } } diff --git a/users/ridingqwerty/tapdances.c b/users/ridingqwerty/tapdances.c index 644166cb45..0fdd941637 100644 --- a/users/ridingqwerty/tapdances.c +++ b/users/ridingqwerty/tapdances.c @@ -1,13 +1,13 @@ #include "ridingqwerty.h" #include "tapdances.h" -void braces_finished (qk_tap_dance_state_t *state, void *user_data) { +void braces_finished (tap_dance_state_t *state, void *user_data) { if ((state->count == 1) || (state->count == 3)) { register_code(KC_LSFT); } } -void braces_reset (qk_tap_dance_state_t *state, void *user_data) { +void braces_reset (tap_dance_state_t *state, void *user_data) { // two or three taps for "[]"/"{}" if ((state->count == 2) || (state->count == 3)) { tap_code(KC_LBRC); @@ -28,6 +28,6 @@ void braces_reset (qk_tap_dance_state_t *state, void *user_data) { } } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_BRACES] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, braces_finished, braces_reset) }; diff --git a/users/ridingqwerty/unicode.c b/users/ridingqwerty/unicode.c index 8ef5aaa1ec..5a4c154919 100644 --- a/users/ridingqwerty/unicode.c +++ b/users/ridingqwerty/unicode.c @@ -1,7 +1,7 @@ #include "unicode.h" #ifdef UNICODEMAP_ENABLE -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { FOREACH_UNICODE(UCM_ENTRY) }; #endif diff --git a/users/ridingqwerty/unicode.h b/users/ridingqwerty/unicode.h index 8b403272ae..de8d1593b4 100644 --- a/users/ridingqwerty/unicode.h +++ b/users/ridingqwerty/unicode.h @@ -227,7 +227,7 @@ enum unicode_names { FOREACH_UNICODE(UCM_NAME) }; -extern const uint32_t PROGMEM unicode_map[]; +extern const uint32_t unicode_map[] PROGMEM; enum unicode_keycodes { FOREACH_UNICODE(UCM_KEYCODE) diff --git a/users/rmeli/keyrecords/tap_dances.c b/users/rmeli/keyrecords/tap_dances.c index 3b38bf4a33..4e7ac31962 100644 --- a/users/rmeli/keyrecords/tap_dances.c +++ b/users/rmeli/keyrecords/tap_dances.c @@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // Tap dances definitions // Need to needs to be defined in a .c file to avoid a linker error (multiple definitions) -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_LSPO_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, LSPO_CAPS_finished, LSPO_CAPS_reset), [TD_RSPC_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, RSPC_CAPS_finished, RSPC_CAPS_reset), [TD_ESC_DEL] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_DEL), @@ -34,7 +34,7 @@ qk_tap_dance_action_t tap_dance_actions[] = { // + ------ + // https://github.com/qmk/qmk_firmware/blob/9294258c02d3e025e01935a06c4d9f1997535bda/users/gordon/gordon.c#L112-L135 -td_state_t hold_cur_dance(qk_tap_dance_state_t *state) { +td_state_t hold_cur_dance(tap_dance_state_t *state) { if (state->count == 1) { if (state->interrupted) { if (!state->pressed) @@ -63,7 +63,7 @@ td_state_t hold_cur_dance(qk_tap_dance_state_t *state) { // Create an instance of 'td_tap_t' for the 'LSPO_CAPS' tap dance. static td_tap_t LSPO_CAPS_state = {.is_press_action = true, .state = TD_NONE}; -void LSPO_CAPS_finished(qk_tap_dance_state_t *state, void *user_data) { +void LSPO_CAPS_finished(tap_dance_state_t *state, void *user_data) { LSPO_CAPS_state.state = hold_cur_dance(state); switch (LSPO_CAPS_state.state) { case TD_SINGLE_TAP: @@ -80,7 +80,7 @@ void LSPO_CAPS_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void LSPO_CAPS_reset(qk_tap_dance_state_t *state, void *user_data) { +void LSPO_CAPS_reset(tap_dance_state_t *state, void *user_data) { switch (LSPO_CAPS_state.state) { case TD_SINGLE_TAP: unregister_code16(KC_LPRN); @@ -104,7 +104,7 @@ void LSPO_CAPS_reset(qk_tap_dance_state_t *state, void *user_data) { // Create an instance of 'td_tap_t' for the 'RSPC_CAPS' tap dance. static td_tap_t RSPC_CAPS_state = {.is_press_action = true, .state = TD_NONE}; -void RSPC_CAPS_finished(qk_tap_dance_state_t *state, void *user_data) { +void RSPC_CAPS_finished(tap_dance_state_t *state, void *user_data) { RSPC_CAPS_state.state = hold_cur_dance(state); switch (RSPC_CAPS_state.state) { case TD_SINGLE_TAP: @@ -121,7 +121,7 @@ void RSPC_CAPS_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void RSPC_CAPS_reset(qk_tap_dance_state_t *state, void *user_data) { +void RSPC_CAPS_reset(tap_dance_state_t *state, void *user_data) { switch (RSPC_CAPS_state.state) { case TD_SINGLE_TAP: unregister_code16(KC_RPRN); diff --git a/users/rmeli/keyrecords/tap_dances.h b/users/rmeli/keyrecords/tap_dances.h index 1d3018441e..40866fe17f 100644 --- a/users/rmeli/keyrecords/tap_dances.h +++ b/users/rmeli/keyrecords/tap_dances.h @@ -60,12 +60,12 @@ typedef struct { // + --------- + // Tap dance for fast modifiers; favors being held over being tapped. -td_state_t hold_cur_dance(qk_tap_dance_state_t *state); +td_state_t hold_cur_dance(tap_dance_state_t *state); // Left Shift Parenthesis Open (LSPO) and Caps Lock (CAPS) on DOUBLE_TAP -void LSPO_CAPS_finished(qk_tap_dance_state_t *state, void *user_data); -void LSPO_CAPS_reset(qk_tap_dance_state_t *state, void *user_data); +void LSPO_CAPS_finished(tap_dance_state_t *state, void *user_data); +void LSPO_CAPS_reset(tap_dance_state_t *state, void *user_data); // Right Shift Parenthesis Close (RSPC) and Caps Lock (CAPS) on DOUBLE_TAP -void RSPC_CAPS_finished(qk_tap_dance_state_t *state, void *user_data); -void RSPC_CAPS_reset(qk_tap_dance_state_t *state, void *user_data); +void RSPC_CAPS_finished(tap_dance_state_t *state, void *user_data); +void RSPC_CAPS_reset(tap_dance_state_t *state, void *user_data); diff --git a/users/rmeli/keyrecords/unicode.h b/users/rmeli/keyrecords/unicode.h index d818af02ee..c3ba96d5b6 100644 --- a/users/rmeli/keyrecords/unicode.h +++ b/users/rmeli/keyrecords/unicode.h @@ -45,7 +45,7 @@ enum unicode_names { UUML, }; -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { // KC_A [aGRV] = 0x00E0, // à [AGRV] = 0x00C0, // À diff --git a/users/rmw/tapdances.c b/users/rmw/tapdances.c index 1b44a87253..792bd83e55 100644 --- a/users/rmw/tapdances.c +++ b/users/rmw/tapdances.c @@ -2,7 +2,7 @@ #include "tapdances.h" -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [SHCAP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, caps, shift_reset) ,[TDGUI] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, shiftgui, gui_reset) ,[TDGUI2] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, guictl, ubermod_reset) @@ -22,13 +22,13 @@ qk_tap_dance_action_t tap_dance_actions[] = { ,[FRBK] = ACTION_TAP_DANCE_DOUBLE(KC_WWW_BACK,KC_WWW_FORWARD) }; -void caps(qk_tap_dance_state_t *state, void *user_data) // Shift, Caps +void caps(tap_dance_state_t *state, void *user_data) // Shift, Caps { if (state->count >= 2) {register_code(KC_CAPS); unregister_code(KC_CAPS);} else if (state->pressed) {register_mods(MOD_LSFT);} else {set_oneshot_mods(MOD_LSFT);} reset_tap_dance(state); } -void forward_back_mac(qk_tap_dance_state_t *state, void *user_data) // G<-, then G-> +void forward_back_mac(tap_dance_state_t *state, void *user_data) // G<-, then G-> { if (state->count > 1) { tap_code16(G(KC_RGHT)); @@ -39,7 +39,7 @@ void forward_back_mac(qk_tap_dance_state_t *state, void *user_data) // G<-, then reset_tap_dance(state); } -void shiftgui(qk_tap_dance_state_t *state, void *user_data) // G->SG +void shiftgui(tap_dance_state_t *state, void *user_data) // G->SG { if (state->count > 1) { if (state->pressed) { @@ -58,7 +58,7 @@ void shiftgui(qk_tap_dance_state_t *state, void *user_data) // G->SG reset_tap_dance(state); } -void guictl(qk_tap_dance_state_t *state, void *user_data) // G->GC +void guictl(tap_dance_state_t *state, void *user_data) // G->GC { if (state->count > 1) { if (state->pressed) { @@ -77,7 +77,7 @@ void guictl(qk_tap_dance_state_t *state, void *user_data) // G->GC reset_tap_dance(state); } -void deleter(qk_tap_dance_state_t *state, void *user_data) // bkspc -> delwrd -> delline +void deleter(tap_dance_state_t *state, void *user_data) // bkspc -> delwrd -> delline { if (state->count > 3) { tap_code16(G(KC_BSPC)); @@ -91,7 +91,7 @@ void deleter(qk_tap_dance_state_t *state, void *user_data) // bkspc -> delwrd -> reset_tap_dance(state); } -void ubermod(qk_tap_dance_state_t *state, void *user_data) // CTL->ALT->GUI +void ubermod(tap_dance_state_t *state, void *user_data) // CTL->ALT->GUI { if (state->count > 2) { if (state->pressed) { @@ -118,7 +118,7 @@ void ubermod(qk_tap_dance_state_t *state, void *user_data) // CTL->ALT->GUI reset_tap_dance(state); } -void ubermod_mac(qk_tap_dance_state_t *state, void *user_data) // GUI->CTL->ALT +void ubermod_mac(tap_dance_state_t *state, void *user_data) // GUI->CTL->ALT { if (state->count > 2) { if (state->pressed) { @@ -145,7 +145,7 @@ void ubermod_mac(qk_tap_dance_state_t *state, void *user_data) // GUI->CTL->ALT reset_tap_dance(state); } -void ubermod2(qk_tap_dance_state_t *state, void *user_data) // ALT->CTL->GUI +void ubermod2(tap_dance_state_t *state, void *user_data) // ALT->CTL->GUI { if (state->count > 2) { if (state->pressed) { @@ -172,7 +172,7 @@ void ubermod2(qk_tap_dance_state_t *state, void *user_data) // ALT->CTL->GUI reset_tap_dance(state); } -void ubermod2_mac(qk_tap_dance_state_t *state, void *user_data) // ALT->GUI->CTL +void ubermod2_mac(tap_dance_state_t *state, void *user_data) // ALT->GUI->CTL { if (state->count > 2) { if (state->pressed) { @@ -199,30 +199,30 @@ void ubermod2_mac(qk_tap_dance_state_t *state, void *user_data) // ALT->GUI->CTL reset_tap_dance(state); } -void shift_reset(qk_tap_dance_state_t *state, void *user_data) +void shift_reset(tap_dance_state_t *state, void *user_data) { unregister_mods(MOD_LSFT); // clear_oneshot_mods(); } -void gui_reset(qk_tap_dance_state_t *state, void *user_data) +void gui_reset(tap_dance_state_t *state, void *user_data) { unregister_mods(MOD_LSFT | MOD_LGUI); } -void CAS_reset(qk_tap_dance_state_t *state, void *user_data) +void CAS_reset(tap_dance_state_t *state, void *user_data) { unregister_mods(MOD_LCTL | MOD_LSFT | MOD_LALT); } -void CASG_reset(qk_tap_dance_state_t *state, void *user_data) +void CASG_reset(tap_dance_state_t *state, void *user_data) { unregister_mods(MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI); // clear_oneshot_mods(); } -void ubermod_reset(qk_tap_dance_state_t *state, void *user_data) // AKA CAG_reset +void ubermod_reset(tap_dance_state_t *state, void *user_data) // AKA CAG_reset { unregister_mods(MOD_LCTL | MOD_LALT | MOD_LGUI); } -void shiftenter(qk_tap_dance_state_t *state, void *user_data) +void shiftenter(tap_dance_state_t *state, void *user_data) { if (state->count > 1) { tap_code(KC_ENT); @@ -236,7 +236,7 @@ void shiftenter(qk_tap_dance_state_t *state, void *user_data) reset_tap_dance(state); } -void shiftentercaps(qk_tap_dance_state_t *state, void *user_data) +void shiftentercaps(tap_dance_state_t *state, void *user_data) { if (state->count > 2) { tap_code(KC_CAPS); @@ -253,7 +253,7 @@ void shiftentercaps(qk_tap_dance_state_t *state, void *user_data) reset_tap_dance(state); } -void ctrl_all_mac(qk_tap_dance_state_t *state, void *user_data) // C->CG->CAG +void ctrl_all_mac(tap_dance_state_t *state, void *user_data) // C->CG->CAG { if (state->count > 2) { if (state->pressed) { @@ -280,7 +280,7 @@ void ctrl_all_mac(qk_tap_dance_state_t *state, void *user_data) // C->CG->CAG reset_tap_dance(state); } -void ctrl_all(qk_tap_dance_state_t *state, void *user_data) // C->CA->SC +void ctrl_all(tap_dance_state_t *state, void *user_data) // C->CA->SC { if (state->count > 2) { if (state->pressed) { @@ -307,7 +307,7 @@ void ctrl_all(qk_tap_dance_state_t *state, void *user_data) // C->CA->SC reset_tap_dance(state); } -void alt_all(qk_tap_dance_state_t *state, void *user_data) // A->SA->AC +void alt_all(tap_dance_state_t *state, void *user_data) // A->SA->AC { if (state->count > 2) { if (state->pressed) { @@ -334,7 +334,7 @@ void alt_all(qk_tap_dance_state_t *state, void *user_data) // A->SA->AC reset_tap_dance(state); } -void shift_and(qk_tap_dance_state_t *state, void *user_data) // SC->SA->SG +void shift_and(tap_dance_state_t *state, void *user_data) // SC->SA->SG { if (state->count > 2) { if (state->pressed) { @@ -361,7 +361,7 @@ void shift_and(qk_tap_dance_state_t *state, void *user_data) // SC->SA->SG reset_tap_dance(state); } -void shift_and_mac(qk_tap_dance_state_t *state, void *user_data) // SG->SC->SA +void shift_and_mac(tap_dance_state_t *state, void *user_data) // SG->SC->SA { if (state->count > 1) { if (state->pressed) { diff --git a/users/rmw/tapdances.h b/users/rmw/tapdances.h index 11425011c5..f358358cb6 100644 --- a/users/rmw/tapdances.h +++ b/users/rmw/tapdances.h @@ -3,27 +3,27 @@ #include "process_tap_dance.h" #include "action.h" -void caps(qk_tap_dance_state_t *state, void *user_data); // Shift, Caps -void forward_back_mac(qk_tap_dance_state_t *state, void *user_data); // G<-, then G-> -void shiftgui(qk_tap_dance_state_t *state, void *user_data); // G->SG -void guictl(qk_tap_dance_state_t *state, void *user_data); // G->GC -void deleter(qk_tap_dance_state_t *state, void *user_data); // bkspc -> delwrd -> delline -void ubermod(qk_tap_dance_state_t *state, void *user_data); // CTL->ALT->GUI -void ubermod_mac(qk_tap_dance_state_t *state, void *user_data); // GUI->CTL->ALT -void ubermod2(qk_tap_dance_state_t *state, void *user_data); // ALT->CTL->GUI -void ubermod2_mac(qk_tap_dance_state_t *state, void *user_data); // ALT->GUI->CTL -void shift_reset(qk_tap_dance_state_t *state, void *user_data); -void gui_reset(qk_tap_dance_state_t *state, void *user_data); -void CAS_reset(qk_tap_dance_state_t *state, void *user_data); -void CASG_reset(qk_tap_dance_state_t *state, void *user_data); -void ubermod_reset(qk_tap_dance_state_t *state, void *user_data); // AKA CAG_reset -void shiftenter(qk_tap_dance_state_t *state, void *user_data); -void shiftentercaps(qk_tap_dance_state_t *state, void *user_data); -void ctrl_all_mac(qk_tap_dance_state_t *state, void *user_data); // C->CG->CAG -void ctrl_all(qk_tap_dance_state_t *state, void *user_data); // C->CA->SC -void alt_all(qk_tap_dance_state_t *state, void *user_data); // A->SA->AC -void shift_and(qk_tap_dance_state_t *state, void *user_data); // SC->SA->SG -void shift_and_mac(qk_tap_dance_state_t *state, void *user_data); // SG->SC->SA +void caps(tap_dance_state_t *state, void *user_data); // Shift, Caps +void forward_back_mac(tap_dance_state_t *state, void *user_data); // G<-, then G-> +void shiftgui(tap_dance_state_t *state, void *user_data); // G->SG +void guictl(tap_dance_state_t *state, void *user_data); // G->GC +void deleter(tap_dance_state_t *state, void *user_data); // bkspc -> delwrd -> delline +void ubermod(tap_dance_state_t *state, void *user_data); // CTL->ALT->GUI +void ubermod_mac(tap_dance_state_t *state, void *user_data); // GUI->CTL->ALT +void ubermod2(tap_dance_state_t *state, void *user_data); // ALT->CTL->GUI +void ubermod2_mac(tap_dance_state_t *state, void *user_data); // ALT->GUI->CTL +void shift_reset(tap_dance_state_t *state, void *user_data); +void gui_reset(tap_dance_state_t *state, void *user_data); +void CAS_reset(tap_dance_state_t *state, void *user_data); +void CASG_reset(tap_dance_state_t *state, void *user_data); +void ubermod_reset(tap_dance_state_t *state, void *user_data); // AKA CAG_reset +void shiftenter(tap_dance_state_t *state, void *user_data); +void shiftentercaps(tap_dance_state_t *state, void *user_data); +void ctrl_all_mac(tap_dance_state_t *state, void *user_data); // C->CG->CAG +void ctrl_all(tap_dance_state_t *state, void *user_data); // C->CA->SC +void alt_all(tap_dance_state_t *state, void *user_data); // A->SA->AC +void shift_and(tap_dance_state_t *state, void *user_data); // SC->SA->SG +void shift_and_mac(tap_dance_state_t *state, void *user_data); // SG->SC->SA enum { SHCAP = 0 diff --git a/users/romus/romus.c b/users/romus/romus.c index 7b2e330228..19d17a63a9 100644 --- a/users/romus/romus.c +++ b/users/romus/romus.c @@ -42,7 +42,7 @@ float tone_windows[][2] = SONG(UNICODE_WINDOWS); |*-----TAP-DANCE-----*| \*-------------------*/ #ifdef TAP_DANCE_ENABLE -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { // Shift on double tap of semicolon [SCL] = ACTION_TAP_DANCE_DOUBLE( KC_SCLN, KC_COLN ) }; diff --git a/users/rupa/unicode.c b/users/rupa/unicode.c index 2302a95552..f99e6d0832 100644 --- a/users/rupa/unicode.c +++ b/users/rupa/unicode.c @@ -21,7 +21,7 @@ combined_mode_t combined_mode = CM_NULL; bool _seeded = false; #if defined(UNICODEMAP_ENABLE) -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { [CCIR] = 0x20DD, // COMBINING CIRCLE ⃝ [CENT] = 0x00A2, // ¢ [CHEK] = 0x2713, // ✓ diff --git a/users/rverst/unicode.h b/users/rverst/unicode.h index 45d1585809..4a92d32038 100644 --- a/users/rverst/unicode.h +++ b/users/rverst/unicode.h @@ -23,7 +23,7 @@ enum unicode_names { BANG, IRONY, SNEK }; -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { [BANG] = 0x203D, [IRONY] = 0x2E2E, [SNEK] = 0x1F40D, diff --git a/users/sethBarberee/config.h b/users/sethBarberee/config.h index 7e9fd7d2f1..f323b27368 100644 --- a/users/sethBarberee/config.h +++ b/users/sethBarberee/config.h @@ -28,9 +28,6 @@ # endif // Trim animations I don't use/like -# ifdef RGBLIGHT_ANIMATIONS -# undef RGBLIGHT_ANIMATIONS -# endif # ifndef RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_BREATHING # endif diff --git a/users/sethBarberee/tap_dance.c b/users/sethBarberee/tap_dance.c index 9461e5ad60..924b3141fe 100644 --- a/users/sethBarberee/tap_dance.c +++ b/users/sethBarberee/tap_dance.c @@ -16,7 +16,7 @@ #include "tap_dance.h" // Shamelessly stolen from QMK Docs -int cur_dance (qk_tap_dance_state_t *state) { +int cur_dance (tap_dance_state_t *state) { if (state->count == 1) { if (state->interrupted || !state->pressed) { return SINGLE_TAP; @@ -44,7 +44,7 @@ tap caps_status = { }; -void dance_ecap_finished (qk_tap_dance_state_t *state, void *user_data){ +void dance_ecap_finished (tap_dance_state_t *state, void *user_data){ caps_status.state = cur_dance(state); switch(caps_status.state){ case SINGLE_TAP: @@ -74,7 +74,7 @@ void dance_ecap_finished (qk_tap_dance_state_t *state, void *user_data){ } } -void dance_ecap_reset (qk_tap_dance_state_t *state, void *user_data){ +void dance_ecap_reset (tap_dance_state_t *state, void *user_data){ if(caps_status.state == SINGLE_HOLD){ unregister_code(KC_LCTL); } @@ -82,7 +82,7 @@ void dance_ecap_reset (qk_tap_dance_state_t *state, void *user_data){ } //Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { //Tap once for Esc, twice for Caps Lock [TD_ECAP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_ecap_finished, dance_ecap_reset), // Other declarations would go here, separated by commas, if you have them diff --git a/users/spidey3/spidey3_unicode.c b/users/spidey3/spidey3_unicode.c index bda0876b54..011eaeb3fa 100644 --- a/users/spidey3/spidey3_unicode.c +++ b/users/spidey3/spidey3_unicode.c @@ -4,7 +4,7 @@ #include "spidey3_unicode.h" -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { [BUL1] = 0x2022, // • [BUL2] = 0x25E6, // ◦ [LARR] = 0x2190, // ← diff --git a/users/stanrc85/stanrc85.c b/users/stanrc85/stanrc85.c index 5f74612848..6dd5db0e33 100644 --- a/users/stanrc85/stanrc85.c +++ b/users/stanrc85/stanrc85.c @@ -8,7 +8,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { } // determine the tapdance state to return -int cur_dance (qk_tap_dance_state_t *state) { +int cur_dance (tap_dance_state_t *state) { if (state->count == 1) { if (state->interrupted || !state->pressed) { return SINGLE_TAP; } else { return SINGLE_HOLD; } @@ -18,7 +18,7 @@ int cur_dance (qk_tap_dance_state_t *state) { } // handle the possible states for each tapdance keycode you define: -void ctl_copy_finished (qk_tap_dance_state_t *state, void *user_data) { +void ctl_copy_finished (tap_dance_state_t *state, void *user_data) { td_state = cur_dance(state); switch (td_state) { case SINGLE_TAP: @@ -32,7 +32,7 @@ void ctl_copy_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void ctl_copy_reset (qk_tap_dance_state_t *state, void *user_data) { +void ctl_copy_reset (tap_dance_state_t *state, void *user_data) { switch (td_state) { case SINGLE_TAP: break; @@ -61,7 +61,7 @@ void ctl_copy_reset (qk_tap_dance_state_t *state, void *user_data) { static uint8_t led_user = 0; #endif -void lock_unlock (qk_tap_dance_state_t *state, void *user_data) { +void lock_unlock (tap_dance_state_t *state, void *user_data) { td_state = cur_dance(state); switch (td_state) { case SINGLE_TAP: // Ctl + Alt + Del to unlock workstation @@ -97,7 +97,7 @@ void lock_unlock (qk_tap_dance_state_t *state, void *user_data) { } } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_WIN] = ACTION_TAP_DANCE_FN(lock_unlock), [TD_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_GRV), [TD_RCTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctl_copy_finished, ctl_copy_reset) diff --git a/users/stanrc85/stanrc85.h b/users/stanrc85/stanrc85.h index 0007e0898c..a6550ca72c 100644 --- a/users/stanrc85/stanrc85.h +++ b/users/stanrc85/stanrc85.h @@ -48,8 +48,8 @@ typedef enum { } td_state_t; // function to determine the current tapdance state -int cur_dance (qk_tap_dance_state_t *state); +int cur_dance (tap_dance_state_t *state); // `finished` and `reset` functions for each tapdance keycode -void ctl_copy_finished (qk_tap_dance_state_t *state, void *user_data); -void ctl_copy_reset (qk_tap_dance_state_t *state, void *user_data); +void ctl_copy_finished (tap_dance_state_t *state, void *user_data); +void ctl_copy_reset (tap_dance_state_t *state, void *user_data); diff --git a/users/talljoe/tapdance/actions/td.function.c b/users/talljoe/tapdance/actions/td.function.c index fffbf283dd..577f2be3d4 100644 --- a/users/talljoe/tapdance/actions/td.function.c +++ b/users/talljoe/tapdance/actions/td.function.c @@ -19,14 +19,14 @@ static struct { } function_state = {0}; // Send semi-colon + enter on two taps -void tap_dance_function_finished(qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_function_finished(tap_dance_state_t *state, void *user_data) { function_state.state = hold_cur_dance(state); switch (function_state.state) { case SINGLE_HOLD: layer_on(_ADJUST); break; } } -void tap_dance_function_reset(qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_function_reset(tap_dance_state_t *state, void *user_data) { switch (function_state.state) { case SPECIAL: reset_keyboard(); break; case SINGLE_HOLD: layer_off(_ADJUST); break; diff --git a/users/talljoe/tapdance/actions/td.grave.c b/users/talljoe/tapdance/actions/td.grave.c index 509b66dc35..f58f00f8c0 100644 --- a/users/talljoe/tapdance/actions/td.grave.c +++ b/users/talljoe/tapdance/actions/td.grave.c @@ -15,7 +15,7 @@ */ // Send `. ~. ``` -void tap_dance_grave_finished(qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_grave_finished(tap_dance_state_t *state, void *user_data) { switch(state->count) { case 1: SEND_STRING("`"); @@ -26,7 +26,7 @@ void tap_dance_grave_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void tap_dance_grave_each(qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_grave_each(tap_dance_state_t *state, void *user_data) { if(state->count == 3) { SEND_STRING("```"); } else if (state->count > 3) { diff --git a/users/talljoe/tapdance/actions/td.lock.c b/users/talljoe/tapdance/actions/td.lock.c index 4422d9e252..bdca0bb11b 100644 --- a/users/talljoe/tapdance/actions/td.lock.c +++ b/users/talljoe/tapdance/actions/td.lock.c @@ -19,7 +19,7 @@ static struct { } lock_state = {0}; // Send semi-colon + enter on two taps -void tap_dance_lock_finished(qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_lock_finished(tap_dance_state_t *state, void *user_data) { lock_state.state = cur_dance(state); switch (lock_state.state) { case SINGLE_TAP: register_code(KC_ESC); break; @@ -27,7 +27,7 @@ void tap_dance_lock_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void tap_dance_lock_reset(qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_lock_reset(tap_dance_state_t *state, void *user_data) { switch (lock_state.state) { case SINGLE_TAP: unregister_code(KC_ESC); break; } diff --git a/users/talljoe/tapdance/actions/td.semicolon.c b/users/talljoe/tapdance/actions/td.semicolon.c index 45776492a4..c2fc500c48 100644 --- a/users/talljoe/tapdance/actions/td.semicolon.c +++ b/users/talljoe/tapdance/actions/td.semicolon.c @@ -19,12 +19,12 @@ static struct { bool mods; } tap_state = {0}; -void tap_dance_semicolon_each(qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_semicolon_each(tap_dance_state_t *state, void *user_data) { tap_state.mods |= get_mods(); } // Send semi-colon + enter on two taps -void tap_dance_semicolon_finished(qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_semicolon_finished(tap_dance_state_t *state, void *user_data) { tap_state.semicolon = hold_cur_dance(state); switch (tap_state.semicolon) { case SINGLE_TAP: case DOUBLE_HOLD: register_code(KC_SCLN); break; @@ -32,7 +32,7 @@ void tap_dance_semicolon_finished(qk_tap_dance_state_t *state, void *user_data) } } -void tap_dance_semicolon_reset(qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_semicolon_reset(tap_dance_state_t *state, void *user_data) { switch (tap_state.semicolon) { case SINGLE_TAP: case DOUBLE_HOLD: unregister_code(KC_SCLN); break; case DOUBLE_TAP: { diff --git a/users/talljoe/tapdance/tapdance_actions.c b/users/talljoe/tapdance/tapdance_actions.c index 59a34b7b9e..b574586171 100644 --- a/users/talljoe/tapdance/tapdance_actions.c +++ b/users/talljoe/tapdance/tapdance_actions.c @@ -20,7 +20,7 @@ #include "actions/td.semicolon.c" #include "actions/td.function.c" -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_SEMICOLON] = ACTION_TAP_DANCE_FN_ADVANCED(tap_dance_semicolon_each, tap_dance_semicolon_finished, tap_dance_semicolon_reset), [TD_LOCK] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_dance_lock_finished, tap_dance_lock_reset), [TD_GRAVE] = ACTION_TAP_DANCE_FN_ADVANCED(tap_dance_grave_each, tap_dance_grave_finished, NULL), diff --git a/users/talljoe/tapdance/td_setup.c b/users/talljoe/tapdance/td_setup.c index d8464144ac..0742763266 100644 --- a/users/talljoe/tapdance/td_setup.c +++ b/users/talljoe/tapdance/td_setup.c @@ -16,7 +16,7 @@ #include "tapdance.h" -int cur_dance (qk_tap_dance_state_t *state) { +int cur_dance (tap_dance_state_t *state) { if (state->count == 1) { //If count = 1, and it has been interrupted - it doesn't matter if it is pressed or not: Send SINGLE_TAP if (state->interrupted) { @@ -45,7 +45,7 @@ int cur_dance (qk_tap_dance_state_t *state) { else return SPECIAL; } -int hold_cur_dance (qk_tap_dance_state_t *state) { +int hold_cur_dance (tap_dance_state_t *state) { if (state->count == 1) { if (state->interrupted) { if (!state->pressed) return SINGLE_TAP; diff --git a/users/talljoe/tapdance/td_setup.h b/users/talljoe/tapdance/td_setup.h index 85d45d944f..e9685c83b2 100644 --- a/users/talljoe/tapdance/td_setup.h +++ b/users/talljoe/tapdance/td_setup.h @@ -25,5 +25,5 @@ enum { SPECIAL = 8 }; -int cur_dance (qk_tap_dance_state_t *state); -int hold_cur_dance (qk_tap_dance_state_t *state); +int cur_dance (tap_dance_state_t *state); +int hold_cur_dance (tap_dance_state_t *state); diff --git a/users/tominabox1/tominabox1.c b/users/tominabox1/tominabox1.c index 999222fa67..4344e06a1f 100644 --- a/users/tominabox1/tominabox1.c +++ b/users/tominabox1/tominabox1.c @@ -79,7 +79,7 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode } #endif //RGB_MATRIX_ENABLE -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(S(KC_2)); } else { @@ -87,14 +87,14 @@ 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(S(KC_2)); } else { } } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [KC_EMAIL] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_cln_finished, dance_cln_reset), [TD_SFT_CPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS), }; diff --git a/users/uqs/config.h b/users/uqs/config.h index 4bb793532b..455aae9da8 100644 --- a/users/uqs/config.h +++ b/users/uqs/config.h @@ -15,7 +15,7 @@ #define TAPPING_TOGGLE 2 // number of taps for a toggle-on-tap #define TAPPING_TERM 170 // ms to trigger tap // https://precondition.github.io/home-row-mods -#define TAPPING_FORCE_HOLD // make tap-then-hold _not_ do key auto repeat +#define QUICK_TAP_TERM 0 // make tap-then-hold _not_ do key auto repeat #define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD // I don't think this works for me, hence I rolled my own implementation. diff --git a/users/uqs/uqs.c b/users/uqs/uqs.c index 82cf70c439..bccab617ac 100644 --- a/users/uqs/uqs.c +++ b/users/uqs/uqs.c @@ -543,7 +543,7 @@ void matrix_scan_user(void) { #ifdef UCIS_ENABLE SEQ_ONE_KEY(KC_U) { - qk_ucis_start(); + ucis_start(); } #endif SEQ_ONE_KEY(KC_H) { @@ -576,7 +576,7 @@ void matrix_scan_user(void) { #ifdef UCIS_ENABLE // 3 codepoints at most, otherwise increase UCIS_MAX_CODE_POINTS -const qk_ucis_symbol_t ucis_symbol_table[] = UCIS_TABLE( +const ucis_symbol_t ucis_symbol_table[] = UCIS_TABLE( UCIS_SYM("poop", 0x1F4A9), // 💩 UCIS_SYM("rofl", 0x1F923), // 🤣 UCIS_SYM("look", 0x0CA0, 0x005F, 0x0CA0) // ಠ_ಠ diff --git a/users/vosechu/config.h b/users/vosechu/config.h index 837cc60ff7..81d9305d50 100644 --- a/users/vosechu/config.h +++ b/users/vosechu/config.h @@ -6,7 +6,7 @@ // actually sends Ctrl-x. That's bad.) #define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define RETRO_TAPPING #ifndef TAPPING_TOGGLE diff --git a/users/wanleg/tapdances.c b/users/wanleg/tapdances.c index cfd84a2644..5d820df3b8 100644 --- a/users/wanleg/tapdances.c +++ b/users/wanleg/tapdances.c @@ -27,7 +27,7 @@ typedef struct { int state; } tap; -int cur_dance (qk_tap_dance_state_t *state) { +int cur_dance (tap_dance_state_t *state) { if (state->count == 1) { //If count = 1, and it has been interrupted - it doesn't matter if it is pressed or not: Send SINGLE_TAP if (state->interrupted || !state->pressed) return SINGLE_TAP; @@ -59,7 +59,7 @@ static tap CADtap_state = { .state = 0 }; -void CAD_finished (qk_tap_dance_state_t *state, void *user_data) { +void CAD_finished (tap_dance_state_t *state, void *user_data) { CADtap_state.state = cur_dance(state); switch (CADtap_state.state) { case SINGLE_TAP: @@ -102,7 +102,7 @@ void CAD_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void CAD_reset (qk_tap_dance_state_t *state, void *user_data) { +void CAD_reset (tap_dance_state_t *state, void *user_data) { switch (CADtap_state.state) { //nothing to do } @@ -115,7 +115,7 @@ static tap RSTtap_state = { .state = 0 }; -void RST_finished (qk_tap_dance_state_t *state, void *user_data) { +void RST_finished (tap_dance_state_t *state, void *user_data) { RSTtap_state.state = cur_dance(state); switch (RSTtap_state.state) { case SINGLE_TAP: register_code(KC_LCTL); break; @@ -125,7 +125,7 @@ void RST_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void RST_reset (qk_tap_dance_state_t *state, void *user_data) { +void RST_reset (tap_dance_state_t *state, void *user_data) { switch (RSTtap_state.state) { case SINGLE_TAP: unregister_code(KC_LCTL); break; case SINGLE_HOLD: unregister_code(KC_LCTL); break; @@ -140,7 +140,7 @@ static tap LYRtap_state = { .state = 0 }; -void LYR_finished (qk_tap_dance_state_t *state, void *user_data) { +void LYR_finished (tap_dance_state_t *state, void *user_data) { LYRtap_state.state = cur_dance(state); switch (LYRtap_state.state) { case SINGLE_TAP: register_code(KC_PSLS); break; @@ -149,7 +149,7 @@ void LYR_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void LYR_reset (qk_tap_dance_state_t *state, void *user_data) { +void LYR_reset (tap_dance_state_t *state, void *user_data) { switch (LYRtap_state.state) { case SINGLE_TAP: unregister_code(KC_PSLS); break; case DOUBLE_TAP: set_single_persistent_default_layer(_GK); break; @@ -164,7 +164,7 @@ static tap LYR75tap_state = { .state = 0 }; -void LYR75_finished (qk_tap_dance_state_t *state, void *user_data) { +void LYR75_finished (tap_dance_state_t *state, void *user_data) { LYR75tap_state.state = cur_dance(state); switch (LYR75tap_state.state) { case SINGLE_TAP: register_code(KC_PSLS); break; @@ -173,7 +173,7 @@ void LYR75_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void LYR75_reset (qk_tap_dance_state_t *state, void *user_data) { +void LYR75_reset (tap_dance_state_t *state, void *user_data) { switch (LYR75tap_state.state) { case SINGLE_TAP: unregister_code(KC_PSLS); break; case DOUBLE_TAP: set_single_persistent_default_layer(_GK); break; @@ -188,7 +188,7 @@ static tap LYR50tap_state = { .state = 0 }; -void LYR50_finished (qk_tap_dance_state_t *state, void *user_data) { +void LYR50_finished (tap_dance_state_t *state, void *user_data) { LYR50tap_state.state = cur_dance(state); switch (LYR75tap_state.state) { case SINGLE_TAP: register_code(KC_PSLS); break; @@ -197,7 +197,7 @@ void LYR50_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void LYR50_reset (qk_tap_dance_state_t *state, void *user_data) { +void LYR50_reset (tap_dance_state_t *state, void *user_data) { switch (LYR50tap_state.state) { case SINGLE_TAP: unregister_code(KC_PSLS); break; case DOUBLE_TAP: set_single_persistent_default_layer(GK50); break; @@ -212,7 +212,7 @@ static tap BSWtap_state = { .state = 0 }; -void BSW_finished (qk_tap_dance_state_t *state, void *user_data) { +void BSW_finished (tap_dance_state_t *state, void *user_data) { BSWtap_state.state = cur_dance(state); switch (BSWtap_state.state) { case SINGLE_TAP: register_code(KC_ENTER); break; @@ -233,7 +233,7 @@ void BSW_finished (qk_tap_dance_state_t *state, void *user_data) { } } -void BSW_reset (qk_tap_dance_state_t *state, void *user_data) { +void BSW_reset (tap_dance_state_t *state, void *user_data) { switch (BSWtap_state.state) { case SINGLE_TAP: unregister_code(KC_ENTER); break; case DOUBLE_TAP: @@ -248,7 +248,7 @@ void BSW_reset (qk_tap_dance_state_t *state, void *user_data) { //Tap Dance Definitions //THIS SECTION HAS TO BE AT THE END OF THE TAP DANCE SECTION -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_SFT_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS) // Other declarations would go here, separated by commas, if you have them ,[TD_Q_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC) diff --git a/users/xulkal/config.h b/users/xulkal/config.h index 7f7782807e..bc175dda98 100644 --- a/users/xulkal/config.h +++ b/users/xulkal/config.h @@ -1,10 +1,11 @@ #pragma once -#undef TAPPING_FORCE_HOLD - #undef TAPPING_TERM #define TAPPING_TERM 175 +#undef QUICK_TAP_TERM +#define QUICK_TAP_TERM TAPPING_TERM + #define SPACE_CADET_MODIFIER_CARRYOVER #define LSPO_KEYS KC_LSFT, KC_TRNS, KC_LBRC #define RSPC_KEYS KC_RSFT, KC_TRNS, KC_RBRC diff --git a/users/xulkal/custom_tap_dance.c b/users/xulkal/custom_tap_dance.c index bcbfb577bb..c2f9efe44b 100644 --- a/users/xulkal/custom_tap_dance.c +++ b/users/xulkal/custom_tap_dance.c @@ -4,7 +4,7 @@ #ifdef TAP_DANCE_ENABLE //Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [COMM_QUOT] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_QUOT), [BACKSPACE] = ACTION_TAP_DANCE_DOUBLE (KC_BACKSPACE, LCTL(KC_BACKSPACE)), [DELETE] = ACTION_TAP_DANCE_DOUBLE (KC_DELETE, LCTL(KC_DELETE)) diff --git a/users/yet-another-developer/config.h b/users/yet-another-developer/config.h index 6d1bf83f0b..030872d3dd 100644 --- a/users/yet-another-developer/config.h +++ b/users/yet-another-developer/config.h @@ -31,7 +31,7 @@ // actually sends Ctrl-x. That's bad.) #define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD -//#define TAPPING_FORCE_HOLD +//#define QUICK_TAP_TERM 0 //#define RETRO_TAPPING #ifndef TAPPING_TOGGLE diff --git a/users/yet-another-developer/tap_dances.c b/users/yet-another-developer/tap_dances.c index 66dcc60fa5..cde0cb832e 100644 --- a/users/yet-another-developer/tap_dances.c +++ b/users/yet-another-developer/tap_dances.c @@ -1,6 +1,6 @@ #include "tap_dances.h" -void td_parenthesis (qk_tap_dance_state_t *state, void *user_data) { +void td_parenthesis (tap_dance_state_t *state, void *user_data) { if (state->count == 1) { // SEND_STRING ("\("); tap_code(KC_QUOT); @@ -24,7 +24,7 @@ void td_parenthesis (qk_tap_dance_state_t *state, void *user_data) { } } -void safe_reset(qk_tap_dance_state_t *state, void *user_data) { +void safe_reset(tap_dance_state_t *state, void *user_data) { if (state->count >= 3) { // Reset the keyboard if you tap the key more than three times reset_keyboard(); @@ -32,7 +32,7 @@ void safe_reset(qk_tap_dance_state_t *state, void *user_data) { } } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_RESET] = ACTION_TAP_DANCE_FN(safe_reset), [TD_NUM1] = ACTION_TAP_DANCE_DOUBLE(KC_1, KC_4), [TD_NUM2] = ACTION_TAP_DANCE_DOUBLE(KC_2, KC_5), diff --git a/users/yet-another-developer/tap_dances.h b/users/yet-another-developer/tap_dances.h index 8afda817cb..ca925e71bd 100644 --- a/users/yet-another-developer/tap_dances.h +++ b/users/yet-another-developer/tap_dances.h @@ -23,4 +23,4 @@ enum { TD_ABR // single double angle brackets }; #endif // TAP_DANCE_ENABLE -void td_parenthesis (qk_tap_dance_state_t *state, void *user_data); +void td_parenthesis (tap_dance_state_t *state, void *user_data); diff --git a/users/yet-another-developer/unicode.c b/users/yet-another-developer/unicode.c index 8b312deb66..f0168cef9f 100644 --- a/users/yet-another-developer/unicode.c +++ b/users/yet-another-developer/unicode.c @@ -1,7 +1,7 @@ #include "unicode.h" //#ifdef UNICODEMAP_ENABLE -const uint32_t PROGMEM unicode_map[] = { +const uint32_t unicode_map[] PROGMEM = { [BANG] = 0x0203D,// ‽ [IRONY] = 0x02E2E,// ⸮ [DEGREE] = 0x000B0,// ° diff --git a/users/zer09/tap_dance.c b/users/zer09/tap_dance.c index 4c7d182d8a..dc87f31eb5 100644 --- a/users/zer09/tap_dance.c +++ b/users/zer09/tap_dance.c @@ -1,7 +1,7 @@ #include "tap_dance.h" #include "lights.h" -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [DA_LCTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_lctl_finished, dance_lctl_reset), [DA_LSPR] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_lspr_finished, @@ -40,7 +40,7 @@ void layer_switcher_tap(uint8_t new_layer) { } } -int cur_dance(qk_tap_dance_state_t *state) { +int cur_dance(tap_dance_state_t *state) { switch (state->count) { case 1: return state->pressed == 0 ? SINGLE_TAP : SINGLE_HOLD; @@ -53,17 +53,17 @@ int cur_dance(qk_tap_dance_state_t *state) { } } -void dance_lctl_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_lctl_finished(tap_dance_state_t *state, void *user_data) { rbw_led_keys[RBW_LCTL].status = ENABLED; register_code(KC_LCTL); }; -void dance_lctl_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_lctl_reset(tap_dance_state_t *state, void *user_data) { unregister_code(KC_LCTL); rbw_led_keys[RBW_LCTL].status = DISABLED; }; -void dance_lspr_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_lspr_finished(tap_dance_state_t *state, void *user_data) { lsprtap_state.state = cur_dance(state); switch (lsprtap_state.state) { @@ -77,7 +77,7 @@ void dance_lspr_finished(qk_tap_dance_state_t *state, void *user_data) { } }; -void dance_lspr_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_lspr_reset(tap_dance_state_t *state, void *user_data) { switch (lsprtap_state.state) { case DOUBLE_HOLD: unregister_code(KC_LALT); @@ -89,17 +89,17 @@ void dance_lspr_reset(qk_tap_dance_state_t *state, void *user_data) { } }; -void dance_rctl_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_rctl_finished(tap_dance_state_t *state, void *user_data) { rbw_led_keys[RBW_RCTL].status = ENABLED; register_code(KC_RCTL); }; -void dance_rctl_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_rctl_reset(tap_dance_state_t *state, void *user_data) { unregister_code(KC_RCTL); rbw_led_keys[RBW_RCTL].status = DISABLED; }; -void dance_ralt_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_ralt_finished(tap_dance_state_t *state, void *user_data) { ralttap_state.state = cur_dance(state); switch (ralttap_state.state) { @@ -113,7 +113,7 @@ void dance_ralt_finished(qk_tap_dance_state_t *state, void *user_data) { } }; -void dance_ralt_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_ralt_reset(tap_dance_state_t *state, void *user_data) { switch (ralttap_state.state) { case DOUBLE_HOLD: unregister_code(KC_RGUI); @@ -125,7 +125,7 @@ void dance_ralt_reset(qk_tap_dance_state_t *state, void *user_data) { } }; -void dance_uply_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_uply_finished(tap_dance_state_t *state, void *user_data) { upltap_state.state = cur_dance(state); switch (upltap_state.state) { @@ -145,7 +145,7 @@ void dance_uply_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void dance_uply_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_uply_reset(tap_dance_state_t *state, void *user_data) { switch (upltap_state.state) { case SINGLE_TAP: break; @@ -157,7 +157,7 @@ void dance_uply_reset(qk_tap_dance_state_t *state, void *user_data) { upltap_state.state = 0; } -void dance_dwly_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_dwly_finished(tap_dance_state_t *state, void *user_data) { dwltap_state.state = cur_dance(state); switch (dwltap_state.state) { @@ -188,7 +188,7 @@ void dance_dwly_finished(qk_tap_dance_state_t *state, void *user_data) { } } -void dance_dwly_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_dwly_reset(tap_dance_state_t *state, void *user_data) { switch (dwltap_state.state) { case SINGLE_TAP: break; diff --git a/users/zer09/tap_dance.h b/users/zer09/tap_dance.h index 555c159248..293b5eedc5 100644 --- a/users/zer09/tap_dance.h +++ b/users/zer09/tap_dance.h @@ -32,24 +32,24 @@ enum { extern volatile uint8_t active_layer; void layer_switcher_tap(uint8_t); -int cur_dance(qk_tap_dance_state_t *); +int cur_dance(tap_dance_state_t *); -void dance_lctl_finished(qk_tap_dance_state_t *, void *); -void dance_lctl_reset(qk_tap_dance_state_t *, void *); +void dance_lctl_finished(tap_dance_state_t *, void *); +void dance_lctl_reset(tap_dance_state_t *, void *); -void dance_lspr_finished(qk_tap_dance_state_t *, void *); -void dance_lspr_reset(qk_tap_dance_state_t *, void *); +void dance_lspr_finished(tap_dance_state_t *, void *); +void dance_lspr_reset(tap_dance_state_t *, void *); -void dance_rctl_finished(qk_tap_dance_state_t *, void *); -void dance_rctl_reset(qk_tap_dance_state_t *, void *); +void dance_rctl_finished(tap_dance_state_t *, void *); +void dance_rctl_reset(tap_dance_state_t *, void *); -void dance_ralt_finished(qk_tap_dance_state_t *, void *); -void dance_ralt_reset(qk_tap_dance_state_t *, void *); +void dance_ralt_finished(tap_dance_state_t *, void *); +void dance_ralt_reset(tap_dance_state_t *, void *); -void dance_uply_finished(qk_tap_dance_state_t *, void *); -void dance_uply_reset(qk_tap_dance_state_t *, void *); +void dance_uply_finished(tap_dance_state_t *, void *); +void dance_uply_reset(tap_dance_state_t *, void *); -void dance_dwly_finished(qk_tap_dance_state_t *, void *); -void dance_dwly_reset(qk_tap_dance_state_t *, void *); +void dance_dwly_finished(tap_dance_state_t *, void *); +void dance_dwly_reset(tap_dance_state_t *, void *); #endif diff --git a/users/zigotica/tapdances.c b/users/zigotica/tapdances.c index 06015fc64d..69390d244c 100644 --- a/users/zigotica/tapdances.c +++ b/users/zigotica/tapdances.c @@ -13,7 +13,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "tapdances.h" -void ios_media(qk_tap_dance_state_t *state, void *user_data) { +void ios_media(tap_dance_state_t *state, void *user_data) { if (state->count == 1) { tap_code(KC_MPLY); } else if (state->count == 2) { @@ -25,7 +25,7 @@ void ios_media(qk_tap_dance_state_t *state, void *user_data) { } } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [0] = ACTION_TAP_DANCE_FN(ios_media), [1] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_SCLN), [2] = ACTION_TAP_DANCE_DOUBLE(KC_DOT, KC_COLON), diff --git a/users/zyber/zyber.c b/users/zyber/zyber.c index 63915ddbd4..72852d091a 100644 --- a/users/zyber/zyber.c +++ b/users/zyber/zyber.c @@ -65,14 +65,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } /* Screenshoot */ -void dance_SSHT_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_SSHT_finished(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { tap_code16(C(S(G(KC_4)))); } else { tap_code(KC_4); } } -void dance_SSHT_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_SSHT_reset(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { unregister_code16(C(S(G(KC_4)))); } else { @@ -81,14 +81,14 @@ void dance_SSHT_reset(qk_tap_dance_state_t *state, void *user_data) { } /* Å */ -void dance_LBRC_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_LBRC_finished(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { tap_code16(A(KC_LBRC)); } else { tap_code(KC_LBRC); } } -void dance_LBRC_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_LBRC_reset(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { unregister_code16(A(KC_LBRC)); } else { @@ -97,14 +97,14 @@ void dance_LBRC_reset(qk_tap_dance_state_t *state, void *user_data) { } /* Ö */ -void dance_SCLN_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_SCLN_finished(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { tap_code16(A(KC_SCLN)); } else { tap_code(KC_SCLN); } } -void dance_SCLN_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_SCLN_reset(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { unregister_code16(A(KC_SCLN)); } else { @@ -113,14 +113,14 @@ void dance_SCLN_reset(qk_tap_dance_state_t *state, void *user_data) { } /* Ä */ -void dance_QUOT_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_QUOT_finished(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { tap_code16(A(KC_QUOT)); } else { tap_code(KC_QUOT); } } -void dance_QUOT_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_QUOT_reset(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { unregister_code16(A(KC_QUOT)); } else { @@ -128,7 +128,7 @@ void dance_QUOT_reset(qk_tap_dance_state_t *state, void *user_data) { } } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [SSHT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_SSHT_finished, dance_SSHT_reset), [LBRC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LBRC_finished, dance_LBRC_reset), [SCLN] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_SCLN_finished, dance_SCLN_reset), diff --git a/users/zyber/zyber.h b/users/zyber/zyber.h index d5f114e852..018d0f5e85 100644 --- a/users/zyber/zyber.h +++ b/users/zyber/zyber.h @@ -23,11 +23,11 @@ enum tap_dances { bool process_record_user(uint16_t keycode, keyrecord_t *record); -void dance_SSHT_finished(qk_tap_dance_state_t *state, void *user_data); -void dance_SSHT_reset(qk_tap_dance_state_t *state, void *user_data); -void dance_LBRC_finished(qk_tap_dance_state_t *state, void *user_data); -void dance_LBRC_reset(qk_tap_dance_state_t *state, void *user_data); -void dance_SCLN_finished(qk_tap_dance_state_t *state, void *user_data); -void dance_SCLN_reset(qk_tap_dance_state_t *state, void *user_data); -void dance_QUOT_finished(qk_tap_dance_state_t *state, void *user_data); -void dance_QUOT_reset(qk_tap_dance_state_t *state, void *user_data); +void dance_SSHT_finished(tap_dance_state_t *state, void *user_data); +void dance_SSHT_reset(tap_dance_state_t *state, void *user_data); +void dance_LBRC_finished(tap_dance_state_t *state, void *user_data); +void dance_LBRC_reset(tap_dance_state_t *state, void *user_data); +void dance_SCLN_finished(tap_dance_state_t *state, void *user_data); +void dance_SCLN_reset(tap_dance_state_t *state, void *user_data); +void dance_QUOT_finished(tap_dance_state_t *state, void *user_data); +void dance_QUOT_reset(tap_dance_state_t *state, void *user_data); |