summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavlos Vinieratos <pvinis@gmail.com>2016-07-15 23:54:08 +0200
committerPavlos Vinieratos <pvinis@gmail.com>2016-07-17 08:28:03 +0200
commitd3091faf363afc8fef73ddf4948f872439b0e827 (patch)
tree8741f3b0cf7ab54e3943598eafcef052faab30be
parentf3b56701ed7e6c622dc48e429780124ba5fde172 (diff)
change naming, and remove extraneous definition
-rw-r--r--quantum/process_keycode/process_tap_dance.c32
-rw-r--r--quantum/process_keycode/process_tap_dance.h27
2 files changed, 23 insertions, 36 deletions
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c
index 40fba2a6a6..93b326b5fc 100644
--- a/quantum/process_keycode/process_tap_dance.c
+++ b/quantum/process_keycode/process_tap_dance.c
@@ -27,7 +27,7 @@ static void _process_tap_dance_action_fn (qk_tap_dance_state_t *state,
}
}
-void process_tap_dance_action (uint16_t keycode)
+void process_tap_dance_action_on_each_tap (uint16_t keycode)
{
uint16_t idx = keycode - QK_TAP_DANCE;
qk_tap_dance_action_t action;
@@ -35,12 +35,8 @@ void process_tap_dance_action (uint16_t keycode)
action = tap_dance_actions[idx];
switch (action.type) {
- case QK_TAP_DANCE_TYPE_PAIR:
- _process_tap_dance_action_pair (&qk_tap_dance_state,
- action.pair.kc1, action.pair.kc2);
- break;
case QK_TAP_DANCE_TYPE_FN:
- _process_tap_dance_action_fn (&qk_tap_dance_state, action.fn.regular);
+ _process_tap_dance_action_fn (&qk_tap_dance_state, action.fn.on_each_tap);
break;
default:
@@ -48,7 +44,7 @@ void process_tap_dance_action (uint16_t keycode)
}
}
-void process_tap_dance_action_anyway (uint16_t keycode)
+void process_tap_dance_action_on_dance_finished (uint16_t keycode)
{
uint16_t idx = keycode - QK_TAP_DANCE;
qk_tap_dance_action_t action;
@@ -56,8 +52,12 @@ void process_tap_dance_action_anyway (uint16_t keycode)
action = tap_dance_actions[idx];
switch (action.type) {
+ case QK_TAP_DANCE_TYPE_PAIR:
+ _process_tap_dance_action_pair (&qk_tap_dance_state,
+ action.pair.kc1, action.pair.kc2);
+ break;
case QK_TAP_DANCE_TYPE_FN:
- _process_tap_dance_action_fn (&qk_tap_dance_state, action.fn.anyway);
+ _process_tap_dance_action_fn (&qk_tap_dance_state, action.fn.on_dance_finished);
break;
default:
@@ -70,9 +70,9 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
switch(keycode) {
case QK_TAP_DANCE ... QK_TAP_DANCE_MAX:
- process_tap_dance_action_anyway (qk_tap_dance_state.keycode);
+ process_tap_dance_action_on_each_tap (qk_tap_dance_state.keycode);
if (qk_tap_dance_state.keycode && qk_tap_dance_state.keycode != keycode) {
- process_tap_dance_action (qk_tap_dance_state.keycode);
+ process_tap_dance_action_on_dance_finished (qk_tap_dance_state.keycode);
} else {
r = false;
}
@@ -85,10 +85,9 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
break;
default:
+ process_tap_dance_action_on_each_tap (qk_tap_dance_state.keycode);
if (qk_tap_dance_state.keycode) {
- //process_tap_dance_action_anyway (qk_tap_dance_state.keycode);
- process_tap_dance_action (qk_tap_dance_state.keycode);
-
+ process_tap_dance_action_on_dance_finished (qk_tap_dance_state.keycode);
reset_tap_dance (&qk_tap_dance_state);
}
break;
@@ -99,8 +98,7 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
void matrix_scan_tap_dance () {
if (qk_tap_dance_state.keycode && timer_elapsed (qk_tap_dance_state.timer) > TAPPING_TERM) {
- process_tap_dance_action (qk_tap_dance_state.keycode);
-
+ process_tap_dance_action_on_dance_finished (qk_tap_dance_state.keycode);
reset_tap_dance (&qk_tap_dance_state);
}
}
@@ -112,8 +110,8 @@ void reset_tap_dance (qk_tap_dance_state_t *state) {
action = tap_dance_actions[idx];
switch (action.type) {
case QK_TAP_DANCE_TYPE_FN:
- if (action.fn.reset) {
- action.fn.reset();
+ if (action.fn.on_reset) {
+ action.fn.on_reset(state);
}
break;
diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h
index bf925df0f6..7b820584a8 100644
--- a/quantum/process_keycode/process_tap_dance.h
+++ b/quantum/process_keycode/process_tap_dance.h
@@ -22,7 +22,6 @@ typedef enum
} qk_tap_dance_type_t;
typedef void (*qk_tap_dance_user_fn_t) (qk_tap_dance_state_t *state);
-typedef void (*qk_tap_dance_user_fn_reset_t) (void);
typedef struct
{
@@ -33,9 +32,9 @@ typedef struct
uint16_t kc2;
} pair;
struct {
- qk_tap_dance_user_fn_t regular;
- qk_tap_dance_user_fn_t anyway;
- qk_tap_dance_user_fn_reset_t reset;
+ qk_tap_dance_user_fn_t on_each_tap;
+ qk_tap_dance_user_fn_t on_dance_finished;
+ qk_tap_dance_user_fn_t on_reset;
} fn;
};
} qk_tap_dance_action_t;
@@ -45,24 +44,14 @@ typedef struct
.pair = { kc1, kc2 } \
}
-#define ACTION_TAP_DANCE_FN(user_fn) { \
+#define ACTION_TAP_DANCE_FN(user_fn) { \
.type = QK_TAP_DANCE_TYPE_FN, \
- .fn = { user_fn, NULL, NULL } \
+ .fn = { NULL, user_fn, NULL } \
}
-#define ACTION_TAP_DANCE_FN_ANYWAY(user_fn, user_fn_anyway) { \
- .type = QK_TAP_DANCE_TYPE_FN, \
- .fn = { user_fn, user_fn_anyway, NULL } \
- }
-
-#define ACTION_TAP_DANCE_FN_RESET(user_fn, user_fn_reset) { \
- .type = QK_TAP_DANCE_TYPE_FN, \
- .fn = { user_fn, NULL, user_fn_reset } \
- }
-
-#define ACTION_TAP_DANCE_FN_ANYWAY_RESET(user_fn, user_fn_anyway, user_fn_reset) { \
- .type = QK_TAP_DANCE_TYPE_FN, \
- .fn = { user_fn, user_fn_anyway, user_fn_reset } \
+#define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_reset) { \
+ .type = QK_TAP_DANCE_TYPE_FN, \
+ .fn = { user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_reset } \
}
extern const qk_tap_dance_action_t tap_dance_actions[];