summaryrefslogtreecommitdiff
path: root/users/edvorakjp
diff options
context:
space:
mode:
Diffstat (limited to 'users/edvorakjp')
-rw-r--r--users/edvorakjp/edvorakjp.c2
-rw-r--r--users/edvorakjp/edvorakjp_tap_dance.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/users/edvorakjp/edvorakjp.c b/users/edvorakjp/edvorakjp.c
index c95b03d981..3d3b5b0ae5 100644
--- a/users/edvorakjp/edvorakjp.c
+++ b/users/edvorakjp/edvorakjp.c
@@ -5,7 +5,7 @@ void matrix_init_user(void) {
matrix_init_keymap();
}
-__attribute__((weak)) void matrix_init_keymap() {}
+__attribute__((weak)) void matrix_init_keymap(void) {}
layer_state_t layer_state_set_user(layer_state_t state) {
state = update_tri_layer_state(state, L_EDVORAKJP_LOWER, L_EDVORAKJP_RAISE, L_EDVORAKJP_ADJUST);
diff --git a/users/edvorakjp/edvorakjp_tap_dance.c b/users/edvorakjp/edvorakjp_tap_dance.c
index 69fcbac1ca..d2c9f2b0e9 100644
--- a/users/edvorakjp/edvorakjp_tap_dance.c
+++ b/users/edvorakjp/edvorakjp_tap_dance.c
@@ -14,7 +14,7 @@ typedef struct {
} td_status_t;
static td_status_t td_status = {NONE, NONE};
-uint8_t cur_dance(qk_tap_dance_state_t *state) {
+uint8_t cur_dance(tap_dance_state_t *state) {
if (state->interrupted || !state->pressed) {
return state->count == 1 ? SINGLE_TAP : DOUBLE_TAP;
} else {
@@ -22,7 +22,7 @@ uint8_t cur_dance(qk_tap_dance_state_t *state) {
}
}
-void td_lower_finished(qk_tap_dance_state_t *state, void *user_data) {
+void td_lower_finished(tap_dance_state_t *state, void *user_data) {
td_status.lower = cur_dance(state);
switch (td_status.lower) {
case SINGLE_TAP:
@@ -36,7 +36,7 @@ void td_lower_finished(qk_tap_dance_state_t *state, void *user_data) {
layer_on(L_EDVORAKJP_LOWER);
}
-void td_lower_reset(qk_tap_dance_state_t *state, void *user_data) {
+void td_lower_reset(tap_dance_state_t *state, void *user_data) {
switch (td_status.lower) {
case DOUBLE_TAP:
unregister_code(KC_ESC);
@@ -46,7 +46,7 @@ void td_lower_reset(qk_tap_dance_state_t *state, void *user_data) {
td_status.lower = NONE;
}
-void td_raise_finished(qk_tap_dance_state_t *state, void *user_data) {
+void td_raise_finished(tap_dance_state_t *state, void *user_data) {
td_status.raise = cur_dance(state);
switch (td_status.raise) {
case DOUBLE_TAP:
@@ -58,12 +58,12 @@ void td_raise_finished(qk_tap_dance_state_t *state, void *user_data) {
layer_on(L_EDVORAKJP_RAISE);
}
-void td_raise_reset(qk_tap_dance_state_t *state, void *user_data) {
+void td_raise_reset(tap_dance_state_t *state, void *user_data) {
layer_off(L_EDVORAKJP_RAISE);
td_status.raise = NONE;
}
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[TD_EDVORAKJP_LOWER] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_lower_finished, td_lower_reset),
[TD_EDVORAKJP_RAISE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_raise_finished, td_raise_reset),
};