Move single `LAYOUT_all`s to data driven (#20430)

3 files changed, 72 insertions, 108 deletions

diff --git a/keyboards/mode/m65s/info.json b/keyboards/mode/m65s/info.json
index c744b3512d..f352ca4f52 100644
--- a/keyboards/mode/m65s/info.json
+++ b/keyboards/mode/m65s/info.json
@@ -21,80 +21,81 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "K00", "x": 0, "y": 0 },
-                { "label": "K01", "x": 1, "y": 0 },
-                { "label": "K02", "x": 2, "y": 0 },
-                { "label": "K03", "x": 3, "y": 0 },
-                { "label": "K04", "x": 4, "y": 0 },
-                { "label": "K05", "x": 5, "y": 0 },
-                { "label": "K06", "x": 6, "y": 0 },
-                { "label": "K07", "x": 7, "y": 0 },
-                { "label": "K08", "x": 8, "y": 0 },
-                { "label": "K09", "x": 9, "y": 0 },
-                { "label": "K0A", "x": 10, "y": 0 },
-                { "label": "K0B", "x": 11, "y": 0 },
-                { "label": "K0C", "x": 12, "y": 0 },
-                { "label": "K0D", "x": 13, "y": 0 },
-                { "label": "K0E", "x": 14, "y": 0 },
-                { "label": "K0F", "x": 15, "y": 0 },
+                {"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, 13], "x": 13, "y": 0},
+                {"matrix": [0, 14], "x": 14, "y": 0},
+                {"matrix": [0, 15], "x": 15, "y": 0},
 
-                { "label": "K10", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "K11", "x": 1.5, "y": 1 },
-                { "label": "K12", "x": 2.5, "y": 1 },
-                { "label": "K13", "x": 3.5, "y": 1 },
-                { "label": "K14", "x": 4.5, "y": 1 },
-                { "label": "K15", "x": 5.5, "y": 1 },
-                { "label": "K16", "x": 6.5, "y": 1 },
-                { "label": "K17", "x": 7.5, "y": 1 },
-                { "label": "K18", "x": 8.5, "y": 1 },
-                { "label": "K19", "x": 9.5, "y": 1 },
-                { "label": "K1A", "x": 10.5, "y": 1 },
-                { "label": "K1B", "x": 11.5, "y": 1 },
-                { "label": "K1C", "x": 12.5, "y": 1 },
-                { "label": "K1E", "x": 13.5, "y": 1, "w": 1.5},
-                { "label": "K1F", "x": 15, "y": 1 },
+                {"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": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 15], "x": 15, "y": 1},
 
-                { "label": "K20", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "K21", "x": 1.75, "y": 2 },
-                { "label": "K22", "x": 2.75, "y": 2 },
-                { "label": "K23", "x": 3.75, "y": 2 },
-                { "label": "K24", "x": 4.75, "y": 2 },
-                { "label": "K25", "x": 5.75, "y": 2 },
-                { "label": "K26", "x": 6.75, "y": 2 },
-                { "label": "K27", "x": 7.75, "y": 2 },
-                { "label": "K28", "x": 8.75, "y": 2 },
-                { "label": "K29", "x": 9.75, "y": 2 },
-                { "label": "K2A", "x": 10.75, "y": 2 },
-                { "label": "K2B", "x": 11.75, "y": 2 },
-                { "label": "K2D", "x": 12.75, "y": 2 },
-                { "label": "K2E", "x": 13.75, "y": 2, "w": 1.25 },
-                { "label": "K2F", "x": 15, "y": 2 },
+                {"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": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2},
+                {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+                {"matrix": [2, 15], "x": 15, "y": 2},
 
-                { "label": "K30", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "K31", "x": 1.25, "y": 3 },
-                { "label": "K32", "x": 2.25, "y": 3 },
-                { "label": "K33", "x": 3.25, "y": 3 },
-                { "label": "K34", "x": 4.25, "y": 3 },
-                { "label": "K35", "x": 5.25, "y": 3 },
-                { "label": "K36", "x": 6.25, "y": 3 },
-                { "label": "K37", "x": 7.25, "y": 3 },
-                { "label": "K38", "x": 8.25, "y": 3 },
-                { "label": "K39", "x": 9.25, "y": 3 },
-                { "label": "K3A", "x": 10.25, "y": 3 },
-                { "label": "K3B", "x": 11.25, "y": 3 },
-                { "label": "K3C", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "K3E", "x": 14, "y": 3 },
-                { "label": "K3F", "x": 15, "y": 3 },
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3},
+                {"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, 12], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 14], "x": 14, "y": 3},
+                {"matrix": [3, 15], "x": 15, "y": 3},
 
-                { "label": "K40", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "K41", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "K42", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "K56", "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "K5A", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "K5B", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "K5D", "x": 13, "y": 4 },
-                { "label": "K5E", "x": 14, "y": 4 },
-                { "label": "K5F", "x": 15, "y": 4 }
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [5, 10], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [5, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+                {"matrix": [5, 13], "x": 13, "y": 4},
+                {"matrix": [5, 14], "x": 14, "y": 4},
+                {"matrix": [5, 15], "x": 15, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mode/m65s/m65s.c b/keyboards/mode/m65s/m65s.c
index 467fc53a0e..70aa52c461 100644
--- a/keyboards/mode/m65s/m65s.c
+++ b/keyboards/mode/m65s/m65s.c
@@ -15,7 +15,7 @@ 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 "m65s.h"
+#include "quantum.h"
 
 void board_init(void) {
     setPinInput(B10);
diff --git a/keyboards/mode/m65s/m65s.h b/keyboards/mode/m65s/m65s.h
deleted file mode 100644
index 3c39f1a85e..0000000000
--- a/keyboards/mode/m65s/m65s.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
-
-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 ___ KC_NO
-
-#define LAYOUT_all( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, K2F, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, K3F, \
-	K40, K41, K42,                K56,                K5A, K5B,      K5D, K5E, K5F \
-) { \
-	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D, K2E, K2F }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___, K3E, K3F }, \
-	{ K40, K41, K42, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
-	{ ___, ___, ___, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, ___, K5D, K5E, K5F } \
-}