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

3 files changed, 125 insertions, 573 deletions

diff --git a/keyboards/handwired/jopr/info.json b/keyboards/handwired/jopr/info.json
index 0dae7b010c..efebe52d0b 100644
--- a/keyboards/handwired/jopr/info.json
+++ b/keyboards/handwired/jopr/info.json
@@ -21,554 +21,130 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {
-          "label": "MX_A0",
-          "x": 0,
-          "y": 0
-        },
-        {
-          "label": "MX_B0",
-          "x": 1.25,
-          "y": 0
-        },
-        {
-          "label": "MX_C0",
-          "x": 2.25,
-          "y": 0
-        },
-        {
-          "label": "MX_D0",
-          "x": 3.25,
-          "y": 0
-        },
-        {
-          "label": "MX_E0",
-          "x": 4.25,
-          "y": 0
-        },
-        {
-          "label": "MX_F0",
-          "x": 5.5,
-          "y": 0
-        },
-        {
-          "label": "MX_G0",
-          "x": 6.5,
-          "y": 0
-        },
-        {
-          "label": "MX_H0",
-          "x": 7.5,
-          "y": 0
-        },
-        {
-          "label": "MX_I0",
-          "x": 8.5,
-          "y": 0
-        },
-        {
-          "label": "MX_J0",
-          "x": 9.75,
-          "y": 0
-        },
-        {
-          "label": "MX_A6",
-          "x": 10.75,
-          "y": 0
-        },
-        {
-          "label": "MX_B6",
-          "x": 11.75,
-          "y": 0
-        },
-        {
-          "label": "MX_C6",
-          "x": 12.75,
-          "y": 0
-        },
-        {
-          "label": "MX_D6",
-          "x": 14,
-          "y": 0
-        },
-        {
-          "label": "MX_E6",
-          "x": 15.25,
-          "y": 0
-        },
-        {
-          "label": "MX_F6",
-          "x": 16.25,
-          "y": 0
-        },
-        {
-          "label": "MX_G6",
-          "x": 17.25,
-          "y": 0
-        },
-        {
-          "label": "MX_H6",
-          "x": 18.25,
-          "y": 0
-        },
-        {
-          "label": "MX_A1",
-          "x": 0,
-          "y": 1.25
-        },
-        {
-          "label": "MX_B1",
-          "x": 1,
-          "y": 1.25
-        },
-        {
-          "label": "MX_C1",
-          "x": 2,
-          "y": 1.25
-        },
-        {
-          "label": "MX_D1",
-          "x": 3,
-          "y": 1.25
-        },
-        {
-          "label": "MX_E1",
-          "x": 4,
-          "y": 1.25
-        },
-        {
-          "label": "MX_F1",
-          "x": 5,
-          "y": 1.25
-        },
-        {
-          "label": "MX_G1",
-          "x": 6,
-          "y": 1.25
-        },
-        {
-          "label": "MX_H1",
-          "x": 7,
-          "y": 1.25
-        },
-        {
-          "label": "MX_I1",
-          "x": 8,
-          "y": 1.25
-        },
-        {
-          "label": "MX_J1",
-          "x": 9,
-          "y": 1.25
-        },
-        {
-          "label": "MX_A7",
-          "x": 10,
-          "y": 1.25
-        },
-        {
-          "label": "MX_B7",
-          "x": 11,
-          "y": 1.25
-        },
-        {
-          "label": "MX_C7",
-          "x": 12,
-          "y": 1.25
-        },
-        {
-          "label": "MX_D7",
-          "x": 13,
-          "y": 1.25,
-          "w": 2
-        },
-        {
-          "label": "MX_E7",
-          "x": 15.25,
-          "y": 1.25
-        },
-        {
-          "label": "MX_F7",
-          "x": 16.25,
-          "y": 1.25
-        },
-        {
-          "label": "MX_G7",
-          "x": 17.25,
-          "y": 1.25
-        },
-        {
-          "label": "MX_H7",
-          "x": 18.25,
-          "y": 1.25
-        },
-        {
-          "label": "MX_A2",
-          "x": 0,
-          "y": 2.25,
-          "w": 1.5
-        },
-        {
-          "label": "MX_B2",
-          "x": 1.5,
-          "y": 2.25
-        },
-        {
-          "label": "MX_C2",
-          "x": 2.5,
-          "y": 2.25
-        },
-        {
-          "label": "MX_D2",
-          "x": 3.5,
-          "y": 2.25
-        },
-        {
-          "label": "MX_E2",
-          "x": 4.5,
-          "y": 2.25
-        },
-        {
-          "label": "MX_F2",
-          "x": 5.5,
-          "y": 2.25
-        },
-        {
-          "label": "MX_G2",
-          "x": 6.5,
-          "y": 2.25
-        },
-        {
-          "label": "MX_H2",
-          "x": 7.5,
-          "y": 2.25
-        },
-        {
-          "label": "MX_I2",
-          "x": 8.5,
-          "y": 2.25
-        },
-        {
-          "label": "MX_J2",
-          "x": 9.5,
-          "y": 2.25
-        },
-        {
-          "label": "MX_A8",
-          "x": 10.5,
-          "y": 2.25
-        },
-        {
-          "label": "MX_B8",
-          "x": 11.5,
-          "y": 2.25
-        },
-        {
-          "label": "MX_C8",
-          "x": 12.5,
-          "y": 2.25
-        },
-        {
-          "label": "MX_D8",
-          "x": 13.75,
-          "y": 2.25,
-          "w": 1.25,
-          "h": 2
-        },
-        {
-          "label": "MX_E8",
-          "x": 15.25,
-          "y": 2.25
-        },
-        {
-          "label": "MX_F8",
-          "x": 16.25,
-          "y": 2.25
-        },
-        {
-          "label": "MX_G8",
-          "x": 17.25,
-          "y": 2.25
-        },
-        {
-          "label": "MX_H8",
-          "x": 18.25,
-          "y": 2.25,
-          "h": 2
-        },
-        {
-          "label": "MX_A3",
-          "x": 0,
-          "y": 3.25,
-          "w": 1.75
-        },
-        {
-          "label": "MX_B3",
-          "x": 1.75,
-          "y": 3.25
-        },
-        {
-          "label": "MX_C3",
-          "x": 2.75,
-          "y": 3.25
-        },
-        {
-          "label": "MX_D3",
-          "x": 3.75,
-          "y": 3.25
-        },
-        {
-          "label": "MX_E3",
-          "x": 4.75,
-          "y": 3.25
-        },
-        {
-          "label": "MX_F3",
-          "x": 5.75,
-          "y": 3.25
-        },
-        {
-          "label": "MX_G3",
-          "x": 6.75,
-          "y": 3.25
-        },
-        {
-          "label": "MX_H3",
-          "x": 7.75,
-          "y": 3.25
-        },
-        {
-          "label": "MX_I3",
-          "x": 8.75,
-          "y": 3.25
-        },
-        {
-          "label": "MX_J3",
-          "x": 9.75,
-          "y": 3.25
-        },
-        {
-          "label": "MX_A9",
-          "x": 10.75,
-          "y": 3.25
-        },
-        {
-          "label": "MX_B9",
-          "x": 11.75,
-          "y": 3.25
-        },
-        {
-          "label": "MX_C9",
-          "x": 12.75,
-          "y": 3.25
-        },
-        {
-          "label": "MX_E9",
-          "x": 15.25,
-          "y": 3.25
-        },
-        {
-          "label": "MX_F9",
-          "x": 16.25,
-          "y": 3.25
-        },
-        {
-          "label": "MX_G9",
-          "x": 17.25,
-          "y": 3.25
-        },
-        {
-          "label": "MX_H9",
-          "x": 19.5,
-          "y": 3.25
-        },
-        {
-          "label": "MX_K1",
-          "x": 20.5,
-          "y": 3.25
-        },
-        {
-          "label": "MX_K0",
-          "x": 21.5,
-          "y": 3.25
-        },
-        {
-          "label": "MX_A4",
-          "x": 0,
-          "y": 4.25,
-          "w": 1.25
-        },
-        {
-          "label": "MX_B4",
-          "x": 1.25,
-          "y": 4.25
-        },
-        {
-          "label": "MX_C4",
-          "x": 2.25,
-          "y": 4.25
-        },
-        {
-          "label": "MX_D4",
-          "x": 3.25,
-          "y": 4.25
-        },
-        {
-          "label": "MX_E4",
-          "x": 4.25,
-          "y": 4.25
-        },
-        {
-          "label": "MX_F4",
-          "x": 5.25,
-          "y": 4.25
-        },
-        {
-          "label": "MX_G4",
-          "x": 6.25,
-          "y": 4.25
-        },
-        {
-          "label": "MX_H4",
-          "x": 7.25,
-          "y": 4.25
-        },
-        {
-          "label": "MX_I4",
-          "x": 8.25,
-          "y": 4.25
-        },
-        {
-          "label": "MX_J4",
-          "x": 9.25,
-          "y": 4.25
-        },
-        {
-          "label": "MX_I9",
-          "x": 10.25,
-          "y": 4.25
-        },
-        {
-          "label": "MX_I8",
-          "x": 11.25,
-          "y": 4.25
-        },
-        {
-          "label": "MX_I7",
-          "x": 12.25,
-          "y": 4.25,
-          "w": 2.75
-        },
-        {
-          "label": "MX_I6",
-          "x": 15.25,
-          "y": 4.25
-        },
-        {
-          "label": "MX_J9",
-          "x": 16.25,
-          "y": 4.25
-        },
-        {
-          "label": "MX_J8",
-          "x": 17.25,
-          "y": 4.25
-        },
-        {
-          "label": "MX_J7",
-          "x": 18.25,
-          "y": 4.25,
-          "h": 2
-        },
-        {
-          "label": "MX_J6",
-          "x": 19.5,
-          "y": 4.25
-        },
-        {
-          "label": "MX_K3",
-          "x": 20.5,
-          "y": 4.25
-        },
-        {
-          "label": "MX_K2",
-          "x": 21.5,
-          "y": 4.25
-        },
-        {
-          "label": "MX_A5",
-          "x": 0,
-          "y": 5.25,
-          "w": 1.25
-        },
-        {
-          "label": "MX_B5",
-          "x": 1.25,
-          "y": 5.25,
-          "w": 1.25
-        },
-        {
-          "label": "MX_C5",
-          "x": 2.5,
-          "y": 5.25,
-          "w": 1.25
-        },
-        {
-          "label": "MX_D5",
-          "x": 3.75,
-          "y": 5.25,
-          "w": 6.25
-        },
-        {
-          "label": "MX_J5",
-          "x": 10,
-          "y": 5.25,
-          "w": 1.25
-        },
-        {
-          "label": "MX_I5",
-          "x": 11.25,
-          "y": 5.25,
-          "w": 1.25
-        },
-        {
-          "label": "MX_K9",
-          "x": 12.5,
-          "y": 5.25,
-          "w": 1.25
-        },
-        {
-          "label": "MX_E5",
-          "x": 13.75,
-          "y": 5.25,
-          "w": 1.25
-        },
-        {
-          "label": "MX_K8",
-          "x": 15.25,
-          "y": 5.25,
-          "w": 2
-        },
-        {
-          "label": "MX_K7",
-          "x": 17.25,
-          "y": 5.25
-        },
-        {
-          "label": "MX_K6",
-          "x": 19.5,
-          "y": 5.25
-        },
-        {
-          "label": "MX_K5",
-          "x": 20.5,
-          "y": 5.25
-        },
-        {
-          "label": "MX_K4",
-          "x": 21.5,
-          "y": 5.25
-        }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 1], "x": 1.25, "y": 0},
+        {"matrix": [0, 2], "x": 2.25, "y": 0},
+        {"matrix": [0, 3], "x": 3.25, "y": 0},
+        {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+        {"matrix": [0, 5], "x": 5.5, "y": 0},
+        {"matrix": [0, 6], "x": 6.5, "y": 0},
+        {"matrix": [0, 7], "x": 7.5, "y": 0},
+        {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+        {"matrix": [0, 9], "x": 9.75, "y": 0},
+        {"matrix": [6, 0], "x": 10.75, "y": 0},
+        {"matrix": [6, 1], "x": 11.75, "y": 0},
+        {"matrix": [6, 2], "x": 12.75, "y": 0},
+
+        {"matrix": [6, 3], "x": 14, "y": 0},
+
+        {"matrix": [6, 4], "x": 15.25, "y": 0},
+        {"matrix": [6, 5], "x": 16.25, "y": 0},
+        {"matrix": [6, 6], "x": 17.25, "y": 0},
+        {"matrix": [6, 7], "x": 18.25, "y": 0},
+
+        {"matrix": [1, 0], "x": 0, "y": 1.25},
+        {"matrix": [1, 1], "x": 1, "y": 1.25},
+        {"matrix": [1, 2], "x": 2, "y": 1.25},
+        {"matrix": [1, 3], "x": 3, "y": 1.25},
+        {"matrix": [1, 4], "x": 4, "y": 1.25},
+        {"matrix": [1, 5], "x": 5, "y": 1.25},
+        {"matrix": [1, 6], "x": 6, "y": 1.25},
+        {"matrix": [1, 7], "x": 7, "y": 1.25},
+        {"matrix": [1, 8], "x": 8, "y": 1.25},
+        {"matrix": [1, 9], "x": 9, "y": 1.25},
+        {"matrix": [7, 0], "x": 10, "y": 1.25},
+        {"matrix": [7, 1], "x": 11, "y": 1.25},
+        {"matrix": [7, 2], "x": 12, "y": 1.25},
+        {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2},
+
+        {"matrix": [7, 4], "x": 15.25, "y": 1.25},
+        {"matrix": [7, 5], "x": 16.25, "y": 1.25},
+        {"matrix": [7, 6], "x": 17.25, "y": 1.25},
+        {"matrix": [7, 7], "x": 18.25, "y": 1.25},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+        {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+        {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+        {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+        {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+        {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+        {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+        {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+        {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+        {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+        {"matrix": [8, 0], "x": 10.5, "y": 2.25},
+        {"matrix": [8, 1], "x": 11.5, "y": 2.25},
+        {"matrix": [8, 2], "x": 12.5, "y": 2.25},
+        {"matrix": [8, 3], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+        {"matrix": [8, 4], "x": 15.25, "y": 2.25},
+        {"matrix": [8, 5], "x": 16.25, "y": 2.25},
+        {"matrix": [8, 6], "x": 17.25, "y": 2.25},
+        {"matrix": [8, 7], "x": 18.25, "y": 2.25, "h": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+        {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+        {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+        {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+        {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+        {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+        {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+        {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+        {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+        {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+        {"matrix": [9, 0], "x": 10.75, "y": 3.25},
+        {"matrix": [9, 1], "x": 11.75, "y": 3.25},
+        {"matrix": [9, 2], "x": 12.75, "y": 3.25},
+
+        {"matrix": [9, 4], "x": 15.25, "y": 3.25},
+        {"matrix": [9, 5], "x": 16.25, "y": 3.25},
+        {"matrix": [9, 6], "x": 17.25, "y": 3.25},
+
+        {"matrix": [9, 7], "x": 19.5, "y": 3.25},
+        {"matrix": [1, 10], "x": 20.5, "y": 3.25},
+        {"matrix": [0, 10], "x": 21.5, "y": 3.25},
+
+        {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+        {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+        {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+        {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+        {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+        {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+        {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+        {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+        {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+        {"matrix": [9, 8], "x": 10.25, "y": 4.25},
+        {"matrix": [8, 8], "x": 11.25, "y": 4.25},
+        {"matrix": [7, 8], "x": 12.25, "y": 4.25, "w": 2.75},
+
+        {"matrix": [6, 8], "x": 15.25, "y": 4.25},
+        {"matrix": [9, 9], "x": 16.25, "y": 4.25},
+        {"matrix": [8, 9], "x": 17.25, "y": 4.25},
+        {"matrix": [7, 9], "x": 18.25, "y": 4.25, "h": 2},
+
+        {"matrix": [6, 9], "x": 19.5, "y": 4.25},
+        {"matrix": [3, 10], "x": 20.5, "y": 4.25},
+        {"matrix": [2, 10], "x": 21.5, "y": 4.25},
+
+        {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+        {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 8], "x": 11.25, "y": 5.25, "w": 1.25},
+        {"matrix": [9, 10], "x": 12.5, "y": 5.25, "w": 1.25},
+        {"matrix": [5, 4], "x": 13.75, "y": 5.25, "w": 1.25},
+
+        {"matrix": [8, 10], "x": 15.25, "y": 5.25, "w": 2},
+        {"matrix": [7, 10], "x": 17.25, "y": 5.25},
+
+        {"matrix": [6, 10], "x": 19.5, "y": 5.25},
+        {"matrix": [5, 10], "x": 20.5, "y": 5.25},
+        {"matrix": [4, 10], "x": 21.5, "y": 5.25}
       ]
     }
   }
diff --git a/keyboards/handwired/jopr/jopr.c b/keyboards/handwired/jopr/jopr.c
index a337867dd1..e6d6f05dd2 100644
--- a/keyboards/handwired/jopr/jopr.c
+++ b/keyboards/handwired/jopr/jopr.c
@@ -1,4 +1,4 @@
-#include "jopr.h"
+#include "quantum.h"
 
 void led_init_ports(void) {
     setPinOutput(F0);
diff --git a/keyboards/handwired/jopr/jopr.h b/keyboards/handwired/jopr/jopr.h
deleted file mode 100644
index b79a8f2646..0000000000
--- a/keyboards/handwired/jopr/jopr.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    K000,  K001, K002, K003, K004,  K005, K006, K007, K008,  K009, K600, K601, K602,  K603,  K604, K605, K606, K607, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K700, K701, K702, K703,      K704, K705, K706, K707, \
-    K200,   K201, K202, K203, K204, K205, K206, K207, K208, K209, K800, K801, K802, K803,    K804, K805, K806, K807, \
-    K300,    K301, K302, K303, K304, K305, K306, K307, K308, K309, K900, K901, K902,         K904, K905, K906,        K907, K110, K010, \
-    K400,  K401, K402, K403, K404, K405, K406, K407, K408, K409, K908, K808, K708,           K608, K909, K809, K709,  K609, K310, K210, \
-    K500,  K501,  K502,  K503,                            K509,  K508,  K910,  K504,         K810,       K710,        K610, K510, K410 \
-) \
-{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310 }, \
-    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410 }, \
-    { K500, K501, K502, K503, K504, KC_NO, KC_NO, KC_NO, K508, K509, K510 }, \
-    { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610 }, \
-    { K700, K701, K702, K703, K704, K705, K706, K707, K708, K709, K710 }, \
-    { K800, K801, K802, K803, K804, K805, K806, K807, K808, K809, K810 }, \
-    { K900, K901, K902, KC_NO, K904, K905, K906, K907, K908, K909, K910 } \
-}