Move single `LAYOUT`s to data driven (#20365)

2 files changed, 70 insertions, 114 deletions

diff --git a/keyboards/morizon/info.json b/keyboards/morizon/info.json
index 4d4e0aa69b..12cd59a31f 100644
--- a/keyboards/morizon/info.json
+++ b/keyboards/morizon/info.json
@@ -18,72 +18,76 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        { "x": 0, "y": 0 },
-        { "x": 1, "y": 0 },
-        { "x": 2, "y": 0 },
-        { "x": 3, "y": 0 },
-        { "x": 4, "y": 0 },
-        { "x": 5, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 12, "y": 0 },
-        { "x": 13, "y": 0 },
-        { "x": 0, "y": 1 },
-        { "x": 1, "y": 1 },
-        { "x": 2, "y": 1 },
-        { "x": 3, "y": 1 },
-        { "x": 4, "y": 1 },
-        { "x": 5, "y": 1 },
-        { "x": 8, "y": 1 },
-        { "x": 9, "y": 1 },
-        { "x": 10, "y": 1 },
-        { "x": 11, "y": 1 },
-        { "x": 12, "y": 1 },
-        { "x": 13, "y": 1 },
-        { "x": 0, "y": 2 },
-        { "x": 1, "y": 2 },
-        { "x": 2, "y": 2 },
-        { "x": 3, "y": 2 },
-        { "x": 4, "y": 2 },
-        { "x": 5, "y": 2 },
-        { "x": 6, "y": 2 },
-        { "x": 7, "y": 2 },
-        { "x": 8, "y": 2 },
-        { "x": 9, "y": 2 },
-        { "x": 10, "y": 2 },
-        { "x": 11, "y": 2 },
-        { "x": 12, "y": 2 },
-        { "x": 13, "y": 2 },
-        { "x": 0, "y": 3 },
-        { "x": 1, "y": 3 },
-        { "x": 2, "y": 3 },
-        { "x": 3, "y": 3 },
-        { "x": 4, "y": 3 },
-        { "x": 5, "y": 3 },
-        { "x": 6, "y": 3 },
-        { "x": 7, "y": 3 },
-        { "x": 8, "y": 3 },
-        { "x": 9, "y": 3 },
-        { "x": 10, "y": 3 },
-        { "x": 11, "y": 3 },
-        { "x": 12, "y": 3 },
-        { "x": 13, "y": 3 },
-        { "x": 0, "y": 4 },
-        { "x": 1, "y": 4 },
-        { "x": 2, "y": 4 },
-        { "x": 3, "y": 4 },
-        { "x": 4, "y": 4 },
-        { "x": 5, "y": 4 },
-        { "x": 6, "y": 4 },
-        { "x": 7, "y": 4 },
-        { "x": 8, "y": 4 },
-        { "x": 9, "y": 4 },
-        { "x": 10, "y": 4 },
-        { "x": 11, "y": 4 },
-        { "x": 12, "y": 4 },
-        { "x": 13, "y": 4 }
+        {"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": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [5, 1], "x": 8, "y": 0},
+        {"matrix": [5, 2], "x": 9, "y": 0},
+        {"matrix": [5, 3], "x": 10, "y": 0},
+        {"matrix": [5, 4], "x": 11, "y": 0},
+        {"matrix": [5, 5], "x": 12, "y": 0},
+        {"matrix": [5, 6], "x": 13, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [6, 1], "x": 8, "y": 1},
+        {"matrix": [6, 2], "x": 9, "y": 1},
+        {"matrix": [6, 3], "x": 10, "y": 1},
+        {"matrix": [6, 4], "x": 11, "y": 1},
+        {"matrix": [6, 5], "x": 12, "y": 1},
+        {"matrix": [6, 6], "x": 13, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [7, 0], "x": 7, "y": 2},
+        {"matrix": [7, 1], "x": 8, "y": 2},
+        {"matrix": [7, 2], "x": 9, "y": 2},
+        {"matrix": [7, 3], "x": 10, "y": 2},
+        {"matrix": [7, 4], "x": 11, "y": 2},
+        {"matrix": [7, 5], "x": 12, "y": 2},
+        {"matrix": [7, 6], "x": 13, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [8, 0], "x": 7, "y": 3},
+        {"matrix": [8, 1], "x": 8, "y": 3},
+        {"matrix": [8, 2], "x": 9, "y": 3},
+        {"matrix": [8, 3], "x": 10, "y": 3},
+        {"matrix": [8, 4], "x": 11, "y": 3},
+        {"matrix": [8, 5], "x": 12, "y": 3},
+        {"matrix": [8, 6], "x": 13, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4},
+        {"matrix": [4, 2], "x": 2, "y": 4},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [4, 4], "x": 4, "y": 4},
+        {"matrix": [4, 5], "x": 5, "y": 4},
+        {"matrix": [4, 6], "x": 6, "y": 4},
+        {"matrix": [9, 0], "x": 7, "y": 4},
+        {"matrix": [9, 1], "x": 8, "y": 4},
+        {"matrix": [9, 2], "x": 9, "y": 4},
+        {"matrix": [9, 3], "x": 10, "y": 4},
+        {"matrix": [9, 4], "x": 11, "y": 4},
+        {"matrix": [9, 5], "x": 12, "y": 4},
+        {"matrix": [9, 6], "x": 13, "y": 4}
       ]
     }
   }
diff --git a/keyboards/morizon/morizon.h b/keyboards/morizon/morizon.h
deleted file mode 100644
index a6c84ee502..0000000000
--- a/keyboards/morizon/morizon.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2022 Steven Karrmann
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k0a, k0b, \
-    k10, k11, k12, k13, k14, k15,           k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d  \
-) \
-{ \
-    { k00  , k01, k02, k03, k04, k05, KC_NO }, \
-    { k10  , k11, k12, k13, k14, k15, KC_NO }, \
-    { k20  , k21, k22, k23, k24, k25, k26   }, \
-    { k30  , k31, k32, k33, k34, k35, k36   }, \
-    { k40  , k41, k42, k43, k44, k45, k46   }, \
-    { KC_NO, k06, k07, k08, k09, k0a, k0b   }, \
-    { KC_NO, k16, k17, k18, k19, k1a, k1b   }, \
-    { k27  , k28, k29, k2a, k2b, k2c, k2d   }, \
-    { k37  , k38, k39, k3a, k3b, k3c, k3d   }, \
-    { k47  , k48, k49, k4a, k4b, k4c, k4d   }  \
-}