aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2018-10-01 08:09:05 -0700
committerJack Humbert <jack.humb@gmail.com>2018-10-01 11:09:05 -0400
commit9d949389f92b6b397ed62246b60ead86d80a57a1 (patch)
treefcf590a8b5309442023caf32dfeb162839c6864a
parenta398d2cece1ee69006cf26e9a86fbf38e1acb0d1 (diff)
downloadqmk_firmware-9d949389f92b6b397ed62246b60ead86d80a57a1.tar.gz
qmk_firmware-9d949389f92b6b397ed62246b60ead86d80a57a1.zip
Adds default value for TAPPING_TERM if Tap Dance is enabled (#2785)
* Force require TAPPING_TERM if Tap Dance is enabled * Handle lack of TAPPING_TERM more gracefully
-rw-r--r--quantum/process_keycode/process_tap_dance.c4
-rw-r--r--quantum/quantum.h6
2 files changed, 8 insertions, 2 deletions
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c
index 833780691..b55ace5ba 100644
--- a/quantum/process_keycode/process_tap_dance.c
+++ b/quantum/process_keycode/process_tap_dance.c
@@ -16,6 +16,10 @@
16#include "quantum.h" 16#include "quantum.h"
17#include "action_tapping.h" 17#include "action_tapping.h"
18 18
19#ifndef TAPPING_TERM
20#define TAPPING_TERM 200
21#endif
22
19#ifndef NO_ACTION_ONESHOT 23#ifndef NO_ACTION_ONESHOT
20uint8_t get_oneshot_mods(void); 24uint8_t get_oneshot_mods(void);
21#endif 25#endif
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 683333211..87a61356c 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -31,7 +31,7 @@
31 #include "backlight.h" 31 #include "backlight.h"
32#endif 32#endif
33#if !defined(RGBLIGHT_ENABLE) && !defined(RGB_MATRIX_ENABLE) 33#if !defined(RGBLIGHT_ENABLE) && !defined(RGB_MATRIX_ENABLE)
34 #include "rgb.h" 34 #include "rgb.h"
35#endif 35#endif
36#ifdef RGBLIGHT_ENABLE 36#ifdef RGBLIGHT_ENABLE
37 #include "rgblight.h" 37 #include "rgblight.h"
@@ -108,7 +108,9 @@ extern uint32_t default_layer_state;
108 #include "process_unicodemap.h" 108 #include "process_unicodemap.h"
109#endif 109#endif
110 110
111#include "process_tap_dance.h" 111#ifdef TAP_DANCE_ENABLE
112 #include "process_tap_dance.h"
113#endif
112 114
113#ifdef PRINTING_ENABLE 115#ifdef PRINTING_ENABLE
114 #include "process_printer.h" 116 #include "process_printer.h"