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

2 files changed, 90 insertions, 117 deletions

diff --git a/keyboards/mnk1800s/info.json b/keyboards/mnk1800s/info.json
index 619911f907..4e09e2ecd0 100755
--- a/keyboards/mnk1800s/info.json
+++ b/keyboards/mnk1800s/info.json
@@ -18,93 +18,100 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Num Lock", "x":0, "y":0},
-                {"label":"/", "x":1, "y":0},
-                {"label":"*", "x":2, "y":0},
-                {"label":"-", "x":3, "y":0},
-                {"label":"Esc", "x":4.5, "y":0},
-                {"label":"1", "x":5.5, "y":0},
-                {"label":"2", "x":6.5, "y":0},
-                {"label":"3", "x":7.5, "y":0},
-                {"label":"4", "x":8.5, "y":0},
-                {"label":"5", "x":9.5, "y":0},
-                {"label":"6", "x":10.5, "y":0},
-                {"label":"7", "x":11.5, "y":0},
-                {"label":"8", "x":12.5, "y":0},
-                {"label":"9", "x":13.5, "y":0},
-                {"label":"0", "x":14.5, "y":0},
-                {"label":"-", "x":15.5, "y":0},
-                {"label":"=", "x":16.5, "y":0},
-                {"label":"Backspace", "x":17.5, "y":0},
-                {"label":"Delete", "x":18.5, "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},
 
-                {"label":"7", "x":0, "y":1},
-                {"label":"8", "x":1, "y":1},
-                {"label":"9", "x":2, "y":1},
-                {"label":"+", "x":3, "y":1},
-                {"label":"Tab", "x":4.5, "y":1, "w":1.5},
-                {"label":"Q", "x":6, "y":1},
-                {"label":"W", "x":7, "y":1},
-                {"label":"E", "x":8, "y":1},
-                {"label":"R", "x":9, "y":1},
-                {"label":"T", "x":10, "y":1},
-                {"label":"Y", "x":11, "y":1},
-                {"label":"U", "x":12, "y":1},
-                {"label":"I", "x":13, "y":1},
-                {"label":"O", "x":14, "y":1},
-                {"label":"P", "x":15, "y":1},
-                {"label":"[", "x":16, "y":1},
-                {"label":"]", "x":17, "y":1},
-                {"label":"\\", "x":18, "y":1, "w":1.5},
+                {"matrix": [0, 4], "x": 4.5, "y": 0},
+                {"matrix": [0, 5], "x": 5.5, "y": 0},
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+                {"matrix": [0, 10], "x": 10.5, "y": 0},
+                {"matrix": [0, 11], "x": 11.5, "y": 0},
+                {"matrix": [0, 12], "x": 12.5, "y": 0},
+                {"matrix": [0, 13], "x": 13.5, "y": 0},
+                {"matrix": [0, 14], "x": 14.5, "y": 0},
+                {"matrix": [0, 15], "x": 15.5, "y": 0},
+                {"matrix": [0, 16], "x": 16.5, "y": 0},
+                {"matrix": [0, 17], "x": 17.5, "y": 0},
+                {"matrix": [2, 17], "x": 18.5, "y": 0},
 
-                {"label":"4", "x":0, "y":2},
-                {"label":"5", "x":1, "y":2},
-                {"label":"6", "x":2, "y":2},
-                {"label":"Enter", "x":3, "y":2},
-                {"label":"Ctrl", "x":4.5, "y":2, "w":1.75},
-                {"label":"A", "x":6.25, "y":2},
-                {"label":"S", "x":7.25, "y":2},
-                {"label":"D", "x":8.25, "y":2},
-                {"label":"F", "x":9.25, "y":2},
-                {"label":"G", "x":10.25, "y":2},
-                {"label":"H", "x":11.25, "y":2},
-                {"label":"J", "x":12.25, "y":2},
-                {"label":"K", "x":13.25, "y":2},
-                {"label":"L", "x":14.25, "y":2},
-                {"label":";", "x":15.25, "y":2},
-                {"label":"'", "x":16.25, "y":2},
-                {"label":"Enter", "x":17.25, "y":2, "w":2.25},
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                {"label":"1", "x":0, "y":3},
-                {"label":"2", "x":1, "y":3},
-                {"label":"3", "x":2, "y":3},
-                {"label":"Enter", "x":3, "y":3},
-                {"label":"Up", "x":4.25, "y":3.25},
-                {"label":"Shift", "x":5.5, "y":3, "w":1.25},
-                {"label":"Z", "x":6.75, "y":3},
-                {"label":"X", "x":7.75, "y":3},
-                {"label":"C", "x":8.75, "y":3},
-                {"label":"V", "x":9.75, "y":3},
-                {"label":"B", "x":10.75, "y":3},
-                {"label":"N", "x":11.75, "y":3},
-                {"label":"M", "x":12.75, "y":3},
-                {"label":",", "x":13.75, "y":3},
-                {"label":".", "x":14.75, "y":3},
-                {"label":"/", "x":15.75, "y":3},
-                {"label":"Shift", "x":16.75, "y":3, "w":1.75},
-                {"label":"Fn", "x":18.5, "y":3},
+                {"matrix": [1, 4], "x": 4.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 5], "x": 6, "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, "y": 1},
+                {"matrix": [1, 10], "x": 11, "y": 1},
+                {"matrix": [1, 11], "x": 12, "y": 1},
+                {"matrix": [1, 12], "x": 13, "y": 1},
+                {"matrix": [1, 13], "x": 14, "y": 1},
+                {"matrix": [1, 14], "x": 15, "y": 1},
+                {"matrix": [1, 15], "x": 16, "y": 1},
+                {"matrix": [1, 16], "x": 17, "y": 1},
+                {"matrix": [1, 17], "x": 18, "y": 1, "w": 1.5},
 
-                {"label":"0", "x":0, "y":4},
-                {"label":"0", "x":1, "y":4},
-                {"label":".", "x":2, "y":4},
-                {"label":"Left", "x":3.25, "y":4.25},
-                {"label":"Down", "x":4.25, "y":4.25},
-                {"label":"Right", "x":5.25, "y":4.25},
-                {"label":"GUI", "x":6.5, "y":4, "w":1.5},
-                {"label":"Alt", "x":8, "y":4, "w":1.5},
-                {"label":"Space", "x":9.5, "y":4, "w":7},
-                {"label":"Alt", "x":16.5, "y":4, "w":1.5},
-                {"label":"Menu", "x":18, "y":4, "w":1.5}
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+
+                {"matrix": [2, 4], "x": 4.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 5], "x": 6.25, "y": 2},
+                {"matrix": [2, 6], "x": 7.25, "y": 2},
+                {"matrix": [2, 7], "x": 8.25, "y": 2},
+                {"matrix": [2, 8], "x": 9.25, "y": 2},
+                {"matrix": [2, 9], "x": 10.25, "y": 2},
+                {"matrix": [2, 10], "x": 11.25, "y": 2},
+                {"matrix": [2, 11], "x": 12.25, "y": 2},
+                {"matrix": [2, 12], "x": 13.25, "y": 2},
+                {"matrix": [2, 13], "x": 14.25, "y": 2},
+                {"matrix": [2, 14], "x": 15.25, "y": 2},
+                {"matrix": [2, 15], "x": 16.25, "y": 2},
+                {"matrix": [2, 16], "x": 17.25, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [4, 8], "x": 3, "y": 3},
+
+                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+
+                {"matrix": [3, 4], "x": 5.5, "y": 3, "w": 1.25},
+                {"matrix": [3, 5], "x": 6.75, "y": 3},
+                {"matrix": [3, 6], "x": 7.75, "y": 3},
+                {"matrix": [3, 7], "x": 8.75, "y": 3},
+                {"matrix": [3, 8], "x": 9.75, "y": 3},
+                {"matrix": [3, 9], "x": 10.75, "y": 3},
+                {"matrix": [3, 10], "x": 11.75, "y": 3},
+                {"matrix": [3, 11], "x": 12.75, "y": 3},
+                {"matrix": [3, 12], "x": 13.75, "y": 3},
+                {"matrix": [3, 13], "x": 14.75, "y": 3},
+                {"matrix": [3, 14], "x": 15.75, "y": 3},
+                {"matrix": [3, 15], "x": 16.75, "y": 3, "w": 1.75},
+                {"matrix": [3, 16], "x": 18.5, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+
+                {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+
+                {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 7], "x": 8, "y": 4, "w": 1.5},
+                {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 7},
+                {"matrix": [4, 15], "x": 16.5, "y": 4, "w": 1.5},
+                {"matrix": [4, 16], "x": 18, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/mnk1800s/mnk1800s.h b/keyboards/mnk1800s/mnk1800s.h
deleted file mode 100644
index 71716767b8..0000000000
--- a/keyboards/mnk1800s/mnk1800s.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 Yiancar-Designs
- *
- * 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
-
-#define XXX KC_NO
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    K00, K01, K02, K03,      K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, KOG, K0H, K2H, \
-    K10, K11, K12, K13,      K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H,      \
-    K20, K21, K22, K23,      K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G,           \
-    K30, K31, K32, K48, K33,      K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G,      \
-    K40, K41, K42, K43, K44, K45,      K46, K47,           K4A,                     K4F, K4G            \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, KOG, K0H }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, XXX, K4A, XXX, XXX, XXX, XXX, K4F, K4G, XXX }  \
-}