From 71a9c7189a981734ccc423ee85deec5e6dd2ee36 Mon Sep 17 00:00:00 2001 From: Christoph Cullmann Date: Mon, 24 Oct 2022 15:43:36 +0200 Subject: [PATCH] thumb buttons do no layer switch --- keymap.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/keymap.c b/keymap.c index 167e2b3..2209134 100644 --- a/keymap.c +++ b/keymap.c @@ -54,10 +54,7 @@ bool achordion_chord(uint16_t tap_hold_keycode, keyrecord_t* other_record) { // last row is special for the planck, just allow there everything - if (planck_bottom_row(tap_hold_record->event.key)) { - return true; - } - if (planck_bottom_row(other_record->event.key)) { + if (planck_bottom_row(tap_hold_record->event.key) || planck_bottom_row(other_record->event.key)) { return true; } @@ -94,32 +91,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, LT(_NUM, KC_A), LALT_T(KC_S), LCTL_T(KC_D), LSFT_T(KC_F), KC_G, KC_H, RSFT_T(KC_J), RCTL_T(KC_K), LALT_T(KC_L), LT(_NAV, KC_QUOT), LT(_SYM, KC_Z), RALT_T(KC_X), LGUI_T(KC_C), KC_V, KC_B, KC_N, KC_M, RGUI_T(KC_COMM), RALT_T(KC_DOT), LT(_FN, KC_SLSH), - LT(_SYM, KC_TAB), LT(_NUM, KC_SPC), LT(_FN, KC_ENT), LT(_NAV, KC_BSPC) + KC_TAB, KC_SPC, KC_ENT, KC_BSPC ), [_SYM] = LAYOUT_cullmann( - KC_ESC, C(KC_X), C(KC_C), C(KC_V), XXXXXXX, KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, + XXXXXXX, C(KC_X), C(KC_C), C(KC_V), KC_ESC, KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, XXXXXXX, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_PLUS, KC_DLR, KC_PERC, KC_CIRC, KC_COLN, XXXXXXX, KC_RALT, KC_LGUI, XXXXXXX, XXXXXXX, KC_PIPE, KC_EXLM, KC_AT, KC_HASH, KC_TILD, KC_TAB, KC_SPC, KC_UNDS, KC_RPRN ), [_NUM] = LAYOUT_cullmann( - KC_ESC, C(KC_X), C(KC_C), C(KC_V), XXXXXXX, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, + XXXXXXX, C(KC_X), C(KC_C), C(KC_V), KC_ESC, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, XXXXXXX, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_EQL, KC_4, KC_5, KC_6, KC_SCLN, XXXXXXX, KC_RALT, KC_LGUI, XXXXXXX, XXXXXXX, KC_BSLS, KC_1, KC_2, KC_3, KC_GRV, KC_TAB, KC_SPC, KC_MINS, KC_0 ), [_FN] = LAYOUT_cullmann( - KC_F12, KC_F7, KC_F8, KC_F9, KC_PSCR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, + KC_F12, KC_F7, KC_F8, KC_F9, KC_PSCR, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_F11, KC_F4, KC_F5, KC_F6, KC_DEL, XXXXXXX, KC_RSFT, KC_RCTL, KC_LALT, XXXXXXX, KC_F10, KC_F1, KC_F2, KC_F3, KC_INS, XXXXXXX, XXXXXXX, KC_RGUI, KC_RALT, XXXXXXX, KC_TAB, KC_SPC, KC_ENT, KC_BSPC ), [_NAV] = LAYOUT_cullmann( - KC_PGUP, KC_HOME, KC_UP, KC_END, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, + KC_PGUP, KC_HOME, KC_UP, KC_END, KC_PGUP, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, KC_RSFT, KC_RCTL, KC_LALT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RGUI, KC_RALT, XXXXXXX, KC_TAB, KC_SPC, KC_ENT, KC_BSPC