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

4 files changed, 143 insertions, 181 deletions

diff --git a/keyboards/pico/65keys/65keys.h b/keyboards/pico/65keys/65keys.h
deleted file mode 100644
index 444d8d2ee5..0000000000
--- a/keyboards/pico/65keys/65keys.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    L01, L02, L03, L04, L05, L06,            R00, R01, R02, R03, R04, R05, R06, \
-    L11, L12, L13, L14, L15, L16,            R10, R11, R12, R13, R14, R15, R16, \
-    L21, L22, L23, L24, L25, L26,            R20, R21, R22, R23, R24, R25, R26, \
-    L31, L32, L33, L34, L35, L36,            R30, R31, R32, R33, R34, R35, R36, \
-    L41, L42, L43, L44, L45, L46,            R40, R41, R42, R43, R44, R45, R46  \
-) \
-{ \
-    { KC_NO, L01, L02, L03, L04, L05, L06 }, \
-    { KC_NO, L11, L12, L13, L14, L15, L16 }, \
-    { KC_NO, L21, L22, L23, L24, L25, L26 }, \
-    { KC_NO, L31, L32, L33, L34, L35, L36 }, \
-    { KC_NO, L41, L42, L43, L44, L45, L46 }, \
-    { R00,   R01, R02, R03, R04, R05, R06 }, \
-    { R10,   R11, R12, R13, R14, R15, R16 }, \
-    { R20,   R21, R22, R23, R24, R25, R26 }, \
-    { R30,   R31, R32, R33, R34, R35, R36 }, \
-    { R40,   R41, R42, R43, R44, R45, R46 } \
-}
diff --git a/keyboards/pico/65keys/info.json b/keyboards/pico/65keys/info.json
index c591f0fe47..c9d61fc434 100644
--- a/keyboards/pico/65keys/info.json
+++ b/keyboards/pico/65keys/info.json
@@ -24,71 +24,75 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":9, "y":0},
-                {"label":"7", "x":10, "y":0},
-                {"label":"8", "x":11, "y":0},
-                {"label":"9", "x":12, "y":0},
-                {"label":"0", "x":13, "y":0},
-                {"label":"-", "x":14, "y":0},
-                {"label":"\u2190", "x":15, "y":0},
-                {"label":"Tab", "x":0.25, "y":1},
-                {"label":"Q", "x":1.25, "y":1},
-                {"label":"W", "x":2.25, "y":1},
-                {"label":"E", "x":3.25, "y":1},
-                {"label":"R", "x":4.25, "y":1},
-                {"label":"T", "x":5.25, "y":1},
-                {"label":"Y", "x":9.25, "y":1},
-                {"label":"U", "x":10.25, "y":1},
-                {"label":"I", "x":11.25, "y":1},
-                {"label":"O", "x":12.25, "y":1},
-                {"label":"P", "x":13.25, "y":1},
-                {"label":"[", "x":14.25, "y":1},
-                {"label":"]", "x":15.25, "y":1},
-                {"label":"Ctrl", "x":0.5, "y":2},
-                {"label":"A", "x":1.5, "y":2},
-                {"label":"S", "x":2.5, "y":2},
-                {"label":"D", "x":3.5, "y":2},
-                {"label":"F", "x":4.5, "y":2},
-                {"label":"G", "x":5.5, "y":2},
-                {"label":"H", "x":9.5, "y":2},
-                {"label":"J", "x":10.5, "y":2},
-                {"label":"K", "x":11.5, "y":2},
-                {"label":"L", "x":12.5, "y":2},
-                {"label":";", "x":13.5, "y":2},
-                {"label":"'", "x":14.5, "y":2},
-                {"label":"Enter", "x":15.5, "y":2},
-                {"label":"Shift", "x":0.75, "y":3},
-                {"label":"Z", "x":1.75, "y":3},
-                {"label":"X", "x":2.75, "y":3},
-                {"label":"C", "x":3.75, "y":3},
-                {"label":"V", "x":4.75, "y":3},
-                {"label":"B", "x":5.75, "y":3},
-                {"label":"N", "x":9.75, "y":3},
-                {"label":"M", "x":10.75, "y":3},
-                {"label":",", "x":11.75, "y":3},
-                {"label":".", "x":12.75, "y":3},
-                {"label":"/", "x":13.75, "y":3},
-                {"label":"\u2191", "x":14.75, "y":3},
-                {"label":"Shift", "x":15.75, "y":3},
-                {"label":"Alt", "x":1, "y":4},
-                {"label":"Enter", "x":2, "y":4},
-                {"label":"Del", "x":3, "y":4},
-                {"label":"GUI", "x":4, "y":4},
-                {"label":"LANG2", "x":5, "y":4},
-                {"label":"Space", "x":6, "y":4},
-                {"label":"Space", "x":10, "y":4},
-                {"label":"LANG1", "x":11, "y":4},
-                {"label":"GUI", "x":12, "y":4},
-                {"label":"Del", "x":13, "y":4},
-                {"label":"\u2190", "x":14, "y":4},
-                {"label":"\u2193", "x":15, "y":4},
-                {"label":"\u2192", "x":16, "y":4}
+                {"matrix": [0, 1], "x": 0, "y": 0},
+                {"matrix": [0, 2], "x": 1, "y": 0},
+                {"matrix": [0, 3], "x": 2, "y": 0},
+                {"matrix": [0, 4], "x": 3, "y": 0},
+                {"matrix": [0, 5], "x": 4, "y": 0},
+                {"matrix": [0, 6], "x": 5, "y": 0},
+                {"matrix": [5, 0], "x": 9, "y": 0},
+                {"matrix": [5, 1], "x": 10, "y": 0},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 4], "x": 13, "y": 0},
+                {"matrix": [5, 5], "x": 14, "y": 0},
+                {"matrix": [5, 6], "x": 15, "y": 0},
+
+                {"matrix": [1, 1], "x": 0.25, "y": 1},
+                {"matrix": [1, 2], "x": 1.25, "y": 1},
+                {"matrix": [1, 3], "x": 2.25, "y": 1},
+                {"matrix": [1, 4], "x": 3.25, "y": 1},
+                {"matrix": [1, 5], "x": 4.25, "y": 1},
+                {"matrix": [1, 6], "x": 5.25, "y": 1},
+                {"matrix": [6, 0], "x": 9.25, "y": 1},
+                {"matrix": [6, 1], "x": 10.25, "y": 1},
+                {"matrix": [6, 2], "x": 11.25, "y": 1},
+                {"matrix": [6, 3], "x": 12.25, "y": 1},
+                {"matrix": [6, 4], "x": 13.25, "y": 1},
+                {"matrix": [6, 5], "x": 14.25, "y": 1},
+                {"matrix": [6, 6], "x": 15.25, "y": 1},
+
+                {"matrix": [2, 1], "x": 0.5, "y": 2},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [7, 0], "x": 9.5, "y": 2},
+                {"matrix": [7, 1], "x": 10.5, "y": 2},
+                {"matrix": [7, 2], "x": 11.5, "y": 2},
+                {"matrix": [7, 3], "x": 12.5, "y": 2},
+                {"matrix": [7, 4], "x": 13.5, "y": 2},
+                {"matrix": [7, 5], "x": 14.5, "y": 2},
+                {"matrix": [7, 6], "x": 15.5, "y": 2},
+
+                {"matrix": [3, 1], "x": 0.75, "y": 3},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [8, 0], "x": 9.75, "y": 3},
+                {"matrix": [8, 1], "x": 10.75, "y": 3},
+                {"matrix": [8, 2], "x": 11.75, "y": 3},
+                {"matrix": [8, 3], "x": 12.75, "y": 3},
+                {"matrix": [8, 4], "x": 13.75, "y": 3},
+                {"matrix": [8, 5], "x": 14.75, "y": 3},
+                {"matrix": [8, 6], "x": 15.75, "y": 3},
+
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 0], "x": 10, "y": 4},
+                {"matrix": [9, 1], "x": 11, "y": 4},
+                {"matrix": [9, 2], "x": 12, "y": 4},
+                {"matrix": [9, 3], "x": 13, "y": 4},
+                {"matrix": [9, 4], "x": 14, "y": 4},
+                {"matrix": [9, 5], "x": 15, "y": 4},
+                {"matrix": [9, 6], "x": 16, "y": 4}
             ]
         }
     }
