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

2 files changed, 69 insertions, 106 deletions

diff --git a/keyboards/keyhive/ergosaurus/ergosaurus.h b/keyboards/keyhive/ergosaurus/ergosaurus.h
deleted file mode 100644
index cef594993d..0000000000
--- a/keyboards/keyhive/ergosaurus/ergosaurus.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 cfbender
- *
- * 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_alice_split_bs( \
-  K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
-  K20, K30, K21, K31, K22, K32, K23,      K33, K24, K34, K25, K35, K26, K36, K27, \
-  K40, K50, K41, K51, K42, K52, K43,      K53, K44, K54, K45, K55, K46,      K47, \
-       K60, K61, K71, K62, K72, K63,      K73, K64, K74, K65, K75, K66, K76, K67, \
-       K80,      K81, K82,      K83,           K84,      K85,                K87  \
-) { \
-  {  K00, K01, K02, K03, K04, K05, K06, K07  }, \
-  {  K10, K11, K12, K13, K14, K15, K16, K17  }, \
-  {  K20, K21, K22, K23, K24, K25, K26, K27  }, \
-  {  K30, K31, K32, K33, K34, K35, K36, KNO  }, \
-  {  K40, K41, K42, K43, K44, K45, K46, K47  }, \
-  {  K50, K51, K52, K53, K54, K55, KNO, KNO  }, \
-  {  K60, K61, K62, K63, K64, K65, K66, K67  }, \
-  {  KNO, K71, K72, K73, K74, K75, K76, KNO  }, \
-  {  K80, K81, K82, K83, K84, K85, KNO, K87  }  \
-}
-
-#define LAYOUT LAYOUT_alice_split_bs
diff --git a/keyboards/keyhive/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/info.json
index f9e3944fec..afd25e2785 100644
--- a/keyboards/keyhive/ergosaurus/info.json
+++ b/keyboards/keyhive/ergosaurus/info.json
@@ -15,79 +15,82 @@
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "community_layouts": ["alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_alice_split_bs"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"`", "x":0.5, "y":0},
-                {"label":"Esc", "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":"|", "x":17, "y":0.25},
-                {"label":"Del", "x":18, "y":0.25},
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
+                {"matrix": [1, 0], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 2.75, "y": 0.25},
+                {"matrix": [1, 1], "x": 3.75, "y": 0},
+                {"matrix": [0, 2], "x": 4.75, "y": 0.25},
+                {"matrix": [1, 2], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 3], "x": 6.75, "y": 0.25},
+                {"matrix": [1, 3], "x": 7.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 11, "y": 0.25},
+                {"matrix": [1, 4], "x": 12, "y": 0.25},
+                {"matrix": [0, 5], "x": 13, "y": 0.25},
+                {"matrix": [1, 5], "x": 14, "y": 0.25},
+                {"matrix": [0, 6], "x": 15, "y": 0},
+                {"matrix": [1, 6], "x": 16, "y": 0.25},
+                {"matrix": [0, 7], "x": 17, "y": 0.25},
+                {"matrix": [1, 7], "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":"Backspace", "x":17.75, "y":1.25, "w":1.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 1},
+                {"matrix": [3, 0], "x": 1.5, "y": 1.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 3, "y": 1.25},
+                {"matrix": [3, 1], "x": 4.25, "y": 1.25},
+                {"matrix": [2, 2], "x": 5.25, "y": 1.25},
+                {"matrix": [3, 2], "x": 6.25, "y": 1.25},
+                {"matrix": [2, 3], "x": 7.25, "y": 1.25},
+                {"matrix": [3, 3], "x": 10.5, "y": 1.25},
+                {"matrix": [2, 4], "x": 11.5, "y": 1.25},
+                {"matrix": [3, 4], "x": 12.5, "y": 1.25},
+                {"matrix": [2, 5], "x": 13.5, "y": 1.25},
+                {"matrix": [3, 5], "x": 14.75, "y": 1.25},
+                {"matrix": [2, 6], "x": 15.75, "y": 1.25},
+                {"matrix": [3, 6], "x": 16.75, "y": 1.25},
+                {"matrix": [2, 7], "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},
+                {"matrix": [4, 0], "x": 0, "y": 2},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25, "w": 1.75},
+                {"matrix": [4, 1], "x": 3.25, "y": 2.25},
+                {"matrix": [5, 1], "x": 4.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 5.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 6.5, "y": 2.25},
+                {"matrix": [4, 3], "x": 7.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 10.75, "y": 2.25},
+                {"matrix": [4, 4], "x": 11.75, "y": 2.25},
+                {"matrix": [5, 4], "x": 12.75, "y": 2.25},
+                {"matrix": [4, 5], "x": 13.75, "y": 2.25},
+                {"matrix": [5, 5], "x": 15.25, "y": 2.25},
+                {"matrix": [4, 6], "x": 16.25, "y": 2.25},
+                {"matrix": [4, 7], "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":"B", "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},
+                {"matrix": [6, 0], "x": 1.5, "y": 3.25, "w": 2.25},
+                {"matrix": [6, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 5, "y": 3.25},
+                {"matrix": [6, 2], "x": 6, "y": 3.25},
+                {"matrix": [7, 2], "x": 7, "y": 3.25},
+                {"matrix": [6, 3], "x": 8, "y": 3.25},
+                {"matrix": [7, 3], "x": 10.25, "y": 3.25},
+                {"matrix": [6, 4], "x": 11.25, "y": 3.25},
+                {"matrix": [7, 4], "x": 12.25, "y": 3.25},
+                {"matrix": [6, 5], "x": 13.25, "y": 3.25},
+                {"matrix": [7, 5], "x": 15, "y": 3.25},
+                {"matrix": [6, 6], "x": 16, "y": 3.25},
+                {"matrix": [7, 6], "x": 17, "y": 3.25, "w": 1.75},
+                {"matrix": [6, 7], "x": 18.75, "y": 3.25},
 
-                {"label":"Os", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Enter", "x":6.5, "y":4.25, "w":2},
-                {"label":"Fn", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.25},
-                {"label":"Alt", "x":12.5, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"matrix": [8, 0], "x": 1.5, "y": 4.25, "w": 1.5},
+                {"matrix": [8, 1], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [8, 2], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [8, 3], "x": 8.5, "y": 4.25},
+                {"matrix": [8, 4], "x": 10.25, "y": 4.25, "w": 2.25},
+                {"matrix": [8, 5], "x": 12.5, "y": 4.25, "w": 1.5},
+                {"matrix": [8, 7], "x": 18, "y": 4.25, "w": 1.5}
             ]
         }
     }