Move remaining `LAYOUT_all`s to data driven (#20463)

2 files changed, 163 insertions, 78 deletions

diff --git a/keyboards/pohjolaworks/louhi/info.json b/keyboards/pohjolaworks/louhi/info.json
index d6c6fc31f0..3acffeee23 100644
--- a/keyboards/pohjolaworks/louhi/info.json
+++ b/keyboards/pohjolaworks/louhi/info.json
@@ -25,13 +25,173 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_7u_space": {
-            "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k10", "x":1, "y":0}, {"label":"k01", "x":2, "y":0}, {"label":"k11", "x":3, "y":0}, {"label":"k02", "x":4, "y":0}, {"label":"k12", "x":5, "y":0}, {"label":"k03", "x":6, "y":0}, {"label":"k13", "x":7, "y":0}, {"label":"k04", "x":8, "y":0}, {"label":"k14", "x":9, "y":0}, {"label":"k05", "x":10, "y":0}, {"label":"k15", "x":11, "y":0}, {"label":"k06", "x":12, "y":0}, {"label":"k20", "x":0, "y":1}, {"label":"k30", "x":1, "y":1}, {"label":"k21", "x":2, "y":1}, {"label":"k31", "x":3, "y":1}, {"label":"k22", "x":4, "y":1}, {"label":"k32", "x":5, "y":1}, {"label":"k23", "x":6, "y":1}, {"label":"k33", "x":7, "y":1}, {"label":"k24", "x":8, "y":1}, {"label":"k34", "x":9, "y":1}, {"label":"k25", "x":10, "y":1}, {"label":"k35", "x":11, "y":1}, {"label":"k26", "x":12, "y":1}, {"label":"k40", "x":0, "y":2}, {"label":"k50", "x":1, "y":2}, {"label":"k41", "x":2, "y":2}, {"label":"k51", "x":3, "y":2}, {"label":"k42", "x":4, "y":2}, {"label":"k52", "x":5, "y":2}, {"label":"k43", "x":6, "y":2}, {"label":"k53", "x":7, "y":2}, {"label":"k44", "x":8, "y":2}, {"label":"k54", "x":9, "y":2}, {"label":"k45", "x":10, "y":2}, {"label":"k55", "x":11, "y":2}, {"label":"k46", "x":12, "y":2}, {"label":"k60", "x":0, "y":3}, {"label":"k70", "x":1, "y":3}, {"label":"k61", "x":2, "y":3}, {"label":"k63", "x":3, "y":3, "w":7}, {"label":"k65", "x":10, "y":3}, {"label":"k75", "x":11, "y":3}, {"label":"k66", "x":12, "y":3}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+                {"matrix": [4, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [4, 3], "x": 6, "y": 2},
+                {"matrix": [5, 3], "x": 7, "y": 2},
+                {"matrix": [4, 4], "x": 8, "y": 2},
+                {"matrix": [5, 4], "x": 9, "y": 2},
+                {"matrix": [4, 5], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
+                {"matrix": [4, 6], "x": 12, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [6, 3], "x": 3, "y": 3, "w": 7},
+                {"matrix": [6, 5], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+                {"matrix": [6, 6], "x": 12, "y": 3}
+            ]
         },
         "LAYOUT_all": {
-            "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k10", "x":1, "y":0}, {"label":"k01", "x":2, "y":0}, {"label":"k11", "x":3, "y":0}, {"label":"k02", "x":4, "y":0}, {"label":"k12", "x":5, "y":0}, {"label":"k03", "x":6, "y":0}, {"label":"k13", "x":7, "y":0}, {"label":"k04", "x":8, "y":0}, {"label":"k14", "x":9, "y":0}, {"label":"k05", "x":10, "y":0}, {"label":"k15", "x":11, "y":0}, {"label":"k06", "x":12, "y":0}, {"label":"k20", "x":0, "y":1}, {"label":"k30", "x":1, "y":1}, {"label":"k21", "x":2, "y":1}, {"label":"k31", "x":3, "y":1}, {"label":"k22", "x":4, "y":1}, {"label":"k32", "x":5, "y":1}, {"label":"k23", "x":6, "y":1}, {"label":"k33", "x":7, "y":1}, {"label":"k24", "x":8, "y":1}, {"label":"k34", "x":9, "y":1}, {"label":"k25", "x":10, "y":1}, {"label":"k35", "x":11, "y":1}, {"label":"k26", "x":12, "y":1}, {"label":"k40", "x":0, "y":2}, {"label":"k50", "x":1, "y":2}, {"label":"k41", "x":2, "y":2}, {"label":"k51", "x":3, "y":2}, {"label":"k42", "x":4, "y":2}, {"label":"k52", "x":5, "y":2}, {"label":"k43", "x":6, "y":2}, {"label":"k53", "x":7, "y":2}, {"label":"k44", "x":8, "y":2}, {"label":"k54", "x":9, "y":2}, {"label":"k45", "x":10, "y":2}, {"label":"k55", "x":11, "y":2}, {"label":"k46", "x":12, "y":2}, {"label":"k60", "x":0, "y":3}, {"label":"k70", "x":1, "y":3}, {"label":"k61", "x":2, "y":3}, {"label":"k71", "x":3, "y":3}, {"label":"k62", "x":4, "y":3}, {"label":"k72", "x":5, "y":3}, {"label":"k63", "x":6, "y":3}, {"label":"k73", "x":7, "y":3}, {"label":"k64", "x":8, "y":3}, {"label":"k74", "x":9, "y":3}, {"label":"k65", "x":10, "y":3}, {"label":"k75", "x":11, "y":3}, {"label":"k66", "x":12, "y":3}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+                {"matrix": [4, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [4, 3], "x": 6, "y": 2},
+                {"matrix": [5, 3], "x": 7, "y": 2},
+                {"matrix": [4, 4], "x": 8, "y": 2},
+                {"matrix": [5, 4], "x": 9, "y": 2},
+                {"matrix": [4, 5], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
+                {"matrix": [4, 6], "x": 12, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+                {"matrix": [6, 2], "x": 4, "y": 3},
+                {"matrix": [7, 2], "x": 5, "y": 3},
+                {"matrix": [6, 3], "x": 6, "y": 3},
+                {"matrix": [7, 3], "x": 7, "y": 3},
+                {"matrix": [6, 4], "x": 8, "y": 3},
+                {"matrix": [7, 4], "x": 9, "y": 3},
+                {"matrix": [6, 5], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+                {"matrix": [6, 6], "x": 12, "y": 3}
+            ]
         },
         "LAYOUT_2x_2u": {
-            "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k10", "x":1, "y":0}, {"label":"k01", "x":2, "y":0}, {"label":"k11", "x":3, "y":0}, {"label":"k02", "x":4, "y":0}, {"label":"k12", "x":5, "y":0}, {"label":"k03", "x":6, "y":0}, {"label":"k13", "x":7, "y":0}, {"label":"k04", "x":8, "y":0}, {"label":"k14", "x":9, "y":0}, {"label":"k05", "x":10, "y":0}, {"label":"k15", "x":11, "y":0}, {"label":"k06", "x":12, "y":0}, {"label":"k20", "x":0, "y":1}, {"label":"k30", "x":1, "y":1}, {"label":"k21", "x":2, "y":1}, {"label":"k31", "x":3, "y":1}, {"label":"k22", "x":4, "y":1}, {"label":"k32", "x":5, "y":1}, {"label":"k23", "x":6, "y":1}, {"label":"k33", "x":7, "y":1}, {"label":"k24", "x":8, "y":1}, {"label":"k34", "x":9, "y":1}, {"label":"k25", "x":10, "y":1}, {"label":"k35", "x":11, "y":1}, {"label":"k26", "x":12, "y":1}, {"label":"k40", "x":0, "y":2}, {"label":"k50", "x":1, "y":2}, {"label":"k41", "x":2, "y":2}, {"label":"k51", "x":3, "y":2}, {"label":"k42", "x":4, "y":2}, {"label":"k52", "x":5, "y":2}, {"label":"k43", "x":6, "y":2}, {"label":"k53", "x":7, "y":2}, {"label":"k44", "x":8, "y":2}, {"label":"k54", "x":9, "y":2}, {"label":"k45", "x":10, "y":2}, {"label":"k55", "x":11, "y":2}, {"label":"k46", "x":12, "y":2}, {"label":"k60", "x":0, "y":3}, {"label":"k70", "x":1, "y":3}, {"label":"k61", "x":2, "y":3}, {"label":"k71", "x":3, "y":3}, {"label":"k62", "x":4, "y":3, "w":2}, {"label":"k63", "x":6, "y":3, "w":2}, {"label":"k64", "x":8, "y":3}, {"label":"k74", "x":9, "y":3}, {"label":"k65", "x":10, "y":3}, {"label":"k75", "x":11, "y":3}, {"label":"k66", "x":12, "y":3}]
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1},
+                {"matrix": [3, 0], "x": 1, "y": 1},
+                {"matrix": [2, 1], "x": 2, "y": 1},
+                {"matrix": [3, 1], "x": 3, "y": 1},
+                {"matrix": [2, 2], "x": 4, "y": 1},
+                {"matrix": [3, 2], "x": 5, "y": 1},
+                {"matrix": [2, 3], "x": 6, "y": 1},
+                {"matrix": [3, 3], "x": 7, "y": 1},
+                {"matrix": [2, 4], "x": 8, "y": 1},
+                {"matrix": [3, 4], "x": 9, "y": 1},
+                {"matrix": [2, 5], "x": 10, "y": 1},
+                {"matrix": [3, 5], "x": 11, "y": 1},
+                {"matrix": [2, 6], "x": 12, "y": 1},
+
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1, "y": 2},
+                {"matrix": [4, 1], "x": 2, "y": 2},
+                {"matrix": [5, 1], "x": 3, "y": 2},
+                {"matrix": [4, 2], "x": 4, "y": 2},
+                {"matrix": [5, 2], "x": 5, "y": 2},
+                {"matrix": [4, 3], "x": 6, "y": 2},
+                {"matrix": [5, 3], "x": 7, "y": 2},
+                {"matrix": [4, 4], "x": 8, "y": 2},
+                {"matrix": [5, 4], "x": 9, "y": 2},
+                {"matrix": [4, 5], "x": 10, "y": 2},
+                {"matrix": [5, 5], "x": 11, "y": 2},
+                {"matrix": [4, 6], "x": 12, "y": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [7, 0], "x": 1, "y": 3},
+                {"matrix": [6, 1], "x": 2, "y": 3},
+                {"matrix": [7, 1], "x": 3, "y": 3},
+                {"matrix": [6, 2], "x": 4, "y": 3, "w": 2},
+                {"matrix": [6, 3], "x": 6, "y": 3, "w": 2},
+                {"matrix": [6, 4], "x": 8, "y": 3},
+                {"matrix": [7, 4], "x": 9, "y": 3},
+                {"matrix": [6, 5], "x": 10, "y": 3},
+                {"matrix": [7, 5], "x": 11, "y": 3},
+                {"matrix": [6, 6], "x": 12, "y": 3}
+            ]
         }
     }
 }
