qmk_firmware

commit 8a062380540b3552d88175ef58839e6ef6ae74f4
parent 25d7ac9ecc7b390a01236320c03b8e60160d1b3e
Author: QMK Bot <hello@qmk.fm>
Date:   Thu, 19 Jun 2025 21:25:05 +0000

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

Diffstat:
M
keyboards/bolsa/damapad/keyboard.json
 | 
26
+++++++++++++-------------
M
keyboards/silakka54/keyboard.json
 | 
3
+++

2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/keyboards/bolsa/damapad/keyboard.json b/keyboards/bolsa/damapad/keyboard.json
@@ -30,13 +30,13 @@
     "layouts": {
         "LAYOUT_wkl": {
             "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, 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": [0, 5], "x": 5.25, "y": 0},
 
                 {"matrix": [1, 0], "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "x": 1, "y": 1.25},
@@ -55,13 +55,13 @@
         },
         "LAYOUT_bar": {
             "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, 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": [0, 5], "x": 5.25, "y": 0},
 
                 {"matrix": [1, 0], "x": 0, "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": [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, 5], "x": 5.25, "y": 2.25}
diff --git a/keyboards/silakka54/keyboard.json b/keyboards/silakka54/keyboard.json
@@ -14,6 +14,9 @@
         "enabled": true,
         "serial": {
             "driver": "vendor"
+        },
+        "transport": {
+            "watchdog": true
         }
     },
     "matrix_pins": {