Move 65% layouts to data driven (#20308)

2 files changed, 72 insertions, 106 deletions

diff --git a/keyboards/keebmonkey/kbmg68/info.json b/keyboards/keebmonkey/kbmg68/info.json
index 2069100fdf..15893e45c6 100644
--- a/keyboards/keebmonkey/kbmg68/info.json
+++ b/keyboards/keebmonkey/kbmg68/info.json
@@ -19,74 +19,78 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                { "label": "K00 (B1,B6)", "x": 0, "y": 0 },
-                { "label": "K01 (B1,B7)", "x": 1, "y": 0 },
-                { "label": "K02 (B1,D0)", "x": 2, "y": 0 },
-                { "label": "K03 (B1,D1)", "x": 3, "y": 0 },
-                { "label": "K04 (B1,D2)", "x": 4, "y": 0 },
-                { "label": "K05 (B1,D3)", "x": 5, "y": 0 },
-                { "label": "K06 (B1,D4)", "x": 6, "y": 0 },
-                { "label": "K07 (B1,D5)", "x": 7, "y": 0 },
-                { "label": "K08 (B1,D6)", "x": 8, "y": 0 },
-                { "label": "K09 (B1,D7)", "x": 9, "y": 0 },
-                { "label": "K0A (B1,C6)", "x": 10, "y": 0 },
-                { "label": "K0B (B1,C7)", "x": 11, "y": 0 },
-                { "label": "K0C (B1,F7)", "x": 12, "y": 0 },
-                { "label": "K0E (B1,F5)", "x": 13, "y": 0, "w": 2 },
-                { "label": "K0F (B1,F4)", "x": 15, "y": 0 },
-                { "label": "K10 (B2,B6)", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "K12 (B2,D0)", "x": 1.5, "y": 1 },
-                { "label": "K13 (B2,D1)", "x": 2.5, "y": 1 },
-                { "label": "K14 (B2,D2)", "x": 3.5, "y": 1 },
-                { "label": "K15 (B2,D3)", "x": 4.5, "y": 1 },
-                { "label": "K16 (B2,D4)", "x": 5.5, "y": 1 },
-                { "label": "K17 (B2,D5)", "x": 6.5, "y": 1 },
-                { "label": "K18 (B2,D6)", "x": 7.5, "y": 1 },
-                { "label": "K19 (B2,D7)", "x": 8.5, "y": 1 },
-                { "label": "K1A (B2,C6)", "x": 9.5, "y": 1 },
-                { "label": "K1B (B2,C7)", "x": 10.5, "y": 1 },
-                { "label": "K1C (B2,F7)", "x": 11.5, "y": 1 },
-                { "label": "K1D (B2,F6)", "x": 12.5, "y": 1 },
-                { "label": "K1E (B2,F5)", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "K1F (B2,F4)", "x": 15, "y": 1 },
-                { "label": "K20 (B3,B6)", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "K22 (B3,D0)", "x": 1.75, "y": 2 },
-                { "label": "K23 (B3,D1)", "x": 2.75, "y": 2 },
-                { "label": "K24 (B3,D2)", "x": 3.75, "y": 2 },
-                { "label": "K25 (B3,D3)", "x": 4.75, "y": 2 },
-                { "label": "K26 (B3,D4)", "x": 5.75, "y": 2 },
-                { "label": "K27 (B3,D5)", "x": 6.75, "y": 2 },
-                { "label": "K28 (B3,D6)", "x": 7.75, "y": 2 },
-                { "label": "K29 (B3,D7)", "x": 8.75, "y": 2 },
-                { "label": "K2A (B3,C6)", "x": 9.75, "y": 2 },
-                { "label": "K2B (B3,C7)", "x": 10.75, "y": 2 },
-                { "label": "K2C (B3,F7)", "x": 11.75, "y": 2 },
-                { "label": "K2D (B3,F6)", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "K2F (B3,F4)", "x": 15, "y": 2 },
-                { "label": "K31 (B4,B7)", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "K32 (B4,D0)", "x": 2.25, "y": 3 },
-                { "label": "K33 (B4,D1)", "x": 3.25, "y": 3 },
-                { "label": "K34 (B4,D2)", "x": 4.25, "y": 3 },
-                { "label": "K35 (B4,D3)", "x": 5.25, "y": 3 },
-                { "label": "K36 (B4,D4)", "x": 6.25, "y": 3 },
-                { "label": "K37 (B4,D5)", "x": 7.25, "y": 3 },
-                { "label": "K38 (B4,D6)", "x": 8.25, "y": 3 },
-                { "label": "K39 (B4,D7)", "x": 9.25, "y": 3 },
-                { "label": "K3A (B4,C6)", "x": 10.25, "y": 3 },
-                { "label": "K3B (B4,C7)", "x": 11.25, "y": 3 },
-                { "label": "K3D (B4,F6)", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "K3E (B4,F5)", "x": 14, "y": 3 },
-                { "label": "K3F (B4,F4)", "x": 15, "y": 3 },
-                { "label": "K40 (B5,B6)", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "K41 (B5,B7)", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "K43 (B5,D1)", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "K46 (B5,D4)", "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "K4A (B5,C6)", "x": 10, "y": 4 },
-                { "label": "K4B (B5,C7)", "x": 11, "y": 4 },
-                { "label": "K4C (B5,F7)", "x": 12, "y": 4 },
-                { "label": "K4D (B5,F6)", "x": 13, "y": 4 },
-                { "label": "K4E (B5,F5)", "x": 14, "y": 4 },
-                { "label": "K4F (B5,F4)", "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": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+                {"matrix": [0, 15], "x": 15, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 2], "x": 1.5, "y": 1},
+                {"matrix": [1, 3], "x": 2.5, "y": 1},
+                {"matrix": [1, 4], "x": 3.5, "y": 1},
+                {"matrix": [1, 5], "x": 4.5, "y": 1},
+                {"matrix": [1, 6], "x": 5.5, "y": 1},
+                {"matrix": [1, 7], "x": 6.5, "y": 1},
+                {"matrix": [1, 8], "x": 7.5, "y": 1},
+                {"matrix": [1, 9], "x": 8.5, "y": 1},
+                {"matrix": [1, 10], "x": 9.5, "y": 1},
+                {"matrix": [1, 11], "x": 10.5, "y": 1},
+                {"matrix": [1, 12], "x": 11.5, "y": 1},
+                {"matrix": [1, 13], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 2], "x": 1.75, "y": 2},
+                {"matrix": [2, 3], "x": 2.75, "y": 2},
+                {"matrix": [2, 4], "x": 3.75, "y": 2},
+                {"matrix": [2, 5], "x": 4.75, "y": 2},
+                {"matrix": [2, 6], "x": 5.75, "y": 2},
+                {"matrix": [2, 7], "x": 6.75, "y": 2},
+                {"matrix": [2, 8], "x": 7.75, "y": 2},
+                {"matrix": [2, 9], "x": 8.75, "y": 2},
+                {"matrix": [2, 10], "x": 9.75, "y": 2},
+                {"matrix": [2, 11], "x": 10.75, "y": 2},
+                {"matrix": [2, 12], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
+
+                {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+                {"matrix": [3, 8], "x": 8.25, "y": 3},
+                {"matrix": [3, 9], "x": 9.25, "y": 3},
+                {"matrix": [3, 10], "x": 10.25, "y": 3},
+                {"matrix": [3, 11], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4},
+                {"matrix": [4, 14], "x": 14, "y": 4},
+                {"matrix": [4, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/keebmonkey/kbmg68/kbmg68.h b/keyboards/keebmonkey/kbmg68/kbmg68.h
deleted file mode 100644
index a817a73d78..0000000000
--- a/keyboards/keebmonkey/kbmg68/kbmg68.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2022 Your Mom Loves My Keyboard
- *
- * 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
-
-#define LAYOUT_65_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \
-    K10, 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, K2F, \
-    K31,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
-    K40, K41, K43,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \
-    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
-    { XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
-    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F }, \
-}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/