aboutsummaryrefslogtreecommitdiffstats
path: root/quantum
diff options
context:
space:
mode:
authorNick Choi <iinikchi@gmail.com>2017-05-25 16:26:30 -0400
committerNick Choi <iinikchi@gmail.com>2017-05-25 16:26:30 -0400
commitaeb3a34636c614cd392cfc6268491a51a461df31 (patch)
tree4395604c2c6bd7d9adb0f1eb0d99b2f536eec88f /quantum
parente695b5a33b97cfb4f9dd8bc8ecaff8aa7e0f14cc (diff)
downloadfirmware-aeb3a34636c614cd392cfc6268491a51a461df31.tar.gz
firmware-aeb3a34636c614cd392cfc6268491a51a461df31.tar.bz2
firmware-aeb3a34636c614cd392cfc6268491a51a461df31.zip
moved specific tap term to its own function
included custom_tapping_term in action struct
Diffstat (limited to 'quantum')
-rw-r--r--quantum/process_keycode/process_tap_dance.c6
-rw-r--r--quantum/process_keycode/process_tap_dance.h12
2 files changed, 14 insertions, 4 deletions
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c
index e58b6f2df..2c7f6e937 100644
--- a/quantum/process_keycode/process_tap_dance.c
+++ b/quantum/process_keycode/process_tap_dance.c
@@ -127,6 +127,8 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
return true;
}
+
+
void matrix_scan_tap_dance () {
if (highest_td == -1)
return;
@@ -134,8 +136,8 @@ void matrix_scan_tap_dance () {
for (int i = 0; i <= highest_td; i++) {
qk_tap_dance_action_t *action = &tap_dance_actions[i];
- if(action->user_data != NULL ) {
- tap_user_defined = (int)action->user_data;
+ if(action->custom_tapping_term > 0 ) {
+ tap_user_defined = action->custom_tapping_term;
}
else{
tap_user_defined = TAPPING_TERM;
diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h
index 95d51f480..a020f7991 100644
--- a/quantum/process_keycode/process_tap_dance.h
+++ b/quantum/process_keycode/process_tap_dance.h
@@ -44,6 +44,7 @@ typedef struct
qk_tap_dance_user_fn_t on_reset;
} fn;
qk_tap_dance_state_t state;
+ uint16_t custom_tapping_term;
void *user_data;
} qk_tap_dance_action_t;
@@ -63,9 +64,16 @@ typedef struct
.user_data = NULL, \
}
-#define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, tap_specific_tapping_term) { \
+#define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset) { \
.fn = { user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset }, \
- .user_data = (void *)(tap_specific_tapping_term), \
+ .user_data = NULL, \
+ .custom_tapping_term = -1, \
+ }
+
+#define ACTION_TAP_DANCE_FN_ADVANCED_TIME(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, tap_specific_tapping_term) { \
+ .fn = { user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset }, \
+ .user_data = NULL, \
+ .custom_tapping_term = tap_specific_tapping_term, \
}
extern qk_tap_dance_action_t tap_dance_actions[];