Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Replace td_fn_rctrl with generic td_layer_mod

Browse source
This commit is contained in:
Konstantin Đorđević 2019-02-18 06:00:05 +01:00
parent b05a4b1a4b
commit 14908f86fb
1 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
users/konstantin/tap_dance.c
View file

@ -57,35 +57,44 @@ void td_mod_layer_reset(qk_tap_dance_state_t *state, void *user_data) {
} }
} }
struct { #define ACTION_TAP_DANCE_LAYER_MOD(layer, mod) { \
bool fn_on; // Layer state when tap dance started .fn = { td_layer_mod_each, NULL, td_layer_mod_reset }, \
.user_data = &(qk_tap_dance_layer_mod_t){ layer, mod }, \
}
typedef struct {
uint8_t layer;
uint16_t kc;
bool layer_on; // Layer state when tap dance started
bool started; bool started;
} td_fn_rctrl_data; } qk_tap_dance_layer_mod_t;
void td_fn_rctrl_each(qk_tap_dance_state_t *state, void *user_data) { void td_layer_mod_each(qk_tap_dance_state_t *state, void *user_data) {
if (!td_fn_rctrl_data.started) { qk_tap_dance_layer_mod_t *data = (qk_tap_dance_layer_mod_t *)user_data;
td_fn_rctrl_data.fn_on = IS_LAYER_ON(L_FN); if (!data->started) {
td_fn_rctrl_data.started = true; data->layer_on = IS_LAYER_ON(data->layer);
data->started = true;
} }
// Single tap → Fn, double tap → RCtrl, triple tap etc. → Fn+RCtrl // Single tap → layer, double tap → mod, triple tap etc. → layer+mod
if (state->count == 1 || state->count == 3) { if (state->count == 1 || state->count == 3) {
layer_on(L_FN); layer_on(data->layer);
} else if (state->count == 2) { } else if (state->count == 2) {
if (!td_fn_rctrl_data.fn_on) { if (!data->layer_on) {
layer_off(L_FN); layer_off(data->layer);
} }
register_code(KC_RCTL); register_code(data->kc);
} }
} }
void td_fn_rctrl_reset(qk_tap_dance_state_t *state, void *user_data) { void td_layer_mod_reset(qk_tap_dance_state_t *state, void *user_data) {
if ((state->count == 1 || state->count >= 3) && !td_fn_rctrl_data.fn_on) { qk_tap_dance_layer_mod_t *data = (qk_tap_dance_layer_mod_t *)user_data;
layer_off(L_FN); if ((state->count == 1 || state->count >= 3) && !data->layer_on) {
layer_off(data->layer);
} }
if (state->count >= 2) { if (state->count >= 2) {
unregister_code(KC_RCTL); unregister_code(data->kc);
} }
td_fn_rctrl_data.started = false; data->started = false;
} }
qk_tap_dance_action_t tap_dance_actions[] = { qk_tap_dance_action_t tap_dance_actions[] = {
@ -97,5 +106,5 @@ qk_tap_dance_action_t tap_dance_actions[] = {
[TD_LSFT_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_LSFT, L_FN), [TD_LSFT_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_LSFT, L_FN),
[TD_RCTL_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_RCTL, L_FN), [TD_RCTL_FN] = ACTION_TAP_DANCE_MOD_LAYER(KC_RCTL, L_FN),
[TD_FN_RCTL] = ACTION_TAP_DANCE_FN_ADVANCED(td_fn_rctrl_each, NULL, td_fn_rctrl_reset), [TD_FN_RCTL] = ACTION_TAP_DANCE_LAYER_MOD(L_FN, KC_RCTL),
}; };