From c0fec7eebd1359e4173dc4149554eab1bb48a958 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Sun, 24 Mar 2024 16:46:01 +0100 Subject: Revert "skeletyl, sweep: fix dia-combo syntax" This reverts commit 11dd508650ad4e15dfa65f726d2d41425e5444aa. --- keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c | 9 +++++---- keyboards/ferris/keymaps/quotengrote/keymap.c | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c index dc477ec368..1fb5ebde06 100644 --- a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c +++ b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c @@ -57,6 +57,7 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { return false; } + // combos; https://github.com/qmk/qmk_firmware/blob/master/docs/feature_combo.md enum combos { C_KA, @@ -73,8 +74,8 @@ const uint16_t PROGMEM ka_combo[] = {LALT_T(KC_R), LSFT_T(KC_T), COMBO_END} 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_combo1[] = {LT(2, KC_ENT), LT(1, KC_SPC), COMBO_END}; -const uint16_t PROGMEM dia_combo2[] = {LSFT_T(KC_T), LSFT_T(KC_N), 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}; @@ -83,8 +84,8 @@ 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_combo1, OSL(5)), - [C_DIA_S] = COMBO(dia_combo2, OSL(5)), + [C_DIA_T] = COMBO(dia_combo, OSL(5)), + [C_DIA_S] = 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 13c0ca38b2..832d8cadb7 100644 --- a/keyboards/ferris/keymaps/quotengrote/keymap.c +++ b/keyboards/ferris/keymaps/quotengrote/keymap.c @@ -17,8 +17,8 @@ const uint16_t PROGMEM ka_combo[] = {LALT_T(KC_R), LSFT_T(KC_T), COMBO_END} 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_combo1[] = {LT(2, KC_ENT), LT(1, KC_SPC), COMBO_END}; -const uint16_t PROGMEM dia_combo2[] = {LSFT_T(KC_T), LSFT_T(KC_N), 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 +27,8 @@ 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_combo1, OSL(5)), - [C_DIA_S] = COMBO(dia_combo2, OSL(5)), + [C_DIA_T] = COMBO(dia_combo, OSL(5)), + [C_DIA_S] = COMBO(dia_combo, OSL(5)), [C_SV] = COMBO(sv_combo, LCTL(KC_S)), [C_WE] = COMBO(we_combo, LGUI(KC_E)), }; -- cgit v1.2.3