Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
fcddaadc56
|
|
@ -17,35 +17,38 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
/* Directional arrangement | LAYOUT_directional
|
||||
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
|
||||
* │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │ 0e │
|
||||
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
|
||||
/* My hhkb variant
|
||||
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
|
||||
* │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
|
||||
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
|
||||
* │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │
|
||||
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
|
||||
* │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
|
||||
* ├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤
|
||||
* │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │
|
||||
* ├────┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┼───┼───┼───┼───┤
|
||||
* │40 │41 │43 │ 46 │4a │4b │4c │4d │4e │
|
||||
* └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
|
||||
*/
|
||||
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
|
||||
* │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │
|
||||
* ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤
|
||||
* │40 │41 │43 │44 │46 │48 │4a │4b │4c │4d │4e │
|
||||
* └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
|
||||
*/
|
||||
|
||||
#define LAYOUT_directional_nosplitspace( \
|
||||
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
|
||||
#define LAYOUT_hhkb_split( \
|
||||
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
|
||||
k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
|
||||
k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
|
||||
k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
|
||||
k40, k41, k43, k46, k4a, k4b, k4c, k4d, k4e \
|
||||
k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \
|
||||
k40, k41, k43, k44, k46, k48, k4a, k4b, k4c, k4d, k4e \
|
||||
) { \
|
||||
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, KC_NO,k0e }, \
|
||||
{ k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
|
||||
{ k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \
|
||||
{ k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
|
||||
{ k40, k41, KC_NO, k43, KC_NO,KC_NO, k46, KC_NO, KC_NO,KC_NO, k4a, k4b, k4c, k4d, k4e } \
|
||||
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
|
||||
{ k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
|
||||
{ k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \
|
||||
{ k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, k3e }, \
|
||||
{ k40, k41, KC_NO, k43, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d, k4e } \
|
||||
}
|
||||
|
||||
#define AUTO_SHIFT_TIMEOUT 160
|
||||
#define AUTO_SHIFT_REPEAT
|
||||
#define RGBLIGHT_LAYERS
|
||||
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
|
||||
#define LEADER_TIMEOUT 400
|
||||
#define LEADER_PER_KEY_TIMING
|
||||
#define USB_MAX_POWER_CONSUMPTION 100
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
LEADER_ENABLE = yes
|
||||
MOUSEKEY_ENABLE = yes
|
||||
MOUSEKEY_ENABLE = no
|
||||
CONSOLE_ENABLE = no
|
||||
NKRO_ENABLE = no
|
||||
TAP_DANCE_ENABLE = yes
|
||||
LTO_ENABLE = yes
|
||||
AUTO_SHIFT_ENABLE = yes
|
||||
LTO_ENABLE = yes
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
/*
|
||||
Copyright 2020 Joel Elkins <joel@elkins.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
/* My hhkb variant
|
||||
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
|
||||
* │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
|
||||
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
|
||||
* │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │
|
||||
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
|
||||
* │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │
|
||||
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
|
||||
* │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d │3e │
|
||||
* ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤
|
||||
* │40 │41 │43 │44 │46 │48 │4a │4b │4c │4d │4e │
|
||||
* └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
|
||||
*/
|
||||
|
||||
#define LAYOUT_hhkb_split( \
|
||||
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
|
||||
k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
|
||||
k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
|
||||
k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \
|
||||
k40, k41, k43, k44, k46, k48, k4a, k4b, k4c, k4d, k4e \
|
||||
) { \
|
||||
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
|
||||
{ k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
|
||||
{ k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \
|
||||
{ k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, k3d, k3e }, \
|
||||
{ k40, k41, KC_NO, k43, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d, k4e } \
|
||||
}
|
||||
|
||||
#define AUTO_SHIFT_TIMEOUT 165
|
||||
#define RGBLIGHT_LAYERS
|
||||
#define LEADER_TIMEOUT 400
|
||||
#define LEADER_PER_KEY_TIMING
|
||||
|
|
@ -1,367 +0,0 @@
|
|||
/*
|
||||
Copyright 2020 Joel Elkins <joel@elkins.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "jdelkins.h"
|
||||
|
||||
#undef LAYOUT
|
||||
#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) {
|
||||
case SINGLE_TAP: qk_leader_start(); break;
|
||||
case SINGLE_HOLD: register_code(KC_LCTL); break;
|
||||
case DOUBLE_TAP: tap_code(KC_RCTL); break;
|
||||
case DOUBLE_HOLD: register_code(KC_RCTL); break;
|
||||
case TRIPLE_TAP: tap_code(KC_RCTL); tap_code(KC_RCTL); break;
|
||||
case TRIPLE_HOLD: tap_code(KC_RCTL); register_code(KC_RCTL); break;
|
||||
}
|
||||
}
|
||||
|
||||
void ctl_reset(qk_tap_dance_state_t *state, void *user_data) {
|
||||
switch (ctl_state) {
|
||||
case SINGLE_HOLD: unregister_code(KC_LCTL); break;
|
||||
case DOUBLE_HOLD:
|
||||
case TRIPLE_HOLD: unregister_code(KC_RCTL); break;
|
||||
}
|
||||
ctl_state = 0;
|
||||
}
|
||||
|
||||
void g_finished(qk_tap_dance_state_t *state, void *user_data) {
|
||||
switch (cur_dance(state)) {
|
||||
case SINGLE_TAP:
|
||||
tap_code16(C(KC_END));
|
||||
break;
|
||||
case DOUBLE_TAP:
|
||||
tap_code16(C(KC_HOME));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
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_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_RALT, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
|
||||
),
|
||||
[_RPT] = LAYOUT(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
[_GAME] = LAYOUT(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
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, KC_F13,
|
||||
_______, _______, FW_WRD, KB_EOL, TG(_RPT), _______, 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_NO,
|
||||
_______, 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, _______, _______, _______, _______
|
||||
),
|
||||
[_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, KC_F13,
|
||||
_______, 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, _______, _______, _______, _______, _______,
|
||||
_______, 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},
|
||||
{15, 1, HSV_RED}
|
||||
);
|
||||
|
||||
const rgblight_segment_t PROGMEM func_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
{0, 8, HSV_GREEN}
|
||||
);
|
||||
|
||||
const rgblight_segment_t PROGMEM kp_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
{0, 16, HSV_ORANGE}
|
||||
);
|
||||
|
||||
const rgblight_segment_t PROGMEM adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
{0, 16, HSV_BLUE}
|
||||
);
|
||||
|
||||
const rgblight_segment_t PROGMEM capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
{10, 4, HSV_WHITE}
|
||||
);
|
||||
|
||||
const rgblight_segment_t PROGMEM numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
{0, 2, HSV_PURPLE},
|
||||
{14, 2, HSV_PURPLE}
|
||||
);
|
||||
|
||||
|
||||
enum rgb_layer_index {
|
||||
L_RPT,
|
||||
L_GAME,
|
||||
L_FUNC,
|
||||
L_KP,
|
||||
L_ADJUST,
|
||||
L_CAPSLOCK,
|
||||
L_NUMLOCK,
|
||||
};
|
||||
|
||||
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,
|
||||
[L_ADJUST] = adjust_layer,
|
||||
[L_CAPSLOCK] = capslock_layer,
|
||||
[L_NUMLOCK] = numlock_layer
|
||||
);
|
||||
|
||||
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) || layer_state_cmp(state, _RPT))
|
||||
autoshift_disable();
|
||||
else
|
||||
autoshift_enable();
|
||||
return state;
|
||||
}
|
||||
|
||||
bool led_update_user(led_t led_state) {
|
||||
rgblight_set_layer_state(L_CAPSLOCK, led_state.caps_lock);
|
||||
rgblight_set_layer_state(L_NUMLOCK, led_state.num_lock && layer_state_is(_KP));
|
||||
return true;
|
||||
}
|
||||
|
||||
void keyboard_post_init_keymap(void) {
|
||||
rgblight_layers = my_rgb_layers;
|
||||
rgb_was_enabled = rgblight_is_enabled();
|
||||
bspc_timer = 0;
|
||||
}
|
||||
|
||||
LEADER_EXTERNS();
|
||||
|
||||
void matrix_scan_keymap(void) {
|
||||
if (rgblight_is_enabled() && timer_elapsed(rgb_timer) > 1000) {
|
||||
rgb_idle_seconds++;
|
||||
rgb_timer = timer_read();
|
||||
}
|
||||
if (rgb_idle_seconds > IDLE_TIMEOUT) {
|
||||
rgb_was_enabled = rgblight_is_enabled();
|
||||
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_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);
|
||||
}
|
||||
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));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
|
||||
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) {
|
||||
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; // special case, return now without resetting timer
|
||||
// other paths should set rc and break
|
||||
break;
|
||||
}
|
||||
|
||||
// if something was pressed while MY_BSPC was held down, keep it pressed by
|
||||
// disabling the timer
|
||||
bspc_timer = 0;
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
LEADER_ENABLE = yes
|
||||
MOUSEKEY_ENABLE = yes
|
||||
CONSOLE_ENABLE = no
|
||||
NKRO_ENABLE = no
|
||||
TAP_DANCE_ENABLE = yes
|
||||
AUTO_SHIFT_ENABLE = yes
|
||||
LTO_ENABLE = yes
|
||||
USER_NAME := jdelkins
|
||||
|
|
@ -53,6 +53,9 @@
|
|||
// Most tactile encoders have detents every 4 stages
|
||||
#define ENCODER_RESOLUTION 4
|
||||
|
||||
#define AUTO_SHIFT_TIMEOUT 165
|
||||
#define AUTO_SHIFT_TIMEOUT 160
|
||||
#define AUTO_SHIFT_REPEAT
|
||||
#define RGBLIGHT_LAYERS
|
||||
#define LEADER_TIMEOUT 400
|
||||
#define LEADER_PER_KEY_TIMING
|
||||
#define USB_MAX_POWER_CONSUMPTION 100
|
||||
|
|
|
|||
|
|
@ -122,6 +122,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
TD(TD_LDCTL), MO(_ADJUST), MY_GUI, MY_ALT, MY_BSPC, MY_SPC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
|
||||
),
|
||||
|
||||
/* Same as _QWERTY but disable wutoshift */
|
||||
[_RPT] = LAYOUT(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
|
||||
[_GAME] = LAYOUT(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
|
|
@ -130,39 +138,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
),
|
||||
|
||||
[_RAISE] = LAYOUT(
|
||||
KC_ESC, _______, FW_WRD, KB_EOL, _______, _______, KB_COPY, KC_PGUP, _______, KC_LPRN, KC_RPRN, KC_MINS,
|
||||
_______, KB_BOL, _______, KC_PGDN, _______, TD(TD_G), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_BSLS,
|
||||
_______, _______, KC_DEL, _______, KB_PASTE, BK_WRD, _______, _______, _______, _______, _______, KC_CALC,
|
||||
_______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
|
||||
),
|
||||
|
||||
/* Same as _QWERTY but disable autoshift */
|
||||
[_RPT] = LAYOUT(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, KC_BSPC, KC_SPC, _______, _______, _______, _______
|
||||
KC_ESC, _______, FW_WRD, KB_EOL, TG(_RPT), _______, KB_COPY, KC_PGUP, _______, KC_LPRN, KC_RPRN, KC_MINS,
|
||||
KC_RCTL, KB_BOL, _______, KC_PGDN, _______, TD(TD_G), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_BSLS,
|
||||
_______, _______, KC_DEL, KC_CAPS, KB_PASTE, BK_WRD, _______, _______, _______, _______, _______, MY_CALC,
|
||||
KC_RCTL, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
|
||||
),
|
||||
|
||||
[_KP] = LAYOUT(
|
||||
KC_NUMLOCK, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_7, KC_8, KC_9, KC_MINS, KC_EQL,
|
||||
KC_ESC, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_7, KC_8, KC_9, KC_MINS, KC_EQL,
|
||||
_______, KC_F5, KC_F6, KC_F7, KC_F8, XXXXXXX, XXXXXXX, KC_4, KC_5, KC_6, KC_ASTR, _______,
|
||||
_______, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX, XXXXXXX, KC_1, KC_2, KC_3, KC_SLSH, _______,
|
||||
KC_NUMLOCK, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX, XXXXXXX, KC_1, KC_2, KC_3, KC_SLSH, _______,
|
||||
_______, _______, _______, _______, _______, _______, KC_0, KC_DOT, KC_PLUS, KC_END
|
||||
),
|
||||
|
||||
[_LOWER] = LAYOUT(
|
||||
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LBRC, KC_RBRC, KC_EQL,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, KC_PIPE,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END, KC_MPLY,
|
||||
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LCBR, KC_RCBR, KC_EQL,
|
||||
_______, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, _______, _______, KC_LBRC, KC_RBRC, KC_PIPE,
|
||||
_______, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, _______, KC_HOME, KC_END, KC_MPLY,
|
||||
_______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
|
||||
),
|
||||
|
||||
[_ADJUST] = LAYOUT(
|
||||
_______, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL,
|
||||
_______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______,
|
||||
_______, RGB_TOG, KB_MAKE, KB_FLSH, KB_VRSN, KB_BOOT, _______, TG_SYS, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||
KC_RCTL, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, TG(_KP), KC_BRID, KC_BRIU, KC_MUTE,
|
||||
_______, RGB_TOG, KB_MAKE, KB_FLSH, KB_VRSN, KB_BOOT, _______, TG_SYS, _______, _______, _______, KC_MPLY,
|
||||
KC_RCTL, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
|
||||
)
|
||||
|
||||
/* [_ADJUST] = LAYOUT( */
|
||||
|
|
@ -174,12 +174,85 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
};
|
||||
|
||||
/* plwnck rev6 RGB layout:
|
||||
* ----------------------------------
|
||||
* | 6 5 4 3 |
|
||||
* | 0 |
|
||||
* | 7 8 1 2 |
|
||||
* ----------------------------------
|
||||
*/
|
||||
|
||||
const rgblight_segment_t PROGMEM rpt_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
{1, 2, HSV_PINK},
|
||||
{7, 2, HSV_PINK}
|
||||
);
|
||||
|
||||
const rgblight_segment_t PROGMEM game_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
{2, 2, HSV_RED},
|
||||
{6, 2, HSV_RED}
|
||||
);
|
||||
|
||||
const rgblight_segment_t PROGMEM raise_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
{3, 4, HSV_GREEN}
|
||||
);
|
||||
|
||||
const rgblight_segment_t PROGMEM kp_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
{1, 8, HSV_ORANGE}
|
||||
);
|
||||
|
||||
const rgblight_segment_t PROGMEM lower_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
{3, 4, HSV_BLUE}
|
||||
);
|
||||
|
||||
const rgblight_segment_t PROGMEM adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
{1, 8, HSV_BLUE}
|
||||
);
|
||||
|
||||
const rgblight_segment_t PROGMEM capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
{1, 1, HSV_WHITE},
|
||||
{8, 1, HSV_WHITE}
|
||||
);
|
||||
|
||||
const rgblight_segment_t PROGMEM numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
|
||||
{6, 2, HSV_PURPLE}
|
||||
);
|
||||
|
||||
enum rgb_layer_index {
|
||||
L_RPT,
|
||||
L_GAME,
|
||||
L_RAISE,
|
||||
L_KP,
|
||||
L_LOWER,
|
||||
L_ADJUST,
|
||||
L_CAPSLOCK,
|
||||
L_NUMLOCK
|
||||
};
|
||||
|
||||
const rgblight_segment_t * const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
|
||||
[L_RPT] = rpt_layer,
|
||||
[L_GAME] = game_layer,
|
||||
[L_RAISE] = raise_layer,
|
||||
[L_KP] = kp_layer,
|
||||
[L_LOWER] = lower_layer,
|
||||
[L_ADJUST] = adjust_layer,
|
||||
[L_CAPSLOCK] = capslock_layer,
|
||||
[L_NUMLOCK] = numlock_layer
|
||||
);
|
||||
|
||||
#ifdef AUDIO_ENABLE
|
||||
float plover_song[][2] = SONG(PLOVER_SOUND);
|
||||
float plover_gb_song[][2] = SONG(PLOVER_GOODBYE_SOUND);
|
||||
#endif
|
||||
|
||||
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_RAISE, layer_state_cmp(state, _RAISE));
|
||||
rgblight_set_layer_state(L_KP, layer_state_cmp(state, _KP));
|
||||
rgblight_set_layer_state(L_LOWER, layer_state_cmp(state, _LOWER));
|
||||
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) || layer_state_cmp(state, _RPT))
|
||||
autoshift_disable();
|
||||
else
|
||||
|
|
@ -187,6 +260,12 @@ layer_state_t layer_state_set_keymap(layer_state_t state) {
|
|||
return update_tri_layer_state(state, _KP, _RAISE, _LOWER);
|
||||
}
|
||||
|
||||
bool led_update_user(led_t led_state) {
|
||||
rgblight_set_layer_state(L_CAPSLOCK, led_state.caps_lock);
|
||||
rgblight_set_layer_state(L_NUMLOCK, led_state.num_lock && layer_state_is(_KP));
|
||||
return true;
|
||||
}
|
||||
|
||||
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
|
||||
bool rc = true;
|
||||
static bool bspc_del = false;
|
||||
|
|
@ -325,6 +404,7 @@ bool dip_switch_update_user(uint8_t index, bool active) {
|
|||
}
|
||||
|
||||
void keyboard_post_init_keymap(void) {
|
||||
rgblight_layers = my_rgb_layers;
|
||||
bspc_timer = 0;
|
||||
}
|
||||
|
||||
|
|
@ -411,6 +491,11 @@ void matrix_scan_keymap(void) {
|
|||
SEQ_ONE_KEY(KC_C) {
|
||||
tap_code16(C(KC_C));
|
||||
}
|
||||
// neovim: terminal escape
|
||||
SEQ_ONE_KEY(KC_QUOT) {
|
||||
tap_code16(C(KC_BSLS));
|
||||
tap_code16(C(KC_N));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -193,7 +193,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
case KB_MAKE:
|
||||
if (!get_mods()) {
|
||||
if (!record->event.pressed)
|
||||
#ifdef NO_SECRETS
|
||||
SEND_STRING("make NO_SECRETS=1 " QMK_KEYBOARD ":" QMK_KEYMAP SS_TAP(X_ENTER));
|
||||
#else
|
||||
SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP SS_TAP(X_ENTER));
|
||||
#endif
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
|
|
@ -201,10 +205,15 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
case KB_VRSN:
|
||||
if (!get_mods()) {
|
||||
if (!record->event.pressed) {
|
||||
#ifdef DO_SECRETS
|
||||
# define SECRET_MSG " (with secrets)"
|
||||
#else
|
||||
# define SECRET_MSG
|
||||
#endif
|
||||
if (user_config.system_mac) {
|
||||
SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION " (mac mode)");
|
||||
SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION " (mac mode)" SECRET_MSG);
|
||||
} else {
|
||||
SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION " (non-mac mode)");
|
||||
SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION " (non-mac mode)" SECRET_MSG);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
|
|
@ -227,7 +236,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
case KB_FLSH:
|
||||
if (!get_mods()) {
|
||||
if (!record->event.pressed) {
|
||||
#ifdef NO_SECRETS
|
||||
SEND_STRING("make NO_SECRETS=1 " QMK_KEYBOARD ":" QMK_KEYMAP ":flash\n");
|
||||
#else
|
||||
SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP ":flash\n");
|
||||
#endif
|
||||
reset_keyboard();
|
||||
}
|
||||
return false;
|
||||
|
|
@ -235,7 +248,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
break;
|
||||
|
||||
#ifdef DO_SECRETS
|
||||
case KC_SECRET_1 ... KC_SECRET_5: // Secrets! Externally defined strings, not stored in repo
|
||||
case KC_SECRET_1 ... KC_SECRET_6: // Secrets! Externally defined strings, not stored in repo
|
||||
if (!record->event.pressed) {
|
||||
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
|
||||
send_secret_string(keycode - KC_SECRET_1);
|
||||
|
|
|
|||
|
|
@ -1,10 +1,15 @@
|
|||
SRC += jdelkins.c
|
||||
|
||||
ifeq ($(strip $(NO_SECRETS)), yes)
|
||||
OPT_DEFS += -DNO_SECRETS
|
||||
ifneq ($(strip $(NO_SECRETS)),)
|
||||
OPT_DEFS += -DNO_SECRETS
|
||||
endif
|
||||
|
||||
ifeq ($(shell test -f users/jdelkins/secrets.h.gpg && echo yes || echo no),yes)
|
||||
users/jdelkins/jdelkins.c: users/jdelkins/secrets.h
|
||||
touch $@
|
||||
|
||||
users/jdelkins/secrets.h: users/jdelkins/secrets.h.gpg
|
||||
gpg -d $< >$@
|
||||
endif
|
||||
|
||||
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
|
||||
|
|
|
|||
Loading…
Reference in New Issue