diff options
3 files changed, 137 insertions, 73 deletions
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h index 0a38c8aefb..9ae7b44a69 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/config.h @@ -28,7 +28,7 @@ #define USE_SERIAL #define SOFT_SERIAL_PIN D2 #define EE_HANDS -#define SPLIT_USB_DETECT +// #define SPLIT_USB_DETECT // wiring of each half // ../../../../docs/proton_c_conversion.md @@ -43,17 +43,15 @@ #define BOOTMAGIC_LITE_ROW_RIGHT 0 #define BOOTMAGIC_LITE_COLUMN_RIGHT 5 +// Configure the global tapping term (default: 200ms) #define TAPPING_TERM 200 // Prevent normal rollover on alphas from accidentally triggering mods. -// #define IGNORE_MOD_TAP_INTERRUPT +#define IGNORE_MOD_TAP_INTERRUPT +//#define IGNORE_MOD_TAP_INTERRUPT +#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY // Enable rapid switch from tap to hold, disables double tap hold auto-repeat. -// #define TAPPING_FORCE_HOLD - -// Apply the modifier on keys that are tapped during a short hold of a modtap -// #define PERMISSIVE_HOLD - -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY +#define TAPPING_FORCE_HOLD #define FORCE_NKRO diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c index 0d8fd05425..3503bfd368 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c +++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/keymap.c @@ -15,28 +15,76 @@ #include QMK_KEYBOARD_H -#define CM_SPAL LGUI_T(KC_SPC) -#define CM_SPAR RGUI_T(KC_SPC) +#define CM_R LCTL_T(KC_R) +#define CM_S LALT_T(KC_S) +#define CM_T LGUI_T(KC_T) -#define SH_ENL LSFT_T(KC_ENT) -#define SH_ENR RSFT_T(KC_ENT) +#define CM_N RGUI_T(KC_N) +#define CM_E RALT_T(KC_E) +#define CM_I RCTL_T(KC_I) -#define SYM MO(_SYMBOL) -#define ADJ MO(_ADJUST) +#define QU_S LCTL_T(KC_S) +#define QU_D LALT_T(KC_D) +#define QU_F LGUI_T(KC_F) + +#define QU_J RGUI_T(KC_J) +#define QU_K RALT_T(KC_K) +#define QU_L RCTL_T(KC_L) + +#define SPC_L LSFT_T(KC_SPC) +#define SPC_R RSFT_T(KC_SPC) +#define ENT_L LSFT_T(KC_ENT) +#define ENT_R RSFT_T(KC_ENT) + +#define UNDO LGUI(KC_Z) +#define REDO LGUI(KC_Y) +#define CUT LGUI(KC_X) +#define COPY LGUI(KC_C) +#define PASTE LGUI(KC_V) +#define ALL LGUI(KC_A) + +#define RAISE MO(_RAISE) +#define LOWER MO(_LOWER) #define QWERT DF(_QWERTY) -#define COLEM DF(_COLEMAK) +#define COLEM DF(_COLEMAK_DH) enum layer_names { + _COLEMAK_DH, _QWERTY, - _COLEMAK, - _SYMBOL, + _RAISE, + _LOWER, _ADJUST }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - + [_COLEMAK_DH] = LAYOUT_5x6_5( + /* COLEMAK_DH + * .-----------------------------------------. .-----------------------------------------. + * | Esc | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bsp | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | Q | W | F | P | B | | J | L | U | Y | ; | \ | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Del | A |R /CTL|S /ALT|T /CMD| G | | M |N /CMD|E /ALT|I /CTL| O | ' | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Shft | Z | X | C | D | V | | K | H | , | . | / | Shft | + * '-----------------------------------------/ \-----------------------------------------' + * | | | / RAISE /---------------. .---------------\ LOWER \ | | | + * | | | / / Space / Enter / \ Enter \ Space \ \ | | | + * '-------------' '-------/ Shift / Shift / \ Shift \ Shift \-------' '-------------' + * /---------------/ \---------------\ + * / = / Home / \ End \ - \ + * / + / / \ \ _ \ + * '---------------' '---------------' + */ + KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_BSPC, + KC_TAB , KC_Q , KC_W , KC_F , KC_P , KC_B , KC_J , KC_L , KC_U , KC_Y , KC_SCLN, KC_BSLS, + KC_DEL , KC_A , CM_R , CM_S , CM_T , KC_G , KC_M , CM_N , CM_E , CM_I , KC_O , KC_QUOT, + KC_LSFT, KC_Z , KC_X , KC_C , KC_D , KC_V , KC_K , KC_H , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, + XXXXXXX, XXXXXXX, RAISE , SPC_L , ENT_L , ENT_R , SPC_R , LOWER , XXXXXXX, XXXXXXX, + KC_EQL, KC_HOME , KC_END , KC_MINS + ), [_QWERTY] = LAYOUT_5x6_5( /* QWERTY * .-----------------------------------------. .-----------------------------------------. @@ -44,87 +92,87 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| |------+------+------+------+------+------| * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' | + * | Del | A |S /CTL|D /ALT|F /CMD| G | | H |J /CMD|K /ALT|L /CTL| ; | ' | * |------+------+------+------+------+------| |------+------+------+------+------+------| * | Shft | Z | X | C | V | B | | N | M | , | . | / | Shft | * '-----------------------------------------/ \-----------------------------------------' - * | ADJ | - | / SYM /---------------. .---------------\ SYM \ | + | ADJ | - * | | | / / Cmd / Shift / \ Shift \ Cmd \ \ | | | - * '-------------' '-------/ Space / Enter / \ Enter \ Space \-------' '-------------' + * | | | / RAISE /---------------. .---------------\ LOWER \ | | | + * | | | / / Space / Enter / \ Enter \ Space \ \ | | | + * '-------------' '-------/ Shift / / \ \ Shift \-------' '-------------' * /---------------/ \---------------\ - * / Alt / Ctrl / \ Ctrl \ Alt \ - * / / / \ \ \ + * / = / Home / \ End \ - \ + * / + / / \ \ _ \ * '---------------' '---------------' */ - KC_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_BSPC, + KC_ESC , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_BSPC, KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_BSLS, - KC_LCTL, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, + KC_DEL , KC_A , QU_S , QU_D , QU_F , KC_G , KC_H , QU_J , QU_K , QU_L , KC_SCLN, KC_QUOT, KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, - ADJ , KC_MINS, SYM , CM_SPAL, SH_ENL , SH_ENR , CM_SPAR, SYM , KC_EQL , ADJ , - KC_LALT, KC_LCTL, KC_RCTL, KC_RALT + XXXXXXX, XXXXXXX, RAISE , SPC_L , ENT_L , ENT_R , SPC_R , LOWER , XXXXXXX, XXXXXXX, + KC_EQL, KC_HOME , KC_END , KC_MINS ), - [_COLEMAK] = LAYOUT_5x6_5( - /* COLEMAK + [_RAISE] = LAYOUT_5x6_5( + /* RAISE * .-----------------------------------------. .-----------------------------------------. - * | Esc | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bsp | + * | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | \ | + * | | Redo | | | | | | % | $ | # | ` | | F12 | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' | + * | | All | Cut | Copy | Paste| | | ^ | / | * | ~ | ? | | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Shft | Z | X | C | V | B | | K | M | , | . | / | Shft | + * | | Undo | | | | | | | & | | | | | | * '-----------------------------------------/ \-----------------------------------------' - * | ADJ | - | / SYM /---------------. .---------------\ SYM \ | + | ADJ | - * | | | / / Cmd / Shift / \ Shift \ Cmd \ \ | | | - * '-------------' '-------/ Space / Enter / \ Enter \ Space \-------' '-------------' + * | RST | | / /---------------. .---------------\ \ | | | + * | | | / / / / \ \ \ \ | | | + * '-------------' '-------/ / / \ \ \-------' '-------------' * /---------------/ \---------------\ - * / Alt / Ctrl / \ Ctrl \ Alt \ - * / / / \ \ \ + * / / Page / \ Page \ \ + * / / Up / \ Down \ \ * '---------------' '---------------' */ - KC_GESC, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_BSPC, - KC_TAB , KC_Q , KC_W , KC_F , KC_P , KC_G , KC_J , KC_L , KC_U , KC_Y , KC_SCLN, KC_BSLS, - KC_LCTL, KC_A , KC_R , KC_S , KC_T , KC_D , KC_H , KC_N , KC_E , KC_I , KC_O , KC_QUOT, - KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_K , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, - ADJ , KC_MINS, SYM , CM_SPAL, SH_ENL , SH_ENR , CM_SPAR, SYM , KC_EQL , ADJ , - KC_LALT, KC_LCTL, KC_RCTL, KC_RALT + _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , + XXXXXXX, REDO , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PERC, KC_DLR , KC_HASH, KC_GRV , XXXXXXX, KC_F12 , + XXXXXXX, ALL , CUT , COPY , PASTE , XXXXXXX, KC_CIRC, KC_SLSH, KC_ASTR, KC_TILD, KC_QUES, XXXXXXX, + _______, UNDO , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_AMPR, KC_PIPE, XXXXXXX, XXXXXXX, _______, + RESET , XXXXXXX, _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, + _______, KC_PGUP, KC_PGDN, _______ ), - [_SYMBOL] = LAYOUT_5x6_5( - /* SYMBOL + [_LOWER] = LAYOUT_5x6_5( + /* LOWER * .-----------------------------------------. .-----------------------------------------. - * | ` | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | + * | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | ! | @ | [ | ] | + | | | | up | | | F12 | + * | | | | [ | ] | | | | | up | | | F12 | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | & | | | ( | ) | - | | | left | down | right| ? | | + * | Ins | ! | @ | ( | ) | | | | left | down | rght | ? | | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | * | / | { | } | = | | | | | | | | + * | | | | { | } | | | | | | | | | * '-----------------------------------------/ \-----------------------------------------' - * | | | / /---------------. .---------------\ \ | | | + * | | | / /---------------. .---------------\ \ | | RST | * | | | / / / / \ \ \ \ | | | * '-------------' '-------/ / / \ \ \-------' '-------------' * /---------------/ \---------------\ - * / / / \ \ \ - * / / / \ \ \ + * / / Page / \ Page \ \ + * / / Up / \ Down \ \ * '---------------' '---------------' */ - KC_GRV , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , - XXXXXXX, KC_EXLM, KC_AT , KC_LBRC, KC_RBRC, KC_PPLS, XXXXXXX, XXXXXXX, KC_UP , XXXXXXX, XXXXXXX, KC_F12 , - _______, KC_AMPR, KC_PIPE, KC_LPRN, KC_RPRN, KC_MINS, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_QUES, XXXXXXX, - _______, KC_ASTR, KC_SLSH, KC_LCBR, KC_RCBR, KC_PEQL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, - XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, - _______, _______, _______, _______ + _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , + XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP , XXXXXXX, XXXXXXX, KC_F12 , + KC_INS , KC_EXLM, KC_AT , KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_QUES, XXXXXXX, + _______, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, + XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, XXXXXXX, RESET , + _______, KC_PGUP, KC_PGDN, _______ ), [_ADJUST] = LAYOUT_5x6_5( /* ADJUST * .-----------------------------------------. .-----------------------------------------. - * | RST | | | | | QWERT| |COLEM | | | | | RST | + * | | | | | | QWERT| |COLEM | | | | | | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | + | | B + | | | | | | + * | | | | | | V+ | | B + | | | | | | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | - | | B - | << | play | >> | | | + * | | | | | | V- | | B - | << | play | >> | | | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | = | | | | | | | | + * | | | | | | Mute | | | | | | | | * '-----------------------------------------/ \-----------------------------------------' * | | | / /---------------. .---------------\ \ | | | * | | | / / / / \ \ \ \ | | | @@ -134,20 +182,42 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * / / / \ \ \ * '---------------' '---------------' */ - RESET , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QWERT , COLEM , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET , + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QWERT , COLEM , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD, KC_BRID, KC_MRWD, KC_MPLY, KC_MFFD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX ) }; +layer_state_t layer_state_set_user(layer_state_t state) { + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); +} + bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { switch (keycode) { - case CM_SPAR: + case SPC_L: + return false; + case SPC_R: return true; - default: + case ENT_L: + return false; + case ENT_R: return false; + default: + return true; } } + +// Flexible macOS-friendly Grave Escape +// https://docs.qmk.fm/#/feature_key_overrides?id=flexible-macos-friendly-grave-escape + +const key_override_t tilde_esc_override = ko_make_basic(MOD_MASK_SHIFT, KC_ESC, S(KC_GRAVE)); +const key_override_t grave_esc_override = ko_make_basic(MOD_MASK_GUI, KC_ESC, KC_GRAVE); + +const key_override_t **key_overrides = (const key_override_t *[]){ + &tilde_esc_override, + &grave_esc_override, + NULL +}; diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/rules.mk index 0b99981410..88d1fb309d 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/rules.mk +++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/cykedev/rules.mk @@ -1,6 +1,2 @@ -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -EXTRAKEY_ENABLE = yes -COMMAND_ENABLE = yes MOUSEKEY_ENABLE = no -LTO_ENABLE = no -NKRO_ENABLE = yes +KEY_OVERRIDE_ENABLE = yes |