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

2 files changed, 43 insertions, 59 deletions

diff --git a/keyboards/handwired/pilcrow/info.json b/keyboards/handwired/pilcrow/info.json
index 28bb690c3c..0a826c6ba8 100644
--- a/keyboards/handwired/pilcrow/info.json
+++ b/keyboards/handwired/pilcrow/info.json
@@ -18,46 +18,49 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"Q", "x":0, "y":0},
-        {"label":"W", "x":1, "y":0},
-        {"label":"E", "x":2, "y":0},
-        {"label":"R", "x":3, "y":0},
-        {"label":"T", "x":4, "y":0},
-        {"label":"Y", "x":5, "y":0},
-        {"label":"U", "x":6, "y":0},
-        {"label":"I", "x":7, "y":0},
-        {"label":"O", "x":8, "y":0},
-        {"label":"P", "x":9, "y":0},
-        {"label":"A", "x":0, "y":1},
-        {"label":"S", "x":1, "y":1},
-        {"label":"D", "x":2, "y":1},
-        {"label":"F", "x":3, "y":1},
-        {"label":"G", "x":4, "y":1},
-        {"label":"H", "x":5, "y":1},
-        {"label":"J", "x":6, "y":1},
-        {"label":"K", "x":7, "y":1},
-        {"label":"L", "x":8, "y":1},
-        {"label":";", "x":9, "y":1},
-        {"label":"Z", "x":0, "y":2},
-        {"label":"X", "x":1, "y":2},
-        {"label":"C", "x":2, "y":2},
-        {"label":"V", "x":3, "y":2},
-        {"label":"B", "x":4, "y":2},
-        {"label":"N", "x":5, "y":2},
-        {"label":"M", "x":6, "y":2},
-        {"label":",", "x":7, "y":2},
-        {"label":".", "x":8, "y":2},
-        {"label":"/", "x":9, "y":2},
-        {"label":"Ctrl", "x":0, "y":3},
-        {"label":"Alt", "x":1, "y":3},
-        {"label":"GUI", "x":2, "y":3},
-        {"label":"MO(1)", "x":3, "y":3},
-        {"label":"Space", "x":4, "y":3},
-        {"label":"Shift / Space", "x":5, "y":3},
-        {"label":"MO(2)", "x":6, "y":3},
-        {"label":"MO(3)", "x":7, "y":3},
-        {"label":"Delete", "x":8, "y":3},
-        {"label":"Esc", "x":9, "y":3}
+        {"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": [1, 0], "x": 0, "y": 1},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+        {"matrix": [1, 4], "x": 4, "y": 1},
+        {"matrix": [1, 5], "x": 5, "y": 1},
+        {"matrix": [1, 6], "x": 6, "y": 1},
+        {"matrix": [1, 7], "x": 7, "y": 1},
+        {"matrix": [1, 8], "x": 8, "y": 1},
+        {"matrix": [1, 9], "x": 9, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [2, 4], "x": 4, "y": 2},
+        {"matrix": [2, 5], "x": 5, "y": 2},
+        {"matrix": [2, 6], "x": 6, "y": 2},
+        {"matrix": [2, 7], "x": 7, "y": 2},
+        {"matrix": [2, 8], "x": 8, "y": 2},
+        {"matrix": [2, 9], "x": 9, "y": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3}
       ]
     }
   }
diff --git a/keyboards/handwired/pilcrow/pilcrow.h b/keyboards/handwired/pilcrow/pilcrow.h
deleted file mode 100644
index 30576e85c0..0000000000
--- a/keyboards/handwired/pilcrow/pilcrow.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguements
-// The second converts the arguments into a two-dimensional array
-#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, k35, k36, k37, k38, k39 \
-) { \
-    { 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 } \
-}