1
0
Fork 0

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2022-01-29 23:28:42 +00:00
commit b001d9383a
4 changed files with 552 additions and 552 deletions

View file

@ -6,22 +6,22 @@
"LAYOUT_all": { "LAYOUT_all": {
"layout": [ "layout": [
{"label":"Esc", "x":0, "y":0}, {"label":"Esc", "x":0, "y":0},
{ "label": "F1", "x": 1.5, "y": 0 }, {"label":"F1", "x":1.25, "y":0},
{ "label": "F2", "x": 2.5, "y": 0 }, {"label":"F2", "x":2.25, "y":0},
{ "label": "F3", "x": 3.5, "y": 0 }, {"label":"F3", "x":3.25, "y":0},
{ "label": "F4", "x": 4.5, "y": 0 }, {"label":"F4", "x":4.25, "y":0},
{ "label": "F5", "x": 6, "y": 0 }, {"label":"F5", "x":5.5, "y":0},
{ "label": "F6", "x": 7, "y": 0 }, {"label":"F6", "x":6.5, "y":0},
{ "label": "F7", "x": 8, "y": 0 }, {"label":"F7", "x":7.5, "y":0},
{ "label": "F8", "x": 9, "y": 0 }, {"label":"F8", "x":8.5, "y":0},
{ "label": "F9", "x": 10.5, "y": 0 }, {"label":"F9", "x":9.75, "y":0},
{ "label": "F10", "x": 11.5, "y": 0 }, {"label":"F10", "x":10.75, "y":0},
{ "label": "F11", "x": 12.5, "y": 0 }, {"label":"F11", "x":11.75, "y":0},
{ "label": "F12", "x": 13.5, "y": 0 }, {"label":"F12", "x":12.75, "y":0},
{ "label": "Delete", "x": 15, "y": 0 }, {"label":"Delete", "x":14, "y":0},
{ "label": "EncoderRotateL", "x": 15.25, "y": 1.25, "w": 0.25 }, {"label":"EncoderRotateL", "x":15.65, "y":0.125, "w":0.6, "h":0.5},
{ "label": "EncoderClick", "x": 15.75, "y": 1.25 }, {"label":"EncoderClick", "x":15.75, "y":0.625},
{ "label": "EncoderRotateR", "x": 16.75, "y": 1.25, "w": 0.25 }, {"label":"EncoderRotateR", "x":16.25, "y":0.125, "w":0.6, "h":0.5},
{"label":"~", "x":0, "y":1.25}, {"label":"~", "x":0, "y":1.25},
{"label":"1", "x":1, "y":1.25}, {"label":"1", "x":1, "y":1.25},
@ -37,6 +37,7 @@
{"label":"-", "x":11, "y":1.25}, {"label":"-", "x":11, "y":1.25},
{"label":"=", "x":12, "y":1.25}, {"label":"=", "x":12, "y":1.25},
{"label":"Backspace", "x":13, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25},
{"label":"Backspace1", "x":14, "y":1.25},
{"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Tab", "x":0, "y":2.25, "w":1.5},
{"label":"Q", "x":1.5, "y":2.25}, {"label":"Q", "x":1.5, "y":2.25},
@ -68,7 +69,6 @@
{"label":";", "x":10.75, "y":3.25}, {"label":";", "x":10.75, "y":3.25},
{"label":"'", "x":11.75, "y":3.25}, {"label":"'", "x":11.75, "y":3.25},
{"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
{ "label": "Backspace1", "x": 14, "y": 1.25 },
{"label":"End", "x":15.25, "y":3.25}, {"label":"End", "x":15.25, "y":3.25},
{"label":"PageDown", "x":16.25, "y":3.25}, {"label":"PageDown", "x":16.25, "y":3.25},
@ -86,7 +86,7 @@
{"label":"/", "x":11.25, "y":4.25}, {"label":"/", "x":11.25, "y":4.25},
{"label":"Shift1", "x":12.25, "y":4.25, "w":1.75}, {"label":"Shift1", "x":12.25, "y":4.25, "w":1.75},
{"label":"Shift2", "x":14, "y":4.25}, {"label":"Shift2", "x":14, "y":4.25},
{ "label": "\u2191", "x": 15.25, "y": 4.25 }, {"label":"\u2191", "x":15.25, "y":4.5},
{"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
{"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
@ -97,28 +97,28 @@
{"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25},
{"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
{"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
{ "label": "\u2190", "x": 14.25, "y": 5.25 }, {"label":"\u2190", "x":14.25, "y":5.5},
{ "label": "\u2193", "x": 15.25, "y": 5.25 }, {"label":"\u2193", "x":15.25, "y":5.5},
{ "label": "\u2192", "x": 16.25, "y": 5.25 } {"label":"\u2192", "x":16.25, "y":5.5}
] ]
}, },
"LAYOUT_75_ansi": { "LAYOUT_75_ansi": {
"layout": [ "layout": [
{"label":"Esc", "x":0, "y":0}, {"label":"Esc", "x":0, "y":0},
{ "label": "F1", "x": 1.5, "y": 0 }, {"label":"F1", "x":1.25, "y":0},
{ "label": "F2", "x": 2.5, "y": 0 }, {"label":"F2", "x":2.25, "y":0},
{ "label": "F3", "x": 3.5, "y": 0 }, {"label":"F3", "x":3.25, "y":0},
{ "label": "F4", "x": 4.5, "y": 0 }, {"label":"F4", "x":4.25, "y":0},
{ "label": "F5", "x": 6, "y": 0 }, {"label":"F5", "x":5.5, "y":0},
{ "label": "F6", "x": 7, "y": 0 }, {"label":"F6", "x":6.5, "y":0},
{ "label": "F7", "x": 8, "y": 0 }, {"label":"F7", "x":7.5, "y":0},
{ "label": "F8", "x": 9, "y": 0 }, {"label":"F8", "x":8.5, "y":0},
{ "label": "F9", "x": 10.5, "y": 0 }, {"label":"F9", "x":9.75, "y":0},
{ "label": "F10", "x": 11.5, "y": 0 }, {"label":"F10", "x":10.75, "y":0},
{ "label": "F11", "x": 12.5, "y": 0 }, {"label":"F11", "x":11.75, "y":0},
{ "label": "F12", "x": 13.5, "y": 0 }, {"label":"F12", "x":12.75, "y":0},
{ "label": "Delete", "x": 15, "y": 0 }, {"label":"Delete", "x":14, "y":0},
{ "label": "EncoderClick", "x": 15.75, "y": 1.25 }, {"label":"EncoderClick", "x":15.75, "y":0.625},
{"label":"~", "x":0, "y":1.25}, {"label":"~", "x":0, "y":1.25},
{"label":"1", "x":1, "y":1.25}, {"label":"1", "x":1, "y":1.25},
@ -180,7 +180,7 @@
{"label":".", "x":10.25, "y":4.25}, {"label":".", "x":10.25, "y":4.25},
{"label":"/", "x":11.25, "y":4.25}, {"label":"/", "x":11.25, "y":4.25},
{"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
{ "label": "\u2191", "x": 15.25, "y": 4.25 }, {"label":"\u2191", "x":15.25, "y":4.5},
{"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
{"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
@ -189,28 +189,28 @@
{"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25},
{"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
{"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
{ "label": "\u2190", "x": 14.25, "y": 5.25 }, {"label":"\u2190", "x":14.25, "y":5.5},
{ "label": "\u2193", "x": 15.25, "y": 5.25 }, {"label":"\u2193", "x":15.25, "y":5.5},
{ "label": "\u2192", "x": 16.25, "y": 5.25 } {"label":"\u2192", "x":16.25, "y":5.5}
] ]
}, },
"LAYOUT_75_ansi_split_lshift": { "LAYOUT_75_ansi_split_lshift": {
"layout": [ "layout": [
{"label":"Esc", "x":0, "y":0}, {"label":"Esc", "x":0, "y":0},
{ "label": "F1", "x": 1.5, "y": 0 }, {"label":"F1", "x":1.25, "y":0},
{ "label": "F2", "x": 2.5, "y": 0 }, {"label":"F2", "x":2.25, "y":0},
{ "label": "F3", "x": 3.5, "y": 0 }, {"label":"F3", "x":3.25, "y":0},
{ "label": "F4", "x": 4.5, "y": 0 }, {"label":"F4", "x":4.25, "y":0},
{ "label": "F5", "x": 6, "y": 0 }, {"label":"F5", "x":5.5, "y":0},
{ "label": "F6", "x": 7, "y": 0 }, {"label":"F6", "x":6.5, "y":0},
{ "label": "F7", "x": 8, "y": 0 }, {"label":"F7", "x":7.5, "y":0},
{ "label": "F8", "x": 9, "y": 0 }, {"label":"F8", "x":8.5, "y":0},
{ "label": "F9", "x": 10.5, "y": 0 }, {"label":"F9", "x":9.75, "y":0},
{ "label": "F10", "x": 11.5, "y": 0 }, {"label":"F10", "x":10.75, "y":0},
{ "label": "F11", "x": 12.5, "y": 0 }, {"label":"F11", "x":11.75, "y":0},
{ "label": "F12", "x": 13.5, "y": 0 }, {"label":"F12", "x":12.75, "y":0},
{ "label": "Delete", "x": 15, "y": 0 }, {"label":"Delete", "x":14, "y":0},
{ "label": "EncoderClick", "x": 15.75, "y": 1.25 }, {"label":"EncoderClick", "x":15.75, "y":0.625},
{"label":"~", "x":0, "y":1.25}, {"label":"~", "x":0, "y":1.25},
{"label":"1", "x":1, "y":1.25}, {"label":"1", "x":1, "y":1.25},
@ -273,7 +273,7 @@
{"label":".", "x":10.25, "y":4.25}, {"label":".", "x":10.25, "y":4.25},
{"label":"/", "x":11.25, "y":4.25}, {"label":"/", "x":11.25, "y":4.25},
{"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
{ "label": "\u2191", "x": 15.25, "y": 4.25 }, {"label":"\u2191", "x":15.25, "y":4.5},
{"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
{"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
@ -282,28 +282,28 @@
{"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25},
{"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
{"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
{ "label": "\u2190", "x": 14.25, "y": 5.25 }, {"label":"\u2190", "x":14.25, "y":5.5},
{ "label": "\u2193", "x": 15.25, "y": 5.25 }, {"label":"\u2193", "x":15.25, "y":5.5},
{ "label": "\u2192", "x": 16.25, "y": 5.25 } {"label":"\u2192", "x":16.25, "y":5.5}
] ]
}, },
"LAYOUT_75_ansi_split_rshift": { "LAYOUT_75_ansi_split_rshift": {
"layout": [ "layout": [
{"label":"Esc", "x":0, "y":0}, {"label":"Esc", "x":0, "y":0},
{ "label": "F1", "x": 1.5, "y": 0 }, {"label":"F1", "x":1.25, "y":0},
{ "label": "F2", "x": 2.5, "y": 0 }, {"label":"F2", "x":2.25, "y":0},
{ "label": "F3", "x": 3.5, "y": 0 }, {"label":"F3", "x":3.25, "y":0},
{ "label": "F4", "x": 4.5, "y": 0 }, {"label":"F4", "x":4.25, "y":0},
{ "label": "F5", "x": 6, "y": 0 }, {"label":"F5", "x":5.5, "y":0},
{ "label": "F6", "x": 7, "y": 0 }, {"label":"F6", "x":6.5, "y":0},
{ "label": "F7", "x": 8, "y": 0 }, {"label":"F7", "x":7.5, "y":0},
{ "label": "F8", "x": 9, "y": 0 }, {"label":"F8", "x":8.5, "y":0},
{ "label": "F9", "x": 10.5, "y": 0 }, {"label":"F9", "x":9.75, "y":0},
{ "label": "F10", "x": 11.5, "y": 0 }, {"label":"F10", "x":10.75, "y":0},
{ "label": "F11", "x": 12.5, "y": 0 }, {"label":"F11", "x":11.75, "y":0},
{ "label": "F12", "x": 13.5, "y": 0 }, {"label":"F12", "x":12.75, "y":0},
{ "label": "Delete", "x": 15, "y": 0 }, {"label":"Delete", "x":14, "y":0},
{ "label": "EncoderClick", "x": 15.75, "y": 1.25 }, {"label":"EncoderClick", "x":15.75, "y":0.625},
{"label":"~", "x":0, "y":1.25}, {"label":"~", "x":0, "y":1.25},
{"label":"1", "x":1, "y":1.25}, {"label":"1", "x":1, "y":1.25},
@ -366,7 +366,7 @@
{"label":"/", "x":11.25, "y":4.25}, {"label":"/", "x":11.25, "y":4.25},
{"label":"Shift1", "x":12.25, "y":4.25, "w":1.75}, {"label":"Shift1", "x":12.25, "y":4.25, "w":1.75},
{"label":"Shift2", "x":14, "y":4.25}, {"label":"Shift2", "x":14, "y":4.25},
{ "label": "\u2191", "x": 15.25, "y": 4.25 }, {"label":"\u2191", "x":15.25, "y":4.5},
{"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
{"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
@ -375,28 +375,28 @@
{"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25},
{"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
{"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
{ "label": "\u2190", "x": 14.25, "y": 5.25 }, {"label":"\u2190", "x":14.25, "y":5.5},
{ "label": "\u2193", "x": 15.25, "y": 5.25 }, {"label":"\u2193", "x":15.25, "y":5.5},
{ "label": "\u2192", "x": 16.25, "y": 5.25 } {"label":"\u2192", "x":16.25, "y":5.5}
] ]
}, },
"LAYOUT_75_ansi_split_bs": { "LAYOUT_75_ansi_split_bs": {
"layout": [ "layout": [
{"label":"Esc", "x":0, "y":0}, {"label":"Esc", "x":0, "y":0},
{ "label": "F1", "x": 1.5, "y": 0 }, {"label":"F1", "x":1.25, "y":0},
{ "label": "F2", "x": 2.5, "y": 0 }, {"label":"F2", "x":2.25, "y":0},
{ "label": "F3", "x": 3.5, "y": 0 }, {"label":"F3", "x":3.25, "y":0},
{ "label": "F4", "x": 4.5, "y": 0 }, {"label":"F4", "x":4.25, "y":0},
{ "label": "F5", "x": 6, "y": 0 }, {"label":"F5", "x":5.5, "y":0},
{ "label": "F6", "x": 7, "y": 0 }, {"label":"F6", "x":6.5, "y":0},
{ "label": "F7", "x": 8, "y": 0 }, {"label":"F7", "x":7.5, "y":0},
{ "label": "F8", "x": 9, "y": 0 }, {"label":"F8", "x":8.5, "y":0},
{ "label": "F9", "x": 10.5, "y": 0 }, {"label":"F9", "x":9.75, "y":0},
{ "label": "F10", "x": 11.5, "y": 0 }, {"label":"F10", "x":10.75, "y":0},
{ "label": "F11", "x": 12.5, "y": 0 }, {"label":"F11", "x":11.75, "y":0},
{ "label": "F12", "x": 13.5, "y": 0 }, {"label":"F12", "x":12.75, "y":0},
{ "label": "Delete", "x": 15, "y": 0 }, {"label":"Delete", "x":14, "y":0},
{ "label": "EncoderClick", "x": 15.75, "y": 1.25 }, {"label":"EncoderClick", "x":15.75, "y":0.625},
{"label":"~", "x":0, "y":1.25}, {"label":"~", "x":0, "y":1.25},
{"label":"1", "x":1, "y":1.25}, {"label":"1", "x":1, "y":1.25},
@ -459,7 +459,7 @@
{"label":".", "x":10.25, "y":4.25}, {"label":".", "x":10.25, "y":4.25},
{"label":"/", "x":11.25, "y":4.25}, {"label":"/", "x":11.25, "y":4.25},
{"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
{ "label": "\u2191", "x": 15.25, "y": 4.25 }, {"label":"\u2191", "x":15.25, "y":4.5},
{"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
{"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
@ -468,28 +468,28 @@
{"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25},
{"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
{"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
{ "label": "\u2190", "x": 14.25, "y": 5.25 }, {"label":"\u2190", "x":14.25, "y":5.5},
{ "label": "\u2193", "x": 15.25, "y": 5.25 }, {"label":"\u2193", "x":15.25, "y":5.5},
{ "label": "\u2192", "x": 16.25, "y": 5.25 } {"label":"\u2192", "x":16.25, "y":5.5}
] ]
}, },
"LAYOUT_75_ansi_split_space": { "LAYOUT_75_ansi_split_space": {
"layout": [ "layout": [
{"label":"Esc", "x":0, "y":0}, {"label":"Esc", "x":0, "y":0},
{ "label": "F1", "x": 1.5, "y": 0 }, {"label":"F1", "x":1.25, "y":0},
{ "label": "F2", "x": 2.5, "y": 0 }, {"label":"F2", "x":2.25, "y":0},
{ "label": "F3", "x": 3.5, "y": 0 }, {"label":"F3", "x":3.25, "y":0},
{ "label": "F4", "x": 4.5, "y": 0 }, {"label":"F4", "x":4.25, "y":0},
{ "label": "F5", "x": 6, "y": 0 }, {"label":"F5", "x":5.5, "y":0},
{ "label": "F6", "x": 7, "y": 0 }, {"label":"F6", "x":6.5, "y":0},
{ "label": "F7", "x": 8, "y": 0 }, {"label":"F7", "x":7.5, "y":0},
{ "label": "F8", "x": 9, "y": 0 }, {"label":"F8", "x":8.5, "y":0},
{ "label": "F9", "x": 10.5, "y": 0 }, {"label":"F9", "x":9.75, "y":0},
{ "label": "F10", "x": 11.5, "y": 0 }, {"label":"F10", "x":10.75, "y":0},
{ "label": "F11", "x": 12.5, "y": 0 }, {"label":"F11", "x":11.75, "y":0},
{ "label": "F12", "x": 13.5, "y": 0 }, {"label":"F12", "x":12.75, "y":0},
{ "label": "Delete", "x": 15, "y": 0 }, {"label":"Delete", "x":14, "y":0},
{ "label": "EncoderClick", "x": 15.75, "y": 1.25 }, {"label":"EncoderClick", "x":15.75, "y":0.625},
{"label":"~", "x":0, "y":1.25}, {"label":"~", "x":0, "y":1.25},
{"label":"1", "x":1, "y":1.25}, {"label":"1", "x":1, "y":1.25},
@ -551,7 +551,7 @@
{"label":".", "x":10.25, "y":4.25}, {"label":".", "x":10.25, "y":4.25},
{"label":"/", "x":11.25, "y":4.25}, {"label":"/", "x":11.25, "y":4.25},
{"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
{ "label": "\u2191", "x": 15.25, "y": 4.25 }, {"label":"\u2191", "x":15.25, "y":4.5},
{"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
{"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
@ -562,9 +562,9 @@
{"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25},
{"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
{"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
{ "label": "\u2190", "x": 14.25, "y": 5.25 }, {"label":"\u2190", "x":14.25, "y":5.5},
{ "label": "\u2193", "x": 15.25, "y": 5.25 }, {"label":"\u2193", "x":15.25, "y":5.5},
{ "label": "\u2192", "x": 16.25, "y": 5.25 } {"label":"\u2192", "x":16.25, "y":5.5}
] ]
} }
} }

View file

@ -19,17 +19,17 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all( [0] = LAYOUT_all(
KC_ESC, 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_VOLD, KC_MUTE,KC_VOLU, KC_ESC, 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_VOLD, KC_MUTE,KC_VOLU,
KC_GRV, 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_GRV, 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_BSPC,
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_INS, KC_PGUP, 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_INS, KC_PGUP,
KC_CAPS, 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_BSPC, KC_END, KC_PGDN, KC_CAPS, 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_END, KC_PGDN,
KC_LSFT, 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_RSFT, KC_UP, KC_LSFT, 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_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
), ),
[1] = LAYOUT_all( [1] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
), ),

View file

@ -19,34 +19,34 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all( [0] = LAYOUT_all(
KC_ESC, 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_VOLD, KC_MUTE,KC_VOLU, KC_ESC, 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_VOLD, KC_MUTE,KC_VOLU,
KC_GRV, 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_GRV, 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_BSPC,
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_INS, KC_PGUP, 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_INS, KC_PGUP,
KC_CAPS, 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_BSPC, KC_END, KC_PGDN, KC_CAPS, 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_END, KC_PGDN,
KC_LSFT, 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_RSFT, KC_UP, KC_LSFT, 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_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
), ),
[1] = LAYOUT_all( [1] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
), ),
[2] = LAYOUT_all( [2] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
), ),
[3] = LAYOUT_all( [3] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
), ),
}; };

View file

@ -38,9 +38,9 @@
*/ */
#define LAYOUT_all( \ #define LAYOUT_all( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K53, K0E, K55, \ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K53, K0E, K55, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K3F, \
K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \
K50, K51, K52, K54, K56, K58, K5A, K5B, K5C, K5D, K5E, K5F \ K50, K51, K52, K54, K56, K58, K5A, K5B, K5C, K5D, K5E, K5F \
) { \ ) { \