diff --git a/keyboards/pico/70keys/70keys.h b/keyboards/pico/70keys/70keys.h
deleted file mode 100644
index 6235d8e136..0000000000
--- a/keyboards/pico/70keys/70keys.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, L06,            R00, R01, R02, R03, R04, R05, R06, \
-    L10, L11, L12, L13, L14, L15, L16,            R10, R11, R12, R13, R14, R15, R16, \
-    L20, L21, L22, L23, L24, L25, L26,            R20, R21, R22, R23, R24, R25, R26, \
-    L30, L31, L32, L33, L34, L35, L36,            R30, R31, R32, R33, R34, R35, R36, \
-    L40, L41, L42, L43, L44, L45, L46,            R40, R41, R42, R43, R44, R45, R46  \
-) \
-{ \
-    { L00, L01, L02, L03, L04, L05, L06 }, \
-    { L10, L11, L12, L13, L14, L15, L16 }, \
-    { L20, L21, L22, L23, L24, L25, L26 }, \
-    { L30, L31, L32, L33, L34, L35, L36 }, \
-    { L40, L41, L42, L43, L44, L45, L46 }, \
-    { R00, R01, R02, R03, R04, R05, R06 }, \
-    { R10, R11, R12, R13, R14, R15, R16 }, \
-    { R20, R21, R22, R23, R24, R25, R26 }, \
-    { R30, R31, R32, R33, R34, R35, R36 }, \
-    { R40, R41, R42, R43, R44, R45, R46 } \
-}
diff --git a/keyboards/pico/70keys/info.json b/keyboards/pico/70keys/info.json
index 0cd5afb0ca..09c1cfa5b3 100644
--- a/keyboards/pico/70keys/info.json
+++ b/keyboards/pico/70keys/info.json
@@ -24,76 +24,80 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"~", "x":1, "y":0},
-                {"label":"1", "x":2, "y":0},
-                {"label":"2", "x":3, "y":0},
-                {"label":"3", "x":4, "y":0},
-                {"label":"4", "x":5, "y":0},
-                {"label":"5", "x":6, "y":0},
-                {"label":"6", "x":9, "y":0},
-                {"label":"7", "x":10, "y":0},
-                {"label":"8", "x":11, "y":0},
-                {"label":"9", "x":12, "y":0},
-                {"label":"0", "x":13, "y":0},
-                {"label":"-", "x":14, "y":0},
-                {"label":"\u2190", "x":15, "y":0},
-                {"label":"Tab", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.25, "y":1},
-                {"label":"Q", "x":2.25, "y":1},
-                {"label":"W", "x":3.25, "y":1},
-                {"label":"E", "x":4.25, "y":1},
-                {"label":"R", "x":5.25, "y":1},
-                {"label":"T", "x":6.25, "y":1},
-                {"label":"Y", "x":9.25, "y":1},
-                {"label":"U", "x":10.25, "y":1},
-                {"label":"I", "x":11.25, "y":1},
-                {"label":"O", "x":12.25, "y":1},
-                {"label":"P", "x":13.25, "y":1},
-                {"label":"[", "x":14.25, "y":1},
-                {"label":"]", "x":15.25, "y":1},
-                {"label":"Ctrl", "x":0.5, "y":2},
-                {"label":"Ctrl", "x":1.5, "y":2},
-                {"label":"A", "x":2.5, "y":2},
-                {"label":"S", "x":3.5, "y":2},
-                {"label":"D", "x":4.5, "y":2},
-                {"label":"F", "x":5.5, "y":2},
-                {"label":"G", "x":6.5, "y":2},
-                {"label":"H", "x":9.5, "y":2},
-                {"label":"J", "x":10.5, "y":2},
-                {"label":"K", "x":11.5, "y":2},
-                {"label":"L", "x":12.5, "y":2},
-                {"label":";", "x":13.5, "y":2},
-                {"label":"'", "x":14.5, "y":2},
-                {"label":"Enter", "x":15.5, "y":2},
-                {"label":"Shift", "x":0.75, "y":3},
-                {"label":"Shift", "x":1.75, "y":3},
-                {"label":"Z", "x":2.75, "y":3},
-                {"label":"X", "x":3.75, "y":3},
-                {"label":"C", "x":4.75, "y":3},
-                {"label":"V", "x":5.75, "y":3},
-                {"label":"B", "x":6.75, "y":3},
-                {"label":"N", "x":9.75, "y":3},
-                {"label":"M", "x":10.75, "y":3},
-                {"label":",", "x":11.75, "y":3},
-                {"label":".", "x":12.75, "y":3},
-                {"label":"/", "x":13.75, "y":3},
-                {"label":"\u2191", "x":14.75, "y":3},
-                {"label":"Shift", "x":15.75, "y":3},
-                {"label":"Alt", "x":1, "y":4},
-                {"label":"Alt", "x":2, "y":4},
-                {"label":"Enter", "x":3, "y":4},
-                {"label":"Del", "x":4, "y":4},
-                {"label":"GUI", "x":5, "y":4},
-                {"label":"LANG2", "x":6, "y":4},
-                {"label":"Space", "x":7, "y":4},
-                {"label":"Space", "x":10, "y":4},
-                {"label":"LANG1", "x":11, "y":4},
-                {"label":"GUI", "x":12, "y":4},
-                {"label":"Del", "x":13, "y":4},
-                {"label":"\u2190", "x":14, "y":4},
-                {"label":"\u2193", "x":15, "y":4},
-                {"label":"\u2192", "x":16, "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": [5, 0], "x": 9, "y": 0},
+                {"matrix": [5, 1], "x": 10, "y": 0},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 4], "x": 13, "y": 0},
+                {"matrix": [5, 5], "x": 14, "y": 0},
+                {"matrix": [5, 6], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+                {"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": [6, 0], "x": 9.25, "y": 1},
+                {"matrix": [6, 1], "x": 10.25, "y": 1},
+                {"matrix": [6, 2], "x": 11.25, "y": 1},
+                {"matrix": [6, 3], "x": 12.25, "y": 1},
+                {"matrix": [6, 4], "x": 13.25, "y": 1},
+                {"matrix": [6, 5], "x": 14.25, "y": 1},
+                {"matrix": [6, 6], "x": 15.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.5, "y": 2},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+                {"matrix": [2, 6], "x": 6.5, "y": 2},
+                {"matrix": [7, 0], "x": 9.5, "y": 2},
+                {"matrix": [7, 1], "x": 10.5, "y": 2},
+                {"matrix": [7, 2], "x": 11.5, "y": 2},
+                {"matrix": [7, 3], "x": 12.5, "y": 2},
+                {"matrix": [7, 4], "x": 13.5, "y": 2},
+                {"matrix": [7, 5], "x": 14.5, "y": 2},
+                {"matrix": [7, 6], "x": 15.5, "y": 2},
+
+                {"matrix": [3, 0], "x": 0.75, "y": 3},
+                {"matrix": [3, 1], "x": 1.75, "y": 3},
+                {"matrix": [3, 2], "x": 2.75, "y": 3},
+                {"matrix": [3, 3], "x": 3.75, "y": 3},
+                {"matrix": [3, 4], "x": 4.75, "y": 3},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [8, 0], "x": 9.75, "y": 3},
+                {"matrix": [8, 1], "x": 10.75, "y": 3},
+                {"matrix": [8, 2], "x": 11.75, "y": 3},
+                {"matrix": [8, 3], "x": 12.75, "y": 3},
+                {"matrix": [8, 4], "x": 13.75, "y": 3},
+                {"matrix": [8, 5], "x": 14.75, "y": 3},
+                {"matrix": [8, 6], "x": 15.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 1, "y": 4},
+                {"matrix": [4, 1], "x": 2, "y": 4},
+                {"matrix": [4, 2], "x": 3, "y": 4},
+                {"matrix": [4, 3], "x": 4, "y": 4},
+                {"matrix": [4, 4], "x": 5, "y": 4},
+                {"matrix": [4, 5], "x": 6, "y": 4},
+                {"matrix": [4, 6], "x": 7, "y": 4},
+                {"matrix": [9, 0], "x": 10, "y": 4},
+                {"matrix": [9, 1], "x": 11, "y": 4},
+                {"matrix": [9, 2], "x": 12, "y": 4},
+                {"matrix": [9, 3], "x": 13, "y": 4},
+                {"matrix": [9, 4], "x": 14, "y": 4},
+                {"matrix": [9, 5], "x": 15, "y": 4},
+                {"matrix": [9, 6], "x": 16, "y": 4}
             ]
         }
     }