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

master
QMK Bot 2022-10-08 02:04:49 +00:00
commit 010ed2e132
1 changed files with 74 additions and 40 deletions

View File

@ -19,7 +19,7 @@
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT_all": {
"layout": [ "layout": [
{"label":"P2 1", "x":3, "y":0, "w":0.5, "h":1.5, "matrix":[0,0]}, {"label":"P2 1", "x":3, "y":0, "w":0.5, "h":1.5, "matrix":[0,0]},
{"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,1]}, {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,1]},
@ -28,9 +28,11 @@
{"label":"P2 5", "x":5, "y":0, "w":0.5, "h":1.5, "matrix":[0,4]}, {"label":"P2 5", "x":5, "y":0, "w":0.5, "h":1.5, "matrix":[0,4]},
{"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,5]}, {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,5]},
{"label":"P2 7", "x":6, "y":0, "w":0.5, "h":1.5, "matrix":[0,6]}, {"label":"P2 7", "x":6, "y":0, "w":0.5, "h":1.5, "matrix":[0,6]},
{"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]},
{"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1,0]}, {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1,0]},
{"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]},
{"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1,2]}, {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1,2]},
{"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2,0]}, {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2,0]},
{"label":"P2 2", "x":3.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,1]}, {"label":"P2 2", "x":3.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,1]},
{"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2,2]}, {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2,2]},
@ -39,6 +41,38 @@
{"label":"P2 6", "x":5.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,5]}, {"label":"P2 6", "x":5.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,5]},
{"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2,6]} {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2,6]}
] ]
},
"LAYOUT_left": {
"layout": [
{"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,1]},
{"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,3]},
{"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,5]},
{"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1,0]},
{"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]},
{"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1,2]},
{"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2,0]},
{"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2,2]},
{"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2,4]},
{"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2,6]}
]
},
"LAYOUT_right": {
"layout": [
{"label":"P2 6", "x":0.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,5]},
{"label":"P2 4", "x":1.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,3]},
{"label":"P2 2", "x":2.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,1]},
{"label":"Knob CCW", "x":4, "y":1.25, "w":0.5, "matrix":[1,0] },
{"label":"Knob Press", "x":4.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]},
{"label":"Knob CW", "x":6, "y":1.25, "w":0.5, "matrix":[1,2]},
{"label":"P2 7", "x":0, "y":2, "w":0.5, "h":1.5, "matrix":[0,6]},
{"label":"P2 5", "x":1, "y":2, "w":0.5, "h":1.5, "matrix":[0,4]},
{"label":"P2 3", "x":2, "y":2, "w":0.5, "h":1.5, "matrix":[0,2]},
{"label":"P2 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[0,0]}
]
} }
} }
} }