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

2 files changed, 97 insertions, 114 deletions

diff --git a/keyboards/handwired/bigmac/bigmac.h b/keyboards/handwired/bigmac/bigmac.h
deleted file mode 100644
index 43ba78d311..0000000000
--- a/keyboards/handwired/bigmac/bigmac.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 Taylore101
- *
- * 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, K02, K03, K04, K05,    K06, K07, K08,   K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G,      \
-    K10,   K11, K12, K13, K14, K15,    K16, K17, K18,   K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G,      \
-    K20,   K21, K22, K23, K24, K25,    K26, K27, K28,   K29, K2A, K2B, K2C, K2D, K2E, K2F,    K2G,   \
-    K30,   K31, K32, K33, K34, K35,    K36, K37, K38,   K39, K3A, K3B, K3C, K3D, K3E,    K3F, K3G,   \
-    K40,   K41,    K43,   K45,         K46, K47, K48,   K49,      K4B,    K4D,      K4E, K4F, K4G    \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F,   K3G   }, \
-    { K40,   K41,   KC_NO, K43,   KC_NO, K45,   K46,   K47,   K48,   K49,   KC_NO, K4B,   KC_NO, K4D,   K4E,   K4F,   K4G   }, \
-}
diff --git a/keyboards/handwired/bigmac/info.json b/keyboards/handwired/bigmac/info.json
index 13c523245c..b9377ae6c4 100644
--- a/keyboards/handwired/bigmac/info.json
+++ b/keyboards/handwired/bigmac/info.json
@@ -18,88 +18,104 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (F0,B6)", "x":0, "y":0, "w":1.5},
-                {"label":"K01 (F0,B2)", "x":1.5, "y":0},
-                {"label":"K02 (F0,B3)", "x":2.5, "y":0},
-                {"label":"K03 (F0,B1)", "x":3.5, "y":0},
-                {"label":"K04 (F0,F7)", "x":4.5, "y":0},
-                {"label":"K05 (F0,F6)", "x":5.5, "y":0},
-                {"label":"K06 (F0,F5)", "x":7, "y":0},
-                {"label":"K07 (F0,F4)", "x":8, "y":0},
-                {"label":"K08 (F0,D3)", "x":9, "y":0},
-                {"label":"K09 (F0,D2)", "x":10.5, "y":0},
-                {"label":"K0A (F0,D1)", "x":11.5, "y":0},
-                {"label":"K0B (F0,D0)", "x":12.5, "y":0},
-                {"label":"K0C (F0,D4)", "x":13.5, "y":0},
-                {"label":"K0D (F0,C6)", "x":14.5, "y":0},
-                {"label":"K0E (F0,D7)", "x":15.5, "y":0},
-                {"label":"K0F (F0,E6)", "x":16.5, "y":0},
-                {"label":"K0G (F0,B4)", "x":17.5, "y":0, "w":1.5},
-                {"label":"K10 (F1,B6)", "x":0, "y":1, "w":1.5},
-                {"label":"K11 (F1,B2)", "x":1.5, "y":1},
-                {"label":"K12 (F1,B3)", "x":2.5, "y":1},
-                {"label":"K13 (F1,B1)", "x":3.5, "y":1},
-                {"label":"K14 (F1,F7)", "x":4.5, "y":1},
-                {"label":"K15 (F1,F6)", "x":5.5, "y":1},
-                {"label":"K16 (F1,F5)", "x":7, "y":1},
-                {"label":"K17 (F1,F4)", "x":8, "y":1},
-                {"label":"K18 (F1,D3)", "x":9, "y":1},
-                {"label":"K19 (F1,D2)", "x":10.5, "y":1},
-                {"label":"K1A (F1,D1)", "x":11.5, "y":1},
-                {"label":"K1B (F1,D0)", "x":12.5, "y":1},
-                {"label":"K1C (F1,D4)", "x":13.5, "y":1},
-                {"label":"K1D (F1,C6)", "x":14.5, "y":1},
-                {"label":"K1E (F1,D7)", "x":15.5, "y":1},
-                {"label":"K1F (F1,E6)", "x":16.5, "y":1},
-                {"label":"K1G (F1,B4)", "x":17.5, "y":1, "w":1.5},
-                {"label":"K20 (C7,B6)", "x":0, "y":2, "w":1.5},
-                {"label":"K21 (C7,B2)", "x":1.5, "y":2},
-                {"label":"K22 (C7,B3)", "x":2.5, "y":2},
-                {"label":"K23 (C7,B1)", "x":3.5, "y":2},
-                {"label":"K24 (C7,F7)", "x":4.5, "y":2},
-                {"label":"K25 (C7,F6)", "x":5.5, "y":2},
-                {"label":"K26 (C7,F5)", "x":7, "y":2},
-                {"label":"K27 (C7,F4)", "x":8, "y":2},
-                {"label":"K28 (C7,D3)", "x":9, "y":2},
-                {"label":"K29 (C7,D2)", "x":10.5, "y":2},
-                {"label":"K2A (C7,D1)", "x":11.5, "y":2},
-                {"label":"K2B (C7,D0)", "x":12.5, "y":2},
-                {"label":"K2C (C7,D4)", "x":13.5, "y":2},
-                {"label":"K2D (C7,C6)", "x":14.5, "y":2},
-                {"label":"K2E (C7,D7)", "x":15.5, "y":2},
-                {"label":"K2F (C7,E6)", "x":16.5, "y":2, "w":1.5},
-                {"label":"K2G (C7,B4)", "x":18, "y":2},
-                {"label":"K30 (D5,B6)", "x":0, "y":3, "w":1.5},
-                {"label":"K31 (D5,B2)", "x":1.5, "y":3},
-                {"label":"K32 (D5,B3)", "x":2.5, "y":3},
-                {"label":"K33 (D5,B1)", "x":3.5, "y":3},
-                {"label":"K34 (D5,F7)", "x":4.5, "y":3},
-                {"label":"K35 (D5,F6)", "x":5.5, "y":3},
-                {"label":"K36 (D5,F5)", "x":7, "y":3},
-                {"label":"K37 (D5,F4)", "x":8, "y":3},
-                {"label":"K38 (D5,D3)", "x":9, "y":3},
-                {"label":"K39 (D5,D2)", "x":10.5, "y":3},
-                {"label":"K3A (D5,D1)", "x":11.5, "y":3},
-                {"label":"K3B (D5,D0)", "x":12.5, "y":3},
-                {"label":"K3C (D5,D4)", "x":13.5, "y":3},
-                {"label":"K3D (D5,C6)", "x":14.5, "y":3},
-                {"label":"K3E (D5,D7)", "x":15.5, "y":3, "w":1.5},
-                {"label":"K3F (D5,E6)", "x":17, "y":3},
-                {"label":"K3G (D5,B4)", "x":18, "y":3},
-                {"label":"K40 (B7,B6)", "x":0, "y":4, "w":1.5},
-                {"label":"K41 (B7,B2)", "x":1.5, "y":4, "w":1.5},
-                {"label":"K43 (B7,B1)", "x":3, "y":4, "w":1.5},
-                {"label":"K45 (B7,F6)", "x":4.5, "y":4, "w":2},
-                {"label":"K46 (B7,F5)", "x":7, "y":4},
-                {"label":"K47 (B7,F4)", "x":8, "y":4},
-                {"label":"K48 (B7,D3)", "x":9, "y":4},
-                {"label":"K49 (B7,D2)", "x":10.5, "y":4, "w":2},
-                {"label":"K4B (B7,D0)", "x":12.5, "y":4, "w":1.5},
-                {"label":"K4D (B7,C6)", "x":14, "y":4, "w":1.5},
-                {"label":"K4E (B7,D7)", "x":16, "y":4},
-                {"label":"K4F (B7,E6)", "x":17, "y":4},
-                {"label":"K4G (B7,B4)", "x":18, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+                {"matrix": [0, 1], "x": 1.5, "y": 0},
+                {"matrix": [0, 2], "x": 2.5, "y": 0},
+                {"matrix": [0, 3], "x": 3.5, "y": 0},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+                {"matrix": [0, 6], "x": 7, "y": 0},
+                {"matrix": [0, 7], "x": 8, "y": 0},
+                {"matrix": [0, 8], "x": 9, "y": 0},
+
+                {"matrix": [0, 9], "x": 10.5, "y": 0},
+                {"matrix": [0, 10], "x": 11.5, "y": 0},
+                {"matrix": [0, 11], "x": 12.5, "y": 0},
+                {"matrix": [0, 12], "x": 13.5, "y": 0},
+                {"matrix": [0, 13], "x": 14.5, "y": 0},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
+                {"matrix": [0, 15], "x": 16.5, "y": 0},
+                {"matrix": [0, 16], "x": 17.5, "y": 0, "w": 1.5},
+
+                {"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": [1, 6], "x": 7, "y": 1},
+                {"matrix": [1, 7], "x": 8, "y": 1},
+                {"matrix": [1, 8], "x": 9, "y": 1},
+
+                {"matrix": [1, 9], "x": 10.5, "y": 1},
+                {"matrix": [1, 10], "x": 11.5, "y": 1},
+                {"matrix": [1, 11], "x": 12.5, "y": 1},
+                {"matrix": [1, 12], "x": 13.5, "y": 1},
+                {"matrix": [1, 13], "x": 14.5, "y": 1},
+                {"matrix": [1, 14], "x": 15.5, "y": 1},
+                {"matrix": [1, 15], "x": 16.5, "y": 1},
+                {"matrix": [1, 16], "x": 17.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2},
+                {"matrix": [2, 2], "x": 2.5, "y": 2},
+                {"matrix": [2, 3], "x": 3.5, "y": 2},
+                {"matrix": [2, 4], "x": 4.5, "y": 2},
+                {"matrix": [2, 5], "x": 5.5, "y": 2},
+
+                {"matrix": [2, 6], "x": 7, "y": 2},
+                {"matrix": [2, 7], "x": 8, "y": 2},
+                {"matrix": [2, 8], "x": 9, "y": 2},
+
+                {"matrix": [2, 9], "x": 10.5, "y": 2},
+                {"matrix": [2, 10], "x": 11.5, "y": 2},
+                {"matrix": [2, 11], "x": 12.5, "y": 2},
+                {"matrix": [2, 12], "x": 13.5, "y": 2},
+                {"matrix": [2, 13], "x": 14.5, "y": 2},
+                {"matrix": [2, 14], "x": 15.5, "y": 2},
+                {"matrix": [2, 15], "x": 16.5, "y": 2, "w": 1.5},
+                {"matrix": [2, 16], "x": 18, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3},
+                {"matrix": [3, 2], "x": 2.5, "y": 3},
+                {"matrix": [3, 3], "x": 3.5, "y": 3},
+                {"matrix": [3, 4], "x": 4.5, "y": 3},
+                {"matrix": [3, 5], "x": 5.5, "y": 3},
+
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+
+                {"matrix": [3, 9], "x": 10.5, "y": 3},
+                {"matrix": [3, 10], "x": 11.5, "y": 3},
+                {"matrix": [3, 11], "x": 12.5, "y": 3},
+                {"matrix": [3, 12], "x": 13.5, "y": 3},
+                {"matrix": [3, 13], "x": 14.5, "y": 3},
+                {"matrix": [3, 14], "x": 15.5, "y": 3, "w": 1.5},
+                {"matrix": [3, 15], "x": 17, "y": 3},
+                {"matrix": [3, 16], "x": 18, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+                {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.5},
+                {"matrix": [4, 5], "x": 4.5, "y": 4, "w": 2},
+
+                {"matrix": [4, 6], "x": 7, "y": 4},
+                {"matrix": [4, 7], "x": 8, "y": 4},
+                {"matrix": [4, 8], "x": 9, "y": 4},
+
+                {"matrix": [4, 9], "x": 10.5, "y": 4, "w": 2},
+                {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 13], "x": 14, "y": 4, "w": 1.5},
+
+                {"matrix": [4, 14], "x": 16, "y": 4},
+                {"matrix": [4, 15], "x": 17, "y": 4},
+                {"matrix": [4, 16], "x": 18, "y": 4}
             ]
         }
     }
+
 }