diff options
| author | Drashna Jael're <drashna@live.com> | 2021-10-20 10:49:14 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2021-10-20 10:49:14 -0700 |
| commit | 8ea22cc06f5591e04f154ad20e4aa558b03f6f41 (patch) | |
| tree | 70362d2529229659a4a0ebc0bf7ce5c00d2c8971 /quantum/process_keycode | |
| parent | 51517ee9d4f0150fdd90ed74044c11995df32c50 (diff) | |
| parent | 0fd45d59845d71e435f36975d9ba8a54dfb2a87d (diff) | |
Merge tag '0.14.25' into firmware_21
Diffstat (limited to 'quantum/process_keycode')
| -rw-r--r-- | quantum/process_keycode/process_magic.c | 1 | ||||
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/quantum/process_keycode/process_magic.c b/quantum/process_keycode/process_magic.c index 01f2fb9289..d5cff4f12a 100644 --- a/quantum/process_keycode/process_magic.c +++ b/quantum/process_keycode/process_magic.c @@ -43,6 +43,7 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_TOGGLE_ALT_GUI: case MAGIC_SWAP_LCTL_LGUI ... MAGIC_EE_HANDS_RIGHT: + case MAGIC_TOGGLE_GUI: /* keymap config */ keymap_config.raw = eeconfig_read_keymap(); switch (keycode) { diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index 225b36cd5f..c707fdea30 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c @@ -20,7 +20,7 @@ uint8_t get_oneshot_mods(void); #endif static uint16_t last_td; -static int8_t highest_td = -1; +static int16_t highest_td = -1; void qk_tap_dance_pair_on_each_tap(qk_tap_dance_state_t *state, void *user_data) { qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; |