Merge branch 'develop'

6 files changed, 202 insertions, 389 deletions

diff --git a/keyboards/thepanduuh/degenpad/config.h b/keyboards/thepanduuh/degenpad/config.h
deleted file mode 100644
index 49f53eff7a..0000000000
--- a/keyboards/thepanduuh/degenpad/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Copyright 2023 ThePanduuh <thepanduuh.kb@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { D5, D6, D7, B4, B5, B6 }
-#define MATRIX_COL_PINS { F4, F5, B1, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/thepanduuh/degenpad/degenpad.c b/keyboards/thepanduuh/degenpad/degenpad.c
deleted file mode 100644
index d70c8b8c1a..0000000000
--- a/keyboards/thepanduuh/degenpad/degenpad.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright 2023 ThePanduuh <thepanduuh.kb@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "degenpad.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 0) {
-        if (clockwise) {
-            tap_code_delay(KC_VOLU, 10);
-        } else {
-            tap_code_delay(KC_VOLD, 10);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/thepanduuh/degenpad/degenpad.h b/keyboards/thepanduuh/degenpad/degenpad.h
deleted file mode 100644
index 53f949a79f..0000000000
--- a/keyboards/thepanduuh/degenpad/degenpad.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-Copyright 2023 ThePanduuh <thepanduuh.kb@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma once
-
-#include "quantum.h"
-#define LAYOUT_ortho_6x4( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-    k50, k51, k52, k53 \
-) { \
-	{k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, k23}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, k43}, \
-    {k50, k51, k52, k53}  \
-}
-
-#define LAYOUT_numpad_6x4(  \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22,      \
-    k30, k31, k32, k33, \
-    k40, k41, k42,      \
-         k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, KC_NO}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, KC_NO}, \
-    {KC_NO, k51, k52, k53}  \
-}
-
-#define LAYOUT_split_plus( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42,      \
-         k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, k23}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, KC_NO}, \
-    {KC_NO, k51, k52, k53}  \
-}
-
-#define LAYOUT_split_zero( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22,      \
-    k30, k31, k32, k33, \
-    k40, k41, k42,      \
-    k50, k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03},   \
-    {k10, k11, k12, k13},   \
-    {k20, k21, k22, KC_NO}, \
-    {k30, k31, k32, k33},   \
-    {k40, k41, k42, KC_NO}, \
-    {k50, k51, k52, k53}    \
-}
-
-#define LAYOUT_split_enter( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22,      \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-         k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, KC_NO}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, k43}, \
-    {KC_NO, k51, k52, k53}  \
-}
-
-#define LAYOUT_split_enter_plus( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42, k43, \
-         k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, k23}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, k43}, \
-    {KC_NO, k51, k52, k53}  \
-}
-
-#define LAYOUT_split_zero_plus( \
-    k00, k01, k02, k03, \
-    k10, k11, k12, k13, \
-    k20, k21, k22, k23, \
-    k30, k31, k32, k33, \
-    k40, k41, k42,      \
-    k50, k51, k52, k53  \
-) \
-{ \
-    {k00, k01, k02, k03}, \
-    {k10, k11, k12, k13}, \
-    {k20, k21, k22, k23}, \
-    {k30, k31, k32, k33}, \
-    {k40, k41, k42, KC_NO}, \
-    {k50, k51, k52, k53}  \
-}
diff --git a/keyboards/thepanduuh/degenpad/info.json b/keyboards/thepanduuh/degenpad/info.json
index 999de9648c..4a5e844b50 100644
--- a/keyboards/thepanduuh/degenpad/info.json
+++ b/keyboards/thepanduuh/degenpad/info.json
@@ -1,13 +1,18 @@
 {
-    "keyboard_name": "Degenpad", 
+    "keyboard_name": "Degenpad",
     "manufacturer": "ThePanduuh",
-    "url": "https://github.com/ThePanduuh", 
-    "maintainer": "ThePanduuh", 
+    "url": "https://github.com/ThePanduuh",
+    "maintainer": "ThePanduuh",
     "usb": {
         "vid": "0x4A44",
         "pid": "0x4447",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "B1", "D3"],
+        "rows": ["D5", "D6", "D7", "B4", "B5", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "F1", "pin_b": "F0"}
@@ -18,222 +23,222 @@
     "layouts": {
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-                {"x": 3, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.25},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-                {"x": 3, "y": 4.25},
-
-                {"x": 0, "y": 5.25},
-                {"x": 1, "y": 5.25},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         },
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 2.25, "h": 2},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 2},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_split_plus": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-                {"x": 3, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.25},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 2},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_split_zero": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 2.25, "h": 2},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-
-                {"x": 0, "y": 5.25},
-                {"x": 1, "y": 5.25},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         },
         "LAYOUT_split_enter": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 2.25, "h": 2},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-                {"x": 3, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 2},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 2.25, "h": 2},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         },
         "LAYOUT_split_enter_plus": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-                {"x": 3, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.25},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-                {"x": 3, "y": 4.25},
-
-                {"x": 0, "y": 5.25, "w": 2},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+
+                {"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25}
             ]
         },
         "LAYOUT_split_zero_plus": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.25},
-                {"x": 3, "y": 1.25},
-
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.25},
-                {"x": 3, "y": 2.25},
-
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.25},
-                {"x": 3, "y": 3.25},
-
-                {"x": 0, "y": 4.25},
-                {"x": 1, "y": 4.25},
-                {"x": 2, "y": 4.25},
-
-                {"x": 0, "y": 5.25},
-                {"x": 1, "y": 5.25},
-                {"x": 2, "y": 5.25},
-                {"x": 3, "y": 4.25, "h": 2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.25},
+                {"matrix": [2, 3], "x": 3, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.25},
+                {"matrix": [3, 3], "x": 3, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 4.25, "h": 2}
             ]
         }
     }
diff --git a/keyboards/thepanduuh/degenpad/keymaps/default/keymap.c b/keyboards/thepanduuh/degenpad/keymaps/default/keymap.c
index f46a447eff..0240ba034e 100644
--- a/keyboards/thepanduuh/degenpad/keymaps/default/keymap.c
+++ b/keyboards/thepanduuh/degenpad/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
   [_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
   [_FN] = {ENCODER_CCW_CW(KC_NO, KC_NO)}
 };
diff --git a/keyboards/thepanduuh/degenpad/keymaps/via/keymap.c b/keyboards/thepanduuh/degenpad/keymaps/via/keymap.c
index 87b98be5bc..64bf0d37c1 100644
--- a/keyboards/thepanduuh/degenpad/keymaps/via/keymap.c
+++ b/keyboards/thepanduuh/degenpad/keymaps/via/keymap.c
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
   [0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
   [1] = {ENCODER_CCW_CW(KC_NO, KC_NO)},
   [2] = {ENCODER_CCW_CW(KC_NO, KC_NO)},