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

2 files changed, 143 insertions, 185 deletions

diff --git a/keyboards/tronguylabs/m122_3270/info.json b/keyboards/tronguylabs/m122_3270/info.json
index 23dc5366ed..2dae824cc4 100644
--- a/keyboards/tronguylabs/m122_3270/info.json
+++ b/keyboards/tronguylabs/m122_3270/info.json
@@ -10,151 +10,149 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 3.25, "y": 0},
-                {"x": 4.25, "y": 0},
-                {"x": 5.25, "y": 0},
-                {"x": 6.25, "y": 0},
-                {"x": 7.25, "y": 0},
-                {"x": 8.25, "y": 0},
-                {"x": 9.25, "y": 0},
-                {"x": 10.25, "y": 0},
-                {"x": 11.25, "y": 0},
-                {"x": 12.25, "y": 0},
-                {"x": 13.25, "y": 0},
-                {"x": 14.25, "y": 0},
-
-                {"x": 3.25, "y": 1},
-                {"x": 4.25, "y": 1},
-                {"x": 5.25, "y": 1},
-                {"x": 6.25, "y": 1},
-                {"x": 7.25, "y": 1},
-                {"x": 8.25, "y": 1},
-                {"x": 9.25, "y": 1},
-                {"x": 10.25, "y": 1},
-                {"x": 11.25, "y": 1},
-                {"x": 12.25, "y": 1},
-                {"x": 13.25, "y": 1},
-                {"x": 14.25, "y": 1},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3},
-                {"x": 13.25, "y": 3},
-                {"x": 14.25, "y": 3},
-                {"x": 15.25, "y": 3, "w": 2},
-
-                {"x": 17.5, "y": 3},
-                {"x": 18.5, "y": 3},
-                {"x": 19.5, "y": 3},
-
-                {"x": 20.75, "y": 3},
-                {"x": 21.75, "y": 3},
-                {"x": 22.75, "y": 3},
-                {"x": 23.75, "y": 3},
-
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-
-                {"x": 2.25, "y": 4, "w": 1.5},
-                {"x": 3.75, "y": 4},
-                {"x": 4.75, "y": 4},
-                {"x": 5.75, "y": 4},
-                {"x": 6.75, "y": 4},
-                {"x": 7.75, "y": 4},
-                {"x": 8.75, "y": 4},
-                {"x": 9.75, "y": 4},
-                {"x": 10.75, "y": 4},
-                {"x": 11.75, "y": 4},
-                {"x": 12.75, "y": 4},
-                {"x": 13.75, "y": 4},
-                {"x": 14.75, "y": 4},
-                {"x": 16, "y": 4, "w": 1.25, "h": 2},
-
-                {"x": 17.5, "y": 4},
-                {"x": 18.5, "y": 4},
-                {"x": 19.5, "y": 4},
-
-                {"x": 20.75, "y": 4},
-                {"x": 21.75, "y": 4},
-                {"x": 22.75, "y": 4},
-                {"x": 23.75, "y": 4},
-
-                {"x": 0, "y": 5},
-                {"x": 1, "y": 5},
-
-                {"x": 2.25, "y": 5, "w": 1.75},
-                {"x": 4, "y": 5},
-                {"x": 5, "y": 5},
-                {"x": 6, "y": 5},
-                {"x": 7, "y": 5},
-                {"x": 8, "y": 5},
-                {"x": 9, "y": 5},
-                {"x": 10, "y": 5},
-                {"x": 11, "y": 5},
-                {"x": 12, "y": 5},
-                {"x": 13, "y": 5},
-                {"x": 14, "y": 5},
-                {"x": 15, "y": 5},
-
-                {"x": 18.5, "y": 5},
-
-                {"x": 20.75, "y": 5},
-                {"x": 21.75, "y": 5},
-                {"x": 22.75, "y": 5},
-                {"x": 23.75, "y": 5},
-
-                {"x": 0, "y": 6},
-                {"x": 1, "y": 6},
-
-                {"x": 2.25, "y": 6, "w": 1.25},
-                {"x": 3.5, "y": 6},
-                {"x": 4.5, "y": 6},
-                {"x": 5.5, "y": 6},
-                {"x": 6.5, "y": 6},
-                {"x": 7.5, "y": 6},
-                {"x": 8.5, "y": 6},
-                {"x": 9.5, "y": 6},
-                {"x": 10.5, "y": 6},
-                {"x": 11.5, "y": 6},
-                {"x": 12.5, "y": 6},
-                {"x": 13.5, "y": 6},
-                {"x": 14.5, "y": 6, "w": 2.75},
-
-                {"x": 17.5, "y": 6},
-                {"x": 18.5, "y": 6},
-                {"x": 19.5, "y": 6},
-
-                {"x": 20.75, "y": 6},
-                {"x": 21.75, "y": 6},
-                {"x": 22.75, "y": 6},
-                {"x": 23.75, "y": 6, "h": 2},
-
-                {"x": 0, "y": 7},
-                {"x": 1, "y": 7},
-
-                {"x": 2.25, "y": 7, "w": 1.5},
-
-                {"x": 4.75, "y": 7, "w": 1.5},
-                {"x": 6.25, "y": 7, "w": 7},
-                {"x": 13.25, "y": 7, "w": 1.5},
-
-                {"x": 15.75, "y": 7, "w": 1.5},
-
-                {"x": 18.5, "y": 7},
-
-                {"x": 20.75, "y": 7, "w": 2},
-                {"x": 22.75, "y": 7}
+                {"matrix": [0, 9], "x": 3.25, "y": 0},
+                {"matrix": [1, 9], "x": 4.25, "y": 0},
+                {"matrix": [1, 10], "x": 5.25, "y": 0},
+                {"matrix": [2, 9], "x": 6.25, "y": 0},
+                {"matrix": [3, 9], "x": 7.25, "y": 0},
+                {"matrix": [3, 10], "x": 8.25, "y": 0},
+                {"matrix": [4, 9], "x": 9.25, "y": 0},
+                {"matrix": [5, 9], "x": 10.25, "y": 0},
+                {"matrix": [5, 10], "x": 11.25, "y": 0},
+                {"matrix": [6, 9], "x": 12.25, "y": 0},
+                {"matrix": [7, 9], "x": 13.25, "y": 0},
+                {"matrix": [7, 10], "x": 14.25, "y": 0},
+
+                {"matrix": [0, 10], "x": 3.25, "y": 1},
+                {"matrix": [0, 11], "x": 4.25, "y": 1},
+                {"matrix": [1, 11], "x": 5.25, "y": 1},
+                {"matrix": [2, 10], "x": 6.25, "y": 1},
+                {"matrix": [2, 11], "x": 7.25, "y": 1},
+                {"matrix": [3, 11], "x": 8.25, "y": 1},
+                {"matrix": [4, 10], "x": 9.25, "y": 1},
+                {"matrix": [4, 11], "x": 10.25, "y": 1},
+                {"matrix": [5, 11], "x": 11.25, "y": 1},
+                {"matrix": [6, 10], "x": 12.25, "y": 1},
+                {"matrix": [6, 11], "x": 13.25, "y": 1},
+                {"matrix": [7, 11], "x": 14.25, "y": 1},
+
+                {"matrix": [3, 1], "x": 0, "y": 3},
+                {"matrix": [3, 2], "x": 1, "y": 3},
+
+                {"matrix": [3, 4], "x": 2.25, "y": 3},
+                {"matrix": [2, 4], "x": 3.25, "y": 3},
+                {"matrix": [2, 5], "x": 4.25, "y": 3},
+                {"matrix": [2, 6], "x": 5.25, "y": 3},
+                {"matrix": [2, 7], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [2, 8], "x": 9.25, "y": 3},
+                {"matrix": [2, 12], "x": 10.25, "y": 3},
+                {"matrix": [2, 13], "x": 11.25, "y": 3},
+                {"matrix": [2, 14], "x": 12.25, "y": 3},
+                {"matrix": [3, 14], "x": 13.25, "y": 3},
+                {"matrix": [3, 12], "x": 14.25, "y": 3},
+                {"matrix": [3, 15], "x": 15.25, "y": 3, "w": 2},
+
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [3, 17], "x": 18.5, "y": 3},
+                {"matrix": [2, 16], "x": 19.5, "y": 3},
+
+                {"matrix": [2, 15], "x": 20.75, "y": 3},
+                {"matrix": [2, 17], "x": 21.75, "y": 3},
+                {"matrix": [2, 18], "x": 22.75, "y": 3},
+                {"matrix": [2, 0], "x": 23.75, "y": 3},
+
+                {"matrix": [2, 1], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+
+                {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 4], "x": 3.75, "y": 4},
+                {"matrix": [4, 5], "x": 4.75, "y": 4},
+                {"matrix": [4, 6], "x": 5.75, "y": 4},
+                {"matrix": [4, 7], "x": 6.75, "y": 4},
+                {"matrix": [5, 7], "x": 7.75, "y": 4},
+                {"matrix": [5, 8], "x": 8.75, "y": 4},
+                {"matrix": [4, 8], "x": 9.75, "y": 4},
+                {"matrix": [4, 12], "x": 10.75, "y": 4},
+                {"matrix": [4, 13], "x": 11.75, "y": 4},
+                {"matrix": [4, 14], "x": 12.75, "y": 4},
+                {"matrix": [5, 14], "x": 13.75, "y": 4},
+                {"matrix": [5, 12], "x": 14.75, "y": 4},
+                {"matrix": [6, 15], "x": 16, "y": 4, "w": 1.25, "h": 2},
+
+                {"matrix": [1, 16], "x": 17.5, "y": 4},
+                {"matrix": [5, 16], "x": 18.5, "y": 4},
+                {"matrix": [4, 16], "x": 19.5, "y": 4},
+
+                {"matrix": [4, 15], "x": 20.75, "y": 4},
+                {"matrix": [4, 17], "x": 21.75, "y": 4},
+                {"matrix": [4, 18], "x": 22.75, "y": 4},
+                {"matrix": [4, 0], "x": 23.75, "y": 4},
+
+                {"matrix": [5, 1], "x": 0, "y": 5},
+                {"matrix": [5, 2], "x": 1, "y": 5},
+
+                {"matrix": [6, 2], "x": 2.25, "y": 5, "w": 1.75},
+                {"matrix": [1, 4], "x": 4, "y": 5},
+                {"matrix": [1, 5], "x": 5, "y": 5},
+                {"matrix": [1, 6], "x": 6, "y": 5},
+                {"matrix": [1, 7], "x": 7, "y": 5},
+                {"matrix": [0, 7], "x": 8, "y": 5},
+                {"matrix": [0, 8], "x": 9, "y": 5},
+                {"matrix": [1, 8], "x": 10, "y": 5},
+                {"matrix": [1, 12], "x": 11, "y": 5},
+                {"matrix": [1, 13], "x": 12, "y": 5},
+                {"matrix": [1, 14], "x": 13, "y": 5},
+                {"matrix": [0, 14], "x": 14, "y": 5},
+                {"matrix": [6, 14], "x": 15, "y": 5},
+
+                {"matrix": [0, 16], "x": 18.5, "y": 5},
+
+                {"matrix": [1, 15], "x": 20.75, "y": 5},
+                {"matrix": [1, 17], "x": 21.75, "y": 5},
+                {"matrix": [1, 18], "x": 22.75, "y": 5},
+                {"matrix": [1, 0], "x": 23.75, "y": 5},
+
+                {"matrix": [1, 1], "x": 0, "y": 6},
+                {"matrix": [1, 2], "x": 1, "y": 6},
+
+                {"matrix": [7, 3], "x": 2.25, "y": 6, "w": 1.25},
+                {"matrix": [7, 4], "x": 3.5, "y": 6},
+                {"matrix": [6, 4], "x": 4.5, "y": 6},
+                {"matrix": [6, 5], "x": 5.5, "y": 6},
+                {"matrix": [6, 6], "x": 6.5, "y": 6},
+                {"matrix": [6, 7], "x": 7.5, "y": 6},
+                {"matrix": [7, 7], "x": 8.5, "y": 6},
+                {"matrix": [7, 8], "x": 9.5, "y": 6},
+                {"matrix": [6, 8], "x": 10.5, "y": 6},
+                {"matrix": [6, 12], "x": 11.5, "y": 6},
+                {"matrix": [6, 13], "x": 12.5, "y": 6},
+                {"matrix": [7, 14], "x": 13.5, "y": 6},
+                {"matrix": [6, 3], "x": 14.5, "y": 6, "w": 2.75},
+
+                {"matrix": [6, 0], "x": 17.5, "y": 6},
+                {"matrix": [0, 19], "x": 18.5, "y": 6},
+                {"matrix": [1, 19], "x": 19.5, "y": 6},
+
+                {"matrix": [6, 1], "x": 20.75, "y": 6},
+                {"matrix": [6, 17], "x": 21.75, "y": 6},
+                {"matrix": [6, 18], "x": 22.75, "y": 6},
+                {"matrix": [7, 19], "x": 23.75, "y": 6, "h": 2},
+
+                {"matrix": [0, 2], "x": 0, "y": 7},
+                {"matrix": [0, 1], "x": 1, "y": 7},
+
+                {"matrix": [0, 0], "x": 2.25, "y": 7, "w": 1.5},
+                {"matrix": [7, 0], "x": 4.75, "y": 7, "w": 1.5},
+                {"matrix": [7, 1], "x": 6.25, "y": 7, "w": 7},
+                {"matrix": [0, 3], "x": 13.25, "y": 7, "w": 1.5},
+                {"matrix": [7, 2], "x": 15.75, "y": 7, "w": 1.5},
+
+                {"matrix": [0, 15], "x": 18.5, "y": 7},
+
+                {"matrix": [7, 17], "x": 20.75, "y": 7, "w": 2},
+                {"matrix": [7, 18], "x": 22.75, "y": 7}
             ]
         }
     }
