From 92111da78d60381792a8e615ac0f6fe181ce12c0 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 24 Mar 2024 16:46:24 +0100 Subject: Revert "skeletyl, sweep: dia-layer on shift and thumg" This reverts commit 2809526ce1f76060bb20288d130f9482c772437d. --- .../bastardkb/skeletyl/keymaps/quotengrote/keymap.c | 7 ++----- keyboards/ferris/keymaps/quotengrote/keymap.c | 7 ++----- readme.md | 16 +++------------- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c index 1fb5ebde06..55a99cb566 100644 --- a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c +++ b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c @@ -64,8 +64,7 @@ enum combos { C_KK, C_ESC, C_MED, - C_DIA_T, - C_DIA_S, + C_DIA, C_SV, // Strg + S C_WE // Windows Explorer }; @@ -75,7 +74,6 @@ const uint16_t PROGMEM kk_combo[] = {LSFT_T(KC_N), LALT_T(KC_I), COMBO_END} const uint16_t PROGMEM esc_combo[] = {LCTL_T(KC_S), LSFT_T(KC_T), COMBO_END}; const uint16_t PROGMEM med_combo[] = {LT(3, KC_DEL), MO(3), COMBO_END}; const uint16_t PROGMEM dia_combo[] = {LT(2, KC_ENT), LT(1, KC_SPC), COMBO_END}; -const uint16_t PROGMEM dia_combo[] = {LSFT_T(KC_T), LSFT_T(KC_N), COMBO_END}; const uint16_t PROGMEM sv_combo[] = {LCTL_T(KC_S), LT(0,KC_C), COMBO_END}; const uint16_t PROGMEM we_combo[] = {LT(0,KC_W), LCTL_T(KC_E), COMBO_END}; @@ -84,8 +82,7 @@ combo_t key_combos[] = { [C_KK] = COMBO(kk_combo, LCTL(LALT(KC_K))), [C_ESC] = COMBO(esc_combo, KC_ESC), [C_MED] = COMBO(med_combo, MO(4)), - [C_DIA_T] = COMBO(dia_combo, OSL(5)), - [C_DIA_S] = COMBO(dia_combo, OSL(5)), + [C_DIA] = COMBO(dia_combo, OSL(5)), [C_SV] = COMBO(sv_combo, LCTL(KC_S)), [C_WE] = COMBO(we_combo, LGUI(KC_E)), }; diff --git a/keyboards/ferris/keymaps/quotengrote/keymap.c b/keyboards/ferris/keymaps/quotengrote/keymap.c index 832d8cadb7..12d8ccc467 100644 --- a/keyboards/ferris/keymaps/quotengrote/keymap.c +++ b/keyboards/ferris/keymaps/quotengrote/keymap.c @@ -7,8 +7,7 @@ enum combos { C_KK, C_ESC, C_MED, - C_DIA_T, - C_DIA_S, + C_DIA, C_SV, // Strg + S C_WE // Windows Explorer }; @@ -18,7 +17,6 @@ const uint16_t PROGMEM kk_combo[] = {LSFT_T(KC_N), LALT_T(KC_I), COMBO_END} const uint16_t PROGMEM esc_combo[] = {LCTL_T(KC_S), LSFT_T(KC_T), COMBO_END}; const uint16_t PROGMEM med_combo[] = {LT(3, KC_DEL), MO(3), COMBO_END}; const uint16_t PROGMEM dia_combo[] = {LT(2, KC_ENT), LT(1, KC_SPC), COMBO_END}; -const uint16_t PROGMEM dia_combo[] = {LSFT_T(KC_T), LSFT_T(KC_N), COMBO_END}; const uint16_t PROGMEM sv_combo[] = {LCTL_T(KC_S), LT(0,KC_C), COMBO_END}; const uint16_t PROGMEM we_combo[] = {LT(0,KC_W), LCTL_T(KC_E), COMBO_END}; @@ -27,8 +25,7 @@ combo_t key_combos[] = { [C_KK] = COMBO(kk_combo, LCTL(LALT(KC_K))), [C_ESC] = COMBO(esc_combo, KC_ESC), [C_MED] = COMBO(med_combo, MO(4)), - [C_DIA_T] = COMBO(dia_combo, OSL(5)), - [C_DIA_S] = COMBO(dia_combo, OSL(5)), + [C_DIA] = COMBO(dia_combo, OSL(5)), [C_SV] = COMBO(sv_combo, LCTL(KC_S)), [C_WE] = COMBO(we_combo, LGUI(KC_E)), }; diff --git a/readme.md b/readme.md index 11f7e4c040..607b50d79e 100644 --- a/readme.md +++ b/readme.md @@ -82,7 +82,7 @@ DIACRETICS Layer | | | | | | | | ------------------- ------------------- -Combos 1/3 +Combos 1/2 ------------------------------- ------------------------------- | | | | | | | | | | | | ------------------------------- ------------------------------- @@ -90,10 +90,10 @@ Combos 1/3 ------------------------------- ------------------------------- | | | | | | | | | | | | ------------------------------- ------------------------------- - | |MEDIA| DIA1| | DIA1|MEDIA| | + | |MEDIA| DIA | | DIA |MEDIA| | ------------------- ------------------- -Combos 2/3 +Combos 2/2 ------------------------------- ------------------------------- | | WE | | | | | | | | | | ------------------------------- ------------------------------- @@ -104,14 +104,4 @@ Combos 2/3 | | | | | | | | ------------------- ------------------- -Combos 3/3 -------------------------------- ------------------------------- -| | | | | | | | | | | | -------------------------------- ------------------------------- -| | | | DIA2| | | | DIA2| | | | -------------------------------- ------------------------------- -| | | | | | | | | | | | -------------------------------- ------------------------------- - | | | | | | | | - ------------------- ------------------- ``` -- cgit v1.2.3