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

This commit is contained in:
QMK Bot 2022-07-02 14:32:39 +00:00
commit 36de989e6f

View file

@ -10,10 +10,192 @@
"diode_direction": "COL2ROW",
"layouts": {
"LAYOUT": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":0, "y":1.25, "w":1.25}, {"x":1.25, "y":1.25}, {"x":2.25, "y":1.25}, {"x":3.25, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":11.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":13.25, "y":1.25}, {"x":14.25, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25, "w":1.25}, {"x":0, "y":2.25, "w":1.25}, {"x":1.25, "y":2.25}, {"x":2.25, "y":2.25}, {"x":3.25, "y":2.25}, {"x":4.25, "y":2.25}, {"x":5.25, "y":2.25}, {"x":11.25, "y":2.25}, {"x":12.25, "y":2.25}, {"x":13.25, "y":2.25}, {"x":14.25, "y":2.25}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25, "w":1.25}, {"x":0, "y":3.25, "w":1.25}, {"x":1.25, "y":3.25}, {"x":2.25, "y":3.25}, {"x":3.25, "y":3.25}, {"x":4.25, "y":3.25}, {"x":5.25, "y":3.25}, {"x":11.25, "y":3.25}, {"x":12.25, "y":3.25}, {"x":13.25, "y":3.25}, {"x":14.25, "y":3.25}, {"x":15.25, "y":3.25}, {"x":16.25, "y":3.25, "w":1.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25}, {"x":13.25, "y":4.25}, {"x":14.25, "y":4.25}, {"x":15.25, "y":4.25}, {"x":16.25, "y":4.25, "w":1.25}, {"x":1.25, "y":5.25}, {"x":2.25, "y":5.25}, {"x":3.25, "y":5.25}, {"x":4.25, "y":5.25}, {"x":12.25, "y":5.25}, {"x":13.25, "y":5.25}, {"x":14.25, "y":5.25}, {"x":15.25, "y":5.25}, {"x":6.25, "y":6}, {"x":7.25, "y":6}, {"x":9.25, "y":6}, {"x":10.25, "y":6}, {"x":5.25, "y":7, "h":2}, {"x":6.25, "y":7, "h":2}, {"x":7.25, "y":7}, {"x":9.25, "y":7}, {"x":10.25, "y":7, "h":2}, {"x":11.25, "y":7, "h":2}, {"x":7.25, "y":8}, {"x":9.25, "y":8}]
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":5, "y":0},
{"x":11.5, "y":0},
{"x":12.5, "y":0},
{"x":13.5, "y":0},
{"x":14.5, "y":0},
{"x":15.5, "y":0},
{"x":16.5, "y":0},
{"x":0, "y":1.25, "w":1.25},
{"x":1.25, "y":1.25},
{"x":2.25, "y":1.25},
{"x":3.25, "y":1.25},
{"x":4.25, "y":1.25},
{"x":5.25, "y":1.25},
{"x":11.25, "y":1.25},
{"x":12.25, "y":1.25},
{"x":13.25, "y":1.25},
{"x":14.25, "y":1.25},
{"x":15.25, "y":1.25},
{"x":16.25, "y":1.25, "w":1.25},
{"x":0, "y":2.25, "w":1.25},
{"x":1.25, "y":2.25},
{"x":2.25, "y":2.25},
{"x":3.25, "y":2.25},
{"x":4.25, "y":2.25},
{"x":5.25, "y":2.25},
{"x":11.25, "y":2.25},
{"x":12.25, "y":2.25},
{"x":13.25, "y":2.25},
{"x":14.25, "y":2.25},
{"x":15.25, "y":2.25},
{"x":16.25, "y":2.25, "w":1.25},
{"x":0, "y":3.25, "w":1.25},
{"x":1.25, "y":3.25},
{"x":2.25, "y":3.25},
{"x":3.25, "y":3.25},
{"x":4.25, "y":3.25},
{"x":5.25, "y":3.25},
{"x":11.25, "y":3.25},
{"x":12.25, "y":3.25},
{"x":13.25, "y":3.25},
{"x":14.25, "y":3.25},
{"x":15.25, "y":3.25},
{"x":16.25, "y":3.25, "w":1.25},
{"x":0, "y":4.25, "w":1.25},
{"x":1.25, "y":4.25},
{"x":2.25, "y":4.25},
{"x":3.25, "y":4.25},
{"x":4.25, "y":4.25},
{"x":5.25, "y":4.25},
{"x":11.25, "y":4.25},
{"x":12.25, "y":4.25},
{"x":13.25, "y":4.25},
{"x":14.25, "y":4.25},
{"x":15.25, "y":4.25},
{"x":16.25, "y":4.25, "w":1.25},
{"x":1.25, "y":5.25},
{"x":2.25, "y":5.25},
{"x":3.25, "y":5.25},
{"x":4.25, "y":5.25},
{"x":12.25, "y":5.25},
{"x":13.25, "y":5.25},
{"x":14.25, "y":5.25},
{"x":15.25, "y":5.25},
{"x":6.25, "y":6},
{"x":7.25, "y":6},
{"x":9.25, "y":6},
{"x":10.25, "y":6},
{"x":7.25, "y":7},
{"x":9.25, "y":7},
{"x":5.25, "y":7, "h":2},
{"x":6.25, "y":7, "h":2},
{"x":7.25, "y":8},
{"x":9.25, "y":8},
{"x":10.25, "y":7, "h":2},
{"x":11.25, "y":7, "h":2}
]
},
"LAYOUT_all": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":0, "y":1.25, "w":1.25}, {"x":1.25, "y":1.25}, {"x":2.25, "y":1.25}, {"x":3.25, "y":1.25}, {"x":4.25, "y":1.25}, {"x":5.25, "y":1.25}, {"x":11.75, "y":1.25}, {"x":12.75, "y":1.25}, {"x":13.75, "y":1.25}, {"x":14.75, "y":1.25}, {"x":15.75, "y":1.25}, {"x":16.75, "y":1.25, "w":1.25}, {"x":0, "y":2.25, "w":1.25}, {"x":1.25, "y":2.25}, {"x":2.25, "y":2.25}, {"x":3.25, "y":2.25}, {"x":4.25, "y":2.25}, {"x":5.25, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25}, {"x":13.75, "y":2.25}, {"x":14.75, "y":2.25}, {"x":15.75, "y":2.25}, {"x":16.75, "y":2.25, "w":1.25}, {"x":0, "y":3.25, "w":1.25}, {"x":1.25, "y":3.25}, {"x":2.25, "y":3.25}, {"x":3.25, "y":3.25}, {"x":4.25, "y":3.25}, {"x":5.25, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25}, {"x":13.75, "y":3.25}, {"x":14.75, "y":3.25}, {"x":15.75, "y":3.25}, {"x":16.75, "y":3.25, "w":1.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":11.75, "y":4.25}, {"x":12.75, "y":4.25}, {"x":13.75, "y":4.25}, {"x":14.75, "y":4.25}, {"x":15.75, "y":4.25}, {"x":16.75, "y":4.25, "w":1.25}, {"x":0.25, "y":5.25}, {"x":1.25, "y":5.25}, {"x":2.25, "y":5.25}, {"x":3.25, "y":5.25}, {"x":4.25, "y":5.25}, {"x":5.25, "y":5.25}, {"x":11.75, "y":5.25}, {"x":12.75, "y":5.25}, {"x":13.75, "y":5.25}, {"x":14.75, "y":5.25}, {"x":15.75, "y":5.25}, {"x":16.75, "y":5.25}, {"x":6.5, "y":6}, {"x":7.5, "y":6}, {"x":9.5, "y":6}, {"x":10.5, "y":6}, {"x":5.25, "y":7, "h":2}, {"x":6.25, "y":7, "h":2}, {"x":7.25, "y":7}, {"x":9.5, "y":7}, {"x":10.5, "y":7, "h":2}, {"x":11.5, "y":7, "h":2}, {"x":7.25, "y":8}, {"x":9.5, "y":8}]
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":4, "y":0},
{"x":5, "y":0},
{"x":11.5, "y":0},
{"x":12.5, "y":0},
{"x":13.5, "y":0},
{"x":14.5, "y":0},
{"x":15.5, "y":0},
{"x":16.5, "y":0},
{"x":0, "y":1.25, "w":1.25},
{"x":1.25, "y":1.25},
{"x":2.25, "y":1.25},
{"x":3.25, "y":1.25},
{"x":4.25, "y":1.25},
{"x":5.25, "y":1.25},
{"x":11.25, "y":1.25},
{"x":12.25, "y":1.25},
{"x":13.25, "y":1.25},
{"x":14.25, "y":1.25},
{"x":15.25, "y":1.25},
{"x":16.25, "y":1.25, "w":1.25},
{"x":0, "y":2.25, "w":1.25},
{"x":1.25, "y":2.25},
{"x":2.25, "y":2.25},
{"x":3.25, "y":2.25},
{"x":4.25, "y":2.25},
{"x":5.25, "y":2.25},
{"x":11.25, "y":2.25},
{"x":12.25, "y":2.25},
{"x":13.25, "y":2.25},
{"x":14.25, "y":2.25},
{"x":15.25, "y":2.25},
{"x":16.25, "y":2.25, "w":1.25},
{"x":0, "y":3.25, "w":1.25},
{"x":1.25, "y":3.25},
{"x":2.25, "y":3.25},
{"x":3.25, "y":3.25},
{"x":4.25, "y":3.25},
{"x":5.25, "y":3.25},
{"x":11.25, "y":3.25},
{"x":12.25, "y":3.25},
{"x":13.25, "y":3.25},
{"x":14.25, "y":3.25},
{"x":15.25, "y":3.25},
{"x":16.25, "y":3.25, "w":1.25},
{"x":0, "y":4.25, "w":1.25},
{"x":1.25, "y":4.25},
{"x":2.25, "y":4.25},
{"x":3.25, "y":4.25},
{"x":4.25, "y":4.25},
{"x":5.25, "y":4.25},
{"x":11.25, "y":4.25},
{"x":12.25, "y":4.25},
{"x":13.25, "y":4.25},
{"x":14.25, "y":4.25},
{"x":15.25, "y":4.25},
{"x":16.25, "y":4.25, "w":1.25},
{"x":0.25, "y":5.25},
{"x":1.25, "y":5.25},
{"x":2.25, "y":5.25},
{"x":3.25, "y":5.25},
{"x":4.25, "y":5.25},
{"x":5.25, "y":5.25},
{"x":11.25, "y":5.25},
{"x":12.25, "y":5.25},
{"x":13.25, "y":5.25},
{"x":14.25, "y":5.25},
{"x":15.25, "y":5.25},
{"x":16.25, "y":5.25},
{"x":6.25, "y":6},
{"x":7.25, "y":6},
{"x":9.25, "y":6},
{"x":10.25, "y":6},
{"x":7.25, "y":7},
{"x":9.25, "y":7},
{"x":5.25, "y":7, "h":2},
{"x":6.25, "y":7, "h":2},
{"x":7.25, "y":8},
{"x":9.25, "y":8},
{"x":10.25, "y":7, "h":2},
{"x":11.25, "y":7, "h":2}
]
}
}
}