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

This commit is contained in:
QMK Bot 2021-11-13 20:22:39 +00:00
commit f7536f3adf
2 changed files with 83 additions and 79 deletions

View File

@ -3,7 +3,7 @@
"url": "https://github.com/kb-elmo/numpad", "url": "https://github.com/kb-elmo/numpad",
"maintainer": "kb-elmo", "maintainer": "kb-elmo",
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT_numpad_6x4": {
"layout": [ "layout": [
{"x":0, "y":0}, {"x":0, "y":0},
{"x":1, "y":0}, {"x":1, "y":0},

View File

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