diff options
Diffstat (limited to 'users')
50 files changed, 52 insertions, 129 deletions
diff --git a/users/art/funcs/string_funcs.c b/users/art/funcs/string_funcs.c index 319b1310e4..1ea86779cc 100644 --- a/users/art/funcs/string_funcs.c +++ b/users/art/funcs/string_funcs.c @@ -37,10 +37,8 @@ enum combo_events { ED_ENTER, ED_CS_ENTER, - BSPC_LSFT_CLEAR, - COMBO_LENGTH + BSPC_LSFT_CLEAR }; -uint16_t COMBO_LEN = COMBO_LENGTH; // do not remove - needed for combos to work const uint16_t PROGMEM combo_up[] = {KC_W, KC_R, COMBO_END}; const uint16_t PROGMEM combo_left[] = {KC_S, KC_E, COMBO_END}; @@ -122,7 +120,7 @@ void process_combo_event(uint16_t combo_index, bool pressed) { tap_code16(A(KC_RIGHT)); } } - break; + break; case BSPC_LSFT_CLEAR: if (pressed) { tap_code16(KC_END); @@ -134,7 +132,7 @@ void process_combo_event(uint16_t combo_index, bool pressed) { if (pressed) { tap_code16(C(S(KC_ENTER))); } - break; + break; } } @@ -210,63 +208,63 @@ void send_string_with_translation(char *string) { case 'w': toPrint = 'd'; - break; + break; case 'e': toPrint = 'r'; - break; + break; case 'r': toPrint = 'w'; - break; + break; case 't': toPrint = 'b'; - break; + break; case 'y': toPrint = 'j'; - break; + break; case 'u': toPrint = 'f'; - break; + break; case 'i': toPrint = 'u'; - break; + break; case 'o': toPrint = 'p'; - break; + break; case 'p': toPrint = ';'; - break; + break; case 'd': toPrint = 'h'; - break; + break; case 'f': toPrint = 't'; - break; + break; case 'h': toPrint = 'y'; - break; + break; case 'j': toPrint = 'n'; - break; + break; case 'k': toPrint = 'e'; - break; + break; case 'l': toPrint = 'o'; - break; + break; case ';': toPrint = 'i'; - break; + break; case 'b': toPrint = 'm'; - break; + break; case 'n': toPrint = 'k'; - break; + break; case 'm': toPrint = 'l'; - break; + break; } if (isUpperCase) { isUpperCase = 0; @@ -306,4 +304,4 @@ void send_shifted_strings_add(char *string1, char *string2) { send_string(string2); char_to_bspace = strlen(string1) + strlen(string2); } -}
\ No newline at end of file +} diff --git a/users/bcat/bcat.h b/users/bcat/bcat.h index 4a88acba7d..6fc84937c4 100644 --- a/users/bcat/bcat.h +++ b/users/bcat/bcat.h @@ -18,7 +18,7 @@ #include <stdbool.h> -#include "keymap.h" +#include "keycodes.h" /* Layer numbers shared across keymaps. */ enum user_layer { diff --git a/users/curry/config.h b/users/curry/config.h index d5e1ba7bc5..94e09350cd 100644 --- a/users/curry/config.h +++ b/users/curry/config.h @@ -71,7 +71,6 @@ # define ONESHOT_TIMEOUT 3000 #endif // !ONESHOT_TIMEOUT -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD #define FORCE_NKRO diff --git a/users/cwebster2/config.h b/users/cwebster2/config.h index 313e6d533f..caee7d184d 100644 --- a/users/cwebster2/config.h +++ b/users/cwebster2/config.h @@ -20,7 +20,6 @@ #define TAPPING_TERM_PER_KEY //#define QUICK_TAP_TERM 0 #undef PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define NO_ACTION_ONESHOT #ifdef AUTO_SHIFT_ENABLE diff --git a/users/danielo515/combo.c b/users/danielo515/combo.c index b33cb838bc..dae53f6e85 100644 --- a/users/danielo515/combo.c +++ b/users/danielo515/combo.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM n_m[] = {KC_N, KC_M, COMBO_END}; const uint16_t PROGMEM o_p_combo[] = {KC_O, KC_P, COMBO_END}; const uint16_t PROGMEM m_cm_dot_combo[] = {KC_M, KC_COMMA, KC_DOT, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [JK_ESC] = COMBO(jk_combo, KC_ESC), [YU_COM] = COMBO(yu_combo, KC_AMPR), [UI_COM] = COMBO(ui_combo, KC_CIRC), diff --git a/users/danielo515/config.h b/users/danielo515/config.h index 11007eb27f..c5f9b08389 100644 --- a/users/danielo515/config.h +++ b/users/danielo515/config.h @@ -1,7 +1,6 @@ #pragma once #if defined(COMBO_ENABLE) -# define COMBO_COUNT 11 # define COMBO_TERM 25 #endif // !COMBO_ENABLE // Timeout settings for leader key diff --git a/users/drashna/config.h b/users/drashna/config.h index 465ea63ee2..b4aa1283eb 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h @@ -62,7 +62,6 @@ # define HOLD_ON_OTHER_KEY_PRESS_PER_KEY # define TAPPING_TERM_PER_KEY #else -# define IGNORE_MOD_TAP_INTERRUPT # undef PERMISSIVE_HOLD #endif diff --git a/users/dshields/config.h b/users/dshields/config.h index 860d984c98..83ad32a591 100644 --- a/users/dshields/config.h +++ b/users/dshields/config.h @@ -4,7 +4,6 @@ #define USB_MAX_POWER_CONSUMPTION 100 #define ONESHOT_TAP_TOGGLE 2 #define ONESHOT_TIMEOUT 3000 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD_PER_KEY #define QUICK_TAP_TERM_PER_KEY #define TAPPING_TERM 200 diff --git a/users/ericgebhart/config.h b/users/ericgebhart/config.h index 6cd983b37b..fe0f41327d 100644 --- a/users/ericgebhart/config.h +++ b/users/ericgebhart/config.h @@ -44,11 +44,9 @@ #undef TAPPING_TOGGLE #undef TAPPING_TERM -#undef IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TOGGLE 2 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define TAP_HOLD_TERM 200 diff --git a/users/ericgebhart/extensions/keymap_combo.h b/users/ericgebhart/extensions/keymap_combo.h index cd9684e601..e918fa08ea 100644 --- a/users/ericgebhart/extensions/keymap_combo.h +++ b/users/ericgebhart/extensions/keymap_combo.h @@ -52,10 +52,7 @@ void process_combo_event(uint16_t combo_index, bool pressed); #define TOGG A_ENUM enum combos { #include "combos.def" - COMBO_LENGTH }; -// Export length to combo module -uint16_t COMBO_LEN = COMBO_LENGTH; // Bake combos into mem #undef COMB diff --git a/users/ericgebhart/miryoku_hd_gold_config.h b/users/ericgebhart/miryoku_hd_gold_config.h index 8b5d06da3a..9eafdd2a5a 100644 --- a/users/ericgebhart/miryoku_hd_gold_config.h +++ b/users/ericgebhart/miryoku_hd_gold_config.h @@ -56,11 +56,9 @@ #undef TAPPING_TOGGLE #undef TAPPING_TERM -#undef IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TOGGLE 2 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define TAP_HOLD_TERM 200 diff --git a/users/ibnuda/combo.h b/users/ibnuda/combo.h index d7e79764a9..c4fd5f12ed 100644 --- a/users/ibnuda/combo.h +++ b/users/ibnuda/combo.h @@ -64,7 +64,7 @@ const uint16_t PROGMEM rl_i_ii_combo[] = {RLI, RLII, COMBO_END}; // both hand combinations. const uint16_t PROGMEM bl_m_m_combo[] = {LLM, RLM, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { // left hand combinations. [R_U_PINKY_RING] = COMBO(lu_p_r_combo, KC_TAB), [R_U_RING_MIDDLE] = COMBO(lu_r_m_combo, KC_QUES), @@ -93,4 +93,4 @@ combo_t key_combos[COMBO_COUNT] = { // both hand combinations. [B_L_MIDDLE_MIDDLE] = COMBO(bl_m_m_combo, KC_ENT), -};
\ No newline at end of file +}; diff --git a/users/ibnuda/config.h b/users/ibnuda/config.h index f9a89389b6..957d24a04c 100644 --- a/users/ibnuda/config.h +++ b/users/ibnuda/config.h @@ -1,7 +1,5 @@ #pragma once #define COMBO_TERM 50 -#define COMBO_COUNT 50 -#define IGNORE_MOD_TAP_INTERRUPT -#define PERMISSIVE_HOLD
\ No newline at end of file +#define PERMISSIVE_HOLD diff --git a/users/ishtob/config.h b/users/ishtob/config.h index 98a3a5537e..993521acc4 100755 --- a/users/ishtob/config.h +++ b/users/ishtob/config.h @@ -22,7 +22,7 @@ //#define AUDIO_CLICKY_FREQ_RANDOMNESS 1.0f /* ws2812 RGB LED -#define RGB_DI_PIN B5 +#define WS2812_DI_PIN B5 #define RGBLED_NUM 8 // Number of LEDs #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 diff --git a/users/ishtob/ishtob.h b/users/ishtob/ishtob.h index 4d8e9eb4ed..fd9e19c809 100644 --- a/users/ishtob/ishtob.h +++ b/users/ishtob/ishtob.h @@ -1,6 +1,6 @@ #ifndef USERSPACE #define USERSPACE -#include "quantum.h" +#include QMK_KEYBOARD_H enum userspace_keycodes { QWERTY = SAFE_RANGE, diff --git a/users/issmirnov/config.h b/users/issmirnov/config.h index 5fe78f7a53..a74f6fbc91 100644 --- a/users/issmirnov/config.h +++ b/users/issmirnov/config.h @@ -21,7 +21,6 @@ #define ONESHOT_TIMEOUT 2000 // Enable combos for vim -#define COMBO_COUNT 5 // Specify the number of combos used. BE SURE TO INCREMENT AS NEEDED #define COMBO_TERM 50 // window in milliseconds to trigger combo // Allow more than 4 keys to be sent to the system. Useful for gaming. diff --git a/users/issmirnov/issmirnov.c b/users/issmirnov/issmirnov.c index 45ef7b19a7..ecfb423ee2 100644 --- a/users/issmirnov/issmirnov.c +++ b/users/issmirnov/issmirnov.c @@ -15,9 +15,7 @@ const uint16_t PROGMEM sd_combo[] = {KC_S, KC_D, COMBO_END}; const uint16_t PROGMEM copy_combo[] = {KC_X, KC_C, COMBO_END}; const uint16_t PROGMEM paste_combo[] = {KC_X, KC_V, COMBO_END}; - -// BE SURE TO UPDATE THE CONFIG.H "COMBO_COUNT" value when you add elements here! -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { COMBO(jk_combo, KC_ESC), COMBO(df_combo, KC_COLON), COMBO(sd_combo, KC_SLASH), diff --git a/users/jarred/config.h b/users/jarred/config.h index e63ec4d9b7..bea1f48310 100644 --- a/users/jarred/config.h +++ b/users/jarred/config.h @@ -37,12 +37,10 @@ #undef TAPPING_TOGGLE #undef TAPPING_TERM -#undef IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #ifdef AUDIO_ENABLE #define STARTUP_SONG SONG(PLANCK_SOUND) diff --git a/users/kuchosauronad0/combo.h b/users/kuchosauronad0/combo.h index e2ff09ab5a..6fb3eaf58c 100644 --- a/users/kuchosauronad0/combo.h +++ b/users/kuchosauronad0/combo.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "quantum.h" enum combo_events { ZV_COPY, @@ -12,10 +12,9 @@ const uint16_t PROGMEM cut_combo[] = {KC_X, KC_V, COMBO_END}; const uint16_t PROGMEM paste_combo[] = {KC_C, KC_V, COMBO_END}; const uint16_t PROGMEM sleep_combo[] = {KC_Q, KC_P, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [ZV_COPY] = COMBO_ACTION(copy_combo), [XV_CUT] = COMBO_ACTION(cut_combo), [CV_PASTE] = COMBO_ACTION(paste_combo), [QP_SLEEP] = COMBO_ACTION(sleep_combo), }; - diff --git a/users/kuchosauronad0/config.h b/users/kuchosauronad0/config.h index bc0fe67df8..58ef7a20f8 100644 --- a/users/kuchosauronad0/config.h +++ b/users/kuchosauronad0/config.h @@ -56,7 +56,6 @@ #endif // !LEADER_ENABLE #if defined(COMBO_ENABLE) -# define COMBO_COUNT 4 # define COMBO_TERM 150 #endif // !COMBO_ENABLE @@ -64,11 +63,6 @@ # define FORCE_NKRO #endif // !NKRO_ENABLE -// this makes it possible to do rolling combos (zx) with keys that -// convert to other keys on hold (z becomes ctrl when you hold it, -// and when this option isn't enabled, z rapidly followed by x -// actually sends Ctrl-x. That's bad.) -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD //#define QUICK_TAP_TERM 0 //#define RETRO_TAPPING diff --git a/users/manna-harbour_miryoku/config.h b/users/manna-harbour_miryoku/config.h index 429e08493d..f2bc9c331b 100644 --- a/users/manna-harbour_miryoku/config.h +++ b/users/manna-harbour_miryoku/config.h @@ -11,8 +11,6 @@ #undef TAPPING_TERM #define TAPPING_TERM 200 -// Prevent normal rollover on alphas from accidentally triggering mods. -#define IGNORE_MOD_TAP_INTERRUPT // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. #define QUICK_TAP_TERM 0 @@ -36,7 +34,6 @@ // Thumb Combos #if defined (MIRYOKU_KLUDGE_THUMBCOMBOS) - #define COMBO_COUNT 8 #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 389580759b..58b68c2727 100644 --- a/users/manna-harbour_miryoku/manna-harbour_miryoku.c +++ b/users/manna-harbour_miryoku/manna-harbour_miryoku.c @@ -74,7 +74,7 @@ const uint16_t PROGMEM thumbcombos_sym[] = {KC_UNDS, KC_LPRN, COMBO_END}; const uint16_t PROGMEM thumbcombos_sym[] = {KC_RPRN, KC_UNDS, COMBO_END}; #endif const uint16_t PROGMEM thumbcombos_fun[] = {KC_SPC, KC_TAB, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { COMBO(thumbcombos_base_right, LT(U_FUN, KC_DEL)), COMBO(thumbcombos_base_left, LT(U_MEDIA, KC_ESC)), COMBO(thumbcombos_nav, KC_DEL), diff --git a/users/mattly/config.h b/users/mattly/config.h index 0f7ce4a64b..bea04255aa 100644 --- a/users/mattly/config.h +++ b/users/mattly/config.h @@ -1,6 +1,5 @@ #pragma once -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define TAPPING_TOGGLE 2 #define TAPPING_TERM 200 diff --git a/users/mechmerlin/config.h b/users/mechmerlin/config.h index ec3b3e81e8..e5f0f397d4 100644 --- a/users/mechmerlin/config.h +++ b/users/mechmerlin/config.h @@ -1,5 +1,7 @@ #pragma once +#define TAP_CODE_DELAY 10 + #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_SLEEP #define RGBLIGHT_EFFECT_BREATHING diff --git a/users/mechmerlin/mechmerlin.c b/users/mechmerlin/mechmerlin.c index 23def968d4..5c8ecb9007 100644 --- a/users/mechmerlin/mechmerlin.c +++ b/users/mechmerlin/mechmerlin.c @@ -1,8 +1,6 @@ #include "mechmerlin.h" #include "version.h" -#define TAP_CODE_DELAY 10 - bool process_record_user(uint16_t keycode, keyrecord_t *record) { static uint16_t fnx_layer_timer; @@ -26,4 +24,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; } return true; -}
\ No newline at end of file +} diff --git a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c index 17122f4a63..12547ec508 100644 --- a/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c +++ b/users/miles2go/keymaps/handwired/ms_sculpt_mobile/keymap.c @@ -248,9 +248,7 @@ void keyboard_post_init_user(void) { void matrix_init_user(void) { #ifdef RGBLIGHT_ENABLE - #ifdef RGB_DI_PIN rgblight_setrgb(RGB_GREEN); - #endif #endif //RGB_matrix } diff --git a/users/muppetjones/config.h b/users/muppetjones/config.h index 583567d4f3..742a97950d 100644 --- a/users/muppetjones/config.h +++ b/users/muppetjones/config.h @@ -30,14 +30,9 @@ // -- used for tap dance and other tap mods # define TAPPING_TERM 175 -// Prevent normal rollover on alphas from accidentally triggering mods. -# define IGNORE_MOD_TAP_INTERRUPT - // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. # define QUICK_TAP_TERM 0 #endif - -#define COMBO_COUNT 3 #define COMBO_TERM 40 diff --git a/users/muppetjones/features/combos.c b/users/muppetjones/features/combos.c index a6d14bb25c..a357b3ad4e 100644 --- a/users/muppetjones/features/combos.c +++ b/users/muppetjones/features/combos.c @@ -27,8 +27,7 @@ const uint16_t PROGMEM h_comm_tab[] = {KC_H, KC_COMM, COMBO_END}; const uint16_t PROGMEM l_u_scln[] = {KC_L, KC_U, COMBO_END}; const uint16_t PROGMEM j_m_caps[] = {KC_J, KC_M, COMBO_END}; -// COMBO_COUNT defined in config.h -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [H_COMM_TAB] = COMBO(h_comm_tab, KC_TAB), [L_U_SCLN] = COMBO(l_u_scln, KC_SCLN), [J_M_CAPS] = COMBO(j_m_caps, KC_CAPS), diff --git a/users/narze/superduper.c b/users/narze/superduper.c index b497ce2e68..7545685727 100644 --- a/users/narze/superduper.c +++ b/users/narze/superduper.c @@ -24,7 +24,7 @@ const uint16_t PROGMEM superduper_combos[SUPERDUPER_COMBO_COUNT][3] = { [_QWOC] = {CM_S, CM_D, COMBO_END}, }; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [CB_SUPERDUPER] = COMBO_ACTION(superduper_combos[_QWERTY]), }; diff --git a/users/ninjonas/combos.c b/users/ninjonas/combos.c index 8d1cd6510f..3346af4ce4 100644 --- a/users/ninjonas/combos.c +++ b/users/ninjonas/combos.c @@ -15,7 +15,7 @@ const uint16_t PROGMEM tab_combo[] = {KC_Q, KC_T, COMBO_END}; const uint16_t PROGMEM copy_combo[] = {KC_Z, KC_C, COMBO_END}; const uint16_t PROGMEM paste_combo[] = {KC_X, KC_V, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [EQ_QUIT] = COMBO_ACTION(quit_combo), [RW_CLOSE] = COMBO_ACTION(close_combo), [QT_TAB] = COMBO_ACTION(tab_combo), @@ -52,4 +52,4 @@ void process_combo_event(uint16_t combo_index, bool pressed) { break; } } -#endif
\ No newline at end of file +#endif diff --git a/users/ninjonas/config.h b/users/ninjonas/config.h index 565e40e841..17bb03865c 100644 --- a/users/ninjonas/config.h +++ b/users/ninjonas/config.h @@ -15,8 +15,6 @@ #define MOUSEKEY_WHEEL_DELAY 0 #ifdef COMBO_ENABLE - #undef COMBO_COUNT #undef COMBO_TERM - #define COMBO_COUNT 5 #define COMBO_TERM 60 #endif diff --git a/users/pdl/pdl.c b/users/pdl/pdl.c index 5b90a0b310..1ad2e02c12 100644 --- a/users/pdl/pdl.c +++ b/users/pdl/pdl.c @@ -181,7 +181,7 @@ const uint16_t PROGMEM xcombo_redo[] = {KC_B, KC_H, COMBO_END}; const uint16_t PROGMEM xcombo_pgup[] = {KC_G, KC_B, COMBO_END}; const uint16_t PROGMEM xcombo_pgdn[] = {KC_G, KC_K, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [VCOMBO_PU] = COMBO(vcombo_pu, KC_CIRC), [VCOMBO_NU] = COMBO(vcombo_nu, KC_LBRC), [VCOMBO_EU] = COMBO(vcombo_eu, LSFT(KC_9)), diff --git a/users/pvinis/config.h b/users/pvinis/config.h index 14ec0dc8f1..01bb47dde1 100644 --- a/users/pvinis/config.h +++ b/users/pvinis/config.h @@ -1,7 +1,5 @@ #pragma once -// allow rolling when keys have hold functionality -#define IGNORE_MOD_TAP_INTERRUPT // #define TAPPING_TERM 150 #if defined(MOUSE_KEYS) diff --git a/users/ridingqwerty/config.h b/users/ridingqwerty/config.h index 291c4877e1..2bb32a0120 100644 --- a/users/ridingqwerty/config.h +++ b/users/ridingqwerty/config.h @@ -8,4 +8,3 @@ #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/rmeli/config.h b/users/rmeli/config.h index 5c31462d35..c51093ab38 100644 --- a/users/rmeli/config.h +++ b/users/rmeli/config.h @@ -27,10 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define AUTO_SHIFT_REPEAT #endif -#ifdef HOME_ROW_MODS_ENABLED -# define IGNORE_MOD_TAP_INTERRUPT -#endif - #ifdef CAPS_WORD_ENABLE # define BOTH_SHIFTS_TURNS_ON_CAPS_WORD //#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD diff --git a/users/snowe/snowe.h b/users/snowe/snowe.h index 6a2fc2aba1..caba9d21bc 100644 --- a/users/snowe/snowe.h +++ b/users/snowe/snowe.h @@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "wrappers.h" #include "keycode_aliases.h" -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD //#if defined(RGBLIGHT_ENABLE) diff --git a/users/talljoe/config.h b/users/talljoe/config.h index dcdbbd89f4..6cf0605be3 100644 --- a/users/talljoe/config.h +++ b/users/talljoe/config.h @@ -19,5 +19,4 @@ #define RESET_LAYER 15 -#define COMBO_COUNT 2 #define COMBO_TERM 250 diff --git a/users/talljoe/rules.mk b/users/talljoe/rules.mk index 9338568b97..957ce2a71a 100644 --- a/users/talljoe/rules.mk +++ b/users/talljoe/rules.mk @@ -1,4 +1,6 @@ -SRC += talljoe.c macros.c $(wildcard users/talljoe/tapdance/*.c) +INTROSPECTION_KEYMAP_C = talljoe.c + +SRC += macros.c $(wildcard users/talljoe/tapdance/*.c) ifeq ($(strip $(VISUALIZER_ENABLE)), yes) SRC += visualizer.c endif diff --git a/users/talljoe/talljoe.c b/users/talljoe/talljoe.c index 5e58bc9e3f..61158be760 100644 --- a/users/talljoe/talljoe.c +++ b/users/talljoe/talljoe.c @@ -205,7 +205,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; #ifdef ZEAL_RGB case BL_TOGG: - if (IS_PRESSED(record->event)) { + if (record->event.pressed) { if (g_config.effect) { last_effect = g_config.effect; g_config.effect = 0; @@ -215,7 +215,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return false; case EFFECT...EFFECT_END: - if (IS_PRESSED(record->event)) { + if (record->event.pressed) { uint8_t effect = keycode - EFFECT; if(effect == g_config.effect) effect = 0; // Toggle effect on second press diff --git a/users/toinux/keymap_qwerty_fr.h b/users/toinux/keymap_qwerty_fr.h index 4bd50c4075..3c0195c7f0 100644 --- a/users/toinux/keymap_qwerty_fr.h +++ b/users/toinux/keymap_qwerty_fr.h @@ -16,7 +16,7 @@ #pragma once -#include "keymap.h" +#include "keycodes.h" // clang-format off diff --git a/users/tominabox1/tominabox1.c b/users/tominabox1/tominabox1.c index 44f4c7795c..2c3c1ac9ff 100644 --- a/users/tominabox1/tominabox1.c +++ b/users/tominabox1/tominabox1.c @@ -100,7 +100,6 @@ tap_dance_action_t tap_dance_actions[] = { }; #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #ifdef KEYBOARD_crkbd_rev1 diff --git a/users/uqs/config.h b/users/uqs/config.h index 455aae9da8..94e50d063b 100644 --- a/users/uqs/config.h +++ b/users/uqs/config.h @@ -16,7 +16,6 @@ #define TAPPING_TERM 170 // ms to trigger tap // https://precondition.github.io/home-row-mods #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. #define LEADER_TIMEOUT 400 diff --git a/users/uqs/uqs.c b/users/uqs/uqs.c index 83733bbe2a..cd5e86bdcb 100644 --- a/users/uqs/uqs.c +++ b/users/uqs/uqs.c @@ -125,8 +125,6 @@ const uint16_t PROGMEM my_combos[][4] = { {KC_BTN1, KC_BTN2, KC_BTN3, COMBO_END}, }; -const uint16_t COMBO_LEN = ARRAY_SIZE(my_action_combos) + ARRAY_SIZE(my_combos); - #define MY_ACTION_COMBO(ck) \ [ck] = { .keys = &(my_action_combos[ck][0]) } #define MY_COMBO(ck) \ diff --git a/users/vosechu/config.h b/users/vosechu/config.h index 81d9305d50..7f4f000c41 100644 --- a/users/vosechu/config.h +++ b/users/vosechu/config.h @@ -1,10 +1,5 @@ #pragma once -// this makes it possible to do rolling combos (zx) with keys that -// convert to other keys on hold (z becomes ctrl when you hold it, -// and when this option isn't enabled, z rapidly followed by x -// actually sends Ctrl-x. That's bad.) -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD //#define QUICK_TAP_TERM 0 //#define RETRO_TAPPING diff --git a/users/wanleg/config.h b/users/wanleg/config.h index d29054694c..984bdf6194 100644 --- a/users/wanleg/config.h +++ b/users/wanleg/config.h @@ -40,10 +40,6 @@ #define PERMISSIVE_HOLD -//// Disable mod tap interrrupt -//#ifndef IGNORE_MOD_TAP_INTERRUPT -//#define IGNORE_MOD_TAP_INTERRUPT -//#endif // !mod tap interrrupt //set max breathing brightness on kbd6x #if defined(KEYBOARD_kbdfans_kbd6x) diff --git a/users/yet-another-developer/combo.h b/users/yet-another-developer/combo.h index e2ff09ab5a..6fb3eaf58c 100644 --- a/users/yet-another-developer/combo.h +++ b/users/yet-another-developer/combo.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "quantum.h" enum combo_events { ZV_COPY, @@ -12,10 +12,9 @@ const uint16_t PROGMEM cut_combo[] = {KC_X, KC_V, COMBO_END}; const uint16_t PROGMEM paste_combo[] = {KC_C, KC_V, COMBO_END}; const uint16_t PROGMEM sleep_combo[] = {KC_Q, KC_P, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [ZV_COPY] = COMBO_ACTION(copy_combo), [XV_CUT] = COMBO_ACTION(cut_combo), [CV_PASTE] = COMBO_ACTION(paste_combo), [QP_SLEEP] = COMBO_ACTION(sleep_combo), }; - diff --git a/users/yet-another-developer/config.h b/users/yet-another-developer/config.h index 030872d3dd..4836822eb4 100644 --- a/users/yet-another-developer/config.h +++ b/users/yet-another-developer/config.h @@ -17,7 +17,6 @@ #endif // !LEADER_ENABLE #if defined(COMBO_ENABLE) - #define COMBO_COUNT 4 #define COMBO_TERM 150 #endif // !COMBO_ENABLE @@ -25,11 +24,6 @@ #define FORCE_NKRO #endif // !NKRO_ENABLE -// this makes it possible to do rolling combos (zx) with keys that -// convert to other keys on hold (z becomes ctrl when you hold it, -// and when this option isn't enabled, z rapidly followed by x -// actually sends Ctrl-x. That's bad.) -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD //#define QUICK_TAP_TERM 0 //#define RETRO_TAPPING diff --git a/users/zer09/config.h b/users/zer09/config.h index 0324aaa7d3..48dd17dfc3 100644 --- a/users/zer09/config.h +++ b/users/zer09/config.h @@ -1,11 +1,6 @@ #ifndef USERSPACE_CONFIG_H #define USERSPACE_CONFIG_H -// this makes it possible to do rolling combos (zx) with keys that -// convert to other keys on hold (z becomes ctrl when you hold it, -// and when this option isn't enabled, z rapidly followed by x -// actually sends Ctrl-x. That's bad.) -#define IGNORE_MOD_TAP_INTERRUPT #undef PERMISSIVE_HOLD #define STRICT_LAYER_RELEASE diff --git a/users/zer09/zer09.h b/users/zer09/zer09.h index cc91cd6f28..764fed2315 100644 --- a/users/zer09/zer09.h +++ b/users/zer09/zer09.h @@ -1,7 +1,7 @@ #ifndef USERSPACE #define USERSPACE -#include "quantum.h" +#include QMK_KEYBOARD_H enum custom_keycodes { CK_SAFE = SAFE_RANGE, diff --git a/users/zigotica/combos.c b/users/zigotica/combos.c index a4d4f15618..3f37f3c859 100644 --- a/users/zigotica/combos.c +++ b/users/zigotica/combos.c @@ -15,10 +15,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. enum combos { EM_EMAIL, - CL_CAPSL, - COMBO_LENGTH + CL_CAPSL }; -uint16_t COMBO_LEN = COMBO_LENGTH; const uint16_t PROGMEM email_combo[] = {LT(_SYM, KC_E), KC_M, COMBO_END}; const uint16_t PROGMEM caps_combo[] = {KC_C, KC_L, COMBO_END}; @@ -37,4 +35,3 @@ void process_combo_event(uint16_t combo_index, bool pressed) { break; } } - |