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

2 files changed, 81 insertions, 96 deletions

diff --git a/keyboards/papercranekeyboards/gerald65/gerald65.h b/keyboards/papercranekeyboards/gerald65/gerald65.h
deleted file mode 100644
index b433051bb7..0000000000
--- a/keyboards/papercranekeyboards/gerald65/gerald65.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2021 PaperCraneKeyboards (@PaperCraneKeyboards)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is 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, k35,   k36, k37, k38, k39, k40, k41, k42,      k43, \
-    k44, k45, k46, k47, k48, k49,   k50, k51, k52, k53, k54, k55,      k56, k57, \
-    k58,      k59, k60,      k61,   k62,      k63,                k64, k65, k66  \
-) { \
-    {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,   k42, KC_NO, k43}, \
-    {k44, k45,   k46, k47, k48,   k49,   k50, k51,   k52, k53,   k54,   k55,   KC_NO, k56, k57}, \
-    {k58, KC_NO, k59, k60, KC_NO, k61,   k62, KC_NO, k63, KC_NO, KC_NO, KC_NO, k64,   k65, k66} \
-}
diff --git a/keyboards/papercranekeyboards/gerald65/info.json b/keyboards/papercranekeyboards/gerald65/info.json
index 80b8f115b2..533c50a76c 100644
--- a/keyboards/papercranekeyboards/gerald65/info.json
+++ b/keyboards/papercranekeyboards/gerald65/info.json
@@ -18,73 +18,87 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"~", "x":0, "y":0}, 
-                {"label":"!", "x":1, "y":0}, 
-                {"label":"@", "x":2, "y":0}, 
-                {"label":"#", "x":3, "y":0}, 
-                {"label":"$", "x":4, "y":0}, 
-                {"label":"%", "x":5, "y":0}, 
-                {"label":"^", "x":6, "y":0}, 
-                {"label":"&", "x":8.25, "y":0}, 
-                {"label":"*", "x":9.25, "y":0}, 
-                {"label":"(", "x":10.25, "y":0}, 
-                {"label":")", "x":11.25, "y":0}, 
-                {"label":"_", "x":12.25, "y":0}, 
-                {"label":"+", "x":13.25, "y":0}, 
-                {"label":"Backspace", "x":14.25, "y":0, "w":2}, 
-                {"label":"Delete", "x":16.5, "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":7.75, "y":1}, 
-                {"label":"U", "x":8.75, "y":1}, 
-                {"label":"I", "x":9.75, "y":1}, 
-                {"label":"O", "x":10.75, "y":1}, 
-                {"label":"P", "x":11.75, "y":1}, 
-                {"label":"{", "x":12.75, "y":1}, 
-                {"label":"}", "x":13.75, "y":1}, 
-                {"label":"|", "x":14.75, "y":1, "w":1.5}, 
-                {"label":"Page Up", "x":16.5, "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":8, "y":2}, 
-                {"label":"J", "x":9, "y":2}, 
-                {"label":"K", "x":10, "y":2}, 
-                {"label":"L", "x":11, "y":2}, 
-                {"label":":", "x":12, "y":2}, 
-                {"label":"\"", "x":13, "y":2}, 
-                {"label":"Enter", "x":14, "y":2, "w":2.25}, 
-                {"label":"Page Down", "x":16.5, "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":8.5, "y":3}, 
-                {"label":"M", "x":9.5, "y":3}, 
-                {"label":"<", "x":10.5, "y":3}, 
-                {"label":">", "x":11.5, "y":3}, 
-                {"label":"?", "x":12.5, "y":3}, 
-                {"label":"Shift", "x":13.5, "y":3, "w":1.75}, 
-                {"label":"up", "x":15.5, "y":3}, 
-                {"label":"Home", "x":16.5, "y":3}, 
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 
-                {"label":"Alt", "x":3.25, "y":4, "w":1.25}, 
-                {"label":"space", "x":4.5, "y":4, "w":2}, 
-                {"label":"space", "x":6.5, "y":4}, 
-                {"label":"space", "x":8.25, "y":4, "w":2.75}, 
-                {"label":"Win", "x":11, "y":4, "w":1.25}, 
-                {"label":"left", "x":14.5, "y":4}, 
-                {"label":"down", "x":15.5, "y":4}, 
-                {"label":"right", "x":16.5, "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": 8.25, "y": 0},
+                {"matrix": [0, 8], "x": 9.25, "y": 0},
+                {"matrix": [0, 9], "x": 10.25, "y": 0},
+                {"matrix": [0, 10], "x": 11.25, "y": 0},
+                {"matrix": [0, 11], "x": 12.25, "y": 0},
+                {"matrix": [0, 12], "x": 13.25, "y": 0},
+                {"matrix": [0, 13], "x": 14.25, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 16.5, "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": 7.75, "y": 1},
+                {"matrix": [1, 7], "x": 8.75, "y": 1},
+                {"matrix": [1, 8], "x": 9.75, "y": 1},
+                {"matrix": [1, 9], "x": 10.75, "y": 1},
+                {"matrix": [1, 10], "x": 11.75, "y": 1},
+                {"matrix": [1, 11], "x": 12.75, "y": 1},
+                {"matrix": [1, 12], "x": 13.75, "y": 1},
+                {"matrix": [1, 13], "x": 14.75, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 16.5, "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": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2},
+                {"matrix": [2, 12], "x": 14, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 16.5, "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": 8.5, "y": 3},
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 15.5, "y": 3},
+                {"matrix": [3, 14], "x": 16.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 2},
+                {"matrix": [4, 5], "x": 6.5, "y": 4},
+
+                {"matrix": [4, 6], "x": 8.25, "y": 4, "w": 2.75},
+                {"matrix": [4, 8], "x": 11, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 14.5, "y": 4},
+                {"matrix": [4, 13], "x": 15.5, "y": 4},
+                {"matrix": [4, 14], "x": 16.5, "y": 4}
             ]
         }
     }