forked from forks/qmk_firmware
change naming, and remove extraneous definition
This commit is contained in:
parent
f3b56701ed
commit
d3091faf36
|
@ -27,7 +27,24 @@ 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;
|
||||||
|
|
||||||
|
action = tap_dance_actions[idx];
|
||||||
|
|
||||||
|
switch (action.type) {
|
||||||
|
case QK_TAP_DANCE_TYPE_FN:
|
||||||
|
_process_tap_dance_action_fn (&qk_tap_dance_state, action.fn.on_each_tap);
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void process_tap_dance_action_on_dance_finished (uint16_t keycode)
|
||||||
{
|
{
|
||||||
uint16_t idx = keycode - QK_TAP_DANCE;
|
uint16_t idx = keycode - QK_TAP_DANCE;
|
||||||
qk_tap_dance_action_t action;
|
qk_tap_dance_action_t action;
|
||||||
|
@ -40,24 +57,7 @@ void process_tap_dance_action (uint16_t keycode)
|
||||||
action.pair.kc1, action.pair.kc2);
|
action.pair.kc1, action.pair.kc2);
|
||||||
break;
|
break;
|
||||||
case QK_TAP_DANCE_TYPE_FN:
|
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_dance_finished);
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void process_tap_dance_action_anyway (uint16_t keycode)
|
|
||||||
{
|
|
||||||
uint16_t idx = keycode - QK_TAP_DANCE;
|
|
||||||
qk_tap_dance_action_t action;
|
|
||||||
|
|
||||||
action = tap_dance_actions[idx];
|
|
||||||
|
|
||||||
switch (action.type) {
|
|
||||||
case QK_TAP_DANCE_TYPE_FN:
|
|
||||||
_process_tap_dance_action_fn (&qk_tap_dance_state, action.fn.anyway);
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -70,9 +70,9 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
|
||||||
|
|
||||||
switch(keycode) {
|
switch(keycode) {
|
||||||
case QK_TAP_DANCE ... QK_TAP_DANCE_MAX:
|
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) {
|
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 {
|
} else {
|
||||||
r = false;
|
r = false;
|
||||||
}
|
}
|
||||||
|
@ -85,10 +85,9 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
process_tap_dance_action_on_each_tap (qk_tap_dance_state.keycode);
|
||||||
if (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_on_dance_finished (qk_tap_dance_state.keycode);
|
||||||
process_tap_dance_action (qk_tap_dance_state.keycode);
|
|
||||||
|
|
||||||
reset_tap_dance (&qk_tap_dance_state);
|
reset_tap_dance (&qk_tap_dance_state);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -99,8 +98,7 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {
|
||||||
|
|
||||||
void matrix_scan_tap_dance () {
|
void matrix_scan_tap_dance () {
|
||||||
if (qk_tap_dance_state.keycode && timer_elapsed (qk_tap_dance_state.timer) > TAPPING_TERM) {
|
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);
|
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];
|
action = tap_dance_actions[idx];
|
||||||
switch (action.type) {
|
switch (action.type) {
|
||||||
case QK_TAP_DANCE_TYPE_FN:
|
case QK_TAP_DANCE_TYPE_FN:
|
||||||
if (action.fn.reset) {
|
if (action.fn.on_reset) {
|
||||||
action.fn.reset();
|
action.fn.on_reset(state);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,6 @@ typedef enum
|
||||||
} qk_tap_dance_type_t;
|
} 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_t) (qk_tap_dance_state_t *state);
|
||||||
typedef void (*qk_tap_dance_user_fn_reset_t) (void);
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
|
@ -33,9 +32,9 @@ typedef struct
|
||||||
uint16_t kc2;
|
uint16_t kc2;
|
||||||
} pair;
|
} pair;
|
||||||
struct {
|
struct {
|
||||||
qk_tap_dance_user_fn_t regular;
|
qk_tap_dance_user_fn_t on_each_tap;
|
||||||
qk_tap_dance_user_fn_t anyway;
|
qk_tap_dance_user_fn_t on_dance_finished;
|
||||||
qk_tap_dance_user_fn_reset_t reset;
|
qk_tap_dance_user_fn_t on_reset;
|
||||||
} fn;
|
} fn;
|
||||||
};
|
};
|
||||||
} qk_tap_dance_action_t;
|
} qk_tap_dance_action_t;
|
||||||
|
@ -45,24 +44,14 @@ typedef struct
|
||||||
.pair = { kc1, kc2 } \
|
.pair = { kc1, kc2 } \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ACTION_TAP_DANCE_FN(user_fn) { \
|
#define ACTION_TAP_DANCE_FN(user_fn) { \
|
||||||
.type = QK_TAP_DANCE_TYPE_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) { \
|
#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, \
|
.type = QK_TAP_DANCE_TYPE_FN, \
|
||||||
.fn = { user_fn, user_fn_anyway, NULL } \
|
.fn = { user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_reset } \
|
||||||
}
|
|
||||||
|
|
||||||
#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 } \
|
|
||||||
}
|
}
|
||||||
|
|
||||||
extern const qk_tap_dance_action_t tap_dance_actions[];
|
extern const qk_tap_dance_action_t tap_dance_actions[];
|
||||||
|
|
Loading…
Reference in a new issue