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

3 files changed, 101 insertions, 125 deletions

diff --git a/keyboards/rart/rart75m/info.json b/keyboards/rart/rart75m/info.json
index 41142d0f73..554d9d04f5 100644
--- a/keyboards/rart/rart75m/info.json
+++ b/keyboards/rart/rart75m/info.json
@@ -23,94 +23,106 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"x":1.5, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7.25, "y":0},
-                {"x":8.25, "y":0},
-                {"x":9.25, "y":0},
-                {"x":10.25, "y":0},
-                {"x":11.5, "y":0},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0},
-                {"x":14.5, "y":0},
-
-                {"x":1.5, "y":1.25},
-                {"x":2.5, "y":1.25},
-                {"x":3.5, "y":1.25},
-                {"x":4.5, "y":1.25},
-                {"x":5.5, "y":1.25},
-                {"x":6.5, "y":1.25},
-                {"x":7.5, "y":1.25},
-                {"x":8.5, "y":1.25},
-                {"x":9.5, "y":1.25},
-                {"x":10.5, "y":1.25},
-                {"x":11.5, "y":1.25},
-                {"x":12.5, "y":1.25},
-                {"x":13.5, "y":1.25},
-                {"x":14.5, "y":1.25, "w":2},
-                {"x":17, "y":1},
-
-                {"x":1.5, "y":2.25, "w":1.5},
-                {"x":3, "y":2.25},
-                {"x":4, "y":2.25},
-                {"x":5, "y":2.25},
-                {"x":6, "y":2.25},
-                {"x":7, "y":2.25},
-                {"x":8, "y":2.25},
-                {"x":9, "y":2.25},
-                {"x":10, "y":2.25},
-                {"x":11, "y":2.25},
-                {"x":12, "y":2.25},
-                {"x":13, "y":2.25},
-                {"x":14, "y":2.25},
-                {"x":15, "y":2.25, "w":1.5},
-                {"x":17, "y":2.25},
-
-                {"x":0, "y":3.25},
-                {"x":1.5, "y":3.25, "w":1.75},
-                {"x":3.25, "y":3.25},
-                {"x":4.25, "y":3.25},
-                {"x":5.25, "y":3.25},
-                {"x":6.25, "y":3.25},
-                {"x":7.25, "y":3.25},
-                {"x":8.25, "y":3.25},
-                {"x":9.25, "y":3.25},
-                {"x":10.25, "y":3.25},
-                {"x":11.25, "y":3.25},
-                {"x":12.25, "y":3.25},
-                {"x":13.25, "y":3.25},
-                {"x":14.25, "y":3.25, "w":2.25},
-                {"x":17, "y":3.25},
-
-                {"x":0, "y":4.25},
-                {"x":1.5, "y":4.25, "w":2.25},
-                {"x":3.75, "y":4.25},
-                {"x":4.75, "y":4.25},
-                {"x":5.75, "y":4.25},
-                {"x":6.75, "y":4.25},
-                {"x":7.75, "y":4.25},
-                {"x":8.75, "y":4.25},
-                {"x":9.75, "y":4.25},
-                {"x":10.75, "y":4.25},
-                {"x":11.75, "y":4.25},
-                {"x":12.75, "y":4.25},
-                {"x":13.75, "y":4.25, "w":1.75},
-                {"x":15.75, "y":4.5},
-                {"x":17, "y":4.25},
-               
-                {"x":0, "y":5.25},
-                {"x":1.5, "y":5.25, "w":1.25},
-                {"x":2.75, "y":5.25, "w":1.25},
-                {"x":4, "y":5.25, "w":1.25},
-                {"x":5.25, "y":5.25, "w":6.25},
-                {"x":11.5, "y":5.25, "w":1.5},
-                {"x":13, "y":5.25, "w":1.5},
-                {"x":14.75, "y":5.5 },
-                {"x":15.75, "y":5.5 },
-                {"x":16.75, "y":5.5 }
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [0, 3], "x": 5, "y": 0},
+                {"matrix": [0, 4], "x": 6, "y": 0},
+
+                {"matrix": [0, 5], "x": 7.25, "y": 0},
+                {"matrix": [0, 6], "x": 8.25, "y": 0},
+                {"matrix": [0, 7], "x": 9.25, "y": 0},
+                {"matrix": [0, 8], "x": 10.25, "y": 0},
+
+                {"matrix": [0, 9], "x": 11.5, "y": 0},
+                {"matrix": [0, 10], "x": 12.5, "y": 0},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 1], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 14.5, "y": 1.25, "w": 2},
+
+                {"matrix": [5, 13], "x": 17, "y": 1},
+
+                {"matrix": [2, 0], "x": 1.5, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 3, "y": 2.25},
+                {"matrix": [2, 2], "x": 4, "y": 2.25},
+                {"matrix": [2, 3], "x": 5, "y": 2.25},
+                {"matrix": [2, 4], "x": 6, "y": 2.25},
+                {"matrix": [2, 5], "x": 7, "y": 2.25},
+                {"matrix": [2, 6], "x": 8, "y": 2.25},
+                {"matrix": [2, 7], "x": 9, "y": 2.25},
+                {"matrix": [2, 8], "x": 10, "y": 2.25},
+                {"matrix": [2, 9], "x": 11, "y": 2.25},
+                {"matrix": [2, 10], "x": 12, "y": 2.25},
+                {"matrix": [2, 11], "x": 13, "y": 2.25},
+                {"matrix": [2, 12], "x": 14, "y": 2.25},
+                {"matrix": [2, 13], "x": 15, "y": 2.25, "w": 1.5},
+
+                {"matrix": [5, 12], "x": 17, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 14.25, "y": 3.25, "w": 2.25},
+
+                {"matrix": [5, 11], "x": 17, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.75, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.75, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.75, "y": 4.25},
+                {"matrix": [4, 6], "x": 7.75, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.75, "y": 4.25},
+                {"matrix": [4, 10], "x": 11.75, "y": 4.25},
+                {"matrix": [4, 11], "x": 12.75, "y": 4.25},
+                {"matrix": [4, 12], "x": 13.75, "y": 4.25, "w": 1.75},
+
+                {"matrix": [4, 13], "x": 15.75, "y": 4.5},
+
+                {"matrix": [5, 10], "x": 17, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+
+                {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 4, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 4], "x": 5.25, "y": 5.25, "w": 6.25},
+                {"matrix": [5, 5], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"matrix": [5, 6], "x": 13, "y": 5.25, "w": 1.5},
+
+                {"matrix": [5, 7], "x": 14.75, "y": 5.5},
+                {"matrix": [5, 8], "x": 15.75, "y": 5.5},
+                {"matrix": [5, 9], "x": 16.75, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/rart/rart75m/rart75m.c b/keyboards/rart/rart75m/rart75m.c
index 7c9014386e..2fcb6396c9 100644
--- a/keyboards/rart/rart75m/rart75m.c
+++ b/keyboards/rart/rart75m/rart75m.c
@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "rart75m.h"
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
diff --git a/keyboards/rart/rart75m/rart75m.h b/keyboards/rart/rart75m/rart75m.h
deleted file mode 100644
index 7b45b61a68..0000000000
--- a/keyboards/rart/rart75m/rart75m.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 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"
-
-#define XXX KC_NO
-
-#define LAYOUT_all(\
-       K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-       K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K5D, \
-       K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K5C, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K5B, \
-  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4D, K5A, \
-  K50, K51, K52, K53,                K54,                K55, K56, K57, K58, K59 \
-) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D }, \
-  { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D } \
-}