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

2 files changed, 76 insertions, 108 deletions

diff --git a/keyboards/mint60/info.json b/keyboards/mint60/info.json
index 90b5236d43..bd51052853 100644
--- a/keyboards/mint60/info.json
+++ b/keyboards/mint60/info.json
@@ -24,72 +24,82 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"~", "x":0, "y":0},
-        {"label":"!", "x":1, "y":0},
-        {"label":"@", "x":2, "y":0},
-        {"label":"#", "x":3, "y":0},
-        {"label":"$", "x":4, "y":0},
-        {"label":"%", "x":5, "y":0},
-        {"label":"^", "x":7, "y":0},
-        {"label":"&", "x":8, "y":0},
-        {"label":"*", "x":9, "y":0},
-        {"label":"(", "x":10, "y":0},
-        {"label":")", "x":11, "y":0},
-        {"label":"_", "x":12, "y":0},
-        {"label":"+", "x":13, "y":0},
-        {"label":"Backspace", "x":14, "y":0, "w":2},
-        {"label":"Tab", "x":0, "y":1, "w":1.5},
-        {"label":"Q", "x":1.5, "y":1},
-        {"label":"W", "x":2.5, "y":1},
-        {"label":"E", "x":3.5, "y":1},
-        {"label":"R", "x":4.5, "y":1},
-        {"label":"T", "x":5.5, "y":1},
-        {"label":"Y", "x":7.5, "y":1},
-        {"label":"U", "x":8.5, "y":1},
-        {"label":"I", "x":9.5, "y":1},
-        {"label":"O", "x":10.5, "y":1},
-        {"label":"P", "x":11.5, "y":1},
-        {"label":"{", "x":12.5, "y":1},
-        {"label":"}", "x":13.5, "y":1},
-        {"label":"|", "x":14.5, "y":1, "w":1.5},
-        {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
-        {"label":"A", "x":1.75, "y":2},
-        {"label":"S", "x":2.75, "y":2},
-        {"label":"D", "x":3.75, "y":2},
-        {"label":"F", "x":4.75, "y":2},
-        {"label":"G", "x":5.75, "y":2},
-        {"label":"H", "x":7.75, "y":2},
-        {"label":"J", "x":8.75, "y":2},
-        {"label":"K", "x":9.75, "y":2},
-        {"label":"L", "x":10.75, "y":2},
-        {"label":":", "x":11.75, "y":2},
-        {"label":"\"", "x":12.75, "y":2},
-        {"label":"Enter", "x":13.75, "y":2, "w":2.25},
-        {"label":"Shift", "x":0, "y":3, "w":2},
-        {"label":"Z", "x":2, "y":3},
-        {"label":"X", "x":3, "y":3},
-        {"label":"C", "x":4, "y":3},
-        {"label":"V", "x":5, "y":3},
-        {"label":"B", "x":6, "y":3},
-        {"label":"N", "x":8, "y":3},
-        {"label":"M", "x":9, "y":3},
-        {"label":"<", "x":10, "y":3},
-        {"label":">", "x":11, "y":3},
-        {"label":"?", "x":12, "y":3},
-        {"label":"Shift", "x":13, "y":3},
-        {"label":"Up", "x":14, "y":3},
-        {"label":"Fn", "x":15, "y":3},
-        {"label":"Esc", "x":0, "y":4},
-        {"label":"Ctrl", "x":1, "y":4, "w":1.25},
-        {"label":"Win", "x":2.25, "y":4, "w":1.25},
-        {"label":"Alt", "x":3.5, "y":4, "w":1.25},
-        {"label":"Space", "x":4.75, "y":4, "w":2.25},
-        {"label":"Space", "x":7.75, "y":4, "w":2.75},
-        {"label":"Win", "x":10.5, "y":4, "w":1.25},
-        {"label":"Ctrl", "x":11.75, "y":4, "w":1.25},
-        {"label":"Left", "x":13, "y":4},
-        {"label":"Down", "x":14, "y":4},
-        {"label":"Right", "x":15, "y":4}]
+        {"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": [5, 0], "x": 7, "y": 0},
+        {"matrix": [5, 1], "x": 8, "y": 0},
+        {"matrix": [5, 2], "x": 9, "y": 0},
+        {"matrix": [5, 3], "x": 10, "y": 0},
+        {"matrix": [5, 4], "x": 11, "y": 0},
+        {"matrix": [5, 5], "x": 12, "y": 0},
+        {"matrix": [5, 6], "x": 13, "y": 0},
+        {"matrix": [5, 7], "x": 14, "y": 0, "w": 2},
+
+        {"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": [6, 0], "x": 7.5, "y": 1},
+        {"matrix": [6, 1], "x": 8.5, "y": 1},
+        {"matrix": [6, 2], "x": 9.5, "y": 1},
+        {"matrix": [6, 3], "x": 10.5, "y": 1},
+        {"matrix": [6, 4], "x": 11.5, "y": 1},
+        {"matrix": [6, 5], "x": 12.5, "y": 1},
+        {"matrix": [6, 6], "x": 13.5, "y": 1},
+        {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5},
+
+        {"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": [7, 0], "x": 7.75, "y": 2},
+        {"matrix": [7, 1], "x": 8.75, "y": 2},
+        {"matrix": [7, 2], "x": 9.75, "y": 2},
+        {"matrix": [7, 3], "x": 10.75, "y": 2},
+        {"matrix": [7, 4], "x": 11.75, "y": 2},
+        {"matrix": [7, 5], "x": 12.75, "y": 2},
+        {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+        {"matrix": [3, 1], "x": 2, "y": 3},
+        {"matrix": [3, 2], "x": 3, "y": 3},
+        {"matrix": [3, 3], "x": 4, "y": 3},
+        {"matrix": [3, 4], "x": 5, "y": 3},
+        {"matrix": [3, 5], "x": 6, "y": 3},
+
+        {"matrix": [8, 0], "x": 8, "y": 3},
+        {"matrix": [8, 1], "x": 9, "y": 3},
+        {"matrix": [8, 2], "x": 10, "y": 3},
+        {"matrix": [8, 3], "x": 11, "y": 3},
+        {"matrix": [8, 4], "x": 12, "y": 3},
+        {"matrix": [8, 5], "x": 13, "y": 3},
+        {"matrix": [8, 6], "x": 14, "y": 3},
+        {"matrix": [8, 7], "x": 15, "y": 3},
+
+        {"matrix": [4, 0], "x": 0, "y": 4},
+        {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25},
+        {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2.25},
+
+        {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 2.75},
+        {"matrix": [9, 1], "x": 10.5, "y": 4, "w": 1.25},
+        {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
+        {"matrix": [9, 5], "x": 13, "y": 4},
+        {"matrix": [9, 6], "x": 14, "y": 4},
+        {"matrix": [9, 7], "x": 15, "y": 4}
+      ]
     }
   }
 }
