Migrate some more layouts to data driven (#19889)

3 files changed, 48 insertions, 63 deletions

diff --git a/keyboards/splitish/info.json b/keyboards/splitish/info.json
index 310a31801e..067b20c8cf 100644
--- a/keyboards/splitish/info.json
+++ b/keyboards/splitish/info.json
@@ -13,57 +13,57 @@
     "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":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
+                {"x":0, "y":0, "matrix": [0, 0]},
+                {"x":1, "y":0, "matrix": [0, 1]},
+                {"x":2, "y":0, "matrix": [0, 2]},
+                {"x":3, "y":0, "matrix": [0, 3]},
+                {"x":4, "y":0, "matrix": [0, 4]},
+                {"x":5, "y":0, "matrix": [0, 5]},
+                {"x":7, "y":0, "matrix": [0, 6]},
+                {"x":8, "y":0, "matrix": [0, 7]},
+                {"x":9, "y":0, "matrix": [0, 8]},
+                {"x":10, "y":0, "matrix": [0, 9]},
+                {"x":11, "y":0, "matrix": [0, 10]},
+                {"x":12, "y":0, "matrix": [0, 11]},
 
-                {"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":7, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":1},
-                {"x":10, "y":1},
-                {"x":11, "y":1},
-                {"x":12, "y":1},
+                {"x":0, "y":1, "matrix": [1, 0]},
+                {"x":1, "y":1, "matrix": [1, 1]},
+                {"x":2, "y":1, "matrix": [1, 2]},
+                {"x":3, "y":1, "matrix": [1, 3]},
+                {"x":4, "y":1, "matrix": [1, 4]},
+                {"x":5, "y":1, "matrix": [1, 5]},
+                {"x":7, "y":1, "matrix": [1, 6]},
+                {"x":8, "y":1, "matrix": [1, 7]},
+                {"x":9, "y":1, "matrix": [1, 8]},
+                {"x":10, "y":1, "matrix": [1, 9]},
+                {"x":11, "y":1, "matrix": [1, 10]},
+                {"x":12, "y":1, "matrix": [1, 11]},
 
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":7, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
+                {"x":0, "y":2, "matrix": [2, 0]},
+                {"x":1, "y":2, "matrix": [2, 1]},
+                {"x":2, "y":2, "matrix": [2, 2]},
+                {"x":3, "y":2, "matrix": [2, 3]},
+                {"x":4, "y":2, "matrix": [2, 4]},
+                {"x":5, "y":2, "matrix": [2, 5]},
+                {"x":7, "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":0, "y":3},
-                {"x":1, "y":3},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3}
+                {"x":0, "y":3, "matrix": [3, 0]},
+                {"x":1, "y":3, "matrix": [3, 1]},
+                {"x":2, "y":3, "matrix": [3, 2]},
+                {"x":3, "y":3, "matrix": [3, 3]},
+                {"x":4, "y":3, "matrix": [3, 4]},
+                {"x":5, "y":3, "matrix": [3, 5]},
+                {"x":7, "y":3, "matrix": [3, 6]},
+                {"x":8, "y":3, "matrix": [3, 7]},
+                {"x":9, "y":3, "matrix": [3, 8]},
+                {"x":10, "y":3, "matrix": [3, 9]},
+                {"x":11, "y":3, "matrix": [3, 10]},
+                {"x":12, "y":3, "matrix": [3, 11]}
             ]
         }
     }
diff --git a/keyboards/splitish/splitish.c b/keyboards/splitish/splitish.c
deleted file mode 100644
index b831a68c64..0000000000
--- a/keyboards/splitish/splitish.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "splitish.h"
diff --git a/keyboards/splitish/splitish.h b/keyboards/splitish/splitish.h
deleted file mode 100644
index ff5a7d8412..0000000000
--- a/keyboards/splitish/splitish.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "quantum.h"
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05,    K06, K07, K08, K09, K0A, K0B, \
-    K10, K11, K12, K13, K14, K15,    K16, K17, K18, K19, K1A, K1B, \
-    K20, K21, K22, K23, K24, K25,    K26, K27, K28, K29, K2A, K2B, \
-    K30, K31, K32, K33, K34, K35,    K36, K37, K38, K39, K3A, K3B  \
-) \
-{ \
-    {K00, K01, K02, K03, K04, K05,    K06, K07, K08, K09, K0A, K0B}, \
-    {K10, K11, K12, K13, K14, K15,    K16, K17, K18, K19, K1A, K1B}, \
-    {K20, K21, K22, K23, K24, K25,    K26, K27, K28, K29, K2A, K2B}, \
-    {K30, K31, K32, K33, K34, K35,    K36, K37, K38, K39, K3A, K3B} \
-}