Move remaining `LAYOUT_all`s to data driven (#20463)

2 files changed, 138 insertions, 167 deletions

diff --git a/keyboards/panc40/info.json b/keyboards/panc40/info.json
index 31b9bc8093..929744e59a 100644
--- a/keyboards/panc40/info.json
+++ b/keyboards/panc40/info.json
@@ -21,143 +21,153 @@
     "layouts": {
         "LAYOUT_all": {
             "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":"K1A", "x":10.25, "y":1, "w":1.75},
-                {"label":"K20", "x":0, "y":2, "w":1.75},
-                {"label":"K21", "x":1.75, "y":2},
-                {"label":"K22", "x":2.75, "y":2},
-                {"label":"K23", "x":3.75, "y":2},
-                {"label":"K24", "x":4.75, "y":2},
-                {"label":"K25", "x":5.75, "y":2},
-                {"label":"K26", "x":6.75, "y":2},
-                {"label":"K27", "x":7.75, "y":2},
-                {"label":"K28", "x":8.75, "y":2},
-                {"label":"K29", "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":"K31", "x":1.25, "y":3, "w":1.25},
-                {"label":"K32", "x":2.5, "y":3, "w":1.25},
-                {"label":"K33", "x":3.75, "y":3},
-                {"label":"K34", "x":4.75, "y":3},
-                {"label":"K35", "x":5.75, "y":3},
-                {"label":"K36", "x":6.75, "y":3},
-                {"label":"K37", "x":7.75, "y":3},
-                {"label":"K38", "x":8.75, "y":3},
-                {"label":"K39", "x":9.75, "y":3},
-                {"label":"K3B", "x":10.75, "y":3, "w":1.25}
+                {"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, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"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": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "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, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"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": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
             ]
         },
         "LAYOUT_minorca": {
             "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":"K1A", "x":10.25, "y":1, "w":1.75},
-                {"label":"K20", "x":0, "y":2, "w":1.75},
-                {"label":"K21", "x":1.75, "y":2},
-                {"label":"K22", "x":2.75, "y":2},
-                {"label":"K23", "x":3.75, "y":2},
-                {"label":"K24", "x":4.75, "y":2},
-                {"label":"K25", "x":5.75, "y":2},
-                {"label":"K26", "x":6.75, "y":2},
-                {"label":"K27", "x":7.75, "y":2},
-                {"label":"K28", "x":8.75, "y":2},
-                {"label":"K29", "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":"K31", "x":1.25, "y":3, "w":1.25},
-                {"label":"K32", "x":2.5, "y":3, "w":1.25},
-                {"label":"K34", "x":3.75, "y":3, "w":2.25},
-                {"label":"K36", "x":6, "y":3, "w":2.25},
-                {"label":"K38", "x":8.25, "y":3, "w":1.25},
-                {"label":"K39", "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, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"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": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "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, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.25},
+                {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.25},
+                {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 9], "x": 9.5, "y": 3},
+                {"matrix": [3, 11], "x": 10.5, "y": 3, "w": 1.5}
             ]
         },
         "LAYOUT_sebright": {
             "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":"K1A", "x":10.25, "y":1, "w":1.75},
-                {"label":"K20", "x":0, "y":2, "w":1.75},
-                {"label":"K21", "x":1.75, "y":2},
-                {"label":"K22", "x":2.75, "y":2},
-                {"label":"K23", "x":3.75, "y":2},
-                {"label":"K24", "x":4.75, "y":2},
-                {"label":"K25", "x":5.75, "y":2},
-                {"label":"K26", "x":6.75, "y":2},
-                {"label":"K27", "x":7.75, "y":2},
-                {"label":"K28", "x":8.75, "y":2},
-                {"label":"K29", "x":9.75, "y":2},
-                {"label":"K2B", "x":10.75, "y":2, "w":1.25},
-                {"label":"K31", "x":1.25, "y":3, "w":1.25},
-                {"label":"K32", "x":2.5, "y":3, "w":1.25},
-                {"label":"K33", "x":3.75, "y":3, "w":1.25},
-                {"label":"K35", "x":5, "y":3, "w":2.75},
-                {"label":"K37", "x":7.75, "y":3},
-                {"label":"K38", "x":8.75, "y":3},
-                {"label":"K39", "x":9.75, "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": [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, 10], "x": 10.25, "y": 1, "w": 1.75},
+
+                {"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": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2.75},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3}
             ]
         }
     }
+
 }
diff --git a/keyboards/panc40/panc40.h b/keyboards/panc40/panc40.h
deleted file mode 100644
index f1e317d494..0000000000
--- a/keyboards/panc40/panc40.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,      \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,      K2B, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39,      K3B  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A,   K0B   }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,   KC_NO }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, KC_NO, K2B   }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, KC_NO, K3B   }  \
-}
-
-#define LAYOUT_minorca( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,      \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,      K2B, \
-	K30, K31, K32,      K34,      K36,      K38, K39,      K3B  \
-) { \
-    { K00, K01, K02, K03,   K04, K05,   K06, K07,   K08, K09, K0A,   K0B   }, \
-    { K10, K11, K12, K13,   K14, K15,   K16, K17,   K18, K19, K1A,   KC_NO }, \
-    { K20, K21, K22, K23,   K24, K25,   K26, K27,   K28, K29, KC_NO, K2B   }, \
-    { K30, K31, K32, KC_NO, K34, KC_NO, K36, KC_NO, K38, K39, KC_NO, K3B   }  \
-}
-
-#define LAYOUT_sebright( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,      \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,      K2B, \
-	     K31, K32, K33,      K35,      K37, K38, K39            \
-) { \
-    { K00,   K01, K02, K03, K04,   K05, K06,   K07, K08, K09, K0A,   K0B   }, \
-    { K10,   K11, K12, K13, K14,   K15, K16,   K17, K18, K19, K1A,   KC_NO }, \
-    { K20,   K21, K22, K23, K24,   K25, K26,   K27, K28, K29, KC_NO, K2B   }, \
-    { KC_NO, K31, K32, K33, KC_NO, K35, KC_NO, K37, K38, K39, KC_NO, KC_NO }  \
-}