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

2 files changed, 58 insertions, 90 deletions

diff --git a/keyboards/handwired/aim65/aim65.h b/keyboards/handwired/aim65/aim65.h
deleted file mode 100644
index cce4a603af..0000000000
--- a/keyboards/handwired/aim65/aim65.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 Matteo Bonora
- *
- * 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( \
-         K62, K71, K61, K74, K64, K75, K65, K76, K66, K77, K67, K72, K53,   \
-    K52,   K42, K51, K41, K54, K44, K55, K45, K56, K46, K57, K47, K22, K40, \
-       K60, K31, K21, K34, K24, K35, K25, K36, K26, K37, K27, K33, K12, K23,\
-       K70,    K01, K11, K04, K14, K05, K15, K06, K16, K07, K17, K20,       \
-                                    K00                                     \
-) { \
-    { K00,   K01,   KC_NO, KC_NO, K04,   K05,   K06,   K07   }, \
-    { KC_NO, K11,   K12,   KC_NO, K14,   K15,   K16,   K17   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27   }, \
-    { KC_NO, K31,   KC_NO, K33,   K34,   K35,   K36,   K37   }, \
-    { K40,   K41,   K42,   KC_NO, K44,   K45,   K46,   K47   }, \
-    { KC_NO, K51,   K52,   K53,   K54,   K55,   K56,   K57   }, \
-    { K60,   K61,   K62,   KC_NO, K64,   K65,   K66,   K67   }, \
-    { K70,   K71,   K72,   KC_NO, K74,   K75,   K76,   K77   }, \
-}
diff --git a/keyboards/handwired/aim65/info.json b/keyboards/handwired/aim65/info.json
index 9439a11c76..e7c363794f 100644
--- a/keyboards/handwired/aim65/info.json
+++ b/keyboards/handwired/aim65/info.json
@@ -22,60 +22,64 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K62 (B3,B6)", "x":1, "y":0},
-                {"label":"K71 (B1,C6)", "x":2, "y":0},
-                {"label":"K61 (B3,C6)", "x":3, "y":0},
-                {"label":"K74 (B1,F7)", "x":4, "y":0},
-                {"label":"K64 (B3,F7)", "x":5, "y":0},
-                {"label":"K75 (B1,F6)", "x":6, "y":0},
-                {"label":"K65 (B3,F6)", "x":7, "y":0},
-                {"label":"K76 (B1,F5)", "x":8, "y":0},
-                {"label":"K66 (B3,F5)", "x":9, "y":0},
-                {"label":"K77 (B1,F4)", "x":10, "y":0},
-                {"label":"K67 (B3,F4)", "x":11, "y":0},
-                {"label":"K72 (B1,B6)", "x":12, "y":0},
-                {"label":"K53 (B5,B2)", "x":13, "y":0},
-                {"label":"K52 (B5,B6)", "x":0, "y":1, "w":1.5},
-                {"label":"K42 (B4,B6)", "x":1.5, "y":1},
-                {"label":"K51 (B5,C6)", "x":2.5, "y":1},
-                {"label":"K41 (B4,C6)", "x":3.5, "y":1},
-                {"label":"K54 (B5,F7)", "x":4.5, "y":1},
-                {"label":"K44 (B4,F7)", "x":5.5, "y":1},
-                {"label":"K55 (B5,F6)", "x":6.5, "y":1},
-                {"label":"K45 (B4,F6)", "x":7.5, "y":1},
-                {"label":"K56 (B5,F5)", "x":8.5, "y":1},
-                {"label":"K46 (B4,F5)", "x":9.5, "y":1},
-                {"label":"K57 (B5,F4)", "x":10.5, "y":1},
-                {"label":"K47 (B4,F4)", "x":11.5, "y":1},
-                {"label":"K22 (D7,B6)", "x":12.5, "y":1},
-                {"label":"K40 (B4,D1)", "x":13.5, "y":1},
-                {"label":"K60 (B3,D1)", "x":0.75, "y":2},
-                {"label":"K31 (E6,C6)", "x":1.75, "y":2},
-                {"label":"K21 (D7,C6)", "x":2.75, "y":2},
-                {"label":"K34 (E6,F7)", "x":3.75, "y":2},
-                {"label":"K24 (D7,F7)", "x":4.75, "y":2},
-                {"label":"K35 (E6,F6)", "x":5.75, "y":2},
-                {"label":"K25 (D7,F6)", "x":6.75, "y":2},
-                {"label":"K36 (E6,F5)", "x":7.75, "y":2},
-                {"label":"K26 (D7,F5)", "x":8.75, "y":2},
-                {"label":"K37 (E6,F4)", "x":9.75, "y":2},
-                {"label":"K27 (D7,F4)", "x":10.75, "y":2},
-                {"label":"K33 (E6,B2)", "x":11.75, "y":2},
-                {"label":"K12 (D4,B6)", "x":12.75, "y":2},
-                {"label":"K23 (D7,B2)", "x":13.75, "y":2, "w":1.5},
-                {"label":"K70 (B1,D1)", "x":0.75, "y":3, "w":1.5},
-                {"label":"K01 (D0,C6)", "x":2.25, "y":3},
-                {"label":"K11 (D4,C6)", "x":3.25, "y":3},
-                {"label":"K04 (D0,F7)", "x":4.25, "y":3},
-                {"label":"K14 (D4,F7)", "x":5.25, "y":3},
-                {"label":"K05 (D0,F6)", "x":6.25, "y":3},
-                {"label":"K15 (D4,F6)", "x":7.25, "y":3},
-                {"label":"K06 (D0,F5)", "x":8.25, "y":3},
-                {"label":"K16 (D4,F5)", "x":9.25, "y":3},
-                {"label":"K07 (D0,F4)", "x":10.25, "y":3},
-                {"label":"K17 (D4,F4)", "x":11.25, "y":3},
-                {"label":"K20 (D7,D1)", "x":12.25, "y":3, "w":1.5},
-                {"label":"K00 (D0,D1)", "x":3.25, "y":4, "w":8}
+                {"matrix": [6, 2], "x": 1, "y": 0},
+                {"matrix": [7, 1], "x": 2, "y": 0},
+                {"matrix": [6, 1], "x": 3, "y": 0},
+                {"matrix": [7, 4], "x": 4, "y": 0},
+                {"matrix": [6, 4], "x": 5, "y": 0},
+                {"matrix": [7, 5], "x": 6, "y": 0},
+                {"matrix": [6, 5], "x": 7, "y": 0},
+                {"matrix": [7, 6], "x": 8, "y": 0},
+                {"matrix": [6, 6], "x": 9, "y": 0},
+                {"matrix": [7, 7], "x": 10, "y": 0},
+                {"matrix": [6, 7], "x": 11, "y": 0},
+                {"matrix": [7, 2], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+
+                {"matrix": [5, 2], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [4, 2], "x": 1.5, "y": 1},
+                {"matrix": [5, 1], "x": 2.5, "y": 1},
+                {"matrix": [4, 1], "x": 3.5, "y": 1},
+                {"matrix": [5, 4], "x": 4.5, "y": 1},
+                {"matrix": [4, 4], "x": 5.5, "y": 1},
+                {"matrix": [5, 5], "x": 6.5, "y": 1},
+                {"matrix": [4, 5], "x": 7.5, "y": 1},
+                {"matrix": [5, 6], "x": 8.5, "y": 1},
+                {"matrix": [4, 6], "x": 9.5, "y": 1},
+                {"matrix": [5, 7], "x": 10.5, "y": 1},
+                {"matrix": [4, 7], "x": 11.5, "y": 1},
+                {"matrix": [2, 2], "x": 12.5, "y": 1},
+                {"matrix": [4, 0], "x": 13.5, "y": 1},
+
+                {"matrix": [6, 0], "x": 0.75, "y": 2},
+                {"matrix": [3, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 1], "x": 2.75, "y": 2},
+                {"matrix": [3, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [3, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 5], "x": 6.75, "y": 2},
+                {"matrix": [3, 6], "x": 7.75, "y": 2},
+                {"matrix": [2, 6], "x": 8.75, "y": 2},
+                {"matrix": [3, 7], "x": 9.75, "y": 2},
+                {"matrix": [2, 7], "x": 10.75, "y": 2},
+                {"matrix": [3, 3], "x": 11.75, "y": 2},
+                {"matrix": [1, 2], "x": 12.75, "y": 2},
+                {"matrix": [2, 3], "x": 13.75, "y": 2, "w": 1.5},
+
+                {"matrix": [7, 0], "x": 0.75, "y": 3, "w": 1.5},
+                {"matrix": [0, 1], "x": 2.25, "y": 3},
+                {"matrix": [1, 1], "x": 3.25, "y": 3},
+                {"matrix": [0, 4], "x": 4.25, "y": 3},
+                {"matrix": [1, 4], "x": 5.25, "y": 3},
+                {"matrix": [0, 5], "x": 6.25, "y": 3},
+                {"matrix": [1, 5], "x": 7.25, "y": 3},
+                {"matrix": [0, 6], "x": 8.25, "y": 3},
+                {"matrix": [1, 6], "x": 9.25, "y": 3},
+                {"matrix": [0, 7], "x": 10.25, "y": 3},
+                {"matrix": [1, 7], "x": 11.25, "y": 3},
+                {"matrix": [2, 0], "x": 12.25, "y": 3, "w": 1.5},
+
+                {"matrix": [0, 0], "x": 3.25, "y": 4, "w": 8}
             ]
         }
     }