jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag '0.14.25' into firmware_21

Browse Source
This commit is contained in:
Drashna Jael're
2021-10-20 10:49:14 -07:00
parent 51517ee9d4 0fd45d5984
commit 8ea22cc06f
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
quantum/process_keycode/process_magic.c
View File

@@ -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) {

2
quantum/process_keycode/process_tap_dance.c
View File

@@ -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;