Move remaining `LAYOUT`s to data driven (#20422)

2 files changed, 105 insertions, 135 deletions

diff --git a/keyboards/work_louder/work_board/info.json b/keyboards/work_louder/work_board/info.json
index 3e208110a8..b79a1144a1 100644
--- a/keyboards/work_louder/work_board/info.json
+++ b/keyboards/work_louder/work_board/info.json
@@ -28,107 +28,113 @@
     "layouts": {
         "LAYOUT_2u_space": {
             "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": 6, "y": 0 },
-              { "x": 7, "y": 0 },
-              { "x": 8, "y": 0 },
-              { "x": 9, "y": 0 },
-              { "x": 10, "y": 0 },
-              { "x": 11, "y": 0 },
-              { "x": 12, "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": 6, "y": 1 },
-              { "x": 7, "y": 1 },
-              { "x": 8, "y": 1 },
-              { "x": 9, "y": 1 },
-              { "x": 10, "y": 1 },
-              { "x": 11, "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": 0, "y": 3 },
-              { "x": 1, "y": 3 },
-              { "x": 2, "y": 3 },
-              { "x": 3, "y": 3 },
-              { "x": 4, "y": 3 },
-              { "x": 5, "y": 3, "w": 2 },
-              { "x": 7, "y": 3 },
-              { "x": 8, "y": 3 },
-              { "x": 9, "y": 3 },
-              { "x": 10, "y": 3 },
-              { "x": 11, "y": 3 }
+                {"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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "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": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "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": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "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, "w": 2},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
-          },
-          "LAYOUT": {
+        },
+        "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": 6, "y": 0 },
-              { "x": 7, "y": 0 },
-              { "x": 8, "y": 0 },
-              { "x": 9, "y": 0 },
-              { "x": 10, "y": 0 },
-              { "x": 11, "y": 0 },
-              { "x": 12, "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": 6, "y": 1 },
-              { "x": 7, "y": 1 },
-              { "x": 8, "y": 1 },
-              { "x": 9, "y": 1 },
-              { "x": 10, "y": 1 },
-              { "x": 11, "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": 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 }
+                {"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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "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": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "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": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "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": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3}
             ]
         }
     }
diff --git a/keyboards/work_louder/work_board/work_board.h b/keyboards/work_louder/work_board/work_board.h
index 284eecc430..04de456eca 100644
--- a/keyboards/work_louder/work_board/work_board.h
+++ b/keyboards/work_louder/work_board/work_board.h
@@ -18,39 +18,3 @@
 
 #include "quantum.h"
 #include "rgb_functions.h"
-
-#define ___ KC_NO
-
-/* 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_2u_space( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, ___ }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___ }, \
-    { k30, k31, k32, k33, k34, k35, ___, k37, k38, k39, k3a, k3b, ___ } \
-}
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, ___ }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___ }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___ } \
-}