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

3 files changed, 111 insertions, 134 deletions

diff --git a/keyboards/flx/virgo/info.json b/keyboards/flx/virgo/info.json
index 3a022fcf37..f7ce772482 100644
--- a/keyboards/flx/virgo/info.json
+++ b/keyboards/flx/virgo/info.json
@@ -25,97 +25,116 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (C6,F0)", "x":0, "y":0},
-                {"label":"K01 (C6,F1)", "x":1.5, "y":0},
-                {"label":"K11 (B6,F1)", "x":2.5, "y":0},
-                {"label":"K02 (C6,F4)", "x":3.5, "y":0},
-                {"label":"K12 (B6,F4)", "x":4.5, "y":0},
-                {"label":"K03 (C6,F5)", "x":6, "y":0},
-                {"label":"K13 (B6,F5)", "x":9, "y":0},
-                {"label":"K04 (C6,F6)", "x":10, "y":0},
-                {"label":"K14 (B6,F6)", "x":11, "y":0},
-                {"label":"K05 (C6,F7)", "x":12.5, "y":0},
-                {"label":"K15 (B6,F7)", "x":13.5, "y":0},
-                {"label":"K06 (C6,C7)", "x":14.5, "y":0},
-                {"label":"K16 (B6,C7)", "x":15.5, "y":0},
-                {"label":"K07 (C6,B0)", "x":17.25, "y":0},
-                {"label":"K17 (B6,B0)", "x":18.25, "y":0},
-                {"label":"K08 (C6,B1)", "x":19.25, "y":0},
-                {"label":"K20 (B5,F0)", "x":0, "y":1.25},
-                {"label":"K30 (B4,F0)", "x":1, "y":1.25},
-                {"label":"K21 (B5,F1)", "x":2, "y":1.25},
-                {"label":"K31 (B4,F1)", "x":3, "y":1.25},
-                {"label":"K22 (B5,F4)", "x":4, "y":1.25},
-                {"label":"K32 (B4,F4)", "x":5, "y":1.25},
-                {"label":"K23 (B5,F5)", "x":6, "y":1.25},
-                {"label":"K33 (B4,F5)", "x":9, "y":1.25},
-                {"label":"K24 (B5,F6)", "x":10, "y":1.25},
-                {"label":"K34 (B4,F6)", "x":11, "y":1.25},
-                {"label":"K25 (B5,F7)", "x":12, "y":1.25},
-                {"label":"K35 (B4,F7)", "x":13, "y":1.25},
-                {"label":"K26 (B5,C7)", "x":14, "y":1.25},
-                {"label":"K36 (B4,C7)", "x":15, "y":1.25},
-                {"label":"K66 (D4,C7)", "x":16, "y":1.25},
-                {"label":"K27 (B5,B0)", "x":17.25, "y":1.25},
-                {"label":"K37 (B4,B0)", "x":18.25, "y":1.25},
-                {"label":"K28 (B5,B1)", "x":19.25, "y":1.25},
-                {"label":"K40 (D7,F0)", "x":0, "y":2.25, "w":1.5},
-                {"label":"K50 (D6,F0)", "x":1.5, "y":2.25},
-                {"label":"K41 (D7,F1)", "x":2.5, "y":2.25},
-                {"label":"K51 (D6,F1)", "x":3.5, "y":2.25},
-                {"label":"K42 (D7,F4)", "x":4.5, "y":2.25},
-                {"label":"K52 (D6,F4)", "x":5.5, "y":2.25},
-                {"label":"K43 (D7,F5)", "x":8.5, "y":2.25},
-                {"label":"K53 (D6,F5)", "x":9.5, "y":2.25},
-                {"label":"K44 (D7,F6)", "x":10.5, "y":2.25},
-                {"label":"K54 (D6,F6)", "x":11.5, "y":2.25},
-                {"label":"K45 (D7,F7)", "x":12.5, "y":2.25},
-                {"label":"K55 (D6,F7)", "x":13.5, "y":2.25},
-                {"label":"K46 (D7,C7)", "x":14.5, "y":2.25},
-                {"label":"K56 (D6,C7)", "x":15.5, "y":2.25, "w":1.5},
-                {"label":"K47 (D7,B0)", "x":17.25, "y":2.25},
-                {"label":"K57 (D6,B0)", "x":18.25, "y":2.25},
-                {"label":"K48 (D7,B1)", "x":19.25, "y":2.25},
-                {"label":"K60 (D4,F0)", "x":0, "y":3.25, "w":1.75},
-                {"label":"K70 (D5,F0)", "x":1.75, "y":3.25},
-                {"label":"K61 (D4,F1)", "x":2.75, "y":3.25},
-                {"label":"K71 (D5,F1)", "x":3.75, "y":3.25},
-                {"label":"K62 (D4,F4)", "x":4.75, "y":3.25},
-                {"label":"K72 (D5,F4)", "x":5.75, "y":3.25},
-                {"label":"K63 (D4,F5)", "x":8.75, "y":3.25},
-                {"label":"K73 (D5,F5)", "x":9.75, "y":3.25},
-                {"label":"K64 (D4,F6)", "x":10.75, "y":3.25},
-                {"label":"K74 (D5,F6)", "x":11.75, "y":3.25},
-                {"label":"K65 (D4,F7)", "x":12.75, "y":3.25},
-                {"label":"K75 (D5,F7)", "x":13.75, "y":3.25},
-                {"label":"K76 (D5,C7)", "x":14.75, "y":3.25, "w":2.25},
-                {"label":"K80 (D3,F0)", "x":0, "y":4.25, "w":1.25},
-                {"label":"K90 (D2,F0)", "x":1.25, "y":4.25},
-                {"label":"K81 (D3,F1)", "x":2.25, "y":4.25},
-                {"label":"K91 (D2,F1)", "x":3.25, "y":4.25},
-                {"label":"K82 (D3,F4)", "x":4.25, "y":4.25},
-                {"label":"K92 (D2,F4)", "x":5.25, "y":4.25},
-                {"label":"K83 (D3,F5)", "x":6.25, "y":4.25},
-                {"label":"KA3 (D1,F5)", "x":8.25, "y":4.25},
-                {"label":"K93 (D2,F5)", "x":9.25, "y":4.25},
-                {"label":"K84 (D3,F6)", "x":10.25, "y":4.25},
-                {"label":"K94 (D2,F6)", "x":11.25, "y":4.25},
-                {"label":"K85 (D3,F7)", "x":12.25, "y":4.25},
-                {"label":"K95 (D2,F7)", "x":13.25, "y":4.25},
-                {"label":"K86 (D3,C7)", "x":14.25, "y":4.25, "w":1.75},
-                {"label":"K96 (D2,C7)", "x":16, "y":4.25},
-                {"label":"K97 (D2,B0)", "x":18.25, "y":4.25},
-                {"label":"KA0 (D1,F0)", "x":0, "y":5.25, "w":1.5},
-                {"label":"KB0 (D0,F0)", "x":2.5, "y":5.25, "w":1.5},
-                {"label":"KA1 (D1,F1)", "x":4, "y":5.25},
-                {"label":"KB2 (D0,F4)", "x":5, "y":5.25, "w":2.25},
-                {"label":"KB4 (D0,F6)", "x":8.25, "y":5.25, "w":2.75},
-                {"label":"KB5 (D0,F7)", "x":11, "y":5.25},
-                {"label":"KA6 (D1,C7)", "x":12, "y":5.25, "w":1.5},
-                {"label":"KB6 (D0,C7)", "x":14.5, "y":5.25, "w":1.5},
-                {"label":"KA7 (D1,B0)", "x":17.25, "y":5.25},
-                {"label":"KB7 (D0,B0)", "x":18.25, "y":5.25},
-                {"label":"KA8 (D1,B1)", "x":19.25, "y":5.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [1, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+                {"matrix": [1, 2], "x": 4.5, "y": 0},
+
+                {"matrix": [0, 3], "x": 6, "y": 0},
+
+                {"matrix": [1, 3], "x": 9, "y": 0},
+                {"matrix": [0, 4], "x": 10, "y": 0},
+                {"matrix": [1, 4], "x": 11, "y": 0},
+
+                {"matrix": [0, 5], "x": 12.5, "y": 0},
+                {"matrix": [1, 5], "x": 13.5, "y": 0},
+                {"matrix": [0, 6], "x": 14.5, "y": 0},
+                {"matrix": [1, 6], "x": 15.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 17.25, "y": 0},
+                {"matrix": [1, 7], "x": 18.25, "y": 0},
+                {"matrix": [0, 8], "x": 19.25, "y": 0},
+
+                {"matrix": [2, 0], "x": 0, "y": 1.25},
+                {"matrix": [3, 0], "x": 1, "y": 1.25},
+                {"matrix": [2, 1], "x": 2, "y": 1.25},
+                {"matrix": [3, 1], "x": 3, "y": 1.25},
+                {"matrix": [2, 2], "x": 4, "y": 1.25},
+                {"matrix": [3, 2], "x": 5, "y": 1.25},
+                {"matrix": [2, 3], "x": 6, "y": 1.25},
+
+                {"matrix": [3, 3], "x": 9, "y": 1.25},
+                {"matrix": [2, 4], "x": 10, "y": 1.25},
+                {"matrix": [3, 4], "x": 11, "y": 1.25},
+                {"matrix": [2, 5], "x": 12, "y": 1.25},
+                {"matrix": [3, 5], "x": 13, "y": 1.25},
+                {"matrix": [2, 6], "x": 14, "y": 1.25},
+                {"matrix": [3, 6], "x": 15, "y": 1.25},
+                {"matrix": [6, 6], "x": 16, "y": 1.25},
+
+                {"matrix": [2, 7], "x": 17.25, "y": 1.25},
+                {"matrix": [3, 7], "x": 18.25, "y": 1.25},
+                {"matrix": [2, 8], "x": 19.25, "y": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+                {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+                {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+                {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+                {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+
+                {"matrix": [4, 3], "x": 8.5, "y": 2.25},
+                {"matrix": [5, 3], "x": 9.5, "y": 2.25},
+                {"matrix": [4, 4], "x": 10.5, "y": 2.25},
+                {"matrix": [5, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [4, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [5, 5], "x": 13.5, "y": 2.25},
+                {"matrix": [4, 6], "x": 14.5, "y": 2.25},
+                {"matrix": [5, 6], "x": 15.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [4, 7], "x": 17.25, "y": 2.25},
+                {"matrix": [5, 7], "x": 18.25, "y": 2.25},
+                {"matrix": [4, 8], "x": 19.25, "y": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+                {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+                {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+                {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+                {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+
+                {"matrix": [6, 3], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 9.75, "y": 3.25},
+                {"matrix": [6, 4], "x": 10.75, "y": 3.25},
+                {"matrix": [7, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [6, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [7, 5], "x": 13.75, "y": 3.25},
+                {"matrix": [7, 6], "x": 14.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+                {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+                {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+                {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+
+                {"matrix": [10, 3], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 9.25, "y": 4.25},
+                {"matrix": [8, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 11.25, "y": 4.25},
+                {"matrix": [8, 5], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 5], "x": 13.25, "y": 4.25},
+                {"matrix": [8, 6], "x": 14.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 6], "x": 16, "y": 4.25},
+
+                {"matrix": [9, 7], "x": 18.25, "y": 4.25},
+
+                {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 0], "x": 2.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 1], "x": 4, "y": 5.25},
+                {"matrix": [11, 2], "x": 5, "y": 5.25, "w": 2.25},
+
+                {"matrix": [11, 4], "x": 8.25, "y": 5.25, "w": 2.75},
+                {"matrix": [11, 5], "x": 11, "y": 5.25},
+                {"matrix": [10, 6], "x": 12, "y": 5.25, "w": 1.5},
+                {"matrix": [11, 6], "x": 14.5, "y": 5.25, "w": 1.5},
+
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25},
+                {"matrix": [11, 7], "x": 18.25, "y": 5.25},
+                {"matrix": [10, 8], "x": 19.25, "y": 5.25}
             ]
         }
     }
diff --git a/keyboards/flx/virgo/virgo.c b/keyboards/flx/virgo/virgo.c
index 679f90fb66..5260e15322 100644
--- a/keyboards/flx/virgo/virgo.c
+++ b/keyboards/flx/virgo/virgo.c
@@ -14,7 +14,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 "virgo.h"
+#include "quantum.h"
 
 void matrix_init_kb(void) {
     // put your keyboard start-up code here
diff --git a/keyboards/flx/virgo/virgo.h b/keyboards/flx/virgo/virgo.h
deleted file mode 100644
index fcfcac50e4..0000000000
--- a/keyboards/flx/virgo/virgo.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2019 MechMerlin
- * Edits etc 2020 Flexerm
- *
- * 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 LAYOUT( \
-    K00,        K01,  K11,  K02,  K12,  K03,              K13,  K04,  K14,  K05,  K15,  K06,  K16,          K07,  K17,  K08, \
-    K20,  K30,  K21,  K31,  K22,  K32,  K23,              K33,  K24,  K34,  K25,  K35,  K26,  K36,  K66,    K27,  K37,  K28, \
-    K40,        K50,  K41,  K51,  K42,  K52,              K43,  K53,  K44,  K54,  K45,  K55,  K46,  K56,    K47,  K57,  K48, \
-    K60,        K70,  K61,  K71,  K62,  K72,              K63,  K73,  K64,  K74,  K65,  K75,  K76,                           \
-    K80,  K90,  K81,  K91,  K82,  K92,  K83,        KA3,  K93,  K84,  K94,  K85,  K95,  K86,  K96,                K97,       \
-    KA0,        KB0,  KA1,        KB2,                    KB4,              KB5,  KA6,        KB6,          KA7,  KB7,  KA8  \
-) { \
-    { K00,    K01,    K02,    K03,    K04,    K05,    K06,    K07,    K08    }, \
-    { KC_NO,  K11,    K12,    K13,    K14,    K15,    K16,    K17,    KC_NO  }, \
-    { K20,    K21,    K22,    K23,    K24,    K25,    K26,    K27,    K28    }, \
-    { K30,    K31,    K32,    K33,    K34,    K35,    K36,    K37,    KC_NO  }, \
-    { K40,    K41,    K42,    K43,    K44,    K45,    K46,    K47,    K48    }, \
-    { K50,    K51,    K52,    K53,    K54,    K55,    K56,    K57,    KC_NO  }, \
-    { K60,    K61,    K62,    K63,    K64,    K65,    K66,    KC_NO,  KC_NO  }, \
-    { K70,    K71,    K72,    K73,    K74,    K75,    K76,    KC_NO,  KC_NO  }, \
-    { K80,    K81,    K82,    K83,    K84,    K85,    K86,    KC_NO,  KC_NO  }, \
-    { K90,    K91,    K92,    K93,    K94,    K95,    K96,    K97,    KC_NO  }, \
-    { KA0,    KA1,    KC_NO,  KA3,    KC_NO,  KC_NO,  KA6,    KA7,    KA8    }, \
-    { KB0,    KC_NO,  KB2,    KC_NO,  KB4,    KB5,    KB6,    KB7,    KC_NO  }, \
-}
-