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

This commit is contained in:
QMK Bot 2023-06-21 16:00:31 +00:00
commit 673b536d70
2 changed files with 95 additions and 181 deletions

View file

@ -18,105 +18,5 @@
}, },
"build": { "build": {
"lto": true "lto": true
},
"layouts": {
"LAYOUT_65xt": {
"layout": [
{"label":"F1", "x":0, "y":0},
{"label":"F2", "x":1, "y":0},
{"label":"Esc", "x":2.25, "y":0},
{"label":"1", "x":3.25, "y":0},
{"label":"2", "x":4.25, "y":0},
{"label":"3", "x":5.25, "y":0},
{"label":"4", "x":6.25, "y":0},
{"label":"5", "x":7.25, "y":0},
{"label":"6", "x":8.25, "y":0},
{"label":"7", "x":10.25, "y":0},
{"label":"8", "x":11.25, "y":0},
{"label":"9", "x":12.25, "y":0},
{"label":"0", "x":13.25, "y":0},
{"label":"-", "x":14.25, "y":0},
{"label":"=", "x":15.25, "y":0},
{"label":"Bksp", "x":17.25, "y":0, "w": 2},
{"label":"Del", "x":18.25, "y":0},
{"label":"F3", "x":0, "y":1},
{"label":"F4", "x":1, "y":1},
{"label":"Tab", "x":2.25, "y":1, "w":1.5},
{"label":"Q", "x":3.75, "y":1},
{"label":"W", "x":4.75, "y":1},
{"label":"E", "x":5.75, "y":1},
{"label":"R", "x":6.75, "y":1},
{"label":"T", "x":7.75, "y":1},
{"label":"Y", "x":9.75, "y":1},
{"label":"U", "x":10.75, "y":1},
{"label":"I", "x":11.75, "y":1},
{"label":"O", "x":12.75, "y":1},
{"label":"P", "x":13.75, "y":1},
{"label":"{", "x":14.75, "y":1},
{"label":"}", "x":15.75, "y":1},
{"label":"|", "x":16.75, "y":1, "w":1.5},
{"label":"Home", "x":18.25, "y":1},
{"label":"F5", "x":0, "y":2},
{"label":"F6", "x":1, "y":2},
{"label":"Caps Lock", "x":2.25, "y":2, "w":1.75},
{"label":"A", "x":4, "y":2},
{"label":"S", "x":5, "y":2},
{"label":"D", "x":6, "y":2},
{"label":"F", "x":7, "y":2},
{"label":"G", "x":8, "y":2},
{"label":"H", "x":10, "y":2},
{"label":"J", "x":11, "y":2},
{"label":"K", "x":12, "y":2},
{"label":"L", "x":13, "y":2},
{"label":":", "x":14, "y":2},
{"label":"\"", "x":15, "y":2},
{"label":"Enter", "x":16, "y":2, "w":2.25},
{"label":"PgUp", "x":18.25, "y":2},
{"label":"F7", "x":0, "y":3},
{"label":"F8", "x":1, "y":3},
{"label":"Shift", "x":2.25, "y":3, "w":2.25},
{"label":"Z", "x":4.5, "y":3},
{"label":"X", "x":5.5, "y":3},
{"label":"C", "x":6.5, "y":3},
{"label":"V", "x":7.5, "y":3},
{"label":"B", "x":8.5, "y":3},
{"label":"N", "x":10.5, "y":3},
{"label":"M", "x":11.5, "y":3},
{"label":",", "x":12.5, "y":3},
{"label":".", "x":13.5, "y":3},
{"label":"/", "x":14.5, "y":3},
{"label":"Shift", "x":15.5, "y":3, "w":1.75},
{"label":"Up", "x":17.25, "y":3},
{"label":"PgDn", "x":18.25, "y":3},
{"label":"F9", "x":0, "y":4},
{"label":"F10", "x":1, "y":4},
{"label":"Ctrl", "x":2.25, "y":4, "w":1.25},
{"label":"Win", "x":3.5, "y":4, "w":1.25},
{"label":"Alt", "x":4.75, "y":4, "w":1.25},
{"label":"Fn", "x":6, "y":4, "w":1.25},
{"label":"Space", "x":7.25, "y":4},
{"label":"Space", "x":11.75, "y":4, "w":1.5},
{"label":"Alt", "x":13.25, "y":4},
{"label":"Fn", "x":14.25, "y":4},
{"label":"Ctrl", "x":15.25, "y":4},
{"label":"Left", "x":16.25, "y":4},
{"label":"Down", "x":17.25, "y":4},
{"label":"Right", "x":18.25, "y":4}
]
}
} }
} }

View file

