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

This commit is contained in:
QMK Bot 2022-02-10 16:20:03 +00:00
commit 54572c8daf

View File

@ -6,238 +6,65 @@
"layouts": { "layouts": {
"LAYOUT_numpad_6x4": { "LAYOUT_numpad_6x4": {
"layout": [ "layout": [
{ {"label":"F1", "x":0, "y":0},
"label": "F1", {"label":"F2", "x":1, "y":0},
"x": 0, {"label":"F3", "x":2, "y":0},
"y": 1 {"label":"MUTE", "x":3, "y":0},
},
{ {"label":"Num Lock", "x":0, "y":1},
"label": "F2", {"label":"/", "x":1, "y":1},
"x": 1, {"label":"*", "x":2, "y":1},
"y": 1 {"label":"-", "x":3, "y":1},
},
{ {"label":"7", "x":0, "y":2},
"label": "F3", {"label":"8", "x":1, "y":2},
"x": 2, {"label":"9", "x":2, "y":2},
"y": 1
}, {"label":"4", "x":0, "y":3},
{ {"label":"5", "x":1, "y":3},
"label": "MUTE", {"label":"6", "x":2, "y":3},
"x": 3, {"label":"+", "x":3, "y":2, "h":2},
"y": 1
}, {"label":"1", "x":0, "y":4},
{ {"label":"2", "x":1, "y":4},
"label": "Num Lock", {"label":"3", "x":2, "y":4},
"x": 0,
"y": 1 {"label":"0", "x":0, "y":5, "w":2},
}, {"label":".", "x":2, "y":5},
{ {"label":"Enter", "x":3, "y":4, "h":2}
"label": "/",
"x": 1,
"y": 1
},
{
"label": "*",
"x": 2,
"y": 1
},
{
"label": "-",
"x": 3,
"y": 1
},
{
"label": "7",
"x": 0,
"y": 2
},
{
"label": "8",
"x": 1,
"y": 2
},
{
"label": "9",
"x": 2,
"y": 2
},
{
"label": "4",
"x": 0,
"y": 3
},
{
"label": "5",
"x": 1,
"y": 3
},
{
"label": "6",
"x": 2,
"y": 3
},
{
"label": "+",
"x": 3,
"y": 2,
"h": 2
},
{
"label": "1",
"x": 0,
"y": 4
},
{
"label": "2",
"x": 1,
"y": 4
},
{
"label": "3",
"x": 2,
"y": 4
},
{
"label": "0",
"x": 0,
"y": 5,
"w": 2
},
{
"label": ".",
"x": 2,
"y": 5
},
{
"label": "Enter",
"x": 3,
"y": 4,
"h": 2
}
] ]
}, },
"LAYOUT_ortho_6x4": { "LAYOUT_ortho_6x4": {
"layout": [ "layout": [
{ {"label":"F1", "x":0, "y":0},
"label": "F1", {"label":"F2", "x":1, "y":0},
"x": 0, {"label":"F3", "x":2, "y":0},
"y": 1 {"label":"MUTE", "x":3, "y":0},
},
{ {"label":"Num Lock", "x":0, "y":1},
"label": "F2", {"label":"/", "x":1, "y":1},
"x": 1, {"label":"*", "x":2, "y":1},
"y": 1 {"label":"-", "x":3, "y":1},
},
{ {"label":"7", "x":0, "y":2},
"label": "F3", {"label":"8", "x":1, "y":2},
"x": 2, {"label":"9", "x":2, "y":2},
"y": 1 {"label":"+", "x":3, "y":2},
},
{ {"label":"4", "x":0, "y":3},
"label": "MUTE", {"label":"5", "x":1, "y":3},
"x": 3, {"label":"6", "x":2, "y":3},
"y": 1 {"label":"+", "x":3, "y":3},
},
{ {"label":"1", "x":0, "y":4},
"label": "Num Lock", {"label":"2", "x":1, "y":4},
"x": 0, {"label":"3", "x":2, "y":4},
"y": 1 {"label":"Enter", "x":3, "y":4},
},
{ {"label":"0", "x":0, "y":5},
"label": "/", {"label":"00", "x":1, "y":5},
"x": 1, {"label":".", "x":2, "y":5},
"y": 1 {"label":"Enter", "x":3, "y":5}
},
{
"label": "*",
"x": 2,
"y": 1
},
{
"label": "-",
"x": 3,
"y": 1
},
{
"label": "7",
"x": 0,
"y": 2
},
{
"label": "8",
"x": 1,
"y": 2
},
{
"label": "9",
"x": 2,
"y": 2
},
{
"label": "+",
"x": 3,
"y": 2
},
{
"label": "4",
"x": 0,
"y": 3
},
{
"label": "5",
"x": 1,
"y": 3
},
{
"label": "6",
"x": 2,
"y": 3
},
{
"label": "+",
"x": 3,
"y": 3
},
{
"label": "1",
"x": 0,
"y": 4
},
{
"label": "2",
"x": 1,
"y": 4
},
{
"label": "3",
"x": 2,
"y": 4
},
{
"label": "Enter",
"x": 3,
"y": 4
},
{
"label": "0",
"x": 0,
"y": 5
},
{
"label": "00",
"x": 1,
"y": 5
},
{
"label": ".",
"x": 2,
"y": 5
},
{
"label": "Enter",
"x": 3,
"y": 5
}
] ]
} }
} }