localhots
/
qmk_firmware
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Drashna Jaelre 2018-10-01 08:09:05 -07:00 committed by Jack Humbert
parent a398d2cece
commit 9d949389f9
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quantum/process_keycode/process_tap_dance.c
View File

@ -16,6 +16,10 @@
#include "quantum.h" #include "quantum.h"
#include "action_tapping.h" #include "action_tapping.h"
#ifndef TAPPING_TERM
#define TAPPING_TERM 200
#endif
#ifndef NO_ACTION_ONESHOT #ifndef NO_ACTION_ONESHOT
uint8_t get_oneshot_mods(void); uint8_t get_oneshot_mods(void);
#endif #endif

6
quantum/quantum.h
View File

@ -31,7 +31,7 @@
#include "backlight.h" #include "backlight.h"
#endif #endif
#if !defined(RGBLIGHT_ENABLE) && !defined(RGB_MATRIX_ENABLE) #if !defined(RGBLIGHT_ENABLE) && !defined(RGB_MATRIX_ENABLE)
#include "rgb.h" #include "rgb.h"
#endif #endif
#ifdef RGBLIGHT_ENABLE #ifdef RGBLIGHT_ENABLE
#include "rgblight.h" #include "rgblight.h"
@ -108,7 +108,9 @@ extern uint32_t default_layer_state;
#include "process_unicodemap.h" #include "process_unicodemap.h"
#endif #endif
#include "process_tap_dance.h" #ifdef TAP_DANCE_ENABLE
#include "process_tap_dance.h"
#endif
#ifdef PRINTING_ENABLE #ifdef PRINTING_ENABLE
#include "process_printer.h" #include "process_printer.h"