gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-05-16 14:20:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot 2023-02-22 19:04:30 +00:00
commit af101a13bc
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quantum/action_tapping.c
View File

@ -122,7 +122,7 @@ void action_tapping_process(keyrecord_t record) {
* readable. The conditional definition of tapping_keycode and all the * readable. The conditional definition of tapping_keycode and all the
* conditional uses of it are hidden inside macros named TAP_... * conditional uses of it are hidden inside macros named TAP_...
*/ */
# if (defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)) || defined(PERMISSIVE_HOLD_PER_KEY) || defined(QUICK_TAP_TERM_PER_KEY) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY) # if (defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)) || defined(PERMISSIVE_HOLD_PER_KEY) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
# define TAP_DEFINE_KEYCODE uint16_t tapping_keycode = get_record_keycode(&tapping_key, false) # define TAP_DEFINE_KEYCODE uint16_t tapping_keycode = get_record_keycode(&tapping_key, false)
# else # else
# define TAP_DEFINE_KEYCODE # define TAP_DEFINE_KEYCODE

4
tests/tap_hold_configurations/quick_tap/config.h
View File

@ -19,3 +19,7 @@
#include "test_common.h" #include "test_common.h"
#define QUICK_TAP_TERM 100 #define QUICK_TAP_TERM 100
// Although a seemingly superfluous addition since the default per-key function behaves
// no differently from defining a single global QUICK_TAP_TERM, this has been useful
// to catch compilation errors and prevent regressions in the future; see PR #19893.
#define QUICK_TAP_TERM_PER_KEY