From a41066beedebefc12245c3eee4bb90116c11f7cd Mon Sep 17 00:00:00 2001 From: Jonathan Rascher Date: Sun, 20 Oct 2019 13:41:36 -0500 Subject: [Keymap] Assorted personal keymap and layout updates (#7082) * Enable PERMISSIVE_HOLD and TAPPING_FORCE_HOLD * Fix indentation in userspace * Shuffle around more Lily58 symbol keys * Reformat KBD67 keymap and KLE images * Fix Lily58 lower layer image * Reformat Quefrency keymap and KLE images * Fix KBD67 KLE images... again * Add KLE links for Quefrency * Reformat 60% layouts and KLE images * Move Super key back to right half of Lily58 * Move Lily58 ins/del out of the way of numbers * Fix bottom row of Lily58 KLE image --- users/bcat/config.h | 106 +++++++++++++++++++++++++++++----------------------- 1 file changed, 60 insertions(+), 46 deletions(-) (limited to 'users/bcat/config.h') diff --git a/users/bcat/config.h b/users/bcat/config.h index a0942e9f4f..5f49a4ed37 100644 --- a/users/bcat/config.h +++ b/users/bcat/config.h @@ -8,64 +8,78 @@ #define TAPPING_TERM 250 +/* + * Treat mod-tap keys as holds even if the mod-tap key and the key being + * modified are both relased within TAPPING_TERM. This assumes the mod-tap key + * isn't usually pressed in quick succession with other tapped keys, which is + * good when the tap keycode is something like KC_ESC rather than a letter. + */ +#define PERMISSIVE_HOLD + +/* + * 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 + #if defined(RGBLIGHT_ENABLE) - /* Turn off RGB underglow when the host goes to sleep. */ - #define RGBLIGHT_SLEEP + /* Turn off RGB underglow when the host goes to sleep. */ + #define RGBLIGHT_SLEEP - /* Keep RGB underglow level increments consistent across keyboards. */ - #undef RGBLIGHT_HUE_STEP - #undef RGBLIGHT_SAT_STEP - #undef RGBLIGHT_VAL_STEP + /* Keep RGB underglow level increments consistent across keyboards. */ + #undef RGBLIGHT_HUE_STEP + #undef RGBLIGHT_SAT_STEP + #undef RGBLIGHT_VAL_STEP - #define RGBLIGHT_HUE_STEP 8 - #define RGBLIGHT_SAT_STEP 17 - #define RGBLIGHT_VAL_STEP 17 + #define RGBLIGHT_HUE_STEP 8 + #define RGBLIGHT_SAT_STEP 17 + #define RGBLIGHT_VAL_STEP 17 #endif #if defined(BACKLIGHT_ENABLE) - /* Enable backlight breathing across the board. */ - #define BACKLIGHT_BREATHING + /* Enable backlight breathing across the board. */ + #define BACKLIGHT_BREATHING - /* Keep backlight level increments consistent across keyboards. */ - #undef BACKLIGHT_LEVELS + /* Keep backlight level increments consistent across keyboards. */ + #undef BACKLIGHT_LEVELS - #define BACKLIGHT_LEVELS 7 + #define BACKLIGHT_LEVELS 7 #endif #if defined(MOUSEKEY_ENABLE) - /* Make mouse operation smoother. */ - #undef MOUSEKEY_DELAY - #undef MOUSEKEY_INTERVAL - - #define MOUSEKEY_DELAY 0 - #define MOUSEKEY_INTERVAL 16 - - /* Lower mouse speed to adjust for reduced MOUSEKEY_INTERVAL. */ - #undef MOUSEKEY_MAX_SPEED - #undef MOUSEKEY_TIME_TO_MAX - #undef MOUSEKEY_WHEEL_MAX_SPEED - #undef MOUSEKEY_WHEEL_TIME_TO_MAX - - #define MOUSEKEY_MAX_SPEED 7 - #define MOUSEKEY_TIME_TO_MAX 150 - #define MOUSEKEY_WHEEL_MAX_SPEED 3 - #define MOUSEKEY_WHEEL_TIME_TO_MAX 150 + /* Make mouse operation smoother. */ + #undef MOUSEKEY_DELAY + #undef MOUSEKEY_INTERVAL + + #define MOUSEKEY_DELAY 0 + #define MOUSEKEY_INTERVAL 16 + + /* Lower mouse speed to adjust for reduced MOUSEKEY_INTERVAL. */ + #undef MOUSEKEY_MAX_SPEED + #undef MOUSEKEY_TIME_TO_MAX + #undef MOUSEKEY_WHEEL_MAX_SPEED + #undef MOUSEKEY_WHEEL_TIME_TO_MAX + + #define MOUSEKEY_MAX_SPEED 7 + #define MOUSEKEY_TIME_TO_MAX 150 + #define MOUSEKEY_WHEEL_MAX_SPEED 3 + #define MOUSEKEY_WHEEL_TIME_TO_MAX 150 #endif #if defined(KEYBOARD_cannonkeys_instant60) - /* - * Work around EEPROM incompatibility with VIA: - * https://github.com/qmk/qmk_firmware/issues/6589#issuecomment-524042457. - */ - #undef EEPROM_MAGIC_ADDR - #undef EEPROM_VERSION_ADDR - #undef DYNAMIC_KEYMAP_EEPROM_ADDR - #undef EEPROM_CUSTOM_BACKLIGHT - #undef DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR - - #define EEPROM_MAGIC_ADDR 34 - #define EEPROM_VERSION_ADDR 36 - #define DYNAMIC_KEYMAP_EEPROM_ADDR 37 - #define EEPROM_CUSTOM_BACKLIGHT 637 - #define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 638 + /* + * Work around EEPROM incompatibility with VIA: + * https://github.com/qmk/qmk_firmware/issues/6589#issuecomment-524042457. + */ + #undef EEPROM_MAGIC_ADDR + #undef EEPROM_VERSION_ADDR + #undef DYNAMIC_KEYMAP_EEPROM_ADDR + #undef EEPROM_CUSTOM_BACKLIGHT + #undef DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR + + #define EEPROM_MAGIC_ADDR 34 + #define EEPROM_VERSION_ADDR 36 + #define DYNAMIC_KEYMAP_EEPROM_ADDR 37 + #define EEPROM_CUSTOM_BACKLIGHT 637 + #define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 638 #endif -- cgit v1.2.1