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

2 files changed, 72 insertions, 101 deletions

diff --git a/keyboards/rart/rart67/info.json b/keyboards/rart/rart67/info.json
index 0ec558c67b..08c3a1a7a5 100644
--- a/keyboards/rart/rart67/info.json
+++ b/keyboards/rart/rart67/info.json
@@ -21,79 +21,78 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-      
-                {"label" : "Esc", "x":0, "y":0},
-                {"label" : "1", "x":1, "y":0},
-                {"label" : "2", "x":2, "y":0},
-                {"label" : "3", "x":3, "y":0},
-                {"label" : "4", "x":4, "y":0},
-                {"label" : "5", "x":5, "y":0},
-                {"label" : "6", "x":6, "y":0},
-                {"label" : "7", "x":7, "y":0},
-                {"label" : "8", "x":8, "y":0},
-                {"label" : "9", "x":9, "y":0},
-                {"label" : "0", "x":10, "y":0},
-                {"label" : "-", "x":11, "y":0},
-                {"label" : "=", "x":12, "y":0},
-                {"label" : "|", "x":13, "y":0},
-                {"label" : "Backspace", "x":14, "y":0},
-                {"label" : "Page up", "x":15, "y":0},
-    
-                {"label" : "Tab", "x":0, "y":1, "w":1.5},
-                {"label" : "Q", "x":1.5, "y":1},
-                {"label" : "W", "x":2.5, "y":1},
-                {"label" : "E", "x":3.5, "y":1},
-                {"label" : "R", "x":4.5, "y":1},
-                {"label" : "T", "x":5.5, "y":1},
-                {"label" : "Y", "x":6.5, "y":1},
-                {"label" : "U", "x":7.5, "y":1},
-                {"label" : "I", "x":8.5, "y":1},
-                {"label" : "O", "x":9.5, "y":1},
-                {"label" : "P", "x":10.5, "y":1},
-                {"label" : "[", "x":11.5, "y":1},
-                {"label" : "]", "x":12.5, "y":1},
-                {"label" : "|", "x":13.5, "y":1, "w":1.5},
-                {"label" : "Page  down", "x":15, "y":1},
-       
-                {"label" : "Caps lock", "x":0, "y":2, "w":1.75},
-                {"label" : "A", "x":1.75, "y":2},
-                {"label" : "S", "x":2.75, "y":2},
-                {"label" : "D", "x":3.75, "y":2},
-                {"label" : "F", "x":4.75, "y":2},
-                {"label" : "G", "x":5.75, "y":2},
-                {"label" : "H", "x":6.75, "y":2},
-                {"label" : "J", "x":7.75, "y":2},
-                {"label" : "K", "x":8.75, "y":2},
-                {"label" : "L", "x":9.75, "y":2},
-                {"label" : ";", "x":10.75, "y":2},
-                {"label" : "'", "x":11.75, "y":2},
-                {"label" : "Enter", "x":12.75, "y":2, "w":2.25},
-                {"label" : "Home", "x":15, "y":2},
-    
-                {"label" : "Shift", "x":0, "y":3, "w":2.25},
-                {"label" : "Z", "x":2.25, "y":3},
-                {"label" : "X", "x":3.25, "y":3},
-                {"label" : "C", "x":4.25, "y":3},
-                {"label" : "V", "x":5.25, "y":3},
-                {"label" : "B", "x":6.25, "y":3},
-                {"label" : "N", "x":7.25, "y":3},
-                {"label" : "M", "x":8.25, "y":3},
-                {"label" : ",", "x":9.25, "y":3},
-                {"label" : ".", "x":10.25, "y":3},
-                {"label" : "/", "x":11.25, "y":3},
-                {"label" : "Shift", "x":12.25, "y":3, "w":1.75},
-                {"label" : "Up", "x":14, "y":3},
-                {"label" : "End", "x":15, "y":3},
-       
-                {"label" : "Ctrl", "x":0, "y":4, "w":1.25},
-                {"label" : "Windows", "x":1.25, "y":4, "w":1.25},
-                {"label" : "Alt", "x":2.5, "y":4, "w":1.25},
-                {"label" : "Space", "x":3.75, "y":4, "w":6.25},
-                {"label" : "Alt", "x":10, "y":4, "w":1.5},
-                {"label" : "Ctrl", "x":11.5, "y":4, "w":1.5},
-                {"label" : "Left", "x":13, "y":4 },
-                {"label" : "Down", "x":14, "y":4 },
-                {"label" : "Right", "x":15, "y":4 }                                                        
+                {"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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 11.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 11], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/rart/rart67/rart67.h b/keyboards/rart/rart67/rart67.h
deleted file mode 100644
index a31b6f4090..0000000000
--- a/keyboards/rart/rart67/rart67.h
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#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, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,           K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3E, K3F, \
-    K40, K41, K42,           K45,                K49, K4A, K4B,           K4E, K4F  \
-) \
-{ \
-    { K00, K01, K02, K03,   K04,   K05,   K06,   K07,   K08,   K09, K0A, K0B, K0C,   K0D,   K0E, K0F }, \
-    { K10, K11, K12, K13,   K14,   K15,   K16,   K17,   K18,   K19, K1A, K1B, K1C,   KC_NO, K1E, K1F }, \
-    { K20, K21, K22, K23,   K24,   K25,   K26,   K27,   K28,   K29, K2A, K2B, KC_NO, KC_NO, K2E, K2F }, \
-    { K30, K31, K32, K33,   K34,   K35,   K36,   K37,   K38,   K39, K3A, K3B, KC_NO, KC_NO, K3E, K3F }, \
-    { K40, K41, K42, KC_NO, KC_NO, K45,   KC_NO, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, KC_NO, K4E, K4F }, \
-}
-