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

3 files changed, 90 insertions, 111 deletions

diff --git a/keyboards/custommk/evo70/evo70.c b/keyboards/custommk/evo70/evo70.c
index 23ec0ec8f1..f2874c4e8a 100644
--- a/keyboards/custommk/evo70/evo70.c
+++ b/keyboards/custommk/evo70/evo70.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "evo70.h"
+#include "quantum.h"
 #include <stdbool.h>
 #include "matrix.h"
 #include OLED_FONT_H
diff --git a/keyboards/custommk/evo70/evo70.h b/keyboards/custommk/evo70/evo70.h
deleted file mode 100644
index 2766da19c9..0000000000
--- a/keyboards/custommk/evo70/evo70.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 customMK
- *
- * 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( \
-                  K11,   K61,   K12,   K13, K14, K15, K16, K17, K18,  K19, K1A, K1B,  K1C, K1D, K1E, \
-                  K62,   K21,   K22,   K23, K24, K25, K26, K27, K28,  K29, K2A, K2B,  K2C, K2D, K2E, \
-    K66,   K31,   K63,          K32,   K33, K34, K35, K36, K37, K38,  K39, K3A, K3B,  K3C, K3D, K3E, \
-    K57,   K55,          K41,   K42,   K43, K44, K45, K46, K47, K48,  K49, K4A, K4B,  K4C, K4D, K4E, \
-    K52,   K54,   K65,   K51,          K53,           K56, K67, E00A, K59, K5A, E00B, K5C, K5D, K5E \
-) { \
-    { K11, K12, K13, K14,   K15,  K16, K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E }, \
-    { K21, K22, K23, K24,   K25,  K26, K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E }, \
-    { K31, K32, K33, K34,   K35,  K36, K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E }, \
-    { K41, K42, K43, K44,   K45,  K46, K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E },  \
-    { K51, K52, K53, K54,   K55,  K56, K57,   E00A,  K59,   K5A,   E00B,  K5C,   K5D,   K5E },  \
-    { K61, K62, K63, KC_NO, K65,  K66, K67,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json
index ee032bd5ee..867423ba64 100644
--- a/keyboards/custommk/evo70/info.json
+++ b/keyboards/custommk/evo70/info.json
@@ -52,82 +52,95 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"KC_ESC", "x":2.5, "y":1.1},
-                {"label":"KC_1", "x":3.5, "y":1.1},
-                {"label":"KC_2", "x":4.5, "y":1.1},
-                {"label":"KC_3", "x":5.5, "y":1.1},
-                {"label":"KC_4", "x":6.5, "y":1.1},
-                {"label":"KC_5", "x":7.5, "y":1.1},
-                {"label":"KC_6", "x":8.5, "y":1.1},
-                {"label":"KC_7", "x":9.5, "y":1.1},
-                {"label":"KC_8", "x":10.5, "y":1.1},
-                {"label":"KC_9", "x":11.5, "y":1.1},
-                {"label":"KC_0", "x":12.5, "y":1.1},
-                {"label":"KC_MINS", "x":13.5, "y":1.1},
-                {"label":"KC_EQL", "x":14.5, "y":1.1},
-                {"label":"KC_BSPC", "x":15.5, "y":1.1, "w":2},
-                {"label":"KC_DEL", "x":17.5, "y":1.1},
-                {"label":"KC_TAB", "x":2.5, "y":2.1, "w":1.5},
-                {"label":"KC_Q", "x":4, "y":2.1},
-                {"label":"KC_W", "x":5, "y":2.1},
-                {"label":"KC_E", "x":6, "y":2.1},
-                {"label":"KC_R", "x":7, "y":2.1},
-                {"label":"KC_T", "x":8, "y":2.1},
-                {"label":"KC_Y", "x":9, "y":2.1},
-                {"label":"KC_U", "x":10, "y":2.1},
-                {"label":"KC_I", "x":11, "y":2.1},
-                {"label":"KC_O", "x":12, "y":2.1},
-                {"label":"KC_P", "x":13, "y":2.1},
-                {"label":"KC_LBRC", "x":14, "y":2.1},
-                {"label":"KC_RBRC", "x":15, "y":2.1},
-                {"label":"KC_BSLS", "x":16, "y":2.1, "w":1.5},
-                {"label":"KC_PGUP", "x":17.5, "y":2.1},
-                {"label":"KC_F1", "x":0, "y":3.1},
-                {"label":"KC_F2", "x":1, "y":3.1},
-                {"label":"KC_CAPS", "x":2.5, "y":3.1, "w":1.75},
-                {"label":"KC_A", "x":4.25, "y":3.1},
-                {"label":"KC_S", "x":5.25, "y":3.1},
-                {"label":"KC_D", "x":6.25, "y":3.1},
-                {"label":"KC_F", "x":7.25, "y":3.1},
-                {"label":"KC_G", "x":8.25, "y":3.1},
-                {"label":"KC_H", "x":9.25, "y":3.1},
-                {"label":"KC_J", "x":10.25, "y":3.1},
-                {"label":"KC_K", "x":11.25, "y":3.1},
-                {"label":"KC_L", "x":12.25, "y":3.1},
-                {"label":"KC_SCLN", "x":13.25, "y":3.1},
-                {"label":"KC_QUOT", "x":14.25, "y":3.1},
-                {"label":"KC_ENT", "x":15.25, "y":3.1, "w":2.25},
-                {"label":"KC_PGDN", "x":17.5, "y":3.1},
-                {"label":"KC_F3", "x":0, "y":4.1},
-                {"label":"KC_F4", "x":1, "y":4.1},
-                {"label":"KC_LSFT", "x":2.5, "y":4.1, "w":2.25},
-                {"label":"KC_Z", "x":4.75, "y":4.1},
-                {"label":"KC_X", "x":5.75, "y":4.1},
-                {"label":"KC_C", "x":6.75, "y":4.1},
-                {"label":"KC_V", "x":7.75, "y":4.1},
-                {"label":"KC_B", "x":8.75, "y":4.1},
-                {"label":"KC_N", "x":9.75, "y":4.1},
-                {"label":"KC_M", "x":10.75, "y":4.1},
-                {"label":"KC_COMM", "x":11.75, "y":4.1},
-                {"label":"KC_DOT", "x":12.75, "y":4.1},
-                {"label":"KC_SLSH", "x":13.75, "y":4.1},
-                {"label":"KC_RSFT", "x":14.75, "y":4.1, "w":1.75},
-                {"label":"KC_UP", "x":16.5, "y":4.1},
-                {"label":"KC_END", "x":17.5, "y":4.1},
-                {"label":"KC_F5", "x":0, "y":5.1},
-                {"label":"KC_F6", "x":1, "y":5.1},
-                {"label":"KC_LCTL", "x":2.5, "y":5.1, "w":1.25},
-                {"label":"KC_LGUI", "x":3.75, "y":5.1, "w":1.25},
-                {"label":"KC_LALT", "x":5, "y":5.1, "w":1.25},
-                {"label":"KC_SPC", "x":6.25, "y":5.1, "w":6.25},
-                {"label":"KC_TRNS", "x":0.5, "y":1.1},
-                {"label":"KC_VOLD", "x":0, "y":0},
-                {"label":"KC_RALT", "x":12.5, "y":5.1, "w":1.25},
-                {"label":"KC_RCTL", "x":13.75, "y":5.1, "w":1.25},
-                {"label":"KC_VOLU", "x":1, "y":0},
-                {"label":"KC_LEFT", "x":15.5, "y":5.1},
-                {"label":"KC_DOWN", "x":16.5, "y":5.1},
-                {"label":"KC_RGHT", "x":17.5, "y":5.1}]
+                {"matrix": [0, 0], "x": 2.5, "y": 1.1},
+                {"matrix": [5, 0], "x": 3.5, "y": 1.1},
+                {"matrix": [0, 1], "x": 4.5, "y": 1.1},
+                {"matrix": [0, 2], "x": 5.5, "y": 1.1},
+                {"matrix": [0, 3], "x": 6.5, "y": 1.1},
+                {"matrix": [0, 4], "x": 7.5, "y": 1.1},
+                {"matrix": [0, 5], "x": 8.5, "y": 1.1},
+                {"matrix": [0, 6], "x": 9.5, "y": 1.1},
+                {"matrix": [0, 7], "x": 10.5, "y": 1.1},
+                {"matrix": [0, 8], "x": 11.5, "y": 1.1},
+                {"matrix": [0, 9], "x": 12.5, "y": 1.1},
+                {"matrix": [0, 10], "x": 13.5, "y": 1.1},
+                {"matrix": [0, 11], "x": 14.5, "y": 1.1},
+                {"matrix": [0, 12], "x": 15.5, "y": 1.1, "w": 2},
+                {"matrix": [0, 13], "x": 17.5, "y": 1.1},
+
+                {"matrix": [5, 1], "x": 2.5, "y": 2.1, "w": 1.5},
+                {"matrix": [1, 0], "x": 4, "y": 2.1},
+                {"matrix": [1, 1], "x": 5, "y": 2.1},
+                {"matrix": [1, 2], "x": 6, "y": 2.1},
+                {"matrix": [1, 3], "x": 7, "y": 2.1},
+                {"matrix": [1, 4], "x": 8, "y": 2.1},
+                {"matrix": [1, 5], "x": 9, "y": 2.1},
+                {"matrix": [1, 6], "x": 10, "y": 2.1},
+                {"matrix": [1, 7], "x": 11, "y": 2.1},
+                {"matrix": [1, 8], "x": 12, "y": 2.1},
+                {"matrix": [1, 9], "x": 13, "y": 2.1},
+                {"matrix": [1, 10], "x": 14, "y": 2.1},
+                {"matrix": [1, 11], "x": 15, "y": 2.1},
+                {"matrix": [1, 12], "x": 16, "y": 2.1, "w": 1.5},
+                {"matrix": [1, 13], "x": 17.5, "y": 2.1},
+
+                {"matrix": [5, 5], "x": 0, "y": 3.1},
+                {"matrix": [2, 0], "x": 1, "y": 3.1},
+
+                {"matrix": [5, 2], "x": 2.5, "y": 3.1, "w": 1.75},
+                {"matrix": [2, 1], "x": 4.25, "y": 3.1},
+                {"matrix": [2, 2], "x": 5.25, "y": 3.1},
+                {"matrix": [2, 3], "x": 6.25, "y": 3.1},
+                {"matrix": [2, 4], "x": 7.25, "y": 3.1},
+                {"matrix": [2, 5], "x": 8.25, "y": 3.1},
+                {"matrix": [2, 6], "x": 9.25, "y": 3.1},
+                {"matrix": [2, 7], "x": 10.25, "y": 3.1},
+                {"matrix": [2, 8], "x": 11.25, "y": 3.1},
+                {"matrix": [2, 9], "x": 12.25, "y": 3.1},
+                {"matrix": [2, 10], "x": 13.25, "y": 3.1},
+                {"matrix": [2, 11], "x": 14.25, "y": 3.1},
+                {"matrix": [2, 12], "x": 15.25, "y": 3.1, "w": 2.25},
+                {"matrix": [2, 13], "x": 17.5, "y": 3.1},
+
+                {"matrix": [4, 6], "x": 0, "y": 4.1},
+                {"matrix": [4, 4], "x": 1, "y": 4.1},
+
+                {"matrix": [3, 0], "x": 2.5, "y": 4.1, "w": 2.25},
+                {"matrix": [3, 1], "x": 4.75, "y": 4.1},
+                {"matrix": [3, 2], "x": 5.75, "y": 4.1},
+                {"matrix": [3, 3], "x": 6.75, "y": 4.1},
+                {"matrix": [3, 4], "x": 7.75, "y": 4.1},
+                {"matrix": [3, 5], "x": 8.75, "y": 4.1},
+                {"matrix": [3, 6], "x": 9.75, "y": 4.1},
+                {"matrix": [3, 7], "x": 10.75, "y": 4.1},
+                {"matrix": [3, 8], "x": 11.75, "y": 4.1},
+                {"matrix": [3, 9], "x": 12.75, "y": 4.1},
+                {"matrix": [3, 10], "x": 13.75, "y": 4.1},
+                {"matrix": [3, 11], "x": 14.75, "y": 4.1, "w": 1.75},
+                {"matrix": [3, 12], "x": 16.5, "y": 4.1},
+                {"matrix": [3, 13], "x": 17.5, "y": 4.1},
+
+                {"matrix": [4, 1], "x": 0, "y": 5.1},
+                {"matrix": [4, 3], "x": 1, "y": 5.1},
+
+                {"matrix": [5, 4], "x": 2.5, "y": 5.1, "w": 1.25},
+                {"matrix": [4, 0], "x": 3.75, "y": 5.1, "w": 1.25},
+                {"matrix": [4, 2], "x": 5, "y": 5.1, "w": 1.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 5.1, "w": 6.25},
+
+                {"matrix": [5, 6], "x": 0.5, "y": 1.1},
+
+                {"matrix": [4, 7], "x": 0, "y": 0},
+
+                {"matrix": [4, 8], "x": 12.5, "y": 5.1, "w": 1.25},
+                {"matrix": [4, 9], "x": 13.75, "y": 5.1, "w": 1.25},
+
+                {"matrix": [4, 10], "x": 1, "y": 0},
+
+                {"matrix": [4, 11], "x": 15.5, "y": 5.1},
+                {"matrix": [4, 12], "x": 16.5, "y": 5.1},
+                {"matrix": [4, 13], "x": 17.5, "y": 5.1}
+            ]
         }
     }
 }