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

3 files changed, 157 insertions, 187 deletions

diff --git a/keyboards/edda/edda.c b/keyboards/edda/edda.c
index a04f3cc4c1..38d1d5ddab 100644
--- a/keyboards/edda/edda.c
+++ b/keyboards/edda/edda.c
@@ -11,7 +11,7 @@ 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/>.
 */
-#include "edda.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
   // Call the keyboard pre init code.
diff --git a/keyboards/edda/edda.h b/keyboards/edda/edda.h
deleted file mode 100644
index d15606b2c2..0000000000
--- a/keyboards/edda/edda.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright 2021 Martin Arnstad
-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 KNO KC_NO
-#define LAYOUT_default LAYOUT_alice_split_bs
-
-#define LAYOUT_alice_split_bs( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, 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, K44,      K46,           K49,      K4B,                K4F \
-) { \
-  {  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F  }, \
-  {  K10, K11, K12, K13, K14, K15, K16, KNO, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F  }, \
-  {  K20, K21, K22, K23, K24, K25, K26, KNO, K28, K29, K2A, K2B, K2C, K2D, KNO, K2F  }, \
-  {  KNO, K31, K32, K33, K34, K35, K36, KNO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F  }, \
-  {  KNO, K41, KNO, K43, K44, KNO, K46, KNO, KNO, K49, KNO, K4B, KNO, KNO, KNO, K4F  }  \
-}
-
-#define LAYOUT_alice( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      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, K44,      K46,           K49,      K4B,                K4F \
-) { \
-  {  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KNO, K0F  }, \
-  {  K10, K11, K12, K13, K14, K15, K16, KNO, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F  }, \
-  {  K20, K21, K22, K23, K24, K25, K26, KNO, K28, K29, K2A, K2B, K2C, K2D, KNO, K2F  }, \
-  {  KNO, K31, K32, K33, K34, K35, K36, KNO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F  }, \
-  {  KNO, K41, KNO, K43, K44, KNO, K46, KNO, KNO, K49, KNO, K4B, KNO, KNO, KNO, K4F  }  \
-}
diff --git a/keyboards/edda/info.json b/keyboards/edda/info.json
index 8893abdd95..3cf050fb9e 100644
--- a/keyboards/edda/info.json
+++ b/keyboards/edda/info.json
@@ -16,152 +16,169 @@
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_default": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Del", "x":17, "y":0.25},
-                {"label":"Backspace", "x":18, "y":0.25},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 7], "x": 7.75, "y": 0.25},
+
+                {"matrix": [0, 8], "x": 11, "y": 0.25},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [0, 10], "x": 13, "y": 0.25},
+                {"matrix": [0, 11], "x": 14, "y": 0.25},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0.25},
+                {"matrix": [0, 14], "x": 17, "y": 0.25},
+                {"matrix": [0, 15], "x": 18, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
+
+                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 15], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "y": 3.25},
+
+                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 15, "y": 3.25},
+                {"matrix": [3, 13], "x": 16, "y": 3.25},
+                {"matrix": [3, 14], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 15], "x": 18.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 15], "x": 18, "y": 4.25, "w": 1.5}
             ]
         },
         "LAYOUT_alice": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Backspace", "x":17, "y":0.25, "w":2},
-
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
-
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
-
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
-
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 3.75, "y": 0},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 7], "x": 7.75, "y": 0.25},
+
+                {"matrix": [0, 8], "x": 11, "y": 0.25},
+                {"matrix": [0, 9], "x": 12, "y": 0.25},
+                {"matrix": [0, 10], "x": 13, "y": 0.25},
+                {"matrix": [0, 11], "x": 14, "y": 0.25},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0.25},
+                {"matrix": [0, 15], "x": 17, "y": 0.25, "w": 2},
+
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 7.25, "y": 1.25},
+
+                {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 14.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 15], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 2], "x": 3.25, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 7.5, "y": 2.25},
+
+                {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 15], "x": 17.25, "y": 2.25, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 5, "y": 3.25},
+                {"matrix": [3, 4], "x": 6, "y": 3.25},
+                {"matrix": [3, 5], "x": 7, "y": 3.25},
+                {"matrix": [3, 6], "x": 8, "y": 3.25},
+
+                {"matrix": [3, 8], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 12], "x": 15, "y": 3.25},
+                {"matrix": [3, 13], "x": 16, "y": 3.25},
+                {"matrix": [3, 14], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 15], "x": 18.75, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 4], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 11], "x": 13, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 15], "x": 18, "y": 4.25, "w": 1.5}
             ]
         }
     }