From 208100937632707449bf53f86231531a4e8699f9 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 13:06:07 +0200 Subject: [PATCH 01/16] remove dia-layers --- .../bastardkb/skeletyl/keymaps/quotengrote/keymap.c | 11 ----------- keyboards/ferris/keymaps/quotengrote/keymap.c | 10 ---------- 2 files changed, 21 deletions(-) diff --git a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c index c2aecd441d..b3c004e992 100644 --- a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c +++ b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c @@ -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)), }; diff --git a/keyboards/ferris/keymaps/quotengrote/keymap.c b/keyboards/ferris/keymaps/quotengrote/keymap.c index 1859b4b55e..81a4d37fe2 100644 --- a/keyboards/ferris/keymaps/quotengrote/keymap.c +++ b/keyboards/ferris/keymaps/quotengrote/keymap.c @@ -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 -- 2.43.0 From 32ff604b008693399dccf2fe9b4429ffac2e41ae Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 13:06:43 +0200 Subject: [PATCH 02/16] add alt-layer --- keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c | 4 +++- keyboards/ferris/keymaps/quotengrote/keymap.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c index b3c004e992..94cc49466c 100644 --- a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c +++ b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c @@ -55,9 +55,9 @@ 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_ALT, C_KA, C_KK, C_ESC, @@ -66,6 +66,7 @@ enum combos { C_WE // Windows Explorer }; +const uint16_t PROGMEM alt_combo[] = {LCTL_T(KC_E), KC_I, COMBO_END}; 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}; @@ -74,6 +75,7 @@ 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_ALT] = COMBO(alt_combo, KC_LALT), [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), diff --git a/keyboards/ferris/keymaps/quotengrote/keymap.c b/keyboards/ferris/keymaps/quotengrote/keymap.c index 81a4d37fe2..f816014b81 100644 --- a/keyboards/ferris/keymaps/quotengrote/keymap.c +++ b/keyboards/ferris/keymaps/quotengrote/keymap.c @@ -3,6 +3,7 @@ // combos; https://github.com/qmk/qmk_firmware/blob/master/docs/feature_combo.md enum combos { + C_ALT, C_KA, C_KK, C_ESC, @@ -11,6 +12,7 @@ enum combos { C_WE // Windows Explorer }; +const uint16_t PROGMEM alt_combo[] = {LCTL_T(KC_E), KC_I, COMBO_END}; 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}; @@ -19,6 +21,7 @@ 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_ALT] = COMBO(alt_combo, KC_LALT), [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), -- 2.43.0 From abf3c491a75c402167625135e8d67eef16f2fcbf Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 13:07:08 +0200 Subject: [PATCH 03/16] remove dia-layer again --- keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c index 94cc49466c..b9ee48912b 100644 --- a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c +++ b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c @@ -120,13 +120,6 @@ 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, KC_LALT, DE_SS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LALT, DE_ODIA, - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, - XXXXXXX, _______, _______, _______, _______, XXXXXXX ) }; -- 2.43.0 From acae234753875fcbdc4987212a473040c3816df2 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 13:07:54 +0200 Subject: [PATCH 04/16] add dia as hold-tap --- .../skeletyl/keymaps/quotengrote/keymap.c | 18 +++++++++++++++--- keyboards/ferris/keymaps/quotengrote/keymap.c | 18 +++++++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c index b9ee48912b..4c980ef32b 100644 --- a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c +++ b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c @@ -88,8 +88,8 @@ combo_t key_combos[] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Buchstaben - white [0] = LAYOUT_split_3x5_3( - LT(0,KC_Q), LT(0,KC_W), LT(0,KC_F), KC_P, KC_B, KC_J, KC_L, KC_U, DE_Z, KC_BSPC, - LT(0,KC_A), KC_R, LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, LSFT_T(KC_N), LCTL_T(KC_E), KC_I, KC_O, + LT(0,KC_Q), LT(0,KC_W), LT(0,KC_F), KC_P, KC_B, KC_J, KC_L, LT(0,KC_U), DE_Z, KC_BSPC, + LT(0,KC_A), KC_R, LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, LSFT_T(KC_N), LCTL_T(KC_E), KC_I, LT(0,KC_O), LT(0,DE_Y), LT(0,KC_X), LT(0,KC_C), LSFT_T(KC_D), LT(0,KC_V), KC_K, LSFT_T(KC_H), DE_COMM, DE_DOT, DE_MINS, XXXXXXX, LT(3, KC_DEL), LT(2, KC_ENT), LT(1, KC_SPC), MO(3), XXXXXXX ), @@ -165,7 +165,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; case LT(0,KC_A): if (!record->tap.count && record->event.pressed) { - tap_code16(KC_TAB); + tap_code16(DE_ADIA); + return false; + } + return true; + case LT(0,KC_O): + if (!record->tap.count && record->event.pressed) { + tap_code16(DE_ODIA); + return false; + } + return true; + case LT(0,KC_U): + if (!record->tap.count && record->event.pressed) { + tap_code16(DE_UDIA); return false; } return true; diff --git a/keyboards/ferris/keymaps/quotengrote/keymap.c b/keyboards/ferris/keymaps/quotengrote/keymap.c index f816014b81..04358f3067 100644 --- a/keyboards/ferris/keymaps/quotengrote/keymap.c +++ b/keyboards/ferris/keymaps/quotengrote/keymap.c @@ -34,8 +34,8 @@ combo_t key_combos[] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Buchstaben - white [0] = LAYOUT_split_3x5_2( - LT(0,KC_Q), LT(0,KC_W), LT(0,KC_F), KC_P, KC_B, KC_J, KC_L, KC_U, DE_Z, KC_BSPC, - LT(0,KC_A), KC_R, LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, LSFT_T(KC_N), LCTL_T(KC_E), KC_I, KC_O, + LT(0,KC_Q), LT(0,KC_W), LT(0,KC_F), KC_P, KC_B, KC_J, KC_L, LT(0,KC_U), DE_Z, KC_BSPC, + LT(0,KC_A), KC_R, LCTL_T(KC_S), LSFT_T(KC_T), KC_G, KC_M, LSFT_T(KC_N), LCTL_T(KC_E), KC_I, LT(0,KC_O), LT(0,DE_Y), LT(0,KC_X), LT(0,KC_C), LSFT_T(KC_D), LT(0,KC_V), KC_K, LSFT_T(KC_H), DE_COMM, DE_DOT, DE_MINS, LT(3, KC_DEL), LT(2, KC_ENT), LT(1, KC_SPC), MO(3) ), @@ -110,7 +110,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; case LT(0,KC_A): if (!record->tap.count && record->event.pressed) { - tap_code16(KC_TAB); + tap_code16(DE_ADIA); + return false; + } + return true; + case LT(0,KC_O): + if (!record->tap.count && record->event.pressed) { + tap_code16(DE_ODIA); + return false; + } + return true; + case LT(0,KC_U): + if (!record->tap.count && record->event.pressed) { + tap_code16(DE_UDIA); return false; } return true; -- 2.43.0 From 9260b230653fd06d98c1bd5edf9ae606da4fb431 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 13:08:03 +0200 Subject: [PATCH 05/16] docs --- readme.md | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/readme.md b/readme.md index 9366be644f..e1133dc00f 100644 --- a/readme.md +++ b/readme.md @@ -42,9 +42,9 @@ SYM Layer ------------------------------- ------------------------------- | ^ | [ | ( | ( | § | | % | } | ) | ] | BSPC| ------------------------------- ------------------------------- -| ! | " | ` | ' | / | | \ | $ | & | * | ? | +| ! | " | ß | ' | / | | \ | $ | & | * | ? | ------------------------------- ------------------------------- -| ~ | | ´ | | < | | > | | + | = | # | +| ~ | ´ | | ` | < | | > | | + | = | # | ------------------------------- ------------------------------- | | DEL | ENT | | SPC | MOV | | ------------------- ------------------- @@ -71,18 +71,7 @@ MEDIA Layer | | DEL | ENT | | SPC | MOV | | ------------------- ------------------- -DIACRETICS Layer -------------------------------- ------------------------------- -| | | | | | | | | Ü | | | -------------------------------- ------------------------------- -| Ä | ALT | ß | | | | | | | ALT | Ö | -------------------------------- ------------------------------- -| | | | | | | | | | | | -------------------------------- ------------------------------- - | | | | | | | | - ------------------- ------------------- - -Combos 1/2 +Combos 1/3 ------------------------------- ------------------------------- | | | | | | | | | | | | ------------------------------- ------------------------------- @@ -90,10 +79,10 @@ Combos 1/2 ------------------------------- ------------------------------- | | | | | | | | | | | | ------------------------------- ------------------------------- - | |MEDIA| DIA | | DIA |MEDIA| | + | |MEDIA| | | |MEDIA| | ------------------- ------------------- -Combos 2/2 +Combos 2/3 ------------------------------- ------------------------------- | | WE | | | | | | | | | | ------------------------------- ------------------------------- @@ -104,4 +93,14 @@ Combos 2/2 | | | | | | | | ------------------- ------------------- +Combos 3/3 +------------------------------- ------------------------------- +| | | | | | | | | | | | +------------------------------- ------------------------------- +| | | | | | | | | ALT | ALT | | +------------------------------- ------------------------------- +| | | | | | | | | | | | +------------------------------- ------------------------------- + | | | | | | | | + ------------------- ------------------- ``` -- 2.43.0 From 87879ead60ce49d434b2b5f712ddc5a04b1794bf Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 13:08:15 +0200 Subject: [PATCH 06/16] =?UTF-8?q?=C3=9F=20on=20symbol?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c | 8 ++++---- keyboards/ferris/keymaps/quotengrote/keymap.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c index 4c980ef32b..e829607a2d 100644 --- a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c +++ b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c @@ -102,10 +102,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), // Sym - blue [2] = LAYOUT_split_3x5_3( - DE_CIRC, DE_LBRC, DE_LPRN, DE_LPRN, DE_SECT, DE_PERC, DE_RCBR, DE_RPRN, DE_RBRC, KC_BSPC, - DE_EXLM, DE_DQUO, LSFT(DE_ACUT), DE_QUOT, DE_SLSH, RALT(DE_SS), DE_DLR, DE_AMPR, DE_ASTR, DE_QUES, - DE_TILD, XXXXXXX, DE_ACUT, XXXXXXX, DE_LABK , DE_RABK , XXXXXXX, DE_PLUS, DE_EQL, DE_HASH, - XXXXXXX, _______, _______, _______, _______, XXXXXXX + DE_CIRC, DE_LBRC, DE_LPRN, DE_LPRN, DE_SECT, DE_PERC, DE_RCBR, DE_RPRN, DE_RBRC, KC_BSPC, + DE_EXLM, DE_DQUO, DE_SS, DE_QUOT, DE_SLSH, RALT(DE_SS), DE_DLR, DE_AMPR, DE_ASTR, DE_QUES, + DE_TILD, DE_ACUT, XXXXXXX, LSFT(DE_ACUT), DE_LABK , DE_RABK , XXXXXXX, DE_PLUS, DE_EQL, DE_HASH, + XXXXXXX, _______, _______, _______, _______, XXXXXXX ), // Move - green [3] = LAYOUT_split_3x5_3( diff --git a/keyboards/ferris/keymaps/quotengrote/keymap.c b/keyboards/ferris/keymaps/quotengrote/keymap.c index 04358f3067..ca196b920f 100644 --- a/keyboards/ferris/keymaps/quotengrote/keymap.c +++ b/keyboards/ferris/keymaps/quotengrote/keymap.c @@ -48,10 +48,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), // Sym - blue [2] = LAYOUT_split_3x5_2( - DE_CIRC, DE_LBRC, DE_LPRN, DE_LPRN, DE_SECT, DE_PERC, DE_RCBR, DE_RPRN, DE_RBRC, KC_BSPC, - DE_EXLM, DE_DQUO, LSFT(DE_ACUT), DE_QUOT, DE_SLSH, RALT(DE_SS), DE_DLR, DE_AMPR, DE_ASTR, DE_QUES, - DE_TILD, XXXXXXX, DE_ACUT, XXXXXXX, DE_LABK , DE_RABK , XXXXXXX, DE_PLUS, DE_EQL, DE_HASH, - _______, _______, _______, _______ + DE_CIRC, DE_LBRC, DE_LPRN, DE_LPRN, DE_SECT, DE_PERC, DE_RCBR, DE_RPRN, DE_RBRC, KC_BSPC, + DE_EXLM, DE_DQUO, DE_SS, DE_QUOT, DE_SLSH, RALT(DE_SS), DE_DLR, DE_AMPR, DE_ASTR, DE_QUES, + DE_TILD, DE_ACUT, XXXXXXX, LSFT(DE_ACUT), DE_LABK , DE_RABK , XXXXXXX, DE_PLUS, DE_EQL, DE_HASH, + _______, _______, _______, _______ ), // Move - green [3] = LAYOUT_split_3x5_2( -- 2.43.0 From c4e77e5d6de1be8254dfaa3e78b19bc9e0621a8c Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 13:12:35 +0200 Subject: [PATCH 07/16] docs --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index e1133dc00f..2f8bf2adeb 100644 --- a/readme.md +++ b/readme.md @@ -7,9 +7,9 @@ ```text Home Row Mods / Tap'n'Hold ------------------------------- ------------------------------- -| @ | WIN | € | | | | | | | | | +| @ | WIN | € | | | | | | Ü | | | ------------------------------- ------------------------------- -| TAB | | CTL | SFT | | | | SFT | CTL | | | +| Ä | | CTL | SFT | | | | SFT | CTL | | Ö | ------------------------------- ------------------------------- | | | CUT | CPY | SFT | PST | | | SFT | | | | ------------------------------- ------------------------------- -- 2.43.0 From 6e39d2b62eabab6b69bd1822ab0e43155d092539 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 13:13:06 +0200 Subject: [PATCH 08/16] docs --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 2f8bf2adeb..34bc2a2782 100644 --- a/readme.md +++ b/readme.md @@ -9,7 +9,7 @@ Home Row Mods / Tap'n'Hold ------------------------------- ------------------------------- | @ | WIN | € | | | | | | Ü | | | ------------------------------- ------------------------------- -| Ä | | CTL | SFT | | | | SFT | CTL | | Ö | +| Ä | | CTRL| SFT | | | | SFT | CTRL| | Ö | ------------------------------- ------------------------------- | | | CUT | CPY | SFT | PST | | | SFT | | | | ------------------------------- ------------------------------- -- 2.43.0 From 79e53ba238ff7f6b21d0b8ac6f27089d854c4584 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 13:25:16 +0200 Subject: [PATCH 09/16] pair colors --- .../skeletyl/keymaps/quotengrote/keymap.c | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c index e829607a2d..2f03d7098c 100644 --- a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c +++ b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c @@ -18,28 +18,51 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { for (uint8_t i = led_min; i < led_max; i++) { switch(get_highest_layer(layer_state|default_layer_state)) { case 0: - rgblight_sethsv(4, 75, 150); // warmhite (werte = hue, saturation, value) + rgblight_sethsv(4, 75, 150); // warmwhite (werte = hue, saturation, value) break; case 1: // {siehe ../../skeletyl.c) + // Colors thumbs rgb_matrix_set_color(35, 255, 165, 0); // orange rgb_matrix_set_color(34, 255, 165, 0); // orange rgb_matrix_set_color(33, 255, 165, 0); // orange break; case 2: + // Colors thumbs rgb_matrix_set_color(15, 0, 90, 255); // blue rgb_matrix_set_color(16, 0, 90, 255); // blue rgb_matrix_set_color(17, 0, 90, 255); // blue break; case 3: + // Colors thumbs rgb_matrix_set_color(35, 4, 147, 4); // green rgb_matrix_set_color(34, 4, 147, 4); // green rgb_matrix_set_color(33, 4, 147, 4); // green rgb_matrix_set_color(15, 4, 147, 4); // green rgb_matrix_set_color(16, 4, 147, 4); // green rgb_matrix_set_color(17, 4, 147, 4); // green + // Colors pairs + // ´` + rgb_matrix_set_color(35, 235, 95, 100); // green + rgb_matrix_set_color(35, 235, 95, 100); // green + // [] + rgb_matrix_set_color(35, 235, 75, 100); // green + rgb_matrix_set_color(35, 235, 75, 100); // green + // () + rgb_matrix_set_color(35, 235, 55, 100); // green + rgb_matrix_set_color(35, 235, 55, 100); // green + // {} + rgb_matrix_set_color(35, 215, 95, 100); // green + rgb_matrix_set_color(35, 215, 95, 100); // green + // /\ + rgb_matrix_set_color(35, 215, 75, 100); // green + rgb_matrix_set_color(35, 215, 75, 100); // green + // <> + rgb_matrix_set_color(35, 215, 55, 100); // green + rgb_matrix_set_color(35, 215, 55, 100); // green break; case 4: + // Colors thumbs rgb_matrix_set_color(35, 255, 241, 21); // yellow rgb_matrix_set_color(34, 255, 241, 21); // yellow rgb_matrix_set_color(33, 255, 241, 21); // yellow -- 2.43.0 From 944fe18f25cb5009e22472a37af3cfd5fcb0c9e2 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 13:25:51 +0200 Subject: [PATCH 10/16] docs --- .../bastardkb/skeletyl/keymaps/quotengrote/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c index 2f03d7098c..c5872e7953 100644 --- a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c +++ b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c @@ -22,26 +22,26 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { break; case 1: // {siehe ../../skeletyl.c) - // Colors thumbs + // color thumbs rgb_matrix_set_color(35, 255, 165, 0); // orange rgb_matrix_set_color(34, 255, 165, 0); // orange rgb_matrix_set_color(33, 255, 165, 0); // orange break; case 2: - // Colors thumbs + // color thumbs rgb_matrix_set_color(15, 0, 90, 255); // blue rgb_matrix_set_color(16, 0, 90, 255); // blue rgb_matrix_set_color(17, 0, 90, 255); // blue break; case 3: - // Colors thumbs + // color thumbs rgb_matrix_set_color(35, 4, 147, 4); // green rgb_matrix_set_color(34, 4, 147, 4); // green rgb_matrix_set_color(33, 4, 147, 4); // green rgb_matrix_set_color(15, 4, 147, 4); // green rgb_matrix_set_color(16, 4, 147, 4); // green rgb_matrix_set_color(17, 4, 147, 4); // green - // Colors pairs + // color pairs // ´` rgb_matrix_set_color(35, 235, 95, 100); // green rgb_matrix_set_color(35, 235, 95, 100); // green @@ -62,7 +62,7 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { rgb_matrix_set_color(35, 215, 55, 100); // green break; case 4: - // Colors thumbs + // color thumbs rgb_matrix_set_color(35, 255, 241, 21); // yellow rgb_matrix_set_color(34, 255, 241, 21); // yellow rgb_matrix_set_color(33, 255, 241, 21); // yellow -- 2.43.0 From cf5ff82dc3071b740e0a2c3e4151725d5ad2ca9d Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 13:26:08 +0200 Subject: [PATCH 11/16] syntax --- keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c index c5872e7953..cfdbafe05a 100644 --- a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c +++ b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c @@ -54,7 +54,7 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { // {} rgb_matrix_set_color(35, 215, 95, 100); // green rgb_matrix_set_color(35, 215, 95, 100); // green - // /\ + // \/ rgb_matrix_set_color(35, 215, 75, 100); // green rgb_matrix_set_color(35, 215, 75, 100); // green // <> -- 2.43.0 From 7a6cf78dfc1f5ced888a9723df263d3bb092a260 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 13:30:30 +0200 Subject: [PATCH 12/16] keycodes --- .../skeletyl/keymaps/quotengrote/keymap.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c index cfdbafe05a..e8a44a4706 100644 --- a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c +++ b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c @@ -43,23 +43,23 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { rgb_matrix_set_color(17, 4, 147, 4); // green // color pairs // ´` - rgb_matrix_set_color(35, 235, 95, 100); // green - rgb_matrix_set_color(35, 235, 95, 100); // green + rgb_matrix_set_color(5, 235, 95, 100); // 50 shades of blue + rgb_matrix_set_color(11, 235, 95, 100); // 50 shades of blue // [] - rgb_matrix_set_color(35, 235, 75, 100); // green - rgb_matrix_set_color(35, 235, 75, 100); // green + rgb_matrix_set_color(3, 235, 75, 100); // 50 shades of blue + rgb_matrix_set_color(21, 235, 75, 100); // 50 shades of blue // () - rgb_matrix_set_color(35, 235, 55, 100); // green - rgb_matrix_set_color(35, 235, 55, 100); // green + rgb_matrix_set_color(8, 235, 55, 100); // 50 shades of blue + rgb_matrix_set_color(26, 235, 55, 100); // 50 shades of blue // {} - rgb_matrix_set_color(35, 215, 95, 100); // green - rgb_matrix_set_color(35, 215, 95, 100); // green + rgb_matrix_set_color(9, 215, 95, 100); // 50 shades of blue + rgb_matrix_set_color(27, 215, 95, 100); // 50 shades of blue // \/ - rgb_matrix_set_color(35, 215, 75, 100); // green - rgb_matrix_set_color(35, 215, 75, 100); // green + rgb_matrix_set_color(13, 215, 75, 100); // 50 shades of blue + rgb_matrix_set_color(31, 215, 75, 100); // 50 shades of blue // <> - rgb_matrix_set_color(35, 215, 55, 100); // green - rgb_matrix_set_color(35, 215, 55, 100); // green + rgb_matrix_set_color(14, 215, 55, 100); // 50 shades of blue + rgb_matrix_set_color(32, 215, 55, 100); // 50 shades of blue break; case 4: // color thumbs -- 2.43.0 From 1f912fb0e53da9eb7461d53a204f8fa656346e32 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 13:35:00 +0200 Subject: [PATCH 13/16] colors --- .../skeletyl/keymaps/quotengrote/keymap.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c index e8a44a4706..b23a1517eb 100644 --- a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c +++ b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c @@ -43,23 +43,23 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { rgb_matrix_set_color(17, 4, 147, 4); // green // color pairs // ´` - rgb_matrix_set_color(5, 235, 95, 100); // 50 shades of blue - rgb_matrix_set_color(11, 235, 95, 100); // 50 shades of blue + rgb_matrix_set_color(5, 235, 95, 255); // 50 shades of blue + rgb_matrix_set_color(11, 235, 95, 255); // 50 shades of blue // [] - rgb_matrix_set_color(3, 235, 75, 100); // 50 shades of blue - rgb_matrix_set_color(21, 235, 75, 100); // 50 shades of blue + rgb_matrix_set_color(3, 235, 75, 255); // 50 shades of blue + rgb_matrix_set_color(21, 235, 75, 255); // 50 shades of blue // () - rgb_matrix_set_color(8, 235, 55, 100); // 50 shades of blue - rgb_matrix_set_color(26, 235, 55, 100); // 50 shades of blue + rgb_matrix_set_color(8, 235, 55, 255); // 50 shades of blue + rgb_matrix_set_color(26, 235, 55, 255); // 50 shades of blue // {} - rgb_matrix_set_color(9, 215, 95, 100); // 50 shades of blue - rgb_matrix_set_color(27, 215, 95, 100); // 50 shades of blue + rgb_matrix_set_color(9, 215, 95, 255); // 50 shades of blue + rgb_matrix_set_color(27, 215, 95, 255); // 50 shades of blue // \/ - rgb_matrix_set_color(13, 215, 75, 100); // 50 shades of blue - rgb_matrix_set_color(31, 215, 75, 100); // 50 shades of blue + rgb_matrix_set_color(13, 215, 75, 255); // 50 shades of blue + rgb_matrix_set_color(31, 215, 75, 255); // 50 shades of blue // <> - rgb_matrix_set_color(14, 215, 55, 100); // 50 shades of blue - rgb_matrix_set_color(32, 215, 55, 100); // 50 shades of blue + rgb_matrix_set_color(14, 215, 55, 255); // 50 shades of blue + rgb_matrix_set_color(32, 215, 55, 255); // 50 shades of blue break; case 4: // color thumbs -- 2.43.0 From 757ba3189f71fad7239d94bfb2e515d1db50f623 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 13:40:07 +0200 Subject: [PATCH 14/16] dd --- .../skeletyl/keymaps/quotengrote/keymap.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c index b23a1517eb..40ea42a688 100644 --- a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c +++ b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c @@ -43,23 +43,23 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { rgb_matrix_set_color(17, 4, 147, 4); // green // color pairs // ´` - rgb_matrix_set_color(5, 235, 95, 255); // 50 shades of blue - rgb_matrix_set_color(11, 235, 95, 255); // 50 shades of blue + rgb_matrix_set_color(5, 236, 77, 50); // 50 shades of blue + rgb_matrix_set_color(11, 235, 95, 100); // 50 shades of blue // [] - rgb_matrix_set_color(3, 235, 75, 255); // 50 shades of blue - rgb_matrix_set_color(21, 235, 75, 255); // 50 shades of blue + rgb_matrix_set_color(3, 235, 75, 100); // 50 shades of blue + rgb_matrix_set_color(21, 235, 75, 100); // 50 shades of blue // () - rgb_matrix_set_color(8, 235, 55, 255); // 50 shades of blue - rgb_matrix_set_color(26, 235, 55, 255); // 50 shades of blue + rgb_matrix_set_color(8, 235, 55, 100); // 50 shades of blue + rgb_matrix_set_color(26, 235, 55, 100); // 50 shades of blue // {} - rgb_matrix_set_color(9, 215, 95, 255); // 50 shades of blue - rgb_matrix_set_color(27, 215, 95, 255); // 50 shades of blue + rgb_matrix_set_color(9, 215, 95, 100); // 50 shades of blue + rgb_matrix_set_color(27, 215, 95, 100); // 50 shades of blue // \/ - rgb_matrix_set_color(13, 215, 75, 255); // 50 shades of blue - rgb_matrix_set_color(31, 215, 75, 255); // 50 shades of blue + rgb_matrix_set_color(13, 215, 75, 100); // 50 shades of blue + rgb_matrix_set_color(31, 215, 75, 100); // 50 shades of blue // <> - rgb_matrix_set_color(14, 215, 55, 255); // 50 shades of blue - rgb_matrix_set_color(32, 215, 55, 255); // 50 shades of blue + rgb_matrix_set_color(14, 215, 55, 100); // 50 shades of blue + rgb_matrix_set_color(32, 215, 55, 100); // 50 shades of blue break; case 4: // color thumbs -- 2.43.0 From e5a46eef90f80db6d3d1f40face3dcedb9df688c Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 14:15:12 +0200 Subject: [PATCH 15/16] colors --- .../skeletyl/keymaps/quotengrote/keymap.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c index 40ea42a688..1c78020b45 100644 --- a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c +++ b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c @@ -43,23 +43,23 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { rgb_matrix_set_color(17, 4, 147, 4); // green // color pairs // ´` - rgb_matrix_set_color(5, 236, 77, 50); // 50 shades of blue - rgb_matrix_set_color(11, 235, 95, 100); // 50 shades of blue + rgb_matrix_set_color(5, 20, 214, 22); // 50 shades of green + rgb_matrix_set_color(11, 20, 214, 22); // 50 shades of green // [] - rgb_matrix_set_color(3, 235, 75, 100); // 50 shades of blue - rgb_matrix_set_color(21, 235, 75, 100); // 50 shades of blue + rgb_matrix_set_color(3, 44, 0, 232); // 50 shades of blue + rgb_matrix_set_color(21, 44, 0, 232); // 50 shades of blue // () - rgb_matrix_set_color(8, 235, 55, 100); // 50 shades of blue - rgb_matrix_set_color(26, 235, 55, 100); // 50 shades of blue + rgb_matrix_set_color(8, 44, 0, 207); // 50 shades of blue + rgb_matrix_set_color(26, 44, 0, 207); // 50 shades of blue // {} - rgb_matrix_set_color(9, 215, 95, 100); // 50 shades of blue - rgb_matrix_set_color(27, 215, 95, 100); // 50 shades of blue + rgb_matrix_set_color(9, 44, 0, 171); // 50 shades of blue + rgb_matrix_set_color(27, 44, 0, 171); // 50 shades of blue // \/ - rgb_matrix_set_color(13, 215, 75, 100); // 50 shades of blue - rgb_matrix_set_color(31, 215, 75, 100); // 50 shades of blue + rgb_matrix_set_color(13, 235, 235, 19); // 50 shades of yellow + rgb_matrix_set_color(31, 235, 235, 19); // 50 shades of yellow // <> - rgb_matrix_set_color(14, 215, 55, 100); // 50 shades of blue - rgb_matrix_set_color(32, 215, 55, 100); // 50 shades of blue + rgb_matrix_set_color(14, 235, 56, 19); // 50 shades of red + rgb_matrix_set_color(32, 235, 56, 19); // 50 shades of red break; case 4: // color thumbs -- 2.43.0 From c0cbdcf421be7701210d2e02c48aab963cc9fe2f Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Mon, 5 Aug 2024 14:18:10 +0200 Subject: [PATCH 16/16] colors --- .../skeletyl/keymaps/quotengrote/keymap.c | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c index 1c78020b45..9a7bb2a81b 100644 --- a/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c +++ b/keyboards/bastardkb/skeletyl/keymaps/quotengrote/keymap.c @@ -17,9 +17,11 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { // layer rgb for (uint8_t i = led_min; i < led_max; i++) { switch(get_highest_layer(layer_state|default_layer_state)) { + //base case 0: rgblight_sethsv(4, 75, 150); // warmwhite (werte = hue, saturation, value) break; + // num case 1: // {siehe ../../skeletyl.c) // color thumbs @@ -27,20 +29,12 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { rgb_matrix_set_color(34, 255, 165, 0); // orange rgb_matrix_set_color(33, 255, 165, 0); // orange break; + // sym case 2: // color thumbs rgb_matrix_set_color(15, 0, 90, 255); // blue rgb_matrix_set_color(16, 0, 90, 255); // blue rgb_matrix_set_color(17, 0, 90, 255); // blue - break; - case 3: - // color thumbs - rgb_matrix_set_color(35, 4, 147, 4); // green - rgb_matrix_set_color(34, 4, 147, 4); // green - rgb_matrix_set_color(33, 4, 147, 4); // green - rgb_matrix_set_color(15, 4, 147, 4); // green - rgb_matrix_set_color(16, 4, 147, 4); // green - rgb_matrix_set_color(17, 4, 147, 4); // green // color pairs // ´` rgb_matrix_set_color(5, 20, 214, 22); // 50 shades of green @@ -61,6 +55,17 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { rgb_matrix_set_color(14, 235, 56, 19); // 50 shades of red rgb_matrix_set_color(32, 235, 56, 19); // 50 shades of red break; + // mov + case 3: + // color thumbs + rgb_matrix_set_color(35, 4, 147, 4); // green + rgb_matrix_set_color(34, 4, 147, 4); // green + rgb_matrix_set_color(33, 4, 147, 4); // green + rgb_matrix_set_color(15, 4, 147, 4); // green + rgb_matrix_set_color(16, 4, 147, 4); // green + rgb_matrix_set_color(17, 4, 147, 4); // green + break; + // media case 4: // color thumbs rgb_matrix_set_color(35, 255, 241, 21); // yellow -- 2.43.0