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

2 files changed, 79 insertions, 117 deletions

diff --git a/keyboards/tgr/alice/alice.h b/keyboards/tgr/alice/alice.h
deleted file mode 100644
index 8525fd85f7..0000000000
--- a/keyboards/tgr/alice/alice.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2019 Felipe Coury <felipe.coury@gmail.com>
-
-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"
-
-/* Layout
- * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
- * │50 │ │00 │01 │02 │03 │04 │05 │06 │         │07 │08 │09 │0A │0B │0C │0D │0E │
- * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
- * │51 │ │10   │11 │12 │13 │14 │15 │         │16 │17 │18 │19 │1A │1B │1C │1D   │
- * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │52 │ │20    │21 │22 │23 │24 │25 │         │26 │27 │28 │29 │2A │2B │2C      │
- * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
- *       │30      │31 │32 │33 │34 │35 │     │36 │37 │38 │39 │4A │4B │4C    │4D │
- *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
- *       │40   │     │41   │42     │43  │   │46        │47   │           │48   │
- *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
- */
-#define LAYOUT_alice_split_bs( \
-  K50,   K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-  K51,   K10, K11, K12, K13, K14, K15,      K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
-  K52,   K20, K21, K22, K23, K24, K25,      K26, K27, K28, K29, K2A, K2B,      K2C,      \
-         K30, K31, K32, K33, K34, K35,      K36, K37, K38, K39, K4A, K4B, K4C, K4D,      \
-         K40,      K41,      K42, K43,           K46,      K47,                K48       \
-) \
-{ \
-  { K00  , K01  , K02  , K03  , K04  , K05  , K06  , K07  , K08  , K09  , K0A  , K0B  , K0C  , K0D  , K0E   }, \
-  { K10  , K11  , K12  , K13  , K14  , K15  , K16  , K17  , K18  , K19  , K1A  , K1B  , K1C  , K1D  , KC_NO }, \
-  { K20  , K21  , K22  , K23  , K24  , K25  , K26  , K27  , K28  , K29  , K2A  , K2B  , K2C  , KC_NO, KC_NO }, \
-  { K30  , K31  , K32  , K33  , K34  , K35  , K36  , K37  , K38  , K39  , K4A  , K4B  , K4C  , K4D  , KC_NO }, \
-  { K40  , K41  , K42  , K43  , KC_NO, KC_NO, K46  , K47  , K48  , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-  { K50  , K51  , K52  , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
-
-#define LAYOUT LAYOUT_alice_split_bs
diff --git a/keyboards/tgr/alice/info.json b/keyboards/tgr/alice/info.json
index 250cae069c..7d6a0fbc14 100644
--- a/keyboards/tgr/alice/info.json
+++ b/keyboards/tgr/alice/info.json
@@ -27,75 +27,88 @@
   "processor": "atmega32a",
   "bootloader": "bootloadhid",
   "community_layouts": ["alice_split_bs"],
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_alice_split_bs"
+  },
   "layouts": {
     "LAYOUT_alice_split_bs": {
       "layout": [
-        {"label":"K63", "x":0, "y":0},
-        {"label":"K00", "x":1.25, "y":0},
-        {"label":"K01", "x":2.25, "y":0},
-        {"label":"K02", "x":3.25, "y":0},
-        {"label":"K03", "x":4.25, "y":0},
-        {"label":"K04", "x":5.25, "y":0},
-        {"label":"K05", "x":6.25, "y":0},
-        {"label":"K06", "x":7.25, "y":0},
-        {"label":"K07", "x":10.25, "y":0},
-        {"label":"K08", "x":11.25, "y":0},
-        {"label":"K09", "x":12.25, "y":0},
-        {"label":"K10", "x":13.25, "y":0},
-        {"label":"K11", "x":14.25, "y":0},
-        {"label":"K12", "x":15.25, "y":0},
-        {"label":"K13", "x":16.25, "y":0},
-        {"label":"K14", "x":17.25, "y":0},
-        {"label":"K64", "x":0, "y":1},
-        {"label":"K15", "x":1.25, "y":1, "w":1.5},
-        {"label":"K16", "x":2.75, "y":1},
-        {"label":"K17", "x":3.75, "y":1},
-        {"label":"K18", "x":4.75, "y":1},
-        {"label":"K19", "x":5.75, "y":1},
-        {"label":"K20", "x":6.75, "y":1},
-        {"label":"K21", "x":9.75, "y":1},
-        {"label":"K22", "x":10.75, "y":1},
-        {"label":"K23", "x":11.75, "y":1},
-        {"label":"K24", "x":12.75, "y":1},
-        {"label":"K25", "x":13.75, "y":1},
-        {"label":"K26", "x":14.75, "y":1},
-        {"label":"K27", "x":15.75, "y":1},
-        {"label":"K28", "x":16.75, "y":1, "w":1.5},
-        {"label":"K65", "x":0, "y":2},
-        {"label":"K29", "x":1.25, "y":2, "w":1.75},
-        {"label":"K30", "x":3, "y":2},
-        {"label":"K31", "x":4, "y":2},
-        {"label":"K32", "x":5, "y":2},
-        {"label":"K33", "x":6, "y":2},
-        {"label":"K34", "x":7, "y":2},
-        {"label":"K35", "x":10, "y":2},
-        {"label":"K36", "x":11, "y":2},
-        {"label":"K37", "x":12, "y":2},
-        {"label":"K38", "x":13, "y":2},
-        {"label":"K39", "x":14, "y":2},
-        {"label":"K40", "x":15, "y":2},
-        {"label":"K41", "x":16, "y":2, "w":2.25},
-        {"label":"K42", "x":1.25, "y":3, "w":2.25},
-        {"label":"K43", "x":3.5, "y":3},
-        {"label":"K44", "x":4.5, "y":3},
-        {"label":"K45", "x":5.5, "y":3},
-        {"label":"K46", "x":6.5, "y":3},
-        {"label":"K47", "x":7.5, "y":3},
-        {"label":"K48", "x":9.5, "y":3},
-        {"label":"K49", "x":10.5, "y":3},
-        {"label":"K50", "x":11.5, "y":3},
-        {"label":"K51", "x":12.5, "y":3},
-        {"label":"K52", "x":13.5, "y":3},
-        {"label":"K53", "x":14.5, "y":3},
-        {"label":"K54", "x":15.5, "y":3, "w":1.75},
-        {"label":"K55", "x":17.25, "y":3},
-        {"label":"K56", "x":1.25, "y":4, "w":1.5},
-        {"label":"K57", "x":4.25, "y":4, "w":1.5},
-        {"label":"K58", "x":5.75, "y":4, "w":2},
-        {"label":"K59", "x":7.75, "y":4, "w":1.25},
-        {"label":"K60", "x":9.5, "y":4, "w":2.75},
-        {"label":"K61", "x":12.25, "y":4, "w":1.5},
-        {"label":"K62", "x":16.75, "y":4, "w":1.5}
+        {"matrix": [5, 0], "x": 0, "y": 0},
+
+        {"matrix": [0, 0], "x": 1.25, "y": 0},
+        {"matrix": [0, 1], "x": 2.25, "y": 0},
+        {"matrix": [0, 2], "x": 3.25, "y": 0},
+        {"matrix": [0, 3], "x": 4.25, "y": 0},
+        {"matrix": [0, 4], "x": 5.25, "y": 0},
+        {"matrix": [0, 5], "x": 6.25, "y": 0},
+        {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+        {"matrix": [0, 7], "x": 10.25, "y": 0},
+        {"matrix": [0, 8], "x": 11.25, "y": 0},
+        {"matrix": [0, 9], "x": 12.25, "y": 0},
+        {"matrix": [0, 10], "x": 13.25, "y": 0},
+        {"matrix": [0, 11], "x": 14.25, "y": 0},
+        {"matrix": [0, 12], "x": 15.25, "y": 0},
+        {"matrix": [0, 13], "x": 16.25, "y": 0},
+        {"matrix": [0, 14], "x": 17.25, "y": 0},
+
+        {"matrix": [5, 1], "x": 0, "y": 1},
+
+        {"matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [1, 1], "x": 2.75, "y": 1},
+        {"matrix": [1, 2], "x": 3.75, "y": 1},
+        {"matrix": [1, 3], "x": 4.75, "y": 1},
+        {"matrix": [1, 4], "x": 5.75, "y": 1},
+        {"matrix": [1, 5], "x": 6.75, "y": 1},
+
+        {"matrix": [1, 6], "x": 9.75, "y": 1},
+        {"matrix": [1, 7], "x": 10.75, "y": 1},
+        {"matrix": [1, 8], "x": 11.75, "y": 1},
+        {"matrix": [1, 9], "x": 12.75, "y": 1},
+        {"matrix": [1, 10], "x": 13.75, "y": 1},
+        {"matrix": [1, 11], "x": 14.75, "y": 1},
+        {"matrix": [1, 12], "x": 15.75, "y": 1},
+        {"matrix": [1, 13], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [5, 2], "x": 0, "y": 2},
+        {"matrix": [2, 0], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 3, "y": 2},
+        {"matrix": [2, 2], "x": 4, "y": 2},
+        {"matrix": [2, 3], "x": 5, "y": 2},
+        {"matrix": [2, 4], "x": 6, "y": 2},
+        {"matrix": [2, 5], "x": 7, "y": 2},
+
+        {"matrix": [2, 6], "x": 10, "y": 2},
+        {"matrix": [2, 7], "x": 11, "y": 2},
+        {"matrix": [2, 8], "x": 12, "y": 2},
+        {"matrix": [2, 9], "x": 13, "y": 2},
+        {"matrix": [2, 10], "x": 14, "y": 2},
+        {"matrix": [2, 11], "x": 15, "y": 2},
+        {"matrix": [2, 12], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [3, 1], "x": 3.5, "y": 3},
+        {"matrix": [3, 2], "x": 4.5, "y": 3},
+        {"matrix": [3, 3], "x": 5.5, "y": 3},
+        {"matrix": [3, 4], "x": 6.5, "y": 3},
+        {"matrix": [3, 5], "x": 7.5, "y": 3},
+
+        {"matrix": [3, 6], "x": 9.5, "y": 3},
+        {"matrix": [3, 7], "x": 10.5, "y": 3},
+        {"matrix": [3, 8], "x": 11.5, "y": 3},
+        {"matrix": [3, 9], "x": 12.5, "y": 3},
+        {"matrix": [3, 10], "x": 13.5, "y": 3},
+        {"matrix": [3, 11], "x": 14.5, "y": 3},
+        {"matrix": [3, 12], "x": 15.5, "y": 3, "w": 1.75},
+        {"matrix": [3, 13], "x": 17.25, "y": 3},
+
+        {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 1], "x": 4.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 2], "x": 5.75, "y": 4, "w": 2},
+        {"matrix": [4, 3], "x": 7.75, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 9.5, "y": 4, "w": 2.75},
+        {"matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 8], "x": 16.75, "y": 4, "w": 1.5}
       ]
     }
   }