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

2 files changed, 94 insertions, 447 deletions

diff --git a/keyboards/yandrstudio/wave75/info.json b/keyboards/yandrstudio/wave75/info.json
index 61bd8ab7f3..d055dc0048 100644
--- a/keyboards/yandrstudio/wave75/info.json
+++ b/keyboards/yandrstudio/wave75/info.json
@@ -14,419 +14,100 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "label": "0,0",
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "label": "0,1",
-                    "x": 1.25,
-                    "y": 0
-                },
-                {
-                    "label": "0,2",
-                    "x": 2.25,
-                    "y": 0
-                },
-                {
-                    "label": "0,3",
-                    "x": 3.25,
-                    "y": 0
-                },
-                {
-                    "label": "0,4",
-                    "x": 4.25,
-                    "y": 0
-                },
-                {
-                    "label": "0,5",
-                    "x": 5.5,
-                    "y": 0
-                },
-                {
-                    "label": "0,6",
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "label": "0,7",
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "label": "0,8",
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "label": "0,9",
-                    "x": 9.75,
-                    "y": 0
-                },
-                {
-                    "label": "0,10",
-                    "x": 10.75,
-                    "y": 0
-                },
-                {
-                    "label": "0,11",
-                    "x": 11.75,
-                    "y": 0
-                },
-                {
-                    "label": "0,12",
-                    "x": 12.75,
-                    "y": 0
-                },
-                {
-                    "label": "0,13",
-                    "x": 14,
-                    "y": 0
-                },
-                {
-                    "label": "0,14",
-                    "x": 15.25,
-                    "y": 0
-                },
-                {
-                    "label": "1,0",
-                    "x": 0,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,1",
-                    "x": 1,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,2",
-                    "x": 2,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,3",
-                    "x": 3,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,4",
-                    "x": 4,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,5",
-                    "x": 5,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,6",
-                    "x": 6,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,7",
-                    "x": 7,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,8",
-                    "x": 8,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,9",
-                    "x": 9,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,10",
-                    "x": 10,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,11",
-                    "x": 11,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,12",
-                    "x": 12,
-                    "y": 1.25
-                },
-                {
-                    "label": "1,13",
-                    "x": 13,
-                    "y": 1.25,
-                    "w": 2
-                },
-                {
-                    "label": "1,14",
-                    "x": 15.25,
-                    "y": 1.25
-                },
-                {
-                    "label": "2,0",
-                    "x": 0,
-                    "y": 2.25,
-                    "w": 1.5
-                },
-                {
-                    "label": "2,1",
-                    "x": 1.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,2",
-                    "x": 2.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,3",
-                    "x": 3.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,4",
-                    "x": 4.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,5",
-                    "x": 5.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,6",
-                    "x": 6.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,7",
-                    "x": 7.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,8",
-                    "x": 8.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,9",
-                    "x": 9.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,10",
-                    "x": 10.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,11",
-                    "x": 11.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,12",
-                    "x": 12.5,
-                    "y": 2.25
-                },
-                {
-                    "label": "2,13",
-                    "x": 13.5,
-                    "y": 2.25,
-                    "w": 1.5
-                },
-                {
-                    "label": "2,14",
-                    "x": 15.25,
-                    "y": 2.25
-                },
-                {
-                    "label": "3,0",
-                    "x": 0,
-                    "y": 3.25,
-                    "w": 1.75
-                },
-                {
-                    "label": "3,1",
-                    "x": 1.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,2",
-                    "x": 2.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,3",
-                    "x": 3.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,4",
-                    "x": 4.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,5",
-                    "x": 5.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,6",
-                    "x": 6.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,7",
-                    "x": 7.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,8",
-                    "x": 8.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,9",
-                    "x": 9.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,10",
-                    "x": 10.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,11",
-                    "x": 11.75,
-                    "y": 3.25
-                },
-                {
-                    "label": "3,12",
-                    "x": 12.75,
-                    "y": 3.25,
-                    "w": 2.25
-                },
-                {
-                    "label": "4,0",
-                    "x": 0,
-                    "y": 4.25,
-                    "w": 2.25
-                },
-                {
-                    "label": "4,1",
-                    "x": 2.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,2",
-                    "x": 3.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,3",
-                    "x": 4.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,4",
-                    "x": 5.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,5",
-                    "x": 6.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,6",
-                    "x": 7.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,7",
-                    "x": 8.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,8",
-                    "x": 9.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,9",
-                    "x": 10.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,10",
-                    "x": 11.25,
-                    "y": 4.25
-                },
-                {
-                    "label": "4,11",
-                    "x": 12.25,
-                    "y": 4.25,
-                    "w": 1.75
-                },
-                {
-                    "label": "4,13",
-                    "x": 14.25,
-                    "y": 4.5
-                },
-                {
-                    "label": "5,0",
-                    "x": 0,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "label": "5,1",
-                    "x": 1.25,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "label": "5,2",
-                    "x": 2.5,
-                    "y": 5.25,
-                    "w": 1.25
-                },
-                {
-                    "label": "5,6",
-                    "x": 3.75,
-                    "y": 5.25,
-                    "w": 6.25
-                },
-                {
-                    "label": "5,9",
-                    "x": 10,
-                    "y": 5.25,
-                    "w": 1.5
-                },
-                {
-                    "label": "5,10",
-                    "x": 11.5,
-                    "y": 5.25,
-                    "w": 1.5
-                },
-                {
-                    "label": "5,12",
-                    "x": 13.25,
-                    "y": 5.5
-                },
-                {
-                    "label": "5,13",
-                    "x": 14.25,
-                    "y": 5.5
-                },
-                {
-                    "label": "5,14",
-                    "x": 15.25,
-                    "y": 5.5
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [0, 14], "x": 15.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, 12], "x": 12, "y": 1.25},
+                {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.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, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.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, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.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, 13], "x": 14.25, "y": 4.5},
+
+                {"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, 6], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/yandrstudio/wave75/wave75.h b/keyboards/yandrstudio/wave75/wave75.h
deleted file mode 100644
index e3b2f19f42..0000000000
--- a/keyboards/yandrstudio/wave75/wave75.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2022 JasonRen(biu)
- *
- * 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 LAYOUT( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,             \
-    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413,       \
-    K500, K501, K502,                   K506,             K509, K510,       K512, K513, K514 \
-    )\
-    { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014   }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114   }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214   }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, KC_NO  }, \
-    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  KC_NO  }, \
-    { K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, K509,  K510,  KC_NO, K512,  K513,  K514  }  \
-}