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

3 files changed, 158 insertions, 189 deletions

diff --git a/keyboards/fallacy/fallacy.c b/keyboards/fallacy/fallacy.c
index 486084098a..05f68a0f99 100755
--- a/keyboards/fallacy/fallacy.c
+++ b/keyboards/fallacy/fallacy.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fallacy.h"
+#include "quantum.h"
 #include "indicators.h"
 
 void matrix_init_kb(void) {
diff --git a/keyboards/fallacy/fallacy.h b/keyboards/fallacy/fallacy.h
deleted file mode 100755
index b77c81fa1a..0000000000
--- a/keyboards/fallacy/fallacy.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2020 B. Fletcher (toraifu) <typefast@kyaa.gg>
- *
- * 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"
-
-/* All keys in matrix active: 
- * - Split Backspace
- * - Split Right Shift
- */
-#define LAYOUT_alice_split_bs( \
-    K100,   K000, K001, K002, K003, K004, K005, K006,       K007, K008, K009, K010, K011, K012, K013, K014, \
-    K200,   K101, K102, K103, K104, K105, K106,       K107, K108, K109, K110, K111, K112, K113, K114, \
-    K300,   K201, K202, K203, K204, K205, K206,       K207, K208, K209, K210, K211, K212,       K214, \
-            K301, K302, K303, K304, K305, K306,       K307, K308, K309, K310, K311, K312, K313, K314, \
-            K401,       K403,       K405, K406,             K408,       K410,                   K414  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
-    { KC_NO, K401,  KC_NO, K403,  KC_NO, K405,  K406,  KC_NO, K408,  KC_NO, K410,  KC_NO, KC_NO, KC_NO, K414 }  \
-}
-
-/* Disable position 013 and 314 for:
- * - Full size Backspace
- * - Full size Right Shift
- */
-#define LAYOUT_alice( \
-    K100,   K000, K001, K002, K003, K004, K005, K006,       K007, K008, K009, K010, K011, K012,       K014, \
-    K200,   K101, K102, K103, K104, K105, K106,       K107, K108, K109, K110, K111, K112, K113, K114, \
-    K300,   K201, K202, K203, K204, K205, K206,       K207, K208, K209, K210, K211, K212,       K214, \
-            K301, K302, K303, K304, K305, K306,       K307, K308, K309, K310, K311, K312, K313, K314, \
-            K401,       K403,       K405, K406,             K408,       K410,                   K414  \
-) { \
-    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014 }, \
-    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO, K214 }, \
-    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
-    { KC_NO, K401,  KC_NO, K403,  KC_NO, K405,  K406,  KC_NO, K408,  KC_NO, K410,  KC_NO, KC_NO, KC_NO, K414 }  \
-}
-
-#define LAYOUT_default LAYOUT_alice
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/fallacy/info.json b/keyboards/fallacy/info.json
index 1dbccf8dd5..ec13666e68 100644
--- a/keyboards/fallacy/info.json
+++ b/keyboards/fallacy/info.json
@@ -15,144 +15,170 @@
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["alice", "alice_split_bs"],
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_alice_split_bs",
+        "LAYOUT_default": "LAYOUT_alice"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"~", "x":1.75, "y":0},
-                {"label":"!", "x":2.75, "y":0},
-                {"label":"@", "x":3.75, "y":0},
-                {"label":"#", "x":4.75, "y":0},
-                {"label":"$", "x":5.75, "y":0},
-                {"label":"%", "x":6.75, "y":0},
-                {"label":"^", "x":7.75, "y":0},
-                {"label":"&", "x":10, "y":0},
-                {"label":"*", "x":11, "y":0},
-                {"label":"(", "x":12, "y":0},
-                {"label":")", "x":13, "y":0},
-                {"label":"_", "x":14, "y":0},
-                {"label":"+", "x":15, "y":0},
-                {"label":"|", "x":16, "y":0},
-                {"label":"~", "x":17, "y":0},
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
-                {"label":"Q", "x":3, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":9.75, "y":1},
-                {"label":"U", "x":10.75, "y":1},
-                {"label":"I", "x":11.75, "y":1},
-                {"label":"O", "x":12.75, "y":1},
-                {"label":"P", "x":13.75, "y":1},
-                {"label":"{", "x":14.75, "y":1},
-                {"label":"}", "x":15.75, "y":1},
-                {"label":"Backspace", "x":16.75, "y":1, "w":1.5},
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Control", "x":1.25, "y":2, "w":1.75},
-                {"label":"A", "x":3, "y":2},
-                {"label":"S", "x":4, "y":2},
-                {"label":"D", "x":5, "y":2},
-                {"label":"F", "x":6, "y":2},
-                {"label":"G", "x":7, "y":2},
-                {"label":"H", "x":10.25, "y":2},
-                {"label":"J", "x":11.25, "y":2},
-                {"label":"K", "x":12.25, "y":2},
-                {"label":"L", "x":13.25, "y":2},
-                {"label":":", "x":14.25, "y":2}, 
-                {"label":"\"", "x":15.25, "y":2},
-                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
-                {"label":"Shift", "x":1, "y":3, "w":2.25},
-                {"label":"Z", "x":3.25, "y":3},
-                {"label":"X", "x":4.25, "y":3}, 
-                {"label":"C", "x":5.25, "y":3}, 
-                {"label":"V", "x":6.25, "y":3}, 
-                {"label":"B", "x":7.25, "y":3}, 
-                {"label":"B", "x":10, "y":3},
-                {"label":"N", "x":11, "y":3},
-                {"label":"M", "x":12, "y":3},
-                {"label":"<", "x":13, "y":3},
-                {"label":">", "x":14, "y":3},
-                {"label":"?", "x":15, "y":3},
-                {"label":"Shift", "x":16, "y":3, "w":1.75}, 
-                {"label":"Fn1", "x":17.75, "y":3},
-                {"label":"Ctrl", "x":1, "y":4, "w":1.5}, 
-                {"label":"Alt", "x":4, "y":4, "w":1.5},
-                {"label":"LSpace", "x":5.5, "y":4, "w":2.25},
-                {"label":"Fn2", "x":7.75, "y":4}, 
-                {"label":"RSpace", "x":10, "y":4, "w":2.75}, 
-                {"label":"RAlt", "x":12.75, "y":4, "w":1.5}, 
-                {"label":"RCtl", "x":17, "y":4, "w":1.5}
+                {"matrix": [1, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 13], "x": 16, "y": 0},
+                {"matrix": [0, 14], "x": 17, "y": 0},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "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},
+
+                {"matrix": [2, 7], "x": 10.25, "y": 2},
+                {"matrix": [2, 8], "x": 11.25, "y": 2},
+                {"matrix": [2, 9], "x": 12.25, "y": 2},
+                {"matrix": [2, 10], "x": 13.25, "y": 2},
+                {"matrix": [2, 11], "x": 14.25, "y": 2},
+                {"matrix": [2, 12], "x": 15.25, "y": 2},
+                {"matrix": [2, 14], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+
+                {"matrix": [3, 7], "x": 10, "y": 3},
+                {"matrix": [3, 8], "x": 11, "y": 3},
+                {"matrix": [3, 9], "x": 12, "y": 3},
+                {"matrix": [3, 10], "x": 13, "y": 3},
+                {"matrix": [3, 11], "x": 14, "y": 3},
+                {"matrix": [3, 12], "x": 15, "y": 3},
+                {"matrix": [3, 13], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.75, "y": 3},
+
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.75, "y": 4},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_alice": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"~", "x":1.75, "y":0},
-                {"label":"!", "x":2.75, "y":0},
-                {"label":"@", "x":3.75, "y":0},
-                {"label":"#", "x":4.75, "y":0},
-                {"label":"$", "x":5.75, "y":0},
-                {"label":"%", "x":6.75, "y":0},
-                {"label":"^", "x":7.75, "y":0},
-                {"label":"&", "x":10, "y":0},
-                {"label":"*", "x":11, "y":0},
-                {"label":"(", "x":12, "y":0},
-                {"label":")", "x":13, "y":0},
-                {"label":"_", "x":14, "y":0},
-                {"label":"+", "x":15, "y":0},
-                {"label":"Backspace", "x":16, "y":0, "w":2},
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
-                {"label":"Q", "x":3, "y":1},
-                {"label":"W", "x":4, "y":1},
-                {"label":"E", "x":5, "y":1},
-                {"label":"R", "x":6, "y":1},
-                {"label":"T", "x":7, "y":1},
-                {"label":"Y", "x":9.75, "y":1},
-                {"label":"U", "x":10.75, "y":1},
-                {"label":"I", "x":11.75, "y":1},
-                {"label":"O", "x":12.75, "y":1},
-                {"label":"P", "x":13.75, "y":1},
-                {"label":"{", "x":14.75, "y":1},
-                {"label":"}", "x":15.75, "y":1},
-                {"label":"Backspace", "x":16.75, "y":1, "w":1.5},
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Control", "x":1.25, "y":2, "w":1.75},
-                {"label":"A", "x":3, "y":2},
-                {"label":"S", "x":4, "y":2},
-                {"label":"D", "x":5, "y":2},
-                {"label":"F", "x":6, "y":2},
-                {"label":"G", "x":7, "y":2},
-                {"label":"H", "x":10.25, "y":2},
-                {"label":"J", "x":11.25, "y":2},
-                {"label":"K", "x":12.25, "y":2},
-                {"label":"L", "x":13.25, "y":2},
-                {"label":":", "x":14.25, "y":2}, 
-                {"label":"\"", "x":15.25, "y":2},
-                {"label":"Enter", "x":16.25, "y":2, "w":2.25},
-                {"label":"Shift", "x":1, "y":3, "w":2.25},
-                {"label":"Z", "x":3.25, "y":3},
-                {"label":"X", "x":4.25, "y":3}, 
-                {"label":"C", "x":5.25, "y":3}, 
-                {"label":"V", "x":6.25, "y":3}, 
-                {"label":"B", "x":7.25, "y":3}, 
-                {"label":"B", "x":10, "y":3},
-                {"label":"N", "x":11, "y":3},
-                {"label":"M", "x":12, "y":3},
-                {"label":"<", "x":13, "y":3},
-                {"label":">", "x":14, "y":3},
-                {"label":"?", "x":15, "y":3},
-                {"label":"Shift", "x":16, "y":3, "w":1.75}, 
-                {"label":"Fn1", "x":17.75, "y":3},
-                {"label":"Ctrl", "x":1, "y":4, "w":1.5}, 
-                {"label":"Alt", "x":4, "y":4, "w":1.5},
-                {"label":"LSpace", "x":5.5, "y":4, "w":2.25},
-                {"label":"Fn2", "x":7.75, "y":4}, 
-                {"label":"RSpace", "x":10, "y":4, "w":2.75}, 
-                {"label":"RAlt", "x":12.75, "y":4, "w":1.5}, 
-                {"label":"RCtl", "x":17, "y":4, "w":1.5}
+                {"matrix": [1, 0], "x": 0.5, "y": 0},
+
+                {"matrix": [0, 0], "x": 1.75, "y": 0},
+                {"matrix": [0, 1], "x": 2.75, "y": 0},
+                {"matrix": [0, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0},
+                {"matrix": [0, 4], "x": 5.75, "y": 0},
+                {"matrix": [0, 5], "x": 6.75, "y": 0},
+                {"matrix": [0, 6], "x": 7.75, "y": 0},
+
+                {"matrix": [0, 7], "x": 10, "y": 0},
+                {"matrix": [0, 8], "x": 11, "y": 0},
+                {"matrix": [0, 9], "x": 12, "y": 0},
+                {"matrix": [0, 10], "x": 13, "y": 0},
+                {"matrix": [0, 11], "x": 14, "y": 0},
+                {"matrix": [0, 12], "x": 15, "y": 0},
+                {"matrix": [0, 14], "x": 16, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 1},
+
+                {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 3, "y": 1},
+                {"matrix": [1, 3], "x": 4, "y": 1},
+                {"matrix": [1, 4], "x": 5, "y": 1},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "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},
+
+                {"matrix": [2, 7], "x": 10.25, "y": 2},
+                {"matrix": [2, 8], "x": 11.25, "y": 2},
+                {"matrix": [2, 9], "x": 12.25, "y": 2},
+                {"matrix": [2, 10], "x": 13.25, "y": 2},
+                {"matrix": [2, 11], "x": 14.25, "y": 2},
+                {"matrix": [2, 12], "x": 15.25, "y": 2},
+                {"matrix": [2, 14], "x": 16.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+
+                {"matrix": [3, 7], "x": 10, "y": 3},
+                {"matrix": [3, 8], "x": 11, "y": 3},
+                {"matrix": [3, 9], "x": 12, "y": 3},
+                {"matrix": [3, 10], "x": 13, "y": 3},
+                {"matrix": [3, 11], "x": 14, "y": 3},
+                {"matrix": [3, 12], "x": 15, "y": 3},
+                {"matrix": [3, 13], "x": 16, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.75, "y": 3},
+
+                {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.75, "y": 4},
+                {"matrix": [4, 8], "x": 10, "y": 4, "w": 2.75},
+                {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.5},
+                {"matrix": [4, 14], "x": 17, "y": 4, "w": 1.5}
             ]
         }
     }