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

3 files changed, 112 insertions, 139 deletions

diff --git a/keyboards/handwired/evk/v1_3/info.json b/keyboards/handwired/evk/v1_3/info.json
index 10564bb2a7..7e3baab9ad 100644
--- a/keyboards/handwired/evk/v1_3/info.json
+++ b/keyboards/handwired/evk/v1_3/info.json
@@ -21,101 +21,117 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"k0A", "x":0, "y":0.4},
-                {"label":"k0B", "x":1, "y":0.2},
-                {"label":"k0C", "x":2, "y":0},
-                {"label":"k0D", "x":3, "y":0.2},
-                {"label":"k0E", "x":4, "y":0.2},
-                {"label":"k0F", "x":5, "y":0.2},
-                {"label":"k0G", "x":7, "y":0.2},
-                {"label":"k0H", "x":8, "y":0.2},
-                {"label":"k0I", "x":9, "y":0.2},
-                {"label":"k0J", "x":10, "y":0.2},
-                {"label":"k0K", "x":12.2, "y":0.2},
-                {"label":"k0L", "x":13.2, "y":0.2},
-                {"label":"k0M", "x":14.2, "y":0.2},
-                {"label":"k0N", "x":15.2, "y":0},
-                {"label":"k0O", "x":16.2, "y":0.2},
-                {"label":"k0P", "x":17.2, "y":0.4},
-
-                {"label":"k1A", "x":0, "y":1.4},
-                {"label":"k1B", "x":1, "y":1.2},
-                {"label":"k1C", "x":2, "y":1},
-                {"label":"k1D", "x":3, "y":1.2},
-                {"label":"k1E", "x":4, "y":1.2},
-                {"label":"k1F", "x":5, "y":1.2},
-                {"label":"k1G", "x":7, "y":1.2},
-                {"label":"k1H", "x":8, "y":1.2},
-                {"label":"k1I", "x":9, "y":1.2},
-                {"label":"k1J", "x":10, "y":1.2},
-                {"label":"k1K", "x":12.2, "y":1.2},
-                {"label":"k1L", "x":13.2, "y":1.2},
-                {"label":"k1M", "x":14.2, "y":1.2},
-                {"label":"k1N", "x":15.2, "y":1},
-                {"label":"k1O", "x":16.2, "y":1.2},
-                {"label":"k1P", "x":17.2, "y":1.4},
-
-                {"label":"k2A", "x":0, "y":2.4},
-                {"label":"k2B", "x":1, "y":2.2},
-                {"label":"k2C", "x":2, "y":2},
-                {"label":"k2D", "x":3, "y":2.2},
-                {"label":"k2E", "x":4, "y":2.2},
-                {"label":"k2F", "x":5, "y":2.2},
-                {"label":"k2G", "x":7, "y":2.2},
-                {"label":"k2H", "x":8, "y":2.2},
-                {"label":"k2I", "x":9, "y":2.2},
-                {"label":"k2J", "x":10, "y":2.2},
-                {"label":"k2K", "x":12.2, "y":2.2},
-                {"label":"k2L", "x":13.2, "y":2.2},
-                {"label":"k2M", "x":14.2, "y":2.2},
-                {"label":"k2N", "x":15.2, "y":2},
-                {"label":"k2O", "x":16.2, "y":2.2},
-                {"label":"k2P", "x":17.2, "y":2.4},
-
-                {"label":"k3A", "x":0, "y":3.4},
-                {"label":"k3B", "x":1, "y":3.2},
-                {"label":"k3C", "x":2, "y":3},
-                {"label":"k3D", "x":3, "y":3.2},
-                {"label":"k3E", "x":4, "y":3.2},
-                {"label":"k3G", "x":7, "y":3.2},
-                {"label":"k3H", "x":8, "y":3.2},
-                {"label":"k3I", "x":9, "y":3.2},
-                {"label":"k3J", "x":10, "y":3.2},
-                {"label":"k3L", "x":13.2, "y":3.2},
-                {"label":"k3M", "x":14.2, "y":3.2},
-                {"label":"k3N", "x":15.2, "y":3},
-                {"label":"k3O", "x":16.2, "y":3.2},
-                {"label":"k3P", "x":17.2, "y":3.4},
-
-                {"label":"k4A", "x":0, "y":4.4},
-                {"label":"k4B", "x":1, "y":4.2},
-                {"label":"k4C", "x":2, "y":4},
-                {"label":"k4D", "x":3, "y":4.2},
-                {"label":"k4E", "x":4, "y":4.2},
-                {"label":"k4F", "x":5.2, "y":4.4},
-                {"label":"k4G", "x":7, "y":4.2},
-                {"label":"k4H", "x":8, "y":4.2},
-                {"label":"k4I", "x":9, "y":4.2},
-                {"label":"k4J", "x":10, "y":4.2},
-                {"label":"k4K", "x":12, "y":4.4},
-                {"label":"k4L", "x":13.2, "y":4.2},
-                {"label":"k4M", "x":14.2, "y":4.2},
-                {"label":"k4N", "x":15.2, "y":4},
-                {"label":"k4O", "x":16.2, "y":4.2},
-                {"label":"k4P", "x":17.2, "y":4.4},
-
-                {"label":"k5B", "x":1, "y":5.2},
-                {"label":"k5C", "x":2, "y":5},
-                {"label":"k5E", "x":4.2, "y":5.4},
-                {"label":"k5F", "x":5.24, "y":5.4},
-                {"label":"k5G", "x":7, "y":5.2},
-                {"label":"k5H", "x":8, "y":5.2},
-                {"label":"k5I", "x":9, "y":5.2},
-                {"label":"k5J", "x":10, "y":5.2},
-                {"label":"k5K", "x":12, "y":5.4},
-                {"label":"k5L", "x":13, "y":5.4},
-                {"label":"k5N", "x":15.2, "y":5},
-                {"label":"k5O", "x":16.2, "y":5.2}
+                {"matrix": [0, 0], "x": 0, "y": 0.4},
+                {"matrix": [0, 1], "x": 1, "y": 0.2},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.2},
+                {"matrix": [0, 4], "x": 4, "y": 0.2},
+                {"matrix": [0, 5], "x": 5, "y": 0.2},
+
+                {"matrix": [0, 6], "x": 7, "y": 0.2},
+                {"matrix": [0, 7], "x": 8, "y": 0.2},
+                {"matrix": [0, 8], "x": 9, "y": 0.2},
+                {"matrix": [0, 9], "x": 10, "y": 0.2},
+
+                {"matrix": [0, 10], "x": 12.2, "y": 0.2},
+                {"matrix": [0, 11], "x": 13.2, "y": 0.2},
+                {"matrix": [0, 12], "x": 14.2, "y": 0.2},
+                {"matrix": [0, 13], "x": 15.2, "y": 0},
+                {"matrix": [0, 14], "x": 16.2, "y": 0.2},
+                {"matrix": [0, 15], "x": 17.2, "y": 0.4},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.4},
+                {"matrix": [1, 1], "x": 1, "y": 1.2},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.2},
+                {"matrix": [1, 4], "x": 4, "y": 1.2},
+                {"matrix": [1, 5], "x": 5, "y": 1.2},
+
+                {"matrix": [1, 6], "x": 7, "y": 1.2},
+                {"matrix": [1, 7], "x": 8, "y": 1.2},
+                {"matrix": [1, 8], "x": 9, "y": 1.2},
+                {"matrix": [1, 9], "x": 10, "y": 1.2},
+
+                {"matrix": [1, 10], "x": 12.2, "y": 1.2},
+                {"matrix": [1, 11], "x": 13.2, "y": 1.2},
+                {"matrix": [1, 12], "x": 14.2, "y": 1.2},
+                {"matrix": [1, 13], "x": 15.2, "y": 1},
+                {"matrix": [1, 14], "x": 16.2, "y": 1.2},
+                {"matrix": [1, 15], "x": 17.2, "y": 1.4},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.4},
+                {"matrix": [2, 1], "x": 1, "y": 2.2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2.2},
+                {"matrix": [2, 4], "x": 4, "y": 2.2},
+                {"matrix": [2, 5], "x": 5, "y": 2.2},
+
+                {"matrix": [2, 6], "x": 7, "y": 2.2},
+                {"matrix": [2, 7], "x": 8, "y": 2.2},
+                {"matrix": [2, 8], "x": 9, "y": 2.2},
+                {"matrix": [2, 9], "x": 10, "y": 2.2},
+
+                {"matrix": [2, 10], "x": 12.2, "y": 2.2},
+                {"matrix": [2, 11], "x": 13.2, "y": 2.2},
+                {"matrix": [2, 12], "x": 14.2, "y": 2.2},
+                {"matrix": [2, 13], "x": 15.2, "y": 2},
+                {"matrix": [2, 14], "x": 16.2, "y": 2.2},
+                {"matrix": [2, 15], "x": 17.2, "y": 2.4},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.4},
+                {"matrix": [3, 1], "x": 1, "y": 3.2},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3.2},
+                {"matrix": [3, 4], "x": 4, "y": 3.2},
+
+                {"matrix": [3, 6], "x": 7, "y": 3.2},
+                {"matrix": [3, 7], "x": 8, "y": 3.2},
+                {"matrix": [3, 8], "x": 9, "y": 3.2},
+                {"matrix": [3, 9], "x": 10, "y": 3.2},
+
+                {"matrix": [3, 11], "x": 13.2, "y": 3.2},
+                {"matrix": [3, 12], "x": 14.2, "y": 3.2},
+                {"matrix": [3, 13], "x": 15.2, "y": 3},
+                {"matrix": [3, 14], "x": 16.2, "y": 3.2},
+                {"matrix": [3, 15], "x": 17.2, "y": 3.4},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.4},
+                {"matrix": [4, 1], "x": 1, "y": 4.2},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4.2},
+                {"matrix": [4, 4], "x": 4, "y": 4.2},
+
+                {"matrix": [4, 5], "x": 5.2, "y": 4.4},
+
+                {"matrix": [4, 6], "x": 7, "y": 4.2},
+                {"matrix": [4, 7], "x": 8, "y": 4.2},
+                {"matrix": [4, 8], "x": 9, "y": 4.2},
+                {"matrix": [4, 9], "x": 10, "y": 4.2},
+
+                {"matrix": [4, 10], "x": 12, "y": 4.4},
+
+                {"matrix": [4, 11], "x": 13.2, "y": 4.2},
+                {"matrix": [4, 12], "x": 14.2, "y": 4.2},
+                {"matrix": [4, 13], "x": 15.2, "y": 4},
+                {"matrix": [4, 14], "x": 16.2, "y": 4.2},
+                {"matrix": [4, 15], "x": 17.2, "y": 4.4},
+
+                {"matrix": [5, 1], "x": 1, "y": 5.2},
+                {"matrix": [5, 2], "x": 2, "y": 5},
+
+                {"matrix": [5, 4], "x": 4.2, "y": 5.4},
+                {"matrix": [5, 5], "x": 5.24, "y": 5.4},
+
+                {"matrix": [5, 6], "x": 7, "y": 5.2},
+                {"matrix": [5, 7], "x": 8, "y": 5.2},
+                {"matrix": [5, 8], "x": 9, "y": 5.2},
+                {"matrix": [5, 9], "x": 10, "y": 5.2},
+
+                {"matrix": [5, 10], "x": 12, "y": 5.4},
+                {"matrix": [5, 11], "x": 13, "y": 5.4},
+
+                {"matrix": [5, 13], "x": 15.2, "y": 5},
+                {"matrix": [5, 14], "x": 16.2, "y": 5.2}
             ]
         }
     }
