skeletyl, sweep: remove dia-layer and resort to tap'n'holds #1

Merged
mg merged 16 commits from dia_tab into quotengrote 2024-08-05 14:25:30 +02:00
2 changed files with 0 additions and 21 deletions
Showing only changes of commit 2081009376 - Show all commits

View file

@ -47,14 +47,6 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
rgb_matrix_set_color(16, 255, 241, 21); // yellow
rgb_matrix_set_color(17, 255, 241, 21); // yellow
break;
case 5:
rgb_matrix_set_color(35, 165, 16, 16); // dark red
rgb_matrix_set_color(34, 165, 16, 16); // dark red
rgb_matrix_set_color(33, 165, 16, 16); // dark red
rgb_matrix_set_color(15, 165, 16, 16); // dark red
rgb_matrix_set_color(16, 165, 16, 16); // dark red
rgb_matrix_set_color(17, 165, 16, 16); // dark red
break;
default:
rgblight_sethsv(4, 75, 150); // warmwhite (werte = hue, saturation, value)
break;
@ -70,7 +62,6 @@ enum combos {
C_KK,
C_ESC,
C_MED,
C_DIA,
C_SV, // Strg + S
C_WE // Windows Explorer
};
@ -79,7 +70,6 @@ const uint16_t PROGMEM ka_combo[] = {KC_R, LSFT_T(KC_T), COMBO_END}
const uint16_t PROGMEM kk_combo[] = {LSFT_T(KC_N), 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};
@ -88,7 +78,6 @@ 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] = COMBO(dia_combo, OSL(5)),
[C_SV] = COMBO(sv_combo, LCTL(KC_S)),
[C_WE] = COMBO(we_combo, LGUI(KC_E)),
};

View file

@ -7,7 +7,6 @@ enum combos {
C_KK,
C_ESC,
C_MED,
C_DIA,
C_SV, // Strg + S
C_WE // Windows Explorer
};
@ -16,7 +15,6 @@ const uint16_t PROGMEM ka_combo[] = {KC_R, LSFT_T(KC_T), COMBO_END}
const uint16_t PROGMEM kk_combo[] = {LSFT_T(KC_N), 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};
@ -25,7 +23,6 @@ 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] = COMBO(dia_combo, OSL(5)),
[C_SV] = COMBO(sv_combo, LCTL(KC_S)),
[C_WE] = COMBO(we_combo, LGUI(KC_E)),
};
@ -66,13 +63,6 @@ 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, KC_LALT, DE_SS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LALT, 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