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

This commit is contained in:
QMK Bot 2021-07-28 23:34:48 +00:00
commit 69661eb5ab

View File

@ -6,10 +6,67 @@
"height": 6.25,
"layouts": {
"LAYOUT_ortho_6x4": {
"layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"2,0", "x":0, "y":2.25}, {"label":"2,1", "x":1, "y":2.25}, {"label":"2,2", "x":2, "y":2.25}, {"label":"2,3", "x":3, "y":2.25}, {"label":"3,0", "x":0, "y":3.25}, {"label":"3,1", "x":1, "y":3.25}, {"label":"3,2", "x":2, "y":3.25}, {"label":"3,3", "x":3, "y":3.25}, {"label":"4,0", "x":0, "y":4.25}, {"label":"4,1", "x":1, "y":4.25}, {"label":"4,2", "x":2, "y":4.25}, {"label":"4,3", "x":3, "y":4.25}, {"label":"5,0", "x":0, "y":5.25}, {"label":"5,1", "x":1, "y":5.25}, {"label":"5,2", "x":2, "y":5.25}, {"label":"5,3", "x":3, "y":5.25}]
"layout": [
{"label":"0,0", "x":0, "y":0},
{"label":"0,1", "x":1, "y":0},
{"label":"0,2", "x":2, "y":0},
{"label":"0,3", "x":3, "y":0},
{"label":"1,0", "x":0, "y":1.25},
{"label":"1,1", "x":1, "y":1.25},
{"label":"1,2", "x":2, "y":1.25},
{"label":"1,3", "x":3, "y":1.25},
{"label":"2,0", "x":0, "y":2.25},
{"label":"2,1", "x":1, "y":2.25},
{"label":"2,2", "x":2, "y":2.25},
{"label":"2,3", "x":3, "y":2.25},
{"label":"3,0", "x":0, "y":3.25},
{"label":"3,1", "x":1, "y":3.25},
{"label":"3,2", "x":2, "y":3.25},
{"label":"3,3", "x":3, "y":3.25},
{"label":"4,0", "x":0, "y":4.25},
{"label":"4,1", "x":1, "y":4.25},
{"label":"4,2", "x":2, "y":4.25},
{"label":"4,3", "x":3, "y":4.25},
{"label":"5,0", "x":0, "y":5.25},
{"label":"5,1", "x":1, "y":5.25},
{"label":"5,2", "x":2, "y":5.25},
{"label":"5,3", "x":3, "y":5.25}
]
},
"LAYOUT_numpad_6x4": {
"layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"2,0", "x":0, "y":2.25}, {"label":"2,1", "x":1, "y":2.25}, {"label":"2,2", "x":2, "y":2.25}, {"label":"3,3", "x":3, "y":2.25, "h":2}, {"label":"3,0", "x":0, "y":3.25}, {"label":"3,1", "x":1, "y":3.25}, {"label":"3,2", "x":2, "y":3.25}, {"label":"4,0", "x":0, "y":4.25}, {"label":"4,1", "x":1, "y":4.25}, {"label":"4,2", "x":2, "y":4.25}, {"label":"5,3", "x":3, "y":4.25, "h":2}, {"label":"5,0", "x":0, "y":5.25, "w":2}, {"label":"5,2", "x":2, "y":5.25}]
"layout": [
{"label":"0,0", "x":0, "y":0},
{"label":"0,1", "x":1, "y":0},
{"label":"0,2", "x":2, "y":0},
{"label":"0,3", "x":3, "y":0},
{"label":"1,0", "x":0, "y":1.25},
{"label":"1,1", "x":1, "y":1.25},
{"label":"1,2", "x":2, "y":1.25},
{"label":"1,3", "x":3, "y":1.25},
{"label":"2,0", "x":0, "y":2.25},
{"label":"2,1", "x":1, "y":2.25},
{"label":"2,2", "x":2, "y":2.25},
{"label":"3,0", "x":0, "y":3.25},
{"label":"3,1", "x":1, "y":3.25},
{"label":"3,2", "x":2, "y":3.25},
{"label":"3,3", "x":3, "y":2.25, "h":2},
{"label":"4,0", "x":0, "y":4.25},
{"label":"4,1", "x":1, "y":4.25},
{"label":"4,2", "x":2, "y":4.25},
{"label":"5,0", "x":0, "y":5.25, "w":2},
{"label":"5,2", "x":2, "y":5.25},
{"label":"5,3", "x":3, "y":4.25, "h":2}
]
}
}
}