From 7eeb98301d1573c26f31210908e75d538b376c51 Mon Sep 17 00:00:00 2001 From: thecount Date: Fri, 11 Apr 2025 15:16:02 +0200 Subject: [PATCH 1/3] removed defect combo and added chordal hold --- .../4x5/keymaps/thecount/keymap.c | 32 ++++++++----------- .../4x5/keymaps/thecount/rules.mk | 10 ++++++ users/.keep | 0 users/thecount/config.h | 3 ++ 4 files changed, 27 insertions(+), 18 deletions(-) delete mode 100644 users/.keep create mode 100644 users/thecount/config.h diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c index cf8ef90..373fd85 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c +++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c @@ -40,6 +40,18 @@ along with this program. If not, see . #define KC_MB1 KC_MS_BTN1 #define KC_MB2 KC_MS_BTN2 +// clang-format off +const char chordal_hold_layout[MATRIX_ROWS][MATRIX_COLS] PROGMEM = + LAYOUT( + 'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R', + 'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R', + 'L', 'L', 'L', 'L', 'L', 'R', 'R', 'R', 'R', 'R', + 'L', 'L', 'R', 'R', + 'L', 'L', 'R', 'R', + 'L', 'L', 'R', 'R', + 'L', 'L', 'R', 'R' + ); + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base (qwerty) * ,----------------------------------, ,----------------------------------, @@ -131,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______ ) }; - +// clang-format on @@ -142,7 +154,7 @@ enum combo_events { UI_UE, LSEMI_APOSTROPHE, QW_DESKTOPLEFT, - ER_DESKTOPORIGHT, + ER_DESKTOPORIGHT }; const uint16_t PROGMEM combo_ae[] = {KC_A, KC_S, COMBO_END}; @@ -157,8 +169,6 @@ combo_t key_combos[] = { [OP_OE] = COMBO_ACTION(combo_oe), [UI_UE] = COMBO_ACTION(combo_ue), [LSEMI_APOSTROPHE] = COMBO_ACTION(combo_apostrophe), - [QW_DESKTOPLEFT] = COMBO_ACTION(combo_desktopleft), - [ER_DESKTOPORIGHT] = COMBO_ACTION(combo_desktopright), }; /* COMBO_ACTION(x) is same as COMBO(x, KC_NO) */ @@ -184,19 +194,5 @@ void process_combo_event(uint16_t combo_index, bool pressed) { tap_code16(KC_QUOT); } break; - case QW_DESKTOPLEFT: - if (pressed) { - tap_code16(KC_LCTL); - tap_code16(KC_LGUI); - tap_code16(KC_LEFT); - } - break; - case ER_DESKTOPORIGHT: - if (pressed) { - tap_code16(KC_LCTL); - tap_code16(KC_LGUI); - tap_code16(KC_RGHT); - } - break; } } diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/rules.mk b/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/rules.mk index ab1e438..d550a5b 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/rules.mk +++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/rules.mk @@ -1 +1,11 @@ +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +SPLIT_KEYBOARD = yes COMBO_ENABLE = yes diff --git a/users/.keep b/users/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/users/thecount/config.h b/users/thecount/config.h new file mode 100644 index 0000000..6c42e7a --- /dev/null +++ b/users/thecount/config.h @@ -0,0 +1,3 @@ +#define PERMISSIVE_HOLD +#define CHORDAL_HOLD +#define TAPPING_TERM 250 From 2e26674456220cea7612fcde25215f54122f0ba1 Mon Sep 17 00:00:00 2001 From: thecount Date: Fri, 11 Apr 2025 15:20:30 +0200 Subject: [PATCH 2/3] cleanup removal of combos --- .../handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c index 373fd85..8630969 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c +++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c @@ -152,17 +152,13 @@ enum combo_events { AS_AE, OP_OE, UI_UE, - LSEMI_APOSTROPHE, - QW_DESKTOPLEFT, - ER_DESKTOPORIGHT + LSEMI_APOSTROPHE }; const uint16_t PROGMEM combo_ae[] = {KC_A, KC_S, COMBO_END}; const uint16_t PROGMEM combo_oe[] = {KC_O, KC_P, COMBO_END}; const uint16_t PROGMEM combo_ue[] = {KC_U, KC_I, COMBO_END}; const uint16_t PROGMEM combo_apostrophe[] = {KC_L, KC_SCLN, COMBO_END}; -const uint16_t PROGMEM combo_desktopleft[] = {KC_Q, KC_W, COMBO_END}; -const uint16_t PROGMEM combo_desktopright[] = {KC_E, KC_R, COMBO_END}; combo_t key_combos[] = { [AS_AE] = COMBO_ACTION(combo_ae), From 383d7abd66b155109aff4ff338806bfd6ab41e20 Mon Sep 17 00:00:00 2001 From: thecount Date: Fri, 11 Apr 2025 16:50:08 +0200 Subject: [PATCH 3/3] changed keymap L2 and L3 --- .../4x5/keymaps/thecount/keymap.c | 55 ++++++++++--------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c index 8630969..ab849ec 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c +++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/thecount/keymap.c @@ -21,12 +21,13 @@ along with this program. If not, see . #include QMK_KEYBOARD_H #define _BASE 0 -#define _LAYER1 1 -#define _LAYER2 2 +#define _NUM_MEDIA_MOUSE 1 +#define _SYM_ARROWS_F 2 -#define L1_BSP LT(1,KC_BACKSPACE) + +#define L1_BSP LT(_NUM_MEDIA_MOUSE, KC_BACKSPACE) #define ALT_ESC MT(MOD_LALT, KC_ESC) -#define L2_SPACE LT(2, KC_SPACE) +#define L2_SP LT(_SYM_ARROWS_F, KC_SPACE) #define CTL_ENT MT(MOD_RCTL, KC_ENT) #define CT_TAB MT(MOD_LCTL, KC_TAB) #define GUI_DEL MT(MOD_RGUI, KC_DEL) @@ -78,23 +79,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_A, KC_S, KC_D, SFT_F, KC_G, KC_H, SFT_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, - ALT_ESC, L1_BSP, L2_SPACE, CTL_ENT, + ALT_ESC, L1_BSP, L2_SP, CTL_ENT, CT_TAB, KC_PGUP, KC_PGDN, GUI_DEL, KC_GRV, KC_HOME, KC_END, KC_NUHS ), - /* Layer 1 + /* Layer 1 _NUM_MEDIA_MOUSE * ,----------------------------------, ,----------------------------------, - * |QKBOOT| | mup | | | | VOL+ | | up | | PgUp | + * |QKBOOT| | mup | | >> | | VOL+ | 7 | 8 | 9 | + | * |------+------+------+------+------| |-------------+------+------+------| - * | | mleft| mdown|mright| | | MUTE | left | down |right | PgDn | + * | | mleft| mdown|mright| >|| | | MUTE | 4 | 5 | 6 | - | * |------+------+------+------+------| |------|------+------+------+------| - * | | | | | | | VOL- | / | \ | ? | | | + * | | | | | << | | VOL- | 1 | 2 | 3 | * | * |------+------+------+-------------, ,-------------+------+------+------, * | | | | mbtn |mbtn2 | * '------+------'-------------' '-------------'------+------' * | | | | | | - * | | | | | | + * | | | | | 0 | * | | | | | | * '------+------' '------+------' * '------+------' '------+------' @@ -103,25 +104,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | * '------+------' '------+------' */ - [_LAYER1] = LAYOUT( - QK_BOOT, _______, KC_MU, _______, _______, KC_VOLU, _______, KC_UP, _______, KC_PGUP, - _______, KC_ML, KC_MD, KC_MR, _______, KC_MUTE, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, - _______, _______, _______, _______, _______, KC_VOLD, KC_SLSH, KC_BSLS, KC_QUES, KC_PIPE, - _______, _______, KC_MB1, KC_MB2, - _______, _______, _______, _______, + [_NUM_MEDIA_MOUSE] = LAYOUT( + QK_BOOT, _______, KC_MU, _______, KC_MNXT, KC_VOLU, KC_7, KC_8, KC_9, KC_KP_PLUS, + _______, KC_ML, KC_MD, KC_MR, KC_MPLY, KC_MUTE, KC_4, KC_5, KC_6, KC_KP_MINUS, + _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_1, KC_2, KC_3, KC_KP_ASTERISK, + _______, _______, KC_MB1, KC_MB2, + _______, _______, _______, KC_0 , _______, _______, _______, _______, _______, _______, _______, _______ ), - /* Layer 2 + /* Layer 2 _SYM_ARROWS_F * ,----------------------------------, ,----------------------------------, - * | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | - * |------+------+------+------+------| |-------------+------+------+------| - * | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - * |------+------+------+------+------| |------|------+------+------+------| * | ! | @ | # | $ | % | | ^ | & | * | ( | ) | + * |------+------+------+------+------| |-------------+------+------+------| + * | | | | | | | LEFT | DOWN | UP | RGHT | | + * |------+------+------+------+------| |------|------+------+------+------| + * | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | * |------+------+------+-------------, ,-------------+------+------+------, - * | F11 | F12 | | - | = | + * | F11 | F12 | | | | * '------+------'-------------' '-------------'------+------' * | | | | | | * | | | | | | @@ -133,11 +134,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | * '------+------' '------+------' */ - [_LAYER2] = LAYOUT( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, - KC_F11, KC_F12, _______, _______, + [_SYM_ARROWS_F] = LAYOUT( + KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, + _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, + KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______