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

2 files changed, 51 insertions, 72 deletions

diff --git a/keyboards/uranuma/info.json b/keyboards/uranuma/info.json
index 2b311ea40f..2dd2bd9e53 100644
--- a/keyboards/uranuma/info.json
+++ b/keyboards/uranuma/info.json
@@ -18,56 +18,61 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"k00", "x":0 , "y":0.62},
-        {"label":"k01", "x":1 , "y":0.36},
-        {"label":"k02", "x":2 , "y":0},
-        {"label":"k03", "x":3 , "y":0.09},
-        {"label":"k04", "x":4 , "y":0.7},
-        {"label":"k05", "x":8 , "y":0.7},
-        {"label":"k06", "x":9 , "y":0.09},
-        {"label":"k07", "x":10, "y":0},
-        {"label":"k08", "x":11, "y":0.36},
-        {"label":"k09", "x":12, "y":0.62},
+        {"matrix": [0, 0], "x": 0, "y": 0.62},
+        {"matrix": [0, 1], "x": 1, "y": 0.36},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0.09},
+        {"matrix": [0, 4], "x": 4, "y": 0.7},
 
-        {"label":"k10", "x":0 , "y":1.62},
-        {"label":"k11", "x":1 , "y":1.36},
-        {"label":"k12", "x":2 , "y":1},
-        {"label":"k13", "x":3 , "y":1.09},
-        {"label":"k14", "x":4 , "y":1.7},
-        {"label":"k15", "x":8 , "y":1.7},
-        {"label":"k16", "x":9 , "y":1.09},
-        {"label":"k17", "x":10, "y":1},
-        {"label":"k18", "x":11, "y":1.36},
-        {"label":"k19", "x":12, "y":1.62},
+        {"matrix": [0, 5], "x": 8, "y": 0.7},
+        {"matrix": [0, 6], "x": 9, "y": 0.09},
+        {"matrix": [0, 7], "x": 10, "y": 0},
+        {"matrix": [0, 8], "x": 11, "y": 0.36},
+        {"matrix": [0, 9], "x": 12, "y": 0.62},
 
-        {"label":"k20", "x":0 , "y":2.62},
-        {"label":"k21", "x":1 , "y":2.36},
-        {"label":"k22", "x":2 , "y":2},
-        {"label":"k23", "x":3 , "y":2.09},
-        {"label":"k24", "x":4 , "y":2.7},
-        {"label":"k25", "x":8 , "y":2.7},
-        {"label":"k26", "x":9 , "y":2.09},
-        {"label":"k27", "x":10, "y":2},
-        {"label":"k28", "x":11, "y":2.36},
-        {"label":"k29", "x":12, "y":2.62},
+        {"matrix": [1, 0], "x": 0, "y": 1.62},
+        {"matrix": [1, 1], "x": 1, "y": 1.36},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1.09},
+        {"matrix": [1, 4], "x": 4, "y": 1.7},
 
-        {"label":"k30", "x":0 , "y":3.62},
-        {"label":"k31", "x":1 , "y":3.36},
-        {"label":"k32", "x":2 , "y":3},
-        {"label":"k33", "x":3 , "y":3.09},
-        {"label":"k34", "x":4 , "y":3.7},
-        {"label":"k44", "x":5, "y":2.44, "h":2},
-        {"label":"k45", "x":7, "y":2.44, "h":2},
-        {"label":"k35", "x":8 , "y":3.7},
-        {"label":"k36", "x":9 , "y":3.09},
-        {"label":"k37", "x":10, "y":3},
-        {"label":"k38", "x":11, "y":3.36},
-        {"label":"k39", "x":12, "y":3.62},
+        {"matrix": [1, 5], "x": 8, "y": 1.7},
+        {"matrix": [1, 6], "x": 9, "y": 1.09},
+        {"matrix": [1, 7], "x": 10, "y": 1},
+        {"matrix": [1, 8], "x": 11, "y": 1.36},
+        {"matrix": [1, 9], "x": 12, "y": 1.62},
 
-        {"label":"k40", "x":0, "y":4.7, "w":1.5},
-        {"label":"k41", "x":1.5, "y":4.7},
-        {"label":"k48", "x":10.5, "y":4.7},
-        {"label":"k49", "x":11.5, "y":4.7, "w":1.5}
+        {"matrix": [2, 0], "x": 0, "y": 2.62},
+        {"matrix": [2, 1], "x": 1, "y": 2.36},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2.09},
+        {"matrix": [2, 4], "x": 4, "y": 2.7},
+
+        {"matrix": [2, 5], "x": 8, "y": 2.7},
+        {"matrix": [2, 6], "x": 9, "y": 2.09},
+        {"matrix": [2, 7], "x": 10, "y": 2},
+        {"matrix": [2, 8], "x": 11, "y": 2.36},
+        {"matrix": [2, 9], "x": 12, "y": 2.62},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.62},
+        {"matrix": [3, 1], "x": 1, "y": 3.36},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3.09},
+        {"matrix": [3, 4], "x": 4, "y": 3.7},
+        {"matrix": [4, 4], "x": 5, "y": 2.44, "h": 2},
+
+        {"matrix": [4, 5], "x": 7, "y": 2.44, "h": 2},
+        {"matrix": [3, 5], "x": 8, "y": 3.7},
+        {"matrix": [3, 6], "x": 9, "y": 3.09},
+        {"matrix": [3, 7], "x": 10, "y": 3},
+        {"matrix": [3, 8], "x": 11, "y": 3.36},
+        {"matrix": [3, 9], "x": 12, "y": 3.62},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.7, "w": 1.5},
+        {"matrix": [4, 1], "x": 1.5, "y": 4.7},
+
+        {"matrix": [4, 8], "x": 10.5, "y": 4.7},
+        {"matrix": [4, 9], "x": 11.5, "y": 4.7, "w": 1.5}
       ]
     }
   }
diff --git a/keyboards/uranuma/uranuma.h b/keyboards/uranuma/uranuma.h
deleted file mode 100644
index 8b2e4c6930..0000000000
--- a/keyboards/uranuma/uranuma.h
+++ /dev/null
@@ -1,26 +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( \
-    k00, k01, k02, k03, k04,               k05, k06, k07, k08, k09, \
-    k10, k11, k12, k13, k14,               k15, k16, k17, k18, k19, \
-    k20, k21, k22, k23, k24,               k25, k26, k27, k28, k29, \
-    k30, k31, k32, k33, k34, k44,     k45, k35, k36, k37, k38, k39, \
-    k40, k41,                                             k48, k49  \
-) { \
-    { k00, k01, k02,   k03,   k04, k05, k06,   k07,   k08, k09 }, \
-    { k10, k11, k12,   k13,   k14, k15, k16,   k17,   k18, k19 }, \
-    { k20, k21, k22,   k23,   k24, k25, k26,   k27,   k28, k29 }, \
-    { k30, k31, k32,   k33,   k34, k35, k36,   k37,   k38, k39 }, \
-    { k40, k41, KC_NO, KC_NO, k44, k45, KC_NO, KC_NO, k48, k49 }  \
-}