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

master
QMK Bot 2021-03-02 04:34:43 +00:00
commit de585e3109
1 changed files with 21 additions and 21 deletions

View File

@ -5,43 +5,43 @@
"width": 11.5, "width": 11.5,
"height": 5, "height": 5,
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT_default": {
"layout": [ "layout": [
{"label":"RE", "x":4.25, "y":0}, {"label":"RE", "x":4.25, "y":0},
{"label":"RE", "x":6.25, "y":0}, {"label":"RE", "x":6.25, "y":0},
{"label":"E", "x":2, "y":0.25},
{"label":"I", "x":8.5, "y":0.25},
{"label":"W", "x":1, "y":0.5},
{"label":"O", "x":9.5, "y":0.5},
{"label":"Q", "x":0, "y":0.75}, {"label":"Q", "x":0, "y":0.75},
{"label":"W", "x":1, "y":0.5},
{"label":"E", "x":2, "y":0.25},
{"label":"R", "x":3, "y":0.75}, {"label":"R", "x":3, "y":0.75},
{"label":"U", "x":7.5, "y":0.75},
{"label":"P", "x":10.5, "y":0.75},
{"label":"T", "x":4, "y":1}, {"label":"T", "x":4, "y":1},
{"label":"Delete", "x":5, "y":1, "w":1.5}, {"label":"Delete", "x":5, "y":1, "w":1.5},
{"label":"Y", "x":6.5, "y":1}, {"label":"Y", "x":6.5, "y":1},
{"label":"D", "x":2, "y":1.25}, {"label":"U", "x":7.5, "y":0.75},
{"label":"K", "x":8.5, "y":1.25}, {"label":"I", "x":8.5, "y":0.25},
{"label":"S", "x":1, "y":1.5}, {"label":"O", "x":9.5, "y":0.5},
{"label":"L", "x":9.5, "y":1.5}, {"label":"P", "x":10.5, "y":0.75},
{"label":"A", "x":0, "y":1.75}, {"label":"A", "x":0, "y":1.75},
{"label":"S", "x":1, "y":1.5},
{"label":"D", "x":2, "y":1.25},
{"label":"F", "x":3, "y":1.75}, {"label":"F", "x":3, "y":1.75},
{"label":"J", "x":7.5, "y":1.75},
{"label":"\"", "x":10.5, "y":1.75},
{"label":"G", "x":4, "y":2}, {"label":"G", "x":4, "y":2},
{"label":"Tab", "x":5, "y":2, "w":1.5}, {"label":"Tab", "x":5, "y":2, "w":1.5},
{"label":"H", "x":6.5, "y":2}, {"label":"H", "x":6.5, "y":2},
{"label":"C", "x":2, "y":2.25}, {"label":"J", "x":7.5, "y":1.75},
{"label":"<", "x":8.5, "y":2.25}, {"label":"K", "x":8.5, "y":1.25},
{"label":"X", "x":1, "y":2.5}, {"label":"L", "x":9.5, "y":1.5},
{"label":">", "x":9.5, "y":2.5}, {"label":"\"", "x":10.5, "y":1.75},
{"label":"Z", "x":0, "y":2.75}, {"label":"Z", "x":0, "y":2.75},
{"label":"X", "x":1, "y":2.5},
{"label":"C", "x":2, "y":2.25},
{"label":"V", "x":3, "y":2.75}, {"label":"V", "x":3, "y":2.75},
{"label":"M", "x":7.5, "y":2.75},
{"label":"?", "x":10.5, "y":2.75},
{"label":"B", "x":4, "y":3}, {"label":"B", "x":4, "y":3},
{"label":"Shift", "x":5, "y":3, "w":1.5}, {"label":"Shift", "x":5, "y":3, "w":1.5},
{"label":"N", "x":6.5, "y":3}, {"label":"N", "x":6.5, "y":3},
{"label":"M", "x":7.5, "y":2.75},
{"label":"<", "x":8.5, "y":2.25},
{"label":">", "x":9.5, "y":2.5},
{"label":"?", "x":10.5, "y":2.75},
{"label":"Ctrl", "x":2.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":2.5, "y":4, "w":1.25},
{"label":"Backspace", "x":3.75, "y":4, "w":2}, {"label":"Backspace", "x":3.75, "y":4, "w":2},
{"label":"Space", "x":5.75, "y":4, "w":2}, {"label":"Space", "x":5.75, "y":4, "w":2},