fix layered homerow mods

This commit is contained in:
Lucas Jensen
2025-04-05 11:29:02 -07:00
parent 50ab5fbd2f
commit f121bbd2af
2 changed files with 841 additions and 35 deletions

807
compile_commands.json Normal file

File diff suppressed because one or more lines are too long

View File

@@ -27,16 +27,15 @@ enum ferris_sweep_layers {
LAYER_FUNCTION, LAYER_FUNCTION,
LAYER_NAVIGATION, LAYER_NAVIGATION,
LAYER_NUMERAL, LAYER_NUMERAL,
LAYER_MEDIA, LAYER_SYMBOLS,
LAYER_SYMBOLS LAYER_MEDIA
}; };
#define SPC_NAV LT(LAYER_NAVIGATION, KC_SPC) #define SPC_SYM LT(LAYER_SYMBOLS, KC_SPC)
#define TAB_FUN LT(LAYER_FUNCTION, KC_TAB) #define BSP_NAV LT(LAYER_NAVIGATION, KC_BSPC)
#define BSP_NUM LT(LAYER_NUMERAL, KC_BSPC) #define ENT_FUN LT(LAYER_FUNCTION, KC_ENT)
// #define M_SYM LT(LAYER_SYMBOLS, KC_M) #define TAB_NUM LT(LAYER_NUMERAL, KC_TAB)
#define ENT_MED LT(LAYER_MEDIA, KC_ENT) #define MO_MED MO(LAYER_MEDIA)
#define MO_SYM MO(LAYER_SYMBOLS)
/** Homerow mods for base layer. */ /** Homerow mods for base layer. */
#define HR_A LGUI_T(KC_A) #define HR_A LGUI_T(KC_A)
@@ -46,7 +45,7 @@ enum ferris_sweep_layers {
#define HR_J LSFT_T(KC_J) #define HR_J LSFT_T(KC_J)
#define HR_K LCTL_T(KC_K) #define HR_K LCTL_T(KC_K)
#define HR_L LALT_T(KC_L) #define HR_L LALT_T(KC_L)
#define HR_QU RGUI_T(KC_QUOT) #define HR_QU LGUI_T(KC_QUOT)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[LAYER_BASE] = LAYOUT_split_3x5_2( [LAYER_BASE] = LAYOUT_split_3x5_2(
@@ -56,21 +55,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
HR_A, HR_S, HR_D, HR_F, KC_G, KC_H, HR_J, HR_K, HR_L, HR_QU, HR_A, HR_S, HR_D, HR_F, KC_G, KC_H, HR_J, HR_K, HR_L, HR_QU,
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
TAB_FUN, SPC_NAV, BSP_NUM, ENT_MED TAB_NUM, BSP_NAV, SPC_SYM, ENT_FUN
//`--------------------------' `--------------------------' //`--------------------------' `--------------------------'
), ),
[LAYER_FUNCTION] = LAYOUT_split_3x5_2( [LAYER_FUNCTION] = LAYOUT_split_3x5_2(
//,--------------------------------------------. ,--------------------------------------------. //,--------------------------------------------. ,--------------------------------------------.
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR, KC_F7, KC_F8, KC_F9, KC_F12, KC_ESC, KC_F7, KC_F8, KC_F9, KC_F12, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
KC_LGUI, KC_LALT, KC_LSFT, KC_LCTL, XXXXXXX, KC_SCRL, KC_F4, KC_F5, KC_F6, KC_F11, KC_SCRL, KC_F4, KC_F5, KC_F6, KC_F11, XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PAUS, KC_F1, KC_F2, KC_F3, KC_F10, KC_PAUS, KC_F1, KC_F2, KC_F3, KC_F10, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
_______, XXXXXXX, KC_BSPC, KC_ENT KC_TAB, KC_BSPC, MO_MED, _______
//`--------------------------' `--------------------------' //`--------------------------' `--------------------------'
), ),
[LAYER_NAVIGATION] = LAYOUT_split_3x5_2( [LAYER_NAVIGATION] = LAYOUT_split_3x5_2(
@@ -81,31 +80,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_HOME, KC_PGDN, KC_PGUP, KC_END,
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
XXXXXXX, _______, KC_BSPC, KC_ENT XXXXXXX, _______, KC_SPC, KC_ENT
//`--------------------------' `--------------------------' //`--------------------------' `--------------------------'
), ),
[LAYER_NUMERAL] = LAYOUT_split_3x5_2( [LAYER_NUMERAL] = LAYOUT_split_3x5_2(
//,--------------------------------------------. ,--------------------------------------------. //,--------------------------------------------. ,--------------------------------------------.
KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC,
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
KC_SCLN, KC_4, KC_5, KC_6, KC_EQL, XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_SCLN, KC_4, KC_5, KC_6, KC_EQL,
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
KC_GRV, KC_1, KC_2, KC_3, KC_BSLS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_GRV, KC_1, KC_2, KC_3, KC_BSLS,
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
KC_TAB, KC_SPC, _______, MO_SYM _______, XXXXXXX, KC_0, KC_MINS
//`--------------------------' `--------------------------'
),
[LAYER_MEDIA] = LAYOUT_split_3x5_2(
//,--------------------------------------------. ,--------------------------------------------.
KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT,
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
KC_TAB, KC_SPC, MO_SYM, _______
//`--------------------------' `--------------------------' //`--------------------------' `--------------------------'
), ),
@@ -117,7 +104,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_PIPE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_PIPE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
KC_TAB, KC_SPC, _______, _______ KC_TAB, KC_BSPC, _______, MO_MED
//`--------------------------' `--------------------------'
),
[LAYER_MEDIA] = LAYOUT_split_3x5_2(
//,--------------------------------------------. ,--------------------------------------------.
KC_ESC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT,
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
XXXXXXX, XXXXXXX, XXXXXXX, EE_CLR, QK_BOOT, QK_BOOT, EE_CLR, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------|
KC_TAB, KC_BSPC, _______, _______
//`--------------------------' `--------------------------' //`--------------------------' `--------------------------'
) )
}; };