Merge pull request #623 from algernon/ergodox-ez/algernon
ergodox: Update my keymap to v1.5
This commit is contained in:
Erez Zukerman
GitHub
commit
6323f3d1e7
6 changed files with 1244 additions and 1237 deletions
|
|
@ -8,10 +8,17 @@ CONSOLE_ENABLE = no
|
|||
TAP_DANCE_ENABLE = yes
|
||||
KEYLOGGER_ENABLE ?= yes
|
||||
|
||||
ADORE_AUTOLOG ?= no
|
||||
|
||||
ifeq (${FORCE_NKRO},yes)
|
||||
OPT_DEFS += -DFORCE_NKRO
|
||||
endif
|
||||
|
||||
ifeq (${ADORE_AUTOLOG},yes)
|
||||
KEYLOGGER_ENABLE = yes
|
||||
OPT_DEFS += -DADORE_AUTOLOG
|
||||
endif
|
||||
|
||||
ifeq (${KEYLOGGER_ENABLE},yes)
|
||||
OPT_DEFS += -DKEYLOGGER_ENABLE
|
||||
CONSOLE_ENABLE = yes
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 93 KiB After Width: | Height: | Size: 92 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 93 KiB After Width: | Height: | Size: 93 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 89 KiB |
|
|
@ -23,8 +23,6 @@ enum {
|
|||
APPSEL,
|
||||
HUN,
|
||||
NMDIA,
|
||||
OHLFT,
|
||||
OHRGT,
|
||||
PLVR,
|
||||
};
|
||||
|
||||
|
|
@ -74,13 +72,6 @@ enum {
|
|||
HU_UE, // Ü
|
||||
HU_OEE, // Ő
|
||||
HU_UEE, // Ű
|
||||
|
||||
// One-handed layout specials
|
||||
OH_BSSPC,
|
||||
OH_ENTSFT,
|
||||
OH_BASE,
|
||||
OH_LEFT,
|
||||
OH_RIGHT,
|
||||
};
|
||||
|
||||
/* Fn keys */
|
||||
|
|
@ -100,6 +91,8 @@ enum {
|
|||
CT_CLN = 0,
|
||||
CT_MNS,
|
||||
CT_TA,
|
||||
CT_LBP,
|
||||
CT_RBP
|
||||
};
|
||||
|
||||
/* States & timers */
|
||||
|
|
@ -108,17 +101,6 @@ uint16_t gui_timer = 0;
|
|||
|
||||
uint16_t kf_timers[12];
|
||||
|
||||
uint16_t oh_base_timer = 0;
|
||||
uint16_t oh_bsspc_timer = 0;
|
||||
uint16_t oh_entsft_timer = 0;
|
||||
|
||||
#define OH_BLINK_INTERVAL 500
|
||||
|
||||
uint8_t oh_left_blink = 0;
|
||||
uint16_t oh_left_blink_timer = 0;
|
||||
uint8_t oh_right_blink = 0;
|
||||
uint16_t oh_right_blink_timer = 0;
|
||||
|
||||
#if KEYLOGGER_ENABLE
|
||||
bool log_enable = false;
|
||||
#endif
|
||||
|
|
@ -132,9 +114,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
/* Keymap 0: Base Layer
|
||||
*
|
||||
* ,-----------------------------------------------------. ,-----------------------------------------------------.
|
||||
* | `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 | Plvr | | Apps | 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10| F11 |
|
||||
* | Next/Prev | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 | Plvr | | Apps | 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10| F11 |
|
||||
* |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------|
|
||||
* | Next/Prev | ' | , | . | P | Y | [ | | ] | F | G | C | R | L | \ |
|
||||
* | ~ | ' | , | . | P | Y | [ | | ] | F | G | C | R | L | \ |
|
||||
* |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------|
|
||||
* | Tab/ARROW | A | O | E | U | I |------| |------| D | H | T | N | S | = / Arrow |
|
||||
* |-----------+------+------+------+------+------| ( | | ) |------+------+------+------+------+-----------|
|
||||
|
|
@ -143,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* | | | | | : | | - | | | | |
|
||||
* `-----------------------------------' `-----------------------------------'
|
||||
* ,-------------. ,-------------.
|
||||
* | LAlt | GUI | | MDIA | 1HND |
|
||||
* | LAlt | GUI | | MDIA | Del |
|
||||
* ,------|------|------| |------+------+------.
|
||||
* | | | Ctrl | | LEAD | | |
|
||||
* |Backsp|LShift|------| |------| Enter| Space|
|
||||
|
|
@ -152,8 +134,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
*/
|
||||
[BASE] = KEYMAP(
|
||||
// left hand
|
||||
KC_GRV ,M(KF_1) ,M(KF_2) ,M(KF_3),M(KF_4),M(KF_5),M(A_PLVR)
|
||||
,M(A_MPN) ,KC_QUOT ,KC_COMM ,KC_DOT ,KC_P ,KC_Y ,KC_LBRC
|
||||
M(A_MPN) ,M(KF_1) ,M(KF_2) ,M(KF_3),M(KF_4),M(KF_5),M(A_PLVR)
|
||||
,KC_GRV ,KC_QUOT ,KC_COMM ,KC_DOT ,KC_P ,KC_Y ,KC_LBRC
|
||||
,TD(CT_TA) ,KC_A ,KC_O ,KC_E ,KC_U ,KC_I
|
||||
,KC_MPLY ,KC_SLSH ,KC_Q ,KC_J ,KC_K ,KC_X ,KC_LPRN
|
||||
,KC_NO ,KC_NO ,KC_NO ,KC_NO ,TD(CT_CLN)
|
||||
|
|
@ -169,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
,KC_RPRN ,KC_B ,KC_M ,KC_W ,KC_V ,KC_Z ,KC_MSTP
|
||||
,TD(CT_MNS),KC_NO ,KC_NO ,KC_NO ,KC_NO
|
||||
|
||||
,OSL(NMDIA),M(OH_LEFT)
|
||||
,OSL(NMDIA),KC_DEL
|
||||
,KC_LEAD
|
||||
,F(F_HUN) ,KC_ENT ,KC_SPC
|
||||
),
|
||||
|
|
@ -177,46 +159,46 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
/* Keymap 1: Adore layer
|
||||
*
|
||||
* ,-----------------------------------------------------. ,-----------------------------------------------------.
|
||||
* | `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 | Plvr | | Apps | 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10| F11 |
|
||||
* | Play/Pause| 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 | Plvr | | Apps | 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10| F11 |
|
||||
* |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------|
|
||||
* | Next/Prev | , | . | L | W | M | [ | | ] | F | H | C | P | Y | \ |
|
||||
* | `~ | X | W | K | L | M | ( | | ) | F | H | C | P | Y | \ |
|
||||
* |-----------+------+------+------+------+------| [ | | ] |------+------+------+------+------+-----------|
|
||||
* | Tab/Arrow | A | O | E | I | U |------| |------| D | R | T | N | S | = |
|
||||
* |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------|
|
||||
* | Tab/Arrow | A | O | E | I | U |------| |------| D | R | T | N | S | = / Arrow |
|
||||
* |-----------+------+------+------+------+------| ( | | ) |------+------+------+------+------+-----------|
|
||||
* | Play/Pause| / | Z | ' | K | X | | | | B | G | V | J | Q | Stop |
|
||||
* | | Z | Q | ' | , | . | : | | - | B | G | V | J | / | |
|
||||
* `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------'
|
||||
* | | | | | : | | - | | | | |
|
||||
* | | | | | | | | | | | |
|
||||
* `-----------------------------------' `-----------------------------------'
|
||||
* ,-------------. ,-------------.
|
||||
* | LAlt | GUI | | MDIA | 1HND |
|
||||
* | LAlt | GUI | | MDIA | Del |
|
||||
* ,------|------|------| |------+------+------.
|
||||
* | | | Ctrl | | LEAD | | |
|
||||
* | | | Ctrl | | HUN | | |
|
||||
* |Backsp|LShift|------| |------| Enter| Space|
|
||||
* | | | ESC | | HUN | | |
|
||||
* | | | ESC | | LEAD | | |
|
||||
* `--------------------' `--------------------'
|
||||
*/
|
||||
[ADORE] = KEYMAP(
|
||||
// left hand
|
||||
KC_GRV ,M(KF_1) ,M(KF_2) ,M(KF_3),M(KF_4),M(KF_5),M(A_PLVR)
|
||||
,M(A_MPN) ,KC_COMM ,KC_DOT ,KC_L ,KC_W ,KC_M ,KC_LBRC
|
||||
KC_MPLY ,M(KF_1) ,M(KF_2) ,M(KF_3),M(KF_4),M(KF_5),M(A_PLVR)
|
||||
,KC_GRV ,KC_X ,KC_W ,KC_K ,KC_L ,KC_M ,TD(CT_LBP)
|
||||
,TD(CT_TA) ,KC_A ,KC_O ,KC_E ,KC_I ,KC_U
|
||||
,KC_MPLY ,KC_SLSH ,KC_Z ,KC_QUOT,KC_K ,KC_X ,KC_LPRN
|
||||
,KC_NO ,KC_NO ,KC_NO ,KC_NO ,TD(CT_CLN)
|
||||
,KC_NO ,KC_Z ,KC_Q ,KC_QUOT,KC_COMM,KC_DOT ,TD(CT_CLN)
|
||||
,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
|
||||
|
||||
,F(F_ALT),F(F_GUI)
|
||||
,F(F_CTRL)
|
||||
,KC_BSPC,F(F_SFT),M(A_ESC)
|
||||
|
||||
// right hand
|
||||
,KC_APP ,M(KF_6),M(KF_7) ,M(KF_8),M(KF_9) ,M(KF_10) ,KC_F11
|
||||
,KC_RBRC ,KC_F ,KC_H ,KC_C ,KC_P ,KC_Y ,KC_BSLS
|
||||
,KC_D ,KC_R ,KC_T ,KC_N ,KC_S ,KC_EQL
|
||||
,KC_RPRN ,KC_B ,KC_G ,KC_V ,KC_J ,KC_Q ,KC_MSTP
|
||||
,TD(CT_MNS),KC_NO ,KC_NO ,KC_NO ,KC_NO
|
||||
,KC_APP ,M(KF_6),M(KF_7),M(KF_8),M(KF_9) ,M(KF_10) ,KC_F11
|
||||
,TD(CT_RBP),KC_F ,KC_H ,KC_C ,KC_P ,KC_Y ,KC_BSLS
|
||||
,KC_D ,KC_R ,KC_T ,KC_N ,KC_S ,KC_EQL
|
||||
,TD(CT_MNS),KC_B ,KC_G ,KC_V ,KC_J ,KC_SLSH ,KC_NO
|
||||
,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
|
||||
|
||||
,OSL(NMDIA),M(OH_LEFT)
|
||||
,KC_LEAD
|
||||
,F(F_HUN) ,KC_ENT ,KC_SPC
|
||||
,OSL(NMDIA),KC_DEL
|
||||
,F(F_HUN)
|
||||
,KC_LEAD ,KC_ENT ,KC_SPC
|
||||
),
|
||||
|
||||
/* Keymap 2: Arrow layer
|
||||
|
|
@ -236,7 +218,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* | | | | | |
|
||||
* ,------|------|------| |------+------+------.
|
||||
* | | | | | | | |
|
||||
* | | |------| |------| PgUp | PgDn |
|
||||
* | Enter| |------| |------| PgUp | PgDn |
|
||||
* | | | | | | | |
|
||||
* `--------------------' `--------------------'
|
||||
*/
|
||||
|
|
@ -251,7 +233,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
,KC_TRNS ,KC_TRNS
|
||||
,KC_TRNS
|
||||
,KC_TRNS ,KC_TRNS ,KC_TRNS
|
||||
,KC_ENT ,KC_TRNS ,KC_TRNS
|
||||
|
||||
// right hand
|
||||
,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
|
||||
|
|
@ -402,97 +384,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
,KC_MNXT ,KC_BTN1 ,KC_BTN2
|
||||
),
|
||||
|
||||
/* Keymap 6: One-handed, left side
|
||||
*
|
||||
* ,-----------------------------------------------------.
|
||||
* | `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 |A BSE|
|
||||
* |-----------+------+------+------+------+-------------|
|
||||
* | Tab | ' | , | . | P | Y | [ |
|
||||
* |-----------+------+------+------+------+------| |
|
||||
* | - | A | O | E | U | I |------|
|
||||
* |-----------+------+------+------+------+------| ( |
|
||||
* | Play/Pause| ; | Q | J | K | X | |
|
||||
* `-----------+------+------+------+------+-------------'
|
||||
* | Home | End | Down | Up | ESC |
|
||||
* `-----------------------------------'
|
||||
* ,-------------.
|
||||
* | LAlt | GUI |
|
||||
* ,------|------|------|
|
||||
* |BackSp|LShift| Ctrl |
|
||||
* | | |------|
|
||||
* |Space |Enter |OTHER |
|
||||
* `--------------------'
|
||||
*/
|
||||
[OHLFT] = KEYMAP(
|
||||
// left hand
|
||||
KC_GRV ,M(KF_1) ,M(KF_2) ,M(KF_3) ,M(KF_4) ,M(KF_5) ,M(OH_BASE)
|
||||
,KC_TAB ,KC_QUOT ,KC_COMM ,KC_DOT ,KC_P ,KC_Y ,KC_LBRC
|
||||
,KC_MINS ,KC_A ,KC_O ,KC_E ,KC_U ,KC_I
|
||||
,KC_MPLY ,KC_SCLN ,KC_Q ,KC_J ,KC_K ,KC_X ,KC_LPRN
|
||||
,KC_HOME ,KC_END ,KC_DOWN ,KC_UP ,M(A_ESC)
|
||||
|
||||
,KC_TRNS ,KC_TRNS
|
||||
,KC_TRNS
|
||||
,M(OH_BSSPC),M(OH_ENTSFT),M(OH_RIGHT)
|
||||
|
||||
// right hand
|
||||
,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
|
||||
,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
|
||||
,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
|
||||
,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
|
||||
,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
|
||||
|
||||
,KC_NO ,KC_NO
|
||||
,KC_NO
|
||||
,KC_NO ,KC_NO ,KC_NO
|
||||
),
|
||||
|
||||
/* Keymap 7: One-handed, right side
|
||||
*
|
||||
* ,-----------------------------------------------------.
|
||||
* | = F11 | 0 F10| 9 F9 | 8 F8 | 7 F7 | 6 F6 |A BSE|
|
||||
* |-----------+------+------+------+------+-------------|
|
||||
* | / | L | R | C | G | F | ] |
|
||||
* |-----------+------+------+------+------+------| |
|
||||
* | \ | S | N | T | H | D |------|
|
||||
* |-----------+------+------+------+------+------| ) |
|
||||
* | Stop | Z | V | W | M | B | |
|
||||
* `-----------+------+------+------+------+-------------'
|
||||
* | PgDn | PgUp | Right| Left | ESC |
|
||||
* `-----------------------------------'
|
||||
* ,-------------.
|
||||
* | LAlt | GUI |
|
||||
* ,------|------|------|
|
||||
* |BackSp|LShift| Ctrl |
|
||||
* | | |------|
|
||||
* |Space |Enter |OTHER |
|
||||
* `--------------------'
|
||||
*/
|
||||
[OHRGT] = KEYMAP(
|
||||
// left hand
|
||||
M(KF_11) ,M(KF_10) ,M(KF_9) ,M(KF_8) ,M(KF_7) ,M(KF_6) ,M(OH_BASE)
|
||||
,KC_SLSH ,KC_L ,KC_R ,KC_C ,KC_G ,KC_F ,KC_RBRC
|
||||
,KC_BSLS ,KC_S ,KC_N ,KC_T ,KC_H ,KC_D
|
||||
,KC_MSTP ,KC_Z ,KC_V ,KC_W ,KC_M ,KC_B ,KC_RPRN
|
||||
,KC_PGDN ,KC_PGUP ,KC_RGHT ,KC_LEFT ,M(A_ESC)
|
||||
|
||||
,KC_TRNS ,KC_TRNS
|
||||
,KC_TRNS
|
||||
,M(OH_BSSPC),M(OH_ENTSFT),M(OH_LEFT)
|
||||
|
||||
// right hand
|
||||
,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
|
||||
,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
|
||||
,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
|
||||
,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
|
||||
,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO
|
||||
|
||||
,KC_NO ,KC_NO
|
||||
,KC_NO
|
||||
,KC_NO ,KC_NO ,KC_NO
|
||||
),
|
||||
|
||||
/* Keymap 8: Steno for Plover
|
||||
/* Keymap 6: Steno for Plover
|
||||
*
|
||||
* ,--------------------------------------------------. ,--------------------------------------------------.
|
||||
* | | | | | | | BASE | | | | | | | | |
|
||||
|
|
@ -774,7 +666,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
|
|||
return MACRODOWN(T(S), T(L), T(A), T(C), T(K), T(ENT), END);
|
||||
|
||||
case APP_EMCS:
|
||||
return MACRODOWN(T(E), T(M), T(A), T(C), T(S), T(ENT), END);
|
||||
return MACRODOWN(T(G), T(N), T(U), T(SPC), T(E), T(M), T(A), T(C), T(S), T(SPC), T(2), T(4), T(ENT), END);
|
||||
|
||||
case APP_TERM:
|
||||
return MACRODOWN(T(T), T(E), T(R), T(M), T(ENT), END);
|
||||
|
|
@ -789,65 +681,8 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
|
|||
case KF_1 ... KF_11:
|
||||
ang_handle_kf (record, id);
|
||||
break;
|
||||
|
||||
/* 1HAND layout */
|
||||
case OH_BASE:
|
||||
if (record->event.pressed) {
|
||||
oh_base_timer = timer_read ();
|
||||
} else {
|
||||
if (timer_elapsed (oh_base_timer) > TAPPING_TERM) {
|
||||
layer_clear ();
|
||||
} else {
|
||||
return MACRO (T(APP), END);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case OH_BSSPC:
|
||||
if (record->event.pressed) {
|
||||
oh_bsspc_timer = timer_read ();
|
||||
} else {
|
||||
if (timer_elapsed (oh_bsspc_timer) > TAPPING_TERM) {
|
||||
return MACRO (T(BSPC), END);
|
||||
} else {
|
||||
return MACRO (T(SPC), END);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case OH_ENTSFT:
|
||||
if (record->event.pressed) {
|
||||
oh_entsft_timer = timer_read ();
|
||||
} else {
|
||||
if (timer_elapsed (oh_entsft_timer) > TAPPING_TERM) {
|
||||
if (keyboard_report->mods & MOD_BIT(KC_LSFT))
|
||||
unregister_code (KC_LSFT);
|
||||
else
|
||||
register_code (KC_LSFT);
|
||||
} else {
|
||||
return MACRO (T(ENT), END);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case OH_LEFT:
|
||||
if (record->event.pressed) {
|
||||
layer_move (OHLFT);
|
||||
oh_left_blink = 1;
|
||||
oh_left_blink_timer = timer_read ();
|
||||
ergodox_right_led_1_on ();
|
||||
}
|
||||
break;
|
||||
|
||||
case OH_RIGHT:
|
||||
if (record->event.pressed) {
|
||||
layer_move (OHRGT);
|
||||
oh_right_blink = 1;
|
||||
oh_right_blink_timer = timer_read ();
|
||||
ergodox_right_led_3_on ();
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
return MACRO_NONE;
|
||||
};
|
||||
|
||||
|
|
@ -872,8 +707,12 @@ void matrix_init_user(void) {
|
|||
if (!eeconfig_is_enabled())
|
||||
eeconfig_init();
|
||||
dl = eeconfig_read_default_layer ();
|
||||
if (dl == (1UL << ADORE))
|
||||
if (dl == (1UL << ADORE)) {
|
||||
is_adore = 1;
|
||||
#if ADORE_AUTOLOG
|
||||
log_enable = true;
|
||||
#endif
|
||||
}
|
||||
};
|
||||
|
||||
LEADER_EXTERNS();
|
||||
|
|
@ -896,10 +735,45 @@ void ang_tap (uint16_t codes[]) {
|
|||
}
|
||||
}
|
||||
|
||||
#define TAP_ONCE(code) \
|
||||
#define TAP_ONCE(code) \
|
||||
register_code (code); \
|
||||
unregister_code (code)
|
||||
|
||||
void ang_tap_dance_bp_finished (qk_tap_dance_state_t *state, void *user_data) {
|
||||
bool left, parens;
|
||||
|
||||
if (state->count > 2) {
|
||||
state->count = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
if (state->keycode == TD(CT_LBP))
|
||||
left = true;
|
||||
else
|
||||
left = false;
|
||||
|
||||
if (state->count == 1)
|
||||
parens = false;
|
||||
else
|
||||
parens = true;
|
||||
|
||||
if (parens) {
|
||||
register_code (KC_RSFT);
|
||||
if (left) {
|
||||
TAP_ONCE(KC_9);
|
||||
} else {
|
||||
TAP_ONCE(KC_0);
|
||||
}
|
||||
unregister_code (KC_RSFT);
|
||||
} else {
|
||||
if (left) {
|
||||
TAP_ONCE (KC_LBRC);
|
||||
} else {
|
||||
TAP_ONCE (KC_RBRC);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ang_tap_dance_cln_finished (qk_tap_dance_state_t *state, void *user_data) {
|
||||
if (state->count == 1) {
|
||||
register_code (KC_RSFT);
|
||||
|
|
@ -986,8 +860,14 @@ const qk_tap_dance_action_t tap_dance_actions[] = {
|
|||
.fn = { NULL, ang_tap_dance_ta_finished, ang_tap_dance_ta_reset },
|
||||
.user_data = (void *)&((td_ta_state_t) { false, false, false })
|
||||
}
|
||||
,[CT_LBP] = ACTION_TAP_DANCE_FN (ang_tap_dance_bp_finished)
|
||||
,[CT_RBP] = ACTION_TAP_DANCE_FN (ang_tap_dance_bp_finished)
|
||||
};
|
||||
|
||||
static uint16_t uni[32];
|
||||
static uint8_t unicnt;
|
||||
static bool unimagic = false;
|
||||
|
||||
// Runs constantly in the background, in a loop.
|
||||
void matrix_scan_user(void) {
|
||||
uint8_t layer = biton32(layer_state);
|
||||
|
|
@ -995,11 +875,6 @@ void matrix_scan_user(void) {
|
|||
if (gui_timer && timer_elapsed (gui_timer) > TAPPING_TERM)
|
||||
unregister_code (KC_LGUI);
|
||||
|
||||
if (layer != OHLFT)
|
||||
oh_left_blink = 0;
|
||||
if (layer != OHRGT)
|
||||
oh_right_blink = 0;
|
||||
|
||||
if (layer == HUN) {
|
||||
ergodox_right_led_2_on();
|
||||
ergodox_right_led_3_on();
|
||||
|
|
@ -1018,39 +893,13 @@ void matrix_scan_user(void) {
|
|||
ergodox_right_led_2_set (LED_BRIGHTNESS_HI);
|
||||
}
|
||||
|
||||
if (layer == OHLFT || layer == OHRGT) {
|
||||
ergodox_right_led_2_on();
|
||||
|
||||
if (oh_left_blink) {
|
||||
if (timer_elapsed (oh_left_blink_timer) > OH_BLINK_INTERVAL) {
|
||||
if ((keyboard_report->mods & MOD_BIT(KC_LSFT)) == 0)
|
||||
ergodox_right_led_1_off ();
|
||||
}
|
||||
if (timer_elapsed (oh_left_blink_timer) > OH_BLINK_INTERVAL * 2) {
|
||||
ergodox_right_led_1_on ();
|
||||
oh_left_blink_timer = timer_read ();
|
||||
}
|
||||
}
|
||||
|
||||
if (oh_right_blink) {
|
||||
if (timer_elapsed (oh_right_blink_timer) > OH_BLINK_INTERVAL) {
|
||||
if ((keyboard_report->mods & MOD_BIT(KC_LCTRL)) == 0)
|
||||
ergodox_right_led_3_off ();
|
||||
}
|
||||
if (timer_elapsed (oh_right_blink_timer) > OH_BLINK_INTERVAL * 2) {
|
||||
ergodox_right_led_3_on ();
|
||||
oh_right_blink_timer = timer_read ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (keyboard_report->mods & MOD_BIT(KC_LSFT) ||
|
||||
((get_oneshot_mods() & MOD_BIT(KC_LSFT)) && !has_oneshot_mods_timed_out())) {
|
||||
ergodox_right_led_1_set (LED_BRIGHTNESS_HI);
|
||||
ergodox_right_led_1_on ();
|
||||
} else {
|
||||
ergodox_right_led_1_set (LED_BRIGHTNESS_LO);
|
||||
if (layer != OHLFT && layer != NMDIA && layer != PLVR && layer != ADORE)
|
||||
if (layer != NMDIA && layer != PLVR && layer != ADORE)
|
||||
ergodox_right_led_1_off ();
|
||||
}
|
||||
|
||||
|
|
@ -1060,7 +909,7 @@ void matrix_scan_user(void) {
|
|||
ergodox_right_led_2_on ();
|
||||
} else {
|
||||
ergodox_right_led_2_set (LED_BRIGHTNESS_LO);
|
||||
if (layer != OHRGT && layer != HUN && layer != OHLFT && layer != NMDIA && layer != PLVR && layer != ADORE)
|
||||
if (layer != HUN && layer != NMDIA && layer != PLVR && layer != ADORE)
|
||||
ergodox_right_led_2_off ();
|
||||
}
|
||||
|
||||
|
|
@ -1070,7 +919,7 @@ void matrix_scan_user(void) {
|
|||
ergodox_right_led_3_on ();
|
||||
} else {
|
||||
ergodox_right_led_3_set (LED_BRIGHTNESS_LO);
|
||||
if (layer != OHRGT && layer != HUN && layer != PLVR && layer != ADORE)
|
||||
if (layer != HUN && layer != PLVR && layer != ADORE)
|
||||
ergodox_right_led_3_off ();
|
||||
}
|
||||
|
||||
|
|
@ -1095,6 +944,14 @@ void matrix_scan_user(void) {
|
|||
ang_do_unicode ();
|
||||
}
|
||||
|
||||
SEQ_TWO_KEYS (KC_LEAD, KC_U) {
|
||||
unicnt = 0;
|
||||
unimagic = true;
|
||||
register_code(KC_RSFT);
|
||||
TAP_ONCE(KC_U);
|
||||
unregister_code(KC_RSFT);
|
||||
}
|
||||
|
||||
SEQ_ONE_KEY (KC_V) {
|
||||
SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ (" QMK_VERSION "/" KEYMAP_VERSION ")");
|
||||
}
|
||||
|
|
@ -1156,7 +1013,13 @@ void matrix_scan_user(void) {
|
|||
ergodox_right_led_2_off ();
|
||||
wait_ms (100);
|
||||
ergodox_right_led_1_off ();
|
||||
#if ADORE_AUTOLOG
|
||||
log_enable = true;
|
||||
#endif
|
||||
} else {
|
||||
#if ADORE_AUTOLOG
|
||||
log_enable = false;
|
||||
#endif
|
||||
is_adore = 0;
|
||||
default_layer_and (0);
|
||||
default_layer_or (1UL << BASE);
|
||||
|
|
@ -1180,16 +1043,141 @@ void matrix_scan_user(void) {
|
|||
|
||||
static uint16_t last4[4];
|
||||
|
||||
bool is_uni_seq(char *seq) {
|
||||
uint8_t i;
|
||||
|
||||
for (i = 0; seq[i]; i++) {
|
||||
uint16_t code;
|
||||
if (('1' <= seq[i]) && (seq[i] <= '9'))
|
||||
code = seq[i] - '1' + KC_1;
|
||||
else if (seq[i] == '0')
|
||||
code = KC_0;
|
||||
else
|
||||
code = seq[i] - 'a' + KC_A;
|
||||
|
||||
if (i > unicnt)
|
||||
return false;
|
||||
if (uni[i] != code)
|
||||
return false;
|
||||
}
|
||||
|
||||
if (uni[i] == KC_ENT || uni[i] == KC_SPC)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
uint16_t hex_to_keycode(uint8_t hex)
|
||||
{
|
||||
if (hex == 0x0) {
|
||||
return KC_0;
|
||||
} else if (hex < 0xA) {
|
||||
return KC_1 + (hex - 0x1);
|
||||
} else {
|
||||
return KC_A + (hex - 0xA);
|
||||
}
|
||||
}
|
||||
|
||||
void register_hex(uint16_t hex) {
|
||||
bool leading_zeros = true;
|
||||
|
||||
for(int i = 3; i >= 0; i--) {
|
||||
uint8_t digit = ((hex >> (i*4)) & 0xF);
|
||||
if (digit != 0)
|
||||
leading_zeros = false;
|
||||
else if (leading_zeros)
|
||||
continue;
|
||||
register_code(hex_to_keycode(digit));
|
||||
unregister_code(hex_to_keycode(digit));
|
||||
wait_ms(10);
|
||||
}
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
char *symbol;
|
||||
uint16_t codes[4];
|
||||
} qk_ucis_symbol_t;
|
||||
|
||||
static qk_ucis_symbol_t ucis_symbol_table[] = {
|
||||
{"poop", {0x1, 0xf4a9, 0}},
|
||||
{"rofl", {0x1, 0xf923, 0}},
|
||||
{"kiss", {0x1, 0xf619, 0}},
|
||||
{"snowman", {0x2603, 0}},
|
||||
{NULL, {}}
|
||||
};
|
||||
|
||||
bool process_record_ucis (uint16_t keycode, keyrecord_t *record) {
|
||||
uint8_t i;
|
||||
|
||||
if (!unimagic)
|
||||
return true;
|
||||
|
||||
if (!record->event.pressed)
|
||||
return true;
|
||||
|
||||
uni[unicnt] = keycode;
|
||||
unicnt++;
|
||||
|
||||
if (keycode == KC_BSPC) {
|
||||
if (unicnt >= 2) {
|
||||
unicnt-= 2;
|
||||
return true;
|
||||
} else {
|
||||
unicnt--;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (keycode == KC_ENT || keycode == KC_SPC) {
|
||||
bool symbol_found = false;
|
||||
|
||||
for (i = unicnt; i > 0; i--) {
|
||||
register_code (KC_BSPC);
|
||||
unregister_code (KC_BSPC);
|
||||
wait_ms(10);
|
||||
}
|
||||
|
||||
ang_do_unicode();
|
||||
wait_ms(10);
|
||||
for (i = 0; ucis_symbol_table[i].symbol; i++) {
|
||||
if (is_uni_seq (ucis_symbol_table[i].symbol)) {
|
||||
symbol_found = true;
|
||||
for (uint8_t j = 0; ucis_symbol_table[i].codes[j]; j++) {
|
||||
register_hex(ucis_symbol_table[i].codes[j]);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!symbol_found) {
|
||||
for (i = 0; i < unicnt - 1; i++) {
|
||||
uint8_t code;
|
||||
|
||||
if (uni[i] > KF_1)
|
||||
code = uni[i] - KF_1 + KC_1;
|
||||
else
|
||||
code = uni[i];
|
||||
TAP_ONCE(code);
|
||||
wait_ms (10);
|
||||
}
|
||||
}
|
||||
|
||||
unimagic = false;
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool process_record_user (uint16_t keycode, keyrecord_t *record) {
|
||||
#if KEYLOGGER_ENABLE
|
||||
uint8_t layer = biton32(layer_state);
|
||||
|
||||
if (log_enable && layer == BASE) {
|
||||
if (log_enable) {
|
||||
xprintf ("KL: col=%d, row=%d\n", record->event.key.col,
|
||||
record->event.key.row);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!process_record_ucis (keycode, record))
|
||||
return false;
|
||||
|
||||
if (time_travel && !record->event.pressed) {
|
||||
uint8_t p;
|
||||
|
||||
|
|
|
|||
|
|
@ -16,11 +16,12 @@ Some of the things in the layout only work when one uses Spacemacs and GNOME und
|
|||
- [ADORE layer](#adore-layer)
|
||||
- [Hungarian layer](#hungarian-layer)
|
||||
- [Navigation and media layer](#navigation-and-media-layer)
|
||||
- [One-handed layer](#one-handed-layer)
|
||||
- [Steno layer](#steno-layer)
|
||||
- [LED states](#led-states)
|
||||
* [Tools](#tools)
|
||||
- [Heatmap](#heatmap)
|
||||
* [Special features](#special-features)
|
||||
- [Unicode Symbol Input](#unicode-symbol-input)
|
||||
* [Building](#building)
|
||||
- [Using on Windows](#using-on-windows)
|
||||
* [Changelog](#changelog)
|
||||
|
|
@ -38,7 +39,7 @@ At its core, this is a Dvorak layout, with some minor changes. The more interest
|
|||
* The `Shift`, `Alt`, and `Control` modifiers are one-shot. When tapped, they are considered active for the next key press only. When double tapped, they toggle on, until a third, single tap sometime later. When held, they act as expected. My usual pattern is that I use these for the next keypress only, so this behaviour is perfect. If I need them held, I'll just double-tap.
|
||||
* The `GUI` key is special, because when I double-tap it, it sends `GUI + w`, which pops up an application selector. It also switches to a one-shot layer, where the number row on the left half turns into app selector macros, for the most common things I usually want to switch to. Otherwise it behaves as on a normal layout.
|
||||
* The `ESC` key also doubles as a one-shot cancel key: if tapped while any of the one-shot modifiers are in-flight (as in, single-tapped, and not expired yet), it cancels all one-shot modifiers. It also cancels the **Hun** layer, if active. Otherwise it sends the usual keycode.
|
||||
* The **Media** and **Hun** layer keys are one-shot, the **1Hand** and **STENO** keys are toggles.
|
||||
* The **Media** and **Hun** layer keys are one-shot, the **STENO** key is a toggle.
|
||||
* When holding any of the **Arrow** layer keys, the arrow layer activates while the layer key is held. Tapping the key produces the normal key.
|
||||
* Tapping the `:` key once yields `:`, tapping it twice yields `;`.
|
||||
* The **Lead** key allows me to type in a sequence of keys, and trigger some actions:
|
||||
|
|
@ -51,6 +52,7 @@ At its core, this is a Dvorak layout, with some minor changes. The more interest
|
|||
- `LEAD v` prints the firmware version, the keyboard and the keymap.
|
||||
- `LEAD d` toggles logging keypress positions to the HID console.
|
||||
- `LEAD t` toggles time travel. Figuring out the current `date` is left as an exercise to the reader.
|
||||
- `LEAD LEAD u` enters the [Unicode symbol input][#unicode-symbol-input] mode.
|
||||
|
||||
## ADORE layer
|
||||
|
||||
|
|
@ -74,20 +76,6 @@ On this layer, the accented characters are at the same position as their base va
|
|||
|
||||
This layer is primarily for navigating with the cursor or the mouse, and some media things.
|
||||
|
||||
## One-handed layer
|
||||
|
||||
[](http://www.keyboard-layout-editor.com/#/gists/edff2495135955b8963198dace7f7ece)
|
||||
|
||||
The one-handed layer is used in situations where the right hand is occupied, by mousing around, for example. Tapping the `OTHER` key switches which side is active. For the most part, keys remain in their usual position. When the right half is active, keys are mirrored to the left half.
|
||||
|
||||
The differences are as follows:
|
||||
|
||||
* The `ESC` key has been moved to the bottom row, so the `OTHER` key is easier to tap.
|
||||
* Most keys on the thumb cluster now have dual uses, and these do not change when switching sides:
|
||||
- The `Space`/`Backspace` key sends `Space` on tap, `Backspace` when held for longer than a normal tap.
|
||||
- The `Enter`/`Shift` key sends `Enter` on short-tap, `Shift` on long-tap.
|
||||
* The `Apps`/`BASE` key can be used to go back to the base layer, by long-tapping it. A short-tap will send the `App` key, as usual.
|
||||
|
||||
## Steno layer
|
||||
|
||||
[](http://www.keyboard-layout-editor.com/#/gists/401ef9a84369e47c57f9aedcf0a0d667)
|
||||
|
|
@ -103,11 +91,25 @@ For the layers, the following rules apply:
|
|||
* When the [ADORE layer](#adore-layer) is toggled on, LEDs will light up from left to right in a sequence, then turn off. When the layer is toggled off, the LEDs light up and turn off in the other direction. No LEDs are on while the layer is active.
|
||||
* When the [Hungarian layer](#hungarian-layer) is active, the *green* and *blue* LEDs are on.
|
||||
* When the [Navigation and media layer](#navigation-and-media-layer) is active, the *red* and *green* ones are on.
|
||||
* When the [One-handed layer](#one-handed-layer) is active, the *green* LED is on and bright, and either the *red* or the *blue* one is going to slowly blink, depending on the currently active side.
|
||||
* For the [Steno layer](#steno-layer), all LEDs will be turned on.
|
||||
|
||||
Unless noted otherwise, the layers use a dim light for the LEDs, while modifiers use a stronger one, and modifiers override any layer preferences. For example, when on the one-handed layer, with the left side active (*red* light blinking), if `Shift` is on, the *red* light will be constantly on.
|
||||
|
||||
# Special features
|
||||
|
||||
## Unicode Symbol Input
|
||||
|
||||
Once in the Unicode Symbol Input mode, one is able to type in symbol names, press `Enter` or `Space`, and get the Unicode symbol itself back. When in the mode, a capital `U` is printed first. Once the sequence is finished, all of it is erased by sending enough `Backspace` taps, and the firmware starts the OS-specific unicode input sequence. Then, it looks up the symbol name, and enters the associated code. If it is not found, it will just replay the pressed keycodes.
|
||||
|
||||
The currently supported symbols are:
|
||||
|
||||
- `snowman`: ☃
|
||||
- `kiss`: 😙
|
||||
- `rofl`: 🤣
|
||||
- `poop`: 💩
|
||||
|
||||
This is an experimental feature, and may or may not work reliably.
|
||||
|
||||
# Tools
|
||||
|
||||
## Heatmap
|
||||
|
|
@ -133,14 +135,14 @@ To make my workflow easier, this layout is maintained in [its own repository][al
|
|||
$ git clone https://github.com/jackhumbert/qmk_firmware.git
|
||||
$ cd qmk_firmware
|
||||
$ git clone https://github.com/algernon/ergodox-layout.git \
|
||||
keyboards/ergodox_ez/keymaps/algernon-master
|
||||
$ make KEYBOARD=ergodox_ez KEYMAP=algernon-master
|
||||
keyboards/ergodox/keymaps/algernon-master
|
||||
$ make keyboard=ergodox keymap=algernon-master
|
||||
```
|
||||
|
||||
From time to time, updates may be submitted back to the QMK repository. If you are reading it there, you can build the firmware like any other firmware included with it (assuming you are in the root directory of the firmware):
|
||||
|
||||
```
|
||||
$ make KEYBOARD=ergodox_ez KEYMAP=algernon
|
||||
$ make keyboard=ergodox keymap=algernon
|
||||
```
|
||||
|
||||
## Using on Windows
|
||||
|
|
@ -149,6 +151,16 @@ The keymap default to forcing NKRO, which seems to upset Windows, and except the
|
|||
|
||||
# Changelog
|
||||
|
||||
## v1.5 - 2016-08-12
|
||||
|
||||
* The **1HAND** layer has been removed.
|
||||
* A `Delete` key is now available on the right thumb cluster.
|
||||
* The [ADORE](#adore-layer) layer received a major update, see the layout image above.
|
||||
* It is now possible to enable automatic logging for the [ADORE](#adore-layer) layer, by setting the `ADORE_AUTOLOG` makefile variable to `yes` when compiling the keymap. It is off by default.
|
||||
* The `~` key and the `Media Next/Prev` key have been swapped on the [base layer](#base-layer).
|
||||
* On the **ARROW** layer, `Backspace` has been replaced by `Enter`.
|
||||
* There is some experimental support for entering Unicode symbols.
|
||||
|
||||
## v1.4 - 2016-07-29
|
||||
|
||||
* When toggling the key logging on or off, the LEDs will do a little dance.
|
||||
|
|
|
|||
Loading…
Reference in a new issue