Move miscellaneous layouts to data driven (#20516)

2 files changed, 54 insertions, 298 deletions

diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json
index 223fff5818..e96ce9fd17 100644
--- a/keyboards/marksard/treadstone48/rev2/info.json
+++ b/keyboards/marksard/treadstone48/rev2/info.json
@@ -18,259 +18,63 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT_full": "LAYOUT_base"
+    },
     "layouts": {
         "LAYOUT_base": {
             "layout": [
-                {
-                    "label": "Esc",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "Q",
-                    "x": 2.25,
-                    "y": 0
-                },
-                {
-                    "label": "W",
-                    "x": 3.25,
-                    "y": 0
-                },
-                {
-                    "label": "E",
-                    "x": 4.25,
-                    "y": 0
-                },
-                {
-                    "label": "R",
-                    "x": 5.25,
-                    "y": 0
-                },
-                {
-                    "label": "T",
-                    "x": 6.25,
-                    "y": 0
-                },
-                {
-                    "label": "Y",
-                    "x": 7.75,
-                    "y": 0
-                },
-                {
-                    "label": "U",
-                    "x": 8.75,
-                    "y": 0
-                },
-                {
-                    "label": "I",
-                    "x": 9.75,
-                    "y": 0
-                },
-                {
-                    "label": "O",
-                    "x": 10.75,
-                    "y": 0
-                },
-                {
-                    "label": "P",
-                    "x": 11.75,
-                    "y": 0
-                },
-                {
-                    "label": "Backspace",
-                    "x": 12.75,
-                    "y": 0,
-                    "w": 2
-                },
-                {
-                    "label": "Tab",
-                    "x": 1,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "A",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "S",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "D",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "F",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "G",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "H",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "J",
-                    "x": 8.5,
-                    "y": 1
-                },
-                {
-                    "label": "K",
-                    "x": 9.5,
-                    "y": 1
-                },
-                {
-                    "label": "L",
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "label": ":",
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "label": "Enter",
-                    "x": 12.5,
-                    "y": 1,
-                    "w": 2.25
-                },
-                {
-                    "label": "Shift",
-                    "x": 0,
-                    "y": 2,
-                    "w": 2.25
-                },
-                {
-                    "label": "Z",
-                    "x": 2.25,
-                    "y": 2
-                },
-                {
-                    "label": "X",
-                    "x": 3.25,
-                    "y": 2
-                },
-                {
-                    "label": "C",
-                    "x": 4.25,
-                    "y": 2
-                },
-                {
-                    "label": "V",
-                    "x": 5.25,
-                    "y": 2
-                },
-                {
-                    "label": "B",
-                    "x": 6.25,
-                    "y": 2
-                },
-                {
-                    "label": "N",
-                    "x": 7.75,
-                    "y": 2
-                },
-                {
-                    "label": "M",
-                    "x": 8.75,
-                    "y": 2
-                },
-                {
-                    "label": "<",
-                    "x": 9.75,
-                    "y": 2
-                },
-                {
-                    "label": ">",
-                    "x": 10.75,
-                    "y": 2
-                },
-                {
-                    "label": "?",
-                    "x": 11.75,
-                    "y": 2
-                },
-                {
-                    "label": "\u2191",
-                    "x": 12.75,
-                    "y": 2
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 0.75,
-                    "y": 3,
-                    "w": 1.25
-                },
-                {
-                    "label": "Win",
-                    "x": 2,
-                    "y": 3,
-                    "w": 1.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 3.25,
-                    "y": 3,
-                    "w": 1.25
-                },
-                {
-                    "label": "Lower",
-                    "x": 4.5,
-                    "y": 3
-                },
-                {
-                    "label": "Backspace",
-                    "x": 5.5,
-                    "y": 3,
-                    "w": 2
-                },
-                {
-                    "label": "Space",
-                    "x": 7.5,
-                    "y": 3,
-                    "w": 2
-                },
-                {
-                    "label": "Raise",
-                    "x": 9.5,
-                    "y": 3
-                },
-                {
-                    "label": "Menu",
-                    "x": 10.5,
-                    "y": 3,
-                    "w": 1.25
-                },
-                {
-                    "label": "\u2190",
-                    "x": 11.75,
-                    "y": 3
-                },
-                {
-                    "label": "\u2193",
-                    "x": 12.75,
-                    "y": 3
-                },
-                {
-                    "label": "\u2192",
-                    "x": 13.75,
-                    "y": 3
-                },
-                {
-                    "label": "Shift",
-                    "x": 13.75,
-                    "y": 2
-                }
+                {"matrix": [4, 5], "x": 1, "y": 0},
+                {"matrix": [4, 4], "x": 2.25, "y": 0},
+                {"matrix": [4, 3], "x": 3.25, "y": 0},
+                {"matrix": [4, 2], "x": 4.25, "y": 0},
+                {"matrix": [4, 1], "x": 5.25, "y": 0},
+                {"matrix": [4, 0], "x": 6.25, "y": 0},
+                {"matrix": [0, 5], "x": 7.75, "y": 0},
+                {"matrix": [0, 4], "x": 8.75, "y": 0},
+                {"matrix": [0, 3], "x": 9.75, "y": 0},
+                {"matrix": [0, 2], "x": 10.75, "y": 0},
+                {"matrix": [0, 1], "x": 11.75, "y": 0},
+                {"matrix": [0, 0], "x": 12.75, "y": 0, "w": 2},
+
+                {"matrix": [5, 5], "x": 1, "y": 1, "w": 1.5},
+                {"matrix": [5, 4], "x": 2.5, "y": 1},
+                {"matrix": [5, 3], "x": 3.5, "y": 1},
+                {"matrix": [5, 2], "x": 4.5, "y": 1},
+                {"matrix": [5, 1], "x": 5.5, "y": 1},
+                {"matrix": [5, 0], "x": 6.5, "y": 1},
+                {"matrix": [1, 5], "x": 7.5, "y": 1},
+                {"matrix": [1, 4], "x": 8.5, "y": 1},
+                {"matrix": [1, 3], "x": 9.5, "y": 1},
+                {"matrix": [1, 2], "x": 10.5, "y": 1},
+                {"matrix": [1, 1], "x": 11.5, "y": 1},
+                {"matrix": [1, 0], "x": 12.5, "y": 1, "w": 2.25},
+
+                {"matrix": [6, 5], "x": 0, "y": 2, "w": 2.25},
+                {"matrix": [6, 4], "x": 2.25, "y": 2},
+                {"matrix": [6, 3], "x": 3.25, "y": 2},
+                {"matrix": [6, 2], "x": 4.25, "y": 2},
+                {"matrix": [6, 1], "x": 5.25, "y": 2},
+                {"matrix": [6, 0], "x": 6.25, "y": 2},
+                {"matrix": [2, 5], "x": 7.75, "y": 2},
+                {"matrix": [2, 4], "x": 8.75, "y": 2},
+                {"matrix": [2, 3], "x": 9.75, "y": 2},
+                {"matrix": [2, 2], "x": 10.75, "y": 2},
+                {"matrix": [2, 1], "x": 11.75, "y": 2},
+                {"matrix": [2, 0], "x": 12.75, "y": 2},
+
+                {"matrix": [7, 5], "x": 0.75, "y": 3, "w": 1.25},
+                {"matrix": [7, 4], "x": 2, "y": 3, "w": 1.25},
+                {"matrix": [7, 3], "x": 3.25, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 4.5, "y": 3},
+                {"matrix": [7, 1], "x": 5.5, "y": 3, "w": 2},
+                {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2},
+                {"matrix": [3, 5], "x": 9.5, "y": 3},
+                {"matrix": [3, 4], "x": 10.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 11.75, "y": 3},
+                {"matrix": [3, 2], "x": 12.75, "y": 3},
+                {"matrix": [3, 1], "x": 13.75, "y": 3},
+                {"matrix": [3, 0], "x": 13.75, "y": 2}
             ]
         }
     }
diff --git a/keyboards/marksard/treadstone48/rev2/rev2.h b/keyboards/marksard/treadstone48/rev2/rev2.h
deleted file mode 100644
index 651468c4a5..0000000000
--- a/keyboards/marksard/treadstone48/rev2/rev2.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2020 marksard
- *
- * 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_base( \
-  L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, \
-  L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, \
-  L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, \
-  L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75  \
-  ) \
-  { \
-    { L45, L44, L43, L42, L41, L40 }, \
-    { L55, L54, L53, L52, L51, L50 }, \
-    { L65, L64, L63, L62, L61, L60 }, \
-    { L75, L74, L73, L72, L71, L70 }, \
-    { L05, L04, L03, L02, L01, L00 }, \
-    { L15, L14, L13, L12, L11, L10 }, \
-    { L25, L24, L23, L22, L21, L20 }, \
-    { L35, L34, L33, L32, L31, L30 } \
-  }
-
-// full Keymap
-#define LAYOUT_full LAYOUT_base