diff --git a/keyboards/handwired/evk/v1_3/v1_3.c b/keyboards/handwired/evk/v1_3/v1_3.c
index 718a336122..7c68893968 100644
--- a/keyboards/handwired/evk/v1_3/v1_3.c
+++ b/keyboards/handwired/evk/v1_3/v1_3.c
@@ -12,7 +12,7 @@ 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/>.
  */
-#include "v1_3.h"
+#include "quantum.h"
 
 // Optional override functions below.
 // You can leave any or all of these undefined.
diff --git a/keyboards/handwired/evk/v1_3/v1_3.h b/keyboards/handwired/evk/v1_3/v1_3.h
deleted file mode 100644
index da02b806f8..0000000000
--- a/keyboards/handwired/evk/v1_3/v1_3.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-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 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(\
-      k0A, k0B, k0C, k0D, k0E, k0F,    k0G, k0H, k0I, k0J,    k0K, k0L, k0M, k0N, k0O, k0P, \
-      k1A, k1B, k1C, k1D, k1E, k1F,    k1G, k1H, k1I, k1J,    k1K, k1L, k1M, k1N, k1O, k1P, \
-      k2A, k2B, k2C, k2D, k2E, k2F,    k2G, k2H, k2I, k2J,    k2K, k2L, k2M, k2N, k2O, k2P, \
-      k3A, k3B, k3C, k3D, k3E,         k3G, k3H, k3I, k3J,         k3L, k3M, k3N, k3O, k3P, \
-      k4A, k4B, k4C, k4D, k4E,  k4F,   k4G, k4H, k4I, k4J,   k4K,  k4L, k4M, k4N, k4O, k4P, \
-           k5B, k5C,       k5E, k5F,   k5G, k5H, k5I, k5J,   k5k, k5L,       k5N, k5O       \
-) { \
-    { k0A, k0B, k0C, k0D, k0E, k0F,    k0G, k0H, k0I, k0J,    k0K, k0L, k0M, k0N, k0O, k0P }, \
-    { k1A, k1B, k1C, k1D, k1E, k1F,    k1G, k1H, k1I, k1J,    k1K, k1L, k1M, k1N, k1O, k1P }, \
-    { k2A, k2B, k2C, k2D, k2E, k2F,    k2G, k2H, k2I, k2J,    k2K, k2L, k2M, k2N, k2O, k2P }, \
-    { k3A, k3B, k3C, k3D, k3E,  XXX,   k3G, k3H, k3I, k3J,   XXX,  k3L, k3M, k3N, k3O, k3P }, \
-    { k4A, k4B, k4C, k4D, k4E,  k4F,   k4G, k4H, k4I, k4J,   k4K,  k4L, k4M, k4N, k4O, k4P }, \
-    { XXX, k5B, k5C, XXX,  k5E, k5F,   k5G, k5H, k5I, k5J,   k5k, k5L,  XXX, k5N, k5O, XXX }  \
-}