Merge remote-tracking branch 'origin/master' into develop
commit
a74fbc2f04
|
@ -18,7 +18,6 @@
|
|||
enum layers{
|
||||
_BASE,
|
||||
_NUM,
|
||||
_NAV,
|
||||
_FN
|
||||
};
|
||||
|
||||
|
@ -36,9 +35,9 @@ enum combo_events {
|
|||
const uint16_t PROGMEM esc_combo[] = {KC_Q, KC_W, COMBO_END};
|
||||
const uint16_t PROGMEM bspc_combo[] = {KC_O, KC_P, COMBO_END};
|
||||
const uint16_t PROGMEM tab_combo[] = {KC_A, KC_S, COMBO_END};
|
||||
const uint16_t PROGMEM del_combo[] = {KC_Q, KC_P, COMBO_END};
|
||||
const uint16_t PROGMEM del_combo[] = {KC_I, KC_O, COMBO_END};
|
||||
const uint16_t PROGMEM enter_combo[] = {KC_L, KC_SCLN, COMBO_END};
|
||||
const uint16_t PROGMEM quot_combo[] = {KC_P, KC_SCLN, COMBO_END};
|
||||
const uint16_t PROGMEM quot_combo[] = {KC_K, KC_L, COMBO_END};
|
||||
const uint16_t PROGMEM lprn_combo[] = {KC_X, KC_C, COMBO_END};
|
||||
const uint16_t PROGMEM rprn_combo[] = {KC_COMM, KC_DOT, COMBO_END};
|
||||
|
||||
|
@ -55,7 +54,6 @@ combo_t key_combos[COMBO_COUNT] = {
|
|||
};
|
||||
|
||||
#define NUM MO(_NUM)
|
||||
#define NAV MO(_NAV)
|
||||
#define FN MO(_FN)
|
||||
#define xxx KC_TRNS
|
||||
|
||||
|
@ -64,22 +62,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
|
||||
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
|
||||
LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
|
||||
KC_LCTL, KC_LALT, NUM, KC_SPC, NAV, FN
|
||||
KC_LALT, KC_LCTL, NUM, KC_SPC, KC_RGUI, FN
|
||||
),
|
||||
|
||||
|
||||
[_NUM] = LAYOUT(
|
||||
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
|
||||
KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,
|
||||
KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_HOME, KC_END, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
|
||||
KC_PGUP, KC_PGDN, xxx, xxx, KC_PGUP, KC_PGDN
|
||||
),
|
||||
|
||||
[_NAV] = LAYOUT(
|
||||
xxx, KC_UP, xxx, xxx, xxx, xxx, xxx, xxx, KC_UP, xxx,
|
||||
KC_LEFT, KC_DOWN, KC_RGHT, xxx, xxx, xxx, xxx, KC_LEFT, KC_DOWN, KC_RGHT,
|
||||
xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx,
|
||||
xxx, xxx, xxx, xxx, xxx, xxx
|
||||
KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_HOME, KC_END, KC_PIPE, KC_BSLS, KC_DQUO, KC_QUOT,
|
||||
xxx, xxx, xxx, xxx, KC_PGUP, KC_PGDN
|
||||
),
|
||||
|
||||
[_FN] = LAYOUT(
|
||||
|
|
Loading…
Reference in New Issue