diff options
Diffstat (limited to 'users')
28 files changed, 8 insertions, 59 deletions
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/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 279bcf217b..a406ff9330 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/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/config.h b/users/ibnuda/config.h index f9a89389b6..c4fec5bc2d 100644 --- a/users/ibnuda/config.h +++ b/users/ibnuda/config.h @@ -3,5 +3,4 @@ #define COMBO_TERM 50 #define COMBO_COUNT 50 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD \ No newline at end of file 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/config.h b/users/kuchosauronad0/config.h index bc0fe67df8..28e41215b9 100644 --- a/users/kuchosauronad0/config.h +++ b/users/kuchosauronad0/config.h @@ -64,11 +64,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..3656e9eded 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 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..cbc318d24f 100644 --- a/users/muppetjones/config.h +++ b/users/muppetjones/config.h @@ -30,9 +30,6 @@ // -- 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 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/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/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/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/config.h b/users/yet-another-developer/config.h index 030872d3dd..e783d08dc5 100644 --- a/users/yet-another-developer/config.h +++ b/users/yet-another-developer/config.h @@ -25,11 +25,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 |