Refactor keymap layout and update IPC layer handling

This commit is contained in:
oco9oco 2025-05-07 14:59:24 +09:00
commit 7f4aaf47b1
2 changed files with 6 additions and 5 deletions

View file

@ -99,11 +99,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
XXXXXXX, CTRL_F1, KC_F2, KC_F3, ALT_F4, KC_F5, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, XXXXXXX, CTRL_F1, KC_F2, KC_F3, ALT_F4, KC_F5, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT,
XXXXXXX, XXXXXXX, KC_WH_D, XXXXXXX, KC_WH_U, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_MAKE, XXXXXXX, XXXXXXX, KC_WH_D, XXXXXXX, KC_WH_U, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_MAKE,
S_D_MOD, KC_LCTL, KC_BTN2, KC_LSFT, KC_BTN1, DPI_MOD, C(KC_TAB), KC_BTN1, KC_BTN2, KC_BTN3, XXXXXXX, XXXXXXX, S_D_MOD, KC_LCTL, KC_BTN2, KC_LSFT, KC_BTN1, DPI_MOD, C(KC_TAB), KC_BTN3, KC_BTN1, KC_BTN2, DRGSCRL, XXXXXXX,
S_D_RMOD,KC_BTN3, KC_X, KC_C, KC_V, DPI_RMOD, C(KC_W), KC_BTN4, KC_BTN5, DRGSCRL, SNIPING, XXXXXXX, S_D_RMOD,KC_BTN3, KC_X, KC_C, KC_V, DPI_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, SNIPING, XXXXXXX,
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
KC_LCTL, DRGSCRL, SNIPING,/* */THUMB_R3,THUMB_R2, KC_LCTL, _______, DRGSCRL,/* */THUMB_R3,THUMB_R2,
_______, _______,/* */TO(_BASE) _______, SNIPING,/* */TO(_BASE)
// ╰───────────────────────────╯ ╰──────────────────╯ // ╰───────────────────────────╯ ╰──────────────────╯
), ),
}; };
@ -118,6 +118,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
switch(get_highest_layer(remove_auto_mouse_layer(state, true))) { switch(get_highest_layer(remove_auto_mouse_layer(state, true))) {
case _MOUSE: case _MOUSE:
case _NAV: case _NAV:
case _IPC:
// remove_auto_mouse_target must be called to adjust state *before* setting enable // remove_auto_mouse_target must be called to adjust state *before* setting enable
state = remove_auto_mouse_layer(state, false); state = remove_auto_mouse_layer(state, false);
set_auto_mouse_enable(false); set_auto_mouse_enable(false);

View file

@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define ONEHAND_COLOR HSV_PINK #define ONEHAND_COLOR HSV_PINK
#define SETTINGS_COLOR HSV_GOLD #define SETTINGS_COLOR HSV_GOLD
// checking track
// MOD-TAP ALIASES // MOD-TAP ALIASES
#define GUIT_A LGUI_T(KC_A) #define GUIT_A LGUI_T(KC_A)
#define SFTT_A LSFT_T(KC_A) #define SFTT_A LSFT_T(KC_A)