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

2 files changed, 45 insertions, 57 deletions

diff --git a/keyboards/handwired/minorca/info.json b/keyboards/handwired/minorca/info.json
index c7b463f223..ba2b6d0ed5 100644
--- a/keyboards/handwired/minorca/info.json
+++ b/keyboards/handwired/minorca/info.json
@@ -18,48 +18,51 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K04", "x":4, "y":0},
-                {"label":"K05", "x":5, "y":0},
-                {"label":"K06", "x":6, "y":0},
-                {"label":"K07", "x":7, "y":0},
-                {"label":"K08", "x":8, "y":0},
-                {"label":"K09", "x":9, "y":0},
-                {"label":"K0A", "x":10, "y":0},
-                {"label":"K0B", "x":11, "y":0},
-                {"label":"K10", "x":0, "y":1, "w":1.25},
-                {"label":"K11", "x":1.25, "y":1},
-                {"label":"K12", "x":2.25, "y":1},
-                {"label":"K13", "x":3.25, "y":1},
-                {"label":"K14", "x":4.25, "y":1},
-                {"label":"K15", "x":5.25, "y":1},
-                {"label":"K16", "x":6.25, "y":1},
-                {"label":"K17", "x":7.25, "y":1},
-                {"label":"K18", "x":8.25, "y":1},
-                {"label":"K19", "x":9.25, "y":1},
-                {"label":"K1B", "x":10.25, "y":1, "w":1.75},
-                {"label":"K20", "x":0, "y":2, "w":1.75},
-                {"label":"K22", "x":1.75, "y":2},
-                {"label":"K23", "x":2.75, "y":2},
-                {"label":"K24", "x":3.75, "y":2},
-                {"label":"K25", "x":4.75, "y":2},
-                {"label":"K26", "x":5.75, "y":2},
-                {"label":"K27", "x":6.75, "y":2},
-                {"label":"K28", "x":7.75, "y":2},
-                {"label":"K29", "x":8.75, "y":2},
-                {"label":"K2A", "x":9.75, "y":2},
-                {"label":"K2B", "x":10.75, "y":2, "w":1.25},
-                {"label":"K30", "x":0, "y":3, "w":1.25},
-                {"label":"K32", "x":1.25, "y":3, "w":1.25},
-                {"label":"K33", "x":2.5, "y":3, "w":1.25},
-                {"label":"K34", "x":3.75, "y":3, "w":2.25},
-                {"label":"K37", "x":6, "y":3, "w":2.25},
-                {"label":"K39", "x":8.25, "y":3, "w":1.25},
-                {"label":"K3A", "x":9.5, "y":3},
-                {"label":"K3B", "x":10.5, "y":3, "w":1.5}
+                {"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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.25},
+                {"matrix": [3, 9], "x": 8.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 10], "x": 9.5, "y": 3},
+                {"matrix": [3, 11], "x": 10.5, "y": 3, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/handwired/minorca/minorca.h b/keyboards/handwired/minorca/minorca.h
deleted file mode 100644
index ca524caf59..0000000000
--- a/keyboards/handwired/minorca/minorca.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-    K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19,     K1B, \
-    K20,    K22, K23, K24, K25, K26, K27, K28, K29, K2A,   K2B, \
-    K30,  K32,  K33,         K34, K37,         K39,  K3A,  K3B  \
-) { \
-    { K00, K01,   K02, K03, K04, K05,   K06,   K07, K08,   K09, K0A,   K0B }, \
-    { K10, K11,   K12, K13, K14, K15,   K16,   K17, K18,   K19, KC_NO, K1B }, \
-    { K20, KC_NO, K22, K23, K24, K25,   K26,   K27, K28,   K29, K2A,   K2B }, \
-    { K30, KC_NO, K32, K33, K34, KC_NO, KC_NO, K37, KC_NO, K39, K3A,   K3B } \
-}