diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
| commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
| tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /quantum/process_keycode/process_key_override.c | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'quantum/process_keycode/process_key_override.c')
| -rw-r--r-- | quantum/process_keycode/process_key_override.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/quantum/process_keycode/process_key_override.c b/quantum/process_keycode/process_key_override.c index 9c5abccd4f..17e490e67a 100644 --- a/quantum/process_keycode/process_key_override.c +++ b/quantum/process_keycode/process_key_override.c @@ -186,7 +186,7 @@ const key_override_t *clear_active_override(const bool allow_reregister) { // Then unregister the mod-free replacement key if desired if (unregister_replacement) { - if (IS_KEY(mod_free_replacement)) { + if (IS_BASIC_KEYCODE(mod_free_replacement)) { del_key(mod_free_replacement); } else { key_override_printf("NOT KEY 1\n"); @@ -329,7 +329,7 @@ static bool try_activating_override(const uint16_t keycode, const uint8_t layer, if (!trigger_down && !no_trigger) { // When activating a key override the trigger is is always unregistered. In the case where the key that newly pressed is not the trigger key, we have to explicitly remove the trigger key from the keyboard report. If the trigger was just pressed down we simply suppress the event which also has the effect of the trigger key not being registered in the keyboard report. - if (IS_KEY(override->trigger)) { + if (IS_BASIC_KEYCODE(override->trigger)) { del_key(override->trigger); } else { unregister_code(override->trigger); @@ -356,7 +356,7 @@ static bool try_activating_override(const uint16_t keycode, const uint8_t layer, schedule_deferred_register(mod_free_replacement); send_keyboard_report(); } else { - if (IS_KEY(mod_free_replacement)) { + if (IS_BASIC_KEYCODE(mod_free_replacement)) { add_key(mod_free_replacement); } else { key_override_printf("NOT KEY 2\n"); @@ -402,7 +402,7 @@ bool process_key_override(const uint16_t keycode, const keyrecord_t *const recor #endif const bool key_down = record->event.pressed; - const bool is_mod = IS_MOD(keycode); + const bool is_mod = IS_MODIFIER_KEYCODE(keycode); if (key_down) { switch (keycode) { |