From 4ae0127692e7f4ff638504de11a5cb40b855c0a1 Mon Sep 17 00:00:00 2001 From: oco9oco Date: Thu, 19 Feb 2026 17:15:46 +0900 Subject: [PATCH] IMPLEMENT ALT_T(KC_X) KEY --- .../charybdis/4x6/keymaps/oco9oco/config.h | 6 +- .../charybdis/4x6/keymaps/oco9oco/keymap.c | 17 +- .../keycapsss/kimiko/keymaps/oco9oco/config.h | 59 +---- .../kimiko/keymaps/oco9oco/info.json | 3 + .../keycapsss/kimiko/keymaps/oco9oco/keymap.c | 223 +++++++++--------- .../oco9oco/qmk_userspace.code-workspace | 11 + .../keycapsss/kimiko/keymaps/oco9oco/rules.mk | 4 +- users/oco9oco/config.h | 8 +- users/oco9oco/oco9oco.c | 3 + users/oco9oco/oco9oco.h | 13 +- users/oco9oco/rules.mk | 2 +- 11 files changed, 162 insertions(+), 187 deletions(-) create mode 100644 keyboards/keycapsss/kimiko/keymaps/oco9oco/info.json create mode 100644 keyboards/keycapsss/kimiko/keymaps/oco9oco/qmk_userspace.code-workspace diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/config.h index 7cf3cd73..b2261f19 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/config.h +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/config.h @@ -2,7 +2,7 @@ #define POINTING_DEVICE_AUTO_MOUSE_ENABLE #ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE #define AUTO_MOUSE_DEFAULT_LAYER 10 - #define AUTO_MOUSE_TIME 250 + #define AUTO_MOUSE_TIME 400 #define AUTO_MOUSE_DELAY 0 #endif #define CHARYBDIS_DRAGSCROLL_REVERSE_Y @@ -16,7 +16,7 @@ #define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 150 #define CHARYBDIS_MINIMUM_SNIPING_DPI 200 #define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100 -#define CHARYBDIS_DRAGSCROLL_DPI 200 +#define CHARYBDIS_DRAGSCROLL_DPI 150 #define CHARYBDIS_DRAGSCROLL_BUFFER_SIZE 3 #undef MASTER_LEFT @@ -27,4 +27,4 @@ #undef MASTER_RIGHT #define SPLIT_POINTING_ENABLE #define POINTING_DEVICE_RIGHT -#endif \ No newline at end of file +#endif diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c index f8bc3555..1cfd0290 100644 --- a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c +++ b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c @@ -17,12 +17,15 @@ along with this program. If not, see . #include "oco9oco.h" //look for users/oco9oco/ +//qmk compile -j 0 -kb bastardkb/charybdis/4x6/elitec -km oco9oco -e CONVERT_TO=rp2040_ce const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -//clang-format off -/* - [LAYER_BASE] = LAYOUT( + + //clang-format off + + /* + [LAYER_BASE] = LAYOUT( // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤ @@ -60,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, __________________NUMROW_R_________________, KC_MINS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, __________________QWERTY_R1________________, KC_EQL, SFT_CAPS, __________________QWERTY_SACS_L2___________, __________________QWERTY_R2________________, KC_QUOT, - G_LNG, KC_Z, KC_X, KC_C, KC_V, KC_B, __________________QWERTY_HOME_R3___________, KC_BSLS, + G_LNG, KC_Z, LALT_T(KC_X), KC_C, KC_V, KC_B, __________________QWERTY_HOME_R3___________, KC_BSLS, // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ THUMB_L1,THUMB_L2, THUMB_L3, THUMB_R3,THUMB_R2, TG(_BASE_NOMOD), KC_LNG1, THUMB_R1 @@ -72,7 +75,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, MS_WHLL, MS_BTN2, MS_BTN3, MS_BTN1, MS_WHLR, __________________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, + _______, KC_Z, LALT_T(KC_X), KC_C, KC_V, KC_B, __________________QWERTY_HOME_R3___________, KC_BSLS, // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ THUMB_L1,THUMB_L2, THUMB_L3, THUMB_R3,THUMB_R2, _______, KC_TRNS, THUMB_R1 @@ -99,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_H, MS_BTN3, MS_WHLU, KC_L, KC_SCLN, DPI_MOD, // KC_ENT, KC_B, KC_Z, KC_X, KC_C, KC_V, KC_N, MS_WHLD, MS_BTN1, MS_BTN2, KC_SLSH, DPI_RMOD,// // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ - KC_Y, KC_SPC, KC_F, KC_ENT, THUMB_R3,// TRACK // + KC_LALT, KC_SPC, KC_LCTL, KC_ENT, THUMB_R3,// TRACK // KC_I, KC_O, TO(_BASE) // BALL // ), @@ -211,7 +214,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { } else if (!now_on && mouse_layer_on) { // 마우스 레이어 탈출 시 - tap_code(KC_F14); + tap_code(KC_F15); } mouse_layer_on = now_on; return state; diff --git a/keyboards/keycapsss/kimiko/keymaps/oco9oco/config.h b/keyboards/keycapsss/kimiko/keymaps/oco9oco/config.h index 6393c235..44382926 100644 --- a/keyboards/keycapsss/kimiko/keymaps/oco9oco/config.h +++ b/keyboards/keycapsss/kimiko/keymaps/oco9oco/config.h @@ -15,64 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -// #undef RGBLIGHT_ANIMATIONS -// #undef RGBLIGHT_EFFECT_BREATHING -// #undef RGBLIGHT_EFFECT_RAINBOW_MOOD -// #undef RGBLIGHT_EFFECT_RAINBOW_SWIRL -// #undef RGBLIGHT_EFFECT_SNAKE -// #undef RGBLIGHT_EFFECT_KNIGHT -// #undef RGBLIGHT_EFFECT_CHRISTMAS -// #undef RGBLIGHT_EFFECT_STATIC_GRADIENT -// #undef RGBLIGHT_EFFECT_RGB_TEST -// #undef RGBLIGHT_EFFECT_ALTERNATING -// #undef RGBLIGHT_EFFECT_TWINKLE - -// #undef ENABLE_RGB_MATRIX_ALPHAS_MODS -// #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -// #undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -// #undef ENABLE_RGB_MATRIX_BREATHING -// #undef ENABLE_RGB_MATRIX_BAND_SAT -// #undef ENABLE_RGB_MATRIX_BAND_VAL -// #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -// #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -// #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -// #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -// #undef ENABLE_RGB_MATRIX_CYCLE_ALL -// #undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -// #undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -// #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -// #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN -// #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -// #undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -// #undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL -// #undef ENABLE_RGB_MATRIX_DUAL_BEACON -// #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON -// #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -// #undef ENABLE_RGB_MATRIX_RAINDROPS -// #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -// #undef ENABLE_RGB_MATRIX_HUE_BREATHING -// #undef ENABLE_RGB_MATRIX_HUE_PENDULUM -// #undef ENABLE_RGB_MATRIX_HUE_WAVE -// #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// #undef ENABLE_RGB_MATRIX_PIXEL_RAIN - -// #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP -// #undef ENABLE_RGB_MATRIX_DIGITAL_RAIN - -// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE -// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -// #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -// #undef ENABLE_RGB_MATRIX_SPLASH -// #undef ENABLE_RGB_MATRIX_MULTISPLASH -// #undef ENABLE_RGB_MATRIX_SOLID_SPLASH -// #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH - +#define MASTER_LEFT #ifdef RGBLIGHT_ENABLE # define RGBLIGHT_HUE_STEP 8 diff --git a/keyboards/keycapsss/kimiko/keymaps/oco9oco/info.json b/keyboards/keycapsss/kimiko/keymaps/oco9oco/info.json new file mode 100644 index 00000000..526b4e09 --- /dev/null +++ b/keyboards/keycapsss/kimiko/keymaps/oco9oco/info.json @@ -0,0 +1,3 @@ +{ + "development_board": "promicro" +} \ No newline at end of file diff --git a/keyboards/keycapsss/kimiko/keymaps/oco9oco/keymap.c b/keyboards/keycapsss/kimiko/keymaps/oco9oco/keymap.c index 6ca5e7b8..9987b624 100644 --- a/keyboards/keycapsss/kimiko/keymaps/oco9oco/keymap.c +++ b/keyboards/keycapsss/kimiko/keymaps/oco9oco/keymap.c @@ -16,136 +16,139 @@ along with this program. If not, see . */ #include "oco9oco.h" //look for users/oco9oco/ - +//qmk compile -j 0 -kb keycapsss/kimiko -km oco9oco const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //clang-format off -[_BASE] = LAYOUT_kimiko_wrapper( -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - KC_ESC, __________________NUMROW_L_________________, __________________NUMROW_R_________________, KC_MINS, - KC_TAB, __________________QWERTY_L1________________, __________________QWERTY_R1________________, KC_EQL, - SFT_CAPS,__________________QWERTY_SACS_L2___________, __________________QWERTY_R2________________, KC_QUOT, - KC_LSFT, __________________QWERTY_GUIZ_L3___________, TG(_BASE_NOMOD), KC_B, __________________QWERTY_HOME_R3___________, RSFT_T(KC_BSLS), -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - XXXXXXX, XXXXXXX, THUMB_L1,THUMB_L2,THUMB_L3, THUMB_R3,THUMB_R2,THUMB_R1,KC_LBRC, KC_RBRC +// [_BASE] = LAYOUT_kimiko_wrapper( +// // |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| +// KC_ESC, __________________NUMROW_L_________________, __________________NUMROW_R_________________, KC_MINS, +// KC_TAB, __________________QWERTY_L1________________, __________________QWERTY_R1________________, KC_EQL, +// SFT_CAPS,__________________QWERTY_SACS_L2___________, __________________QWERTY_R2________________, KC_QUOT, +// KC_LSFT, __________________QWERTY_GUIZ_L3___________, TG(_BASE_NOMOD), KC_B, __________________QWERTY_HOME_R3___________, RSFT_T(KC_BSLS), +// // |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| +// XXXXXXX, XXXXXXX, THUMB_L1,THUMB_L2,THUMB_L3, THUMB_R3,THUMB_R2,THUMB_R1,KC_LBRC, KC_RBRC +// ), + + [_BASE] = LAYOUT_kimiko_wrapper( +// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| + 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, MS_BTN3, MS_WHLU, KC_L, KC_SCLN, XXXXXXX, // + KC_ENT, KC_B, KC_Z, KC_X, KC_C, KC_V, TG(_FACT), XXXXXXX, KC_N, MS_WHLD, MS_BTN1, MS_BTN2, KC_SLSH, XXXXXXX,// +// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ + KC_I, KC_O, KC_LALT, KC_SPC, KC_LCTL, KC_ENT, THUMB_R3, TO(_BASE),XXXXXXX,XXXXXXX ), -[_BASE_NOMOD] = LAYOUT_kimiko_wrapper( -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - KC_ESC, __________________NUMROW_L_________________, __________________NUMROW_R_________________, _______, - KC_TAB, __________________QWERTY_L1________________, __________________QWERTY_R1________________, _______, - SFT_CAPS,__________________QWERTY_L2_SFTA___________, __________________QWERTY_R2________________, _______, - KC_LSFT, __________________QWERTY_L3________________, _______, KC_B, __________________QWERTY_HOME_R3___________, _______, -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - XXXXXXX, KC_LALT, THUMB_L1,THUMB_L2,THUMB_L3, _______, _______, _______, _______, _______ +[_FACTORIO] = LAYOUT_charybdis_wrapper( +// FACTORIO: Automation Focus +// |--------|--------|--------|--------|--------|--------|---|---|--------|--------|--------|--------|--------|--------| + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, // Quickbar 1~5 + KC_T, KC_G, KC_Q, KC_W, KC_E, KC_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, // Q:Pipette/Cancel, E:Inv, R:Rotate + KC_LCTL, KC_LSFT, KC_A, KC_S, KC_D, KC_F, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, // Shift:Ghost, F:Pick up + KC_TAB, KC_B, KC_Z, KC_X, KC_C, KC_V, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,// B:Blueprint, X:Switch bar, C:Shoot +// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ + KC_M, KC_ENT, KC_LCTL, KC_SPC, MO(_FACT_ALT), XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + // M:Map, ENT:Vehicle, ALT:Alt-mode, SPC:Shoot/Confirm ), -[_IPC] = LAYOUT_kimiko_wrapper( -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - _______, PDF_HL, KC_P, KC_X, ALT_F4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, - _______, HAEN_B, HAEN_C, CLASS_E, CLASS_A, KC_SLSH, KC_GRV, _________NUM_789_________, KC_RBRC, KC_PLUS, - _______, IPC(A), IPC(S), IPC_MIN, IPC_COMM,KC_DOT, XXXXXXX, _________NUM_456_________, KC_COLN, KC_DQUO, - _______, IPC(Z), HWP_CITE,IPC(C), KC_EQL, KC_BSLS, XXXXXXX, KC_LBRC, KC_RBRC, _________NUM_123_________, _______, KC_PIPE, -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - _______, _______, _______, _______, _______, _______, LT(_NAV, KC_0), _______, KC_LPRN, KC_RPRN +[_FACT_ALT] = LAYOUT_charybdis_wrapper( +// FACTORIO: Automation Focus +// |--------|--------|--------|--------|--------|--------|---|---|--------|--------|--------|--------|--------|--------| + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, // Quickbar 1~5 + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, // Q:Pipette/Cancel, E:Inv, R:Rotate + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_P, KC_H, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, // Shift:Ghost, F:Pick up + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,// B:Blueprint, X:Switch bar, C:Shoot +// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ + KC_M, KC_ENT, KC_LALT, KC_SPC, KC_LCTL, XXXXXXX,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + // M:Map, ENT:Vehicle, ALT:Alt-mode, SPC:Shoot/Confirm ), +// [_IPC] = LAYOUT_kimiko_wrapper( +// // |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| +// _______, PDF_HL, KC_P, KC_X, ALT_F4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, +// _______, HAEN_B, HAEN_C, CLASS_E, CLASS_A, KC_SLSH, KC_GRV, _________NUM_789_________, KC_RBRC, KC_PLUS, +// _______, IPC(A), IPC(S), _IPC_MIN, IPC_COMM,KC_DOT, XXXXXXX, _________NUM_456_________, KC_COLN, KC_DQUO, +// _______, IPC(Z), HWP_CITE,IPC(C), KC_EQL, KC_BSLS, XXXXXXX, KC_LBRC, KC_RBRC, _________NUM_123_________, _______, KC_PIPE, +// // |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| +// _______, _______, _______, _______, _______, _______, LT(_NAV, KC_0), _______, KC_LPRN, KC_RPRN +// ), -[_NUM] = LAYOUT_kimiko_wrapper( -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, C(KC_7), C(KC_8), C(KC_9), XXXXXXX, XXXXXXX, - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, C(KC_4), C(KC_5), C(KC_6), XXXXXXX, XXXXXXX, - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, TO_BASE, TO_BASE, XXXXXXX, C(KC_1), C(KC_2), C(KC_3), XXXXXXX, XXXXXXX, -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - KC_TRNS, KC_TRNS, _______, _______, _______, ENT_HOME, C(KC_0), C(KC_0), KC_LPRN, KC_RPRN -), +// [_NAV] = LAYOUT_kimiko_wrapper( +// // |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| +// _______, CTRL_F1, KC_F2, KC_F3, ALT_F4, KC_F5, XXXXXXX, A(KC_7), A(KC_8), A(KC_9), A(KC_0), XXXXXXX, +// _______, LCA(KC_H),LCA(KC_J),LCA(KC_K),LCA(KC_L), KC_F6, XXXXXXX, A(KC_4), A(KC_5), A(KC_6), XXXXXXX, XXXXXXX, +// _______, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, KC_F7, KC_INS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, +// _______, C(KC_Z), C(KC_X), C(KC_C), C(KC_V), C(KC_B), TO_BASE, CG_TOGG, KC_APP, KC_HOME, KC_PGDN, KC_PGUP, KC_END, XXXXXXX, +// // |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| +// _______, _______, BRKT, KC_BSPC, KC_DEL, _______, KC_TRNS, _______, _______, _______ +// ), -[_NAV] = LAYOUT_kimiko_wrapper( -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - _______, CTRL_F1, KC_F2, KC_F3, ALT_F4, KC_F5, XXXXXXX, A(KC_7), A(KC_8), A(KC_9), A(KC_0), XXXXXXX, - _______, LCA(KC_H),LCA(KC_J),LCA(KC_K),LCA(KC_L), KC_F6, XXXXXXX, A(KC_4), A(KC_5), A(KC_6), XXXXXXX, XXXXXXX, - _______, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, KC_F7, KC_INS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, - _______, C(KC_Z), C(KC_X), C(KC_C), C(KC_V), C(KC_B), TO_BASE, CG_TOGG, KC_APP, KC_HOME, KC_PGDN, KC_PGUP, KC_END, XXXXXXX, -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - _______, _______, BRKT, KC_BSPC, KC_DEL, _______, KC_TRNS, _______, _______, _______ -), +// [_MOUSE] = LAYOUT_kimiko_wrapper( +// // |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| +// _______, CTRL_F1, KC_F2, KC_F3, ALT_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, QK_BOOT, +// KC_U, XXXXXXX, MS_WHLD, MS_UP, MS_WHLU, XXXXXXX, XXXXXXX, MS_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +// KC_P, KC_LSFT, MS_LEFT, MS_DOWN, MS_RGHT, XXXXXXX, XXXXXXX, MS_ACL0, MS_BTN1, MS_BTN2, MS_BTN3, KC_ENT, +// KC_X, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, BOLDFACE,TO_BASE, TO(_ONEHAND), KC_APP, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, +// // |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| +// _______, _______, KC_LCTL, KC_SPC, KC_ENT, KC_TRNS, _______, _______, _______, _______ +// ), -[_MOUSE] = LAYOUT_kimiko_wrapper( -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - _______, CTRL_F1, KC_F2, KC_F3, ALT_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, RESET, - KC_U, XXXXXXX, MS_WHLD, MS_UP, MS_WHLU, XXXXXXX, XXXXXXX, MS_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_P, KC_LSFT, MS_LEFT, MS_DOWN, MS_RGHT, XXXXXXX, XXXXXXX, MS_ACL0, MS_BTN1, MS_BTN2, MS_BTN3, KC_ENT, - KC_X, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, BOLDFACE,TO_BASE, TO(_ONEHAND), KC_APP, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - _______, _______, KC_LCTL, KC_SPC, KC_ENT, KC_TRNS, _______, _______, _______, _______ -), +// [_FUNC] = LAYOUT_kimiko_wrapper( +// // |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| +// _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +// XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F12, KC_F7, KC_F8, KC_F9, XXXXXXX, XXXXXXX, +// XXXXXXX, KC_LSFT, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_F11, KC_F4, KC_F5, KC_F6, XXXXXXX, XXXXXXX, +// XXXXXXX, KC_LGUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F10, KC_F1, KC_F2, KC_F3, XXXXXXX, XXXXXXX, +// // |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| +// _______, _______, _______, _______, _______, _______, _______, KC_TRNS, KC_GT, KC_LT +// ), -[_FUNC] = LAYOUT_kimiko_wrapper( -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - _______, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_F12, KC_F7, KC_F8, KC_F9, XXXXXXX, XXXXXXX, - XXXXXXX, KC_LSFT, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_F11, KC_F4, KC_F5, KC_F6, XXXXXXX, XXXXXXX, - XXXXXXX, KC_LGUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F10, KC_F1, KC_F2, KC_F3, XXXXXXX, XXXXXXX, -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - _______, _______, _______, _______, _______, _______, _______, KC_TRNS, KC_GT, KC_LT -), - -[_ONEHAND] = LAYOUT_kimiko_wrapper( -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - KC_ESC, C(KC_F1),XXXXXXX, XXXXXXX, A(KC_F4),XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_TAB, MS_WHLU, MS_BTN2, KC_UP, MS_BTN1, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, MS_WHLD, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, -// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - KC_LGUI, KC_LALT, KC_LCTL, KC_SPC, KC_ENT, TO(_MOUSE),_______, _______, _______, _______ -), - -[_SETTINGS] = LAYOUT( -//|-------------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - _______, C(MS_WHLD), XXXXXXX, A(KC_0), A(KC_F4),XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET, - KC_TAB,/*|*/ C(MS_WHLU), A(KC_4), A(KC_5), A(KC_6), KC_X, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_ENT,/*|*/ SCRNSHOT,A(KC_1), A(KC_2), A(KC_3), PDF_HL, RGB_TOG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - KC_SPC,/*|*/ XXXXXXX, A(KC_7), A(KC_8), A(KC_9), KC_P, TO_BASE, TO_BASE, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_LSFT, XXXXXXX, -//|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| - _______, KC_LALT, _______, _______, KC_TRNS, _______, _______, _______, KC_GT, KC_LT -) +// [_ONEHAND] = LAYOUT_kimiko_wrapper( +// // |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| +// KC_ESC, C(KC_F1),XXXXXXX, XXXXXXX, A(KC_F4),XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +// KC_TAB, MS_WHLU, MS_BTN2, KC_UP, MS_BTN1, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +// XXXXXXX, MS_WHLD, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +// XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_DEL, TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, +// // |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| +// KC_LGUI, KC_LALT, KC_LCTL, KC_SPC, KC_ENT, TO(_MOUSE),_______, _______, _______, _______ +// ), }; //clang-format on -//keyboard-specific process -// COMBOS -enum combos { - COMBO_ONEHAND, - COMBO_ONEHAND_END, - COMBO_LENGTH -}; -uint16_t COMBO_LEN = COMBO_LENGTH; -const uint16_t PROGMEM onehand_combo[] = {KC_W, KC_E, COMBO_END}; -const uint16_t PROGMEM onehand_end_combo[] = {MS_BTN2, KC_UP, COMBO_END}; -// const uint16_t PROGMEM shift_T[] = {KC_A, KC_T, COMBO_END}; +// //keyboard-specific process +// // COMBOS +// enum combos { +// COMBO_ONEHAND, +// COMBO_ONEHAND_END, +// COMBO_LENGTH +// }; +// uint16_t COMBO_LEN = COMBO_LENGTH; +// const uint16_t PROGMEM onehand_combo[] = {KC_W, KC_E, COMBO_END}; +// const uint16_t PROGMEM onehand_end_combo[] = {MS_BTN2, KC_UP, COMBO_END}; +// // const uint16_t PROGMEM shift_T[] = {KC_A, KC_T, COMBO_END}; -combo_t key_combos[] = { - [COMBO_ONEHAND] = COMBO(onehand_combo, TO(_ONEHAND)), - [COMBO_ONEHAND_END] = COMBO(onehand_end_combo,TO(_BASE)), - // [SHIFT_T] = COMBO(shift_T,S(KC_T)), -}; -// COMBO_TERM +// combo_t key_combos[] = { +// [COMBO_ONEHAND] = COMBO(onehand_combo, TO(_ONEHAND)), +// [COMBO_ONEHAND_END] = COMBO(onehand_end_combo,TO(_BASE)), +// // [SHIFT_T] = COMBO(shift_T,S(KC_T)), +// }; +// // COMBO_TERM -// Key overrides -const key_override_t GRV_override = ko_make_basic(MOD_MASK_SHIFT, KC_ESC, KC_TILD); -const key_override_t TLD_override = ko_make_basic(MOD_MASK_CTRL, KC_ESC, KC_GRV); -const key_override_t DLR_0_override = ko_make_basic(MOD_MASK_SHIFT, KC_DLR, KC_0); -const key_override_t DEL_override = ko_make_basic(MOD_MASK_SHIFT, KC_DEL, KC_BSPC); +// // Key overrides +// const key_override_t GRV_override = ko_make_basic(MOD_MASK_SHIFT, KC_ESC, KC_TILD); +// const key_override_t TLD_override = ko_make_basic(MOD_MASK_CTRL, KC_ESC, KC_GRV); +// const key_override_t DLR_0_override = ko_make_basic(MOD_MASK_SHIFT, KC_DLR, KC_0); +// const key_override_t DEL_override = ko_make_basic(MOD_MASK_SHIFT, KC_DEL, KC_BSPC); -const key_override_t **key_overrides = (const key_override_t *[]){ // This globally defines all key overrides to be used - &GRV_override, - &TLD_override, - &DLR_0_override, - &DEL_override, - NULL // Null terminate the array of overrides! - }; +// const key_override_t **key_overrides = (const key_override_t *[]){ // This globally defines all key overrides to be used +// &GRV_override, +// &TLD_override, +// &DLR_0_override, +// &DEL_override, +// NULL // Null terminate the array of overrides! +// }; // //RGBLIGHT LAYERS // // Light LEDs 6 to 9 and 12 to 15 red when caps lock is active. Hard to ignore! diff --git a/keyboards/keycapsss/kimiko/keymaps/oco9oco/qmk_userspace.code-workspace b/keyboards/keycapsss/kimiko/keymaps/oco9oco/qmk_userspace.code-workspace new file mode 100644 index 00000000..cb72d62e --- /dev/null +++ b/keyboards/keycapsss/kimiko/keymaps/oco9oco/qmk_userspace.code-workspace @@ -0,0 +1,11 @@ +{ + "folders": [ + { + "path": "../../../../.." + }, + { + "path": "../../../../../../qmk_firmware" + } + ], + "settings": {} +} \ No newline at end of file diff --git a/keyboards/keycapsss/kimiko/keymaps/oco9oco/rules.mk b/keyboards/keycapsss/kimiko/keymaps/oco9oco/rules.mk index bbd52c3b..9f095d92 100644 --- a/keyboards/keycapsss/kimiko/keymaps/oco9oco/rules.mk +++ b/keyboards/keycapsss/kimiko/keymaps/oco9oco/rules.mk @@ -2,6 +2,8 @@ OLED_ENABLE = no ENCODER_ENABLE = no # ENables the use of one or more encoders RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = no -AUTO_SHIFT_ENABLE= yes +AUTO_SHIFT_ENABLE= no CAPS_WORD_ENABLE = no LTO_ENABLE = yes +COMBO_ENABLE = no +SPLIT_KEYBOARD = yes \ No newline at end of file diff --git a/users/oco9oco/config.h b/users/oco9oco/config.h index a647f85f..b0b8c323 100644 --- a/users/oco9oco/config.h +++ b/users/oco9oco/config.h @@ -21,7 +21,7 @@ along with this program. If not, see . -#define FORCE_NKRO +//#define FORCE_NKRO #define TAPPING_TERM 200 #define QUICK_TAP_TERM 0 // #define FLOW_TAP_TERM 100 @@ -78,6 +78,6 @@ along with this program. If not, see . // #define ONESHOT_TIMEOUT 5000 // COMBO OPTIONS -#define COMBO_TERM 40 -#define COMBO_TERM_PER_COMBO -#define COMBO_COUNT 4 +//#define COMBO_TERM 40 +//#define COMBO_TERM_PER_COMBO +//#define COMBO_COUNT 4 diff --git a/users/oco9oco/oco9oco.c b/users/oco9oco/oco9oco.c index 83c226fe..b9f2a04d 100644 --- a/users/oco9oco/oco9oco.c +++ b/users/oco9oco/oco9oco.c @@ -542,6 +542,9 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { case NAV(D): case NAV(F): return TAPPING_TERM - 50; + case LALT_T(KC_X): + case CTLT_D: + return TAPPING_TERM + 50; default: return TAPPING_TERM; } diff --git a/users/oco9oco/oco9oco.h b/users/oco9oco/oco9oco.h index 7f40af74..5faf1c4d 100644 --- a/users/oco9oco/oco9oco.h +++ b/users/oco9oco/oco9oco.h @@ -29,6 +29,11 @@ along with this program. If not, see . // MOD-TAP ALIASES #define GUIT_A LGUI_T(KC_A) #define SFTT_A LSFT_T(KC_A) +// #define AT(z) LALT_T(KC_#z) +// #define CT(z) LCTL_T(KC_#z) +// #define ST(z) LSFT_T(KC_#z) +// #define GT(z) LGUI_T(KC_#z) + #define SFTT_Z LSFT_T(KC_Z) #define GUIT_Z LGUI_T(KC_Z) #define ALTT_S LALT_T(KC_S) @@ -92,7 +97,7 @@ Z X C V B N M , . / #define __________________QWERTY_L3_SFTZ___________ SFTT_Z, KC_X, KC_C, KC_V, KC_B #define __________________QWERTY_GUIZ_L3___________ LGUI_T(KC_Z), KC_X, KC_C, KC_V, KC_B -#define __________________QWERTY_L2_SFTA___________ SFTT_A, KC_S, KC_D, SFTT_F, KC_G +#define __________________QWERTY_L2_SFTA___________ SFTT_A, KC_S, KC_D, KC_F, KC_G #define __________________QWERTY_L3________________ KC_Z, KC_X, KC_C, KC_V, KC_B // |--------|--------|--------|--------|--------| #define __________________QWERTY_R1________________ KC_Y, KC_U, KC_I, KC_O, KC_P @@ -225,7 +230,7 @@ bool qwert; #define __ALT_R3 __________________QWERTY_R3________________ #define __IPC_L1 HAEN_B, HAEN_C, HAEN_E, HAEN_D, KC_SLSH -#define __IPC_L2 IPC(A), IPC(S), IPC_MIN, IPC(F), KC_DOT +#define __IPC_L2 IPC(A), IPC(S), _IPC_MIN, IPC(F), KC_DOT #define __IPC_L3 IPC(Z), BRKT, IPC(C), KC_EQL, KC_COLN #define __IPC_R1 KC_LBRC, _________NUM_789_________, KC_RBRC @@ -332,11 +337,13 @@ enum custom_keycodes { }; enum layer_index { - _BASE = 0, // QWERTY with home row mods + _BASE = 0, _BASE_NOMOD, // Just QWERTY _BASE_SWAP, // BASE WITH RIGHT THUMB SWAP _DOOM, // DOOM ETERNAL + _ARC, _FACTORIO, + _FACT_ALT, _NAV, // Arrows _IPC, // _NUM, diff --git a/users/oco9oco/rules.mk b/users/oco9oco/rules.mk index 5f36e079..04d5ed13 100644 --- a/users/oco9oco/rules.mk +++ b/users/oco9oco/rules.mk @@ -2,7 +2,7 @@ SRC+=oco9oco.c -CONSOLE_ENABLE = yes +CONSOLE_ENABLE = no COMMAND_ENABLE = no KEY_OVERRIDE_ENABLE = no