@ -23,86 +23,100 @@
"layouts": { "layouts": {
"LAYOUT_65xt": { "LAYOUT_65xt": {
"layout": [ "layout": [
{ "label": "F1", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
{ "label": "F2", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, {"label": "F2", "matrix": [0, 1], "x": 1, "y": 0},
{ "label": "Esc", "matrix": [0, 2], "w": 1, "x": 2.25, "y": 0 },
{ "label": "1", "matrix": [0, 3], "w": 1, "x": 3.25, "y": 0 }, {"label": "Esc", "matrix": [0, 2], "x": 2.25, "y": 0},
{ "label": "2", "matrix": [0, 4], "w": 1, "x": 4.25, "y": 0 }, {"label": "1", "matrix": [0, 3], "x": 3.25, "y": 0},
{ "label": "3", "matrix": [0, 5], "w": 1, "x": 5.25, "y": 0 }, {"label": "2", "matrix": [0, 4], "x": 4.25, "y": 0},
{ "label": "4", "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 }, {"label": "3", "matrix": [0, 5], "x": 5.25, "y": 0},
{ "label": "5", "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 }, {"label": "4", "matrix": [0, 6], "x": 6.25, "y": 0},
{ "label": "6", "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 }, {"label": "5", "matrix": [0, 7], "x": 7.25, "y": 0},
{ "label": "7", "matrix": [5, 0], "w": 1, "x": 10.25, "y": 0 }, {"label": "6", "matrix": [0, 8], "x": 8.25, "y": 0},
{ "label": "8", "matrix": [5, 1], "w": 1, "x": 11.25, "y": 0 },
{ "label": "9", "matrix": [5, 2], "w": 1, "x": 12.25, "y": 0 }, {"label": "7", "matrix": [5, 0], "x": 10.25, "y": 0},
{ "label": "0", "matrix": [5, 3], "w": 1, "x": 13.25, "y": 0 }, {"label": "8", "matrix": [5, 1], "x": 11.25, "y": 0},
{ "label": "-", "matrix": [5, 4], "w": 1, "x": 14.25, "y": 0 }, {"label": "9", "matrix": [5, 2], "x": 12.25, "y": 0},
{ "label": "=", "matrix": [5, 5], "w": 1, "x": 15.25, "y": 0 }, {"label": "0", "matrix": [5, 3], "x": 13.25, "y": 0},
{ "label": "Bksp", "matrix": [5, 7], "w": 2, "x": 17.25, "y": 0 }, {"label": "-", "matrix": [5, 4], "x": 14.25, "y": 0},
{ "label": "Del", "matrix": [5, 8], "w": 1, "x": 18.25, "y": 0 }, {"label": "=", "matrix": [5, 5], "x": 15.25, "y": 0},
{ "label": "F3", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, {"label": "Bksp", "matrix": [5, 7], "x": 16.25, "y": 0, "w": 2},
{ "label": "F4", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 }, {"label": "Del", "matrix": [5, 8], "x": 18.25, "y": 0},
{ "label": "Tab", "matrix": [1, 2], "w": 1.5, "x": 2.25, "y": 1 },
{ "label": "Q", "matrix": [1, 3], "w": 1, "x": 3.75, "y": 1 }, {"label": "F3", "matrix": [1, 0], "x": 0, "y": 1},
{ "label": "W", "matrix": [1, 4], "w": 1, "x": 4.75, "y": 1 }, {"label": "F4", "matrix": [1, 1], "x": 1, "y": 1},
{ "label": "E", "matrix": [1, 5], "w": 1, "x": 5.75, "y": 1 },
{ "label": "R", "matrix": [1, 6], "w": 1, "x": 6.75, "y": 1 }, {"label": "Tab", "matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
{ "label": "T", "matrix": [1, 7], "w": 1, "x": 7.75, "y": 1 }, {"label": "Q", "matrix": [1, 3], "x": 3.75, "y": 1},
{ "label": "Y", "matrix": [6, 0], "w": 1, "x": 9.75, "y": 1 }, {"label": "W", "matrix": [1, 4], "x": 4.75, "y": 1},
{ "label": "U", "matrix": [6, 1], "w": 1, "x": 10.75, "y": 1 }, {"label": "E", "matrix": [1, 5], "x": 5.75, "y": 1},
{ "label": "I", "matrix": [6, 2], "w": 1, "x": 11.75, "y": 1 }, {"label": "R", "matrix": [1, 6], "x": 6.75, "y": 1},
{ "label": "O", "matrix": [6, 3], "w": 1, "x": 12.75, "y": 1 }, {"label": "T", "matrix": [1, 7], "x": 7.75, "y": 1},
{ "label": "P", "matrix": [6, 4], "w": 1, "x": 13.75, "y": 1 },
{ "label": "{", "matrix": [6, 5], "w": 1, "x": 14.75, "y": 1 }, {"label": "Y", "matrix": [6, 0], "x": 9.75, "y": 1},
{ "label": "}", "matrix": [6, 6], "w": 1, "x": 15.75, "y": 1 }, {"label": "U", "matrix": [6, 1], "x": 10.75, "y": 1},
{ "label": "|", "matrix": [6, 7], "w": 1.5, "x": 16.75, "y": 1 }, {"label": "I", "matrix": [6, 2], "x": 11.75, "y": 1},
{ "label": "Home", "matrix": [6, 8], "w": 1, "x": 18.25, "y": 1 }, {"label": "O", "matrix": [6, 3], "x": 12.75, "y": 1},
{ "label": "F5", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, {"label": "P", "matrix": [6, 4], "x": 13.75, "y": 1},
{ "label": "F6", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, {"label": "{", "matrix": [6, 5], "x": 14.75, "y": 1},
{ "label": "Caps Lock", "matrix": [2, 2], "w": 1.75, "x": 2.25, "y": 2 }, {"label": "}", "matrix": [6, 6], "x": 15.75, "y": 1},
{ "label": "A", "matrix": [2, 3], "w": 1, "x": 4, "y": 2 }, {"label": "|", "matrix": [6, 7], "x": 16.75, "y": 1, "w": 1.5},
{ "label": "S", "matrix": [2, 4], "w": 1, "x": 5, "y": 2 }, {"label": "Home", "matrix": [6, 8], "x": 18.25, "y": 1},
{ "label": "D", "matrix": [2, 5], "w": 1, "x": 6, "y": 2 },
{ "label": "F", "matrix": [2, 6], "w": 1, "x": 7, "y": 2 }, {"label": "F5", "matrix": [2, 0], "x": 0, "y": 2},
{ "label": "G", "matrix": [2, 7], "w": 1, "x": 8, "y": 2 }, {"label": "F6", "matrix": [2, 1], "x": 1, "y": 2},
{ "label": "H", "matrix": [7, 0], "w": 1, "x": 10, "y": 2 },
{ "label": "J", "matrix": [7, 1], "w": 1, "x": 11, "y": 2 }, {"label": "Caps Lock", "matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
{ "label": "K", "matrix": [7, 2], "w": 1, "x": 12, "y": 2 }, {"label": "A", "matrix": [2, 3], "x": 4, "y": 2},
{ "label": "L", "matrix": [7, 3], "w": 1, "x": 13, "y": 2 }, {"label": "S", "matrix": [2, 4], "x": 5, "y": 2},
{ "label": ":", "matrix": [7, 4], "w": 1, "x": 14, "y": 2 }, {"label": "D", "matrix": [2, 5], "x": 6, "y": 2},
{ "label": "\"", "matrix": [7, 5], "w": 1, "x": 15, "y": 2 }, {"label": "F", "matrix": [2, 6], "x": 7, "y": 2},
{ "label": "Enter", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2 }, {"label": "G", "matrix": [2, 7], "x": 8, "y": 2},
{ "label": "PgUp", "matrix": [7, 8], "w": 1, "x": 18.25, "y": 2 },
{ "label": "F7", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, {"label": "H", "matrix": [7, 0], "x": 10, "y": 2},
{ "label": "F8", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, {"label": "J", "matrix": [7, 1], "x": 11, "y": 2},
{ "label": "Shift", "matrix": [3, 2], "w": 2.25, "x": 2.25, "y": 3 }, {"label": "K", "matrix": [7, 2], "x": 12, "y": 2},
{ "label": "Z", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 3 }, {"label": "L", "matrix": [7, 3], "x": 13, "y": 2},
{ "label": "X", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 3 }, {"label": ":", "matrix": [7, 4], "x": 14, "y": 2},
{ "label": "C", "matrix": [3, 6], "w": 1, "x": 6.5, "y": 3 }, {"label": "\"", "matrix": [7, 5], "x": 15, "y": 2},
{ "label": "V", "matrix": [3, 7], "w": 1, "x": 7.5, "y": 3 }, {"label": "Enter", "matrix": [7, 7], "x": 16, "y": 2, "w": 2.25},
{ "label": "B", "matrix": [3, 8], "w": 1, "x": 8.5, "y": 3 }, {"label": "PgUp", "matrix": [7, 8], "x": 18.25, "y": 2},
{ "label": "N", "matrix": [8, 0], "w": 1, "x": 10.5, "y": 3 },
{ "label": "M", "matrix": [8, 1], "w": 1, "x": 11.5, "y": 3 }, {"label": "F7", "matrix": [3, 0], "x": 0, "y": 3},
{ "label": ",", "matrix": [8, 2], "w": 1, "x": 12.5, "y": 3 }, {"label": "F8", "matrix": [3, 1], "x": 1, "y": 3},
{ "label": ".", "matrix": [8, 3], "w": 1, "x": 13.5, "y": 3 },
{ "label": "/", "matrix": [8, 4], "w": 1, "x": 14.5, "y": 3 }, {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
{ "label": "Shift", "matrix": [8, 6], "w": 1.75, "x": 15.5, "y": 3 }, {"label": "Z", "matrix": [3, 4], "x": 4.5, "y": 3},
{ "label": "Up", "matrix": [8, 7], "w": 1, "x": 17.25, "y": 3 }, {"label": "X", "matrix": [3, 5], "x": 5.5, "y": 3},
{ "label": "PgDn", "matrix": [8, 8], "w": 1, "x": 18.25, "y": 3 }, {"label": "C", "matrix": [3, 6], "x": 6.5, "y": 3},
{ "label": "F9", "matrix": [4, 0], "w": 1, "x": 0, "y": 4 }, {"label": "V", "matrix": [3, 7], "x": 7.5, "y": 3},
{ "label": "F10", "matrix": [4, 1], "w": 1, "x": 1, "y": 4 }, {"label": "B", "matrix": [3, 8], "x": 8.5, "y": 3},
{ "label": "Ctrl", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 },
{ "label": "Win", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 }, {"label": "N", "matrix": [8, 0], "x": 10.5, "y": 3},
{ "label": "Alt", "matrix": [4, 4], "w": 1.25, "x": 4.75, "y": 4 }, {"label": "M", "matrix": [8, 1], "x": 11.5, "y": 3},
{ "label": "Fn", "matrix": [4, 5], "w": 1.25, "x": 6, "y": 4 }, {"label": ",", "matrix": [8, 2], "x": 12.5, "y": 3},
{ "label": "Space", "matrix": [4, 7], "w": 1, "x": 7.25, "y": 4 }, {"label": ".", "matrix": [8, 3], "x": 13.5, "y": 3},
{ "label": "Space", "matrix": [9, 1], "w": 1.5, "x": 11.75, "y": 4 }, {"label": "/", "matrix": [8, 4], "x": 14.5, "y": 3},
{ "label": "Alt", "matrix": [9, 2], "w": 1, "x": 13.25, "y": 4 }, {"label": "Shift", "matrix": [8, 6], "x": 15.5, "y": 3, "w": 1.75},
{ "label": "Fn", "matrix": [9, 3], "w": 1, "x": 14.25, "y": 4 }, {"label": "Up", "matrix": [8, 7], "x": 17.25, "y": 3},
{ "label": "Ctrl", "matrix": [9, 4], "w": 1, "x": 15.25, "y": 4 }, {"label": "PgDn", "matrix": [8, 8], "x": 18.25, "y": 3},
{ "label": "Left", "matrix": [9, 6], "w": 1, "x": 16.25, "y": 4 },
{ "label": "Down", "matrix": [9, 7], "w": 1, "x": 17.25, "y": 4 }, {"label": "F9", "matrix": [4, 0], "x": 0, "y": 4},
{ "label": "Right", "matrix": [9, 8], "w": 1, "x": 18.25, "y": 4 } {"label": "F10", "matrix": [4, 1], "x": 1, "y": 4},
{"label": "Ctrl", "matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
{"label": "Win", "matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
{"label": "Alt", "matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
{"label": "Fn", "matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
{"label": "Space", "matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.25},
{"label": "Space", "matrix": [9, 1], "x": 10.5, "y": 4, "w": 2.25},
{"label": "Alt", "matrix": [9, 2], "x": 12.75, "y": 4, "w": 1.25},
{"label": "Fn", "matrix": [9, 3], "x": 14, "y": 4, "w": 1.25},
{"label": "Ctrl", "matrix": [9, 4], "x": 15.25, "y": 4},
{"label": "Left", "matrix": [9, 6], "x": 16.25, "y": 4},
{"label": "Down", "matrix": [9, 7], "x": 17.25, "y": 4},
{"label": "Right", "matrix": [9, 8], "x": 18.25, "y": 4}
] ]
} }
}, },
@ -206,7 +220,7 @@
{"flags":2, "x":166, "y":64}, {"flags":2, "x":166, "y":64},
{"matrix": [9,2], "flags":4, "x":158, "y":60}, {"matrix": [9,2], "flags":4, "x":158, "y":60},
{"matrix": [9,1], "flags":4, "x":137, "y":60}, {"matrix": [9,1], "flags":4, "x":137, "y":60},
{"flags":2, "x":126, "y":64}, {"flags":2, "x":126, "y":64}
] ]
} }
} }