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

This commit is contained in:
QMK Bot 2021-03-17 06:47:59 +00:00
commit 5e7a7c7e2f

View file

@ -7,81 +7,82 @@
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [
{"label":"#", "x":3.5, "y":0},
{"label":"*", "x":12.25, "y":0},
{"label":"@", "x":2.5, "y":0.125},
{"label":"$", "x":4.5, "y":0.125},
{"label":"&", "x":11.25, "y":0.13},
{"label":"(", "x":13.25, "y":0.13},
{"label":"%", "x":5.5, "y":0.25},
{"label":"^", "x":10.25, "y":0.25},
{"label":"!", "x":1.5, "y":0.375},
{"label":"Esc", "x":0.5, "y":0.38}, {"label":"Esc", "x":0.5, "y":0.38},
{"label":")", "x":14.25, "y":0.38}, {"label":"1", "x":1.5, "y":0.375},
{"label":"2", "x":2.5, "y":0.125},
{"label":"3", "x":3.5, "y":0},
{"label":"4", "x":4.5, "y":0.125},
{"label":"5", "x":5.5, "y":0.25},
{"label":"6", "x":6.5, "y":0.5},
{"label":"5", "x":9.25, "y":0.5},
{"label":"6", "x":10.25, "y":0.25},
{"label":"7", "x":11.25, "y":0.13},
{"label":"8", "x":12.25, "y":0},
{"label":"9", "x":13.25, "y":0.13},
{"label":"0", "x":14.25, "y":0.38},
{"label":"PrtScr", "x":15.25, "y":0.38}, {"label":"PrtScr", "x":15.25, "y":0.38},
{"x":6.5, "y":0.5}, {"x":9.25, "y":0.5},
{"label":"E", "x":3.5, "y":1},
{"label":"I", "x":12.25, "y":1},
{"label":"W", "x":2.5, "y":1.125},
{"label":"R", "x":4.5, "y":1.125},
{"label":"U", "x":11.25, "y":1.13},
{"label":"O", "x":13.25, "y":1.13},
{"label":"T", "x":5.5, "y":1.25},
{"label":"Y", "x":10.25, "y":1.25},
{"label":"Q", "x":1.5, "y":1.375},
{"label":"Tab", "x":0.5, "y":1.38}, {"label":"Tab", "x":0.5, "y":1.38},
{"label":"Q", "x":1.5, "y":1.375},
{"label":"W", "x":2.5, "y":1.125},
{"label":"E", "x":3.5, "y":1},
{"label":"R", "x":4.5, "y":1.125},
{"label":"T", "x":5.5, "y":1.25},
{"label":"Y", "x":6.5, "y":1.5},
{"label":"T", "x":9.25, "y":1.5},
{"label":"Y", "x":10.25, "y":1.25},
{"label":"U", "x":11.25, "y":1.13},
{"label":"I", "x":12.25, "y":1},
{"label":"O", "x":13.25, "y":1.13},
{"label":"P", "x":14.25, "y":1.38}, {"label":"P", "x":14.25, "y":1.38},
{"label":"\u2019", "x":15.25, "y":1.38}, {"label":"[", "x":15.25, "y":1.38},
{"label":"[", "x":6.5, "y":1.5},
{"label":"]", "x":9.25, "y":1.5},
{"label":"D", "x":3.5, "y":2},
{"label":"K", "x":12.25, "y":2},
{"label":"S", "x":2.5, "y":2.125},
{"label":"F", "x":4.5, "y":2.125},
{"label":"J", "x":11.25, "y":2.13},
{"label":"L", "x":13.25, "y":2.13},
{"label":"G", "x":5.5, "y":2.25},
{"label":"H", "x":10.25, "y":2.25},
{"label":"A", "x":1.5, "y":2.375},
{"label":"Caps", "x":0.5, "y":2.38}, {"label":"Caps", "x":0.5, "y":2.38},
{"label":"A", "x":1.5, "y":2.375},
{"label":"S", "x":2.5, "y":2.125},
{"label":"D", "x":3.5, "y":2},
{"label":"F", "x":4.5, "y":2.125},
{"label":"G", "x":5.5, "y":2.25},
{"label":"H", "x":6.5, "y":2.5},
{"label":"G", "x":9.25, "y":2.5},
{"label":"H", "x":10.25, "y":2.25},
{"label":"J", "x":11.25, "y":2.13},
{"label":"K", "x":12.25, "y":2},
{"label":"L", "x":13.25, "y":2.13},
{"label":":", "x":14.25, "y":2.38}, {"label":":", "x":14.25, "y":2.38},
{"label":"Ent", "x":15.25, "y":2.38}, {"label":"Ent", "x":15.25, "y":2.38},
{"label":"(", "x":6.5, "y":2.5},
{"label":")", "x":9.25, "y":2.5},
{"label":"C", "x":3.5, "y":3},
{"label":"<", "x":12.25, "y":3},
{"label":"X", "x":2.5, "y":3.125},
{"label":"V", "x":4.5, "y":3.125},
{"label":"M", "x":11.25, "y":3.13},
{"label":">", "x":13.25, "y":3.13},
{"label":"B", "x":5.5, "y":3.25},
{"label":"N", "x":10.25, "y":3.25},
{"label":"Z", "x":1.5, "y":3.375},
{"label":"Shift", "x":0.5, "y":3.38}, {"label":"Shift", "x":0.5, "y":3.38},
{"label":"Z", "x":1.5, "y":3.375},
{"label":"X", "x":2.5, "y":3.125},
{"label":"C", "x":3.5, "y":3},
{"label":"V", "x":4.5, "y":3.125},
{"label":"B", "x":5.5, "y":3.25},
{"label":"N", "x":6.5, "y":3.5},
{"label":"B", "x":9.25, "y":3.5},
{"label":"N", "x":10.25, "y":3.25},
{"label":"M", "x":11.25, "y":3.13},
{"label":"<", "x":12.25, "y":3},
{"label":">", "x":13.25, "y":3.13},
{"label":"?", "x":14.25, "y":3.38}, {"label":"?", "x":14.25, "y":3.38},
{"label":"_", "x":15.25, "y":3.38}, {"label":"_", "x":15.25, "y":3.38},
{"x":6.5, "y":3.5}, {"label":"Ctrl", "x":0.5, "y":4.38},
{"x":9.25, "y":3.5},
{"label":"Ctrl", "x":0.5, "y":4.375},
{"label":"Win", "x":1.5, "y":4.38}, {"label":"Win", "x":1.5, "y":4.38},
{"label":"\u7121\u5909", "x":3.75, "y":4.38}, {"label":"&uarr;", "x":2.63, "y":4.51},
{"label":"Alt", "x":3.75, "y":4.38},
{"label":"Ent", "x":4.75, "y":4.38}, {"label":"Ent", "x":4.75, "y":4.38},
{"label":"Spc", "x":11, "y":4.38},
{"label":"\u5909\u63db", "x":12, "y":4.38},
{"label":"Alt", "x":14.25, "y":4.38},
{"label":"App", "x":15.25, "y":4.38},
{"label":"\u2191", "x":2.625, "y":4.505},
{"label":"\u2191", "x":13.13, "y":4.51},
{"label":"BS", "x":5.85, "y":4.6}, {"label":"BS", "x":5.85, "y":4.6},
{"label":"Del", "x":9.9, "y":4.6},
{"label":"Del", "x":6.9, "y":5.15}, {"label":"Del", "x":6.9, "y":5.15},
{"label":"BS", "x":8.85, "y":5.15}, {"label":"BS", "x":8.85, "y":5.15},
{"label":"\u2190", "x":1.625, "y":5.505}, {"label":"Del", "x":9.9, "y":4.6},
{"label":"\u2193", "x":2.625, "y":5.505}, {"label":"Spc", "x":11, "y":4.38},
{"label":"\u2192", "x":3.625, "y":5.505}, {"label":"Alt", "x":12, "y":4.38},
{"label":"\u2190", "x":12.13, "y":5.51}, {"label":"&uarr;", "x":13.13, "y":4.51},
{"label":"\u2193", "x":13.13, "y":5.51}, {"label":"Alt", "x":14.25, "y":4.38},
{"label":"\u2192", "x":14.13, "y":5.51}] {"label":"App", "x":15.25, "y":4.38},
{"label":"&larr;", "x":1.63, "y":5.51},
{"label":"&dArr;", "x":2.63, "y":5.51},
{"label":"&rarr;", "x":3.625, "y":5.51},
{"label":"&larr;", "x":12.13, "y":5.51},
{"label":"&dArr;", "x":13.13, "y":5.51},
{"label":"&rarr;", "x":14.13, "y":5.51}]
} }
} }
} }