fern/qmk-firmware
1
0
Fork 0
mirror of https://github.com/firewalkwithm3/qmk_firmware.git synced 2024-11-22 19:40:29 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix HOLD_ON_OTHER_KEY_PRESS after #11059 (#15307)

Browse source 
that broke compilation because of a typo: KEYPRESS should have been
KEY_PRESS
This commit is contained in:
Stefan Kerkmann 2021-11-27 19:54:51 +01:00 committed by GitHub
parent e156d5c13b
commit ca5670762b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
quantum/action_tapping.c
View file

@ -113,7 +113,7 @@ void action_tapping_process(keyrecord_t record) {
/* return true when key event is processed or consumed. */ /* return true when key event is processed or consumed. */
bool process_tapping(keyrecord_t *keyp) { bool process_tapping(keyrecord_t *keyp) {
keyevent_t event = keyp->event; keyevent_t event = keyp->event;
# if (defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)) || defined(TAPPING_TERM_PER_KEY) || defined(PERMISSIVE_HOLD_PER_KEY) || defined(TAPPING_FORCE_HOLD_PER_KEY) || defined(HOLD_ON_OTHER_KEYPRESS_PER_KEY) # if (defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)) || defined(TAPPING_TERM_PER_KEY) || defined(PERMISSIVE_HOLD_PER_KEY) || defined(TAPPING_FORCE_HOLD_PER_KEY) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
uint16_t tapping_keycode = get_record_keycode(&tapping_key, false); uint16_t tapping_keycode = get_record_keycode(&tapping_key, false);
# endif # endif
@ -184,11 +184,11 @@ bool process_tapping(keyrecord_t *keyp) {
( (
( (
false false
# if defined(HOLD_ON_OTHER_KEYPRESS) || defined(HOLD_ON_OTHER_KEYPRESS_PER_KEY) # if defined(HOLD_ON_OTHER_KEY_PRESS) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
|| ( || (
IS_LT(tapping_keycode) IS_LT(tapping_keycode)
# ifdef HOLD_ON_OTHER_KEYPRESS_PER_KEY # ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
&& get_hold_on_other_keypress(tapping_keycode, keyp) && get_hold_on_other_key_press(tapping_keycode, keyp)
# endif # endif
) )
# endif # endif