Skip to content

Commit 78945c6

Browse files
author
github-actions
committed
Merge branch 'oryx'
2 parents 8b4faa1 + a1841b3 commit 78945c6

File tree

2 files changed

+61
-93
lines changed

2 files changed

+61
-93
lines changed

‎JzWvO/config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#define USB_SUSPEND_WAKEUP_DELAY 0
99
#define CAPS_LOCK_STATUS
10-
#define SERIAL_NUMBER "JzWvO/gWzJX"
10+
#define SERIAL_NUMBER "JzWvO/OaRaV3"
1111
#define LAYER_STATE_16BIT
1212
#define HCS(report) host_consumer_send(record->event.pressed ? report : 0); return false
1313

‎JzWvO/keymap.c

+60-92
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ enum custom_keycodes {
2323
ST_MACRO_9,
2424
ST_MACRO_10,
2525
MAC_MISSION_CONTROL,
26+
MAC_SPOTLIGHT,
2627
MAC_LOCK,
2728
};
2829

@@ -34,7 +35,6 @@ enum tap_dance_codes {
3435
DANCE_2,
3536
DANCE_3,
3637
DANCE_4,
37-
DANCE_5,
3838
};
3939
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4040
[0] = LAYOUT_moonlander(
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
5050
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
5151
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
5252
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
53-
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, ST_MACRO_1, KC_TRANSPARENT, KC_TRANSPARENT, TD(DANCE_0), KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
53+
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, ST_MACRO_1, KC_TRANSPARENT, KC_TRANSPARENT, MAC_SPOTLIGHT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
5454
KC_TRANSPARENT, LT(11,KC_TAB), KC_TRANSPARENT, KC_TRANSPARENT, KC_BSPC, LT(5,KC_SPACE)
5555
),
5656
[2] = LAYOUT_moonlander(
@@ -70,18 +70,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7070
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
7171
),
7272
[4] = LAYOUT_moonlander(
73-
KC_TRANSPARENT, KC_F1, KC_F2, KC_F3, TD(DANCE_1), KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, LGUI(KC_L),
73+
KC_TRANSPARENT, KC_F1, KC_F2, KC_F3, TD(DANCE_0), KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, LGUI(KC_L),
7474
KC_TRANSPARENT, LGUI(KC_GRAVE), KC_TRANSPARENT, KC_TRANSPARENT, KC_APPLICATION, LGUI(KC_TAB), KC_TRANSPARENT, KC_TRANSPARENT, KC_PAGE_UP, KC_HOME, KC_UP, KC_END, KC_TRANSPARENT, KC_INSERT,
7575
KC_TRANSPARENT, LALT(KC_LEFT), LALT(KC_RIGHT), KC_TRANSPARENT, KC_TRANSPARENT, LGUI(KC_D), KC_TRANSPARENT, KC_TRANSPARENT, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, LALT(LCTL(LSFT(KC_GRAVE))),KC_PSCR,
76-
KC_TRANSPARENT, TD(DANCE_2), KC_TRANSPARENT, LCTL(KC_BSPC), LGUI(LCTL(KC_LEFT)),LGUI(LCTL(KC_RIGHT)), ST_MACRO_2, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), ST_MACRO_3, ST_MACRO_4, KC_TRANSPARENT,
76+
KC_TRANSPARENT, TD(DANCE_1), KC_TRANSPARENT, LCTL(KC_BSPC), LGUI(LCTL(KC_LEFT)),LGUI(LCTL(KC_RIGHT)), ST_MACRO_2, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), ST_MACRO_3, ST_MACRO_4, KC_TRANSPARENT,
7777
QK_LLCK, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_NO, KC_TRANSPARENT, ST_MACRO_5, ST_MACRO_6, ST_MACRO_7, KC_TRANSPARENT, KC_TRANSPARENT,
7878
CW_TOGG, KC_CAPS, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
7979
),
8080
[5] = LAYOUT_moonlander(
8181
KC_TRANSPARENT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_F12, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, MAC_LOCK,
8282
KC_TRANSPARENT, LGUI(LSFT(KC_V)),KC_TRANSPARENT, KC_TRANSPARENT, KC_MS_BTN2, MAC_MISSION_CONTROL,KC_TRANSPARENT, KC_TRANSPARENT, KC_PAGE_UP, KC_HOME, KC_UP, KC_END, KC_TRANSPARENT, KC_INSERT,
8383
KC_TRANSPARENT, LGUI(KC_LBRC), LGUI(KC_RBRC), KC_TRANSPARENT, KC_TRANSPARENT, KC_F11, KC_TRANSPARENT, KC_TRANSPARENT, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, LALT(LGUI(LCTL(KC_M))),LGUI(LSFT(KC_3)),
84-
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, LALT(KC_BSPC), LCTL(KC_LEFT), LCTL(KC_RIGHT), ST_MACRO_8, LGUI(LSFT(KC_LBRC)),LGUI(LSFT(KC_RBRC)),LALT(KC_TAB), KC_TRANSPARENT, LGUI(LSFT(KC_4)),
84+
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, LALT(KC_BSPC), LCTL(KC_LEFT), LCTL(KC_RIGHT), ST_MACRO_8, LGUI(LSFT(KC_LBRC)),LGUI(LSFT(KC_RBRC)),LALT(KC_TAB), LALT(LGUI(LSFT(KC_SPACE))),LGUI(LSFT(KC_4)),
8585
QK_LLCK, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_NO, KC_TRANSPARENT, LSFT(KC_7), LALT(LSFT(KC_2)),LALT(KC_3), KC_TRANSPARENT, KC_TRANSPARENT,
8686
CW_TOGG, KC_CAPS, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
8787
),
@@ -136,9 +136,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
136136
[12] = LAYOUT_moonlander(
137137
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
138138
KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_Y, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
139-
KC_TRANSPARENT, KC_TRANSPARENT, LCTL(KC_S), KC_D, TD(DANCE_3), LCTL(KC_P), KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
140-
KC_TRANSPARENT, TD(DANCE_4), KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
141-
TO(0), LCTL(KC_Y), TD(DANCE_5), KC_NO, KC_LEFT_ALT, TG(13), KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
139+
KC_TRANSPARENT, KC_TRANSPARENT, LCTL(KC_S), KC_D, TD(DANCE_2), LCTL(KC_P), KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
140+
KC_TRANSPARENT, TD(DANCE_3), KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
141+
TO(0), LCTL(KC_Y), TD(DANCE_4), KC_NO, KC_LEFT_ALT, TG(13), KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT,
142142
KC_SPACE, KC_TAB, MT(MOD_LCTL, KC_ENTER), KC_TRANSPARENT, KC_TRANSPARENT, KC_TRANSPARENT
143143
),
144144
[13] = LAYOUT_moonlander(
@@ -186,11 +186,11 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
186186
return g_tapping_term + 15;
187187
case KC_F5:
188188
return g_tapping_term + 100;
189-
case TD(DANCE_3):
189+
case TD(DANCE_2):
190190
return g_tapping_term + 35;
191-
case TD(DANCE_4):
191+
case TD(DANCE_3):
192192
return g_tapping_term + 20;
193-
case TD(DANCE_5):
193+
case TD(DANCE_4):
194194
return g_tapping_term + 100;
195195
default:
196196
return g_tapping_term;
@@ -382,6 +382,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
382382
break;
383383
case MAC_MISSION_CONTROL:
384384
HCS(0x29F);
385+
case MAC_SPOTLIGHT:
386+
HCS(0x221);
385387
case MAC_LOCK:
386388
HCS(0x19E);
387389

@@ -439,7 +441,7 @@ enum {
439441
MORE_TAPS
440442
};
441443

442-
static tap dance_state[6];
444+
static tap dance_state[5];
443445

444446
uint8_t dance_step(tap_dance_state_t *state);
445447

@@ -461,39 +463,6 @@ void dance_0_finished(tap_dance_state_t *state, void *user_data);
461463
void dance_0_reset(tap_dance_state_t *state, void *user_data);
462464

463465
void on_dance_0(tap_dance_state_t *state, void *user_data) {
464-
if(state->count == 3) {
465-
tap_code16(LGUI(KC_SPACE));
466-
tap_code16(LGUI(KC_SPACE));
467-
tap_code16(LGUI(KC_SPACE));
468-
}
469-
if(state->count > 3) {
470-
tap_code16(LGUI(KC_SPACE));
471-
}
472-
}
473-
474-
void dance_0_finished(tap_dance_state_t *state, void *user_data) {
475-
dance_state[0].step = dance_step(state);
476-
switch (dance_state[0].step) {
477-
case SINGLE_TAP: register_code16(LGUI(KC_SPACE)); break;
478-
case DOUBLE_TAP: register_code16(LALT(LGUI(LSFT(KC_SPACE)))); break;
479-
case DOUBLE_SINGLE_TAP: tap_code16(LGUI(KC_SPACE)); register_code16(LGUI(KC_SPACE));
480-
}
481-
}
482-
483-
void dance_0_reset(tap_dance_state_t *state, void *user_data) {
484-
wait_ms(10);
485-
switch (dance_state[0].step) {
486-
case SINGLE_TAP: unregister_code16(LGUI(KC_SPACE)); break;
487-
case DOUBLE_TAP: unregister_code16(LALT(LGUI(LSFT(KC_SPACE)))); break;
488-
case DOUBLE_SINGLE_TAP: unregister_code16(LGUI(KC_SPACE)); break;
489-
}
490-
dance_state[0].step = 0;
491-
}
492-
void on_dance_1(tap_dance_state_t *state, void *user_data);
493-
void dance_1_finished(tap_dance_state_t *state, void *user_data);
494-
void dance_1_reset(tap_dance_state_t *state, void *user_data);
495-
496-
void on_dance_1(tap_dance_state_t *state, void *user_data) {
497466
if(state->count == 3) {
498467
tap_code16(KC_F4);
499468
tap_code16(KC_F4);
@@ -504,29 +473,29 @@ void on_dance_1(tap_dance_state_t *state, void *user_data) {
504473
}
505474
}
506475

507-
void dance_1_finished(tap_dance_state_t *state, void *user_data) {
508-
dance_state[1].step = dance_step(state);
509-
switch (dance_state[1].step) {
476+
void dance_0_finished(tap_dance_state_t *state, void *user_data) {
477+
dance_state[0].step = dance_step(state);
478+
switch (dance_state[0].step) {
510479
case SINGLE_TAP: register_code16(KC_F4); break;
511480
case DOUBLE_TAP: register_code16(LALT(KC_F4)); break;
512481
case DOUBLE_SINGLE_TAP: tap_code16(KC_F4); register_code16(KC_F4);
513482
}
514483
}
515484

516-
void dance_1_reset(tap_dance_state_t *state, void *user_data) {
485+
void dance_0_reset(tap_dance_state_t *state, void *user_data) {
517486
wait_ms(10);
518-
switch (dance_state[1].step) {
487+
switch (dance_state[0].step) {
519488
case SINGLE_TAP: unregister_code16(KC_F4); break;
520489
case DOUBLE_TAP: unregister_code16(LALT(KC_F4)); break;
521490
case DOUBLE_SINGLE_TAP: unregister_code16(KC_F4); break;
522491
}
523-
dance_state[1].step = 0;
492+
dance_state[0].step = 0;
524493
}
525-
void on_dance_2(tap_dance_state_t *state, void *user_data);
526-
void dance_2_finished(tap_dance_state_t *state, void *user_data);
527-
void dance_2_reset(tap_dance_state_t *state, void *user_data);
494+
void on_dance_1(tap_dance_state_t *state, void *user_data);
495+
void dance_1_finished(tap_dance_state_t *state, void *user_data);
496+
void dance_1_reset(tap_dance_state_t *state, void *user_data);
528497

529-
void on_dance_2(tap_dance_state_t *state, void *user_data) {
498+
void on_dance_1(tap_dance_state_t *state, void *user_data) {
530499
if(state->count == 3) {
531500
tap_code16(KC_DELETE);
532501
tap_code16(KC_DELETE);
@@ -537,31 +506,31 @@ void on_dance_2(tap_dance_state_t *state, void *user_data) {
537506
}
538507
}
539508

540-
void dance_2_finished(tap_dance_state_t *state, void *user_data) {
541-
dance_state[2].step = dance_step(state);
542-
switch (dance_state[2].step) {
509+
void dance_1_finished(tap_dance_state_t *state, void *user_data) {
510+
dance_state[1].step = dance_step(state);
511+
switch (dance_state[1].step) {
543512
case SINGLE_TAP: register_code16(KC_DELETE); break;
544513
case SINGLE_HOLD: register_code16(LSFT(KC_DELETE)); break;
545514
case DOUBLE_TAP: register_code16(KC_DELETE); register_code16(KC_DELETE); break;
546515
case DOUBLE_SINGLE_TAP: tap_code16(KC_DELETE); register_code16(KC_DELETE);
547516
}
548517
}
549518

550-
void dance_2_reset(tap_dance_state_t *state, void *user_data) {
519+
void dance_1_reset(tap_dance_state_t *state, void *user_data) {
551520
wait_ms(10);
552-
switch (dance_state[2].step) {
521+
switch (dance_state[1].step) {
553522
case SINGLE_TAP: unregister_code16(KC_DELETE); break;
554523
case SINGLE_HOLD: unregister_code16(LSFT(KC_DELETE)); break;
555524
case DOUBLE_TAP: unregister_code16(KC_DELETE); break;
556525
case DOUBLE_SINGLE_TAP: unregister_code16(KC_DELETE); break;
557526
}
558-
dance_state[2].step = 0;
527+
dance_state[1].step = 0;
559528
}
560-
void on_dance_3(tap_dance_state_t *state, void *user_data);
561-
void dance_3_finished(tap_dance_state_t *state, void *user_data);
562-
void dance_3_reset(tap_dance_state_t *state, void *user_data);
529+
void on_dance_2(tap_dance_state_t *state, void *user_data);
530+
void dance_2_finished(tap_dance_state_t *state, void *user_data);
531+
void dance_2_reset(tap_dance_state_t *state, void *user_data);
563532

564-
void on_dance_3(tap_dance_state_t *state, void *user_data) {
533+
void on_dance_2(tap_dance_state_t *state, void *user_data) {
565534
if(state->count == 3) {
566535
tap_code16(KC_F);
567536
tap_code16(KC_F);
@@ -572,29 +541,29 @@ void on_dance_3(tap_dance_state_t *state, void *user_data) {
572541
}
573542
}
574543

575-
void dance_3_finished(tap_dance_state_t *state, void *user_data) {
576-
dance_state[3].step = dance_step(state);
577-
switch (dance_state[3].step) {
544+
void dance_2_finished(tap_dance_state_t *state, void *user_data) {
545+
dance_state[2].step = dance_step(state);
546+
switch (dance_state[2].step) {
578547
case SINGLE_TAP: register_code16(KC_F); break;
579548
case DOUBLE_TAP: register_code16(LCTL(LSFT(KC_F))); break;
580549
case DOUBLE_SINGLE_TAP: tap_code16(KC_F); register_code16(KC_F);
581550
}
582551
}
583552

584-
void dance_3_reset(tap_dance_state_t *state, void *user_data) {
553+
void dance_2_reset(tap_dance_state_t *state, void *user_data) {
585554
wait_ms(10);
586-
switch (dance_state[3].step) {
555+
switch (dance_state[2].step) {
587556
case SINGLE_TAP: unregister_code16(KC_F); break;
588557
case DOUBLE_TAP: unregister_code16(LCTL(LSFT(KC_F))); break;
589558
case DOUBLE_SINGLE_TAP: unregister_code16(KC_F); break;
590559
}
591-
dance_state[3].step = 0;
560+
dance_state[2].step = 0;
592561
}
593-
void on_dance_4(tap_dance_state_t *state, void *user_data);
594-
void dance_4_finished(tap_dance_state_t *state, void *user_data);
595-
void dance_4_reset(tap_dance_state_t *state, void *user_data);
562+
void on_dance_3(tap_dance_state_t *state, void *user_data);
563+
void dance_3_finished(tap_dance_state_t *state, void *user_data);
564+
void dance_3_reset(tap_dance_state_t *state, void *user_data);
596565

597-
void on_dance_4(tap_dance_state_t *state, void *user_data) {
566+
void on_dance_3(tap_dance_state_t *state, void *user_data) {
598567
if(state->count == 3) {
599568
tap_code16(KC_Z);
600569
tap_code16(KC_Z);
@@ -605,31 +574,31 @@ void on_dance_4(tap_dance_state_t *state, void *user_data) {
605574
}
606575
}
607576

608-
void dance_4_finished(tap_dance_state_t *state, void *user_data) {
609-
dance_state[4].step = dance_step(state);
610-
switch (dance_state[4].step) {
577+
void dance_3_finished(tap_dance_state_t *state, void *user_data) {
578+
dance_state[3].step = dance_step(state);
579+
switch (dance_state[3].step) {
611580
case SINGLE_TAP: register_code16(KC_Z); break;
612581
case SINGLE_HOLD: register_code16(LCTL(KC_Z)); break;
613582
case DOUBLE_TAP: register_code16(KC_Z); register_code16(KC_Z); break;
614583
case DOUBLE_SINGLE_TAP: tap_code16(KC_Z); register_code16(KC_Z);
615584
}
616585
}
617586

618-
void dance_4_reset(tap_dance_state_t *state, void *user_data) {
587+
void dance_3_reset(tap_dance_state_t *state, void *user_data) {
619588
wait_ms(10);
620-
switch (dance_state[4].step) {
589+
switch (dance_state[3].step) {
621590
case SINGLE_TAP: unregister_code16(KC_Z); break;
622591
case SINGLE_HOLD: unregister_code16(LCTL(KC_Z)); break;
623592
case DOUBLE_TAP: unregister_code16(KC_Z); break;
624593
case DOUBLE_SINGLE_TAP: unregister_code16(KC_Z); break;
625594
}
626-
dance_state[4].step = 0;
595+
dance_state[3].step = 0;
627596
}
628-
void on_dance_5(tap_dance_state_t *state, void *user_data);
629-
void dance_5_finished(tap_dance_state_t *state, void *user_data);
630-
void dance_5_reset(tap_dance_state_t *state, void *user_data);
597+
void on_dance_4(tap_dance_state_t *state, void *user_data);
598+
void dance_4_finished(tap_dance_state_t *state, void *user_data);
599+
void dance_4_reset(tap_dance_state_t *state, void *user_data);
631600

632-
void on_dance_5(tap_dance_state_t *state, void *user_data) {
601+
void on_dance_4(tap_dance_state_t *state, void *user_data) {
633602
if(state->count == 3) {
634603
tap_code16(KC_U);
635604
tap_code16(KC_U);
@@ -640,25 +609,25 @@ void on_dance_5(tap_dance_state_t *state, void *user_data) {
640609
}
641610
}
642611

643-
void dance_5_finished(tap_dance_state_t *state, void *user_data) {
644-
dance_state[5].step = dance_step(state);
645-
switch (dance_state[5].step) {
612+
void dance_4_finished(tap_dance_state_t *state, void *user_data) {
613+
dance_state[4].step = dance_step(state);
614+
switch (dance_state[4].step) {
646615
case SINGLE_TAP: register_code16(KC_U); break;
647616
case SINGLE_HOLD: register_code16(LCTL(KC_U)); break;
648617
case DOUBLE_TAP: register_code16(KC_U); register_code16(KC_U); break;
649618
case DOUBLE_SINGLE_TAP: tap_code16(KC_U); register_code16(KC_U);
650619
}
651620
}
652621

653-
void dance_5_reset(tap_dance_state_t *state, void *user_data) {
622+
void dance_4_reset(tap_dance_state_t *state, void *user_data) {
654623
wait_ms(10);
655-
switch (dance_state[5].step) {
624+
switch (dance_state[4].step) {
656625
case SINGLE_TAP: unregister_code16(KC_U); break;
657626
case SINGLE_HOLD: unregister_code16(LCTL(KC_U)); break;
658627
case DOUBLE_TAP: unregister_code16(KC_U); break;
659628
case DOUBLE_SINGLE_TAP: unregister_code16(KC_U); break;
660629
}
661-
dance_state[5].step = 0;
630+
dance_state[4].step = 0;
662631
}
663632

664633
tap_dance_action_t tap_dance_actions[] = {
@@ -667,7 +636,6 @@ tap_dance_action_t tap_dance_actions[] = {
667636
[DANCE_2] = ACTION_TAP_DANCE_FN_ADVANCED(on_dance_2, dance_2_finished, dance_2_reset),
668637
[DANCE_3] = ACTION_TAP_DANCE_FN_ADVANCED(on_dance_3, dance_3_finished, dance_3_reset),
669638
[DANCE_4] = ACTION_TAP_DANCE_FN_ADVANCED(on_dance_4, dance_4_finished, dance_4_reset),
670-
[DANCE_5] = ACTION_TAP_DANCE_FN_ADVANCED(on_dance_5, dance_5_finished, dance_5_reset),
671639
};
672640

673641
// Custom Qmk

0 commit comments

Comments
 (0)