Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bug] Fix compilation issue for Key Overrides #19856

Merged
merged 1 commit into from
Feb 15, 2023
Merged

[Bug] Fix compilation issue for Key Overrides #19856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions quantum/process_keycode/process_key_override.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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);
Expand All @@ -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");
Expand Down