aboutsummaryrefslogtreecommitdiff
path: root/keyboards/dz60
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-08-13 19:29:21 +0000
committerQMK Bot <hello@qmk.fm>2021-08-13 19:29:21 +0000
commitfcddaadc56bc689a7296e230e9a2c631be55e0cb (patch)
treeaf20ac26c658616ea8b3b81e862b8f737367aa99 /keyboards/dz60
parentbd811f6546bcd98383ee0c28240ccd35fbc8549c (diff)
parent2aeacf9db79439801482c8d2f53147779dd0bb89 (diff)
downloadqmk_firmware-fcddaadc56bc689a7296e230e9a2c631be55e0cb.tar.gz
qmk_firmware-fcddaadc56bc689a7296e230e9a2c631be55e0cb.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/dz60')
-rw-r--r--keyboards/dz60/keymaps/jdelkins/config.h41
-rw-r--r--keyboards/dz60/keymaps/jdelkins/keymap.c263
-rw-r--r--keyboards/dz60/keymaps/jdelkins/rules.mk4
-rw-r--r--keyboards/dz60/keymaps/jdelkins_ss/config.h51
-rw-r--r--keyboards/dz60/keymaps/jdelkins_ss/keymap.c367
-rw-r--r--keyboards/dz60/keymaps/jdelkins_ss/rules.mk8
6 files changed, 194 insertions, 540 deletions
diff --git a/keyboards/dz60/keymaps/jdelkins/config.h b/keyboards/dz60/keymaps/jdelkins/config.h
index 95b45b2c1..9d50abd3e 100644
--- a/keyboards/dz60/keymaps/jdelkins/config.h
+++ b/keyboards/dz60/keymaps/jdelkins/config.h
@@ -17,35 +17,38 @@
17 17
18#pragma once 18#pragma once
19 19
20/* Directional arrangement | LAYOUT_directional 20/* My hhkb variant
21 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ 21 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
22 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │ 0e │ 22 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
23 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ 23 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
24 * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │ 24 * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │
25 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ 25 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
26 * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │ 26 * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
27 * ├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤ 27 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
28 * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │ 28 * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │
29 * ├────┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┼───┼───┼───┼───┤ 29 * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤
30 * │40 │41 │43 │ 46 │4a │4b │4c │4d │4e │ 30 * │40 │41 │43 │44 │46 │48 │4a │4b │4c │4d │4e │
31 * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘ 31 * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
32*/ 32 */
33 33
34#define LAYOUT_directional_nosplitspace( \ 34#define LAYOUT_hhkb_split( \
35 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \ 35 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
36 k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ 36 k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
37 k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ 37 k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
38 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \ 38 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \
39 k40, k41, k43, k46, k4a, k4b, k4c, k4d, k4e \ 39 k40, k41, k43, k44, k46, k48, k4a, k4b, k4c, k4d, k4e \
40) { \ 40) { \
41 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, KC_NO,k0e }, \ 41 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
42 { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ 42 { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
43 { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \ 43 { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \
44 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \ 44 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, k3e }, \
45 { k40, k41, KC_NO, k43, KC_NO,KC_NO, k46, KC_NO, KC_NO,KC_NO, k4a, k4b, k4c, k4d, k4e } \ 45 { k40, k41, KC_NO, k43, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d, k4e } \
46} 46}
47 47
48#define AUTO_SHIFT_TIMEOUT 160 48#define AUTO_SHIFT_TIMEOUT 160
49#define AUTO_SHIFT_REPEAT
49#define RGBLIGHT_LAYERS 50#define RGBLIGHT_LAYERS
51#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
50#define LEADER_TIMEOUT 400 52#define LEADER_TIMEOUT 400
51#define LEADER_PER_KEY_TIMING 53#define LEADER_PER_KEY_TIMING
54#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/dz60/keymaps/jdelkins/keymap.c b/keyboards/dz60/keymaps/jdelkins/keymap.c
index c0bf4445a..cf9dd584f 100644
--- a/keyboards/dz60/keymaps/jdelkins/keymap.c
+++ b/keyboards/dz60/keymaps/jdelkins/keymap.c
@@ -18,20 +18,26 @@
18#include "jdelkins.h" 18#include "jdelkins.h"
19 19
20#undef LAYOUT 20#undef LAYOUT
21#define LAYOUT LAYOUT_directional_nosplitspace 21#define LAYOUT LAYOUT_hhkb_split
22 22
23#define IDLE_TIMEOUT 360 23#define IDLE_TIMEOUT 360
24
24uint16_t rgb_idle_seconds = 0; 25uint16_t rgb_idle_seconds = 0;
25uint16_t rgb_timer; 26uint16_t rgb_timer;
27uint16_t bspc_timer;
26bool rgb_was_enabled; 28bool rgb_was_enabled;
27 29
30enum {
31 MY_BSPC = USER_SAFE_RANGE,
32};
33
28// Tap Dance 34// Tap Dance
29 35
30int ctl_state = 0; 36int ctl_state = 0;
31 37
32void ctl_finished(qk_tap_dance_state_t *state, void *user_data) { 38void ctl_finished(qk_tap_dance_state_t *state, void *user_data) {
33 ctl_state = cur_dance(state); 39 ctl_state = cur_dance(state);
34 switch(ctl_state) { 40 switch (ctl_state) {
35 case SINGLE_TAP: qk_leader_start(); break; 41 case SINGLE_TAP: qk_leader_start(); break;
36 case SINGLE_HOLD: register_code(KC_LCTL); break; 42 case SINGLE_HOLD: register_code(KC_LCTL); break;
37 case DOUBLE_TAP: tap_code(KC_RCTL); break; 43 case DOUBLE_TAP: tap_code(KC_RCTL); break;
@@ -42,7 +48,7 @@ void ctl_finished(qk_tap_dance_state_t *state, void *user_data) {
42} 48}
43 49
44void ctl_reset(qk_tap_dance_state_t *state, void *user_data) { 50void ctl_reset(qk_tap_dance_state_t *state, void *user_data) {
45 switch(ctl_state) { 51 switch (ctl_state) {
46 case SINGLE_HOLD: unregister_code(KC_LCTL); break; 52 case SINGLE_HOLD: unregister_code(KC_LCTL); break;
47 case DOUBLE_HOLD: 53 case DOUBLE_HOLD:
48 case TRIPLE_HOLD: unregister_code(KC_RCTL); break; 54 case TRIPLE_HOLD: unregister_code(KC_RCTL); break;
@@ -61,56 +67,93 @@ void g_finished(qk_tap_dance_state_t *state, void *user_data) {
61 } 67 }
62} 68}
63 69
70int kp_state = 0;
71
72void kp_finished(qk_tap_dance_state_t *state, void *user_data) {
73 kp_state = hold_cur_dance(state);
74 switch (kp_state) {
75 case SINGLE_TAP:
76 tap_code(KC_SPC);
77 break;
78 default:
79 layer_invert(_KP);
80 break;
81 }
82}
83
84void kp_reset(qk_tap_dance_state_t *state, void *user_data) {
85 switch (kp_state) {
86 case SINGLE_HOLD:
87 case DOUBLE_HOLD:
88 case TRIPLE_HOLD:
89 layer_invert(_KP);
90 break;
91 }
92}
93
64enum { 94enum {
65 TD_LDCTL, 95 TD_LDCTL,
66 TD_G, 96 TD_G,
97 TD_KP,
67}; 98};
68 99
69qk_tap_dance_action_t tap_dance_actions[] = { 100qk_tap_dance_action_t tap_dance_actions[] = {
70 [TD_LDCTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctl_finished, ctl_reset), 101 [TD_LDCTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctl_finished, ctl_reset),
71 [TD_G] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, g_finished, NULL), 102 [TD_G] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, g_finished, NULL),
103 [TD_KP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, kp_finished, kp_reset),
72}; 104};
73 105
74// Layers 106// Layers
75 107
76const uint16_t PROGMEM keymaps[_LAYER_MAX][MATRIX_ROWS][MATRIX_COLS] = { 108const uint16_t PROGMEM keymaps[_LAYER_MAX][MATRIX_ROWS][MATRIX_COLS] = {
77 [_QWERTY] = LAYOUT( 109 [_QWERTY] = LAYOUT(
78 KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, 110 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV,
79 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, 111 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
80 MY_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, 112 MY_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
81 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_BSPC, MO(_ADJUST), 113 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_ADJUST),
82 TD(TD_LDCTL), MY_GUI, MY_ALT, MY_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT 114 TD(TD_LDCTL), MY_GUI, MY_ALT, MY_BSPC, TD(TD_KP), MY_SPC, KC_RGUI, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
115 ),
116 [_RPT] = LAYOUT(
117 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
118 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
119 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
120 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
121 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
83 ), 122 ),
84 [_GAME] = LAYOUT( 123 [_GAME] = LAYOUT(
85 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 124 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
86 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 125 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
87 KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 126 KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
88 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 127 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
89 _______, _______, KC_LALT, KC_SPC, _______, _______, _______, _______, _______ 128 _______, _______, KC_LALT, KC_SPC, KC_LALT, _______, _______, _______, _______, _______, _______
90 ), 129 ),
91 [_FUNC] = LAYOUT( 130 [_FUNC] = LAYOUT(
92 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, 131 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_F13,
93 _______, _______, FW_WRD, KB_EOL, _______, _______, KB_COPY, KC_PGUP, _______, _______, KB_PASTE, KC_SLCK, _______, MY_CALC, 132 _______, _______, FW_WRD, KB_EOL, TG(_RPT), _______, KB_COPY, KC_PGUP, _______, _______, KB_PASTE, KC_SLCK, _______, MY_CALC,
94 _______, KB_BOL, _______, KC_PGDN, _______, TD(TD_G), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, 133 KC_RCTL, KB_BOL, _______, KC_PGDN, _______, TD(TD_G), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______,
95 _______, _______, KC_DEL, _______, _______, BK_WRD, _______, _______, _______, _______, _______, _______, KC_INS, _______, 134 _______, _______, KC_DEL, _______, _______, BK_WRD, _______, _______, _______, _______, _______, _______, KC_NO,
96 _______, MY_RGUI, MY_RALT, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END 135 KC_RCTL, MY_RGUI, MY_RALT, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
97 ), 136 ),
98 [_KP] = LAYOUT( 137 [_KP] = LAYOUT(
99 _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_ASTERISK, _______, _______, _______, _______, _______, 138 _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_ASTERISK, _______, _______, _______, _______, _______, _______,
100 KC_NUMLOCK, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_MINUS, _______, _______, _______, 139 KC_NUMLOCK, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_MINUS, _______, _______, _______,
101 _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, _______, _______, 140 _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, _______, _______,
102 _______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_SLASH, _______, _______, TG(_KP), 141 _______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_SLASH, _______, TG(_KP),
103 _______, _______, _______, KC_KP_0, KC_KP_DOT, _______, _______, _______, _______ 142 _______, _______, _______, _______, _______, KC_KP_0, KC_KP_DOT, _______, _______, _______, _______
104 ), 143 ),
105 [_ADJUST] = LAYOUT( 144 [_ADJUST] = LAYOUT(
106 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, 145 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_SLCK, KC_F13,
107 _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, _______, KC_MUTE, 146 _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_BRID, KC_BRIU, KC_MUTE,
108 _______, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, TG(_KP), _______, _______, _______, KC_MPLY, 147 KC_RCTL, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, TG(_KP), _______, _______, _______, KC_MPLY,
109 _______, RGB_TOG, KB_MAKE, KB_FLSH, KB_VRSN, KB_BOOT, _______, TG_SYS, _______, _______, _______, _______, KC_DEL, _______, 148 _______, RGB_TOG, KB_MAKE, KB_FLSH, KB_VRSN, KB_BOOT, _______, TG_SYS, _______, _______, _______, _______, _______,
110 _______, MY_RGUI, MY_RALT, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT 149 KC_RCTL, MY_RGUI, MY_RALT, KC_DEL, _______, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
111 ), 150 ),
112}; 151};
113 152
153const rgblight_segment_t PROGMEM rpt_layer[] = RGBLIGHT_LAYER_SEGMENTS(
154 {8, 8, HSV_PINK}
155);
156
114const rgblight_segment_t PROGMEM game_layer[] = RGBLIGHT_LAYER_SEGMENTS( 157const rgblight_segment_t PROGMEM game_layer[] = RGBLIGHT_LAYER_SEGMENTS(
115 {0, 1, HSV_RED}, 158 {0, 1, HSV_RED},
116 {7, 2, HSV_RED}, 159 {7, 2, HSV_RED},
@@ -118,7 +161,7 @@ const rgblight_segment_t PROGMEM game_layer[] = RGBLIGHT_LAYER_SEGMENTS(
118); 161);
119 162
120const rgblight_segment_t PROGMEM func_layer[] = RGBLIGHT_LAYER_SEGMENTS( 163const rgblight_segment_t PROGMEM func_layer[] = RGBLIGHT_LAYER_SEGMENTS(
121 {0, 8, HSV_GREEN} 164 {0, 16, HSV_GREEN}
122); 165);
123 166
124const rgblight_segment_t PROGMEM kp_layer[] = RGBLIGHT_LAYER_SEGMENTS( 167const rgblight_segment_t PROGMEM kp_layer[] = RGBLIGHT_LAYER_SEGMENTS(
@@ -140,6 +183,7 @@ const rgblight_segment_t PROGMEM numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
140 183
141 184
142enum rgb_layer_index { 185enum rgb_layer_index {
186 L_RPT,
143 L_GAME, 187 L_GAME,
144 L_FUNC, 188 L_FUNC,
145 L_KP, 189 L_KP,
@@ -149,6 +193,7 @@ enum rgb_layer_index {
149}; 193};
150 194
151const rgblight_segment_t * const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST( 195const rgblight_segment_t * const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
196 [L_RPT] = rpt_layer,
152 [L_GAME] = game_layer, 197 [L_GAME] = game_layer,
153 [L_FUNC] = func_layer, 198 [L_FUNC] = func_layer,
154 [L_KP] = kp_layer, 199 [L_KP] = kp_layer,
@@ -158,13 +203,14 @@ const rgblight_segment_t * const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
158); 203);
159 204
160layer_state_t layer_state_set_keymap(layer_state_t state) { 205layer_state_t layer_state_set_keymap(layer_state_t state) {
206 rgblight_set_layer_state(L_RPT, layer_state_cmp(state, _RPT));
161 rgblight_set_layer_state(L_GAME, layer_state_cmp(state, _GAME)); 207 rgblight_set_layer_state(L_GAME, layer_state_cmp(state, _GAME));
162 rgblight_set_layer_state(L_FUNC, layer_state_cmp(state, _FUNC)); 208 rgblight_set_layer_state(L_FUNC, layer_state_cmp(state, _FUNC));
163 rgblight_set_layer_state(L_KP, layer_state_cmp(state, _KP)); 209 rgblight_set_layer_state(L_KP, layer_state_cmp(state, _KP));
164 rgblight_set_layer_state(L_ADJUST, layer_state_cmp(state, _ADJUST)); 210 rgblight_set_layer_state(L_ADJUST, layer_state_cmp(state, _ADJUST));
165 rgblight_set_layer_state(L_CAPSLOCK, CAPSLOCK_ON); 211 rgblight_set_layer_state(L_CAPSLOCK, CAPSLOCK_ON);
166 rgblight_set_layer_state(L_NUMLOCK, NUMLOCK_ON && layer_state_cmp(state, _KP)); 212 rgblight_set_layer_state(L_NUMLOCK, NUMLOCK_ON && layer_state_cmp(state, _KP));
167 if (layer_state_cmp(state, _GAME)) 213 if (layer_state_cmp(state, _GAME) || layer_state_cmp(state, _RPT))
168 autoshift_disable(); 214 autoshift_disable();
169 else 215 else
170 autoshift_enable(); 216 autoshift_enable();
@@ -180,6 +226,7 @@ bool led_update_user(led_t led_state) {
180void keyboard_post_init_keymap(void) { 226void keyboard_post_init_keymap(void) {
181 rgblight_layers = my_rgb_layers; 227 rgblight_layers = my_rgb_layers;
182 rgb_was_enabled = rgblight_is_enabled(); 228 rgb_was_enabled = rgblight_is_enabled();
229 bspc_timer = 0;
183} 230}
184 231
185LEADER_EXTERNS(); 232LEADER_EXTERNS();
@@ -194,86 +241,116 @@ void matrix_scan_keymap(void) {
194 rgblight_disable_noeeprom(); 241 rgblight_disable_noeeprom();
195 rgb_idle_seconds = 0; 242 rgb_idle_seconds = 0;
196 } 243 }
244 // if MY_BSPC is held down too long, pretend like it wasn't and start
245 // pressing backspace
246 if (bspc_timer > 0 && timer_elapsed(bspc_timer) > LEADER_TIMEOUT) {
247 layer_off(_FUNC);
248 bspc_timer = 0;
249 register_code(KC_BSPC);
250 }
197 LEADER_DICTIONARY() { 251 LEADER_DICTIONARY() {
198 leading = false; 252 leading = false;
199 leader_end(); 253 leader_end();
200 254
201 SEQ_ONE_KEY(KC_K) { 255 // layer navigation
202 layer_invert(_KP); 256 SEQ_ONE_KEY(KC_R) { layer_invert(_RPT); }
203 } 257 SEQ_ONE_KEY(KC_G) { layer_invert(_GAME); }
204 SEQ_ONE_KEY(KC_G) { 258 SEQ_ONE_KEY(KC_K) { layer_invert(_KP); }
205 layer_invert(_GAME); 259 SEQ_ONE_KEY(KC_KP_5) { layer_invert(_KP); }
206 } 260
207 SEQ_ONE_KEY(KC_KP_5) { 261 // tmux navigation
208 layer_invert(_KP); 262 SEQ_ONE_KEY(KC_L) { SEND_STRING(SS_LCTL("a") "n"); }
209 } 263 SEQ_ONE_KEY(KC_H) { SEND_STRING(SS_LCTL("a") "p"); }
210 SEQ_TWO_KEYS(KC_SCLN, KC_1) { 264 SEQ_ONE_KEY(KC_N) { SEND_STRING(SS_LCTL("a") "c"); }
211 send_secret_string(0); 265 SEQ_ONE_KEY(KC_W) { SEND_STRING(SS_LCTL("a") "x"); }
212 } 266 SEQ_ONE_KEY(KC_MINS) { SEND_STRING(SS_LCTL("a") "-"); }
213 SEQ_TWO_KEYS(KC_SCLN, KC_2) { 267 SEQ_ONE_KEY(KC_QUOT) { SEND_STRING(SS_LCTL("a") "\""); }
214 send_secret_string(1); 268 SEQ_ONE_KEY(KC_1) { SEND_STRING(SS_LCTL("a") "1"); }
215 } 269 SEQ_ONE_KEY(KC_2) { SEND_STRING(SS_LCTL("a") "2"); }
216 SEQ_TWO_KEYS(KC_SCLN, KC_3) { 270 SEQ_ONE_KEY(KC_3) { SEND_STRING(SS_LCTL("a") "3"); }
217 send_secret_string(2); 271 SEQ_ONE_KEY(KC_4) { SEND_STRING(SS_LCTL("a") "4"); }
218 } 272 SEQ_ONE_KEY(KC_5) { SEND_STRING(SS_LCTL("a") "5"); }
219 SEQ_TWO_KEYS(KC_SCLN, KC_4) { 273 SEQ_ONE_KEY(KC_6) { SEND_STRING(SS_LCTL("a") "6"); }
220 send_secret_string(3); 274 SEQ_ONE_KEY(KC_7) { SEND_STRING(SS_LCTL("a") "7"); }
221 } 275 SEQ_ONE_KEY(KC_8) { SEND_STRING(SS_LCTL("a") "8"); }
222 SEQ_TWO_KEYS(KC_SCLN, KC_5) { 276 SEQ_ONE_KEY(KC_9) { SEND_STRING(SS_LCTL("a") "9"); }
223 send_secret_string(4); 277
224 } 278 // secrets
225 SEQ_TWO_KEYS(KC_SCLN, KC_6) { 279 SEQ_TWO_KEYS(KC_SCLN, KC_M) { send_secret_string(0); }
226 send_secret_string(5); 280 SEQ_TWO_KEYS(KC_SCLN, KC_COMM) { send_secret_string(1); }
227 } 281 SEQ_TWO_KEYS(KC_SCLN, KC_DOT) { send_secret_string(2); }
228 SEQ_TWO_KEYS(KC_SCLN, KC_M) { 282 SEQ_TWO_KEYS(KC_SCLN, KC_J) { send_secret_string(3); }
229 send_secret_string(0); 283 SEQ_TWO_KEYS(KC_SCLN, KC_K) { send_secret_string(4); }
230 } 284 SEQ_TWO_KEYS(KC_SCLN, KC_L) { send_secret_string(5); }
231 SEQ_TWO_KEYS(KC_SCLN, KC_COMM) { 285
232 send_secret_string(1); 286 // fast control-C
233 } 287 SEQ_ONE_KEY(KC_C) { tap_code16(C(KC_C)); }
234 SEQ_TWO_KEYS(KC_SCLN, KC_DOT) { 288
235 send_secret_string(2); 289 // neovim: terminal escape
236 } 290 SEQ_ONE_KEY(KC_BSLS) {
237 SEQ_TWO_KEYS(KC_SCLN, KC_J) { 291 tap_code16(C(KC_BSLS));
238 send_secret_string(3); 292 tap_code16(C(KC_N));
239 }
240 SEQ_TWO_KEYS(KC_SCLN, KC_K) {
241 send_secret_string(4);
242 }
243 SEQ_TWO_KEYS(KC_SCLN, KC_L) {
244 send_secret_string(5);
245 }
246 SEQ_ONE_KEY(KC_C) {
247 tap_code16(C(KC_C));
248 } 293 }
249 } 294 }
250} 295}
251 296
252bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { 297bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
253 static uint16_t gesc_timer; 298 static bool bspc_del = false;
299 static bool bspc_initiated_func = false;
300 bool rc = true;
254 301
255 rgb_idle_seconds = 0; 302 rgb_idle_seconds = 0;
256 if (!rgblight_is_enabled() && rgb_was_enabled) 303 if (!rgblight_is_enabled() && rgb_was_enabled)
257 rgblight_enable_noeeprom(); 304 rgblight_enable_noeeprom();
258 305
259 switch (keycode) { 306 switch (keycode) {
260 // custom handle KC_GESC to emulate auto shift on it 307 case MY_BSPC:
261 case KC_GESC: 308 if (record->event.pressed) {
262 if (get_autoshift_state()) { 309 if (IS_LAYER_ON(_FUNC)) {
263 if (record->event.pressed) 310 // special case: if _FUNC was turned on by another key,
264 gesc_timer = timer_read(); 311 // treat this as KC_DEL and don't do anything else
265 else { 312 bspc_del = true;
266 if (timer_elapsed(gesc_timer) > AUTO_SHIFT_TIMEOUT || MODS_SHIFT) { 313 register_code(KC_DEL);
267 tap_code16(S(KC_GRV)); 314 return false;
268 } else if (MODS_GUI) 315 } else {
269 tap_code(KC_GRV); 316 bspc_timer = timer_read();
270 else 317 bspc_initiated_func = true;
271 tap_code(KC_ESC); 318 layer_on(_FUNC);
319 }
320 } else {
321 if (bspc_del) {
322 // special case: if _FUNC was turned on by another key,
323 // treat this as KC_DEL and don't do anything else
324 unregister_code(KC_DEL);
325 bspc_del = false;
326 return false;
327 }
328
329 if (bspc_initiated_func) {
330 layer_off(_FUNC);
331 bspc_initiated_func = false;
332 }
333
334 if (bspc_timer > 0) {
335 // here the key was pressed and released before the timer
336 // expired, so treat as a backspace tap and pretend we
337 // never activated _FUNC
338 bspc_timer = 0;
339 tap_code(KC_BSPC);
340 } else {
341 // the timer went off, so KC_BSPC was registered in
342 // matrix_scan_keymap. unregister it now
343 unregister_code(KC_BSPC);
272 } 344 }
273 return false;
274 } 345 }
275 return false; 346 return false; // special case, return now without resetting timer
347 // other paths should set rc and break
348 break;
276 } 349 }
277 350
278 return true; 351 // if something was pressed while MY_BSPC was held down, keep it pressed by
352 // disabling the timer
353 bspc_timer = 0;
354 return rc;
279} 355}
356
diff --git a/keyboards/dz60/keymaps/jdelkins/rules.mk b/keyboards/dz60/keymaps/jdelkins/rules.mk
index b0a4f73dd..2eacc54ea 100644
--- a/keyboards/dz60/keymaps/jdelkins/rules.mk
+++ b/keyboards/dz60/keymaps/jdelkins/rules.mk
@@ -1,7 +1,7 @@
1LEADER_ENABLE = yes 1LEADER_ENABLE = yes
2MOUSEKEY_ENABLE = yes 2MOUSEKEY_ENABLE = no
3CONSOLE_ENABLE = no 3CONSOLE_ENABLE = no
4NKRO_ENABLE = no 4NKRO_ENABLE = no
5TAP_DANCE_ENABLE = yes 5TAP_DANCE_ENABLE = yes
6LTO_ENABLE = yes
7AUTO_SHIFT_ENABLE = yes 6AUTO_SHIFT_ENABLE = yes
7LTO_ENABLE = yes
diff --git a/keyboards/dz60/keymaps/jdelkins_ss/config.h b/keyboards/dz60/keymaps/jdelkins_ss/config.h
deleted file mode 100644
index e023d3452..000000000
--- a/keyboards/dz60/keymaps/jdelkins_ss/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
1/*
2 Copyright 2020 Joel Elkins <joel@elkins.com>
3
4 This program is free software: you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by
6 the Free Software Foundation, either version 2 of the License, or
7 (at your option) any later version.
8
9 This program is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 GNU General Public License for more details.
13
14 You should have received a copy of the GNU General Public License
15 along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20/* My hhkb variant
21 * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
22 * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
23 * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
24 * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │
25 * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
26 * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
27 * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
28 * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │
29 * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤
30 * │40 │41 │43 │44 │46 │48 │4a │4b │4c │4d │4e │
31 * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
32 */
33
34#define LAYOUT_hhkb_split( \
35 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
36 k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
37 k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
38 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \
39 k40, k41, k43, k44, k46, k48, k4a, k4b, k4c, k4d, k4e \
40) { \
41 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
42 { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
43 { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \
44 { k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, k3e }, \
45 { k40, k41, KC_NO, k43, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d, k4e } \
46}
47
48#define AUTO_SHIFT_TIMEOUT 165
49#define RGBLIGHT_LAYERS
50#define LEADER_TIMEOUT 400
51#define LEADER_PER_KEY_TIMING
diff --git a/keyboards/dz60/keymaps/jdelkins_ss/keymap.c b/keyboards/dz60/keymaps/jdelkins_ss/keymap.c
deleted file mode 100644
index 2744c4372..000000000
--- a/keyboards/dz60/keymaps/jdelkins_ss/keymap.c
+++ /dev/null
@@ -1,367 +0,0 @@
1/*
2 Copyright 2020 Joel Elkins <joel@elkins.com>
3
4 This program is free software: you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by
6 the Free Software Foundation, either version 2 of the License, or
7 (at your option) any later version.
8
9 This program is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 GNU General Public License for more details.
13
14 You should have received a copy of the GNU General Public License
15 along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include "jdelkins.h"
19
20#undef LAYOUT
21#define LAYOUT LAYOUT_hhkb_split
22
23#define IDLE_TIMEOUT 360
24uint16_t rgb_idle_seconds = 0;
25uint16_t rgb_timer;
26uint16_t bspc_timer;
27bool rgb_was_enabled;
28
29enum {
30 MY_BSPC = USER_SAFE_RANGE,
31};
32
33// Tap Dance
34
35int ctl_state = 0;
36
37void ctl_finished(qk_tap_dance_state_t *state, void *user_data) {
38 ctl_state = cur_dance(state);
39 switch (ctl_state) {
40 case SINGLE_TAP: qk_leader_start(); break;
41 case SINGLE_HOLD: register_code(KC_LCTL); break;
42 case DOUBLE_TAP: tap_code(KC_RCTL); break;
43 case DOUBLE_HOLD: register_code(KC_RCTL); break;
44 case TRIPLE_TAP: tap_code(KC_RCTL); tap_code(KC_RCTL); break;
45 case TRIPLE_HOLD: tap_code(KC_RCTL); register_code(KC_RCTL); break;
46 }
47}
48
49void ctl_reset(qk_tap_dance_state_t *state, void *user_data) {
50 switch (ctl_state) {
51 case SINGLE_HOLD: unregister_code(KC_LCTL); break;
52 case DOUBLE_HOLD:
53 case TRIPLE_HOLD: unregister_code(KC_RCTL); break;
54 }
55 ctl_state = 0;
56}
57
58void g_finished(qk_tap_dance_state_t *state, void *user_data) {
59 switch (cur_dance(state)) {
60 case SINGLE_TAP:
61 tap_code16(C(KC_END));
62 break;
63 case DOUBLE_TAP:
64 tap_code16(C(KC_HOME));
65 break;
66 }
67}
68
69int kp_state = 0;
70
71void kp_finished(qk_tap_dance_state_t *state, void *user_data) {
72 kp_state = hold_cur_dance(state);
73 switch (kp_state) {
74 case SINGLE_TAP:
75 tap_code(KC_SPC);
76 break;
77 default:
78 layer_invert(_KP);
79 break;
80 }
81}
82
83void kp_reset(qk_tap_dance_state_t *state, void *user_data) {
84 switch (kp_state) {
85 case SINGLE_HOLD:
86 case DOUBLE_HOLD:
87 case TRIPLE_HOLD:
88 layer_invert(_KP);
89 break;
90 }
91}
92
93enum {
94 TD_LDCTL,
95 TD_G,
96 TD_KP,
97};
98
99qk_tap_dance_action_t tap_dance_actions[] = {
100 [TD_LDCTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctl_finished, ctl_reset),
101 [TD_G] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, g_finished, NULL),
102 [TD_KP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, kp_finished, kp_reset),
103};
104
105// Layers
106
107const uint16_t PROGMEM keymaps[_LAYER_MAX][MATRIX_ROWS][MATRIX_COLS] = {
108 [_QWERTY] = LAYOUT(
109 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV,
110 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
111 MY_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
112 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_ADJUST),
113 TD(TD_LDCTL), MY_GUI, MY_ALT, MY_BSPC, TD(TD_KP), MY_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
114 ),
115 [_RPT] = LAYOUT(
116 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
117 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
118 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
119 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
120 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
121 ),
122 [_GAME] = LAYOUT(
123 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
124 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
125 KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
126 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
127 _______, _______, KC_LALT, KC_SPC, KC_LALT, _______, _______, _______, _______, _______, _______
128 ),
129 [_FUNC] = LAYOUT(
130 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_F13,
131 _______, _______, FW_WRD, KB_EOL, TG(_RPT), _______, KB_COPY, KC_PGUP, _______, _______, KB_PASTE, KC_SLCK, _______, MY_CALC,
132 _______, KB_BOL, _______, KC_PGDN, _______, TD(TD_G), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______,
133 _______, _______, KC_DEL, _______, _______, BK_WRD, _______, _______, _______, _______, _______, _______, KC_NO,
134 _______, MY_RGUI, MY_RALT, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
135 ),
136 [_KP] = LAYOUT(
137 _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_ASTERISK, _______, _______, _______, _______, _______, _______,
138 KC_NUMLOCK, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_MINUS, _______, _______, _______,
139 _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, _______, _______,
140 _______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_SLASH, _______, TG(_KP),
141 _______, _______, _______, _______, _______, KC_KP_0, KC_KP_DOT, _______, _______, _______, _______
142 ),
143 [_ADJUST] = LAYOUT(
144 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_F13,
145 _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, _______, KC_MUTE,
146 _______, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, TG(_KP), _______, _______, _______, KC_MPLY,
147 _______, RGB_TOG, KB_MAKE, KB_FLSH, KB_VRSN, KB_BOOT, _______, TG_SYS, _______, _______, _______, _______, _______,
148 _______, MY_RGUI, MY_RALT, KC_DEL, _______, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
149 ),
150};
151
152const rgblight_segment_t PROGMEM rpt_layer[] = RGBLIGHT_LAYER_SEGMENTS(
153 {8, 8, HSV_PINK}
154);
155
156const rgblight_segment_t PROGMEM game_layer[] = RGBLIGHT_LAYER_SEGMENTS(
157 {0, 1, HSV_RED},
158 {7, 2, HSV_RED},
159 {15, 1, HSV_RED}
160);
161
162const rgblight_segment_t PROGMEM func_layer[] = RGBLIGHT_LAYER_SEGMENTS(
163 {0, 8, HSV_GREEN}
164);
165
166const rgblight_segment_t PROGMEM kp_layer[] = RGBLIGHT_LAYER_SEGMENTS(
167 {0, 16, HSV_ORANGE}
168);
169
170const rgblight_segment_t PROGMEM adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS(
171 {0, 16, HSV_BLUE}
172);
173
174const rgblight_segment_t PROGMEM capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
175 {10, 4, HSV_WHITE}
176);
177
178const rgblight_segment_t PROGMEM numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
179 {0, 2, HSV_PURPLE},
180 {14, 2, HSV_PURPLE}
181);
182
183
184enum rgb_layer_index {
185 L_RPT,
186 L_GAME,
187 L_FUNC,
188 L_KP,
189 L_ADJUST,
190 L_CAPSLOCK,
191 L_NUMLOCK,
192};
193
194const rgblight_segment_t * const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
195 [L_RPT] = rpt_layer,
196 [L_GAME] = game_layer,
197 [L_FUNC] = func_layer,
198 [L_KP] = kp_layer,
199 [L_ADJUST] = adjust_layer,
200 [L_CAPSLOCK] = capslock_layer,
201 [L_NUMLOCK] = numlock_layer
202);
203
204layer_state_t layer_state_set_keymap(layer_state_t state) {
205 rgblight_set_layer_state(L_RPT, layer_state_cmp(state, _RPT));
206 rgblight_set_layer_state(L_GAME, layer_state_cmp(state, _GAME));
207 rgblight_set_layer_state(L_FUNC, layer_state_cmp(state, _FUNC));
208 rgblight_set_layer_state(L_KP, layer_state_cmp(state, _KP));
209 rgblight_set_layer_state(L_ADJUST, layer_state_cmp(state, _ADJUST));
210 rgblight_set_layer_state(L_CAPSLOCK, CAPSLOCK_ON);
211 rgblight_set_layer_state(L_NUMLOCK, NUMLOCK_ON && layer_state_cmp(state, _KP));
212 if (layer_state_cmp(state, _GAME) || layer_state_cmp(state, _RPT))
213 autoshift_disable();
214 else
215 autoshift_enable();
216 return state;
217}
218
219bool led_update_user(led_t led_state) {
220 rgblight_set_layer_state(L_CAPSLOCK, led_state.caps_lock);
221 rgblight_set_layer_state(L_NUMLOCK, led_state.num_lock && layer_state_is(_KP));
222 return true;
223}
224
225void keyboard_post_init_keymap(void) {
226 rgblight_layers = my_rgb_layers;
227 rgb_was_enabled = rgblight_is_enabled();
228 bspc_timer = 0;
229}
230
231LEADER_EXTERNS();
232
233void matrix_scan_keymap(void) {
234 if (rgblight_is_enabled() && timer_elapsed(rgb_timer) > 1000) {
235 rgb_idle_seconds++;
236 rgb_timer = timer_read();
237 }
238 if (rgb_idle_seconds > IDLE_TIMEOUT) {
239 rgb_was_enabled = rgblight_is_enabled();
240 rgblight_disable_noeeprom();
241 rgb_idle_seconds = 0;
242 }
243 // if MY_BSPC is held down too long, pretend like it wasn't and start
244 // pressing backspace
245 if (bspc_timer > 0 && timer_elapsed(bspc_timer) > LEADER_TIMEOUT) {
246 layer_off(_FUNC);
247 bspc_timer = 0;
248 register_code(KC_BSPC);
249 }
250 LEADER_DICTIONARY() {
251 leading = false;
252 leader_end();
253
254 SEQ_ONE_KEY(KC_R) {
255 layer_invert(_RPT);
256 }
257 SEQ_ONE_KEY(KC_G) {
258 layer_invert(_GAME);
259 }
260 SEQ_ONE_KEY(KC_K) {
261 layer_invert(_KP);
262 }
263 SEQ_ONE_KEY(KC_KP_5) {
264 layer_invert(_KP);
265 }
266 SEQ_TWO_KEYS(KC_SCLN, KC_1) {
267 send_secret_string(0);
268 }
269 SEQ_TWO_KEYS(KC_SCLN, KC_2) {
270 send_secret_string(1);
271 }
272 SEQ_TWO_KEYS(KC_SCLN, KC_3) {
273 send_secret_string(2);
274 }
275 SEQ_TWO_KEYS(KC_SCLN, KC_4) {
276 send_secret_string(3);
277 }
278 SEQ_TWO_KEYS(KC_SCLN, KC_5) {
279 send_secret_string(4);
280 }
281 SEQ_TWO_KEYS(KC_SCLN, KC_6) {
282 send_secret_string(5);
283 }
284 SEQ_TWO_KEYS(KC_SCLN, KC_M) {
285 send_secret_string(0);
286 }
287 SEQ_TWO_KEYS(KC_SCLN, KC_COMM) {
288 send_secret_string(1);
289 }
290 SEQ_TWO_KEYS(KC_SCLN, KC_DOT) {
291 send_secret_string(2);
292 }
293 SEQ_TWO_KEYS(KC_SCLN, KC_J) {
294 send_secret_string(3);
295 }
296 SEQ_TWO_KEYS(KC_SCLN, KC_K) {
297 send_secret_string(4);
298 }
299 SEQ_TWO_KEYS(KC_SCLN, KC_L) {
300 send_secret_string(5);
301 }
302 SEQ_ONE_KEY(KC_C) {
303 tap_code16(C(KC_C));
304 }
305 }
306}
307
308bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
309 static bool bspc_del = false;
310 static bool bspc_initiated_func = false;
311 bool rc = true;
312
313 rgb_idle_seconds = 0;
314 if (!rgblight_is_enabled() && rgb_was_enabled)
315 rgblight_enable_noeeprom();
316
317 switch (keycode) {
318 case MY_BSPC:
319 if (record->event.pressed) {
320 if (IS_LAYER_ON(_FUNC)) {
321 // special case: if _FUNC was turned on by another key,
322 // treat this as KC_DEL and don't do anything else
323 bspc_del = true;
324 register_code(KC_DEL);
325 return false;
326 } else {
327 bspc_timer = timer_read();
328 bspc_initiated_func = true;
329 layer_on(_FUNC);
330 }
331 } else {
332 if (bspc_del) {
333 // special case: if _FUNC was turned on by another key,
334 // treat this as KC_DEL and don't do anything else
335 unregister_code(KC_DEL);
336 bspc_del = false;
337 return false;
338 }
339
340 if (bspc_initiated_func) {
341 layer_off(_FUNC);
342 bspc_initiated_func = false;
343 }
344
345 if (bspc_timer > 0) {
346 // here the key was pressed and released before the timer
347 // expired, so treat as a backspace tap and pretend we
348 // never activated _FUNC
349 bspc_timer = 0;
350 tap_code(KC_BSPC);
351 } else {
352 // the timer went off, so KC_BSPC was registered in
353 // matrix_scan_keymap. unregister it now
354 unregister_code(KC_BSPC);
355 }
356 }
357 return false; // special case, return now without resetting timer
358 // other paths should set rc and break
359 break;
360 }
361
362 // if something was pressed while MY_BSPC was held down, keep it pressed by
363 // disabling the timer
364 bspc_timer = 0;
365 return rc;
366}
367
diff --git a/keyboards/dz60/keymaps/jdelkins_ss/rules.mk b/keyboards/dz60/keymaps/jdelkins_ss/rules.mk
deleted file mode 100644
index 49346a80e..000000000
--- a/keyboards/dz60/keymaps/jdelkins_ss/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
1LEADER_ENABLE = yes
2MOUSEKEY_ENABLE = yes
3CONSOLE_ENABLE = no
4NKRO_ENABLE = no
5TAP_DANCE_ENABLE = yes
6AUTO_SHIFT_ENABLE = yes
7LTO_ENABLE = yes
8USER_NAME := jdelkins
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 09:05:21 +0000