skeletyl, sweep: remove dia combos, replace with layer

This commit is contained in:
Michael Grote 2024-03-22 16:53:07 +01:00
parent ff5b9b6cc5
commit cec0b7ad06
3 changed files with 29 additions and 32 deletions

View file

@ -27,6 +27,9 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
case 4:
rgb_matrix_set_color(2, 255, 241, 21); // yellow
break;
case 5:
rgb_matrix_set_color(2, 165, 16, 16); // dark red
break;
default:
rgblight_sethsv(4, 75, 150); // warmwhite (werte = hue, saturation, value)
break;
@ -37,38 +40,29 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
// combos; https://github.com/qmk/qmk_firmware/blob/master/docs/feature_combo.md
enum combos {
C_AE,
C_UE,
C_OE,
C_SS,
C_KA,
C_KK,
C_ESC,
C_MED,
C_DIA,
C_SV, // Strg + S
C_WE // Windows Explorer
};
const uint16_t PROGMEM ae_combo[] = {LT(0,KC_Q), LT(0,KC_A), COMBO_END};
const uint16_t PROGMEM ue_combo[] = {KC_U, LCTL_T(KC_E), COMBO_END};
const uint16_t PROGMEM oe_combo[] = {KC_BSPC, KC_O, COMBO_END};
const uint16_t PROGMEM ss_combo[] = {LT(0,KC_F), LCTL_T(KC_S), COMBO_END};
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_combo[] = {LT(2, KC_ENT), LT(1, KC_SPC), 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};
combo_t key_combos[] = {
[C_AE] = COMBO(ae_combo, DE_ADIA),
[C_UE] = COMBO(ue_combo, DE_UDIA),
[C_OE] = COMBO(oe_combo, DE_ODIA),
[C_SS] = COMBO(ss_combo, DE_SS),
[C_KA] = COMBO(ka_combo, LCTL(LALT(KC_A))),
[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] = COMBO(dia_combo, OSL(5)),
[C_SV] = COMBO(sv_combo, LCTL(KC_S)),
[C_WE] = COMBO(we_combo, LGUI(KC_E)),
};
@ -109,8 +103,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, KC_MPLY, KC_VOLD, KC_VOLD, KC_MPLY, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, _______, _______, _______, _______, XXXXXXX
),
// Diacretics - dark red
[5] = LAYOUT_split_3x5_3(
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DE_UDIA, XXXXXXX, XXXXXXX,
DE_ADIA, XXXXXXX, DE_SS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DE_ODIA,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, _______, _______, _______, _______, XXXXXXX
)
};
// https://github.com/qmk/qmk_firmware/blob/master/docs/mod_tap.md#changing-hold-function

View file

@ -3,38 +3,29 @@
// combos; https://github.com/qmk/qmk_firmware/blob/master/docs/feature_combo.md
enum combos {
C_AE,
C_UE,
C_OE,
C_SS,
C_KA,
C_KK,
C_ESC,
C_MED,
C_DIA,
C_SV, // Strg + S
C_WE // Windows Explorer
};
const uint16_t PROGMEM ae_combo[] = {LT(0,KC_Q), LT(0,KC_A), COMBO_END};
const uint16_t PROGMEM ue_combo[] = {KC_U, LCTL_T(KC_E), COMBO_END};
const uint16_t PROGMEM oe_combo[] = {KC_BSPC, KC_O, COMBO_END};
const uint16_t PROGMEM ss_combo[] = {LT(0,KC_F), LCTL_T(KC_S), COMBO_END};
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_combo[] = {LT(2, KC_ENT), LT(1, KC_SPC), 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};
combo_t key_combos[] = {
[C_AE] = COMBO(ae_combo, DE_ADIA),
[C_UE] = COMBO(ue_combo, DE_UDIA),
[C_OE] = COMBO(oe_combo, DE_ODIA),
[C_SS] = COMBO(ss_combo, DE_SS),
[C_KA] = COMBO(ka_combo, LCTL(LALT(KC_A))),
[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] = COMBO(dia_combo, OSL(5)),
[C_SV] = COMBO(sv_combo, LCTL(KC_S)),
[C_WE] = COMBO(we_combo, LGUI(KC_E)),
};
@ -75,8 +66,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
RGB_MOD, RGB_SAI, RGB_SAD, XXXXXXX, KC_MUTE, KC_MUTE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
RGB_RMOD, RGB_VAI, RGB_VAD, KC_MPLY, KC_VOLD, KC_VOLD, KC_MPLY, XXXXXXX, XXXXXXX, XXXXXXX,
_______, _______, _______, _______
),
// Diacretics - dark red
[5] = LAYOUT_split_3x5_2(
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DE_UDIA, XXXXXXX, XXXXXXX,
DE_ADIA, XXXXXXX, DE_SS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DE_ODIA,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
_______, _______, _______, _______
)
};
// https://github.com/qmk/qmk_firmware/blob/master/docs/mod_tap.md#changing-hold-function
bool process_record_user(uint16_t keycode, keyrecord_t *record) {

View file

@ -71,18 +71,18 @@ MEDIA Layer
| | DEL | ENT | | SPC | MOV | |
------------------- -------------------
Combos 1/3
DIACRETICS Layer
------------------------------- -------------------------------
| Ä | | ß | | | | | | Ü | | Ö |
| | | | | | | | | Ü | | |
------------------------------- -------------------------------
| Ä | | ß | | | | | | Ü | | Ö |
| A | | ß | | | | | | | | Ö |
------------------------------- -------------------------------
| | | | | | | | | | | |
------------------------------- -------------------------------
| | | | | | | |
------------------- -------------------
Combos 2/3
Combos 1/2
------------------------------- -------------------------------
| | | | | | | | | | | |
------------------------------- -------------------------------
@ -90,10 +90,10 @@ Combos 2/3
------------------------------- -------------------------------
| | | | | | | | | | | |
------------------------------- -------------------------------
| |MEDIA| | | |MEDIA| |
| |MEDIA| DIA | | DIA |MEDIA| |
------------------- -------------------
Combos 3/3
Combos 2/2
------------------------------- -------------------------------
| | WE | | | | | | | | | |
------------------------------- -------------------------------