aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/common
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-01-05 00:37:55 +0000
committerQMK Bot <hello@qmk.fm>2021-01-05 00:37:55 +0000
commitd0aa9ff972e7e438d1a5fa2baa4b35db91c8a070 (patch)
tree9da864d1811a6fc892a346cd3fe8b900f816709c /tmk_core/common
parentfd7ab5a22bd5ba85dde3a5da54856784bfb19120 (diff)
parent810eafad121bda333c53490e2d8a29f3a83d9c19 (diff)
downloadqmk_firmware-d0aa9ff972e7e438d1a5fa2baa4b35db91c8a070.tar.gz
qmk_firmware-d0aa9ff972e7e438d1a5fa2baa4b35db91c8a070.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/common')
-rw-r--r--tmk_core/common/action_tapping.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/tmk_core/common/action_tapping.h b/tmk_core/common/action_tapping.h
index 087090f80..4d10c668a 100644
--- a/tmk_core/common/action_tapping.h
+++ b/tmk_core/common/action_tapping.h
@@ -22,8 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
22# define TAPPING_TERM 200 22# define TAPPING_TERM 200
23#endif 23#endif
24 24
25//#define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, as long as there was no interruption
26
27/* tap count needed for toggling a feature */ 25/* tap count needed for toggling a feature */
28#ifndef TAPPING_TOGGLE 26#ifndef TAPPING_TOGGLE
29# define TAPPING_TOGGLE 5 27# define TAPPING_TOGGLE 5
@@ -33,6 +31,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
33 31
34#ifndef NO_ACTION_TAPPING 32#ifndef NO_ACTION_TAPPING
35uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache); 33uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache);
36uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record);
37void action_tapping_process(keyrecord_t record); 34void action_tapping_process(keyrecord_t record);
35
36uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record);
37bool get_permissive_hold(uint16_t keycode, keyrecord_t *record);
38bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record);
39bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record);
40bool get_retro_tapping(uint16_t keycode, keyrecord_t *record);
38#endif 41#endif