summaryrefslogtreecommitdiff
path: root/keyboards/preonic
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-12-15 07:40:25 +1100
committerGitHub <noreply@github.com>2022-12-14 12:40:25 -0800
commit1978007faefc0fb3af809ddf0d2ff1274e540570 (patch)
tree76e3d5ce69f8f4892602c5cfb6b54374642e7c55 /keyboards/preonic
parent83e8e5845a7136ade68bad82c156c70c071f9bf7 (diff)
Tap Dance: remove `qk_` prefix (#19313)
Diffstat (limited to 'keyboards/preonic')
-rw-r--r--keyboards/preonic/keymaps/choromanski/keymap.c2
-rwxr-xr-xkeyboards/preonic/keymaps/davidrambo/keymap.c6
-rw-r--r--keyboards/preonic/keymaps/egstad/keymap.c2
-rw-r--r--keyboards/preonic/keymaps/era1112/keymap.c14
-rw-r--r--keyboards/preonic/keymaps/mverteuil/keymap.c54
-rw-r--r--keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c40
-rw-r--r--keyboards/preonic/keymaps/zach/zach_common_functions.c16
7 files changed, 67 insertions, 67 deletions
diff --git a/keyboards/preonic/keymaps/choromanski/keymap.c b/keyboards/preonic/keymaps/choromanski/keymap.c
index dd4a151980..ce7be97a57 100644
--- a/keyboards/preonic/keymaps/choromanski/keymap.c
+++ b/keyboards/preonic/keymaps/choromanski/keymap.c
@@ -21,7 +21,7 @@ enum {
21}; 21};
22 22
23//Tap Dance Definitions 23//Tap Dance Definitions
24qk_tap_dance_action_t tap_dance_actions[] = { 24tap_dance_action_t tap_dance_actions[] = {
25 //Tap once for 1, twice for Grave 25 //Tap once for 1, twice for Grave
26 [G1] = ACTION_TAP_DANCE_DOUBLE(KC_1, KC_GRV), 26 [G1] = ACTION_TAP_DANCE_DOUBLE(KC_1, KC_GRV),
27 //Tap once for [, twice for ] 27 //Tap once for [, twice for ]
diff --git a/keyboards/preonic/keymaps/davidrambo/keymap.c b/keyboards/preonic/keymaps/davidrambo/keymap.c
index 823bcb6862..aca8a7c1e3 100755
--- a/keyboards/preonic/keymaps/davidrambo/keymap.c
+++ b/keyboards/preonic/keymaps/davidrambo/keymap.c
@@ -156,7 +156,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
156}; 156};
157 157
158// Shift vs capslock function. From bbaserdem's Planck keymap. 158// Shift vs capslock function. From bbaserdem's Planck keymap.
159void caps_tap (qk_tap_dance_state_t *state, void *user_data) { 159void caps_tap (tap_dance_state_t *state, void *user_data) {
160 if (state->count == 1) { 160 if (state->count == 1) {
161 register_code (KC_LSFT); 161 register_code (KC_LSFT);
162 } else if (state->count == 2) { 162 } else if (state->count == 2) {
@@ -164,7 +164,7 @@ void caps_tap (qk_tap_dance_state_t *state, void *user_data) {
164 register_code (KC_CAPS); 164 register_code (KC_CAPS);
165 } 165 }
166} 166}
167void caps_tap_end (qk_tap_dance_state_t *state, void *user_data) { 167void caps_tap_end (tap_dance_state_t *state, void *user_data) {
168 if (state->count == 1) { 168 if (state->count == 1) {
169 unregister_code (KC_LSFT); 169 unregister_code (KC_LSFT);
170 } else { 170 } else {
@@ -173,7 +173,7 @@ void caps_tap_end (qk_tap_dance_state_t *state, void *user_data) {
173} 173}
174 174
175//Tap Dance Definitions 175//Tap Dance Definitions
176qk_tap_dance_action_t tap_dance_actions[] = { 176tap_dance_action_t tap_dance_actions[] = {
177 //Tap once for Shift, twice for Caps Lock 177 //Tap once for Shift, twice for Caps Lock
178 [SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end ) 178 [SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end )
179}; 179};
diff --git a/keyboards/preonic/keymaps/egstad/keymap.c b/keyboards/preonic/keymaps/egstad/keymap.c
index 0ea9c339b1..4b1fad7323 100644
--- a/keyboards/preonic/keymaps/egstad/keymap.c
+++ b/keyboards/preonic/keymaps/egstad/keymap.c
@@ -219,7 +219,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
219/* Tap Dance Definitions 219/* Tap Dance Definitions
220 ========================================================================== */ 220 ========================================================================== */
221 221
222qk_tap_dance_action_t tap_dance_actions[] = { 222tap_dance_action_t tap_dance_actions[] = {
223 // Tap once for Left Brace, twice for Right Brace 223 // Tap once for Left Brace, twice for Right Brace
224 [TD_BRC] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), 224 [TD_BRC] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
225 //Tap once for Minus, twice for Equal 225 //Tap once for Minus, twice for Equal
diff --git a/keyboards/preonic/keymaps/era1112/keymap.c b/keyboards/preonic/keymaps/era1112/keymap.c
index 43c8ab9572..74ba6772d5 100644
--- a/keyboards/preonic/keymaps/era1112/keymap.c
+++ b/keyboards/preonic/keymaps/era1112/keymap.c
@@ -66,7 +66,7 @@ typedef struct {
66 td_state_t state; 66 td_state_t state;
67} td_tap_t; 67} td_tap_t;
68 68
69td_state_t cur_dance(qk_tap_dance_state_t* state); 69td_state_t cur_dance(tap_dance_state_t* state);
70 70
71/* Return an integer that corresponds to what kind of tap dance should be executed. 71/* Return an integer that corresponds to what kind of tap dance should be executed.
72 * 72 *
@@ -95,7 +95,7 @@ td_state_t cur_dance(qk_tap_dance_state_t* state);
95 * For the third point, there does exist the 'TD_DOUBLE_SINGLE_TAP', however this is not fully tested 95 * For the third point, there does exist the 'TD_DOUBLE_SINGLE_TAP', however this is not fully tested
96 * 96 *
97 */ 97 */
98td_state_t cur_dance(qk_tap_dance_state_t* state) { 98td_state_t cur_dance(tap_dance_state_t* state) {
99 if (state->count == 1) { 99 if (state->count == 1) {
100 if (state->interrupted || !state->pressed) { 100 if (state->interrupted || !state->pressed) {
101 return TD_1_TAP; 101 return TD_1_TAP;
@@ -117,15 +117,15 @@ td_state_t cur_dance(qk_tap_dance_state_t* state) {
117 117
118//----------- 2tap capslock --------------// 118//----------- 2tap capslock --------------//
119//----------------------------------------// 119//----------------------------------------//
120void twoCapsLock_finished(qk_tap_dance_state_t* state, void* user_data); 120void twoCapsLock_finished(tap_dance_state_t* state, void* user_data);
121void twoCapsLock_reset(qk_tap_dance_state_t* state, void* user_data); 121void twoCapsLock_reset(tap_dance_state_t* state, void* user_data);
122 122
123static td_tap_t twoCapsLock_tap_state = { 123static td_tap_t twoCapsLock_tap_state = {
124 .is_press_action = true, 124 .is_press_action = true,
125 .state = TD_NONE 125 .state = TD_NONE
126}; 126};
127 127
128void twoCapsLock_finished(qk_tap_dance_state_t* state, void* user_data) { 128void twoCapsLock_finished(tap_dance_state_t* state, void* user_data) {
129 twoCapsLock_tap_state.state = cur_dance(state); 129 twoCapsLock_tap_state.state = cur_dance(state);
130 switch (twoCapsLock_tap_state.state) { 130 switch (twoCapsLock_tap_state.state) {
131 case TD_NONE: register_code(KC_LSFT); break; 131 case TD_NONE: register_code(KC_LSFT); break;
@@ -142,7 +142,7 @@ void twoCapsLock_finished(qk_tap_dance_state_t* state, void* user_data) {
142 } 142 }
143} 143}
144 144
145void twoCapsLock_reset(qk_tap_dance_state_t* state, void* user_data) { 145void twoCapsLock_reset(tap_dance_state_t* state, void* user_data) {
146 switch (twoCapsLock_tap_state.state) { 146 switch (twoCapsLock_tap_state.state) {
147 case TD_UNKNOWN: unregister_code(KC_LSFT); break; 147 case TD_UNKNOWN: unregister_code(KC_LSFT); break;
148 case TD_NONE: unregister_code(KC_LSFT); break; 148 case TD_NONE: unregister_code(KC_LSFT); break;
@@ -202,7 +202,7 @@ enum custom_keycodes {
202 202
203static bool blinky = false; // Track blinky behavior on/off for keycode 203static bool blinky = false; // Track blinky behavior on/off for keycode
204 204
205qk_tap_dance_action_t tap_dance_actions[] = { 205tap_dance_action_t tap_dance_actions[] = {
206 [TD_2_CAPSLOCK] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, twoCapsLock_finished, twoCapsLock_reset) 206 [TD_2_CAPSLOCK] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, twoCapsLock_finished, twoCapsLock_reset)
207}; 207};
208 208
diff --git a/keyboards/preonic/keymaps/mverteuil/keymap.c b/keyboards/preonic/keymaps/mverteuil/keymap.c
index c54eff71d5..332e2877b2 100644
--- a/keyboards/preonic/keymaps/mverteuil/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil/keymap.c
@@ -75,17 +75,17 @@ typedef struct {
75 t_tap_state right_brackets; 75 t_tap_state right_brackets;
76} t_tap; 76} t_tap;
77 77
78t_tap_state get_tapdance_state(qk_tap_dance_state_t *state); 78t_tap_state get_tapdance_state(tap_dance_state_t *state);
79 79
80void td_numpad_funcrow_finished(qk_tap_dance_state_t *state, void *user_data); 80void td_numpad_funcrow_finished(tap_dance_state_t *state, void *user_data);
81void td_numpad_funcrow_reset(qk_tap_dance_state_t *state, void *user_data); 81void td_numpad_funcrow_reset(tap_dance_state_t *state, void *user_data);
82void td_brackets_left_finished(qk_tap_dance_state_t *state, void *user_data); 82void td_brackets_left_finished(tap_dance_state_t *state, void *user_data);
83void td_brackets_left_reset(qk_tap_dance_state_t *state, void *user_data); 83void td_brackets_left_reset(tap_dance_state_t *state, void *user_data);
84void td_brackets_right_finished(qk_tap_dance_state_t *state, void *user_data); 84void td_brackets_right_finished(tap_dance_state_t *state, void *user_data);
85void td_brackets_right_reset(qk_tap_dance_state_t *state, void *user_data); 85void td_brackets_right_reset(tap_dance_state_t *state, void *user_data);
86 86
87/* Tap Dance Definitions */ 87/* Tap Dance Definitions */
88qk_tap_dance_action_t tap_dance_actions[] = { 88tap_dance_action_t tap_dance_actions[] = {
89 /* Tap once for left parenthesis, twice for left bracket, thrice for left brace */ 89 /* Tap once for left parenthesis, twice for left bracket, thrice for left brace */
90 [TD_BRACKETS_LEFT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_brackets_left_finished, td_brackets_left_reset), 90 [TD_BRACKETS_LEFT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_brackets_left_finished, td_brackets_left_reset),
91 /* Tap once for right parenthesis, twice for right bracket, thrice for right brace */ 91 /* Tap once for right parenthesis, twice for right bracket, thrice for right brace */
@@ -290,7 +290,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
290}; 290};
291 291
292/* Global TapDance State */ 292/* Global TapDance State */
293static t_tap qk_tap_state = { 293static t_tap tap_state = {
294 .left_brackets = 0, 294 .left_brackets = 0,
295 .numpad_funcrow = 0, 295 .numpad_funcrow = 0,
296 .right_brackets = 0, 296 .right_brackets = 0,
@@ -300,7 +300,7 @@ float s_functionrow_on[][2] = LAYER_FUNCROW_ON_SONG;
300float s_functionrow_off[][2] = LAYER_FUNCROW_OFF_SONG; 300float s_functionrow_off[][2] = LAYER_FUNCROW_OFF_SONG;
301float s_numpad_toggle[][2] = LAYER_NMPAD_SONG; 301float s_numpad_toggle[][2] = LAYER_NMPAD_SONG;
302 302
303t_tap_state get_tapdance_state(qk_tap_dance_state_t *state) { 303t_tap_state get_tapdance_state(tap_dance_state_t *state) {
304 if (state->count == 1) { 304 if (state->count == 1) {
305 if (state->interrupted || !state->pressed) { 305 if (state->interrupted || !state->pressed) {
306 return SINGLE_TAP; 306 return SINGLE_TAP;
@@ -323,9 +323,9 @@ t_tap_state get_tapdance_state(qk_tap_dance_state_t *state) {
323 return TAP_DANCE_NO_MATCH; 323 return TAP_DANCE_NO_MATCH;
324} 324}
325 325
326void td_numpad_funcrow_finished(qk_tap_dance_state_t *state, void *user_data) { 326void td_numpad_funcrow_finished(tap_dance_state_t *state, void *user_data) {
327 qk_tap_state.numpad_funcrow = get_tapdance_state(state); 327 tap_state.numpad_funcrow = get_tapdance_state(state);
328 switch (qk_tap_state.numpad_funcrow) { 328 switch (tap_state.numpad_funcrow) {
329 case SINGLE_TAP ... SINGLE_HOLD: 329 case SINGLE_TAP ... SINGLE_HOLD:
330 layer_on(_NUMPAD); 330 layer_on(_NUMPAD);
331 PLAY_SONG(s_numpad_toggle); 331 PLAY_SONG(s_numpad_toggle);
@@ -347,8 +347,8 @@ void td_numpad_funcrow_finished(qk_tap_dance_state_t *state, void *user_data) {
347 } 347 }
348} 348}
349 349
350void td_numpad_funcrow_reset(qk_tap_dance_state_t *state, void *user_data) { 350void td_numpad_funcrow_reset(tap_dance_state_t *state, void *user_data) {
351 switch (qk_tap_state.numpad_funcrow) { 351 switch (tap_state.numpad_funcrow) {
352 case SINGLE_HOLD: 352 case SINGLE_HOLD:
353 layer_off(_NUMPAD); 353 layer_off(_NUMPAD);
354 break; 354 break;
@@ -360,9 +360,9 @@ void td_numpad_funcrow_reset(qk_tap_dance_state_t *state, void *user_data) {
360 } 360 }
361} 361}
362 362
363void td_brackets_left_finished(qk_tap_dance_state_t *state, void *user_data) { 363void td_brackets_left_finished(tap_dance_state_t *state, void *user_data) {
364 qk_tap_state.left_brackets = get_tapdance_state(state); 364 tap_state.left_brackets = get_tapdance_state(state);
365 switch (qk_tap_state.left_brackets) { 365 switch (tap_state.left_brackets) {
366 case SINGLE_TAP: 366 case SINGLE_TAP:
367 register_code16(KC_LEFT_PAREN); 367 register_code16(KC_LEFT_PAREN);
368 break; 368 break;
@@ -377,8 +377,8 @@ void td_brackets_left_finished(qk_tap_dance_state_t *state, void *user_data) {
377 } 377 }
378} 378}
379 379
380void td_brackets_left_reset(qk_tap_dance_state_t *state, void *user_data) { 380void td_brackets_left_reset(tap_dance_state_t *state, void *user_data) {
381 switch (qk_tap_state.left_brackets) { 381 switch (tap_state.left_brackets) {
382 case SINGLE_TAP: 382 case SINGLE_TAP:
383 unregister_code16(KC_LEFT_PAREN); 383 unregister_code16(KC_LEFT_PAREN);
384 break; 384 break;
@@ -391,12 +391,12 @@ void td_brackets_left_reset(qk_tap_dance_state_t *state, void *user_data) {
391 default: 391 default:
392 break; 392 break;
393 } 393 }
394 qk_tap_state.left_brackets = 0; 394 tap_state.left_brackets = 0;
395} 395}
396 396
397void td_brackets_right_finished(qk_tap_dance_state_t *state, void *user_data) { 397void td_brackets_right_finished(tap_dance_state_t *state, void *user_data) {
398 qk_tap_state.right_brackets = get_tapdance_state(state); 398 tap_state.right_brackets = get_tapdance_state(state);
399 switch (qk_tap_state.right_brackets) { 399 switch (tap_state.right_brackets) {
400 case SINGLE_TAP: 400 case SINGLE_TAP:
401 register_code16(KC_RIGHT_PAREN); 401 register_code16(KC_RIGHT_PAREN);
402 break; 402 break;
@@ -411,8 +411,8 @@ void td_brackets_right_finished(qk_tap_dance_state_t *state, void *user_data) {
411 } 411 }
412} 412}
413 413
414void td_brackets_right_reset(qk_tap_dance_state_t *state, void *user_data) { 414void td_brackets_right_reset(tap_dance_state_t *state, void *user_data) {
415 switch (qk_tap_state.right_brackets) { 415 switch (tap_state.right_brackets) {
416 case SINGLE_TAP: 416 case SINGLE_TAP:
417 unregister_code16(KC_RIGHT_PAREN); 417 unregister_code16(KC_RIGHT_PAREN);
418 break; 418 break;
@@ -425,7 +425,7 @@ void td_brackets_right_reset(qk_tap_dance_state_t *state, void *user_data) {
425 default: 425 default:
426 break; 426 break;
427 } 427 }
428 qk_tap_state.right_brackets = 0; 428 tap_state.right_brackets = 0;
429} 429}
430 430
431bool muse_mode = false; 431bool muse_mode = false;
diff --git a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
index a269519339..c6cad0fe5f 100644
--- a/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
+++ b/keyboards/preonic/keymaps/mverteuil_2x2u/keymap.c
@@ -78,15 +78,15 @@ typedef struct {
78 t_tap_state right_brackets; 78 t_tap_state right_brackets;
79} t_tap; 79} t_tap;
80 80
81t_tap_state get_tapdance_state(qk_tap_dance_state_t *state); 81t_tap_state get_tapdance_state(tap_dance_state_t *state);
82 82
83void td_brackets_left_finished(qk_tap_dance_state_t *state, void *user_data); 83void td_brackets_left_finished(tap_dance_state_t *state, void *user_data);
84void td_brackets_left_reset(qk_tap_dance_state_t *state, void *user_data); 84void td_brackets_left_reset(tap_dance_state_t *state, void *user_data);
85void td_brackets_right_finished(qk_tap_dance_state_t *state, void *user_data); 85void td_brackets_right_finished(tap_dance_state_t *state, void *user_data);
86void td_brackets_right_reset(qk_tap_dance_state_t *state, void *user_data); 86void td_brackets_right_reset(tap_dance_state_t *state, void *user_data);
87 87
88/* Tap Dance Definitions */ 88/* Tap Dance Definitions */
89qk_tap_dance_action_t tap_dance_actions[] = { 89tap_dance_action_t tap_dance_actions[] = {
90 /* Tap once for left parenthesis, twice for left bracket, thrice for left brace */ 90 /* Tap once for left parenthesis, twice for left bracket, thrice for left brace */
91 [TD_BRACKETS_LEFT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_brackets_left_finished, td_brackets_left_reset), 91 [TD_BRACKETS_LEFT] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, td_brackets_left_finished, td_brackets_left_reset),
92 /* Tap once for right parenthesis, twice for right bracket, thrice for right brace */ 92 /* Tap once for right parenthesis, twice for right bracket, thrice for right brace */
@@ -266,14 +266,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
266}; 266};
267 267
268/* Global TapDance State */ 268/* Global TapDance State */
269static t_tap qk_tap_state = { 269static t_tap tap_state = {
270 .left_brackets = 0, 270 .left_brackets = 0,
271 .right_brackets = 0, 271 .right_brackets = 0,
272}; 272};
273 273
274float s_numpad_toggle[][2] = LAYER_NMPAD_SONG; 274float s_numpad_toggle[][2] = LAYER_NMPAD_SONG;
275 275
276t_tap_state get_tapdance_state(qk_tap_dance_state_t *state) { 276t_tap_state get_tapdance_state(tap_dance_state_t *state) {
277 if (state->count == 1) { 277 if (state->count == 1) {
278 if (state->interrupted || !state->pressed) { 278 if (state->interrupted || !state->pressed) {
279 return SINGLE_TAP; 279 return SINGLE_TAP;
@@ -296,9 +296,9 @@ t_tap_state get_tapdance_state(qk_tap_dance_state_t *state) {
296 return TAP_DANCE_NO_MATCH; 296 return TAP_DANCE_NO_MATCH;
297} 297}
298 298
299void td_brackets_left_finished(qk_tap_dance_state_t *state, void *user_data) { 299void td_brackets_left_finished(tap_dance_state_t *state, void *user_data) {
300 qk_tap_state.left_brackets = get_tapdance_state(state); 300 tap_state.left_brackets = get_tapdance_state(state);
301 switch (qk_tap_state.left_brackets) { 301 switch (tap_state.left_brackets) {
302 case SINGLE_TAP: 302 case SINGLE_TAP:
303 register_code16(KC_LEFT_PAREN); 303 register_code16(KC_LEFT_PAREN);
304 break; 304 break;
@@ -313,8 +313,8 @@ void td_brackets_left_finished(qk_tap_dance_state_t *state, void *user_data) {
313 } 313 }
314} 314}
315 315
316void td_brackets_left_reset(qk_tap_dance_state_t *state, void *user_data) { 316void td_brackets_left_reset(tap_dance_state_t *state, void *user_data) {
317 switch (qk_tap_state.left_brackets) { 317 switch (tap_state.left_brackets) {
318 case SINGLE_TAP: 318 case SINGLE_TAP:
319 unregister_code16(KC_LEFT_PAREN); 319 unregister_code16(KC_LEFT_PAREN);
320 break; 320 break;
@@ -327,12 +327,12 @@ void td_brackets_left_reset(qk_tap_dance_state_t *state, void *user_data) {
327 default: 327 default:
328 break; 328 break;
329 } 329 }
330 qk_tap_state.left_brackets = 0; 330 tap_state.left_brackets = 0;
331} 331}
332 332
333void td_brackets_right_finished(qk_tap_dance_state_t *state, void *user_data) { 333void td_brackets_right_finished(tap_dance_state_t *state, void *user_data) {
334 qk_tap_state.right_brackets = get_tapdance_state(state); 334 tap_state.right_brackets = get_tapdance_state(state);
335 switch (qk_tap_state.right_brackets) { 335 switch (tap_state.right_brackets) {
336 case SINGLE_TAP: 336 case SINGLE_TAP:
337 register_code16(KC_RIGHT_PAREN); 337 register_code16(KC_RIGHT_PAREN);
338 break; 338 break;
@@ -347,8 +347,8 @@ void td_brackets_right_finished(qk_tap_dance_state_t *state, void *user_data) {
347 } 347 }
348} 348}
349 349
350void td_brackets_right_reset(qk_tap_dance_state_t *state, void *user_data) { 350void td_brackets_right_reset(tap_dance_state_t *state, void *user_data) {
351 switch (qk_tap_state.right_brackets) { 351 switch (tap_state.right_brackets) {
352 case SINGLE_TAP: 352 case SINGLE_TAP:
353 unregister_code16(KC_RIGHT_PAREN); 353 unregister_code16(KC_RIGHT_PAREN);
354 break; 354 break;
@@ -361,7 +361,7 @@ void td_brackets_right_reset(qk_tap_dance_state_t *state, void *user_data) {
361 default: 361 default:
362 break; 362 break;
363 } 363 }
364 qk_tap_state.right_brackets = 0; 364 tap_state.right_brackets = 0;
365} 365}
366 366
367bool muse_mode = false; 367bool muse_mode = false;
diff --git a/keyboards/preonic/keymaps/zach/zach_common_functions.c b/keyboards/preonic/keymaps/zach/zach_common_functions.c
index 7a594b567f..b6e8d9be47 100644
--- a/keyboards/preonic/keymaps/zach/zach_common_functions.c
+++ b/keyboards/preonic/keymaps/zach/zach_common_functions.c
@@ -68,7 +68,7 @@ float unilin[][2] = SONG(UNICODE_LINUX);
68#ifdef TAP_DANCE_ENABLE 68#ifdef TAP_DANCE_ENABLE
69#define TAPPING_TERM 200 69#define TAPPING_TERM 200
70 70
71void dance_raise_press(qk_tap_dance_state_t *state, void *user_data){// Called on each tap 71void dance_raise_press(tap_dance_state_t *state, void *user_data){// Called on each tap
72 switch(state->count){ // Only turn the layer on once 72 switch(state->count){ // Only turn the layer on once
73 case 1: 73 case 1:
74 layer_off(_UNICODES); 74 layer_off(_UNICODES);
@@ -77,7 +77,7 @@ void dance_raise_press(qk_tap_dance_state_t *state, void *user_data){// Called o
77 break; 77 break;
78 } 78 }
79}; 79};
80void dance_raise_lift(qk_tap_dance_state_t *state, void *user_data){ // Called on release 80void dance_raise_lift(tap_dance_state_t *state, void *user_data){ // Called on release
81 switch(state->count){ 81 switch(state->count){
82 case 1: // Normal action. Turn off layers 82 case 1: // Normal action. Turn off layers
83 layer_off(_RAISE); 83 layer_off(_RAISE);
@@ -87,7 +87,7 @@ void dance_raise_lift(qk_tap_dance_state_t *state, void *user_data){ // Called o
87 } 87 }
88}; 88};
89///////////////////////////////////////////////////////////////////// 89/////////////////////////////////////////////////////////////////////
90void dance_lower_press(qk_tap_dance_state_t *state, void *user_data){// Called on tap 90void dance_lower_press(tap_dance_state_t *state, void *user_data){// Called on tap
91 switch(state->count){ 91 switch(state->count){
92 case 1: // Turn on lower 92 case 1: // Turn on lower
93 layer_off(_UNICODES); 93 layer_off(_UNICODES);
@@ -96,7 +96,7 @@ void dance_lower_press(qk_tap_dance_state_t *state, void *user_data){// Called o
96 break; 96 break;
97 } 97 }
98}; 98};
99void dance_lower_lift(qk_tap_dance_state_t *state, void *user_data){ // Called on release 99void dance_lower_lift(tap_dance_state_t *state, void *user_data){ // Called on release
100 switch(state->count){ 100 switch(state->count){
101 case 1: // Normal action. Turn off layers 101 case 1: // Normal action. Turn off layers
102 layer_off(_LOWER); 102 layer_off(_LOWER);
@@ -114,12 +114,12 @@ void dance_lower_lift(qk_tap_dance_state_t *state, void *user_data){ // Called o
114 } 114 }
115}; 115};
116///////////////////////////////////////////////////////////////////// 116/////////////////////////////////////////////////////////////////////
117void dance_super_press(qk_tap_dance_state_t *state, void *user_data){ // Called on down 117void dance_super_press(tap_dance_state_t *state, void *user_data){ // Called on down
118 if(state->count == 1){ 118 if(state->count == 1){
119 register_code(KC_LGUI); 119 register_code(KC_LGUI);
120 } 120 }
121} 121}
122void dance_super_done(qk_tap_dance_state_t *state, void *user_data){ // Called on timeout 122void dance_super_done(tap_dance_state_t *state, void *user_data){ // Called on timeout
123 switch(state->count){ 123 switch(state->count){
124 case 2: 124 case 2:
125 register_code(KC_LGUI); 125 register_code(KC_LGUI);
@@ -128,11 +128,11 @@ void dance_super_done(qk_tap_dance_state_t *state, void *user_data){ // Calle
128 break; 128 break;
129 } 129 }
130} 130}
131void dance_super_lift(qk_tap_dance_state_t *state, void *user_data){ // Called on up 131void dance_super_lift(tap_dance_state_t *state, void *user_data){ // Called on up
132 unregister_code(KC_LGUI); 132 unregister_code(KC_LGUI);
133} 133}
134 134
135qk_tap_dance_action_t tap_dance_actions[] = { 135tap_dance_action_t tap_dance_actions[] = {
136 [RAI] = ACTION_TAP_DANCE_FN_ADVANCED(dance_raise_press, NULL, dance_raise_lift), 136 [RAI] = ACTION_TAP_DANCE_FN_ADVANCED(dance_raise_press, NULL, dance_raise_lift),
137 [LOW] = ACTION_TAP_DANCE_FN_ADVANCED(dance_lower_press, NULL, dance_lower_lift), 137 [LOW] = ACTION_TAP_DANCE_FN_ADVANCED(dance_lower_press, NULL, dance_lower_lift),
138 [SUP] = ACTION_TAP_DANCE_FN_ADVANCED(dance_super_press, dance_super_done, dance_super_lift) 138 [SUP] = ACTION_TAP_DANCE_FN_ADVANCED(dance_super_press, dance_super_done, dance_super_lift)