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

2 files changed, 51 insertions, 93 deletions

diff --git a/keyboards/v4n4g0rth0n/info.json b/keyboards/v4n4g0rth0n/info.json
index f538b8773d..4d0371e01f 100644
--- a/keyboards/v4n4g0rth0n/info.json
+++ b/keyboards/v4n4g0rth0n/info.json
@@ -15,60 +15,61 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"1", "x":0.5, "y":0},
-                {"label":"2", "x":1.5, "y":0},
-                {"label":"3", "x":2.5, "y":0},
-                {"label":"4", "x":3.5, "y":0},
-                {"label":"5", "x":4.5, "y":0},
-                {"label":"6", "x":5.5, "y":0},
-                {"label":"Tab", "x":0, "y":1},
+                {"label": "1", "matrix": [0, 0], "x": 0.5, "y": 0},
+                {"label": "2", "matrix": [0, 1], "x": 1.5, "y": 0},
+                {"label": "3", "matrix": [0, 2], "x": 2.5, "y": 0},
+                {"label": "4", "matrix": [0, 3], "x": 3.5, "y": 0},
+                {"label": "5", "matrix": [0, 4], "x": 4.5, "y": 0},
+                {"label": "6", "matrix": [0, 5], "x": 5.5, "y": 0},
 
-                {"label":"Q", "x":1, "y":1},
-                {"label":"W", "x":2, "y":1},
-                {"label":"E", "x":3, "y":1},
-                {"label":"R", "x":4, "y":1},
-                {"label":"T", "x":5, "y":1},
-                {"label":"Y", "x":6.75, "y":1},
-                {"label":"U", "x":7.75, "y":1},
-                {"label":"I", "x":8.75, "y":1},
-                {"label":"O", "x":9.75, "y":1},
-                {"label":"P", "x":10.75, "y":1},
-                {"label":"Back Space", "x":11.75, "y":1},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1},
+                {"label": "Q", "matrix": [1, 1], "x": 1, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 3, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 4, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 5, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 6.75, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 7.75, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 8.75, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 9.75, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 10.75, "y": 1},
+                {"label": "Back Space", "matrix": [1, 11], "x": 11.75, "y": 1},
 
-                {"label":"Esc", "x":0, "y":2},
-                {"label":"A", "x":1, "y":2},
-                {"label":"S", "x":2, "y":2},
-                {"label":"D", "x":3, "y":2},
-                {"label":"F", "x":4, "y":2},
-                {"label":"G", "x":5, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
+                {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 2},
+                {"label": "A", "matrix": [2, 1], "x": 1, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 3, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 4, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 5, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
 
-                {"label":"Shift", "x":0, "y":3},
-                {"label":"Z", "x":1, "y":3},
-                {"label":"X", "x":2, "y":3},
-                {"label":"C", "x":3, "y":3},
-                {"label":"V", "x":4, "y":3},
-                {"label":"B", "x":5, "y":3},
-                {"label":"N", "x":6.75, "y":3},
-                {"label":"M", "x":7.75, "y":3},
-                {"label":",", "x":8.75, "y":3},
-                {"label":".", "x":9.75, "y":3},
-                {"label":"↑", "x":10.75, "y":3},
-                {"label":"Return", "x":11.75, "y":3},
+                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "Z", "matrix": [3, 1], "x": 1, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 2, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 3, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 4, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 5, "y": 3},
+                {"label": "N", "matrix": [3, 6], "x": 6.75, "y": 3},
+                {"label": "M", "matrix": [3, 7], "x": 7.75, "y": 3},
+                {"label": ",", "matrix": [3, 8], "x": 8.75, "y": 3},
+                {"label": ".", "matrix": [3, 9], "x": 9.75, "y": 3},
+                {"label": "↑", "matrix": [3, 10], "x": 10.75, "y": 3},
+                {"label": "Return", "matrix": [3, 11], "x": 11.75, "y": 3},
 
-                {"label":"Gui", "x":0, "y":4},
-                {"label":"Ctrl", "x":1, "y":4},
-                {"label":"Alt", "x":2, "y":4},
-                {"label":"Space", "x":3, "y":4, "w":3},
-                {"label":"Enter", "x":6.75, "y":4, "w":3},
-                {"label":"←", "x":9.75, "y":4},
-                {"label":"↓", "x":10.75, "y":4},
-                {"label":"→", "x":11.75, "y":4}]
+                {"label": "Gui", "matrix": [4, 0], "x": 0, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 1], "x": 1, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 2, "y": 4},
+                {"label": "Space", "matrix": [4, 4], "x": 3, "y": 4, "w": 3},
+                {"label": "Enter", "matrix": [4, 7], "x": 6.75, "y": 4, "w": 3},
+                {"label": "←", "matrix": [4, 9], "x": 9.75, "y": 4},
+                {"label": "↓", "matrix": [4, 10], "x": 10.75, "y": 4},
+                {"label": "→", "matrix": [4, 11], "x": 11.75, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/v4n4g0rth0n/v4n4g0rth0n.h b/keyboards/v4n4g0rth0n/v4n4g0rth0n.h
deleted file mode 100644
index 7c8edfeb12..0000000000
--- a/keyboards/v4n4g0rth0n/v4n4g0rth0n.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2021 jpuerto
- *
- * 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
-
-/* This is 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( \
-    k00, k01, k02, k03, k04, k05, \
-    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, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
-    k40, k41, k42,      k44,           k47,      k49, k4A, k4B \
-) { \
-    { k00, k01, k02, k03, k04, k05, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { 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, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
-    { k40, k41, k42, XXX, k44, XXX, XXX, k47, XXX, k49, k4A, k4B } \
-}