From 4e1c5cf85ecdd86fbdb32dd6baf75a72aafa8838 Mon Sep 17 00:00:00 2001 From: oco9oco Date: Thu, 28 Aug 2025 11:04:21 +0900 Subject: [PATCH] sft_caps code fix --- .../charybdis/4x6/keymaps/oco9oco/config.h | 7 +- .../charybdis/4x6/keymaps/oco9oco/keymap.c | 101 ++++++------- .../charybdis/4x6/keymaps/oco9oco/readme.md | 107 ++++++++++++- users/oco9oco/oco9oco.c | 143 +++++++----------- 4 files changed, 209 insertions(+), 149 deletions(-) diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/config.h index 1e642cea..9ca44e02 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/config.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/config.h @@ -1,6 +1,6 @@ #define CHARYBDIS_CONFIG_SYNC -//#define POINTING_DEVICE_AUTO_MOUSE_ENABLE +#define POINTING_DEVICE_AUTO_MOUSE_ENABLE #ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE #define AUTO_MOUSE_DEFAULT_LAYER 10 #define AUTO_MOUSE_TIME 300 @@ -9,7 +9,10 @@ #define CHARYBDIS_DRAGSCROLL_REVERSE_Y #define TAPPING_TOGGLE 1 - +#ifdef POINTING_DEVICE_TASK_THROTTLE_MS + #undef POINTING_DEVICE_TASK_THROTTLE_MS + #define POINTING_DEVICE_TASK_THROTTLE_MS 3 +#endif #define CHARYBDIS_MINIMUM_DEFAULT_DPI 400 #define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 150 #define CHARYBDIS_MINIMUM_SNIPING_DPI 200 diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c index 4468a3c7..c139a931 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LGUI, KC_Z, KC_X, KC_C, KC_V, KC_B, __________________QWERTY_HOME_R3___________, KC_BSLS, // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ THUMB_L1,THUMB_L2, THUMB_L3, THUMB_R3,THUMB_R2, - KC_LALT, KC_LGUI, THUMB_R1 + TG(_ONEHAND), TG(_BASE_NOMOD), THUMB_R1 // ╰───────────────────────────╯ ╰──────────────────╯ ), @@ -71,48 +71,43 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ KC_ESC, KC_WH_L, KC_BTN2, KC_BTN3, KC_BTN1, KC_WH_R, __________________NUMROW_R_________________, KC_MINS, ALT_TAB, __________________QWERTY_L1________________, __________________QWERTY_R1________________, KC_EQL, - _______, __________________QWERTY_L2_SFTA___________, __________________QWERTY_R2________________, KC_QUOT, - _______, __________________QWERTY_L3________________, __________________QWERTY_HOME_R3___________, KC_PIPE, + _______, __________________QWERTY_SACS_L2___________, __________________QWERTY_R2________________, KC_QUOT, + _______, __________________QWERTY_L3________________, __________________QWERTY_HOME_R3___________, KC_BSLS, // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ THUMB_L1,THUMB_L2, THUMB_L3, THUMB_R3,THUMB_R2, - _______, TT(_ONEHAND), THUMB_R1 + _______, KC_TRNS, THUMB_R1 // ╰───────────────────────────╯ ╰──────────────────╯ ), [_IPC] = LAYOUT_charybdis_wrapper( // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ - ALT_F4, C(KC_F1),XXXXXXX, SCRNSHOT,INV_DSP, TO(_ONEHAND), KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, XXXXXXX, _______, - ALT_TAB, INV_DSP, XXXXXXX, CLASS_A, XXXXXXX, XXXXXXX, KC_GRV, _________NUM_789_________, XXXXXXX, _______, - USR_LNG, IPC(A), IPC(S), IPC_D_, IPC(F), KC_DOT, AT_IPC, _________NUM_456_________, KC_COLN, KC_DQUO, - KC_LGUI, IPC(Z), HWP_CITE, IPC(C), KC_EQL, KC_ENT, HWP_MACRO, _________NUM_123_________, _______, _______, + ALT_F4, C(KC_F1),XXXXXXX, SCRNSHOT,INV_DSP, TO(_ONEHAND), XXXXXXX, KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, _______, + ALT_TAB, XXXXXXX, IME_CHG, CLASS_A, XXXXXXX, XXXXXXX, KC_GRV, _________NUM_789_________, XXXXXXX, _______, + _______, IPC(A), IPC(S), IPC_D_, IPC(F), KC_DOT, AT_IPC, _________NUM_456_________, KC_COLN, KC_DQUO, + _______, IPC(Z), HWP_CITE, IPC(C), KC_EQL, KC_ENT, HWP_MACRO, _________NUM_123_________, _______, KC_PIPE, // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ - TO(_DOOM), _______, _______,/* */_______, LT(_NAV, KC_0), - XXXXXXX, _______,/* */IME_CHG + _______, KC_TRNS, _______,/* */_______, LT(_NAV, KC_0), + XXXXXXX, TO(_DOOM),/* */IME_CHG // ╰───────────────────────────╯ ╰──────────────────╯ ), [_DOOM] = LAYOUT_charybdis_wrapper( -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - KC_ESC, __________________NUMROW_L_________________, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, - KC_TAB, KC_T, KC_Q, KC_W, KC_E, KC_R, TO(_BASE),DPI_MOD,DPI_RMOD,XXXXXXX,XXXXXXX, XXXXXXX, - KC_Y, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_WH_L, KC_WH_U,KC_BTN4,KC_BTN5,XXXXXXX, DPI_MOD, - KC_U, KC_B, KC_Z, KC_X, KC_C, KC_V, KC_WH_R,KC_WH_D,KC_BTN1,KC_BTN2,KC_BTN3, DPI_RMOD, - KC_F, KC_SPC, KC_G, KC_ENT, THUMB_R3, - KC_I, TO(_BASE), THUMB_R2 +// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| + KC_ESC, KC_5, KC_1, KC_2, KC_3, KC_4, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX, // + KC_TAB, KC_T, KC_Q, KC_W, KC_E, KC_R, KC_Y, KC_U, KC_I, KC_O, KC_P, XXXXXXX, // + KC_LCTL, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_H, KC_BTN3, KC_WH_U, KC_L, KC_SCLN, DPI_MOD, // + KC_P, KC_B, KC_Z, KC_X, KC_C, KC_V, KC_N, KC_WH_D, KC_BTN1, KC_BTN2, KC_SLSH, DPI_RMOD,// +// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ + KC_Y, KC_SPC, KC_U, KC_ENT, THUMB_R3,// TRACK // + KC_I, KC_O, TO(_BASE) // BALL // ), -// [_NUM] = LAYOUT_charybdis_wrapper( -// // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ -// XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, -// XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_7, KC_8, KC_9, XXXXXXX, XXXXXXX, -// XXXXXXX, XXXXXXX, KC_BTN2, NUM(D), KC_BTN1, XXXXXXX, XXXXXXX, KC_4, KC_5, KC_6, XXXXXXX, XXXXXXX, -// XXXXXXX, XXXXXXX, HWP_CITE,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_1, KC_2, KC_3, XXXXXXX, XXXXXXX, -// // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ -// _______, _______, _______,/* */_______, LT(_NUM, KC_0), -// _______, _______,/* */IME_CHG -// // ╰───────────────────────────╯ ╰──────────────────╯ -// ), + + + + + [_NAV] = LAYOUT_charybdis_wrapper( // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ _______, CTRL_F1, KC_F2, KC_F3, ALT_F4, KC_F5, XXXXXXX, A(KC_7), A(KC_5), A(KC_9), A(KC_0), XXXXXXX, @@ -139,7 +134,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_FUNC] = LAYOUT_charybdis_wrapper( // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ _______, AS_OFF, AS_TOGG, AS_DOWN, AS_UP, AS_RPT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, - XXXXXXX, XXXXXXX, XXXXXXX, DT_DOWN, DT_UP, DT_PRNT, KC_F12, KC_F7, KC_F8, KC_F9, XXXXXXX, XXXXXXX, + XXXXXXX, TO(_BASE_NOMOD), TO(_ONEHAND), DT_DOWN, DT_UP, DT_PRNT, KC_F12, KC_F7, KC_F8, KC_F9, XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_F11, KC_F4, KC_F5, KC_F6, XXXXXXX, XXXXXXX, XXXXXXX, C(KC_Z), C(KC_X), C(KC_C), C(KC_V), C(KC_B), KC_F10, KC_F1, KC_F2, KC_F3, XXXXXXX, XXXXXXX, // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ @@ -150,26 +145,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ONEHAND] = LAYOUT_charybdis_wrapper( // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ - _______, CTRL_F1, C(KC_W), XXXXXXX, ALT_F4, KC_F5, S_D_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, - XXXXXXX, _______, _______, DRGSCRL, A(KC_S), KC_F6, S_D_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_MAKE, - ALT_TAB, KC_LSFT, LT(_ONEHAND,KC_BTN2), SNIPING, KC_BTN1, KC_F7, DPI_MOD, KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_ENT, C(KC_Z), C(KC_X), C(KC_C), C(KC_V), C(KC_B), DPI_RMOD, A(KC_S), KC_BTN1, KC_BTN2, SNIPING, XXXXXXX, + _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F5, S_D_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, + KC_TAB, XXXXXXX, XXXXXXX, SNIPING, XXXXXXX, KC_F6, S_D_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_MAKE, + ALT_TAB, KC_LSFT, KC_BTN2, DRGSCRL, KC_BTN1, KC_F7, DPI_MOD, KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_ENT, C(KC_Z), C(KC_X), C(KC_C), C(KC_V), C(KC_B), DPI_RMOD, XXXXXXX, KC_BTN1, KC_BTN2, SNIPING, XXXXXXX, // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ _______, _______, _______,/* */_______, _______, - C(KC_TAB), _______,/* */TO(_BASE) + KC_TRNS, _______,/* */TO(_BASE) // ╰───────────────────────────╯ ╰──────────────────╯ ), }; -#ifdef CHORDAL_HOLD -const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM = - LAYOUT( - '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', - '*', '*', 'R', 'R', 'R', 'R', 'L', 'L', 'L', 'L', 'R', '*', - '*', 'L', '*', '*', 'L', '*', 'L', 'L', 'L', 'L', '*', '*', - '*', '*', '*', '*', '*', '*', 'L', 'L', '*', '*', '*', '*', - '*', '*', '*', '*', '*', - '*', '*', '*' - ); +// #ifdef CHORDAL_HOLD +// const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM = +// LAYOUT( +// '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', '*', +// '*', '*', 'R', 'R', 'R', 'R', 'L', 'L', 'L', 'L', 'R', '*', +// '*', 'L', '*', '*', 'L', '*', 'L', 'L', 'L', 'L', '*', '*', +// '*', '*', '*', '*', '*', '*', 'L', 'L', '*', '*', '*', '*', +// '*', '*', '*', '*', '*', +// '*', '*', '*' +// ); // char chordal_hold_handedness(keypos_t key) { // if (key.col == 0 || key.col == MATRIX_COLS - 1) { @@ -179,7 +174,7 @@ const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM = // // left, and the other half are on the right. // return key.row < MATRIX_ROWS / 2 ? 'L' : 'R'; // } -#endif +// #endif #ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE @@ -196,6 +191,7 @@ const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM = case _IPC: case _FUNC: case _BASE_NOMOD: + case _DOOM: // 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); @@ -211,11 +207,15 @@ const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM = bool now_on = layer_state_cmp(state, _ONEHAND); if (now_on && !mouse_layer_on) { // 마우스 레이어 진입 시 - tap_code(KC_F13); // 예: 음소거 키 입력 + register_code(KC_LCTL); + tap_code(KC_F9); + unregister_code(KC_LCTL); } else if (!now_on && mouse_layer_on) { // 마우스 레이어 탈출 시 - tap_code(KC_F13); + register_code(KC_LCTL); + tap_code(KC_F9); + unregister_code(KC_LCTL); } mouse_layer_on = now_on; return state; @@ -223,18 +223,11 @@ const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM = bool is_mouse_record_kb(uint16_t keycode, keyrecord_t* record) { switch(keycode) { - case KC_BTN1: - case KC_BTN2: - case KC_BTN3: case DRGSCRL: - case DRG_TOG: case SNIPING: case ALT_TAB: case KC_LCTL: case KC_LSFT: - case KC_F5: - case KC_F6: - case KC_F7: return true; default: return false; diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/readme.md b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/readme.md index 23a85e54..978d6a3c 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/readme.md +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/readme.md @@ -1,7 +1,106 @@ -# Charybdis (4x6) default keymap -> :bulb: Have a look at the [`via` keymap](../via) for a more feature-rich layout. +[_BASE] = LAYOUT_charybdis_wrapper( +// ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ + KC_ESC, KC_WH_L, KC_BTN2, KC_BTN3, KC_BTN1, KC_WH_R, __________________NUMROW_R_________________, KC_MINS, + KC_TAB, __________________QWERTY_L1________________, __________________QWERTY_R1________________, KC_EQL, + SFT_CAPS, __________________QWERTY_SACS_L2___________, __________________QWERTY_R2________________, KC_QUOT, + KC_LGUI, KC_Z, KC_X, KC_C, KC_V, KC_B, __________________QWERTY_HOME_R3___________, KC_BSLS, +// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ + THUMB_L1,THUMB_L2, THUMB_L3, THUMB_R3,THUMB_R2, + KC_LALT, TG(_BASE_NOMOD), THUMB_R1 +// ╰───────────────────────────╯ ╰──────────────────╯ +), -The Charydbis (4x6) default keymap is inspired from the original [Dactyl Manuform](../../../../../handwired/dactyl_manuform) default keymap. +[_BASE_NOMOD] = LAYOUT_charybdis_wrapper( +// ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ + KC_ESC, KC_WH_L, KC_BTN2, KC_BTN3, KC_BTN1, KC_WH_R, __________________NUMROW_R_________________, KC_MINS, + ALT_TAB, __________________QWERTY_L1________________, __________________QWERTY_R1________________, KC_EQL, + _______, __________________QWERTY_L2_SFTA___________, __________________QWERTY_R2________________, KC_QUOT, + _______, __________________QWERTY_L3________________, __________________QWERTY_HOME_R3___________, KC_BSLS, +// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ + THUMB_L1,THUMB_L2, THUMB_L3, THUMB_R3,THUMB_R2, + _______, _______, THUMB_R1 +// ╰───────────────────────────╯ ╰──────────────────╯ +), -This layout supports RGB matrix. However, due to space constraints on the MCU, only a limited number of effect can be enabled at once. Look at the `config.h` file and enable your favorite effect. + +[_IPC] = LAYOUT_charybdis_wrapper( +// ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ + ALT_F4, C(KC_F1),XXXXXXX, SCRNSHOT,INV_DSP, TO(_ONEHAND), XXXXXXX, KC_LBRC, KC_RBRC, KC_LPRN, KC_RPRN, _______, + ALT_TAB, INV_DSP, XXXXXXX, CLASS_A, XXXXXXX, XXXXXXX, KC_GRV, _________NUM_789_________, XXXXXXX, _______, + USR_LNG, IPC(A), IPC(S), IPC_D_, IPC(F), KC_DOT, AT_IPC, _________NUM_456_________, KC_COLN, KC_DQUO, + KC_LGUI, IPC(Z), HWP_CITE, IPC(C), KC_EQL, KC_ENT, HWP_MACRO, _________NUM_123_________, _______, KC_PIPE, +// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ + TO(_DOOM), _______, _______,/* */_______, LT(_NAV, KC_0), + XXXXXXX, _______,/* */IME_CHG +// ╰───────────────────────────╯ ╰──────────────────╯ +), + + [_DOOM] = LAYOUT_charybdis_wrapper( +// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| + KC_ESC, __________________NUMROW_L_________________, XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, XXXXXXX, + KC_TAB, KC_T, KC_Q, KC_W, KC_E, KC_R, TO(_BASE),DPI_MOD,DPI_RMOD,XXXXXXX,XXXXXXX, XXXXXXX, + KC_Y, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_WH_L, KC_WH_U,KC_BTN4,KC_BTN5,XXXXXXX, DPI_MOD, + KC_U, KC_B, KC_Z, KC_X, KC_C, KC_V, KC_WH_R,KC_WH_D,KC_BTN1,KC_BTN2,KC_BTN3, DPI_RMOD, + KC_F, KC_SPC, KC_G, KC_ENT, THUMB_R3, + KC_I, TO(_BASE), THUMB_R2 +), + +// [_NUM] = LAYOUT_charybdis_wrapper( +// // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ +// XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +// XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_7, KC_8, KC_9, XXXXXXX, XXXXXXX, +// XXXXXXX, XXXXXXX, KC_BTN2, NUM(D), KC_BTN1, XXXXXXX, XXXXXXX, KC_4, KC_5, KC_6, XXXXXXX, XXXXXXX, +// XXXXXXX, XXXXXXX, HWP_CITE,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_1, KC_2, KC_3, XXXXXXX, XXXXXXX, +// // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ +// _______, _______, _______,/* */_______, LT(_NUM, KC_0), +// _______, _______,/* */IME_CHG +// // ╰───────────────────────────╯ ╰──────────────────╯ +// ), +[_NAV] = LAYOUT_charybdis_wrapper( +// ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ + _______, CTRL_F1, KC_F2, KC_F3, ALT_F4, KC_F5, XXXXXXX, A(KC_7), A(KC_5), A(KC_9), A(KC_0), XXXXXXX, + ALT_TAB, NAV_NS,LCA(KC_J),LCA(KC_K),LCA(KC_L), KC_F6, S(A(KC_3)), A(KC_4), A(KC_8), A(KC_6), XXXXXXX, XXXXXXX, + KC_LGUI, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, KC_F7, KC_INS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, DPI_MOD, + G(C(KC_D)), NAV(Z), C(KC_X), C(KC_C), C(KC_V), C(KC_B), KC_APP, KC_HOME, KC_PGDN, KC_PGUP, KC_END, DPI_RMOD, +// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ + USR_LNG, KC_BSPC, KC_DEL,/* */_______, _______, + _______, _______,/* */_______ +// ╰───────────────────────────╯ ╰──────────────────╯ +), +[_MOUSE] = LAYOUT_charybdis_wrapper( +// ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ + _______, CTRL_F1, KC_F2, KC_F3, ALT_F4, KC_F5, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, + KC_U, KC_BTN4, KC_WH_D, KC_MS_U, KC_WH_U, KC_F6, XXXXXXX, KC_WH_L, KC_WH_R, XXXXXXX, XXXXXXX, QK_MAKE, + KC_P, KC_LSFT, KC_MS_L, KC_MS_D, KC_MS_R, KC_F7, XXXXXXX, KC_ACL0, KC_BTN1, KC_BTN2, KC_BTN3, KC_ENT, + KC_X, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, C(KC_B), KC_APP, KC_ACL0, KC_BTN4, KC_BTN5, XXXXXXX, XXXXXXX, +// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ + _______, KC_BSPC, KC_DEL,/* */_______, _______, + _______, _______,/* */_______ +// ╰───────────────────────────╯ ╰──────────────────╯ +), + +[_FUNC] = LAYOUT_charybdis_wrapper( +// ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ + _______, AS_OFF, AS_TOGG, AS_DOWN, AS_UP, AS_RPT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, + XXXXXXX, TO(_BASE_NOMOD), TO(_ONEHAND), DT_DOWN, DT_UP, DT_PRNT, KC_F12, KC_F7, KC_F8, KC_F9, XXXXXXX, XXXXXXX, + XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_F11, KC_F4, KC_F5, KC_F6, XXXXXXX, XXXXXXX, + XXXXXXX, C(KC_Z), C(KC_X), C(KC_C), C(KC_V), C(KC_B), KC_F10, KC_F1, KC_F2, KC_F3, XXXXXXX, XXXXXXX, +// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ + _______, _______, _______,/* */_______, _______, + _______, _______,/* */_______ +// ╰───────────────────────────╯ ╰──────────────────╯ +), + +[_ONEHAND] = LAYOUT_charybdis_wrapper( +// ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ + _______, CTRL_F1, C(KC_W), XXXXXXX, ALT_F4, KC_F5, S_D_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, + XXXXXXX, _______, _______, DRGSCRL, A(KC_S), KC_F6, S_D_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_MAKE, + ALT_TAB, KC_LSFT, LT(_ONEHAND,KC_BTN2), SNIPING, KC_BTN1, KC_F7, DPI_MOD, KC_ENT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_ENT, C(KC_Z), C(KC_X), C(KC_C), C(KC_V), C(KC_B), DPI_RMOD, A(KC_S), KC_BTN1, KC_BTN2, SNIPING, XXXXXXX, +// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ + _______, _______, _______,/* */_______, _______, + C(KC_TAB), _______,/* */TO(_BASE) +// ╰───────────────────────────╯ ╰──────────────────╯ +), +}; diff --git a/users/oco9oco/oco9oco.c b/users/oco9oco/oco9oco.c index 28fc5ba9..6cd45a6b 100644 --- a/users/oco9oco/oco9oco.c +++ b/users/oco9oco/oco9oco.c @@ -21,12 +21,6 @@ void appcmd(uint16_t keycode) { tap_code(keycode); } -/* - 오토쉬프트 on qwertp -*/ - - - bool get_custom_auto_shifted_key(uint16_t keycode, keyrecord_t *record) { switch(keycode) { case KC_Q: @@ -41,52 +35,9 @@ bool get_custom_auto_shifted_key(uint16_t keycode, keyrecord_t *record) { } } - - - - - // process_record_user bool process_record_user(uint16_t keycode, keyrecord_t *record) { -//GETREUR - // if (record->event.pressed) { -// static deferred_token token = INVALID_DEFERRED_TOKEN; -// static report_mouse_t report = {0}; -// if (token) { -// // If jiggler is currently running, stop when any key is pressed. -// cancel_deferred_exec(token); -// token = INVALID_DEFERRED_TOKEN; -// report = (report_mouse_t){}; // Clear the mouse. -// host_mouse_send(&report); -// } else if (keycode == JIGGLE) { - -// uint32_t jiggler_callback(uint32_t trigger_time, void* cb_arg) { -// // Deltas to move in a circle of radius 20 pixels over 32 frames. -// static const int8_t deltas[32] = { -// 0, -1, -2, -2, -3, -3, -4, -4, -4, -4, -3, -3, -2, -2, -1, 0, -// 0, 1, 2, 2, 3, 3, 4, 4, 4, 4, 3, 3, 2, 2, 1, 0}; -// static uint8_t phase = 0; -// // Get x delta from table and y delta by rotating a quarter cycle. -// report.x = deltas[phase]; -// report.y = deltas[(phase + 8) & 31]; -// phase = (phase + 1) & 31; -// host_mouse_send(&report); -// return 16; // Call the callback every 16 ms. -// } - -// token = defer_exec(1, jiggler_callback, NULL); // Schedule callback. -// } -// } - - - - - - - - - switch (keycode) { case THUMB_L2: case THUMB_L3: @@ -169,44 +120,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { cite_done = false; } break; -// -#ifdef CHARYBDIS_CONFIG_SYNC - case DRG_TOG: - if (__PRESSED__) { - register_code(KC_F15); - } else { - unregister_code(KC_F15); - } - return true; - break; -#endif - - - // appcmd function - case JOINTBL: - if (__PRESSED__) { - appcmd(KC_J); - } - break; - - case PDF_HL: - if (__PRESSED__) { - appcmd(KC_H); - } - break; - -#ifdef RGBLIGHT_ENABLE - case TO_NOMOD: - if (__PRESSED__) { - rgblight_setrgb(0, 0, 50); - } - return true; - case TO_BASE: - if (__PRESSED__) { - rgblight_setrgb(RGB_OFF); - } - return true; -#endif // 괄호 커서이동 기능 case KC_COMM: if (__PRESSED__ /* && (brkt_pressed||prns_pressed)*/) { @@ -266,7 +179,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { unregister_code(KC_LALT); } - break; + break; case HWP_CITE: // prns 안에서는 cite_done = false // comma 누르면 cite_done = true @@ -447,6 +360,58 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { break; case SFT_CAPS: + if (__TAPPED__ && __PRESSED__) { + tap_code(KC_LNG1); + } else if (__PRESSED__) { + tap_code(KC_CAPS); + } else { + // DO NOTHING ON RELEASE + } + return false; + break; + + + + + +#ifdef CHARYBDIS_CONFIG_SYNC + case DRG_TOG: + if (__PRESSED__) { + register_code(KC_F15); + } else { + unregister_code(KC_F15); + } + return true; + break; +#endif + + + // appcmd function + case JOINTBL: + if (__PRESSED__) { + appcmd(KC_J); + } + break; + + case PDF_HL: + if (__PRESSED__) { + appcmd(KC_H); + } + break; + +#ifdef RGBLIGHT_ENABLE + case TO_NOMOD: + if (__PRESSED__) { + rgblight_setrgb(0, 0, 50); + } + return true; + case TO_BASE: + if (__PRESSED__) { + rgblight_setrgb(RGB_OFF); + } + return true; +#endif + if (__TAPPED__ && __PRESSED__) { tap_code(KC_CAPS); } else if (__PRESSED__) { @@ -594,7 +559,7 @@ bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { case THUMB_L3: case THUMB_R1: case THUMB_R3: - case SFT_CAPS: + // case SFT_CAPS: // case THUMB_R2: // case SFTT_A: // case SFTT_F: