Move single `LAYOUT`s to data driven (#20365)

2 files changed, 45 insertions, 65 deletions

diff --git a/keyboards/arabica37/rev1/info.json b/keyboards/arabica37/rev1/info.json
index 775257c8de..a543a83fd9 100644
--- a/keyboards/arabica37/rev1/info.json
+++ b/keyboards/arabica37/rev1/info.json
@@ -24,58 +24,59 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0.25, "y":0.75},
-                {"label":"Q", "x":1.25, "y":0.75},
-                {"label":"W", "x":2.25, "y":0.25},
-                {"label":"E", "x":3.25, "y":0},
-                {"label":"R", "x":4.25, "y":0.25},
-                {"label":"T", "x":5.25, "y":0.5},
+                {"matrix": [0, 0], "x": 0.25, "y": 0.75},
+                {"matrix": [0, 1], "x": 1.25, "y": 0.75},
+                {"matrix": [0, 2], "x": 2.25, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 0.5},
 
-                {"label":"Y", "x":9, "y":0.5},
-                {"label":"U", "x":10, "y":0.25},
-                {"label":"I", "x":11, "y":0},
-                {"label":"O", "x":12, "y":0.25},
-                {"label":"P", "x":13, "y":0.75},
-                {"label":"Backspace", "x":14, "y":0.75},
+                {"matrix": [4, 5], "x": 9, "y": 0.5},
+                {"matrix": [4, 4], "x": 10, "y": 0.25},
+                {"matrix": [4, 3], "x": 11, "y": 0},
+                {"matrix": [4, 2], "x": 12, "y": 0.25},
+                {"matrix": [4, 1], "x": 13, "y": 0.75},
+                {"matrix": [4, 0], "x": 14, "y": 0.75},
 
-                {"label":"Ctrl", "x":0.25, "y":1.75},
-                {"label":"A", "x":1.25, "y":1.75},
-                {"label":"S", "x":2.25, "y":1.25},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1.25},
-                {"label":"G", "x":5.25, "y":1.5},
+                {"matrix": [1, 0], "x": 0.25, "y": 1.75},
+                {"matrix": [1, 1], "x": 1.25, "y": 1.75},
+                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.25, "y": 1.5},
 
-                {"label":"H", "x":9, "y":1.5},
-                {"label":"J", "x":10, "y":1.25},
-                {"label":"K", "x":11, "y":1},
-                {"label":"L", "x":12, "y":1.25},
-                {"label":";", "x":13, "y":1.75},
-                {"label":"'", "x":14, "y":1.75},
+                {"matrix": [5, 5], "x": 9, "y": 1.5},
+                {"matrix": [5, 4], "x": 10, "y": 1.25},
+                {"matrix": [5, 3], "x": 11, "y": 1},
+                {"matrix": [5, 2], "x": 12, "y": 1.25},
+                {"matrix": [5, 1], "x": 13, "y": 1.75},
+                {"matrix": [5, 0], "x": 14, "y": 1.75},
 
-                {"label":"Adjust", "x":0.25, "y":2.75},
-                {"label":"Z", "x":1.25, "y":2.75},
-                {"label":"X", "x":2.25, "y":2.25},
-                {"label":"C", "x":3.25, "y":2},
-                {"label":"V", "x":4.25, "y":2.25},
-                {"label":"B", "x":5.25, "y":2.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 2.75},
+                {"matrix": [2, 1], "x": 1.25, "y": 2.75},
+                {"matrix": [2, 2], "x": 2.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.25, "y": 2.5},
 
-                {"label":"N", "x":9, "y":2.5},
-                {"label":"M", "x":10, "y":2.25},
-                {"label":",", "x":11, "y":2},
-                {"label":".", "x":12, "y":2.25},
-                {"label":"/", "x":13, "y":2.75},
-                {"label":"\\", "x":14, "y":2.75},
+                {"matrix": [6, 5], "x": 9, "y": 2.5},
+                {"matrix": [6, 4], "x": 10, "y": 2.25},
+                {"matrix": [6, 3], "x": 11, "y": 2},
+                {"matrix": [6, 2], "x": 12, "y": 2.25},
+                {"matrix": [6, 1], "x": 13, "y": 2.75},
+                {"matrix": [6, 0], "x": 14, "y": 2.75},
 
-                {"label":"Shift", "x":0, "y":3.75, "w":2.25},
-                {"label":"Lower", "x":4.375, "y":3.75, "w":1.5},
-                {"label":"GUI", "x":5.875, "y":3.75, "w":1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.375, "y": 3.75, "w": 1.5},
+                {"matrix": [3, 5], "x": 5.875, "y": 3.75, "w": 1.25},
 
-                {"label":"Alt", "x":8.125, "y":3.75, "w":1.25},
-                {"label":"Raise", "x":9.375, "y":3.75, "w":1.5},
-                {"label":"Shift", "x":13, "y":3.75, "w":2.25},
+                {"matrix": [7, 5], "x": 8.125, "y": 3.75, "w": 1.25},
+                {"matrix": [7, 4], "x": 9.375, "y": 3.75, "w": 1.5},
+                {"matrix": [7, 0], "x": 13, "y": 3.75, "w": 2.25},
 
-                {"label":"Space", "x":5.125, "y":4.75, "w":1.25},
-                {"label":"Enter", "x":8.875, "y":4.75, "w":1.25}
+                {"matrix": [3, 3], "x": 5.125, "y": 4.75, "w": 1.25},
+
+                {"matrix": [7, 3], "x": 8.875, "y": 4.75, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/arabica37/rev1/rev1.h b/keyboards/arabica37/rev1/rev1.h
deleted file mode 100644
index 8d247242f6..0000000000
--- a/keyboards/arabica37/rev1/rev1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
- L26,                L31, L32,           R26, R30,                R32, \
-                       L30,                 R31                        \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L26, KC_NO, KC_NO, L30, L31, L32 }, \
-    { R05, R04, R03, R02, R01, R00 }, \
-    { R15, R14, R13, R12, R11, R10 }, \
-    { R25, R24, R23, R22, R21, R20 }, \
-    { R32, KC_NO, KC_NO, R31, R30, R26 } \
-  }