diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/config.h index b2261f19..d0b26e7d 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 400 + #define AUTO_MOUSE_TIME 200 #define AUTO_MOUSE_DELAY 0 #endif #define CHARYBDIS_DRAGSCROLL_REVERSE_Y diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/oco9oco/keymap.c index 1cfd0290..e15dd82c 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_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, LALT_T(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 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE_NOMOD] = LAYOUT_charybdis_wrapper( // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ - KC_ESC, MS_WHLL, MS_BTN2, MS_BTN3, MS_BTN1, MS_WHLR, __________________NUMROW_R_________________, KC_MINS, + KC_ESC, MS_WHLL, MS_BTN2, MS_BTN1, MS_BTN3, MS_WHLR, __________________NUMROW_R_________________, KC_MINS, ALT_TAB, __________________QWERTY_L1________________, __________________QWERTY_R1________________, KC_EQL, _______, __________________QWERTY_L2_SFTA___________, __________________QWERTY_R2________________, KC_QUOT, _______, KC_Z, LALT_T(KC_X), KC_C, KC_V, KC_B, __________________QWERTY_HOME_R3___________, KC_BSLS, @@ -107,10 +107,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), - - - - [_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, @@ -148,8 +144,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ONEHAND] = LAYOUT_charybdis_wrapper( // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮ - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F5, S_D_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, - KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F6, S_D_RMOD, C(A(KC_7)), C(A(KC_8)), C(A(KC_9)), XXXXXXX, QK_MAKE, + _______, S_D_MOD,S_D_RMOD, DPI_MOD,DPI_RMOD, KC_F5, S_D_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, + KC_TAB, XXXXXXX, C(KC_X), C(KC_C), C(KC_V), KC_F6, S_D_RMOD, C(A(KC_7)), C(A(KC_8)), C(A(KC_9)), XXXXXXX, QK_MAKE, _______, KC_LSFT, SNIPING, MS_BTN3, MS_BTN1, KC_F7, DPI_MOD, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, XXXXXXX, KC_ENT, KC_LGUI, KC_LALT, KC_LCTL, MS_BTN2, XXXXXXX, DPI_RMOD, SNIPING, MS_BTN1, DRGSCRL, MS_BTN2, XXXXXXX, // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯ diff --git a/keyboards/keycapsss/kimiko/keymaps/oco9oco/keymap.c b/keyboards/keycapsss/kimiko/keymaps/oco9oco/keymap.c index 9987b624..39ca7b05 100644 --- a/keyboards/keycapsss/kimiko/keymaps/oco9oco/keymap.c +++ b/keyboards/keycapsss/kimiko/keymaps/oco9oco/keymap.c @@ -20,24 +20,14 @@ along with this program. If not, see . 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, 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] = 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 ), [_FACTORIO] = LAYOUT_charybdis_wrapper( @@ -63,45 +53,45 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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 -// ), +[_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 +), -// [_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, 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, _______, _______, _______, _______ +), -// [_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( +// |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| + _______, 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 +), // [_ONEHAND] = LAYOUT_kimiko_wrapper( // // |--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------|--------| diff --git a/keyboards/keycapsss/kimiko/keymaps/oco9oco/rules.mk b/keyboards/keycapsss/kimiko/keymaps/oco9oco/rules.mk index 9f095d92..30039058 100644 --- a/keyboards/keycapsss/kimiko/keymaps/oco9oco/rules.mk +++ b/keyboards/keycapsss/kimiko/keymaps/oco9oco/rules.mk @@ -1,9 +1 @@ -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= no -CAPS_WORD_ENABLE = no -LTO_ENABLE = yes -COMBO_ENABLE = no -SPLIT_KEYBOARD = yes \ No newline at end of file +BOARD = GENERIC_RP_RP2040 \ No newline at end of file