Move single `LAYOUT_all`s to data driven (#20430)

3 files changed, 92 insertions, 144 deletions

diff --git a/keyboards/viendi8l/info.json b/keyboards/viendi8l/info.json
index 5b599959ce..87dac17fd5 100644
--- a/keyboards/viendi8l/info.json
+++ b/keyboards/viendi8l/info.json
@@ -27,96 +27,101 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Push", "x":0, "y":0},
-                {"label":"\u00d7", "x":1, "y":0},
-                {"label":"/", "x":2, "y":0},
-                {"label":"Del", "x":3, "y":0},
-                {"label":"Esc", "x":4.5, "y":0},
-                {"label":"!", "x":5.5, "y":0},
-                {"label":"@", "x":6.5, "y":0},
-                {"label":"#", "x":7.5, "y":0},
-                {"label":"$", "x":8.5, "y":0},
-                {"label":"%", "x":9.5, "y":0},
-                {"label":"^", "x":10.5, "y":0},
-                {"label":"&", "x":11.5, "y":0},
-                {"label":"*", "x":12.5, "y":0},
-                {"label":"(", "x":13.5, "y":0},
-                {"label":")", "x":14.5, "y":0},
-                {"label":"-", "x":15.5, "y":0},
-                {"label":"=", "x":16.5, "y":0},
-                {"label":"Bksp", "x":17.5, "y":0},
-                {"label":"Bksp", "x":18.5, "y":0},
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
 
-                {"label":"-", "x":0, "y":1},
-                {"label":"7", "x":1, "y":1},
-                {"label":"8", "x":2, "y":1},
-                {"label":"9", "x":3, "y":1},
-                {"label":"Tab", "x":4.5, "y":1, "w":1.5},
-                {"label":"Q", "x":6, "y":1},
-                {"label":"W", "x":7, "y":1},
-                {"label":"E", "x":8, "y":1},
-                {"label":"R", "x":9, "y":1},
-                {"label":"T", "x":10, "y":1},
-                {"label":"Y", "x":11, "y":1},
-                {"label":"U", "x":12, "y":1},
-                {"label":"I", "x":13, "y":1},
-                {"label":"O", "x":14, "y":1},
-                {"label":"P", "x":15, "y":1},
-                {"label":"{", "x":16, "y":1},
-                {"label":"}", "x":17, "y":1},
-                {"label":"|", "x":18, "y":1, "w":1.5},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 14.5, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+                {"matrix": [2, 17], "x": 18.5, "y": 0},
 
-                {"label":"+", "x":0, "y":2},
-                {"label":"4", "x":1, "y":2},
-                {"label":"5", "x":2, "y":2},
-                {"label":"6", "x":3, "y":2},
-                {"label":"Caps Lock", "x":4.5, "y":2, "w":1.75},
-                {"label":"A", "x":6.25, "y":2},
-                {"label":"S", "x":7.25, "y":2},
-                {"label":"D", "x":8.25, "y":2},
-                {"label":"F", "x":9.25, "y":2},
-                {"label":"G", "x":10.25, "y":2},
-                {"label":"H", "x":11.25, "y":2},
-                {"label":"J", "x":12.25, "y":2},
-                {"label":"K", "x":13.25, "y":2},
-                {"label":"L", "x":14.25, "y":2},
-                {"label":":", "x":15.25, "y":2},
-                {"label":"\"", "x":16.25, "y":2},
-                {"x":17.25, "y":2},
-                {"label":"Enter", "x":18.25, "y":2, "w":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"label":"Enter", "x":0, "y":3},
-                {"label":"1", "x":1, "y":3},
-                {"label":"2", "x":2, "y":3},
-                {"label":"3", "x":3, "y":3},
-                {"label":"Shift", "x":4.5, "y":3, "w":1.25},
-                {"x":5.75, "y":3},
-                {"label":"Z", "x":6.75, "y":3},
-                {"label":"X", "x":7.75, "y":3},
-                {"label":"C", "x":8.75, "y":3},
-                {"label":"V", "x":9.75, "y":3},
-                {"label":"B", "x":10.75, "y":3},
-                {"label":"N", "x":11.75, "y":3},
-                {"label":"M", "x":12.75, "y":3},
-                {"label":"<", "x":13.75, "y":3},
-                {"label":">", "x":14.75, "y":3},
-                {"label":"Shift", "x":15.75, "y":3, "w":1.75},
-                {"label":"\u2191", "x":17.5, "y":3},
-                {"x":18.5, "y":3},
+                {"matrix": [1, 4], "x": 4.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 5], "x": 6, "y": 1},
+                {"matrix": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+                {"matrix": [1, 9], "x": 10, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+                {"matrix": [1, 13], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+                {"matrix": [1, 16], "x": 17, "y": 1},
+                {"matrix": [1, 17], "x": 18, "y": 1, "w": 1.5},
 
-                {"label":"Enter", "x":0, "y":4},
-                {"label":".", "x":1, "y":4},
-                {"label":".", "x":2, "y":4},
-                {"label":"0", "x":3, "y":4},
-                {"label":"Ctrl", "x":4.5, "y":4, "w":1.25},
-                {"label":"Win", "x":5.75, "y":4, "w":1.25},
-                {"label":"Alt", "x":7, "y":4, "w":1.25},
-                {"x":8.25, "y":4, "w":6.25},
-                {"x":14.5, "y":4},
-                {"x":15.5, "y":4},
-                {"label":"\u2190", "x":16.5, "y":4},
-                {"label":"\u2193", "x":17.5, "y":4},
-                {"label":"\u2192", "x":18.5, "y":4}
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [2, 4], "x": 4.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "y": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2},
+                {"matrix": [2, 15], "x": 16.25, "y": 2},
+                {"matrix": [3, 17], "x": 17.25, "y": 2},
+                {"matrix": [2, 16], "x": 18.25, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+
+                {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3},
+                {"matrix": [3, 6], "x": 6.75, "y": 3},
+                {"matrix": [3, 7], "x": 7.75, "y": 3},
+                {"matrix": [3, 8], "x": 8.75, "y": 3},
+                {"matrix": [3, 9], "x": 9.75, "y": 3},
+                {"matrix": [3, 10], "x": 10.75, "y": 3},
+                {"matrix": [3, 11], "x": 11.75, "y": 3},
+                {"matrix": [3, 12], "x": 12.75, "y": 3},
+                {"matrix": [3, 13], "x": 13.75, "y": 3},
+                {"matrix": [3, 14], "x": 14.75, "y": 3},
+                {"matrix": [3, 15], "x": 15.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 17.5, "y": 3},
+                {"matrix": [5, 17], "x": 18.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+
+                {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 7, "y": 4, "w": 1.25},
+                {"matrix": [5, 10], "x": 8.25, "y": 4, "w": 6.25},
+                {"matrix": [5, 12], "x": 14.5, "y": 4},
+                {"matrix": [5, 13], "x": 15.5, "y": 4},
+                {"matrix": [5, 14], "x": 16.5, "y": 4},
+                {"matrix": [5, 15], "x": 17.5, "y": 4},
+                {"matrix": [5, 16], "x": 18.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/viendi8l/viendi8l.c b/keyboards/viendi8l/viendi8l.c
index 4d0257f0dd..ea55f4efa3 100644
--- a/keyboards/viendi8l/viendi8l.c
+++ b/keyboards/viendi8l/viendi8l.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 "viendi8l.h"
+#include "quantum.h"
 
 
 // Defining indicator colors
diff --git a/keyboards/viendi8l/viendi8l.h b/keyboards/viendi8l/viendi8l.h
deleted file mode 100644
index 7303e764ba..0000000000
--- a/keyboards/viendi8l/viendi8l.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Copyright 2020 Gondolindrim <gondolindrim@acheronproject.com>
-
-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 ___ KC_NO
-
-/* ┌────────────Numpad─────────────┐   ┌───────────────────────────────────────Alphas─────────────────────────────────────────────────────────────────┐
- *             ┌───┬───┬───┐                        ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐          ┌───────┐
- *         (00)│01 │02 │03 │                        │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │0G │0H │2H │          │0H     │ 2u Backspace
- * ┌───┐   ┌───┼───┼───┼───┤   ┌───┐                ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤          └─┬─────┤
- * │   │   │10 │11 │12 │13 │   │   │                │14   │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │1G │1H   │            │     │
- * │10 │   ├───┼───┼───┼───┤   │23 │    2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤         ┌──┴┐2G  │ ISO Enter
- * │   │   │20 │21 │22 │23 │   │   │    LShift      │24    │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │2F │2G      │         │3H │    │
- * ├───┤   ├───┼───┼───┼───┤   ├───┤   ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌───┬─┴───┴────┤
- * │   │   │30 │31 │32 │33 │   │   │   │34      │   │34  │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │3F │3G    │5H │   │3F │3G        │ 1u/2.75u RShift
- * │30 │   ├───┼───┼───┼───┤   │33 │   └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤   └───┴──────────┘
- * │   │   │40 │41 │42 │43 │   │   │                │44  │46  │47  │5A                      │5C │5D │5E │5F │5G │   ┌──────┬───┬───┐
- * └───┘   └───┴───┴───┴───┘   └───┘                └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘   │3F    │3G │5H │ 1.75u RShift/1u/1u
- *         ┌───────┐                                                                        ┌────┬────┬────┬────┐   └──────┴───┴───┘
- *         │41     │                                                     Standard (4x1.25u) │5C  │5D  │5F  │5G  │
- *         └───────┘                                                                        └────┴────┴────┴────┘
- *             ┌───────┐
- *             │42     │
- *             └───────┘
- */
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03,   K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K2H, \
-    K10, K11, K12, K13,   K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \
-    K20, K21, K22, K23,   K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K3H, K2G, \
-    K30, K31, K32, K33,   K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K5H, \
-    K40, K41, K42, K43,   K44, K46, K47,                K5A,           K5C, K5D, K5E, K5F, K5G  \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H }, \
-	{ K40, K41, K42, K43, K44, ___, K46, K47, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
-	{ ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, K5A, ___, K5C, K5D, K5E, K5F, K5G, K5H }  \
-}