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

2 files changed, 83 insertions, 103 deletions

diff --git a/keyboards/eason/aeroboard/aeroboard.h b/keyboards/eason/aeroboard/aeroboard.h
deleted file mode 100644
index a623670b2d..0000000000
--- a/keyboards/eason/aeroboard/aeroboard.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2022 Eason
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-
- #pragma once
-
- #include "quantum.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( \
-        K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,K0E,K0F, \
-        K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,K1E,K1F, \
-        K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,     K2E,K2F, \
-        K30, K31,      K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,K3E,K3F, \
-        K40, K41,      K43,      K45,      K47,      K49,      K4B,      K4D,K4E,K4F  \
-) { \
-        { K00,  K01,  K02,  K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D,K0E,K0F}, \
-        { K10,  K11,  K12,  K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D,K1E,K1F}, \
-        { K20,  K21,  K22,  K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   K2C,   ___,K2E,K2F}, \
-        { K30,  K31,  ___,  K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, K3B,   K3C,   K3D,K3E,K3F}, \
-        { K40,  K41,  ___,  K43,   ___,   K45, ___,   K47,   ___,   K49, ___, K4B,   ___,   K4D,K4E,K4F}  \
-}
diff --git a/keyboards/eason/aeroboard/info.json b/keyboards/eason/aeroboard/info.json
index 5eb135c953..83908b1bed 100644
--- a/keyboards/eason/aeroboard/info.json
+++ b/keyboards/eason/aeroboard/info.json
@@ -22,79 +22,89 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1.75, "y": 0},
-                {"x": 2.75, "y": 0},
-                {"x": 3.75, "y": 0},
-                {"x": 4.75, "y": 0},
-                {"x": 5.75, "y": 0},
-                {"x": 6.75, "y": 0},
-                {"x": 7.75, "y": 0},
-                {"x": 8.75, "y": 0},
-                {"x": 9.75, "y": 0},
-                {"x": 10.75, "y": 0},
-                {"x": 11.75, "y": 0},
-                {"x": 12.75, "y": 0},
-                {"x": 13.75, "y": 0},
-                {"x": 14.75, "y": 0, "w": 2},
-                {"x": 16.75, "y": 0},
-                {"x": 0, "y": 1},
-                {"x": 1.75, "y": 1, "w": 1.5},
-                {"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": 15.25, "y": 1, "w": 1.5},
-                {"x": 16.75, "y": 1},
-                {"x": 0, "y": 2},
-                {"x": 1.75, "y": 2, "w": 1.75},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2},
-                {"x": 14.5, "y": 2, "w": 2.25},
-                {"x": 16.75, "y": 2},
-                {"x": 0, "y": 3},
-                {"x": 1.75, "y": 3, "w": 2.25},
-                {"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},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3, "w": 1.75},
-                {"x": 15.75, "y": 3},
-                {"x": 16.75, "y": 3},
-                {"x": 0, "y": 4},
-                {"x": 1.75, "y": 4, "w": 1.5},
-                {"x": 4, "y": 4, "w": 1.5},
-                {"x": 5.5, "y": 4, "w": 3},
-                {"x": 8.5, "y": 4},
-                {"x": 9.5, "y": 4, "w": 3},
-                {"x": 12.5, "y": 4, "w": 1.5},
-                {"x": 14.75, "y": 4},
-                {"x": 15.75, "y": 4},
-                {"x": 16.75, "y": 4}
-           ]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0},
+                {"matrix": [0, 5], "x": 5.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "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": 13.75, "y": 0},
+                {"matrix": [0, 14], "x": 14.75, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 16.75, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3.25, "y": 1},
+                {"matrix": [1, 3], "x": 4.25, "y": 1},
+                {"matrix": [1, 4], "x": 5.25, "y": 1},
+                {"matrix": [1, 5], "x": 6.25, "y": 1},
+                {"matrix": [1, 6], "x": 7.25, "y": 1},
+                {"matrix": [1, 7], "x": 8.25, "y": 1},
+                {"matrix": [1, 8], "x": 9.25, "y": 1},
+                {"matrix": [1, 9], "x": 10.25, "y": 1},
+                {"matrix": [1, 10], "x": 11.25, "y": 1},
+                {"matrix": [1, 11], "x": 12.25, "y": 1},
+                {"matrix": [1, 12], "x": 13.25, "y": 1},
+                {"matrix": [1, 13], "x": 14.25, "y": 1},
+                {"matrix": [1, 14], "x": 15.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 16.75, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.75, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.5, "y": 2},
+                {"matrix": [2, 3], "x": 4.5, "y": 2},
+                {"matrix": [2, 4], "x": 5.5, "y": 2},
+                {"matrix": [2, 5], "x": 6.5, "y": 2},
+                {"matrix": [2, 6], "x": 7.5, "y": 2},
+                {"matrix": [2, 7], "x": 8.5, "y": 2},
+                {"matrix": [2, 8], "x": 9.5, "y": 2},
+                {"matrix": [2, 9], "x": 10.5, "y": 2},
+                {"matrix": [2, 10], "x": 11.5, "y": 2},
+                {"matrix": [2, 11], "x": 12.5, "y": 2},
+                {"matrix": [2, 12], "x": 13.5, "y": 2},
+                {"matrix": [2, 14], "x": 14.5, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 16.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+
+                {"matrix": [3, 1], "x": 1.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 15.75, "y": 3},
+                {"matrix": [3, 15], "x": 16.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 3},
+                {"matrix": [4, 7], "x": 8.5, "y": 4},
+                {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 3},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 13], "x": 14.75, "y": 4},
+                {"matrix": [4, 14], "x": 15.75, "y": 4},
+                {"matrix": [4, 15], "x": 16.75, "y": 4}
+            ]
         }
     }
 }