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

2 files changed, 142 insertions, 114 deletions

diff --git a/keyboards/nasu/info.json b/keyboards/nasu/info.json
index 04637a3438..1765cab0be 100644
--- a/keyboards/nasu/info.json
+++ b/keyboards/nasu/info.json
@@ -25,78 +25,154 @@
     "bootloader": "stm32-dfu",
     "community_layouts": ["alice", "alice_split_bs"],
     "layouts": {
+        "LAYOUT_alice": {
+            "layout": [
+                {"matrix": [1, 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": 6, "y": 0},
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+                {"matrix": [2, 0], "x": 15, "y": 0},
+                {"matrix": [1, 1], "x": 16, "y": 0},
+                {"matrix": [1, 2], "x": 17, "y": 0},
+                {"matrix": [1, 3], "x": 18, "y": 0},
+                {"matrix": [1, 4], "x": 19, "y": 0},
+                {"matrix": [1, 5], "x": 20, "y": 0},
+                {"matrix": [1, 6], "x": 21, "y": 0},
+                {"matrix": [1, 7], "x": 22, "y": 0},
+                {"matrix": [1, 8], "x": 23, "y": 0},
+                {"matrix": [1, 9], "x": 24, "y": 0},
+                {"matrix": [1, 10], "x": 25, "y": 0},
+                {"matrix": [1, 11], "x": 26, "y": 0},
+                {"matrix": [1, 12], "x": 27, "y": 0},
+                {"matrix": [1, 13], "x": 28, "y": 0},
+                {"matrix": [1, 14], "x": 29, "y": 0},
+                {"matrix": [3, 0], "x": 30, "y": 0},
+                {"matrix": [2, 1], "x": 31, "y": 0},
+                {"matrix": [2, 2], "x": 32, "y": 0},
+                {"matrix": [2, 3], "x": 33, "y": 0},
+                {"matrix": [2, 4], "x": 34, "y": 0},
+                {"matrix": [2, 5], "x": 35, "y": 0},
+                {"matrix": [2, 6], "x": 36, "y": 0},
+                {"matrix": [2, 7], "x": 37, "y": 0},
+                {"matrix": [2, 8], "x": 38, "y": 0},
+                {"matrix": [2, 9], "x": 39, "y": 0},
+                {"matrix": [2, 10], "x": 40, "y": 0},
+                {"matrix": [2, 11], "x": 41, "y": 0},
+                {"matrix": [2, 12], "x": 42, "y": 0},
+                {"matrix": [2, 14], "x": 43, "y": 0},
+                {"matrix": [3, 1], "x": 44, "y": 0},
+                {"matrix": [3, 2], "x": 45, "y": 0},
+                {"matrix": [3, 3], "x": 46, "y": 0},
+                {"matrix": [3, 4], "x": 47, "y": 0},
+                {"matrix": [3, 5], "x": 48, "y": 0},
+                {"matrix": [3, 6], "x": 49, "y": 0},
+                {"matrix": [3, 7], "x": 50, "y": 0},
+                {"matrix": [3, 8], "x": 51, "y": 0},
+                {"matrix": [3, 9], "x": 52, "y": 0},
+                {"matrix": [3, 10], "x": 53, "y": 0},
+                {"matrix": [3, 11], "x": 54, "y": 0},
+                {"matrix": [3, 12], "x": 55, "y": 0},
+                {"matrix": [3, 13], "x": 56, "y": 0},
+                {"matrix": [3, 14], "x": 57, "y": 0},
+                {"matrix": [4, 1], "x": 58, "y": 0},
+                {"matrix": [4, 3], "x": 59, "y": 0},
+                {"matrix": [4, 5], "x": 60, "y": 0},
+                {"matrix": [4, 6], "x": 61, "y": 0},
+                {"matrix": [4, 8], "x": 62, "y": 0},
+                {"matrix": [4, 10], "x": 63, "y": 0},
+                {"matrix": [4, 14], "x": 64, "y": 0}
+            ]
+        },
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1.25, "y":0},
-                {"x":2.25, "y":0},
-                {"x":3.25, "y":0},
-                {"x":4.25, "y":0},
-                {"x":5.25, "y":0},
-                {"x":6.25, "y":0},
-                {"x":7.25, "y":0},
-                {"x":10.25, "y":0},
-                {"x":11.25, "y":0},
-                {"x":12.25, "y":0},
-                {"x":13.25, "y":0},
-                {"x":14.25, "y":0},
-                {"x":15.25, "y":0},
-                {"x":16.25, "y":0},
-                {"x":17.25, "y":0},
+                {"matrix": [1, 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": [2, 0], "x": 0, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 2.75, "y": 1},
+                {"matrix": [1, 3], "x": 3.75, "y": 1},
+                {"matrix": [1, 4], "x": 4.75, "y": 1},
+                {"matrix": [1, 5], "x": 5.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+
+                {"matrix": [1, 7], "x": 9.75, "y": 1},
+                {"matrix": [1, 8], "x": 10.75, "y": 1},
+                {"matrix": [1, 9], "x": 11.75, "y": 1},
+                {"matrix": [1, 10], "x": 12.75, "y": 1},
+                {"matrix": [1, 11], "x": 13.75, "y": 1},
+                {"matrix": [1, 12], "x": 14.75, "y": 1},
+                {"matrix": [1, 13], "x": 15.75, "y": 1},
+                {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
+                {"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": 6, "y": 2},
+                {"matrix": [2, 6], "x": 7, "y": 2},
 
-                {"x":0, "y":1},
-                {"x":1.25, "y":1, "w":1.5},
-                {"x":2.75, "y":1},
-                {"x":3.75, "y":1},
-                {"x":4.75, "y":1},
-                {"x":5.75, "y":1},
-                {"x":6.75, "y":1},
-                {"x":9.75, "y":1},
-                {"x":10.75, "y":1},
-                {"x":11.75, "y":1},
-                {"x":12.75, "y":1},
-                {"x":13.75, "y":1},
-                {"x":14.75, "y":1},
-                {"x":15.75, "y":1},
-                {"x":16.75, "y":1, "w":1.5},
+                {"matrix": [2, 7], "x": 10, "y": 2},
+                {"matrix": [2, 8], "x": 11, "y": 2},
+                {"matrix": [2, 9], "x": 12, "y": 2},
+                {"matrix": [2, 10], "x": 13, "y": 2},
+                {"matrix": [2, 11], "x": 14, "y": 2},
+                {"matrix": [2, 12], "x": 15, "y": 2},
+                {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25},
 
-                {"x":0, "y":2},
-                {"x":1.25, "y":2, "w":1.75},
-                {"x":3, "y":2},
-                {"x":4, "y":2},
-                {"x":5, "y":2},
-                {"x":6, "y":2},
-                {"x":7, "y":2},
-                {"x":10, "y":2},
-                {"x":11, "y":2},
-                {"x":12, "y":2},
-                {"x":13, "y":2},
-                {"x":14, "y":2},
-                {"x":15, "y":2},
-                {"x":16, "y":2, "w":2.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 6.5, "y": 3},
+                {"matrix": [3, 6], "x": 7.5, "y": 3},
 
-                {"x":1.25, "y":3, "w":2.25},
-                {"x":3.5, "y":3},
-                {"x":4.5, "y":3},
-                {"x":5.5, "y":3},
-                {"x":6.5, "y":3},
-                {"x":7.5, "y":3},
-                {"x":9.5, "y":3},
-                {"x":10.5, "y":3},
-                {"x":11.5, "y":3},
-                {"x":12.5, "y":3},
-                {"x":13.5, "y":3},
-                {"x":14.5, "y":3},
-                {"x":15.5, "y":3, "w":1.75},
-                {"x":17.25, "y":3},
+                {"matrix": [3, 7], "x": 9.5, "y": 3},
+                {"matrix": [3, 8], "x": 10.5, "y": 3},
+                {"matrix": [3, 9], "x": 11.5, "y": 3},
+                {"matrix": [3, 10], "x": 12.5, "y": 3},
+                {"matrix": [3, 11], "x": 13.5, "y": 3},
+                {"matrix": [3, 12], "x": 14.5, "y": 3},
+                {"matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3},
 
-                {"x":1.25, "y":4, "w":1.5},
-                {"x":4.25, "y":4, "w":1.5},
-                {"x":5.75, "y":4, "w":2},
-                {"x":7.75, "y":4, "w":1.25},
-                {"x":9.5, "y":4, "w":2.75},
-                {"x":12.25, "y":4, "w":1.5},
-                {"x":16.75, "y":4, "w":1.5}
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2},
+                {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/nasu/nasu.h b/keyboards/nasu/nasu.h
deleted file mode 100644
index 41bd1212f6..0000000000
--- a/keyboards/nasu/nasu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2021 Yiancar-Designs
- *
- * 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
-
-#define XXX KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_alice_split_bs( \
-    K10, K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K20, K11, K12, K13, K14, K15, K16,      K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      \
-    K30, K21, K22, K23, K24, K25, K26,      K27, K28, K29, K2A, K2B, K2C,      K2E,      \
-         K31, K32, K33, K34, K35, K36,      K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
-         K41,      K43,      K45, K46,           K48,      K4A,                K4E       \
-) { \
-    { 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, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E }  \
-}
-
-#define LAYOUT_alice( \
-    K10, K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K20, K11, K12, K13, K14, K15, K16,      K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      \
-    K30, K21, K22, K23, K24, K25, K26,      K27, K28, K29, K2A, K2B, K2C,      K2E,      \
-         K31, K32, K33, K34, K35, K36,      K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
-         K41,      K43,      K45, K46,           K48,      K4A,                K4E       \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E }  \
-}