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

master
QMK Bot 2021-11-15 18:42:14 +00:00
commit 89c874dd8f
1 changed files with 86 additions and 81 deletions

View File

@ -5,87 +5,92 @@
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [
{"x":5, "y":0, "w":2}, {"label":"Print Screen", "x":5, "y":0, "w":2},
{"x":0, "y":1.15},
{"x":1, "y":1.15}, {"label":"Esc", "x":0, "y":1.15},
{"x":2, "y":1.15}, {"label":"1!", "x":1, "y":1.15},
{"x":3, "y":1.15}, {"label":"2@", "x":2, "y":1.15},
{"x":4, "y":1.15}, {"label":"3#", "x":3, "y":1.15},
{"x":5, "y":1.15}, {"label":"4$", "x":4, "y":1.15},
{"x":6, "y":1.15}, {"label":"5%", "x":5, "y":1.15},
{"x":7, "y":1.15}, {"label":"6^", "x":6, "y":1.15},
{"x":8, "y":1.15}, {"label":"7&", "x":7, "y":1.15},
{"x":9, "y":1.15}, {"label":"8*", "x":8, "y":1.15},
{"x":10, "y":1.15}, {"label":"9(", "x":9, "y":1.15},
{"x":11, "y":1.15}, {"label":"0)", "x":10, "y":1.15},
{"x":12, "y":1.15}, {"label":"-_", "x":11, "y":1.15},
{"x":13, "y":1.15, "w":1.5}, {"label":"=+", "x":12, "y":1.15},
{"x":15.25, "y":1.15}, {"label":"Backspace", "x":13, "y":1.15, "w":1.5},
{"x":16.25, "y":1.15}, {"label":"Delete", "x":15.25, "y":1.15},
{"x":17.25, "y":1.15}, {"label":"=+", "x":16.25, "y":1.15},
{"x":18.25, "y":1.15}, {"label":"/", "x":17.25, "y":1.15},
{"x":0, "y":2.15, "w":1.5}, {"label":"*", "x":18.25, "y":1.15},
{"x":1.5, "y":2.15},
{"x":2.5, "y":2.15}, {"label":"Tab", "x":0, "y":2.15, "w":1.5},
{"x":3.5, "y":2.15}, {"label":"Q", "x":1.5, "y":2.15},
{"x":4.5, "y":2.15}, {"label":"W", "x":2.5, "y":2.15},
{"x":5.5, "y":2.15}, {"label":"E", "x":3.5, "y":2.15},
{"x":6.5, "y":2.15}, {"label":"R", "x":4.5, "y":2.15},
{"x":7.5, "y":2.15}, {"label":"T", "x":5.5, "y":2.15},
{"x":8.5, "y":2.15}, {"label":"Y", "x":6.5, "y":2.15},
{"x":9.5, "y":2.15}, {"label":"U", "x":7.5, "y":2.15},
{"x":10.5, "y":2.15}, {"label":"I", "x":8.5, "y":2.15},
{"x":11.5, "y":2.15}, {"label":"O", "x":9.5, "y":2.15},
{"x":12.5, "y":2.15}, {"label":"P", "x":10.5, "y":2.15},
{"x":15.25, "y":2.15}, {"label":"[{", "x":11.5, "y":2.15},
{"x":16.25, "y":2.15}, {"label":"]}", "x":12.5, "y":2.15},
{"x":17.25, "y":2.15}, {"label":"7", "x":15.25, "y":2.15},
{"x":18.25, "y":2.15}, {"label":"8", "x":16.25, "y":2.15},
{"x":0, "y":3.15, "w":1.75}, {"label":"9", "x":17.25, "y":2.15},
{"x":1.75, "y":3.15}, {"label":"+", "x":18.25, "y":2.15},
{"x":2.75, "y":3.15},
{"x":3.75, "y":3.15}, {"label":"Ctrl", "x":0, "y":3.15, "w":1.75},
{"x":4.75, "y":3.15}, {"label":"A", "x":1.75, "y":3.15},
{"x":5.75, "y":3.15}, {"label":"S", "x":2.75, "y":3.15},
{"x":6.75, "y":3.15}, {"label":"D", "x":3.75, "y":3.15},
{"x":7.75, "y":3.15}, {"label":"F", "x":4.75, "y":3.15},
{"x":8.75, "y":3.15}, {"label":"G", "x":5.75, "y":3.15},
{"x":9.75, "y":3.15}, {"label":"H", "x":6.75, "y":3.15},
{"x":10.75, "y":3.15}, {"label":"J", "x":7.75, "y":3.15},
{"x":11.75, "y":3.15}, {"label":"K", "x":8.75, "y":3.15},
{"x":13.5, "y":2.15, "h":2}, {"label":"L", "x":9.75, "y":3.15},
{"x":15.25, "y":3.15}, {"label":";:", "x":10.75, "y":3.15},
{"x":16.25, "y":3.15}, {"label":"'\"", "x":11.75, "y":3.15},
{"x":17.25, "y":3.15}, {"label":"Enter", "x":13.5, "y":2.15, "h":2},
{"x":18.25, "y":3.15}, {"label":"4", "x":15.25, "y":3.15},
{"x":0, "y":4.15, "w":2.25}, {"label":"5", "x":16.25, "y":3.15},
{"x":2.25, "y":4.15}, {"label":"6", "x":17.25, "y":3.15},
{"x":3.25, "y":4.15}, {"label":"-", "x":18.25, "y":3.15},
{"x":4.25, "y":4.15},
{"x":5.25, "y":4.15}, {"label":"Shift", "x":0, "y":4.15, "w":2.25},
{"x":6.25, "y":4.15}, {"label":"Z", "x":2.25, "y":4.15},
{"x":7.25, "y":4.15}, {"label":"X", "x":3.25, "y":4.15},
{"x":8.25, "y":4.15}, {"label":"C", "x":4.25, "y":4.15},
{"x":9.25, "y":4.15}, {"label":"V", "x":5.25, "y":4.15},
{"x":10.25, "y":4.15}, {"label":"B", "x":6.25, "y":4.15},
{"x":11.25, "y":4.15}, {"label":"N", "x":7.25, "y":4.15},
{"x":12.25, "y":4.15, "w":2.25}, {"label":"M", "x":8.25, "y":4.15},
{"x":15.25, "y":4.15}, {"label":",<", "x":9.25, "y":4.15},
{"x":16.25, "y":4.15}, {"label":".>", "x":10.25, "y":4.15},
{"x":17.25, "y":4.15}, {"label":"/?", "x":11.25, "y":4.15},
{"x":18.25, "y":4.15, "h":2}, {"label":"MO(1)", "x":12.25, "y":4.15, "w":2.25},
{"x":0, "y":5.15}, {"label":"1", "x":15.25, "y":4.15},
{"x":1, "y":5.15}, {"label":"2", "x":16.25, "y":4.15},
{"x":2, "y":5.15, "w":1.75}, {"label":"3", "x":17.25, "y":4.15},
{"x":3.75, "y":5.15},
{"x":4.75, "y":5.15, "w":4.75}, {"label":"Caps Lock", "x":0, "y":5.15},
{"x":9.5, "y":5.15}, {"label":"GUI", "x":1, "y":5.15},
{"x":10.5, "y":5.15}, {"label":"Alt", "x":2, "y":5.15, "w":1.75},
{"x":11.5, "y":5.15}, {"label":"`~", "x":3.75, "y":5.15},
{"x":12.5, "y":5.15}, {"label":"Space", "x":4.75, "y":5.15, "w":4.75},
{"x":13.5, "y":5.15}, {"label":"\\|", "x":9.5, "y":5.15},
{"x":15.25, "y":5.15, "w":2}, {"label":"Left", "x":10.5, "y":5.15},
{"x":17.25, "y":5.15} {"label":"Right", "x":11.5, "y":5.15},
{"label":"Down", "x":12.5, "y":5.15},
{"label":"Up", "x":13.5, "y":5.15},
{"label":"0", "x":15.25, "y":5.15, "w":2},
{"label":".", "x":17.25, "y":5.15},
{"label":"Enter", "x":18.25, "y":4.15, "h":2}
] ]
} }
} }