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

2 files changed, 76 insertions, 40 deletions

diff --git a/keyboards/aya/aya.h b/keyboards/aya/aya.h
deleted file mode 100644
index 36ba18220c..0000000000
--- a/keyboards/aya/aya.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Dan Nixon
- *
- * 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( \
-    L06, L05, L04, L03, L02, L01, L00,                        R00, R01, R02, R03, R04, R05, R06, \
-    L16, L15, L14, L13, L12, L11, L10,                        R10, R11, R12, R13, R14, R15, R16, \
-    L26, L25, L24, L23, L22, L21, L20, L40,              R40, R20, R21, R22, R23, R24, R25, R26, \
-    L36, L35, L34, L33, L32, L31, L30, L43, L44,    R44, R43, R30, R31, R32, R33, R34, R35, R36, \
-                             L42, L41, L45, L46,    R46, R45, R41, R42                           \
-    ) \
-{ \
-    { L00, L01, L02, L03, L04, L05, L06 }, \
-    { L10, L11, L12, L13, L14, L15, L16 }, \
-    { L20, L21, L22, L23, L24, L25, L26 }, \
-    { L30, L31, L32, L33, L34, L35, L36 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { R00, R01, R02, R03, R04, R05, R06 }, \
-    { R10, R11, R12, R13, R14, R15, R16 }, \
-    { R20, R21, R22, R23, R24, R25, R26 }, \
-    { R30, R31, R32, R33, R34, R35, R36 }, \
-    { R40, R41, R42, R43, R44, R45, R46 }  \
-}
diff --git a/keyboards/aya/info.json b/keyboards/aya/info.json
index d35001e132..6b65aa5521 100644
--- a/keyboards/aya/info.json
+++ b/keyboards/aya/info.json
@@ -17,7 +17,82 @@
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}, {"x":17, "y":3}, {"x":18, "y":3}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]
+            "layout": [
+                {"matrix": [0, 6], "x": 0, "y": 0},
+                {"matrix": [0, 5], "x": 1, "y": 0},
+                {"matrix": [0, 4], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [0, 1], "x": 5, "y": 0},
+                {"matrix": [0, 0], "x": 6, "y": 0},
+                {"matrix": [5, 0], "x": 12, "y": 0},
+                {"matrix": [5, 1], "x": 13, "y": 0},
+                {"matrix": [5, 2], "x": 14, "y": 0},
+                {"matrix": [5, 3], "x": 15, "y": 0},
+                {"matrix": [5, 4], "x": 16, "y": 0},
+                {"matrix": [5, 5], "x": 17, "y": 0},
+                {"matrix": [5, 6], "x": 18, "y": 0},
+
+                {"matrix": [1, 6], "x": 0, "y": 1},
+                {"matrix": [1, 5], "x": 1, "y": 1},
+                {"matrix": [1, 4], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 2], "x": 4, "y": 1},
+                {"matrix": [1, 1], "x": 5, "y": 1},
+                {"matrix": [1, 0], "x": 6, "y": 1},
+                {"matrix": [6, 0], "x": 12, "y": 1},
+                {"matrix": [6, 1], "x": 13, "y": 1},
+                {"matrix": [6, 2], "x": 14, "y": 1},
+                {"matrix": [6, 3], "x": 15, "y": 1},
+                {"matrix": [6, 4], "x": 16, "y": 1},
+                {"matrix": [6, 5], "x": 17, "y": 1},
+                {"matrix": [6, 6], "x": 18, "y": 1},
+
+                {"matrix": [2, 6], "x": 0, "y": 2},
+                {"matrix": [2, 5], "x": 1, "y": 2},
+                {"matrix": [2, 4], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [2, 1], "x": 5, "y": 2},
+                {"matrix": [2, 0], "x": 6, "y": 2},
+                {"matrix": [4, 0], "x": 7, "y": 2},
+                {"matrix": [9, 0], "x": 11, "y": 2},
+                {"matrix": [7, 0], "x": 12, "y": 2},
+                {"matrix": [7, 1], "x": 13, "y": 2},
+                {"matrix": [7, 2], "x": 14, "y": 2},
+                {"matrix": [7, 3], "x": 15, "y": 2},
+                {"matrix": [7, 4], "x": 16, "y": 2},
+                {"matrix": [7, 5], "x": 17, "y": 2},
+                {"matrix": [7, 6], "x": 18, "y": 2},
+
+                {"matrix": [3, 6], "x": 0, "y": 3},
+                {"matrix": [3, 5], "x": 1, "y": 3},
+                {"matrix": [3, 4], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 2], "x": 4, "y": 3},
+                {"matrix": [3, 1], "x": 5, "y": 3},
+                {"matrix": [3, 0], "x": 6, "y": 3},
+                {"matrix": [4, 3], "x": 7, "y": 3},
+                {"matrix": [4, 4], "x": 8, "y": 3},
+                {"matrix": [9, 4], "x": 10, "y": 3},
+                {"matrix": [9, 3], "x": 11, "y": 3},
+                {"matrix": [8, 0], "x": 12, "y": 3},
+                {"matrix": [8, 1], "x": 13, "y": 3},
+                {"matrix": [8, 2], "x": 14, "y": 3},
+                {"matrix": [8, 3], "x": 15, "y": 3},
+                {"matrix": [8, 4], "x": 16, "y": 3},
+                {"matrix": [8, 5], "x": 17, "y": 3},
+                {"matrix": [8, 6], "x": 18, "y": 3},
+
+                {"matrix": [4, 2], "x": 5, "y": 4},
+                {"matrix": [4, 1], "x": 6, "y": 4},
+                {"matrix": [4, 5], "x": 7, "y": 4},
+                {"matrix": [4, 6], "x": 8, "y": 4},
+                {"matrix": [9, 6], "x": 10, "y": 4},
+                {"matrix": [9, 5], "x": 11, "y": 4},
+                {"matrix": [9, 1], "x": 12, "y": 4},
+                {"matrix": [9, 2], "x": 13, "y": 4}
+            ]
         }
     }
 }