Add support for alt on bottom row ; basically std ansi layout and relatedupdates

This commit is contained in:
kemonine 2020-10-28 13:06:26 -04:00
parent 2d2d65f00b
commit 678f97062c
10 changed files with 47 additions and 49 deletions

16
.vscode/settings.json vendored Normal file
View file

@ -0,0 +1,16 @@
{
"files.associations": {
"array": "c",
"hash_map": "c",
"hash_set": "c",
"deque": "c",
"forward_list": "c",
"list": "c",
"string": "c",
"unordered_map": "c",
"vector": "c",
"string_view": "c",
"initializer_list": "c",
"regex": "c"
}
}

View file

@ -9,8 +9,8 @@
:100080000C944F050C944F050C944F050C944F05A0
:100090000C944F050C944F050C944F050C944F0590
:1000A0000C944F050C944F050C944F05C800BE00EE
:1000B000B40000000010BFFFF0FF000000000010BF
:1000C00080FFF0FF0000000000100AFFF0FF0000BA
:1000B000B40000000014BFFFF0FF000000000014B7
:1000C00080FFF0FF0000000000140AFFF0FF0000B6
:1000D0000000165C1E001F002000210022002300EB
:1000E00024002500260027002D002E0000002A00F5
:1000F0004A002B00000014001A0008001500170029
@ -20,7 +20,7 @@
:100130004E00E10000001D001B0006001900050034
:10014000110010003600370038000000E5005200B2
:100150004D00E000E3000000E200000000002C0081
:100160000000000000000057E400000050005100B3
:100160000000000000000057E600E40050005100CD
:100170004F0035003A003B003C003D003E003F0090
:1001800040004100420043004400450000004C0094
:100190004C0001000000010001000100010001000D
@ -30,7 +30,7 @@
:1001D00046000100000001000100010001000100D3
:1001E0000100010001000100AE000000E500A900CF
:1001F000A800010001000000010000000000010053
:100200000000000000000100E6000000CA5CAA0037
:10020000000000000000010001000100CA5CAA001B
:10021000C95C290000000000000000000000000090
:1002200000000000000000000000000000000000CE
:1002300000000000000000000000F00000000000CE

View file

@ -30,40 +30,39 @@ qk_tap_dance_action_t tap_dance_actions[] = {
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_65_ansi_blocker(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
[0] = LAYOUT_65_ansi(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
LM(1, MOD_LALT), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, TD(LAYERS), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[1] = LAYOUT_65_ansi_blocker(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, TD(LAYERS), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[1] = LAYOUT_65_ansi(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_INS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PLAY_PAUSE, KC_RSFT, KC_VOLU, KC_MUTE,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, RGB_VAD, KC_VOLD, RGB_VAI),
[2] = LAYOUT_65_ansi_blocker(KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_VOLD, RGB_VAI),
[2] = LAYOUT_65_ansi(KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_MS_UP, KC_NO, KC_NO, KC_NO, KC_MS_WH_UP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_NO, KC_NO, KC_MS_BTN1, KC_MS_BTN2, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_LSFT, KC_NO, KC_X, KC_C, KC_V, KC_NO, KC_NO, KC_MS_WH_DOWN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_LCTL, KC_NO, TG(2), KC_NO, TG(2), KC_NO, KC_NO, KC_NO, KC_NO),
KC_LCTL, KC_NO, TG(2), KC_NO, TG(2), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
};
// Customized HSV values for layer highlights
#define HSV_KMN_ORANGE 10,255, RGBLIGHT_LIMIT_VAL
#define HSV_KMN_CYAN 128, 255, RGBLIGHT_LIMIT_VAL
#define HSV_KMN_PURPLE 191, 255, RGBLIGHT_LIMIT_VAL
#define LED_UNDERGLOW_NUMBER 16
// Standard layout == Layer 0 == Orange
const rgblight_segment_t PROGMEM led_underglow_orange[] = RGBLIGHT_LAYER_SEGMENTS(
{0, LED_UNDERGLOW_NUMBER, HSV_KMN_ORANGE}
{0, RGBLED_NUM, HSV_KMN_ORANGE}
);
// Modifiers == Layer 1 == Cyan
const rgblight_segment_t PROGMEM led_underglow_cyan[] = RGBLIGHT_LAYER_SEGMENTS(
{0, LED_UNDERGLOW_NUMBER, HSV_KMN_CYAN}
{0, RGBLED_NUM, HSV_KMN_CYAN}
);
// Mouse keys == Layer 3 == Purple
const rgblight_segment_t PROGMEM led_underglow_purple[] = RGBLIGHT_LAYER_SEGMENTS(
{0, LED_UNDERGLOW_NUMBER, HSV_KMN_PURPLE}
{0, RGBLED_NUM, HSV_KMN_PURPLE}
);
// Array of layers for management

View file

@ -129,19 +129,17 @@
},
"",
{
"a": 4,
"w": 1.25
"a": 4
},
"Mouse\nFn",
{
"a": 6,
"w": 1.25
"a": 6
},
"Ctrl",
{
"x": 0.5,
"a": 7
},
"Alt",
"←",
"↓",
"→"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View file

@ -128,20 +128,14 @@
"w": 6.25
},
"",
{
"w": 1.25
},
"",
"",
"",
{
"a": 6,
"w": 1.25
"a": 6
},
"Alt",
{
"x": 0.5
},
"BL+",
"BL-",
"Vol Dn",
"BL-"
"BL+"
]
]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 23 KiB

