From 94f5ba578183ac7ed02c0163304b56a6a311a551 Mon Sep 17 00:00:00 2001 From: Buliway Date: Thu, 23 Nov 2023 21:57:02 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D1=81=D0=B2=D0=B5=D1=82=D0=BA=D1=83=20=D0=B8?= =?UTF-8?q?=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B8=D0=B3?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=BE=D0=B9=20=D1=81=D0=BB=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vial/keymap.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/vial/keymap.c b/vial/keymap.c index 49fbe5d..7716fae 100644 --- a/vial/keymap.c +++ b/vial/keymap.c @@ -132,13 +132,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [L_GAME] = LAYOUT( //,-----------------------------------------------------------------------. ,-----------------------------------------------------------------------. - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_TAB, KC_T, KC_Q, KC_W, KC_E, KC_R, KC_Y, KC_U, KC_I, KC_O, KC_P, DF(L_ENG), //|-----------+-----------+-----------+-----------+-----------+-----------| |-----------+-----------+-----------+-----------+-----------+-----------| - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LSFT, KC_G, KC_A, KC_S, KC_D, KC_F, KC_H, KC_J, KC_UP, KC_K, KC_L, KC_GRV, //|-----------+-----------+-----------+-----------+-----------+-----------| |-----------+-----------+-----------+-----------+-----------+-----------| - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + KC_LCTL, KC_B, KC_Z, KC_X, KC_C, KC_V, KC_N, KC_LEFT, KC_DOWN, KC_RGHT, KC_M, KC_SLSH, //|-----------+-----------+-----------+-----------+-----------+-----------+-----------||-----------+-----------+-----------+-----------+-----------+-----------+-----------| - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + KC_LALT, KC_SPC, TD(19), KC_H, KC_SPC, TD(20) //`+-----------+-----------+-----------||-----------+-----------+-----------+' ) }; @@ -319,10 +319,10 @@ void keyboard_post_init_user(void) { layer_state_t default_layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case L_ENG: - rgblight_sethsv(HSV_ORANGE); + rgblight_sethsv(HSV_ROSE); break; case L_GAME: - rgblight_sethsv(HSV_YELLOW); + rgblight_sethsv(HSV_ORANGE); break; default: // for any other layers, or the default layer rgblight_sethsv(HSV_WHITE); @@ -334,20 +334,26 @@ layer_state_t default_layer_state_set_user(layer_state_t state) { layer_state_t layer_state_set_user(layer_state_t state) { switch (get_highest_layer(state)) { case L_RU: - rgblight_sethsv(HSV_GREEN); + rgblight_sethsv(HSV_VIOLET); break; - case L_PUNC: + case L_MEDIA: rgblight_sethsv(HSV_MAGENTA); break; - case L_IDK1: + case L_NAV: + rgblight_sethsv(HSV_CYAN); + break; + case L_MOUSE: + rgblight_sethsv(HSV_YELLOW); + break; + case L_SYM: + rgblight_sethsv(HSV_GREEN); + break; + case L_NUM: rgblight_sethsv(HSV_BLUE); break; - case L_IDK2: + case L_FUN: rgblight_sethsv(HSV_RED); break; - case L_NUMF: - rgblight_sethsv(HSV_CYAN); - break; default: // for any other layers, or the default layer rgblight_sethsv(HSV_WHITE); break; @@ -359,10 +365,12 @@ void matrix_scan_user(void) { user_timer(); // Проверяем, активен ли слой - if (!layer_state_cmp(layer_state, L_PUNC) && - !layer_state_cmp(layer_state, L_IDK1) && - !layer_state_cmp(layer_state, L_IDK2) && - !layer_state_cmp(layer_state, L_NUMF) && + if (!layer_state_cmp(layer_state, L_MEDIA) && + !layer_state_cmp(layer_state, L_NAV) && + !layer_state_cmp(layer_state, L_MOUSE) && + !layer_state_cmp(layer_state, L_SYM) && + !layer_state_cmp(layer_state, L_NUM) && + !layer_state_cmp(layer_state, L_FUN) && !layer_state_cmp(layer_state, L_RU)) { // Если ни один из этих слоев не активен, обновляем подсветку на основе текущего базового слоя default_layer_state_set_user(default_layer_state);