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

This commit is contained in:
QMK Bot 2025-06-19 21:25:05 +00:00
commit 8a06238054
2 changed files with 16 additions and 13 deletions

View File

@ -30,13 +30,13 @@
"layouts": { "layouts": {
"LAYOUT_wkl": { "LAYOUT_wkl": {
"layout": [ "layout": [
{"matrix": [0, 0], "x": 5.25, "y": 0}, {"matrix": [0, 0], "x": 0, "y": 0.25},
{"matrix": [0, 1], "x": 1, "y": 0.25},
{"matrix": [0, 2], "x": 2, "y": 0.25},
{"matrix": [0, 3], "x": 3, "y": 0.25},
{"matrix": [0, 4], "x": 4, "y": 0.25},
{"matrix": [0, 1], "x": 0, "y": 0.25}, {"matrix": [0, 5], "x": 5.25, "y": 0},
{"matrix": [0, 2], "x": 1, "y": 0.25},
{"matrix": [0, 3], "x": 2, "y": 0.25},
{"matrix": [0, 4], "x": 3, "y": 0.25},
{"matrix": [0, 5], "x": 4, "y": 0.25},
{"matrix": [1, 0], "x": 0, "y": 1.25}, {"matrix": [1, 0], "x": 0, "y": 1.25},
{"matrix": [1, 1], "x": 1, "y": 1.25}, {"matrix": [1, 1], "x": 1, "y": 1.25},
@ -55,13 +55,13 @@
}, },
"LAYOUT_bar": { "LAYOUT_bar": {
"layout": [ "layout": [
{"matrix": [0, 0], "x": 5.25, "y": 0}, {"matrix": [0, 0], "x": 0, "y": 0.25},
{"matrix": [0, 1], "x": 1, "y": 0.25},
{"matrix": [0, 2], "x": 2, "y": 0.25},
{"matrix": [0, 3], "x": 3, "y": 0.25},
{"matrix": [0, 4], "x": 4, "y": 0.25},
{"matrix": [0, 1], "x": 0, "y": 0.25}, {"matrix": [0, 5], "x": 5.25, "y": 0},
{"matrix": [0, 2], "x": 1, "y": 0.25},
{"matrix": [0, 3], "x": 2, "y": 0.25},
{"matrix": [0, 4], "x": 3, "y": 0.25},
{"matrix": [0, 5], "x": 4, "y": 0.25},
{"matrix": [1, 0], "x": 0, "y": 1.25}, {"matrix": [1, 0], "x": 0, "y": 1.25},
{"matrix": [1, 1], "x": 1, "y": 1.25}, {"matrix": [1, 1], "x": 1, "y": 1.25},
@ -71,7 +71,7 @@
{"matrix": [1, 5], "x": 5.25, "y": 1.25}, {"matrix": [1, 5], "x": 5.25, "y": 1.25},
{"matrix": [2, 0], "x": 0, "y": 2.25, "w": 2.75}, {"matrix": [2, 1], "x": 0, "y": 2.25, "w": 2.75},
{"matrix": [2, 3], "x": 2.75, "y": 2.25, "w": 2.25}, {"matrix": [2, 3], "x": 2.75, "y": 2.25, "w": 2.25},
{"matrix": [2, 5], "x": 5.25, "y": 2.25} {"matrix": [2, 5], "x": 5.25, "y": 2.25}

View File

@ -14,6 +14,9 @@
"enabled": true, "enabled": true,
"serial": { "serial": {
"driver": "vendor" "driver": "vendor"
},
"transport": {
"watchdog": true
} }
}, },
"matrix_pins": { "matrix_pins": {