Move remaining `LAYOUT`s to data driven (#20422)

2 files changed, 96 insertions, 92 deletions

diff --git a/keyboards/matthewdias/m3n3van/info.json b/keyboards/matthewdias/m3n3van/info.json
index 5b7cafa2da..4b9a31aefc 100644
--- a/keyboards/matthewdias/m3n3van/info.json
+++ b/keyboards/matthewdias/m3n3van/info.json
@@ -23,50 +23,102 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "Q", "x": 1, "y": 0 },
-                { "label": "W", "x": 2, "y": 0 },
-                { "label": "E", "x": 3, "y": 0 },
-                { "label": "R", "x": 4, "y": 0 },
-                { "label": "T", "x": 5, "y": 0 },
-                { "label": "Y", "x": 6, "y": 0 },
-                { "label": "U", "x": 7, "y": 0 },
-                { "label": "I", "x": 8, "y": 0 },
-                { "label": "O", "x": 9, "y": 0 },
-                { "label": "P", "x": 10, "y": 0 },
-                { "label": "Backspace", "x": 11, "y": 0, "w": 1.75 },
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.25 },
-                { "label": "A", "x": 1.25, "y": 1 },
-                { "label": "S", "x": 2.25, "y": 1 },
-                { "label": "D", "x": 3.25, "y": 1 },
-                { "label": "F", "x": 4.25, "y": 1 },
-                { "label": "G", "x": 5.25, "y": 1 },
-                { "label": "H", "x": 6.25, "y": 1 },
-                { "label": "J", "x": 7.25, "y": 1 },
-                { "label": "K", "x": 8.25, "y": 1 },
-                { "label": "L", "x": 9.25, "y": 1 },
-                { "label": ";", "x": 10.25, "y": 1 },
-                { "label": "Enter", "x": 11.25, "y": 1, "w": 1.5 },
-                { "label": "Shift", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "Z", "x": 1.75, "y": 2 },
-                { "label": "X", "x": 2.75, "y": 2 },
-                { "label": "C", "x": 3.75, "y": 2 },
-                { "label": "V", "x": 4.75, "y": 2 },
-                { "label": "B", "x": 5.75, "y": 2 },
-                { "label": "N", "x": 6.75, "y": 2 },
-                { "label": "M", "x": 7.75, "y": 2 },
-                { "label": "<", "x": 8.75, "y": 2 },
-                { "label": ">", "x": 9.75, "y": 2 },
-                { "label": "/", "x": 10.75, "y": 2 },
-                { "label": "Shift", "x": 11.75, "y": 2 },
-                { "label": "Ctrl", "x": 0, "y": 3 },
-                { "label": "Alt", "x": 1, "y": 3, "w": 1.25 },
-                { "label": "Meta", "x": 2.25, "y": 3 },
-                { "x": 3.25, "y": 3, "w": 3 },
-                { "x": 6.25, "y": 3, "w": 3 },
-                { "label": "Meta", "x": 9.25, "y": 3, "w": 1.25 },
-                { "label": "Alt", "x": 10.5, "y": 3 },
-                { "label": "Ctrl", "x": 11.5, "y": 3, "w": 1.25 }
+                {"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},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 12], "x": 11, "y": 0, "w": 1.75},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [1, 1], "x": 1.25, "y": 1},
+                {"matrix": [1, 2], "x": 2.25, "y": 1},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+                {"matrix": [1, 8], "x": 8.25, "y": 1},
+                {"matrix": [1, 9], "x": 9.25, "y": 1},
+                {"matrix": [1, 10], "x": 10.25, "y": 1},
+                {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 4], "x": 3.25, "y": 3, "w": 3},
+                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3, "w": 1.25},
+                {"matrix": [3, 11], "x": 10.5, "y": 3},
+                {"matrix": [3, 12], "x": 11.5, "y": 3, "w": 1.25}
+            ]
+        },
+        "LAYOUT_encoder": {
+            "layout": [
+                {"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},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [1, 0], "x": 13, "y": 0},
+                {"matrix": [1, 1], "x": 14, "y": 0},
+                {"matrix": [1, 2], "x": 15, "y": 0},
+                {"matrix": [1, 3], "x": 16, "y": 0},
+                {"matrix": [1, 4], "x": 17, "y": 0},
+                {"matrix": [1, 5], "x": 18, "y": 0},
+                {"matrix": [1, 6], "x": 19, "y": 0},
+                {"matrix": [1, 7], "x": 20, "y": 0},
+                {"matrix": [1, 8], "x": 21, "y": 0},
+                {"matrix": [1, 9], "x": 22, "y": 0},
+                {"matrix": [1, 10], "x": 23, "y": 0},
+                {"matrix": [1, 12], "x": 24, "y": 0},
+                {"matrix": [2, 0], "x": 25, "y": 0},
+                {"matrix": [2, 2], "x": 26, "y": 0},
+                {"matrix": [2, 3], "x": 27, "y": 0},
+                {"matrix": [2, 4], "x": 28, "y": 0},
+                {"matrix": [2, 5], "x": 29, "y": 0},
+                {"matrix": [2, 6], "x": 30, "y": 0},
+                {"matrix": [2, 7], "x": 31, "y": 0},
+                {"matrix": [2, 8], "x": 32, "y": 0},
+                {"matrix": [2, 9], "x": 33, "y": 0},
+                {"matrix": [2, 10], "x": 34, "y": 0},
+                {"matrix": [2, 11], "x": 35, "y": 0},
+                {"matrix": [2, 12], "x": 36, "y": 0},
+                {"matrix": [3, 0], "x": 37, "y": 0},
+                {"matrix": [3, 1], "x": 38, "y": 0},
+                {"matrix": [3, 2], "x": 39, "y": 0},
+                {"matrix": [3, 4], "x": 40, "y": 0},
+                {"matrix": [3, 7], "x": 41, "y": 0},
+                {"matrix": [3, 9], "x": 42, "y": 0},
+                {"matrix": [3, 11], "x": 43, "y": 0},
+                {"matrix": [3, 12], "x": 44, "y": 0}
             ]
         }
     }
diff --git a/keyboards/matthewdias/m3n3van/m3n3van.h b/keyboards/matthewdias/m3n3van/m3n3van.h
deleted file mode 100644
index be9efe7e54..0000000000
--- a/keyboards/matthewdias/m3n3van/m3n3van.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-Copyright 2021 Matthew Dias <matthewdias@me.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 XXX KC_NO
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A,      K0C, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,      K1C, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
-    K30, K31, K32,      K34,           K37,      K39,      K3B, K3C  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, XXX, K0C }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
-    { K30, K31, K32, XXX, K34, XXX, XXX, K37, XXX, K39, XXX, K3B, K3C }  \
-}
-
-#define LAYOUT_encoder( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,      K1C, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
-    K30, K31, K32,      K34,           K37,      K39,      K3B, K3C  \
-) \
-{ \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
-    { K30, K31, K32, XXX, K34, XXX, XXX, K37, XXX, K39, XXX, K3B, K3C }  \
-}