Merge branch 'develop'

2 files changed, 106 insertions, 128 deletions

diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/daskeyboard4.c b/keyboards/handwired/daskeyboard/daskeyboard4/daskeyboard4.c
deleted file mode 100644
index 37d67007df..0000000000
--- a/keyboards/handwired/daskeyboard/daskeyboard4/daskeyboard4.c
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2022 Commander1024 (@Commander1024)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#include "quantum.h"
-
-// rotary encoder
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-    // Volume control
-    if (clockwise) {
-        tap_code(KC_VOLD);
-    } else {
-        tap_code(KC_VOLU);
-    }
-    return true;
-};
-#endif
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/info.json b/keyboards/handwired/daskeyboard/daskeyboard4/info.json
index 900a66bb8b..8308506512 100644
--- a/keyboards/handwired/daskeyboard/daskeyboard4/info.json
+++ b/keyboards/handwired/daskeyboard/daskeyboard4/info.json
@@ -37,10 +37,7 @@
     },
     "encoder": {
         "rotary": [
-            {
-            "pin_a": "B13",
-            "pin_b": "B12"
-            }
+            {"pin_a": "B13", "pin_b": "B12"}
         ]
     },
     "tapping": {
@@ -49,111 +46,111 @@
     "layouts": {
         "LAYOUT_fullsize_iso": {
             "layout": [
-                { "label":"Esc", "matrix": [5, 16], "x": 0, "y": 0 },
-                { "label":"F1", "matrix": [2, 4], "x": 2, "y": 0 },
-                { "label":"F2", "matrix": [2, 5], "x": 3, "y": 0 },
-                { "label":"F3", "matrix": [3, 5], "x": 4, "y": 0 },
-                { "label":"F4", "matrix": [5, 5], "x": 5, "y": 0 },
-                { "label":"F5", "matrix": [0, 1], "x": 6.5, "y": 0 },
-                { "label":"F6", "matrix": [5, 8], "x": 7.5, "y": 0 },
-                { "label":"F7", "matrix": [3, 3], "x": 8.5, "y": 0 },
-                { "label":"F8", "matrix": [2, 3], "x": 9.5, "y": 0 },
-                { "label":"F9", "matrix": [2, 2], "x": 11, "y": 0 },
-                { "label":"F10", "matrix": [0, 2], "x": 12, "y": 0 },
-                { "label":"F11", "matrix": [5, 2], "x": 13, "y": 0 },
-                { "label":"F12", "matrix": [6, 2], "x": 14, "y": 0 },
-                { "label":"Prt Sc", "matrix": [0, 0], "x": 15.25, "y": 0 },
-                { "label":"Scr Lk", "matrix": [1, 0], "x": 16.25, "y": 0 },
-                { "label":"Pause", "matrix": [1, 1], "x": 17.25, "y": 0 },
-                { "label":"`", "matrix": [2, 16], "x": 0, "y": 1.25 },
-                { "label":"1", "matrix": [0, 16], "x": 1, "y": 1.25 },
-                { "label":"2", "matrix": [0, 4], "x": 2, "y": 1.25 },
-                { "label":"3", "matrix": [0, 5], "x": 3, "y": 1.25 },
-                { "label":"4", "matrix": [0, 6], "x": 4, "y": 1.25 },
-                { "label":"5", "matrix": [2, 6], "x": 5, "y": 1.25 },
-                { "label":"6", "matrix": [2, 7], "x": 6, "y": 1.25 },
-                { "label":"7", "matrix": [0, 7], "x": 7, "y": 1.25 },
-                { "label":"8", "matrix": [0, 8], "x": 8, "y": 1.25 },
-                { "label":"9", "matrix": [0, 3], "x": 9, "y": 1.25 },
-                { "label":"0", "matrix": [0, 9], "x": 10, "y": 1.25 },
-                { "label":"-", "matrix": [2, 9], "x": 11, "y": 1.25 },
-                { "label":"=", "matrix": [2, 8], "x": 12, "y": 1.25 },
-                { "label":"Backspace", "matrix": [3, 2], "w": 2, "x": 13, "y": 1.25 },
-                { "label":"Ins", "matrix": [2, 11], "x": 15.25, "y": 1.25 },
-                { "label":"Home", "matrix": [2, 15], "x": 16.25, "y": 1.25 },
-                { "label":"Page Up", "matrix": [2, 14], "x": 17.25, "y": 1.25 },
-                { "label":"Num Lk", "matrix": [4, 10], "x": 18.5, "y": 1.25 },
-                { "label":"/", "matrix": [4, 11], "x": 19.5, "y": 1.25 },
-                { "label":"*", "matrix": [4, 14], "x": 20.5, "y": 1.25 },
-                { "label":"-", "matrix": [6, 14], "x": 21.5, "y": 1.25 },
-                { "label":"Tab", "matrix": [3, 16], "w": 1.5, "x": 0, "y": 2.25 },
-                { "label":"Q", "matrix": [1, 16], "x": 1.5, "y": 2.25 },
-                { "label":"W", "matrix": [1, 4], "x": 2.5, "y": 2.25 },
-                { "label":"E", "matrix": [1, 5], "x": 3.5, "y": 2.25 },
-                { "label":"R", "matrix": [1, 6], "x": 4.5, "y": 2.25 },
-                { "label":"T", "matrix": [3, 6], "x": 5.5, "y": 2.25 },
-                { "label":"Y", "matrix": [3, 7], "x": 6.5, "y": 2.25 },
-                { "label":"U", "matrix": [1, 7], "x": 7.5, "y": 2.25 },
-                { "label":"I", "matrix": [1, 8], "x": 8.5, "y": 2.25 },
-                { "label":"O", "matrix": [1, 3], "x": 9.5, "y": 2.25 },
-                { "label":"P", "matrix": [1, 9], "x": 10.5, "y": 2.25 },
-                { "label":"[", "matrix": [3, 9], "x": 11.5, "y": 2.25 },
-                { "label":"]", "matrix": [3, 8], "x": 12.5, "y": 2.25 },
-                { "label":"Del", "matrix": [2, 10], "x": 15.25, "y": 2.25 },
-                { "label":"End", "matrix": [0, 15], "x": 16.25, "y": 2.25 },
-                { "label":"Page Down", "matrix": [0, 14], "x": 17.25, "y": 2.25 },
-                { "label":"7", "matrix": [1, 10], "x": 18.5, "y": 2.25 },
-                { "label":"8", "matrix": [1, 11], "x": 19.5, "y": 2.25 },
-                { "label":"9", "matrix": [1, 14], "x": 20.5, "y": 2.25 },
-                { "label":"+", "h": 2, "matrix": [1, 15], "x": 21.5, "y": 2.25 },
-                { "label":"Caps Lock", "matrix": [3, 4], "w": 1.75, "x": 0, "y": 3.25 },
-                { "label":"A", "matrix": [7, 16], "x": 1.75, "y": 3.25 },
-                { "label":"S", "matrix": [7, 4], "x": 2.75, "y": 3.25 },
-                { "label":"D", "matrix": [7, 5], "x": 3.75, "y": 3.25 },
-                { "label":"F", "matrix": [7, 6], "x": 4.75, "y": 3.25 },
-                { "label":"G", "matrix": [5, 6], "x": 5.75, "y": 3.25 },
-                { "label":"H", "matrix": [5, 7], "x": 6.75, "y": 3.25 },
-                { "label":"J", "matrix": [7, 7], "x": 7.75, "y": 3.25 },
-                { "label":"K", "matrix": [7, 8], "x": 8.75, "y": 3.25 },
-                { "label":"L", "matrix": [7, 3], "x": 9.75, "y": 3.25 },
-                { "label":";", "matrix": [7, 9], "x": 10.75, "y": 3.25 },
-                { "label":"'", "matrix": [5, 9], "x": 11.75, "y": 3.25 },
-                { "label":"#", "matrix": [1, 2], "x": 12.75, "y": 3.25 },
-                { "label":"Return", "h": 2, "matrix": [4, 2], "w": 1.25, "x": 13.75, "y": 2.25 },
-                { "label":"4", "matrix": [3, 10], "x": 18.5, "y": 3.25 },
-                { "label":"5", "matrix": [3, 11], "x": 19.5, "y": 3.25 },
-                { "label":"6", "matrix": [3, 14], "x": 20.5, "y": 3.25 },
-                { "label":"Shift L", "matrix": [3, 13], "w": 1.25, "x": 0, "y": 4.25 },
-                { "label":"\\", "matrix": [5, 4], "x": 1.25, "y": 4.25 },
-                { "label":"Z", "matrix": [4, 16], "x": 2.25, "y": 4.25 },
-                { "label":"X", "matrix": [4, 4], "x": 3.25, "y": 4.25 },
-                { "label":"C", "matrix": [4, 5], "x": 4.25, "y": 4.25 },
-                { "label":"V", "matrix": [4, 6], "x": 5.25, "y": 4.25 },
-                { "label":"B", "matrix": [6, 6], "x": 6.25, "y": 4.25 },
-                { "label":"N", "matrix": [6, 7], "x": 7.25, "y": 4.25 },
-                { "label":"M", "matrix": [4, 7], "x": 8.25, "y": 4.25 },
-                { "label":",", "matrix": [4, 8], "x": 9.25, "y": 4.25 },
-                { "label":".", "matrix": [4, 3], "x": 10.25, "y": 4.25 },
-                { "label":"/", "matrix": [6, 9], "x": 11.25, "y": 4.25 },
-                { "label":"Shift R", "matrix": [7, 13], "w": 2.75, "x": 12.25, "y": 4.25 },
-                { "label":"Up", "matrix": [5, 15], "x": 16.25, "y": 4.25 },
-                { "label":"1", "matrix": [7, 10], "x": 18.5, "y": 4.25 },
-                { "label":"2", "matrix": [7, 11], "x": 19.5, "y": 4.25 },
-                { "label":"3", "matrix": [7, 14], "x": 20.5, "y": 4.25 },
-                { "label":"Enter", "h": 2, "matrix": [7, 15], "x": 21.5, "y": 4.25 },
-                { "label":"Control L", "matrix": [2, 1], "w": 1.25, "x": 0, "y": 5.25 },
-                { "label":"Super L", "matrix": [3, 12], "w": 1.25, "x": 1.25, "y": 5.25 },
-                { "label":"Alt L", "matrix": [5, 0], "w": 1.25, "x": 2.5, "y": 5.25 },
-                { "label":" ", "matrix": [5, 10], "w": 6.25, "x": 3.75, "y": 5.25 },
-                { "label":"Alt R", "matrix": [6, 0], "w": 1.25, "x": 10, "y": 5.25 },
-                { "label":"Super R", "matrix": [7, 12], "w": 1.25, "x": 11.25, "y": 5.25 },
-                { "label":"Menu", "matrix": [6, 3], "w": 1.25, "x": 12.5, "y": 5.25 },
-                { "label":"Control R", "matrix": [4, 1], "w": 1.25, "x": 13.75, "y": 5.25 },
-                { "label":"Left", "matrix": [6, 15], "x": 15.25, "y": 5.25 },
-                { "label":"Down", "matrix": [6, 10], "x": 16.25, "y": 5.25 },
-                { "label":"Right", "matrix": [6, 11], "x": 17.25, "y": 5.25 },
-                { "label":"0", "matrix": [5, 11], "w": 2, "x": 18.5, "y": 5.25 },
-                { "label":"Del", "matrix": [5, 14], "x": 20.5, "y": 5.25 }
+                {"label": "Esc", "matrix": [5, 16], "x": 0, "y": 0},
+                {"label": "F1", "matrix": [2, 4], "x": 2, "y": 0},
+                {"label": "F2", "matrix": [2, 5], "x": 3, "y": 0},
+                {"label": "F3", "matrix": [3, 5], "x": 4, "y": 0},
+                {"label": "F4", "matrix": [5, 5], "x": 5, "y": 0},
+                {"label": "F5", "matrix": [0, 1], "x": 6.5, "y": 0},
+                {"label": "F6", "matrix": [5, 8], "x": 7.5, "y": 0},
+                {"label": "F7", "matrix": [3, 3], "x": 8.5, "y": 0},
+                {"label": "F8", "matrix": [2, 3], "x": 9.5, "y": 0},
+                {"label": "F9", "matrix": [2, 2], "x": 11, "y": 0},
+                {"label": "F10", "matrix": [0, 2], "x": 12, "y": 0},
+                {"label": "F11", "matrix": [5, 2], "x": 13, "y": 0},
+                {"label": "F12", "matrix": [6, 2], "x": 14, "y": 0},
+                {"label": "Prt Sc", "matrix": [0, 0], "x": 15.25, "y": 0},
+                {"label": "Scr Lk", "matrix": [1, 0], "x": 16.25, "y": 0},
+                {"label": "Pause", "matrix": [1, 1], "x": 17.25, "y": 0},
+                {"label": "`", "matrix": [2, 16], "x": 0, "y": 1.25},
+                {"label": "1", "matrix": [0, 16], "x": 1, "y": 1.25},
+                {"label": "2", "matrix": [0, 4], "x": 2, "y": 1.25},
+                {"label": "3", "matrix": [0, 5], "x": 3, "y": 1.25},
+                {"label": "4", "matrix": [0, 6], "x": 4, "y": 1.25},
+                {"label": "5", "matrix": [2, 6], "x": 5, "y": 1.25},
+                {"label": "6", "matrix": [2, 7], "x": 6, "y": 1.25},
+                {"label": "7", "matrix": [0, 7], "x": 7, "y": 1.25},
+                {"label": "8", "matrix": [0, 8], "x": 8, "y": 1.25},
+                {"label": "9", "matrix": [0, 3], "x": 9, "y": 1.25},
+                {"label": "0", "matrix": [0, 9], "x": 10, "y": 1.25},
+                {"label": "-", "matrix": [2, 9], "x": 11, "y": 1.25},
+                {"label": "=", "matrix": [2, 8], "x": 12, "y": 1.25},
+                {"label": "Backspace", "matrix": [3, 2], "w": 2, "x": 13, "y": 1.25},
+                {"label": "Ins", "matrix": [2, 11], "x": 15.25, "y": 1.25},
+                {"label": "Home", "matrix": [2, 15], "x": 16.25, "y": 1.25},
+                {"label": "Page Up", "matrix": [2, 14], "x": 17.25, "y": 1.25},
+                {"label": "Num Lk", "matrix": [4, 10], "x": 18.5, "y": 1.25},
+                {"label": "/", "matrix": [4, 11], "x": 19.5, "y": 1.25},
+                {"label": "*", "matrix": [4, 14], "x": 20.5, "y": 1.25},
+                {"label": "-", "matrix": [6, 14], "x": 21.5, "y": 1.25},
+                {"label": "Tab", "matrix": [3, 16], "w": 1.5, "x": 0, "y": 2.25},
+                {"label": "Q", "matrix": [1, 16], "x": 1.5, "y": 2.25},
+                {"label": "W", "matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"label": "E", "matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"label": "R", "matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"label": "T", "matrix": [3, 6], "x": 5.5, "y": 2.25},
+                {"label": "Y", "matrix": [3, 7], "x": 6.5, "y": 2.25},
+                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 2.25},
+                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 2.25},
+                {"label": "O", "matrix": [1, 3], "x": 9.5, "y": 2.25},
+                {"label": "P", "matrix": [1, 9], "x": 10.5, "y": 2.25},
+                {"label": "[", "matrix": [3, 9], "x": 11.5, "y": 2.25},
+                {"label": "]", "matrix": [3, 8], "x": 12.5, "y": 2.25},
+                {"label": "Del", "matrix": [2, 10], "x": 15.25, "y": 2.25},
+                {"label": "End", "matrix": [0, 15], "x": 16.25, "y": 2.25},
+                {"label": "Page Down", "matrix": [0, 14], "x": 17.25, "y": 2.25},
+                {"label": "7", "matrix": [1, 10], "x": 18.5, "y": 2.25},
+                {"label": "8", "matrix": [1, 11], "x": 19.5, "y": 2.25},
+                {"label": "9", "matrix": [1, 14], "x": 20.5, "y": 2.25},
+                {"label": "+", "h": 2, "matrix": [1, 15], "x": 21.5, "y": 2.25},
+                {"label": "Caps Lock", "matrix": [3, 4], "w": 1.75, "x": 0, "y": 3.25},
+                {"label": "A", "matrix": [7, 16], "x": 1.75, "y": 3.25},
+                {"label": "S", "matrix": [7, 4], "x": 2.75, "y": 3.25},
+                {"label": "D", "matrix": [7, 5], "x": 3.75, "y": 3.25},
+                {"label": "F", "matrix": [7, 6], "x": 4.75, "y": 3.25},
+                {"label": "G", "matrix": [5, 6], "x": 5.75, "y": 3.25},
+                {"label": "H", "matrix": [5, 7], "x": 6.75, "y": 3.25},
+                {"label": "J", "matrix": [7, 7], "x": 7.75, "y": 3.25},
+                {"label": "K", "matrix": [7, 8], "x": 8.75, "y": 3.25},
+                {"label": "L", "matrix": [7, 3], "x": 9.75, "y": 3.25},
+                {"label": ";", "matrix": [7, 9], "x": 10.75, "y": 3.25},
+                {"label": "'", "matrix": [5, 9], "x": 11.75, "y": 3.25},
+                {"label": "#", "matrix": [1, 2], "x": 12.75, "y": 3.25},
+                {"label": "Return", "h": 2, "matrix": [4, 2], "w": 1.25, "x": 13.75, "y": 2.25},
+                {"label": "4", "matrix": [3, 10], "x": 18.5, "y": 3.25},
+                {"label": "5", "matrix": [3, 11], "x": 19.5, "y": 3.25},
+                {"label": "6", "matrix": [3, 14], "x": 20.5, "y": 3.25},
+                {"label": "Shift L", "matrix": [3, 13], "w": 1.25, "x": 0, "y": 4.25},
+                {"label": "\\", "matrix": [5, 4], "x": 1.25, "y": 4.25},
+                {"label": "Z", "matrix": [4, 16], "x": 2.25, "y": 4.25},
+                {"label": "X", "matrix": [4, 4], "x": 3.25, "y": 4.25},
+                {"label": "C", "matrix": [4, 5], "x": 4.25, "y": 4.25},
+                {"label": "V", "matrix": [4, 6], "x": 5.25, "y": 4.25},
+                {"label": "B", "matrix": [6, 6], "x": 6.25, "y": 4.25},
+                {"label": "N", "matrix": [6, 7], "x": 7.25, "y": 4.25},
+                {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"label": ".", "matrix": [4, 3], "x": 10.25, "y": 4.25},
+                {"label": "/", "matrix": [6, 9], "x": 11.25, "y": 4.25},
+                {"label": "Shift R", "matrix": [7, 13], "w": 2.75, "x": 12.25, "y": 4.25},
+                {"label": "Up", "matrix": [5, 15], "x": 16.25, "y": 4.25},
+                {"label": "1", "matrix": [7, 10], "x": 18.5, "y": 4.25},
+                {"label": "2", "matrix": [7, 11], "x": 19.5, "y": 4.25},
+                {"label": "3", "matrix": [7, 14], "x": 20.5, "y": 4.25},
+                {"label": "Enter", "h": 2, "matrix": [7, 15], "x": 21.5, "y": 4.25},
+                {"label": "Control L", "matrix": [2, 1], "w": 1.25, "x": 0, "y": 5.25},
+                {"label": "Super L", "matrix": [3, 12], "w": 1.25, "x": 1.25, "y": 5.25},
+                {"label": "Alt L", "matrix": [5, 0], "w": 1.25, "x": 2.5, "y": 5.25},
+                {"label": " ", "matrix": [5, 10], "w": 6.25, "x": 3.75, "y": 5.25},
+                {"label": "Alt R", "matrix": [6, 0], "w": 1.25, "x": 10, "y": 5.25},
+                {"label": "Super R", "matrix": [7, 12], "w": 1.25, "x": 11.25, "y": 5.25},
+                {"label": "Menu", "matrix": [6, 3], "w": 1.25, "x": 12.5, "y": 5.25},
+                {"label": "Control R", "matrix": [4, 1], "w": 1.25, "x": 13.75, "y": 5.25},
+                {"label": "Left", "matrix": [6, 15], "x": 15.25, "y": 5.25},
+                {"label": "Down", "matrix": [6, 10], "x": 16.25, "y": 5.25},
+                {"label": "Right", "matrix": [6, 11], "x": 17.25, "y": 5.25},
+                {"label": "0", "matrix": [5, 11], "w": 2, "x": 18.5, "y": 5.25},
+                {"label": "Del", "matrix": [5, 14], "x": 20.5, "y": 5.25}
             ]
         }
     }