Move remaining `LAYOUT_all`s to data driven (#20463)

2 files changed, 98 insertions, 151 deletions

diff --git a/keyboards/ocean/wang_ergo/info.json b/keyboards/ocean/wang_ergo/info.json
index 596bc46b1b..c09340a92f 100644
--- a/keyboards/ocean/wang_ergo/info.json
+++ b/keyboards/ocean/wang_ergo/info.json
@@ -21,106 +21,114 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":1, "y":0},
-                {"label":"Q", "x":2, "y":0},
-                {"label":"W", "x":3, "y":0},
-                {"label":"E", "x":4, "y":0},
-                {"label":"R", "x":5, "y":0},
-                {"label":"T", "x":6, "y":0},
-                {"label":"Y", "x":8, "y":0},
-                {"label":"U", "x":9, "y":0},
-                {"label":"I", "x":10, "y":0},
-                {"label":"O", "x":11, "y":0},
-                {"label":"P", "x":12, "y":0},
-                {"label":"Del", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
 
-                {"label":"Tab", "x":0.75, "y":1, "w":1.25},
-                {"label":"A", "x":2, "y":1},
-                {"label":"S", "x":3, "y":1},
-                {"label":"D", "x":4, "y":1},
-                {"label":"F", "x":5, "y":1},
-                {"label":"G", "x":6, "y":1},
-                {"label":"H", "x":8, "y":1},
-                {"label":"J", "x":9, "y":1},
-                {"label":"K", "x":10, "y":1},
-                {"label":"L", "x":11, "y":1},
-                {"label":";:", "x":12, "y":1},
-                {"label":"Enter", "x":13, "y":1, "w":1.75},
+                {"matrix": [0, 6], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [3, 10], "x": 14, "y": 0},
 
-                {"label":"Shift", "x":0.25, "y":2, "w":1.75},
-                {"label":"Z", "x":2, "y":2},
-                {"label":"X", "x":3, "y":2},
-                {"label":"C", "x":4, "y":2},
-                {"label":"V", "x":5, "y":2},
-                {"label":"B", "x":6, "y":2},
-                {"label":"N", "x":8, "y":2},
-                {"label":"M", "x":9, "y":2},
-                {"label":",<", "x":10, "y":2},
-                {"label":".>", "x":11, "y":2},
-                {"label":"/?", "x":12, "y":2},
-                {"label":"Fn", "x":13, "y":2, "w":1.25},
+                {"matrix": [1, 0], "x": 0.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"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},
 
-                {"label":"Ctrl", "x":0, "y":3},
-                {"label":"GUI", "x":1, "y":3},
-                {"label":"Alt", "x":4, "y":3},
-                {"label":"Space", "x":5, "y":3},
-                {"label":"Space", "x":6, "y":3},
-                {"label":"Space", "x":8, "y":3},
-                {"label":"Space", "x":9, "y":3},
-                {"label":"Alt", "x":10, "y":3},
-                {"label":"Ctrl", "x":13, "y":3}
+                {"matrix": [1, 6], "x": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"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": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2, "w": 1.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+
+                {"matrix": [3, 6], "x": 8, "y": 3},
+                {"matrix": [3, 7], "x": 9, "y": 3},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 13, "y": 3}
             ]
         },
         "LAYOUT_2x2u": {
             "layout": [
-                {"label":"Esc", "x":1, "y":0},
-                {"label":"Q", "x":2, "y":0},
-                {"label":"W", "x":3, "y":0},
-                {"label":"E", "x":4, "y":0},
-                {"label":"R", "x":5, "y":0},
-                {"label":"T", "x":6, "y":0},
-                {"label":"Y", "x":8, "y":0},
-                {"label":"U", "x":9, "y":0},
-                {"label":"I", "x":10, "y":0},
-                {"label":"O", "x":11, "y":0},
-                {"label":"P", "x":12, "y":0},
-                {"label":"Del", "x":13, "y":0},
-                {"label":"Backspace", "x":14, "y":0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+                {"matrix": [0, 5], "x": 6, "y": 0},
+
+                {"matrix": [0, 6], "x": 8, "y": 0},
+                {"matrix": [0, 7], "x": 9, "y": 0},
+                {"matrix": [0, 8], "x": 10, "y": 0},
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [3, 10], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.75, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"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": 8, "y": 1},
+                {"matrix": [1, 7], "x": 9, "y": 1},
+                {"matrix": [1, 8], "x": 10, "y": 1},
+                {"matrix": [1, 9], "x": 11, "y": 1},
+                {"matrix": [1, 10], "x": 12, "y": 1},
+                {"matrix": [1, 11], "x": 13, "y": 1, "w": 1.75},
+
+                {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2},
+                {"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},
 
-                {"label":"Tab", "x":0.75, "y":1, "w":1.25},
-                {"label":"A", "x":2, "y":1},
-                {"label":"S", "x":3, "y":1},
-                {"label":"D", "x":4, "y":1},
-                {"label":"F", "x":5, "y":1},
-                {"label":"G", "x":6, "y":1},
-                {"label":"H", "x":8, "y":1},
-                {"label":"J", "x":9, "y":1},
-                {"label":"K", "x":10, "y":1},
-                {"label":"L", "x":11, "y":1},
-                {"label":";:", "x":12, "y":1},
-                {"label":"Enter", "x":13, "y":1, "w":1.75},
+                {"matrix": [2, 6], "x": 8, "y": 2},
+                {"matrix": [2, 7], "x": 9, "y": 2},
+                {"matrix": [2, 8], "x": 10, "y": 2},
+                {"matrix": [2, 9], "x": 11, "y": 2},
+                {"matrix": [2, 10], "x": 12, "y": 2},
+                {"matrix": [2, 11], "x": 13, "y": 2, "w": 1.25},
 
-                {"label":"Shift", "x":0.25, "y":2, "w":1.75},
-                {"label":"Z", "x":2, "y":2},
-                {"label":"X", "x":3, "y":2},
-                {"label":"C", "x":4, "y":2},
-                {"label":"V", "x":5, "y":2},
-                {"label":"B", "x":6, "y":2},
-                {"label":"N", "x":8, "y":2},
-                {"label":"M", "x":9, "y":2},
-                {"label":",<", "x":10, "y":2},
-                {"label":".>", "x":11, "y":2},
-                {"label":"/?", "x":12, "y":2},
-                {"label":"Fn", "x":13, "y":2, "w":1.25},
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
 
-                {"label":"Ctrl", "x":0, "y":3},
-                {"label":"GUI", "x":1, "y":3},
-                {"label":"Alt", "x":4, "y":3},
-                {"label":"Space", "x":5, "y":3, "w":2},
-                {"label":"Space", "x":8, "y":3, "w":2},
-                {"label":"Alt", "x":10, "y":3},
-                {"label":"Ctrl", "x":13, "y":3}
+                {"matrix": [3, 6], "x": 8, "y": 3, "w": 2},
+                {"matrix": [3, 8], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 13, "y": 3}
             ]
         }
     }
diff --git a/keyboards/ocean/wang_ergo/wang_ergo.h b/keyboards/ocean/wang_ergo/wang_ergo.h
deleted file mode 100644
index 68074c2998..0000000000
--- a/keyboards/ocean/wang_ergo/wang_ergo.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright 2021 Ocean
- *
- * 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 XXX KC_NO
-
-/*
- *     ┌───┬───┬───┬───┬───┬───┐   ┌───┬───┬───┬───┬───┬───┬───┐
- *     │00 │01 │02 │03 │04 │05 │   │06 │07 │08 │09 │0A │0B │3A │
- *    ┌┴───┼───┼───┼───┼───┼───┤   ├───┼───┼───┼───┼───┼───┴──┬┘
- *    │10  │11 │12 │13 │14 │15 │   │16 │17 │18 │19 │1A │1B    │
- *  ┌─┴────┼───┼───┼───┼───┼───┤   ├───┼───┼───┼───┼───┼────┬─┘
- *  │20    │21 │22 │23 │24 │25 │   │26 │27 │28 │29 │2A │2B  │
- * ┌┴──┬───┼───┴───┼───┼───┼───┤   ├───┼───┼───┼───┴───┼───┬┘
- * │30 │31 │       │33 │34 │35 │   │36 │37 │38 │       │3B │
- * └───┴───┘       └───┴───┴───┘   └───┴───┴───┘       └───┘
- *                     ┌───────┐   ┌───────┐
- *                     │35     │   │36     │
- *                     └───────┘   └───────┘
- */
-
-#define LAYOUT_all(\
-  K00, K01, K02, K03, K04, K05,   K06, K07, K08, K09, K0A, K0B, K3A, \
-  K10, K11, K12, K13, K14, K15,   K16, K17, K18, K19, K1A, K1B,      \
-  K20, K21, K22, K23, K24, K25,   K26, K27, K28, K29, K2A, K2B,      \
-  K30, K31,      K33, K34, K35,   K36, K37, K38,           K3B       \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-  { K30, K31, XXX, K33, K34, K35, K36, K37, K38, XXX, K3A, K3B }, \
-}
-
-#define LAYOUT_2x2u(\
-  K00, K01, K02, K03, K04, K05,   K06, K07, K08, K09, K0A, K0B, K3A, \
-  K10, K11, K12, K13, K14, K15,   K16, K17, K18, K19, K1A, K1B,      \
-  K20, K21, K22, K23, K24, K25,   K26, K27, K28, K29, K2A, K2B,      \
-  K30, K31,      K33,      K35,   K36,      K38,           K3B       \
-) \
-{ \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \
-  { K30, K31, XXX, K33, XXX, K35, K36, XXX, K38, XXX, K3A, K3B }, \
-}