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

This commit is contained in:
QMK Bot 2023-07-20 14:32:07 +00:00
commit 58f14fc162

View File

@ -29,88 +29,88 @@
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [
{"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 0], "x": 0, "y": 0.1, "w":1.25},
{"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 1], "x": 1.25, "y": 0.35},
{"matrix": [0, 2], "x": 2, "y": 0}, {"matrix": [0, 2], "x": 2.25, "y": 0.1},
{"matrix": [0, 3], "x": 3, "y": 0}, {"matrix": [0, 3], "x": 3.25, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0}, {"matrix": [0, 4], "x": 4.25, "y": 0.1},
{"matrix": [0, 5], "x": 5, "y": 0}, {"matrix": [0, 5], "x": 5.25, "y": 0.1},
{"matrix": [6, 0], "x": 11, "y": 0}, {"matrix": [6, 0], "x": 11.25, "y": 0.1},
{"matrix": [6, 1], "x": 12, "y": 0}, {"matrix": [6, 1], "x": 12.25, "y": 0.1},
{"matrix": [6, 2], "x": 13, "y": 0}, {"matrix": [6, 2], "x": 13.25, "y": 0},
{"matrix": [6, 3], "x": 14, "y": 0}, {"matrix": [6, 3], "x": 14.25, "y": 0.1},
{"matrix": [6, 4], "x": 15, "y": 0}, {"matrix": [6, 4], "x": 15.25, "y": 0.35},
{"matrix": [6, 5], "x": 16, "y": 0}, {"matrix": [6, 5], "x": 16.25, "y": 0.1, "w":1.25},
{"matrix": [1, 0], "x": 0, "y": 1}, {"matrix": [1, 0], "x": 0, "y": 1.1, "w":1.25},
{"matrix": [1, 1], "x": 1, "y": 1}, {"matrix": [1, 1], "x": 1.25, "y": 1.35},
{"matrix": [1, 2], "x": 2, "y": 1}, {"matrix": [1, 2], "x": 2.25, "y": 1.1},
{"matrix": [1, 3], "x": 3, "y": 1}, {"matrix": [1, 3], "x": 3.25, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1}, {"matrix": [1, 4], "x": 4.25, "y": 1.1},
{"matrix": [1, 5], "x": 5, "y": 1}, {"matrix": [1, 5], "x": 5.25, "y": 1.1},
{"matrix": [7, 0], "x": 11, "y": 1}, {"matrix": [7, 0], "x": 11.25, "y": 1.1},
{"matrix": [7, 1], "x": 12, "y": 1}, {"matrix": [7, 1], "x": 12.25, "y": 1.1},
{"matrix": [7, 2], "x": 13, "y": 1}, {"matrix": [7, 2], "x": 13.25, "y": 1},
{"matrix": [7, 3], "x": 14, "y": 1}, {"matrix": [7, 3], "x": 14.25, "y": 1.1},
{"matrix": [7, 4], "x": 15, "y": 1}, {"matrix": [7, 4], "x": 15.25, "y": 1.35},
{"matrix": [7, 5], "x": 16, "y": 1}, {"matrix": [7, 5], "x": 16.25, "y": 1.1, "w":1.25},
{"matrix": [2, 0], "x": 0, "y": 2}, {"matrix": [2, 0], "x": 0, "y": 2.1, "w":1.25},
{"matrix": [2, 1], "x": 1, "y": 2}, {"matrix": [2, 1], "x": 1.25, "y": 2.35},
{"matrix": [2, 2], "x": 2, "y": 2}, {"matrix": [2, 2], "x": 2.25, "y": 2.1},
{"matrix": [2, 3], "x": 3, "y": 2}, {"matrix": [2, 3], "x": 3.25, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2}, {"matrix": [2, 4], "x": 4.25, "y": 2.1},
{"matrix": [2, 5], "x": 5, "y": 2}, {"matrix": [2, 5], "x": 5.25, "y": 2.1},
{"matrix": [8, 0], "x": 11, "y": 2}, {"matrix": [8, 0], "x": 11.25, "y": 2.1},
{"matrix": [8, 1], "x": 12, "y": 2}, {"matrix": [8, 1], "x": 12.25, "y": 2.1},
{"matrix": [8, 2], "x": 13, "y": 2}, {"matrix": [8, 2], "x": 13.25, "y": 2},
{"matrix": [8, 3], "x": 14, "y": 2}, {"matrix": [8, 3], "x": 14.25, "y": 2.1},
{"matrix": [8, 4], "x": 15, "y": 2}, {"matrix": [8, 4], "x": 15.25, "y": 2.35},
{"matrix": [8, 5], "x": 16, "y": 2}, {"matrix": [8, 5], "x": 16.25, "y": 2.1, "w":1.25},
{"matrix": [3, 0], "x": 0, "y": 3}, {"matrix": [3, 0], "x": 0, "y": 3.1, "w":1.25},
{"matrix": [3, 1], "x": 1, "y": 3}, {"matrix": [3, 1], "x": 1.25, "y": 3.35},
{"matrix": [3, 2], "x": 2, "y": 3}, {"matrix": [3, 2], "x": 2.25, "y": 3.1},
{"matrix": [3, 3], "x": 3, "y": 3}, {"matrix": [3, 3], "x": 3.25, "y": 3},
{"matrix": [3, 4], "x": 4, "y": 3}, {"matrix": [3, 4], "x": 4.25, "y": 3.1},
{"matrix": [3, 5], "x": 5, "y": 3}, {"matrix": [3, 5], "x": 5.25, "y": 3.1},
{"matrix": [9, 0], "x": 11, "y": 3}, {"matrix": [9, 0], "x": 11.25, "y": 3.1},
{"matrix": [9, 1], "x": 12, "y": 3}, {"matrix": [9, 1], "x": 12.25, "y": 3.1},
{"matrix": [9, 2], "x": 13, "y": 3}, {"matrix": [9, 2], "x": 13.25, "y": 3},
{"matrix": [9, 3], "x": 14, "y": 3}, {"matrix": [9, 3], "x": 14.25, "y": 3.1},
{"matrix": [9, 4], "x": 15, "y": 3}, {"matrix": [9, 4], "x": 15.25, "y": 3.35},
{"matrix": [9, 5], "x": 16, "y": 3}, {"matrix": [9, 5], "x": 16.25, "y": 3.1, "w":1.25},
{"matrix": [4, 0], "x": 1, "y": 4}, {"matrix": [4, 1], "x": 1.25, "y": 4.35},
{"matrix": [4, 1], "x": 2, "y": 4}, {"matrix": [4, 2], "x": 2.25, "y": 4.1},
{"matrix": [4, 2], "x": 3, "y": 4}, {"matrix": [4, 3], "x": 3.25, "y": 4},
{"matrix": [4, 3], "x": 4, "y": 4}, {"matrix": [4, 4], "x": 4.25, "y": 4.1},
{"matrix": [10, 2], "x": 12, "y": 4}, {"matrix": [10, 1], "x": 12.25, "y": 4.1},
{"matrix": [10, 3], "x": 13, "y": 4}, {"matrix": [10, 2], "x": 13.25, "y": 4},
{"matrix": [10, 4], "x": 14, "y": 4}, {"matrix": [10, 3], "x": 14.25, "y": 4.1},
{"matrix": [10, 5], "x": 15, "y": 4}, {"matrix": [10, 4], "x": 15.25, "y": 4.35},
{"matrix": [4, 4], "x": 6, "y": 5}, {"matrix": [5, 4], "x": 6.25, "y": 5},
{"matrix": [4, 5], "x": 7, "y": 5}, {"matrix": [4, 5], "x": 7.25, "y": 5},
{"matrix": [10, 0], "x": 9, "y": 5}, {"matrix": [10, 0], "x": 9.25, "y": 5},
{"matrix": [10, 1], "x": 10, "y": 5}, {"matrix": [11, 1], "x": 10.25, "y": 5},
{"matrix": [5, 2], "x": 5, "y": 6, "h": 2}, {"matrix": [5, 1], "x": 5.25, "y": 6, "h": 2},
{"matrix": [5, 3], "x": 6, "y": 6, "h": 2}, {"matrix": [5, 2], "x": 6.25, "y": 6, "h": 2},
{"matrix": [5, 5], "x": 7, "y": 6}, {"matrix": [5, 5], "x": 7.25, "y": 6},
{"matrix": [11, 0], "x": 9, "y": 6}, {"matrix": [11, 0], "x": 9.25, "y": 6},
{"matrix": [11, 2], "x": 10, "y": 6, "h": 2}, {"matrix": [11, 3], "x": 10.25, "y": 6, "h": 2},
{"matrix": [11, 3], "x": 11, "y": 6, "h": 2}, {"matrix": [11, 4], "x": 11.25, "y": 6, "h": 2},
{"matrix": [5, 4], "x": 7, "y": 7}, {"matrix": [5, 3], "x": 7.25, "y": 7},
{"matrix": [11, 1], "x": 9, "y": 7} {"matrix": [11, 2], "x": 9.25, "y": 7}
] ]
} }
} }