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

2 files changed, 72 insertions, 107 deletions

diff --git a/keyboards/ubest/vn/info.json b/keyboards/ubest/vn/info.json
index fc28aa5bea..0183f09afe 100644
--- a/keyboards/ubest/vn/info.json
+++ b/keyboards/ubest/vn/info.json
@@ -30,82 +30,82 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-				{"label":"K00 (E6,F0)", "x":0, "y":0},
-                {"label":"K01 (E6,F1)", "x":1, "y":0},
-                {"label":"K02 (E6,F4)", "x":2, "y":0},
-                {"label":"K03 (E6,F5)", "x":3, "y":0},
-                {"label":"K04 (E6,F6)", "x":4, "y":0},
-                {"label":"K05 (E6,F7)", "x":5, "y":0},
-                {"label":"K06 (E6,C7)", "x":6, "y":0},
-                {"label":"K07 (E6,C6)", "x":7, "y":0},
-                {"label":"K08 (E6,B5)", "x":8, "y":0},
-                {"label":"K09 (E6,B4)", "x":9, "y":0},
-                {"label":"K0A (E6,D7)", "x":10, "y":0},
-                {"label":"K0B (E6,D6)", "x":11, "y":0},
-                {"label":"K0C (E6,D4)", "x":12, "y":0},
-                {"label":"K0D (E6,D5)", "x":13, "y":0},
-                {"label":"K2D (B7,D5)", "x":14, "y":0},
-                {"label":"K0E (E6,D3)", "x":15, "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},
+                {"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": [0, 13], "x": 13, "y": 0},
+                {"matrix": [2, 13], "x": 14, "y": 0},
+                {"matrix": [0, 14], "x": 15, "y": 0},
 
-                {"label":"K10 (B0,F0)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (B0,F1)", "x":1.5, "y":1},
-                {"label":"K12 (B0,F4)", "x":2.5, "y":1},
-                {"label":"K13 (B0,F5)", "x":3.5, "y":1},
-                {"label":"K14 (B0,F6)", "x":4.5, "y":1},
-                {"label":"K15 (B0,F7)", "x":5.5, "y":1},
-                {"label":"K16 (B0,C7)", "x":6.5, "y":1},
-                {"label":"K17 (B0,C6)", "x":7.5, "y":1},
-                {"label":"K18 (B0,B5)", "x":8.5, "y":1},
-                {"label":"K19 (B0,B4)", "x":9.5, "y":1},
-                {"label":"K1A (B0,D7)", "x":10.5, "y":1},
-                {"label":"K1B (B0,D6)", "x":11.5, "y":1},
-                {"label":"K1C (B0,D4)", "x":12.5, "y":1},
-                {"label":"K1D (B0,D5)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K1E (B0,D3)", "x":15, "y":1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 14], "x": 15, "y": 1},
 
-                {"label":"K20 (B7,F0)", "x":0, "y":2, "w":1.75},
-                {"label":"K21 (B7,F1)", "x":1.75, "y":2},
-                {"label":"K22 (B7,F4)", "x":2.75, "y":2},
-                {"label":"K23 (B7,F5)", "x":3.75, "y":2},
-                {"label":"K24 (B7,F6)", "x":4.75, "y":2},
-                {"label":"K25 (B7,F7)", "x":5.75, "y":2},
-                {"label":"K26 (B7,C7)", "x":6.75, "y":2},
-                {"label":"K27 (B7,C6)", "x":7.75, "y":2},
-                {"label":"K28 (B7,B5)", "x":8.75, "y":2},
-                {"label":"K29 (B7,B4)", "x":9.75, "y":2},
-                {"label":"K2A (B7,D7)", "x":10.75, "y":2},
-                {"label":"K2B (B7,D6)", "x":11.75, "y":2},
-                {"label":"K2C (B7,D4)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K2E (B7,D3)", "x":15, "y":2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 14], "x": 15, "y": 2},
 
-                {"label":"K30 (D0,F0)", "x":0, "y":3, "w":1.25},
-                {"label":"K31 (D0,F1)", "x":1.25, "y":3},
-                {"label":"K32 (D0,F4)", "x":2.25, "y":3},
-                {"label":"K33 (D0,F5)", "x":3.25, "y":3},
-                {"label":"K34 (D0,F6)", "x":4.25, "y":3},
-                {"label":"K35 (D0,F7)", "x":5.25, "y":3},
-                {"label":"K36 (D0,C7)", "x":6.25, "y":3},
-                {"label":"K37 (D0,C6)", "x":7.25, "y":3},
-                {"label":"K38 (D0,B5)", "x":8.25, "y":3},
-                {"label":"K39 (D0,B4)", "x":9.25, "y":3},
-                {"label":"K3A (D0,D7)", "x":10.25, "y":3},
-                {"label":"K3B (D0,D6)", "x":11.25, "y":3},
-                {"label":"K3C (D0,D4)", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D (D0,D5)", "x":14, "y":3},
-                {"label":"K3E (D0,D3)", "x":15, "y":3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+                {"matrix": [3, 14], "x": 15, "y": 3},
 
-                {"label":"K40 (D1,F0)", "x":0, "y":4, "w":1.25},
-                {"label":"K41 (D1,F1)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K43 (D1,F5)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K47 (D1,C6)", "x":3.75, "y":4, "w":5.25},
-                {"label":"K48 (D1,B5)", "x":9, "y":4},
-                {"label":"K49 (D1,B4)", "x":10, "y":4},
-                {"label":"K4A (D1,D7)", "x":11, "y":4},
-                {"label":"K4B (D1,D6)", "x":12, "y":4},
-                {"label":"K4C (D1,D4)", "x":13, "y":4},
-                {"label":"K4D (D1,D5)", "x":14, "y":4},
-                {"label":"K4E (D1,D3)", "x":15, "y":4}
-			]
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 5.25},
+                {"matrix": [4, 8], "x": 9, "y": 4},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4},
+                {"matrix": [4, 14], "x": 15, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/ubest/vn/vn.h b/keyboards/ubest/vn/vn.h
deleted file mode 100644
index 6dedaf99f2..0000000000
--- a/keyboards/ubest/vn/vn.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 water <mfkiiyd@163.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, K0B, K0C, K0D, K2D, K0E,   \
-    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,    K1E,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,        K2E,   \
-    K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,     K3D, K3E,   \
-    K40,  K41,  K43,  K47,                       K48, K49, K4A, K4B, K4C, K4D, K4E    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   KC_NO, K43,   KC_NO, KC_NO, KC_NO, K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E   }, \
-}