fix corne v3
This commit is contained in:
parent
050e46e0ed
commit
c2fdd3a870
3 changed files with 24 additions and 58 deletions
|
|
@ -34,10 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
// #define LANG_CHANGE_DEFAULT LANG_CHANGE_CTRL_SHIFT
|
// #define LANG_CHANGE_DEFAULT LANG_CHANGE_CTRL_SHIFT
|
||||||
// #define LANG_CHANGE_DEFAULT LANG_CHANGE_WIN_SPACE
|
// #define LANG_CHANGE_DEFAULT LANG_CHANGE_WIN_SPACE
|
||||||
|
|
||||||
#define RGBLIGHT_LAYERS
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Holding mouse movement keys moves the cursor at constant speeds
|
// Holding mouse movement keys moves the cursor at constant speeds
|
||||||
#define MK_3_SPEED
|
#define MK_3_SPEED
|
||||||
// The chosen speed is only active while you hold the respective key. When the key is raised, mouse keys returns to the unmodified speed.
|
// The chosen speed is only active while you hold the respective key. When the key is raised, mouse keys returns to the unmodified speed.
|
||||||
|
|
|
||||||
|
|
@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
|
||||||
[L_MEDIA] = LAYOUT(
|
[L_MEDIA] = LAYOUT(
|
||||||
//,-----------------------------------------------------------------------. ,-----------------------------------------------------------------------.
|
//,-----------------------------------------------------------------------. ,-----------------------------------------------------------------------.
|
||||||
XXXXXXX, KC_RWIN, KC_RALT, KC_RCTL, KC_RSFT, XXXXXXX, NK_ON, KC_VOLD, KC_VOLU, LA_SYNC, RGB_TOG, XXXXXXX,
|
XXXXXXX, KC_RWIN, KC_RALT, KC_RCTL, KC_RSFT, XXXXXXX, NK_ON, KC_VOLD, KC_VOLU, LA_SYNC, UG_TOGG, XXXXXXX,
|
||||||
//|-----------+-----------+-----------+-----------+-----------+-----------| |-----------+-----------+-----------+-----------+-----------+-----------|
|
//|-----------+-----------+-----------+-----------+-----------+-----------| |-----------+-----------+-----------+-----------+-----------+-----------|
|
||||||
XXXXXXX, KC_LWIN, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, NK_TOGG, KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE, XXXXXXX,
|
XXXXXXX, KC_LWIN, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, NK_TOGG, KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE, XXXXXXX,
|
||||||
//|-----------+-----------+-----------+-----------+-----------+-----------| |-----------+-----------+-----------+-----------+-----------+-----------|
|
//|-----------+-----------+-----------+-----------+-----------+-----------| |-----------+-----------+-----------+-----------+-----------+-----------|
|
||||||
|
|
@ -83,13 +83,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
|
||||||
[L_MOUSE] = LAYOUT(
|
[L_MOUSE] = LAYOUT(
|
||||||
//,-----------------------------------------------------------------------. ,-----------------------------------------------------------------------.
|
//,-----------------------------------------------------------------------. ,-----------------------------------------------------------------------.
|
||||||
XXXXXXX, KC_BTN5, KC_BTN1, KC_BTN3, KC_BTN2, XXXXXXX, C(KC_Y), C(KC_V), C(KC_C), C(KC_X), C(KC_Z), C(KC_S),
|
XXXXXXX, MS_BTN5, MS_BTN1, MS_BTN3, MS_BTN2, XXXXXXX, C(KC_Y), C(KC_V), C(KC_C), C(KC_X), C(KC_Z), C(KC_S),
|
||||||
//|-----------+-----------+-----------+-----------+-----------+-----------| |-----------+-----------+-----------+-----------+-----------+-----------|
|
//|-----------+-----------+-----------+-----------+-----------+-----------| |-----------+-----------+-----------+-----------+-----------+-----------|
|
||||||
XXXXXXX, KC_LWIN, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_TAB,
|
XXXXXXX, KC_LWIN, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_CAPS, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, KC_TAB,
|
||||||
//|-----------+-----------+-----------+-----------+-----------+-----------| |-----------+-----------+-----------+-----------+-----------+-----------|
|
//|-----------+-----------+-----------+-----------+-----------+-----------| |-----------+-----------+-----------+-----------+-----------+-----------|
|
||||||
XXXXXXX, KC_BTN4, KC_ACL2, KC_ACL1, KC_ACL0, XXXXXXX, KC_INS, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_DEL,
|
XXXXXXX, MS_BTN4, MS_ACL2, MS_ACL1, MS_ACL0, XXXXXXX, KC_INS, MS_WHLL, MS_WHLD, MS_WHLU, MS_WHLR, KC_DEL,
|
||||||
//|-----------+-----------+-----------+-----------+-----------+-----------+-----------||-----------+-----------+-----------+-----------+-----------+-----------+-----------|
|
//|-----------+-----------+-----------+-----------+-----------+-----------+-----------||-----------+-----------+-----------+-----------+-----------+-----------+-----------|
|
||||||
XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN3, KC_BTN2
|
XXXXXXX, XXXXXXX, XXXXXXX, MS_BTN1, MS_BTN3, MS_BTN2
|
||||||
//`+-----------+-----------+-----------||-----------+-----------+-----------+'
|
//`+-----------+-----------+-----------||-----------+-----------+-----------+'
|
||||||
),
|
),
|
||||||
|
|
||||||
|
|
@ -197,63 +197,31 @@ void user_timer(void) {
|
||||||
// Lighting Layers
|
// Lighting Layers
|
||||||
layer_state_t default_layer_state_set_user(layer_state_t state) {
|
layer_state_t default_layer_state_set_user(layer_state_t state) {
|
||||||
switch (get_highest_layer(state)) {
|
switch (get_highest_layer(state)) {
|
||||||
case L_ENG:
|
case L_ENG: rgblight_sethsv_noeeprom(HSV_PINK); break;
|
||||||
rgblight_sethsv(HSV_PINK);
|
case L_GAME: rgblight_sethsv_noeeprom(HSV_ORANGE); break;
|
||||||
break;
|
default: rgblight_sethsv_noeeprom(HSV_WHITE); break;
|
||||||
case L_GAME:
|
|
||||||
rgblight_sethsv(HSV_ORANGE);
|
|
||||||
break;
|
|
||||||
default: // for any other layers, or the default layer
|
|
||||||
rgblight_sethsv(HSV_WHITE);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
return state;
|
return state;
|
||||||
};
|
}
|
||||||
|
|
||||||
layer_state_t layer_state_set_user(layer_state_t state) {
|
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||||
switch (get_highest_layer(state)) {
|
switch (get_highest_layer(state | default_layer_state)) {
|
||||||
case L_RU:
|
case L_ENG: rgblight_sethsv_noeeprom(HSV_PINK); break;
|
||||||
rgblight_sethsv(HSV_PURPLE);
|
case L_GAME: rgblight_sethsv_noeeprom(HSV_ORANGE); break;
|
||||||
break;
|
case L_RU: rgblight_sethsv_noeeprom(HSV_PURPLE); break;
|
||||||
case L_MEDIA:
|
case L_MEDIA: rgblight_sethsv_noeeprom(HSV_MAGENTA); break;
|
||||||
rgblight_sethsv(HSV_MAGENTA);
|
case L_NAV: rgblight_sethsv_noeeprom(HSV_CYAN); break;
|
||||||
break;
|
case L_MOUSE: rgblight_sethsv_noeeprom(HSV_YELLOW); break;
|
||||||
case L_NAV:
|
case L_SYM: rgblight_sethsv_noeeprom(HSV_GREEN); break;
|
||||||
rgblight_sethsv(HSV_CYAN);
|
case L_NUM: rgblight_sethsv_noeeprom(HSV_BLUE); break;
|
||||||
break;
|
case L_FUN: rgblight_sethsv_noeeprom(HSV_RED); break;
|
||||||
case L_MOUSE:
|
default: rgblight_sethsv_noeeprom(HSV_WHITE); break;
|
||||||
rgblight_sethsv(HSV_YELLOW);
|
|
||||||
break;
|
|
||||||
case L_SYM:
|
|
||||||
rgblight_sethsv(HSV_GREEN);
|
|
||||||
break;
|
|
||||||
case L_NUM:
|
|
||||||
rgblight_sethsv(HSV_BLUE);
|
|
||||||
break;
|
|
||||||
case L_FUN:
|
|
||||||
rgblight_sethsv(HSV_RED);
|
|
||||||
break;
|
|
||||||
default: // for any other layers, or the default layer
|
|
||||||
rgblight_sethsv(HSV_WHITE);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
return state;
|
return state;
|
||||||
};
|
}
|
||||||
|
|
||||||
void matrix_scan_user(void) {
|
void matrix_scan_user(void) {
|
||||||
user_timer();
|
user_timer();
|
||||||
|
|
||||||
// Проверяем, активен ли слой
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool caps_word_press_user(uint16_t keycode) {
|
bool caps_word_press_user(uint16_t keycode) {
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ NKRO_ENABLE = yes
|
||||||
# If this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
# If this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
||||||
|
|
||||||
RGBLIGHT_ENABLE = yes
|
RGBLIGHT_ENABLE = yes
|
||||||
|
RGB_MATRIX_ENABLE = no
|
||||||
# Enable keyboard underlight functionality
|
# Enable keyboard underlight functionality
|
||||||
|
|
||||||
TAP_DANCE_ENABLE = no
|
TAP_DANCE_ENABLE = no
|
||||||
|
|
@ -20,8 +21,9 @@ TAP_DANCE_ENABLE = no
|
||||||
# TAPPING_TERM_PER_KEY = yes
|
# TAPPING_TERM_PER_KEY = yes
|
||||||
# Я так понимаю это чтоб задавать задержку до срабатывания не одну на всю клавиатуру, а для каждой клавиши отдельно. https://docs.qmk.fm/#/tap_hold?id=tapping_term
|
# Я так понимаю это чтоб задавать задержку до срабатывания не одну на всю клавиатуру, а для каждой клавиши отдельно. https://docs.qmk.fm/#/tap_hold?id=tapping_term
|
||||||
|
|
||||||
KEY_OVERRIDE_ENABLE = yes
|
KEY_OVERRIDE_ENABLE = no
|
||||||
# Enable the key override feature. https://docs.qmk.fm/#/feature_key_overrides
|
# Enable the key override feature. https://docs.qmk.fm/#/feature_key_overrides
|
||||||
|
# Было `yes`, но теперь ошибку даёт
|
||||||
|
|
||||||
BACKLIGHT_ENABLE = no
|
BACKLIGHT_ENABLE = no
|
||||||
# This enables the in-switch LED backlighting. You can specify the backlight pin by putting this in your config.h: #define BACKLIGHT_PIN B7
|
# This enables the in-switch LED backlighting. You can specify the backlight pin by putting this in your config.h: #define BACKLIGHT_PIN B7
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue