From 7f4aaf47b1c5f109ede222cd4176e7174a16155d Mon Sep 17 00:00:00 2001 From: oco9oco Date: Wed, 7 May 2025 14:59:24 +0900 Subject: [PATCH] Refactor keymap layout and update IPC layer handling --- .../bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c | 9 +++++---- users/oco9oco/oco9oco.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c index b33e56e3..b1fa9268 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c @@ -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, 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_RMOD,KC_BTN3, KC_X, KC_C, KC_V, DPI_RMOD, C(KC_W), KC_BTN4, KC_BTN5, DRGSCRL, SNIPING, 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, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, SNIPING, XXXXXXX, // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ - KC_LCTL, DRGSCRL, SNIPING,/* */THUMB_R3,THUMB_R2, - _______, _______,/* */TO(_BASE) + KC_LCTL, _______, DRGSCRL,/* */THUMB_R3,THUMB_R2, + _______, 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))) { case _MOUSE: case _NAV: + case _IPC: // remove_auto_mouse_target must be called to adjust state *before* setting enable state = remove_auto_mouse_layer(state, false); set_auto_mouse_enable(false); diff --git a/users/oco9oco/oco9oco.h b/users/oco9oco/oco9oco.h index 9bdeaa99..afd602ab 100644 --- a/users/oco9oco/oco9oco.h +++ b/users/oco9oco/oco9oco.h @@ -25,7 +25,7 @@ along with this program. If not, see . #define ONEHAND_COLOR HSV_PINK #define SETTINGS_COLOR HSV_GOLD - +// checking track // MOD-TAP ALIASES #define GUIT_A LGUI_T(KC_A) #define SFTT_A LSFT_T(KC_A)