diff options
| author | QMK Bot <hello@qmk.fm> | 2021-11-10 14:10:35 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-11-10 14:10:35 +0000 |
| commit | ed48c0bd8b681123073da08da150c6bb4e7c2706 (patch) | |
| tree | 152f2fcc0ba45799e2f0dece5930039abb3746d6 /users/drashna/config.h | |
| parent | 5523f7093a797400fbd7367f9be50cb40ecdd68e (diff) | |
| parent | 83ab7d41efc8b400ad2870be7f46e5435b8fd550 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'users/drashna/config.h')
| -rw-r--r-- | users/drashna/config.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/users/drashna/config.h b/users/drashna/config.h index 5e935827bf..f54da9e328 100644 --- a/users/drashna/config.h +++ b/users/drashna/config.h @@ -147,6 +147,9 @@ // # define OLED_FONT_5X5 // # define OLED_FONT_AZTECH // # define OLED_FONT_BMPLAIN +// # define OLED_FONT_CRACKERS +// # define OLED_FONT_HISKYF21 +# define OLED_FONT_DEAD_MEAL // # define OLED_FONT_SUPER_DIGG // # define OLED_LOGO_GMK_BAD // # define OLED_LOGO_HUE_MANITEE @@ -163,17 +166,12 @@ # define ONESHOT_TIMEOUT 3000 #endif // !ONESHOT_TIMEOUT -// 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 TAPPING_FORCE_HOLD_PER_KEY -//#define RETRO_TAPPING_PER_KEY -#if !defined(KEYBOARD_kyria) && !defined(KEYBOARD_splitkb_kyria) -# define TAPPING_TERM_PER_KEY -#endif +#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY +#define PERMISSIVE_HOLD_PER_KEY +#define TAPPING_FORCE_HOLD_PER_KEY +#define RETRO_TAPPING_PER_KEY +#define TAPPING_TERM_PER_KEY + #ifndef TAPPING_TOGGLE # define TAPPING_TOGGLE 1 |