diff --git a/keyboards/pohjolaworks/louhi/louhi.h b/keyboards/pohjolaworks/louhi/louhi.h
deleted file mode 100644
index 4bdb6eadb5..0000000000
--- a/keyboards/pohjolaworks/louhi/louhi.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2020 Erkki Halinen
- *
- * 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_all( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, \
-    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66  \
-) { \
-    { k00, k01, k02, k03,  k04, k05, k06 }, \
-    { k10, k11, k12, k13,  k14, k15, KC_NO },  \
-    { k20, k21, k22, k23,  k24, k25, k26 },  \
-    { k30, k31, k32, k33,  k34, k35, KC_NO },  \
-    { k40, k41, k42, k43,  k44, k45, k46 },  \
-    { k50, k51, k52, k53,  k54, k55, KC_NO },  \
-    { k60, k61, k62, k63,  k64, k65, k66 },  \
-    { k70, k71, k72, k73,  k74, k75, KC_NO }  \
-}
-
-#define LAYOUT_7u_space( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, \
-    k60, k70, k61,                k63,                k65, k75, k66  \
-) { \
-    { k00, k01, k02, k03,  k04, k05, k06 }, \
-    { k10, k11, k12, k13,  k14, k15, KC_NO },  \
-    { k20, k21, k22, k23,  k24, k25, k26 },  \
-    { k30, k31, k32, k33,  k34, k35, KC_NO },  \
-    { k40, k41, k42, k43,  k44, k45, k46 },  \
-    { k50, k51, k52, k53,  k54, k55, KC_NO },  \
-    { k60, k61, KC_NO, k63,  KC_NO, k65, k66 },  \
-    { k70, KC_NO, KC_NO, KC_NO, KC_NO, k75, KC_NO }  \
-}
-
-#define LAYOUT_2x_2u( \
-    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, \
-    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, \
-    k60, k70, k61, k71,    k62,      k63,    k64, k74, k65, k75, k66  \
-) { \
-    { k00, k01, k02, k03,  k04, k05, k06 }, \
-    { k10, k11, k12, k13,  k14, k15, KC_NO },  \
-    { k20, k21, k22, k23,  k24, k25, k26 },  \
-    { k30, k31, k32, k33,  k34, k35, KC_NO },  \
-    { k40, k41, k42, k43,  k44, k45, k46 },  \
-    { k50, k51, k52, k53,  k54, k55, KC_NO },  \
-    { k60, k61, k62, k63,  k64, k65, k66 },  \
-    { k70, k71, KC_NO, KC_NO, k74, k75, KC_NO }  \
-}