summaryrefslogtreecommitdiff
path: root/keyboards/dz60/keymaps/jdelkins/keymap.c
diff options
context:
space:
mode:
authorJoel Elkins <joel@elkins.co>2021-08-13 12:28:37 -0700
committerGitHub <noreply@github.com>2021-08-13 12:28:37 -0700
commit2aeacf9db79439801482c8d2f53147779dd0bb89 (patch)
tree05b66865aa15b8b1df627cd83ed51aee7b636243 /keyboards/dz60/keymaps/jdelkins/keymap.c
parentac3b9333d8b52001cee682bb833e145c5252f72d (diff)
[Keymap] Updates to jdelkins userspace and keymaps (#13216)
- Remove disused dz60/jdelkins_ss keymap - Manage configured features for firmware size - Improve build configuration for the secrets feature - Various keymap tweaks - Clean up formatting in various places
Diffstat (limited to 'keyboards/dz60/keymaps/jdelkins/keymap.c')
-rw-r--r--keyboards/dz60/keymaps/jdelkins/keymap.c263
1 files changed, 170 insertions, 93 deletions
diff --git a/keyboards/dz60/keymaps/jdelkins/keymap.c b/keyboards/dz60/keymaps/jdelkins/keymap.c
index c0bf4445a8..cf9dd584f6 100644
--- a/keyboards/dz60/keymaps/jdelkins/keymap.c
+++ b/keyboards/dz60/keymaps/jdelkins/keymap.c
@@ -18,20 +18,26 @@
#include "jdelkins.h"
#undef LAYOUT
-#define LAYOUT LAYOUT_directional_nosplitspace
+#define LAYOUT LAYOUT_hhkb_split
#define IDLE_TIMEOUT 360
+
uint16_t rgb_idle_seconds = 0;
uint16_t rgb_timer;
+uint16_t bspc_timer;
bool rgb_was_enabled;
+enum {
+ MY_BSPC = USER_SAFE_RANGE,
+};
+
// Tap Dance
int ctl_state = 0;
void ctl_finished(qk_tap_dance_state_t *state, void *user_data) {
ctl_state = cur_dance(state);
- switch(ctl_state) {
+ switch (ctl_state) {
case SINGLE_TAP: qk_leader_start(); break;
case SINGLE_HOLD: register_code(KC_LCTL); break;
case DOUBLE_TAP: tap_code(KC_RCTL); break;
@@ -42,7 +48,7 @@ void ctl_finished(qk_tap_dance_state_t *state, void *user_data) {
}
void ctl_reset(qk_tap_dance_state_t *state, void *user_data) {
- switch(ctl_state) {
+ switch (ctl_state) {
case SINGLE_HOLD: unregister_code(KC_LCTL); break;
case DOUBLE_HOLD:
case TRIPLE_HOLD: unregister_code(KC_RCTL); break;
@@ -61,56 +67,93 @@ void g_finished(qk_tap_dance_state_t *state, void *user_data) {
}
}
+int kp_state = 0;
+
+void kp_finished(qk_tap_dance_state_t *state, void *user_data) {
+ kp_state = hold_cur_dance(state);
+ switch (kp_state) {
+ case SINGLE_TAP:
+ tap_code(KC_SPC);
+ break;
+ default:
+ layer_invert(_KP);
+ break;
+ }
+}
+
+void kp_reset(qk_tap_dance_state_t *state, void *user_data) {
+ switch (kp_state) {
+ case SINGLE_HOLD:
+ case DOUBLE_HOLD:
+ case TRIPLE_HOLD:
+ layer_invert(_KP);
+ break;
+ }
+}
+
enum {
TD_LDCTL,
TD_G,
+ TD_KP,
};
qk_tap_dance_action_t tap_dance_actions[] = {
[TD_LDCTL] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, ctl_finished, ctl_reset),
[TD_G] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, g_finished, NULL),
+ [TD_KP] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, kp_finished, kp_reset),
};
// Layers
const uint16_t PROGMEM keymaps[_LAYER_MAX][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT(
- 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,
- 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,
- 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,
- 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),
- TD(TD_LDCTL), MY_GUI, MY_ALT, MY_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ 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,
+ 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,
+ 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,
+ 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),
+ TD(TD_LDCTL), MY_GUI, MY_ALT, MY_BSPC, TD(TD_KP), MY_SPC, KC_RGUI, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
+ ),
+ [_RPT] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[_GAME] = LAYOUT(
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, KC_LALT, KC_SPC, _______, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, KC_LALT, KC_SPC, KC_LALT, _______, _______, _______, _______, _______, _______
),
[_FUNC] = LAYOUT(
- 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,
- _______, _______, FW_WRD, KB_EOL, _______, _______, KB_COPY, KC_PGUP, _______, _______, KB_PASTE, KC_SLCK, _______, MY_CALC,
- _______, KB_BOL, _______, KC_PGDN, _______, TD(TD_G), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______,
- _______, _______, KC_DEL, _______, _______, BK_WRD, _______, _______, _______, _______, _______, _______, KC_INS, _______,
- _______, MY_RGUI, MY_RALT, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
+ 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,
+ _______, _______, FW_WRD, KB_EOL, TG(_RPT), _______, KB_COPY, KC_PGUP, _______, _______, KB_PASTE, KC_SLCK, _______, MY_CALC,
+ KC_RCTL, KB_BOL, _______, KC_PGDN, _______, TD(TD_G), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______,
+ _______, _______, KC_DEL, _______, _______, BK_WRD, _______, _______, _______, _______, _______, _______, KC_NO,
+ KC_RCTL, MY_RGUI, MY_RALT, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
),
[_KP] = LAYOUT(
- _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_ASTERISK, _______, _______, _______, _______, _______,
- KC_NUMLOCK, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_MINUS, _______, _______, _______,
- _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_SLASH, _______, _______, TG(_KP),
- _______, _______, _______, KC_KP_0, KC_KP_DOT, _______, _______, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_KP_ASTERISK, _______, _______, _______, _______, _______, _______,
+ KC_NUMLOCK, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_MINUS, _______, _______, _______,
+ _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_SLASH, _______, TG(_KP),
+ _______, _______, _______, _______, _______, KC_KP_0, KC_KP_DOT, _______, _______, _______, _______
),
[_ADJUST] = LAYOUT(
- 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,
- _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, _______, KC_MUTE,
- _______, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, TG(_KP), _______, _______, _______, KC_MPLY,
- _______, RGB_TOG, KB_MAKE, KB_FLSH, KB_VRSN, KB_BOOT, _______, TG_SYS, _______, _______, _______, _______, KC_DEL, _______,
- _______, MY_RGUI, MY_RALT, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
+ 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,
+ _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_BRID, KC_BRIU, KC_MUTE,
+ KC_RCTL, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, TG(_KP), _______, _______, _______, KC_MPLY,
+ _______, RGB_TOG, KB_MAKE, KB_FLSH, KB_VRSN, KB_BOOT, _______, TG_SYS, _______, _______, _______, _______, _______,
+ KC_RCTL, MY_RGUI, MY_RALT, KC_DEL, _______, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
),
};
+const rgblight_segment_t PROGMEM rpt_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+ {8, 8, HSV_PINK}
+);
+
const rgblight_segment_t PROGMEM game_layer[] = RGBLIGHT_LAYER_SEGMENTS(
{0, 1, HSV_RED},
{7, 2, HSV_RED},
@@ -118,7 +161,7 @@ const rgblight_segment_t PROGMEM game_layer[] = RGBLIGHT_LAYER_SEGMENTS(
);
const rgblight_segment_t PROGMEM func_layer[] = RGBLIGHT_LAYER_SEGMENTS(
- {0, 8, HSV_GREEN}
+ {0, 16, HSV_GREEN}
);
const rgblight_segment_t PROGMEM kp_layer[] = RGBLIGHT_LAYER_SEGMENTS(
@@ -140,6 +183,7 @@ const rgblight_segment_t PROGMEM numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
enum rgb_layer_index {
+ L_RPT,
L_GAME,
L_FUNC,
L_KP,
@@ -149,6 +193,7 @@ enum rgb_layer_index {
};
const rgblight_segment_t * const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+ [L_RPT] = rpt_layer,
[L_GAME] = game_layer,
[L_FUNC] = func_layer,
[L_KP] = kp_layer,
@@ -158,13 +203,14 @@ const rgblight_segment_t * const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
);
layer_state_t layer_state_set_keymap(layer_state_t state) {
+ rgblight_set_layer_state(L_RPT, layer_state_cmp(state, _RPT));
rgblight_set_layer_state(L_GAME, layer_state_cmp(state, _GAME));
rgblight_set_layer_state(L_FUNC, layer_state_cmp(state, _FUNC));
rgblight_set_layer_state(L_KP, layer_state_cmp(state, _KP));
rgblight_set_layer_state(L_ADJUST, layer_state_cmp(state, _ADJUST));
rgblight_set_layer_state(L_CAPSLOCK, CAPSLOCK_ON);
rgblight_set_layer_state(L_NUMLOCK, NUMLOCK_ON && layer_state_cmp(state, _KP));
- if (layer_state_cmp(state, _GAME))
+ if (layer_state_cmp(state, _GAME) || layer_state_cmp(state, _RPT))
autoshift_disable();
else
autoshift_enable();
@@ -180,6 +226,7 @@ bool led_update_user(led_t led_state) {
void keyboard_post_init_keymap(void) {
rgblight_layers = my_rgb_layers;
rgb_was_enabled = rgblight_is_enabled();
+ bspc_timer = 0;
}
LEADER_EXTERNS();
@@ -194,86 +241,116 @@ void matrix_scan_keymap(void) {
rgblight_disable_noeeprom();
rgb_idle_seconds = 0;
}
+ // if MY_BSPC is held down too long, pretend like it wasn't and start
+ // pressing backspace
+ if (bspc_timer > 0 && timer_elapsed(bspc_timer) > LEADER_TIMEOUT) {
+ layer_off(_FUNC);
+ bspc_timer = 0;
+ register_code(KC_BSPC);
+ }
LEADER_DICTIONARY() {
leading = false;
leader_end();
- SEQ_ONE_KEY(KC_K) {
- layer_invert(_KP);
- }
- SEQ_ONE_KEY(KC_G) {
- layer_invert(_GAME);
- }
- SEQ_ONE_KEY(KC_KP_5) {
- layer_invert(_KP);
- }
- SEQ_TWO_KEYS(KC_SCLN, KC_1) {
- send_secret_string(0);
- }
- SEQ_TWO_KEYS(KC_SCLN, KC_2) {
- send_secret_string(1);
- }
- SEQ_TWO_KEYS(KC_SCLN, KC_3) {
- send_secret_string(2);
- }
- SEQ_TWO_KEYS(KC_SCLN, KC_4) {
- send_secret_string(3);
- }
- SEQ_TWO_KEYS(KC_SCLN, KC_5) {
- send_secret_string(4);
- }
- SEQ_TWO_KEYS(KC_SCLN, KC_6) {
- send_secret_string(5);
- }
- SEQ_TWO_KEYS(KC_SCLN, KC_M) {
- send_secret_string(0);
- }
- SEQ_TWO_KEYS(KC_SCLN, KC_COMM) {
- send_secret_string(1);
- }
- SEQ_TWO_KEYS(KC_SCLN, KC_DOT) {
- send_secret_string(2);
- }
- SEQ_TWO_KEYS(KC_SCLN, KC_J) {
- send_secret_string(3);
- }
- SEQ_TWO_KEYS(KC_SCLN, KC_K) {
- send_secret_string(4);
- }
- SEQ_TWO_KEYS(KC_SCLN, KC_L) {
- send_secret_string(5);
- }
- SEQ_ONE_KEY(KC_C) {
- tap_code16(C(KC_C));
+ // layer navigation
+ SEQ_ONE_KEY(KC_R) { layer_invert(_RPT); }
+ SEQ_ONE_KEY(KC_G) { layer_invert(_GAME); }
+ SEQ_ONE_KEY(KC_K) { layer_invert(_KP); }
+ SEQ_ONE_KEY(KC_KP_5) { layer_invert(_KP); }
+
+ // tmux navigation
+ SEQ_ONE_KEY(KC_L) { SEND_STRING(SS_LCTL("a") "n"); }
+ SEQ_ONE_KEY(KC_H) { SEND_STRING(SS_LCTL("a") "p"); }
+ SEQ_ONE_KEY(KC_N) { SEND_STRING(SS_LCTL("a") "c"); }
+ SEQ_ONE_KEY(KC_W) { SEND_STRING(SS_LCTL("a") "x"); }
+ SEQ_ONE_KEY(KC_MINS) { SEND_STRING(SS_LCTL("a") "-"); }
+ SEQ_ONE_KEY(KC_QUOT) { SEND_STRING(SS_LCTL("a") "\""); }
+ SEQ_ONE_KEY(KC_1) { SEND_STRING(SS_LCTL("a") "1"); }
+ SEQ_ONE_KEY(KC_2) { SEND_STRING(SS_LCTL("a") "2"); }
+ SEQ_ONE_KEY(KC_3) { SEND_STRING(SS_LCTL("a") "3"); }
+ SEQ_ONE_KEY(KC_4) { SEND_STRING(SS_LCTL("a") "4"); }
+ SEQ_ONE_KEY(KC_5) { SEND_STRING(SS_LCTL("a") "5"); }
+ SEQ_ONE_KEY(KC_6) { SEND_STRING(SS_LCTL("a") "6"); }
+ SEQ_ONE_KEY(KC_7) { SEND_STRING(SS_LCTL("a") "7"); }
+ SEQ_ONE_KEY(KC_8) { SEND_STRING(SS_LCTL("a") "8"); }
+ SEQ_ONE_KEY(KC_9) { SEND_STRING(SS_LCTL("a") "9"); }
+
+ // secrets
+ SEQ_TWO_KEYS(KC_SCLN, KC_M) { send_secret_string(0); }
+ SEQ_TWO_KEYS(KC_SCLN, KC_COMM) { send_secret_string(1); }
+ SEQ_TWO_KEYS(KC_SCLN, KC_DOT) { send_secret_string(2); }
+ SEQ_TWO_KEYS(KC_SCLN, KC_J) { send_secret_string(3); }
+ SEQ_TWO_KEYS(KC_SCLN, KC_K) { send_secret_string(4); }
+ SEQ_TWO_KEYS(KC_SCLN, KC_L) { send_secret_string(5); }
+
+ // fast control-C
+ SEQ_ONE_KEY(KC_C) { tap_code16(C(KC_C)); }
+
+ // neovim: terminal escape
+ SEQ_ONE_KEY(KC_BSLS) {
+ tap_code16(C(KC_BSLS));
+ tap_code16(C(KC_N));
}
}
}
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
- static uint16_t gesc_timer;
+ static bool bspc_del = false;
+ static bool bspc_initiated_func = false;
+ bool rc = true;
rgb_idle_seconds = 0;
if (!rgblight_is_enabled() && rgb_was_enabled)
rgblight_enable_noeeprom();
switch (keycode) {
- // custom handle KC_GESC to emulate auto shift on it
- case KC_GESC:
- if (get_autoshift_state()) {
- if (record->event.pressed)
- gesc_timer = timer_read();
- else {
- if (timer_elapsed(gesc_timer) > AUTO_SHIFT_TIMEOUT || MODS_SHIFT) {
- tap_code16(S(KC_GRV));
- } else if (MODS_GUI)
- tap_code(KC_GRV);
- else
- tap_code(KC_ESC);
+ case MY_BSPC:
+ if (record->event.pressed) {
+ if (IS_LAYER_ON(_FUNC)) {
+ // special case: if _FUNC was turned on by another key,
+ // treat this as KC_DEL and don't do anything else
+ bspc_del = true;
+ register_code(KC_DEL);
+ return false;
+ } else {
+ bspc_timer = timer_read();
+ bspc_initiated_func = true;
+ layer_on(_FUNC);
+ }
+ } else {
+ if (bspc_del) {
+ // special case: if _FUNC was turned on by another key,
+ // treat this as KC_DEL and don't do anything else
+ unregister_code(KC_DEL);
+ bspc_del = false;
+ return false;
+ }
+
+ if (bspc_initiated_func) {
+ layer_off(_FUNC);
+ bspc_initiated_func = false;
+ }
+
+ if (bspc_timer > 0) {
+ // here the key was pressed and released before the timer
+ // expired, so treat as a backspace tap and pretend we
+ // never activated _FUNC
+ bspc_timer = 0;
+ tap_code(KC_BSPC);
+ } else {
+ // the timer went off, so KC_BSPC was registered in
+ // matrix_scan_keymap. unregister it now
+ unregister_code(KC_BSPC);
}
- return false;
}
- return false;
+ return false; // special case, return now without resetting timer
+ // other paths should set rc and break
+ break;
}
- return true;
+ // if something was pressed while MY_BSPC was held down, keep it pressed by
+ // disabling the timer
+ bspc_timer = 0;
+ return rc;
}
+