diff options
| author | Konstantin Đorđević <vomindoraan@gmail.com> | 2019-01-27 17:46:54 +0100 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-01-27 08:46:54 -0800 |
| commit | 6ba0b818e9ab8830610ab2a74515227884f93abc (patch) | |
| tree | b6a8761351604b6fe222b0e0196d24c447d4db97 /users | |
| parent | 5c1d4baec4a178df3845c724ec48f8e9bba47b74 (diff) | |
[Keymap] Update personal userspace and keymaps (#4963)
* Remove duplicated or unnecessary definitions in config.h and rules.mk * Use IS_HOST_LED_ON() macro * Add mouse acceleration to kbd6x:konstantin keymap * Clear and restore mods when sending macros * Make SEND_STRING_CLEAN a config option * Add NO_ACTION_ONESHOT to userspace config
Diffstat (limited to 'users')
| -rw-r--r-- | users/konstantin/config.h | 1 | ||||
| -rw-r--r-- | users/konstantin/konstantin.c | 5 | ||||
| -rw-r--r-- | users/konstantin/konstantin.h | 10 | ||||
| -rw-r--r-- | users/konstantin/rules.mk | 1 |
4 files changed, 14 insertions, 3 deletions
diff --git a/users/konstantin/config.h b/users/konstantin/config.h index d03333f05d..800b8e49ba 100644 --- a/users/konstantin/config.h +++ b/users/konstantin/config.h @@ -14,6 +14,7 @@ #define NO_ACTION_FUNCTION #define NO_ACTION_MACRO +#define NO_ACTION_ONESHOT #define PERMISSIVE_HOLD #define TAPPING_TERM 200 diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c index 977111c1f9..47596279c3 100644 --- a/users/konstantin/konstantin.c +++ b/users/konstantin/konstantin.c @@ -3,8 +3,9 @@ #ifdef LAYER_NUMPAD static void toggle_numpad(void) { layer_invert(L_NUMPAD); - bool num_lock = host_keyboard_leds() & 1<<USB_LED_NUM_LOCK; - if (num_lock != (bool)IS_LAYER_ON(L_NUMPAD)) { + bool numpad_on = IS_LAYER_ON(L_NUMPAD); + bool num_lock_on = IS_HOST_LED_ON(USB_LED_NUM_LOCK); + if (num_lock_on != numpad_on) { tap_code(KC_NLCK); // Toggle Num Lock to match layer state } } diff --git a/users/konstantin/konstantin.h b/users/konstantin/konstantin.h index 06081496b6..f67f9f1b7e 100644 --- a/users/konstantin/konstantin.h +++ b/users/konstantin/konstantin.h @@ -25,6 +25,16 @@ #define LCT_CPS LCTL_T(KC_CAPS) +#ifdef SEND_STRING_CLEAN + #undef SEND_STRING + #define SEND_STRING(...) { \ + uint8_t ss_mods = get_mods(); \ + clear_mods(); \ + send_string_P(PSTR(__VA_ARGS__)); \ + set_mods(ss_mods); \ + } +#endif + enum keycodes_user { CLEAR = SAFE_RANGE, #ifdef LAYER_NUMPAD diff --git a/users/konstantin/rules.mk b/users/konstantin/rules.mk index 7f25a8107a..d2522b9523 100644 --- a/users/konstantin/rules.mk +++ b/users/konstantin/rules.mk @@ -2,7 +2,6 @@ BOOTMAGIC_ENABLE = no COMMAND_ENABLE = yes CONSOLE_ENABLE = yes EXTRAKEY_ENABLE = yes -KEYBOARD_SHARED_EP = yes # TODO: Disable once Command is fixed MOUSEKEY_ENABLE = yes NKRO_ENABLE = yes TAP_DANCE_ENABLE = yes |