Move single `LAYOUT_all`s to data driven (#20430)

2 files changed, 104 insertions, 135 deletions

diff --git a/keyboards/foxlab/time80/info.json b/keyboards/foxlab/time80/info.json
index 682e70125c..91564b7522 100644
--- a/keyboards/foxlab/time80/info.json
+++ b/keyboards/foxlab/time80/info.json
@@ -24,97 +24,110 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k07", "x":6.5, "y":0},
-                {"label":"k08", "x":7.5, "y":0},
-                {"label":"k09", "x":8.5, "y":0},
-                {"label":"k0A", "x":9.5, "y":0},
-                {"label":"k0B", "x":11, "y":0},
-                {"label":"k0E", "x":12, "y":0},
-                {"label":"k0C", "x":13, "y":0},
-                {"label":"k01", "x":14, "y":0},
-                {"label":"k61", "x":15.25, "y":0},
-                {"label":"k62", "x":16.25, "y":0},
-                {"label":"k6E", "x":17.25, "y":0},
-                {"label":"k10", "x":0, "y":1.25},
-                {"label":"k11", "x":1, "y":1.25},
-                {"label":"k12", "x":2, "y":1.25},
-                {"label":"k13", "x":3, "y":1.25},
-                {"label":"k14", "x":4, "y":1.25},
-                {"label":"k15", "x":5, "y":1.25},
-                {"label":"k16", "x":6, "y":1.25},
-                {"label":"k17", "x":7, "y":1.25},
-                {"label":"k18", "x":8, "y":1.25},
-                {"label":"k19", "x":9, "y":1.25},
-                {"label":"k1A", "x":10, "y":1.25},
-                {"label":"k1B", "x":11, "y":1.25},
-                {"label":"k1E", "x":12, "y":1.25},
-                {"label":"k1C", "x":13, "y":1.25},
-                {"label":"k1D", "x":14, "y":1.25},
-                {"label":"k66", "x":15.25, "y":1.25},
-                {"label":"k65", "x":16.25, "y":1.25},
-                {"label":"k64", "x":17.25, "y":1.25},
-                {"label":"k20", "x":0, "y":2.25, "w":1.5},
-                {"label":"k21", "x":1.5, "y":2.25},
-                {"label":"k22", "x":2.5, "y":2.25},
-                {"label":"k23", "x":3.5, "y":2.25},
-                {"label":"k24", "x":4.5, "y":2.25},
-                {"label":"k25", "x":5.5, "y":2.25},
-                {"label":"k26", "x":6.5, "y":2.25},
-                {"label":"k27", "x":7.5, "y":2.25},
-                {"label":"k28", "x":8.5, "y":2.25},
-                {"label":"k29", "x":9.5, "y":2.25},
-                {"label":"k2A", "x":10.5, "y":2.25},
-                {"label":"k2B", "x":11.5, "y":2.25},
-                {"label":"k2E", "x":12.5, "y":2.25},
-                {"label":"k2C", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"k6C", "x":15.25, "y":2.25},
-                {"label":"k68", "x":16.25, "y":2.25},
-                {"label":"k67", "x":17.25, "y":2.25},
-                {"label":"k30", "x":0, "y":3.25, "w":1.75},
-                {"label":"k31", "x":1.75, "y":3.25},
-                {"label":"k32", "x":2.75, "y":3.25},
-                {"label":"k33", "x":3.75, "y":3.25},
-                {"label":"k34", "x":4.75, "y":3.25},
-                {"label":"k35", "x":5.75, "y":3.25},
-                {"label":"k36", "x":6.75, "y":3.25},
-                {"label":"k37", "x":7.75, "y":3.25},
-                {"label":"k38", "x":8.75, "y":3.25},
-                {"label":"k39", "x":9.75, "y":3.25},
-                {"label":"k3A", "x":10.75, "y":3.25},
-                {"label":"k3B", "x":11.75, "y":3.25},
-                {"label":"k3C", "x":12.75, "y":3.25},
-                {"label":"k3E", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"k40", "x":0, "y":4.25, "w":1.25},
-                {"label":"k4D", "x":1.25, "y":4.25},
-                {"label":"k41", "x":2.25, "y":4.25},
-                {"label":"k42", "x":3.25, "y":4.25},
-                {"label":"k43", "x":4.25, "y":4.25},
-                {"label":"k44", "x":5.25, "y":4.25},
-                {"label":"k45", "x":6.25, "y":4.25},
-                {"label":"k46", "x":7.25, "y":4.25},
-                {"label":"k47", "x":8.25, "y":4.25},
-                {"label":"k48", "x":9.25, "y":4.25},
-                {"label":"k49", "x":10.25, "y":4.25},
-                {"label":"k4A", "x":11.25, "y":4.25},
-                {"label":"k4B", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"k4E", "x":14, "y":4.25},
-                {"label":"k4C", "x":16.25, "y":4.25},
-                {"label":"k50", "x":0, "y":5.25, "w":1.25},
-                {"label":"k51", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"k52", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"k54", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"k58", "x":10, "y":5.25, "w":1.25},
-                {"label":"k59", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"k5A", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"k5B", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"k5E", "x":15.25, "y":5.25},
-                {"label":"k5C", "x":16.25, "y":5.25},
-                {"label":"k57", "x":17.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0},
+                {"matrix": [0, 8], "x": 7.5, "y": 0},
+                {"matrix": [0, 9], "x": 8.5, "y": 0},
+                {"matrix": [0, 10], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 14], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 1], "x": 14, "y": 0},
+
+                {"matrix": [6, 1], "x": 15.25, "y": 0},
+                {"matrix": [6, 2], "x": 16.25, "y": 0},
+                {"matrix": [6, 14], "x": 17.25, "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": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 7], "x": 7, "y": 1.25},
+                {"matrix": [1, 8], "x": 8, "y": 1.25},
+                {"matrix": [1, 9], "x": 9, "y": 1.25},
+                {"matrix": [1, 10], "x": 10, "y": 1.25},
+                {"matrix": [1, 11], "x": 11, "y": 1.25},
+                {"matrix": [1, 14], "x": 12, "y": 1.25},
+                {"matrix": [1, 12], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [6, 6], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 14], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [6, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [6, 8], "x": 16.25, "y": 2.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 14], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 13], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 14], "x": 14, "y": 4.25},
+
+                {"matrix": [4, 12], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [5, 12], "x": 16.25, "y": 5.25},
+                {"matrix": [5, 7], "x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/foxlab/time80/time80.h b/keyboards/foxlab/time80/time80.h
deleted file mode 100644
index 54ac3fb9d7..0000000000
--- a/keyboards/foxlab/time80/time80.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2020 Lukas Alexander
- *
- * 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,      k02, k03, k04, k05,      k07, k08, k09, k0A,      k0B, k0E, k0C, k01,      k61, k62, k6E, \
-   k10,      k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1E, k1C, k1D,      k66, k65, k64, \
-   k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2E, k2C,           k6C, k68, k67, \
-   k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E,                          \
-   k40, k4D, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4E,                     k4C,      \
-   k50,      k51, k52,                k54,                k58, k59, k5A, k5B,           k5E, k5C, k57  \
-) { \
-  { k00,   k01, k02, k03,   k04, k05,   KC_NO, k07, k08, k09,   k0A,   k0B,   k0C, KC_NO, k0E }, \
-  { k10,   k11, k12, k13,   k14, k15,   k16,   k17, k18, k19,   k1A,   k1B,   k1C, k1D,   k1E }, \
-  { k20,   k21, k22, k23,   k24, k25,   k26,   k27, k28, k29,   k2A,   k2B,   k2C, KC_NO, k2E }, \
-  { k30,   k31, k32, k33,   k34, k35,   k36,   k37, k38, k39,   k3A,   k3B,   k3C, KC_NO, k3E }, \
-  { k40,   k41, k42, k43,   k44, k45,   k46,   k47, k48, k49,   k4A,   k4B,   k4C, k4D,   k4E }, \
-  { k50,   k51, k52, KC_NO, k54, KC_NO, KC_NO, k57, k58, k59,   k5A,   k5B,   k5C, KC_NO, k5E }, \
-  { KC_NO, k61, k62, KC_NO, k64, k65,   k66,   k67, k68, KC_NO, KC_NO, KC_NO, k6C, KC_NO, k6E } \
-}