Move Alice and Ergodox layouts to data driven (#20340)

2 files changed, 72 insertions, 101 deletions

diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json
index edfc012c28..388ae9b860 100644
--- a/keyboards/westm/westmergo/info.json
+++ b/keyboards/westm/westmergo/info.json
@@ -18,75 +18,82 @@
     "layouts": {
         "LAYOUT_alice": {
             "layout": [
-                {"label":"K1E", "x":0, "y":0},
-                {"label":"K00", "x":1.5, "y":0},
-                {"label":"K01", "x":2.5, "y":0},
-                {"label":"K02", "x":3.5, "y":0},
-                {"label":"K03", "x":4.5, "y":0},
-                {"label":"K04", "x":5.5, "y":0},
-                {"label":"K05", "x":6.5, "y":0},
-                {"label":"K06", "x":7.5, "y":0},
-                {"label":"K07", "x":10.5, "y":0},
-                {"label":"K08", "x":11.5, "y":0},
-                {"label":"K09", "x":12.5, "y":0},
-                {"label":"K0A", "x":13.5, "y":0},
-                {"label":"K0B", "x":14.5, "y":0},
-                {"label":"K0C", "x":15.5, "y":0},
-                {"label":"K0D", "x":16.5, "y":0, "w":2},
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-                {"label":"K2E", "x":0, "y":1},
-                {"label":"K10", "x":1.5, "y":1, "w":1.5},
-                {"label":"K11", "x":3, "y":1},
-                {"label":"K12", "x":4, "y":1},
-                {"label":"K13", "x":5, "y":1},
-                {"label":"K14", "x":6, "y":1},
-                {"label":"K15", "x":7, "y":1},
-                {"label":"K16", "x":10, "y":1},
-                {"label":"K17", "x":11, "y":1},
-                {"label":"K18", "x":12, "y":1},
-                {"label":"K19", "x":13, "y":1},
-                {"label":"K1A", "x":14, "y":1},
-                {"label":"K1B", "x":15, "y":1},
-                {"label":"K1C", "x":16, "y":1},
-                {"label":"K1D", "x":17, "y":1, "w":1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "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},
 
-                {"label":"K3E", "x":0, "y":2},
-                {"label":"K20", "x":1.5, "y":2, "w":1.75},
-                {"label":"K21", "x":3.25, "y":2},
-                {"label":"K22", "x":4.25, "y":2},
-                {"label":"K23", "x":5.25, "y":2},
-                {"label":"K24", "x":6.25, "y":2},
-                {"label":"K25", "x":7.25, "y":2},
-                {"label":"K26", "x":10.25, "y":2},
-                {"label":"K27", "x":11.25, "y":2},
-                {"label":"K28", "x":12.25, "y":2},
-                {"label":"K29", "x":13.25, "y":2},
-                {"label":"K2A", "x":14.25, "y":2},
-                {"label":"K2B", "x":15.25, "y":2},
-                {"label":"K2D", "x":16.25, "y":2, "w":2.25},
+                {"matrix": [0, 8], "x": 10.5, "y": 0},
+                {"matrix": [0, 9], "x": 11.5, "y": 0},
+                {"matrix": [0, 10], "x": 12.5, "y": 0},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0, "w": 2},
 
-                {"label":"K30", "x":1.5, "y":3, "w":2.25},
-                {"label":"K32", "x":3.75, "y":3},
-                {"label":"K33", "x":4.75, "y":3},
-                {"label":"K34", "x":5.75, "y":3},
-                {"label":"K35", "x":6.75, "y":3},
-                {"label":"K36", "x":7.75, "y":3},
-                {"label":"K37", "x":9.75, "y":3},
-                {"label":"K38", "x":10.75, "y":3},
-                {"label":"K39", "x":11.75, "y":3},
-                {"label":"K3A", "x":12.75, "y":3},
-                {"label":"K3B", "x":13.75, "y":3},
-                {"label":"K3D", "x":14.75, "y":3},
-                {"label":"K3C", "x":15.75, "y":3, "w":1.75},
-                {"label":"K4D", "x":17.5, "y":3},
+                {"matrix": [1, 0], "x": 0, "y": 1},
 
-                {"label":"K40", "x":1.5, "y":4, "w":1.5},
-                {"label":"K42", "x":4.5, "y":4, "w":1.25},
-                {"label":"K44", "x":5.75, "y":4, "w":2.25},
-                {"label":"K46", "x":8, "y":4, "w":1.25},
-                {"label":"K48", "x":9.75, "y":4, "w":2.75},
-                {"label":"K4A", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4E", "x":17, "y":4, "w":1.5}
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"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": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "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": 13, "y": 1},
+                {"matrix": [1, 12], "x": 14, "y": 1},
+                {"matrix": [1, 13], "x": 15, "y": 1},
+                {"matrix": [1, 14], "x": 16, "y": 1},
+                {"matrix": [1, 15], "x": 17, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2},
+                {"matrix": [2, 3], "x": 4.25, "y": 2},
+                {"matrix": [2, 4], "x": 5.25, "y": 2},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+
+                {"matrix": [2, 8], "x": 10.25, "y": 2},
+                {"matrix": [2, 9], "x": 11.25, "y": 2},
+                {"matrix": [2, 10], "x": 12.25, "y": 2},
+                {"matrix": [2, 11], "x": 13.25, "y": 2},
+                {"matrix": [2, 12], "x": 14.25, "y": 2},
+                {"matrix": [2, 13], "x": 15.25, "y": 2},
+                {"matrix": [2, 15], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3},
+                {"matrix": [3, 3], "x": 4.75, "y": 3},
+                {"matrix": [3, 4], "x": 5.75, "y": 3},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 14], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 17.5, "y": 3},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 8, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 2.75},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 15], "x": 17, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/westm/westmergo/westmergo.h b/keyboards/westm/westmergo/westmergo.h
deleted file mode 100644
index 550773b5ac..0000000000
--- a/keyboards/westm/westmergo/westmergo.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 WestM
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_alice( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b,      k0d, k0e, k0f,\
-    k10, k11, k12, k13, k14, k15, k16,      k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
-    k20, k21, k22, k23, k24, k25, k26,      k28, k29, k2a, k2b, k2c, k2d,      k2f, \
-         k31, k32, k33, k34, k35, k36,      k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
-         k41,      k43,      k45, k46,           k49,      k4b,                k4f  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, XXX, k0d, k0e, k0f },\
-    { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
-    { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
-    { XXX, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
-    { XXX, k41, XXX, k43, XXX, k45, k46, XXX, XXX, k49, XXX, k4b, XXX, XXX, XXX, k4f },  \
-}