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

2 files changed, 57 insertions, 97 deletions

diff --git a/keyboards/rart/rart45/info.json b/keyboards/rart/rart45/info.json
index 74cbf358c1..493ba6fca2 100644
--- a/keyboards/rart/rart45/info.json
+++ b/keyboards/rart/rart45/info.json
@@ -22,63 +22,67 @@
   "layouts": {
     "LAYOUT_all": {
       "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": 7, "y": 0 },
-        { "x": 8, "y": 0 },
-        { "x": 9, "y": 0 },
-        { "x": 10, "y": 0 },
-        { "x": 11, "y": 0 },
-        { "x": 12, "y": 0 },
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [4, 0], "x": 1, "y": 0},
+        {"matrix": [0, 1], "x": 2, "y": 0},
+        {"matrix": [4, 1], "x": 3, "y": 0},
+        {"matrix": [0, 2], "x": 4, "y": 0},
+        {"matrix": [4, 2], "x": 5, "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": 7, "y": 1 },
-        {"x": 8, "y": 1 },
-        {"x": 9, "y": 1 },
-        {"x": 10, "y": 1 },
-        {"x": 11, "y": 1 },
-        {"x": 12, "y": 1 },
+        {"matrix": [0, 3], "x": 7, "y": 0},
+        {"matrix": [4, 3], "x": 8, "y": 0},
+        {"matrix": [0, 4], "x": 9, "y": 0},
+        {"matrix": [4, 4], "x": 10, "y": 0},
+        {"matrix": [0, 5], "x": 11, "y": 0},
+        {"matrix": [4, 5], "x": 12, "y": 0},
 
-        {"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": 7, "y": 2 },
-        {"x": 8, "y": 2 },
-        {"x": 9, "y": 2 },
-        {"x": 10, "y": 2 },
-        {"x": 11, "y": 2 },
-        {"x": 12, "y": 2 },
+        {"matrix": [1, 0], "x": 0, "y": 1},
+        {"matrix": [5, 0], "x": 1, "y": 1},
+        {"matrix": [1, 1], "x": 2, "y": 1},
+        {"matrix": [5, 1], "x": 3, "y": 1},
+        {"matrix": [1, 2], "x": 4, "y": 1},
+        {"matrix": [5, 2], "x": 5, "y": 1},
 
-        {"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": 7, "y": 3 },
-        {"x": 8, "y": 3 },
-        {"x": 9, "y": 3 },
-        {"x": 10, "y": 3 },
-        {"x": 11, "y": 3 },
-        {"x": 12, "y": 3 },
+        {"matrix": [1, 3], "x": 7, "y": 1},
+        {"matrix": [5, 3], "x": 8, "y": 1},
+        {"matrix": [1, 4], "x": 9, "y": 1},
+        {"matrix": [5, 4], "x": 10, "y": 1},
+        {"matrix": [1, 5], "x": 11, "y": 1},
+        {"matrix": [5, 5], "x": 12, "y": 1},
 
-        {"x": 2.875, "y": 4, "w":1.25},
-        {"x": 4.125, "y": 4, "w":1.25 },
-        {"x": 5.375, "y": 4, "w":2.25 },
-        {"x": 7.625, "y": 4, "w":1.25 },
-        {"x": 8.875, "y": 4, "w":1.25 }
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [6, 0], "x": 1, "y": 2},
+        {"matrix": [2, 1], "x": 2, "y": 2},
+        {"matrix": [6, 1], "x": 3, "y": 2},
+        {"matrix": [2, 2], "x": 4, "y": 2},
+        {"matrix": [6, 2], "x": 5, "y": 2},
+
+        {"matrix": [2, 3], "x": 7, "y": 2},
+        {"matrix": [6, 3], "x": 8, "y": 2},
+        {"matrix": [2, 4], "x": 9, "y": 2},
+        {"matrix": [6, 4], "x": 10, "y": 2},
+        {"matrix": [2, 5], "x": 11, "y": 2},
+        {"matrix": [6, 5], "x": 12, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [7, 0], "x": 1, "y": 3},
+        {"matrix": [3, 1], "x": 2, "y": 3},
+        {"matrix": [7, 1], "x": 3, "y": 3},
+        {"matrix": [3, 2], "x": 4, "y": 3},
+        {"matrix": [7, 2], "x": 5, "y": 3},
+
+        {"matrix": [3, 3], "x": 7, "y": 3},
+        {"matrix": [7, 3], "x": 8, "y": 3},
+        {"matrix": [3, 4], "x": 9, "y": 3},
+        {"matrix": [7, 4], "x": 10, "y": 3},
+        {"matrix": [3, 5], "x": 11, "y": 3},
+        {"matrix": [7, 5], "x": 12, "y": 3},
+
+        {"matrix": [8, 0], "x": 2.875, "y": 4, "w": 1.25},
+        {"matrix": [8, 1], "x": 4.125, "y": 4, "w": 1.25},
+        {"matrix": [8, 2], "x": 5.375, "y": 4, "w": 2.25},
+        {"matrix": [8, 3], "x": 7.625, "y": 4, "w": 1.25},
+        {"matrix": [8, 4], "x": 8.875, "y": 4, "w": 1.25}
       ]
     }
   }
diff --git a/keyboards/rart/rart45/rart45.h b/keyboards/rart/rart45/rart45.h
deleted file mode 100644
index 99ac9acd93..0000000000
--- a/keyboards/rart/rart45/rart45.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Copyright 2020 Alabahuy
- * 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( \
-    K00, K40, K01, K41, K02, K42,   K03, K43, K04, K44, K05, K45, \
-    K10, K50, K11, K51, K12, K52,   K13, K53, K14, K54, K15, K55, \
-    K20, K60, K21, K61, K22, K62,   K23, K63, K24, K64, K25, K65, \
-    K30, K70, K31, K71, K32, K72,   K33, K73, K34, K74, K35, K75, \
-                   K80, K81,     K82,    K83, K84 \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05   }, \
-    { K10, K11, K12, K13, K14, K15   }, \
-    { K20, K21, K22, K23, K24, K25   }, \
-    { K30, K31, K32, K33, K34, K35   }, \
-    { K40, K41, K42, K43, K44, K45   }, \
-    { K50, K51, K52, K53, K54, K55   }, \
-    { K60, K61, K62, K63, K64, K65   }, \
-    { K70, K71, K72, K73, K74, K75   }, \
-    { K80, K81, K82, K83, K84, KC_NO }, \
-}