View file

@ -149,17 +149,9 @@
"w": 6.25
},
"",
{
"w": 1.25
},
"",
{
"w": 1.25
},
"",
{
"x": 0.5
},
"",
"",
"",
""

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View file

@ -30,40 +30,39 @@ qk_tap_dance_action_t tap_dance_actions[] = {
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_65_ansi_blocker(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
[0] = LAYOUT_65_ansi(KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
LM(1, MOD_LALT), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, TD(LAYERS), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[1] = LAYOUT_65_ansi_blocker(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, TD(LAYERS), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
[1] = LAYOUT_65_ansi(KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_DEL,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_INS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PLAY_PAUSE, KC_RSFT, KC_VOLU, KC_MUTE,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, RGB_VAD, KC_VOLD, RGB_VAI),
[2] = LAYOUT_65_ansi_blocker(KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, KC_VOLD, RGB_VAI),
[2] = LAYOUT_65_ansi(KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_MS_UP, KC_NO, KC_NO, KC_NO, KC_MS_WH_UP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_NO, KC_NO, KC_MS_BTN1, KC_MS_BTN2, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_LSFT, KC_NO, KC_X, KC_C, KC_V, KC_NO, KC_NO, KC_MS_WH_DOWN, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_LCTL, KC_NO, TG(2), KC_NO, TG(2), KC_NO, KC_NO, KC_NO, KC_NO),
KC_LCTL, KC_NO, TG(2), KC_NO, TG(2), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
};
// Customized HSV values for layer highlights
#define HSV_KMN_ORANGE 10,255, RGBLIGHT_LIMIT_VAL
#define HSV_KMN_CYAN 128, 255, RGBLIGHT_LIMIT_VAL
#define HSV_KMN_PURPLE 191, 255, RGBLIGHT_LIMIT_VAL
#define LED_UNDERGLOW_NUMBER 16
// Standard layout == Layer 0 == Orange
const rgblight_segment_t PROGMEM led_underglow_orange[] = RGBLIGHT_LAYER_SEGMENTS(
{0, LED_UNDERGLOW_NUMBER, HSV_KMN_ORANGE}
{0, RGBLED_NUM, HSV_KMN_ORANGE}
);
// Modifiers == Layer 1 == Cyan
const rgblight_segment_t PROGMEM led_underglow_cyan[] = RGBLIGHT_LAYER_SEGMENTS(
{0, LED_UNDERGLOW_NUMBER, HSV_KMN_CYAN}
{0, RGBLED_NUM, HSV_KMN_CYAN}
);
// Mouse keys == Layer 3 == Purple
const rgblight_segment_t PROGMEM led_underglow_purple[] = RGBLIGHT_LAYER_SEGMENTS(
{0, LED_UNDERGLOW_NUMBER, HSV_KMN_PURPLE}
{0, RGBLED_NUM, HSV_KMN_PURPLE}
);
// Array of layers for management