Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
92d7964b28
@ -7,375 +7,235 @@
|
|||||||
"device_version": "1.0.0"
|
"device_version": "1.0.0"
|
||||||
},
|
},
|
||||||
"layouts": {
|
"layouts": {
|
||||||
"LAYOUT": {
|
"LAYOUT_all": {
|
||||||
"layout": [
|
"layout": [
|
||||||
{
|
{"label":"~", "x":0, "y":0.5},
|
||||||
"label": "EC",
|
{"label":"!", "x":1, "y":0.5},
|
||||||
"x": 16,
|
{"label":"@", "x":2, "y":0.5},
|
||||||
"y": 0
|
{"label":"#", "x":3, "y":0.5},
|
||||||
},
|
{"label":"$", "x":4, "y":0.5},
|
||||||
{
|
{"label":"%", "x":5, "y":0.5},
|
||||||
"label": "~",
|
{"label":"^", "x":6, "y":0.5},
|
||||||
"x": 0,
|
{"label":"&", "x":7, "y":0.5},
|
||||||
"y": 0.5
|
{"label":"*", "x":8, "y":0.5},
|
||||||
},
|
{"label":"(", "x":9, "y":0.5},
|
||||||
{
|
{"label":")", "x":10, "y":0.5},
|
||||||
"label": "!",
|
{"label":"_", "x":11, "y":0.5},
|
||||||
"x": 1,
|
{"label":"+", "x":12, "y":0.5},
|
||||||
"y": 0.5
|
{"label":"Backspace", "x":13, "y":0.5, "w":2},
|
||||||
},
|
{"label":"EC CCW", "x":16, "y":0},
|
||||||
{
|
{"label":"Insert", "x":15, "y":0.5},
|
||||||
"label": "@",
|
{"label":"EC CW", "x":16, "y":1},
|
||||||
"x": 2,
|
|
||||||
"y": 0.5
|
{"label":"Tab", "x":0, "y":1.5, "w":1.5},
|
||||||
},
|
{"label":"Q", "x":1.5, "y":1.5},
|
||||||
{
|
{"label":"W", "x":2.5, "y":1.5},
|
||||||
"label": "#",
|
{"label":"E", "x":3.5, "y":1.5},
|
||||||
"x": 3,
|
{"label":"R", "x":4.5, "y":1.5},
|
||||||
"y": 0.5
|
{"label":"T", "x":5.5, "y":1.5},
|
||||||
},
|
{"label":"Y", "x":6.5, "y":1.5},
|
||||||
{
|
{"label":"U", "x":7.5, "y":1.5},
|
||||||
"label": "$",
|
{"label":"I", "x":8.5, "y":1.5},
|
||||||
"x": 4,
|
{"label":"O", "x":9.5, "y":1.5},
|
||||||
"y": 0.5
|
{"label":"P", "x":10.5, "y":1.5},
|
||||||
},
|
{"label":"{", "x":11.5, "y":1.5},
|
||||||
{
|
{"label":"}", "x":12.5, "y":1.5},
|
||||||
"label": "%",
|
{"label":"|", "x":13.5, "y":1.5, "w":1.5},
|
||||||
"x": 5,
|
{"label":"PgUp", "x":15, "y":1.5},
|
||||||
"y": 0.5
|
|
||||||
},
|
{"label":"Caps Lock", "x":0, "y":2.5, "w":1.75},
|
||||||
{
|
{"label":"A", "x":1.75, "y":2.5},
|
||||||
"label": "^",
|
{"label":"S", "x":2.75, "y":2.5},
|
||||||
"x": 6,
|
{"label":"D", "x":3.75, "y":2.5},
|
||||||
"y": 0.5
|
{"label":"F", "x":4.75, "y":2.5},
|
||||||
},
|
{"label":"G", "x":5.75, "y":2.5},
|
||||||
{
|
{"label":"H", "x":6.75, "y":2.5},
|
||||||
"label": "&",
|
{"label":"J", "x":7.75, "y":2.5},
|
||||||
"x": 7,
|
{"label":"K", "x":8.75, "y":2.5},
|
||||||
"y": 0.5
|
{"label":"L", "x":9.75, "y":2.5},
|
||||||
},
|
{"label":":", "x":10.75, "y":2.5},
|
||||||
{
|
{"label":"\"", "x":11.75, "y":2.5},
|
||||||
"label": "*",
|
{"label":"Enter", "x":12.75, "y":2.5, "w":2.25},
|
||||||
"x": 8,
|
{"label":"PgDn", "x":15, "y":2.5},
|
||||||
"y": 0.5
|
|
||||||
},
|
{"label":"Shift", "x":0, "y":3.5, "w":2.25},
|
||||||
{
|
{"label":"Z", "x":2.25, "y":3.5},
|
||||||
"label": "(",
|
{"label":"X", "x":3.25, "y":3.5},
|
||||||
"x": 9,
|
{"label":"C", "x":4.25, "y":3.5},
|
||||||
"y": 0.5
|
{"label":"V", "x":5.25, "y":3.5},
|
||||||
},
|
{"label":"B", "x":6.25, "y":3.5},
|
||||||
{
|
{"label":"N", "x":7.25, "y":3.5},
|
||||||
"label": ")",
|
{"label":"M", "x":8.25, "y":3.5},
|
||||||
"x": 10,
|
{"label":"<", "x":9.25, "y":3.5},
|
||||||
"y": 0.5
|
{"label":">", "x":10.25, "y":3.5},
|
||||||
},
|
{"label":"?", "x":11.25, "y":3.5},
|
||||||
{
|
{"label":"Shift", "x":12.25, "y":3.5, "w":1.75},
|
||||||
"label": "_",
|
{"label":"\u2191", "x":14, "y":3.5},
|
||||||
"x": 11,
|
{"label":"Delete", "x":15, "y":3.5},
|
||||||
"y": 0.5
|
|
||||||
},
|
{"label":"Ctrl", "x":0, "y":4.5, "w":1.25},
|
||||||
{
|
{"label":"Win", "x":1.25, "y":4.5, "w":1.25},
|
||||||
"label": "+",
|
{"label":"Alt", "x":2.5, "y":4.5, "w":1.25},
|
||||||
"x": 12,
|
{"label":"Space", "x":3.75, "y":4.5, "w":2.25},
|
||||||
"y": 0.5
|
{"label":"Space", "x":6, "y":4.5, "w":1.75},
|
||||||
},
|
{"label":"Space", "x":7.75, "y":4.5, "w":2.25},
|
||||||
{
|
{"label":"Alt", "x":10, "y":4.5, "w":1.25},
|
||||||
"label": "Backspace",
|
{"label":"Fn", "x":11.25, "y":4.5, "w":1.25},
|
||||||
"x": 13,
|
{"label":"\u2190", "x":13, "y":4.5},
|
||||||
"y": 0.5,
|
{"label":"\u2193", "x":14, "y":4.5},
|
||||||
"w": 2
|
{"label":"\u2192", "x":15, "y":4.5}
|
||||||
},
|
]
|
||||||
{
|
},
|
||||||
"label": "Insert",
|
"LAYOUT_65_ansi_blocker": {
|
||||||
"x": 15,
|
"layout": [
|
||||||
"y": 0.5
|
{"label":"~", "x":0, "y":0},
|
||||||
},
|
{"label":"!", "x":1, "y":0},
|
||||||
{
|
{"label":"@", "x":2, "y":0},
|
||||||
"label": "EC",
|
{"label":"#", "x":3, "y":0},
|
||||||
"x": 16,
|
{"label":"$", "x":4, "y":0},
|
||||||
"y": 1
|
{"label":"%", "x":5, "y":0},
|
||||||
},
|
{"label":"^", "x":6, "y":0},
|
||||||
{
|
{"label":"&", "x":7, "y":0},
|
||||||
"label": "Tab",
|
{"label":"*", "x":8, "y":0},
|
||||||
"x": 0,
|
{"label":"(", "x":9, "y":0},
|
||||||
"y": 1.5,
|
{"label":")", "x":10, "y":0},
|
||||||
"w": 1.5
|
{"label":"_", "x":11, "y":0},
|
||||||
},
|
{"label":"+", "x":12, "y":0},
|
||||||
{
|
{"label":"Backspace", "x":13, "y":0, "w":2},
|
||||||
"label": "Q",
|
{"label":"Insert", "x":15, "y":0},
|
||||||
"x": 1.5,
|
|
||||||
"y": 1.5
|
{"label":"Tab", "x":0, "y":1, "w":1.5},
|
||||||
},
|
{"label":"Q", "x":1.5, "y":1},
|
||||||
{
|
{"label":"W", "x":2.5, "y":1},
|
||||||
"label": "W",
|
{"label":"E", "x":3.5, "y":1},
|
||||||
"x": 2.5,
|
{"label":"R", "x":4.5, "y":1},
|
||||||
"y": 1.5
|
{"label":"T", "x":5.5, "y":1},
|
||||||
},
|
{"label":"Y", "x":6.5, "y":1},
|
||||||
{
|
{"label":"U", "x":7.5, "y":1},
|
||||||
"label": "E",
|
{"label":"I", "x":8.5, "y":1},
|
||||||
"x": 3.5,
|
{"label":"O", "x":9.5, "y":1},
|
||||||
"y": 1.5
|
{"label":"P", "x":10.5, "y":1},
|
||||||
},
|
{"label":"{", "x":11.5, "y":1},
|
||||||
{
|
{"label":"}", "x":12.5, "y":1},
|
||||||
"label": "R",
|
{"label":"|", "x":13.5, "y":1, "w":1.5},
|
||||||
"x": 4.5,
|
{"label":"PgUp", "x":15, "y":1},
|
||||||
"y": 1.5
|
|
||||||
},
|
{"label":"Caps Lock", "x":0, "y":2, "w":1.75},
|
||||||
{
|
{"label":"A", "x":1.75, "y":2},
|
||||||
"label": "T",
|
{"label":"S", "x":2.75, "y":2},
|
||||||
"x": 5.5,
|
{"label":"D", "x":3.75, "y":2},
|
||||||
"y": 1.5
|
{"label":"F", "x":4.75, "y":2},
|
||||||
},
|
{"label":"G", "x":5.75, "y":2},
|
||||||
{
|
{"label":"H", "x":6.75, "y":2},
|
||||||
"label": "Y",
|
{"label":"J", "x":7.75, "y":2},
|
||||||
"x": 6.5,
|
{"label":"K", "x":8.75, "y":2},
|
||||||
"y": 1.5
|
{"label":"L", "x":9.75, "y":2},
|
||||||
},
|
{"label":":", "x":10.75, "y":2},
|
||||||
{
|
{"label":"\"", "x":11.75, "y":2},
|
||||||
"label": "U",
|
{"label":"Enter", "x":12.75, "y":2, "w":2.25},
|
||||||
"x": 7.5,
|
{"label":"PgDn", "x":15, "y":2},
|
||||||
"y": 1.5
|
|
||||||
},
|
{"label":"Shift", "x":0, "y":3, "w":2.25},
|
||||||
{
|
{"label":"Z", "x":2.25, "y":3},
|
||||||
"label": "I",
|
{"label":"X", "x":3.25, "y":3},
|
||||||
"x": 8.5,
|
{"label":"C", "x":4.25, "y":3},
|
||||||
"y": 1.5
|
{"label":"V", "x":5.25, "y":3},
|
||||||
},
|
{"label":"B", "x":6.25, "y":3},
|
||||||
{
|
{"label":"N", "x":7.25, "y":3},
|
||||||
"label": "O",
|
{"label":"M", "x":8.25, "y":3},
|
||||||
"x": 9.5,
|
{"label":"<", "x":9.25, "y":3},
|
||||||
"y": 1.5
|
{"label":">", "x":10.25, "y":3},
|
||||||
},
|
{"label":"?", "x":11.25, "y":3},
|
||||||
{
|
{"label":"Shift", "x":12.25, "y":3, "w":1.75},
|
||||||
"label": "P",
|
{"label":"\u2191", "x":14, "y":3},
|
||||||
"x": 10.5,
|
{"label":"Delete", "x":15, "y":3},
|
||||||
"y": 1.5
|
|
||||||
},
|
{"label":"Ctrl", "x":0, "y":4, "w":1.25},
|
||||||
{
|
{"label":"Win", "x":1.25, "y":4, "w":1.25},
|
||||||
"label": "{",
|
{"label":"Alt", "x":2.5, "y":4, "w":1.25},
|
||||||
"x": 11.5,
|
{"label":"Space", "x":3.75, "y":4, "w":6.25},
|
||||||
"y": 1.5
|
{"label":"Alt", "x":10, "y":4, "w":1.25},
|
||||||
},
|
{"label":"Fn", "x":11.25, "y":4, "w":1.25},
|
||||||
{
|
{"label":"\u2190", "x":13, "y":4},
|
||||||
"label": "}",
|
{"label":"\u2193", "x":14, "y":4},
|
||||||
"x": 12.5,
|
{"label":"\u2192", "x":15, "y":4}
|
||||||
"y": 1.5
|
]
|
||||||
},
|
},
|
||||||
{
|
"LAYOUT_65_ansi_blocker_split_space": {
|
||||||
"label": "|",
|
"layout": [
|
||||||
"x": 13.5,
|
{"label":"~", "x":0, "y":0},
|
||||||
"y": 1.5,
|
{"label":"!", "x":1, "y":0},
|
||||||
"w": 1.5
|
{"label":"@", "x":2, "y":0},
|
||||||
},
|
{"label":"#", "x":3, "y":0},
|
||||||
{
|
{"label":"$", "x":4, "y":0},
|
||||||
"label": "PgUp",
|
{"label":"%", "x":5, "y":0},
|
||||||
"x": 15,
|
{"label":"^", "x":6, "y":0},
|
||||||
"y": 1.5
|
{"label":"&", "x":7, "y":0},
|
||||||
},
|
{"label":"*", "x":8, "y":0},
|
||||||
{
|
{"label":"(", "x":9, "y":0},
|
||||||
"label": "Caps Lock",
|
{"label":")", "x":10, "y":0},
|
||||||
"x": 0,
|
{"label":"_", "x":11, "y":0},
|
||||||
"y": 2.5,
|
{"label":"+", "x":12, "y":0},
|
||||||
"w": 1.75
|
{"label":"Backspace", "x":13, "y":0, "w":2},
|
||||||
},
|
{"label":"Insert", "x":15, "y":0},
|
||||||
{
|
|
||||||
"label": "A",
|
{"label":"Tab", "x":0, "y":1, "w":1.5},
|
||||||
"x": 1.75,
|
{"label":"Q", "x":1.5, "y":1},
|
||||||
"y": 2.5
|
{"label":"W", "x":2.5, "y":1},
|
||||||
},
|
{"label":"E", "x":3.5, "y":1},
|
||||||
{
|
{"label":"R", "x":4.5, "y":1},
|
||||||
"label": "S",
|
{"label":"T", "x":5.5, "y":1},
|
||||||
"x": 2.75,
|
{"label":"Y", "x":6.5, "y":1},
|
||||||
"y": 2.5
|
{"label":"U", "x":7.5, "y":1},
|
||||||
},
|
{"label":"I", "x":8.5, "y":1},
|
||||||
{
|
{"label":"O", "x":9.5, "y":1},
|
||||||
"label": "D",
|
{"label":"P", "x":10.5, "y":1},
|
||||||
"x": 3.75,
|
{"label":"{", "x":11.5, "y":1},
|
||||||
"y": 2.5
|
{"label":"}", "x":12.5, "y":1},
|
||||||
},
|
{"label":"|", "x":13.5, "y":1, "w":1.5},
|
||||||
{
|
{"label":"PgUp", "x":15, "y":1},
|
||||||
"label": "F",
|
|
||||||
"x": 4.75,
|
{"label":"Caps Lock", "x":0, "y":2, "w":1.75},
|
||||||
"y": 2.5
|
{"label":"A", "x":1.75, "y":2},
|
||||||
},
|
{"label":"S", "x":2.75, "y":2},
|
||||||
{
|
{"label":"D", "x":3.75, "y":2},
|
||||||
"label": "G",
|
{"label":"F", "x":4.75, "y":2},
|
||||||
"x": 5.75,
|
{"label":"G", "x":5.75, "y":2},
|
||||||
"y": 2.5
|
{"label":"H", "x":6.75, "y":2},
|
||||||
},
|
{"label":"J", "x":7.75, "y":2},
|
||||||
{
|
{"label":"K", "x":8.75, "y":2},
|
||||||
"label": "H",
|
{"label":"L", "x":9.75, "y":2},
|
||||||
"x": 6.75,
|
{"label":":", "x":10.75, "y":2},
|
||||||
"y": 2.5
|
{"label":"\"", "x":11.75, "y":2},
|
||||||
},
|
{"label":"Enter", "x":12.75, "y":2, "w":2.25},
|
||||||
{
|
{"label":"PgDn", "x":15, "y":2},
|
||||||
"label": "J",
|
|
||||||
"x": 7.75,
|
{"label":"Shift", "x":0, "y":3, "w":2.25},
|
||||||
"y": 2.5
|
{"label":"Z", "x":2.25, "y":3},
|
||||||
},
|
{"label":"X", "x":3.25, "y":3},
|
||||||
{
|
{"label":"C", "x":4.25, "y":3},
|
||||||
"label": "K",
|
{"label":"V", "x":5.25, "y":3},
|
||||||
"x": 8.75,
|
{"label":"B", "x":6.25, "y":3},
|
||||||
"y": 2.5
|
{"label":"N", "x":7.25, "y":3},
|
||||||
},
|
{"label":"M", "x":8.25, "y":3},
|
||||||
{
|
{"label":"<", "x":9.25, "y":3},
|
||||||
"label": "L",
|
{"label":">", "x":10.25, "y":3},
|
||||||
"x": 9.75,
|
{"label":"?", "x":11.25, "y":3},
|
||||||
"y": 2.5
|
{"label":"Shift", "x":12.25, "y":3, "w":1.75},
|
||||||
},
|
{"label":"\u2191", "x":14, "y":3},
|
||||||
{
|
{"label":"Delete", "x":15, "y":3},
|
||||||
"label": ":",
|
|
||||||
"x": 10.75,
|
{"label":"Ctrl", "x":0, "y":4, "w":1.25},
|
||||||
"y": 2.5
|
{"label":"Win", "x":1.25, "y":4, "w":1.25},
|
||||||
},
|
{"label":"Alt", "x":2.5, "y":4, "w":1.25},
|
||||||
{
|
{"label":"Space", "x":3.75, "y":4, "w":2.25},
|
||||||
"label": "\"",
|
{"label":"Space", "x":6, "y":4, "w":1.75},
|
||||||
"x": 11.75,
|
{"label":"Space", "x":7.75, "y":4, "w":2.25},
|
||||||
"y": 2.5
|
{"label":"Alt", "x":10, "y":4, "w":1.25},
|
||||||
},
|
{"label":"Fn", "x":11.25, "y":4, "w":1.25},
|
||||||
{
|
{"label":"\u2190", "x":13, "y":4},
|
||||||
"label": "Enter",
|
{"label":"\u2193", "x":14, "y":4},
|
||||||
"x": 12.75,
|
{"label":"\u2192", "x":15, "y":4}
|
||||||
"y": 2.5,
|
|
||||||
"w": 2.25
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "PgDn",
|
|
||||||
"x": 15,
|
|
||||||
"y": 2.5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "Shift",
|
|
||||||
"x": 0,
|
|
||||||
"y": 3.5,
|
|
||||||
"w": 2.25
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "Z",
|
|
||||||
"x": 2.25,
|
|
||||||
"y": 3.5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "X",
|
|
||||||
"x": 3.25,
|
|
||||||
"y": 3.5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "C",
|
|
||||||
"x": 4.25,
|
|
||||||
"y": 3.5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "V",
|
|
||||||
"x": 5.25,
|
|
||||||
"y": 3.5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "B",
|
|
||||||
"x": 6.25,
|
|
||||||
"y": 3.5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "N",
|
|
||||||
"x": 7.25,
|
|
||||||
"y": 3.5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "M",
|
|
||||||
"x": 8.25,
|
|
||||||
"y": 3.5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "<",
|
|
||||||
"x": 9.25,
|
|
||||||
"y": 3.5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": ">",
|
|
||||||
"x": 10.25,
|
|
||||||
"y": 3.5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "?",
|
|
||||||
"x": 11.25,
|
|
||||||
"y": 3.5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "Shift",
|
|
||||||
"x": 12.25,
|
|
||||||
"y": 3.5,
|
|
||||||
"w": 1.75
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "\u2191",
|
|
||||||
"x": 14,
|
|
||||||
"y": 3.5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "Delete",
|
|
||||||
"x": 15,
|
|
||||||
"y": 3.5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "Ctrl",
|
|
||||||
"x": 0,
|
|
||||||
"y": 4.5,
|
|
||||||
"w": 1.25
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "Win",
|
|
||||||
"x": 1.25,
|
|
||||||
"y": 4.5,
|
|
||||||
"w": 1.25
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "Alt",
|
|
||||||
"x": 2.5,
|
|
||||||
"y": 4.5,
|
|
||||||
"w": 1.25
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"x": 3.75,
|
|
||||||
"y": 4.5,
|
|
||||||
"w": 2.25
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"x": 6,
|
|
||||||
"y": 4.5,
|
|
||||||
"w": 1.75
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"x": 7.75,
|
|
||||||
"y": 4.5,
|
|
||||||
"w": 2.25
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "Alt",
|
|
||||||
"x": 10,
|
|
||||||
"y": 4.5,
|
|
||||||
"w": 1.25
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "Fn",
|
|
||||||
"x": 11.25,
|
|
||||||
"y": 4.5,
|
|
||||||
"w": 1.25
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "\u2190",
|
|
||||||
"x": 13,
|
|
||||||
"y": 4.5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "\u2193",
|
|
||||||
"x": 14,
|
|
||||||
"y": 4.5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "\u2192",
|
|
||||||
"x": 15,
|
|
||||||
"y": 4.5
|
|
||||||
}
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,17 +17,17 @@
|
|||||||
#include QMK_KEYBOARD_H
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
[0] = LAYOUT(
|
[0] = LAYOUT_all(
|
||||||
KC_ESC, 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_ESC, 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_VOLD, KC_HOME, KC_VOLU,
|
||||||
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_END,
|
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_END,
|
||||||
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_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_PGUP,
|
||||||
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_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_PGDN,
|
||||||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_VOLD,KC_SPC, KC_VOLU, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
|
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
|
||||||
[1] = LAYOUT(
|
[1] = LAYOUT_all(
|
||||||
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_TRNS,
|
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_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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||||
KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, LOCK_GUI,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, LOCK_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||||
KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, 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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -17,30 +17,30 @@
|
|||||||
#include QMK_KEYBOARD_H
|
#include QMK_KEYBOARD_H
|
||||||
|
|
||||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
[0] = LAYOUT(
|
[0] = LAYOUT_all(
|
||||||
KC_ESC, 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_ESC, 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_VOLD, KC_HOME, KC_VOLU,
|
||||||
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_END,
|
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_END,
|
||||||
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_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_PGUP,
|
||||||
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_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_PGDN,
|
||||||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_VOLD,KC_SPC, KC_VOLU, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
|
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
|
||||||
[1] = LAYOUT(
|
[1] = LAYOUT_all(
|
||||||
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_TRNS,
|
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_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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||||
KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, LOCK_GUI,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
KC_TRNS, URGB_K, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, LOCK_GUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||||
KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, 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_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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
|
||||||
[2] = LAYOUT(
|
[2] = LAYOUT_all(
|
||||||
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_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_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_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_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_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_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_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_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_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_TRNS),
|
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
|
||||||
[3] = LAYOUT(
|
[3] = LAYOUT_all(
|
||||||
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_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_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_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_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_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_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_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_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_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_TRNS)
|
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
|
||||||
};
|
};
|
||||||
#ifdef ENCODER_ENABLE
|
#ifdef ENCODER_ENABLE
|
||||||
keyevent_t encoder1_ccw = {.key = (keypos_t){.row = 4, .col = 4}, .pressed = false};
|
keyevent_t encoder1_ccw = {.key = (keypos_t){.row = 4, .col = 4}, .pressed = false};
|
||||||
|
|||||||
@ -17,21 +17,68 @@
|
|||||||
|
|
||||||
#include "quantum.h"
|
#include "quantum.h"
|
||||||
|
|
||||||
#define LAYOUT( \
|
#define ____ KC_NO
|
||||||
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
|
|
||||||
K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
|
/*
|
||||||
K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \
|
* optional encoder (404│406)
|
||||||
K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \
|
* \ /
|
||||||
K400, K401, K402, K403, K404, K405, K406, K407, K409, K410, K412, K413, K414 \
|
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
|
||||||
|
* │000│001│002│003│004│005│006│007│008│009│010│011│012│013 │014│
|
||||||
|
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
|
||||||
|
* │100 │101│102│103│104│105│106│107│108│109│110│111│112│113 │114│
|
||||||
|
* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
|
||||||
|
* │200 │201│202│203│204│205│206│207│208│209│210│211│213 │214│
|
||||||
|
* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
|
||||||
|
* │300 │301│302│303│304│305│306│307│308│309│310│312 │313│314│
|
||||||
|
* ├────┬───┴┬──┴─┬─┴───┴──┬┴───┴─┬─┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
|
||||||
|
* │400 │401 │402 │403 │405 │407 │409 │410 │ │412│413│414│
|
||||||
|
* └────┴────┴────┴────────┴──────┴────────┴────┴────┘ └───┴───┴───┘
|
||||||
|
* ┌────┬────┬────┬────────────────────────┬────┬────┐
|
||||||
|
* │400 │401 │402 │405 │409 │410 │ Standard
|
||||||
|
* └────┴────┴────┴────────────────────────┴────┴────┘
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define LAYOUT_all( \
|
||||||
|
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K404, K014, K406, \
|
||||||
|
K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
|
||||||
|
K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \
|
||||||
|
K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \
|
||||||
|
K400, K401, K402, K403, K405, K407, K409, K410, K412, K413, K414 \
|
||||||
) { \
|
) { \
|
||||||
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
|
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
|
||||||
{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
|
{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
|
||||||
{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, K214 }, \
|
{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \
|
||||||
{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, KC_NO, K312, K313, K314 }, \
|
{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
|
||||||
{ K400, K401, K402, K403, K404, K405, K406, K407, KC_NO, K409, K410, KC_NO, K412, K413, K414 } \
|
{ K400, K401, K402, K403, K404, K405, K406, K407, ____, K409, K410, ____, K412, K413, K414 } \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define LAYOUT_65_ansi_blocker( \
|
||||||
|
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
|
||||||
|
K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
|
||||||
|
K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \
|
||||||
|
K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \
|
||||||
|
K400, K401, K402, K405, K409, K410, K412, K413, K414 \
|
||||||
|
) { \
|
||||||
|
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
|
||||||
|
{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
|
||||||
|
{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \
|
||||||
|
{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
|
||||||
|
{ K400, K401, K402, ____, ____, K405, ____, ____, ____, K409, K410, ____, K412, K413, K414 } \
|
||||||
|
}
|
||||||
|
|
||||||
|
#define LAYOUT_65_ansi_blocker_split_space( \
|
||||||
|
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
|
||||||
|
K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
|
||||||
|
K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \
|
||||||
|
K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \
|
||||||
|
K400, K401, K402, K403, K405, K407, K409, K410, K412, K413, K414 \
|
||||||
|
) { \
|
||||||
|
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
|
||||||
|
{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
|
||||||
|
{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, ____, K213, K214 }, \
|
||||||
|
{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, ____, K312, K313, K314 }, \
|
||||||
|
{ K400, K401, K402, K403, ____, K405, ____, K407, ____, K409, K410, ____, K412, K413, K414 } \
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef RGB_MATRIX_ENABLE
|
#ifdef RGB_MATRIX_ENABLE
|
||||||
# define URGB_K KC_F24
|
# define URGB_K KC_F24
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user