buliway/keyboard
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Небольшие изменения и фикс тапденса на ру слое

Browse source
This commit is contained in:
Buliway 2023-03-08 05:29:39 +03:00
parent 61895cfe8d
commit 14bd05d1f3
3 changed files with 27 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
img/test.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 522 KiB

After

Width:  |  Height:  |  Size: 521 KiB

BIN
img/test.kra
View file

Binary file not shown.

56
vial/keymap.c
View file

@ -22,21 +22,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define CUSTOM_SAFE_RANGE SAFE_RANGE #define CUSTOM_SAFE_RANGE SAFE_RANGE
#include "lang_shift/include.h" #include "lang_shift/include.h"
// #define LCTRL() C()
#define L_ENG 0 #define L_ENG 0
#define L_NUMF 1 #define L_GAME 1
#define L_RU 2 #define L_RU 2
#define L_PUNC 3 #define L_PUNC 3
#define L_IDK1 4 #define L_IDK1 4
#define L_IDK2 5 #define L_IDK2 5
#define L_GAME 6 #define L_NUMF 6
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[L_ENG] = LAYOUT( [L_ENG] = LAYOUT(
//,-----------------------------------------------------------. ,-----------------------------------------------------------. //,-----------------------------------------------------------. ,-----------------------------------------------------------.
KC_ESC, EN_F, EN_L, EN_H, EN_V, EN_Z, EN_Q, EN_W, EN_U, EN_O, EN_Y, XXXXXXX, KC_ESC, EN_F, EN_L, EN_H, EN_V, EN_Z, EN_Q, EN_W, EN_U, EN_O, EN_Y, DF(L_GAME),
//|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------| //|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------|
XXXXXXX, EN_S, EN_R, EN_N, EN_T, EN_K, EN_C, EN_D, EN_E, EN_A, EN_I, XXXXXXX, XXXXXXX, EN_S, EN_R, EN_N, EN_T, EN_K, EN_C, EN_D, EN_E, EN_A, EN_I, XXXXXXX,
//|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------| //|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------|
@ -46,6 +44,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`+---------+---------+---------||---------+---------+---------+' //`+---------+---------+---------||---------+---------+---------+'
), ),
[L_RU] = LAYOUT(
//,-----------------------------------------------------------. ,-----------------------------------------------------------.
KC_ESC, RU_H, RU_G, RU_JA, RU_Y, RU_U, RU_D, RU_CH, RU_M, RU_ZH, RU_E, RU_SC,
//|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------|
RU_F, RU_N, RU_I, RU_JE, RU_O, RU_SF, RU_P, RU_V, RU_T, RU_S, RU_R, RU_TS,
//|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------|
TD(5), RU_SH, RU_B, RU_JU, RU_A, RU_JO, RU_HD, RU_K, RU_L, RU_Z, RU_J, ALT_0,
//|---------+---------+---------+---------+---------+---------+---------||---------+---------+---------+---------+---------+---------+---------|
TD(0), TD(1), KC_LSHIFT, TD(2), TD(3), KC_TAB
//`+---------+---------+---------||---------+---------+---------+'
),
[L_NUMF] = LAYOUT( [L_NUMF] = LAYOUT(
//,-----------------------------------------------------------. ,-----------------------------------------------------------. //,-----------------------------------------------------------. ,-----------------------------------------------------------.
XXXXXXX, XXXXXXX, KC_1, KC_2, KC_3, XXXXXXX, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX, XXXXXXX, XXXXXXX, KC_1, KC_2, KC_3, XXXXXXX, XXXXXXX, KC_F1, KC_F2, KC_F3, KC_F4, XXXXXXX,
@ -58,18 +68,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//`+---------+---------+---------||---------+---------+---------+' //`+---------+---------+---------||---------+---------+---------+'
), ),
[L_RU] = LAYOUT(
//,-----------------------------------------------------------. ,-----------------------------------------------------------.
KC_ESC, RU_H, RU_G, RU_JA, RU_Y, RU_U, RU_D, RU_CH, RU_M, RU_ZH, RU_E, RU_SC,
//|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------|
RU_F, RU_N, RU_I, RU_JE, RU_O, RU_SF, RU_P, RU_V, RU_T, RU_S, RU_R, RU_TS,
//|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------|
TD(5), RU_SH, RU_B, RU_JU, RU_A, RU_JO, RU_HD, RU_K, RU_L, RU_Z, RU_J, ALT_0,
//|---------+---------+---------+---------+---------+---------+---------||---------+---------+---------+---------+---------+---------+---------|
TD(0), TD(1), KC_LSHIFT, TD(2), TD(3), KC_TAB
//`+---------+---------+---------||---------+---------+---------+'
),
[L_PUNC] = LAYOUT( [L_PUNC] = LAYOUT(
//,-----------------------------------------------------------. ,-----------------------------------------------------------. //,-----------------------------------------------------------. ,-----------------------------------------------------------.
AG_PERC, EN_QUOT, AG_MINS, AG_SLSH, AG_EQL, AG_PLUS, EN_PIPE, AG_RPRN, EN_RCBR, EN_RBRC, EN_GT, EN_TILD, AG_PERC, EN_QUOT, AG_MINS, AG_SLSH, AG_EQL, AG_PLUS, EN_PIPE, AG_RPRN, EN_RCBR, EN_RBRC, EN_GT, EN_TILD,
@ -96,11 +94,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[L_IDK2] = LAYOUT( [L_IDK2] = LAYOUT(
//,-----------------------------------------------------------------------. ,-----------------------------------------------------------------------. //,-----------------------------------------------------------------------. ,-----------------------------------------------------------------------.
KC_HOME, C(KC_LEFT), C(KC_UP), C(KC_DOWN), C(KC_RGHT), KC_PGUP, LA_SYNC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, KC_HOME, C(KC_LEFT), C(KC_UP), C(KC_DOWN), C(KC_RGHT), KC_PGUP, LA_SYNC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|-----------+-----------+-----------+-----------+-----------+-----------| |-----------+-----------+-----------+-----------+-----------+-----------| //|-----------+-----------+-----------+-----------+-----------+-----------| |-----------+-----------+-----------+-----------+-----------+-----------|
KC_END, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_PGDN, KC_VOLD, KC_MPLY, KC_MNXT, KC_MPRV, KC_MUTE, KC_VOLU, KC_END, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_PGDN, KC_VOLD, KC_MPLY, KC_MNXT, KC_MPRV, KC_MUTE, KC_VOLU,
//|-----------+-----------+-----------+-----------+-----------+-----------| |-----------+-----------+-----------+-----------+-----------+-----------| //|-----------+-----------+-----------+-----------+-----------+-----------| |-----------+-----------+-----------+-----------+-----------+-----------|
KC_LCTL, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, KC_DEL, DF(L_GAME), LA_CAPS, LA_ALSH, LA_CTSH, LA_WISP, KC_LALT, KC_LCTL, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, KC_DEL, RGB_TOG, LA_CAPS, LA_ALSH, LA_CTSH, LA_WISP, KC_LALT,
//|-----------+-----------+-----------+-----------+-----------+-----------+-----------||-----------+-----------+-----------+-----------+-----------+-----------+-----------| //|-----------+-----------+-----------+-----------+-----------+-----------+-----------||-----------+-----------+-----------+-----------+-----------+-----------+-----------|
XXXXXXX, XXXXXXX, XXXXXXX, KC_LSHIFT, XXXXXXX, XXXXXXX XXXXXXX, XXXXXXX, XXXXXXX, KC_LSHIFT, XXXXXXX, XXXXXXX
//`+-----------+-----------+-----------||-----------+-----------+-----------+' //`+-----------+-----------+-----------||-----------+-----------+-----------+'
@ -108,11 +106,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[L_GAME] = LAYOUT( [L_GAME] = LAYOUT(
//,-----------------------------------------------------------. ,-----------------------------------------------------------. //,-----------------------------------------------------------. ,-----------------------------------------------------------.
KC_TAB, KC_T, KC_Q, KC_W, KC_E, KC_R, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, DF(L_RU), KC_TAB, KC_T, KC_Q, KC_W, KC_E, KC_R, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, XXXXXXX, DF(L_ENG),
//|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------| //|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------|
KC_LSFT, KC_G, KC_A, KC_S, KC_D, KC_F, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_SCLN, XXXXXXX, KC_LSFT, KC_G, KC_A, KC_S, KC_D, KC_F, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_SCLN, XXXXXXX,
//|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------| //|---------+---------+---------+---------+---------+---------| |---------+---------+---------+---------+---------+---------|
KC_LCTL, KC_B, KC_Z, KC_X, KC_C, KC_V, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DF(L_ENG), KC_LCTL, KC_B, KC_Z, KC_X, KC_C, KC_V, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|---------+---------+---------+---------+---------+---------+---------||---------+---------+---------+---------+---------+---------+---------| //|---------+---------+---------+---------+---------+---------+---------||---------+---------+---------+---------+---------+---------+---------|
KC_LALT, KC_SPC, TD(4), KC_H, KC_SPC, XXXXXXX KC_LALT, KC_SPC, TD(4), KC_H, KC_SPC, XXXXXXX
//`+---------+---------+---------||---------+---------+---------+' //`+---------+---------+---------||---------+---------+---------+'
@ -208,8 +206,8 @@ layer_state_t default_layer_state_set_user(layer_state_t state) {
case L_RU: case L_RU:
rgblight_sethsv(HSV_GREEN); rgblight_sethsv(HSV_GREEN);
break; break;
case L_NUMF: case L_GAME:
rgblight_sethsv(HSV_CYAN); rgblight_sethsv(HSV_YELLOW);
break; break;
case L_PUNC: case L_PUNC:
rgblight_sethsv(HSV_MAGENTA); rgblight_sethsv(HSV_MAGENTA);
@ -220,8 +218,8 @@ layer_state_t default_layer_state_set_user(layer_state_t state) {
case L_IDK2: case L_IDK2:
rgblight_sethsv(HSV_RED); rgblight_sethsv(HSV_RED);
break; break;
case L_GAME: case L_NUMF:
rgblight_sethsv(HSV_YELLOW); rgblight_sethsv(HSV_CYAN);
break; break;
default: // for any other layers, or the default layer default: // for any other layers, or the default layer
rgblight_sethsv(HSV_WHITE); rgblight_sethsv(HSV_WHITE);
@ -238,8 +236,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
case L_RU: case L_RU:
rgblight_sethsv(HSV_GREEN); rgblight_sethsv(HSV_GREEN);
break; break;
case L_NUMF: case L_GAME:
rgblight_sethsv(HSV_CYAN); rgblight_sethsv(HSV_YELLOW);
break; break;
case L_PUNC: case L_PUNC:
rgblight_sethsv(HSV_MAGENTA); rgblight_sethsv(HSV_MAGENTA);
@ -250,8 +248,8 @@ layer_state_t layer_state_set_user(layer_state_t state) {
case L_IDK2: case L_IDK2:
rgblight_sethsv(HSV_RED); rgblight_sethsv(HSV_RED);
break; break;
case L_GAME: case L_NUMF:
rgblight_sethsv(HSV_YELLOW); rgblight_sethsv(HSV_CYAN);
break; break;
default: // for any other layers, or the default layer default: // for any other layers, or the default layer
rgblight_sethsv(HSV_WHITE); rgblight_sethsv(HSV_WHITE);