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

This commit is contained in:
QMK Bot 2023-09-14 20:37:59 +00:00
commit f9777dfda4

View file

@ -253,7 +253,7 @@
{ "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 }, { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
{ "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 }, { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
{ "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 }, { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 },
{ "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 }, { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.5 },
{ "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 }, { "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 },
{ "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
{ "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 }, { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
@ -262,9 +262,9 @@
{ "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 }, { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 },
{ "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 }, { "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 },
{ "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 }, { "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 },
{ "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.25 }, { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.5 },
{ "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 }, { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.5 },
{ "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 } { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.5 }
] ]
}, },
"LAYOUT_ansi": { "LAYOUT_ansi": {
@ -340,7 +340,7 @@
{ "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 }, { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
{ "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 }, { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
{ "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 }, { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 },
{ "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 }, { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.5 },
{ "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 }, { "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 },
{ "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
{ "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 }, { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
@ -349,9 +349,9 @@
{ "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 }, { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 },
{ "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 }, { "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 },
{ "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 }, { "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 },
{ "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.25 }, { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.5 },
{ "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 }, { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.5 },
{ "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 } { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.5 }
] ]
}, },
"LAYOUT_iso": { "LAYOUT_iso": {
@ -428,7 +428,7 @@
{ "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 }, { "label": ">", "matrix": [4, 9], "x": 10.25, "y": 4.25 },
{ "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 }, { "label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25 },
{ "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 }, { "label": "Shift", "matrix": [4, 13], "w": 1.75, "x": 12.25, "y": 4.25 },
{ "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.25 }, { "label": "Up", "matrix": [4, 14], "x": 14.25, "y": 4.5 },
{ "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 }, { "label": "End", "matrix": [4, 15], "x": 15.5, "y": 4.25 },
{ "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 }, { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
{ "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 }, { "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
@ -437,9 +437,9 @@
{ "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 }, { "label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25 },
{ "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 }, { "label": "Fn", "matrix": [5, 10], "x": 11, "y": 5.25 },
{ "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 }, { "label": "Ctrl", "matrix": [5, 11], "x": 12, "y": 5.25 },
{ "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.25 }, { "label": "Left", "matrix": [5, 13], "x": 13.25, "y": 5.5 },
{ "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.25 }, { "label": "Down", "matrix": [5, 14], "x": 14.25, "y": 5.5 },
{ "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.25 } { "label": "Right", "matrix": [5, 15], "x": 15.25, "y": 5.5 }
] ]
} }
} }