Move single `LAYOUT_all`s to data driven (#20430)

2 files changed, 49 insertions, 85 deletions

diff --git a/keyboards/ai03/equinox/equinox.h b/keyboards/ai03/equinox/equinox.h
deleted file mode 100644
index e5ac158124..0000000000
--- a/keyboards/ai03/equinox/equinox.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2019 Ryota Goto
- *
- * 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 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_all( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
-	K300, K301, K302,     K304,       K306,       K308,   K309, K310, K311  \
-) \
-{ \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
-	{ K300,  K301,  K302,  KC_NO, K304,  KC_NO, K306,  KC_NO, K308,  K309,  K310,  K311 }  \
-}
diff --git a/keyboards/ai03/equinox/info.json b/keyboards/ai03/equinox/info.json
index f5c8ecbfba..73bd49c360 100644
--- a/keyboards/ai03/equinox/info.json
+++ b/keyboards/ai03/equinox/info.json
@@ -11,52 +11,55 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-				{"label":"Tab", "x":0, "y":0, "w":1.5},
-				{"label":"Q", "x":1.5, "y":0},
-				{"label":"W", "x":2.5, "y":0},
-				{"label":"E", "x":3.5, "y":0},
-				{"label":"R", "x":4.5, "y":0},
-				{"label":"T", "x":5.5, "y":0},
-				{"label":"Y", "x":6.5, "y":0},
-				{"label":"U", "x":7.5, "y":0},
-				{"label":"I", "x":8.5, "y":0},
-				{"label":"O", "x":9.5, "y":0},
-				{"label":"P", "x":10.5, "y":0},
-				{"label":"|", "x":11.5, "y":0, "w":1.5},
-				{"label":"Caps Lock", "x":0, "y":1, "w":1.75},
-				{"label":"A", "x":1.75, "y":1},
-				{"label":"S", "x":2.75, "y":1},
-				{"label":"D", "x":3.75, "y":1},
-				{"label":"F", "x":4.75, "y":1},
-				{"label":"G", "x":5.75, "y":1},
-				{"label":"H", "x":6.75, "y":1},
-				{"label":"J", "x":7.75, "y":1},
-				{"label":"K", "x":8.75, "y":1},
-				{"label":"L", "x":9.75, "y":1},
-				{"label":":", "x":10.75, "y":1},
-				{"label":"Enter", "x":11.75, "y":1, "w":1.25},
-				{"label":"Shift", "x":0, "y":2, "w":1.25},
-				{"label":"Fn", "x":1.25, "y":2},
-				{"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.25, "y":2},
-				{"label":"M", "x":8.25, "y":2},
-				{"label":"<", "x":9.25, "y":2},
-				{"label":">", "x":10.25, "y":2},
-				{"label":"Shift", "x":11.25, "y":2, "w":1.75},
-				{"label":"Ctrl", "x":0, "y":3, "w":1.25},
-				{"label":"Super", "x":1.25, "y":3},
-				{"label":"Alt", "x":2.25, "y":3, "w":1.25},
-				{"x":3.5, "y":3, "w":2.25},
-				{"x":5.75, "y":3},
-				{"x":6.75, "y":3, "w":2.75},
-				{"label":"Alt", "x":9.5, "y":3, "w":1.25},
-				{"label":"Super", "x":10.75, "y":3},
-				{"label":"Ctrl", "x":11.75, "y":3, "w":1.25}
-			]
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "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.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0, "w": 1.5},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75},
+                {"matrix": [1, 1], "x": 1.75, "y": 1},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "y": 1},
+                {"matrix": [1, 9], "x": 9.75, "y": 1},
+                {"matrix": [1, 10], "x": 10.75, "y": 1},
+                {"matrix": [1, 11], "x": 11.75, "y": 1, "w": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 2},
+                {"matrix": [2, 2], "x": 2.25, "y": 2},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+                {"matrix": [2, 8], "x": 8.25, "y": 2},
+                {"matrix": [2, 9], "x": 9.25, "y": 2},
+                {"matrix": [2, 10], "x": 10.25, "y": 2},
+                {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.75},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 8], "x": 6.75, "y": 3, "w": 2.75},
+                {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25}
+            ]
         }
     }
 }