Move remaining `LAYOUT`s to data driven (#20422)

2 files changed, 83 insertions, 126 deletions

diff --git a/keyboards/handwired/ms_sculpt_mobile/info.json b/keyboards/handwired/ms_sculpt_mobile/info.json
index a66f43fadc..8ef1cb0a84 100644
--- a/keyboards/handwired/ms_sculpt_mobile/info.json
+++ b/keyboards/handwired/ms_sculpt_mobile/info.json
@@ -10,94 +10,94 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
-                {"x": 15, "y": 0},
+                {"matrix": [7, 16], "x": 0, "y": 0},
+                {"matrix": [6, 14], "x": 1, "y": 0},
+                {"matrix": [6, 15], "x": 2, "y": 0},
+                {"matrix": [6, 16], "x": 3, "y": 0},
+                {"matrix": [5, 14], "x": 4, "y": 0},
+                {"matrix": [5, 15], "x": 5, "y": 0},
+                {"matrix": [5, 16], "x": 6, "y": 0},
+                {"matrix": [7, 0], "x": 7, "y": 0},
+                {"matrix": [7, 1], "x": 8, "y": 0},
+                {"matrix": [7, 2], "x": 9, "y": 0},
+                {"matrix": [7, 3], "x": 10, "y": 0},
+                {"matrix": [7, 4], "x": 11, "y": 0},
+                {"matrix": [7, 5], "x": 12, "y": 0},
+                {"matrix": [1, 14], "x": 13, "y": 0},
+                {"matrix": [1, 10], "x": 14, "y": 0},
+                {"matrix": [1, 11], "x": 15, "y": 0},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-                {"x": 13, "y": 1, "w": 2},
-                {"x": 15, "y": 1, "h": 1.6},
+                {"matrix": [5, 0], "x": 0, "y": 1},
+                {"matrix": [5, 10], "x": 1, "y": 1},
+                {"matrix": [5, 11], "x": 2, "y": 1},
+                {"matrix": [5, 12], "x": 3, "y": 1},
+                {"matrix": [5, 13], "x": 4, "y": 1},
+                {"matrix": [5, 7], "x": 5, "y": 1},
+                {"matrix": [5, 8], "x": 6, "y": 1},
+                {"matrix": [2, 0], "x": 7, "y": 1},
+                {"matrix": [2, 1], "x": 8, "y": 1},
+                {"matrix": [2, 2], "x": 9, "y": 1},
+                {"matrix": [2, 3], "x": 10, "y": 1},
+                {"matrix": [5, 1], "x": 11, "y": 1},
+                {"matrix": [5, 2], "x": 12, "y": 1},
+                {"matrix": [5, 9], "x": 13, "y": 1, "w": 2},
+                {"matrix": [2, 4], "x": 15, "y": 1, "h": 1.6},
 
-                {"x": 0, "y": 2, "w": 1.5},
-                {"x": 1.5, "y": 2},
-                {"x": 2.5, "y": 2},
-                {"x": 3.5, "y": 2},
-                {"x": 4.5, "y": 2},
-                {"x": 5.5, "y": 2},
-                {"x": 6.5, "y": 2},
-                {"x": 7.5, "y": 2},
-                {"x": 8.5, "y": 2},
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2},
-                {"x": 13.5, "y": 2, "w": 1.5},
+                {"matrix": [6, 17], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [6, 3], "x": 1.5, "y": 2},
+                {"matrix": [6, 4], "x": 2.5, "y": 2},
+                {"matrix": [6, 5], "x": 3.5, "y": 2},
+                {"matrix": [7, 8], "x": 4.5, "y": 2},
+                {"matrix": [7, 9], "x": 5.5, "y": 2},
+                {"matrix": [4, 0], "x": 6.5, "y": 2},
+                {"matrix": [4, 1], "x": 7.5, "y": 2},
+                {"matrix": [4, 2], "x": 8.5, "y": 2},
+                {"matrix": [4, 3], "x": 9.5, "y": 2},
+                {"matrix": [3, 0], "x": 10.5, "y": 2},
+                {"matrix": [3, 1], "x": 11.5, "y": 2},
+                {"matrix": [3, 2], "x": 12.5, "y": 2},
+                {"matrix": [3, 3], "x": 13.5, "y": 2, "w": 1.5},
 
-                {"x": 0, "y": 3, "w": 1.75},
-                {"x": 1.75, "y": 3},
-                {"x": 2.75, "y": 3},
-                {"x": 3.75, "y": 3},
-                {"x": 4.75, "y": 3},
-                {"x": 5.75, "y": 3},
-                {"x": 6.75, "y": 3},
-                {"x": 7.75, "y": 3},
-                {"x": 8.75, "y": 3},
-                {"x": 9.75, "y": 3},
-                {"x": 10.75, "y": 3},
-                {"x": 11.75, "y": 3},
-                {"x": 12.75, "y": 3, "w": 2.25},
-                {"x": 15, "y": 2.6, "h": 1.2},
+                {"matrix": [0, 9], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [6, 0], "x": 1.75, "y": 3},
+                {"matrix": [6, 1], "x": 2.75, "y": 3},
+                {"matrix": [6, 2], "x": 3.75, "y": 3},
+                {"matrix": [7, 7], "x": 4.75, "y": 3},
+                {"matrix": [1, 0], "x": 5.75, "y": 3},
+                {"matrix": [1, 1], "x": 6.75, "y": 3},
+                {"matrix": [5, 3], "x": 7.75, "y": 3},
+                {"matrix": [5, 4], "x": 8.75, "y": 3},
+                {"matrix": [5, 5], "x": 9.75, "y": 3},
+                {"matrix": [5, 6], "x": 10.75, "y": 3},
+                {"matrix": [1, 2], "x": 11.75, "y": 3},
+                {"matrix": [7, 15], "x": 12.75, "y": 3, "w": 2.25},
+                {"matrix": [2, 6], "x": 15, "y": 2.6, "h": 1.2},
 
