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

3 files changed, 170 insertions, 76 deletions

diff --git a/keyboards/sneakbox/ava/ava.c b/keyboards/sneakbox/ava/ava.c
index c1b7c76cda..807943c0e9 100644
--- a/keyboards/sneakbox/ava/ava.c
+++ b/keyboards/sneakbox/ava/ava.c
@@ -15,7 +15,7 @@ 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 "ava.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index,clockwise)) { return false; }
diff --git a/keyboards/sneakbox/ava/ava.h b/keyboards/sneakbox/ava/ava.h
deleted file mode 100644
index f3aae119d0..0000000000
--- a/keyboards/sneakbox/ava/ava.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Copyright 2021 Bryan Ong
-
-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 LAYOUT_alice_split_bs( \
-	K020,   K000, K001, K002, K003, K004, K005, K006,       K010, K011, K012, K013, K014, K015, K016, K017, \
-	K040,   K021,       K022, K023, K024, K025, K026,       K030, K031, K032, K033, K034, K035, K036, K037, \
-	K060,   K041,       K042, K043, K044, K045, K046,       K050, K051, K052, K053, K054, K055,       K056, \
-	K007,   K061,       K062, K063, K064, K065, K066,       K070, K071, K072, K073, K074, K075, K076, K077, \
-	        K027, K047,             K057, K067,                   K081, K083,             K085, K086, K087  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007 }, \
-	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057 }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067	}, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077 }, \
-	{ KC_NO, K081,  KC_NO, K083,  KC_NO, K085,  K086,  K087 }  \
-}
-
-#define LAYOUT_alice( \
-	K020,   K000, K001, K002, K003, K004, K005, K006,       K010, K011, K012, K013, K014, K015,       K017, \
-	K040,   K021,       K022, K023, K024, K025, K026,       K030, K031, K032, K033, K034, K035, K036, K037, \
-	K060,   K041,       K042, K043, K044, K045, K046,       K050, K051, K052, K053, K054, K055,       K056, \
-	K007,   K061,       K062, K063, K064, K065, K066,       K070, K071, K072, K073, K074, K075, K076, K077, \
-	        K027, K047,             K057, K067,                   K081, K083,             K085, K086, K087  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007 }, \
-	{ K010,  K011,  K012,  K013,  K014,  K015,  KC_NO, K017 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057 }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067	}, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077 }, \
-	{ KC_NO, K081,  KC_NO, K083,  KC_NO, K085,  K086,  K087 }  \
-}
-
diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json
index 068806ca33..c8ed5d2537 100644
--- a/keyboards/sneakbox/ava/info.json
+++ b/keyboards/sneakbox/ava/info.json
@@ -33,23 +33,174 @@
     "LAYOUT_ava": "LAYOUT_alice"
   },
   "layouts": {
-      "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},
-              {"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},
-              {"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},
-              {"x":0, "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.65, "y":3.25}, {"x":16.75, "y":3, "w":1.5},
-              {"x":1.25, "y":4, "w":1.5}, {"x":2.75, "y":4}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4}, {"x":14.65, "y":4.25}, {"x":15.65, "y":4.25}, {"x":16.65, "y":4.25}
-			]
-      },
-      "LAYOUT_alice": {
-          "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, "w":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},
-              {"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},
-              {"x":0, "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.65, "y":3.25}, {"x":16.75, "y":3, "w":1.5},
-              {"x":1.25, "y":4, "w":1.5}, {"x":2.75, "y":4}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4}, {"x":14.65, "y":4.25}, {"x":15.65, "y":4.25}, {"x":16.65, "y":4.25}
-            ]
-      }
+    "LAYOUT_alice_split_bs": {
+      "layout": [
+        {"matrix": [2, 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": [1, 0], "x": 10.25, "y": 0},
+        {"matrix": [1, 1], "x": 11.25, "y": 0},
+        {"matrix": [1, 2], "x": 12.25, "y": 0},
+        {"matrix": [1, 3], "x": 13.25, "y": 0},
+        {"matrix": [1, 4], "x": 14.25, "y": 0},
+        {"matrix": [1, 5], "x": 15.25, "y": 0},
+        {"matrix": [1, 6], "x": 16.25, "y": 0},
+        {"matrix": [1, 7], "x": 17.25, "y": 0},
+
+        {"matrix": [4, 0], "x": 0, "y": 1},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [2, 2], "x": 2.75, "y": 1},
+        {"matrix": [2, 3], "x": 3.75, "y": 1},
+        {"matrix": [2, 4], "x": 4.75, "y": 1},
+        {"matrix": [2, 5], "x": 5.75, "y": 1},
+        {"matrix": [2, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [3, 0], "x": 9.75, "y": 1},
+        {"matrix": [3, 1], "x": 10.75, "y": 1},
+        {"matrix": [3, 2], "x": 11.75, "y": 1},
+        {"matrix": [3, 3], "x": 12.75, "y": 1},
+        {"matrix": [3, 4], "x": 13.75, "y": 1},
+        {"matrix": [3, 5], "x": 14.75, "y": 1},
+        {"matrix": [3, 6], "x": 15.75, "y": 1},
+        {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [6, 0], "x": 0, "y": 2},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [4, 2], "x": 3, "y": 2},
+        {"matrix": [4, 3], "x": 4, "y": 2},
+        {"matrix": [4, 4], "x": 5, "y": 2},
+        {"matrix": [4, 5], "x": 6, "y": 2},
+        {"matrix": [4, 6], "x": 7, "y": 2},
+
+        {"matrix": [5, 0], "x": 10, "y": 2},
+        {"matrix": [5, 1], "x": 11, "y": 2},
+        {"matrix": [5, 2], "x": 12, "y": 2},
+        {"matrix": [5, 3], "x": 13, "y": 2},
+        {"matrix": [5, 4], "x": 14, "y": 2},
+        {"matrix": [5, 5], "x": 15, "y": 2},
+        {"matrix": [5, 6], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [0, 7], "x": 0, "y": 3},
+
+        {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [6, 2], "x": 3.5, "y": 3},
+        {"matrix": [6, 3], "x": 4.5, "y": 3},
+        {"matrix": [6, 4], "x": 5.5, "y": 3},
+        {"matrix": [6, 5], "x": 6.5, "y": 3},
+        {"matrix": [6, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [7, 0], "x": 9.5, "y": 3},
+        {"matrix": [7, 1], "x": 10.5, "y": 3},
+        {"matrix": [7, 2], "x": 11.5, "y": 3},
+        {"matrix": [7, 3], "x": 12.5, "y": 3},
+        {"matrix": [7, 4], "x": 13.5, "y": 3},
+        {"matrix": [7, 5], "x": 14.5, "y": 3},
+        {"matrix": [7, 6], "x": 15.65, "y": 3.25},
+        {"matrix": [7, 7], "x": 16.75, "y": 3, "w": 1.5},
+
+        {"matrix": [2, 7], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 7], "x": 2.75, "y": 4},
+        {"matrix": [5, 7], "x": 5, "y": 4, "w": 1.5},
+        {"matrix": [6, 7], "x": 6.5, "y": 4, "w": 2.25},
+        {"matrix": [8, 1], "x": 9.75, "y": 4, "w": 2.75},
+        {"matrix": [8, 3], "x": 12.5, "y": 4},
+        {"matrix": [8, 5], "x": 14.65, "y": 4.25},
+        {"matrix": [8, 6], "x": 15.65, "y": 4.25},
+        {"matrix": [8, 7], "x": 16.65, "y": 4.25}
+      ]
+    },
+    "LAYOUT_alice": {
+      "layout": [
+        {"matrix": [2, 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": [1, 0], "x": 10.25, "y": 0},
+        {"matrix": [1, 1], "x": 11.25, "y": 0},
+        {"matrix": [1, 2], "x": 12.25, "y": 0},
+        {"matrix": [1, 3], "x": 13.25, "y": 0},
+        {"matrix": [1, 4], "x": 14.25, "y": 0},
+        {"matrix": [1, 5], "x": 15.25, "y": 0},
+        {"matrix": [1, 7], "x": 16.25, "y": 0, "w": 2},
+
+        {"matrix": [4, 0], "x": 0, "y": 1},
+
+        {"matrix": [2, 1], "x": 1.25, "y": 1, "w": 1.5},
+        {"matrix": [2, 2], "x": 2.75, "y": 1},
+        {"matrix": [2, 3], "x": 3.75, "y": 1},
+        {"matrix": [2, 4], "x": 4.75, "y": 1},
+        {"matrix": [2, 5], "x": 5.75, "y": 1},
+        {"matrix": [2, 6], "x": 6.75, "y": 1},
+
+        {"matrix": [3, 0], "x": 9.75, "y": 1},
+        {"matrix": [3, 1], "x": 10.75, "y": 1},
+        {"matrix": [3, 2], "x": 11.75, "y": 1},
+        {"matrix": [3, 3], "x": 12.75, "y": 1},
+        {"matrix": [3, 4], "x": 13.75, "y": 1},
+        {"matrix": [3, 5], "x": 14.75, "y": 1},
+        {"matrix": [3, 6], "x": 15.75, "y": 1},
+        {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+        {"matrix": [6, 0], "x": 0, "y": 2},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 2, "w": 1.75},
+        {"matrix": [4, 2], "x": 3, "y": 2},
+        {"matrix": [4, 3], "x": 4, "y": 2},
+        {"matrix": [4, 4], "x": 5, "y": 2},
+        {"matrix": [4, 5], "x": 6, "y": 2},
+        {"matrix": [4, 6], "x": 7, "y": 2},
+
+        {"matrix": [5, 0], "x": 10, "y": 2},
+        {"matrix": [5, 1], "x": 11, "y": 2},
+        {"matrix": [5, 2], "x": 12, "y": 2},
+        {"matrix": [5, 3], "x": 13, "y": 2},
+        {"matrix": [5, 4], "x": 14, "y": 2},
+        {"matrix": [5, 5], "x": 15, "y": 2},
+        {"matrix": [5, 6], "x": 16, "y": 2, "w": 2.25},
+
+        {"matrix": [0, 7], "x": 0, "y": 3},
+
+        {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.25},
+        {"matrix": [6, 2], "x": 3.5, "y": 3},
+        {"matrix": [6, 3], "x": 4.5, "y": 3},
+        {"matrix": [6, 4], "x": 5.5, "y": 3},
+        {"matrix": [6, 5], "x": 6.5, "y": 3},
+        {"matrix": [6, 6], "x": 7.5, "y": 3},
+
+        {"matrix": [7, 0], "x": 9.5, "y": 3},
+        {"matrix": [7, 1], "x": 10.5, "y": 3},
+        {"matrix": [7, 2], "x": 11.5, "y": 3},
+        {"matrix": [7, 3], "x": 12.5, "y": 3},
+        {"matrix": [7, 4], "x": 13.5, "y": 3},
+        {"matrix": [7, 5], "x": 14.5, "y": 3},
+        {"matrix": [7, 6], "x": 15.65, "y": 3.25},
+        {"matrix": [7, 7], "x": 16.75, "y": 3, "w": 1.5},
+
+        {"matrix": [2, 7], "x": 1.25, "y": 4, "w": 1.5},
+        {"matrix": [4, 7], "x": 2.75, "y": 4},
+        {"matrix": [5, 7], "x": 5, "y": 4, "w": 1.5},
+        {"matrix": [6, 7], "x": 6.5, "y": 4, "w": 2.25},
+        {"matrix": [8, 1], "x": 9.75, "y": 4, "w": 2.75},
+        {"matrix": [8, 3], "x": 12.5, "y": 4},
+        {"matrix": [8, 5], "x": 14.65, "y": 4.25},
+        {"matrix": [8, 6], "x": 15.65, "y": 4.25},
+        {"matrix": [8, 7], "x": 16.65, "y": 4.25}
+      ]
+    }
   }
 }