diff --git a/keyboards/tronguylabs/m122_3270/m122_3270.h b/keyboards/tronguylabs/m122_3270/m122_3270.h
deleted file mode 100644
index c18020ebcd..0000000000
--- a/keyboards/tronguylabs/m122_3270/m122_3270.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021 James R. Maynard III
- *
- * 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 XXX KC_NO
-
-#define LAYOUT( \
-                k09, k19, k1A, k29, k39, k3A, k49, k59, k5A, k69, k79, k7A, \
-                k0A, k0B, k1B, k2A, k2B, k3B, k4A, k4B, k5B, k6A, k6B, k7B, \
-    k31, k32,   k34, k24, k25, k26, k27, k37, k38, k28, k2C, k2D, k2E, k3E, k3C, k3F,   k3G, k3H, k2G,   k2F, k2H, k2I, k20, \
-    k21, k41,   k42, k44, k45, k46, k47, k57, k58, k48, k4C, k4D, k4E, k5E, k5C, k6F,   k1G, k5G, k4G,   k4F, k4H, k4I, k40, \
-    k51, k52,   k62, k14, k15, k16, k17, k07, k08, k18, k1C, k1D, k1E, k0E, k6E,             k0G,        k1F, k1H, k1I, k10, \
-    k11, k12,   k73, k74, k64, k65, k66, k67, k77, k78, k68, k6C, k6D, k7E,      k63,   k60, k0J, k1J,   k61, k6H, k6I, k7J, \
-    k02, k01,   k00,    k70,                k71,             k03,      k72,                  k0F,        k7H,      k7I \
-) { \
-    { k00, k01, k02, k03, XXX, XXX, XXX, k07, k08, k09, k0A, k0B, XXX, XXX, k0E, k0F, k0G, XXX, XXX, k0J }, \
-    { k10, k11, k12, XXX, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1J }, \
-    { k20, k21, XXX, XXX, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, XXX }, \
-    { XXX, k31, k32, XXX, k34, XXX, XXX, k37, k38, k39, k3A, k3B, k3C, XXX, k3E, k3F, k3G, k3H, XXX, XXX }, \
-    { k40, k41, k42, XXX, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, XXX }, \
-    { XXX, k51, k52, XXX, XXX, XXX, XXX, k57, k58, k59, k5A, k5B, k5C, XXX, k5E, XXX, k5G, XXX, XXX, XXX }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, XXX, k6H, k6I, XXX }, \
-    { k70, k71, k72, k73, k74, XXX, XXX, k77, k78, k79, k7A, k7B, XXX, XXX, k7E, XXX, XXX, k7H, k7I, k7J } \
-}