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

2 files changed, 96 insertions, 125 deletions

diff --git a/keyboards/exclusive/e7v1se/e7v1se.h b/keyboards/exclusive/e7v1se/e7v1se.h
deleted file mode 100644
index c36072dc0a..0000000000
--- a/keyboards/exclusive/e7v1se/e7v1se.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2019 Bart Riemens
- *
- * 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"
-
-/* 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,   K06, K07,   K08,   K09,   K0A, K0B, K0C,          K0E,   K0F, \
-      K10, K11,   K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E,   K1F, \
-      K20,        K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   K2D,   K2E,   K2F, \
-      K30,        K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, K3C,   K3D,               \
-      K40, K41,   K42, K43,   K44,   K45,   K46, K47,   K48,   K49,   K4A, K4B,        K4D,   K4E,        \
-      K50, K51,   K52,                      K56,                      K5A, K5B,        K5D,   K5E,   K5F  \
-) { \
-    { K00, K01,   K02, K03,   K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   KC_NO, K0E,   K0F },   \
-    { K10, K11,   K12, K13,   K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E,   K1F },   \
-    { K20, KC_NO, K22, K23,   K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   K2D,   K2E,   K2F },   \
-    { K30, KC_NO, K32, K33,   K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, K3C,   K3D,   KC_NO, KC_NO }, \
-    { K40, K41,   K42, K43,   K44,   K45,   K46, K47,   K48,   K49,   K4A, K4B, KC_NO, K4D,   K4E,   KC_NO }, \
-    { K50, K51,   K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, KC_NO, K5D,   K5E,   K5F }   \
-}
diff --git a/keyboards/exclusive/e7v1se/info.json b/keyboards/exclusive/e7v1se/info.json
index f91568a28c..3244831b4d 100644
--- a/keyboards/exclusive/e7v1se/info.json
+++ b/keyboards/exclusive/e7v1se/info.json
@@ -25,88 +25,102 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "K00", "x": 0, "y": 0 },
-                { "label": "K01", "x": 1.25, "y": 0 },
-                { "label": "K02", "x": 2.25, "y": 0 },
-                { "label": "K03", "x": 3.25, "y": 0 },
-                { "label": "K04", "x": 4.25, "y": 0 },
-                { "label": "K05", "x": 5.5, "y": 0 },
-                { "label": "K06", "x": 6.5, "y": 0 },
-                { "label": "K07", "x": 7.5, "y": 0 },
-                { "label": "K08", "x": 8.5, "y": 0 },
-                { "label": "K09", "x": 9.75, "y": 0 },
-                { "label": "K0a", "x": 10.75, "y": 0 },
-                { "label": "K0b", "x": 11.75, "y": 0 },
-                { "label": "K0c", "x": 12.75, "y": 0 },
-                { "label": "K0e", "x": 14, "y": 0 },
-                { "label": "K0f", "x": 15.25, "y": 0 },
-                { "label": "K10", "x": 0, "y": 1 },
-                { "label": "K11", "x": 1, "y": 1 },
-                { "label": "K12", "x": 2, "y": 1 },
-                { "label": "K13", "x": 3, "y": 1 },
-                { "label": "K14", "x": 4, "y": 1 },
-                { "label": "K15", "x": 5, "y": 1 },
-                { "label": "K16", "x": 6, "y": 1 },
-                { "label": "K17", "x": 7, "y": 1 },
-                { "label": "K18", "x": 8, "y": 1 },
-                { "label": "K19", "x": 9, "y": 1 },
-                { "label": "K1a", "x": 10, "y": 1 },
-                { "label": "K1b", "x": 11, "y": 1 },
-                { "label": "K1c", "x": 12, "y": 1 },
-                { "label": "K1d", "x": 13, "y": 1 },
-                { "label": "K1e", "x": 14, "y": 1 },
-                { "label": "K1f", "x": 15.25, "y": 1 },
-                { "label": "K20", "x": 0, "y": 2, "w": 1.5 },
-                { "label": "K22", "x": 1.5, "y": 2 },
-                { "label": "K23", "x": 2.5, "y": 2 },
-                { "label": "K24", "x": 3.5, "y": 2 },
-                { "label": "K25", "x": 4.5, "y": 2 },
-                { "label": "K26", "x": 5.5, "y": 2 },
-                { "label": "K27", "x": 6.5, "y": 2 },
-                { "label": "K28", "x": 7.5, "y": 2 },
-                { "label": "K29", "x": 8.5, "y": 2 },
-                { "label": "K2a", "x": 9.5, "y": 2 },
-                { "label": "K2b", "x": 10.5, "y": 2 },
-                { "label": "K2c", "x": 11.5, "y": 2 },
-                { "label": "K2d", "x": 12.5, "y": 2 },
-                { "label": "K2e", "x": 13.5, "y": 2, "w": 1.5 },
-                { "label": "K2f", "x": 15.25, "y": 2 },
-                { "label": "K30", "x": 0, "y": 3, "w": 1.75 },
-                { "label": "K32", "x": 1.75, "y": 3 },
-                { "label": "K33", "x": 2.75, "y": 3 },
-                { "label": "K34", "x": 3.75, "y": 3 },
-                { "label": "K35", "x": 4.75, "y": 3 },
-                { "label": "K36", "x": 5.75, "y": 3 },
-                { "label": "K37", "x": 6.75, "y": 3 },
-                { "label": "K38", "x": 7.75, "y": 3 },
-                { "label": "K39", "x": 8.75, "y": 3 },
-                { "label": "K3a", "x": 9.75, "y": 3 },
-                { "label": "K3b", "x": 10.75, "y": 3 },
-                { "label": "K3c", "x": 11.75, "y": 3 },
-                { "label": "K3d", "x": 12.75, "y": 3, "w": 2.25 },
-                { "label": "K40", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "K41", "x": 1.25, "y": 4 },
-                { "label": "K42", "x": 2.25, "y": 4 },
-                { "label": "K43", "x": 3.25, "y": 4 },
-                { "label": "K44", "x": 4.25, "y": 4 },
-                { "label": "K45", "x": 5.25, "y": 4 },
-                { "label": "K46", "x": 6.25, "y": 4 },
-                { "label": "K47", "x": 7.25, "y": 4 },
-                { "label": "K48", "x": 8.25, "y": 4 },
-                { "label": "K49", "x": 9.25, "y": 4 },
-                { "label": "K4a", "x": 10.25, "y": 4 },
-                { "label": "K4b", "x": 11.25, "y": 4 },
-                { "label": "K4d", "x": 12.25, "y": 4, "w": 1.75 },
-                { "label": "K4e", "x": 14.25, "y": 4.25 },
-                { "label": "K50", "x": 0, "y": 5, "w": 1.25 },
-                { "label": "K51", "x": 1.25, "y": 5, "w": 1.25 },
-                { "label": "K52", "x": 2.5, "y": 5, "w": 1.25 },
-                { "label": "K56", "x": 3.75, "y": 5, "w": 6.25 },
-                { "label": "K5a", "x": 10, "y": 5, "w": 1.25 },
-                { "label": "K5b", "x": 11.25, "y": 5, "w": 1.25 },
-                { "label": "K5d", "x": 13.25, "y": 5.25 },
-                { "label": "K5e", "x": 14.25, "y": 5.25 },
-                { "label": "K5f", "x": 15.25, "y": 5.25 }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 9.75, "y": 0},
+                {"matrix": [0, 10], "x": 10.75, "y": 0},
+                {"matrix": [0, 11], "x": 11.75, "y": 0},
+                {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+                {"matrix": [0, 14], "x": 14, "y": 0},
+
+                {"matrix": [0, 15], "x": 15.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+                {"matrix": [1, 14], "x": 14, "y": 1},
+
+                {"matrix": [1, 15], "x": 15.25, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 2], "x": 1.5, "y": 2},
+                {"matrix": [2, 3], "x": 2.5, "y": 2},
+                {"matrix": [2, 4], "x": 3.5, "y": 2},
+                {"matrix": [2, 5], "x": 4.5, "y": 2},
+                {"matrix": [2, 6], "x": 5.5, "y": 2},
+                {"matrix": [2, 7], "x": 6.5, "y": 2},
+                {"matrix": [2, 8], "x": 7.5, "y": 2},
+                {"matrix": [2, 9], "x": 8.5, "y": 2},
+                {"matrix": [2, 10], "x": 9.5, "y": 2},
+                {"matrix": [2, 11], "x": 10.5, "y": 2},
+                {"matrix": [2, 12], "x": 11.5, "y": 2},
+                {"matrix": [2, 13], "x": 12.5, "y": 2},
+                {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5},
+
+                {"matrix": [2, 15], "x": 15.25, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+                {"matrix": [3, 2], "x": 1.75, "y": 3},
+                {"matrix": [3, 3], "x": 2.75, "y": 3},
+                {"matrix": [3, 4], "x": 3.75, "y": 3},
+                {"matrix": [3, 5], "x": 4.75, "y": 3},
+                {"matrix": [3, 6], "x": 5.75, "y": 3},
+                {"matrix": [3, 7], "x": 6.75, "y": 3},
+                {"matrix": [3, 8], "x": 7.75, "y": 3},
+                {"matrix": [3, 9], "x": 8.75, "y": 3},
+                {"matrix": [3, 10], "x": 9.75, "y": 3},
+                {"matrix": [3, 11], "x": 10.75, "y": 3},
+                {"matrix": [3, 12], "x": 11.75, "y": 3},
+                {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4},
+                {"matrix": [4, 2], "x": 2.25, "y": 4},
+                {"matrix": [4, 3], "x": 3.25, "y": 4},
+                {"matrix": [4, 4], "x": 4.25, "y": 4},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+                {"matrix": [4, 8], "x": 8.25, "y": 4},
+                {"matrix": [4, 9], "x": 9.25, "y": 4},
+                {"matrix": [4, 10], "x": 10.25, "y": 4},
+                {"matrix": [4, 11], "x": 11.25, "y": 4},
+                {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75},
+
+                {"matrix": [4, 14], "x": 14.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 13.25, "y": 5.25},
+                {"matrix": [5, 14], "x": 14.25, "y": 5.25},
+                {"matrix": [5, 15], "x": 15.25, "y": 5.25}
             ]
         }
     }