Move single `LAYOUT`s to data driven (#20365)

3 files changed, 74 insertions, 107 deletions

diff --git a/keyboards/keebio/ergodicity/ergodicity.c b/keyboards/keebio/ergodicity/ergodicity.c
index acba8a6ed3..76fb136c03 100644
--- a/keyboards/keebio/ergodicity/ergodicity.c
+++ b/keyboards/keebio/ergodicity/ergodicity.c
@@ -1,4 +1,4 @@
-#include "ergodicity.h"
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {
 #ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/ergodicity/ergodicity.h b/keyboards/keebio/ergodicity/ergodicity.h
deleted file mode 100644
index a6a9cf4d7a..0000000000
--- a/keyboards/keebio/ergodicity/ergodicity.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2019 Keebio
- *
- * 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"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    kA1, kA2, kA3, kE3, kA4, kA5, kA6, kA7, kA8, kA9,  kA10, kA11, kA12, kA13, kA15, \
-    kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8, kB9, kB10, kB11, kB12, kB13, kB14, kB15, \
-    kC1, kC2, kC3, kC4, kC5, kC6, kC7, kC8, kC9, kC10, kC11, kC12, kC13,       kC15, \
-         kD2, kD3, kD4, kD5, kD6, kD7, kD8, kD9, kD10, kD11, kD12, kD13, kD14, kD15, \
-         kE2,      kE4,      kE6, kE7,      kE9,       kE11,                   kE15 \
-) \
-{ \
-    { kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9, kA10, kA11, kA12, kA13, KC_NO, kA15 }, \
-    { kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8, kB9, kB10, kB11, kB12, kB13, kB14, kB15 }, \
-    { kC1, kC2, kC3, kC4, kC5, kC6, kC7, kC8, kC9, kC10, kC11, kC12, kC13, KC_NO, kC15 }, \
-    { KC_NO, kD2, kD3, kD4, kD5, kD6, kD7, kD8, kD9, kD10, kD11, kD12, kD13, kD14, kD15 }, \
-    { KC_NO, kE2, kE3, kE4, KC_NO, kE6, kE7, KC_NO, kE9, KC_NO, kE11, KC_NO, KC_NO, KC_NO, kE15 } \
-}
diff --git a/keyboards/keebio/ergodicity/info.json b/keyboards/keebio/ergodicity/info.json
index ca3b20c1e0..c6a9f2d6a3 100644
--- a/keyboards/keebio/ergodicity/info.json
+++ b/keyboards/keebio/ergodicity/info.json
@@ -26,75 +26,83 @@
     "layouts": {
         "LAYOUT": {
             "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},
+                {"matrix": [0, 0], "x": 0.5, "y": 0},
 
-                {"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":"Backslash", "x":17.75, "y":1.25, "w":1.5},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 0},
+                {"matrix": [0, 3], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 7.75, "y": 0.25},
 
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.25, "y":2.25, "w":2},
-                {"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},
+                {"matrix": [0, 7], "x": 11, "y": 0.25},
+                {"matrix": [0, 8], "x": 12, "y": 0.25},
+                {"matrix": [0, 9], "x": 13, "y": 0.25},
+                {"matrix": [0, 10], "x": 14, "y": 0.25},
+                {"matrix": [0, 11], "x": 15, "y": 0},
+                {"matrix": [0, 12], "x": 16, "y": 0.25},
+                {"matrix": [0, 14], "x": 17, "y": 0.25, "w": 2},
 
-                {"label":"Shift", "x":1.25, "y":3.25, "w":2.5},
-                {"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":14.75, "y":3.25},
-                {"label":"/", "x":15.75, "y":3.25},
-                {"label":"Shift", "x":16.75, "y":3.25, "w":1.5},
-                {"label":"Fn", "x":18.25, "y":3.25},
+                {"matrix": [1, 0], "x": 0.25, "y": 1},
 
-                {"label":"Alt", "x":1.25, "y":4.25, "w":1.5},
-                {"label":"Gui", "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.5},
-                {"label":"Alt", "x":12.75, "y":4.25, "w":1.5},
-                {"label":"Fn", "x":17.75, "y":4.25, "w":1.5}
+                {"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, 7], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.75, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.75, "y": 1.25},
+                {"matrix": [1, 13], "x": 16.75, "y": 1.25},
+                {"matrix": [1, 14], "x": 17.75, "y": 1.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 2},
+                {"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, 7], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 12.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 15.25, "y": 2.25},
+                {"matrix": [2, 12], "x": 16.25, "y": 2.25},
+                {"matrix": [2, 14], "x": 17.25, "y": 2.25, "w": 2},
+
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 2.5},
+                {"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, 7], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 12.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 13.25, "y": 3.25},
+                {"matrix": [3, 11], "x": 14.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 15.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 16.75, "y": 3.25, "w": 1.5},
+                {"matrix": [3, 14], "x": 18.25, "y": 3.25},
+
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 2},
+                {"matrix": [4, 6], "x": 8.5, "y": 4.25},
+
+                {"matrix": [4, 8], "x": 10.25, "y": 4.25, "w": 2.5},
+                {"matrix": [4, 10], "x": 12.75, "y": 4.25, "w": 1.5},
+                {"matrix": [4, 14], "x": 17.75, "y": 4.25, "w": 1.5}
             ]
         }
     }