-                {"x": 0, "y": 4, "w": 2.25},
-                {"x": 2.25, "y": 4},
-                {"x": 3.25, "y": 4},
-                {"x": 4.25, "y": 4},
-                {"x": 5.25, "y": 4},
-                {"x": 6.25, "y": 4},
-                {"x": 7.25, "y": 4},
-                {"x": 8.25, "y": 4},
-                {"x": 9.25, "y": 4},
-                {"x": 10.25, "y": 4},
-                {"x": 11.25, "y": 4},
-                {"x": 12.25, "y": 4, "w": 1.75},
-                {"x": 14, "y": 4},
-                {"x": 15, "y": 3.8, "h": 1.2},
+                {"matrix": [2, 15], "x": 0, "y": 4, "w": 2.25},
+                {"matrix": [7, 10], "x": 2.25, "y": 4},
+                {"matrix": [7, 11], "x": 3.25, "y": 4},
+                {"matrix": [7, 12], "x": 4.25, "y": 4},
+                {"matrix": [7, 14], "x": 5.25, "y": 4},
+                {"matrix": [0, 0], "x": 6.25, "y": 4},
+                {"matrix": [0, 1], "x": 7.25, "y": 4},
+                {"matrix": [0, 2], "x": 8.25, "y": 4},
+                {"matrix": [0, 3], "x": 9.25, "y": 4},
+                {"matrix": [0, 4], "x": 10.25, "y": 4},
+                {"matrix": [0, 5], "x": 11.25, "y": 4},
+                {"matrix": [2, 11], "x": 12.25, "y": 4, "w": 1.75},
+                {"matrix": [6, 6], "x": 14, "y": 4},
+                {"matrix": [1, 15], "x": 15, "y": 3.8, "h": 1.2},
 
-                {"x": 0, "y": 5, "w": 1.25},
-                {"x": 1.25, "y": 5, "w": 1.25},
-                {"x": 2.5, "y": 5, "w": 1.25},
-                {"x": 3.75, "y": 5, "w": 5.5},
-                {"x": 9.25, "y": 5, "w": 1.25},
-                {"x": 10.5, "y": 5, "w": 1.25},
-                {"x": 11.75, "y": 5, "w": 1.25},
-                {"x": 13, "y": 5},
-                {"x": 14, "y": 5},
-                {"x": 15, "y": 5}
+                {"matrix": [1, 16], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [4, 13], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [3, 14], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [6, 13], "x": 3.75, "y": 5, "w": 5.5},
+                {"matrix": [3, 10], "x": 9.25, "y": 5, "w": 1.25},
+                {"matrix": [0, 17], "x": 10.5, "y": 5, "w": 1.25},
+                {"matrix": [1, 12], "x": 11.75, "y": 5, "w": 1.25},
+                {"matrix": [6, 7], "x": 13, "y": 5},
+                {"matrix": [6, 8], "x": 14, "y": 5},
+                {"matrix": [6, 9], "x": 15, "y": 5}
             ]
         }
     }
diff --git a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h b/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h
deleted file mode 100644
index 64d4f7bbc4..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    k7G, k6E, k6F, k6G, k5E, k5F, k5G, k70, k71, k72, k73, k74, k75, k1E, k1A, k1B, \
-    k50, k5A, k5B, k5C, k5D, k57, k58, k20, k21, k22, k23, k51, k52, k59, k24, \
-    k6H, k63, k64, k65, k78, k79, k40, k41, k42, k43, k30, k31, k32, k33, \
-    k09, k60, k61, k62, k77, k10, k11, k53, k54, k55, k56, k12, k7F, k26, \
-    k2F, k7A, k7B, k7C, k7E, k00, k01, k02, k03, k04, k05, k2B, k66, k1F, \
-    k1G, k4D, k3E, k6D, k3A, k0H, k1C, k67, k68, k69 \
-) { \
-    { k00, k01, k02, k03, k04, k05, XXX, XXX, XXX, k09, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k0H }, \
-    { k10, k11, k12, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k1A, k1B, k1C, XXX, k1E, k1F, k1G, XXX }, \
-    { k20, k21, k22, k23, k24, XXX, k26, XXX, XXX, XXX, XXX, k2B, XXX, XXX, XXX, k2F, XXX, XXX }, \
-    { k30, k31, k32, k33, XXX, XXX, XXX, XXX, XXX, XXX, k3A, XXX, XXX, XXX, k3E, XXX, XXX, XXX }, \
-    { k40, k41, k42, k43, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k4D, XXX, XXX, XXX, XXX }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, XXX }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, XXX, XXX, XXX, k6D, k6E, k6F, k6G, k6H }, \
-    { k70, k71, k72, k73, k74, k75, XXX, k77, k78, k79, k7A, k7B, k7C, XXX, k7E, k7F, k7G, XXX } \
-}
-
-#define MATRIX_TESTING_LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, \
-    k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H, \
-    k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H, \
-    k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H } \
-}