diff --git a/keyboards/mint60/mint60.h b/keyboards/mint60/mint60.h
deleted file mode 100644
index 78529921aa..0000000000
--- a/keyboards/mint60/mint60.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2018 Eucalyn
- *
- * 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 a shortcut to help you visually see your layout.
-// The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-  L00,L01,L02,L03,L04,L05,    R00,R01,R02,R03,R04,R05,R06,  R07, \
-  L10,  L11,L12,L13,L14,L15,    R10,R11,R12,R13,R14,R15,R16,R17, \
-  L20,   L21,L22,L23,L24,L25,    R20,R21,R22,R23,R24,R25,   R27, \
-  L30,    L31,L32,L33,L34,L35,    R30,R31,R32,R33,R34,R35,R36,R37, \
-  L40,L41, L42, L43,    L44,      R40, R41, R43,      R45,R46,R47 \
-) \
-{ \
-  { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \
-  { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \
-  { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \
-  { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO }, \
-  { L40, L41, L42, L43, L44, KC_NO, KC_NO, KC_NO }, \
-  { R00, R01, R02, R03, R04, R05, R06, R07 }, \
-  { R10, R11, R12, R13, R14, R15, R16, R17 }, \
-  { R20, R21, R22, R23, R24, R25, KC_NO, R27 }, \
-  { R30, R31, R32, R33, R34, R35, R36, R37 }, \
-  { R40, R41, KC_NO, R43, KC_NO, R45, R46, R47 }, \
-}