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

2 files changed, 26 insertions, 55 deletions

diff --git a/keyboards/amag23/amag23.h b/keyboards/amag23/amag23.h
deleted file mode 100644
index a737dde63c..0000000000
--- a/keyboards/amag23/amag23.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021
- *
- * 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"
-
-// clang-format off
-#define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, \
-    K10, K11, K12, K13, K14, K15, \
-    K20, K21, K22, K23, K24, K25, \
-    K30, K31, K32, K33,    K34    \
-) { \
-    { K00, K01, K02, K03, K04,   K05 }, \
-    { K10, K11, K12, K13, K14,   K15 }, \
-    { K20, K21, K22, K23, K24,   K25 }, \
-    { K30, K31, K32, K33, KC_NO, K34 }  \
-}
-// clang-format on
diff --git a/keyboards/amag23/info.json b/keyboards/amag23/info.json
index 1bbcc854c5..4230740ab0 100644
--- a/keyboards/amag23/info.json
+++ b/keyboards/amag23/info.json
@@ -21,29 +21,32 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-              {"label":"K00", "x":0, "y":0},
-              {"label":"K01", "x":1, "y":0},
-              {"label":"K02", "x":2, "y":0},
-              {"label":"K03", "x":3, "y":0},
-              {"label":"K04", "x":4, "y":0},
-              {"label":"K05", "x":5, "y":0},
-              {"label":"K10", "x":0, "y":1},
-              {"label":"K11", "x":1, "y":1},
-              {"label":"K12", "x":2, "y":1},
-              {"label":"K13", "x":3, "y":1},
-              {"label":"K14", "x":4, "y":1},
-              {"label":"K15", "x":5, "y":1},
-              {"label":"K20", "x":0, "y":2},
-              {"label":"K21", "x":1, "y":2},
-              {"label":"K22", "x":2, "y":2},
-              {"label":"K23", "x":3, "y":2},
-              {"label":"K24", "x":4, "y":2},
-              {"label":"K25", "x":5, "y":2},
-              {"label":"K30", "x":0, "y":3},
-              {"label":"K31", "x":1, "y":3},
-              {"label":"K32", "x":2, "y":3},
-              {"label":"K33", "x":3, "y":3},
-              {"label":"K34", "x":4, "y":3, "w":2}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 5], "x": 4, "y": 3, "w": 2}
             ]
         }
     }