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

2 files changed, 104 insertions, 131 deletions

diff --git a/keyboards/winkeyless/b87/b87.h b/keyboards/winkeyless/b87/b87.h
deleted file mode 100644
index 27ece38575..0000000000
--- a/keyboards/winkeyless/b87/b87.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021 Joah Nelson (Jels)
- *
- * 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,   K02, K03, K04, K05,   K60, K66, K76, K70, K07, K08, K09, K0A,            K49, K4A, K3A,  \
-    K10, K11, K12, K13, K14, K15, K61, K67, K77, K71, K16, K17, K18, K19, K1A,      K59, K5A, K7B,  \
-    K20, K21, K22, K23, K24, K25, K62, K68, K78, K72, K26, K27, K28, K29,           K7E, K7D, K7C,  \
-    K30, K31, K32, K33, K34, K35, K63, K69, K79, K73, K36, K37, K38, K39,                           \
-    K40, K53, K41, K42, K43, K44, K45, K64, K6A, K7A, K74, K46, K47, K48,                K6C,       \
-    K50, K51, K52,                K65,                K75, K56, K57, K58,           K6E, K6D, K6B   \
-){ \
-    {K00, ___, K02, K03, K04, K05, ___, K07, K08, K09, K0A, ___, ___, ___, ___},  \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, ___, ___, ___, ___},  \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, ___, ___, ___, ___, ___},  \
-    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, ___, ___, ___, ___},  \
-    {K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, ___, ___, ___, ___},  \
-    {K50, K51, K52, K53, ___, ___, K56, K57, K58, K59, K5A, ___, ___, ___, ___},  \
-    {K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E},  \
-    {K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E}   \
-}
diff --git a/keyboards/winkeyless/b87/info.json b/keyboards/winkeyless/b87/info.json
index 7422d3e2ba..672bd3e1d8 100644
--- a/keyboards/winkeyless/b87/info.json
+++ b/keyboards/winkeyless/b87/info.json
@@ -28,97 +28,110 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 2, "y": 0 },
-                { "label": "F2", "x": 3, "y": 0 },
-                { "label": "F3", "x": 4, "y": 0 },
-                { "label": "F4", "x": 5, "y": 0 },
-                { "label": "F5", "x": 6.5, "y": 0 },
-                { "label": "F6", "x": 7.5, "y": 0 },
-                { "label": "F7", "x": 8.5, "y": 0 },
-                { "label": "F8", "x": 9.5, "y": 0 },
-                { "label": "F9", "x": 11, "y": 0 },
-                { "label": "F10", "x": 12, "y": 0 },
-                { "label": "F11", "x": 13, "y": 0 },
-                { "label": "F12", "x": 14, "y": 0 },
-                { "label": "PrtSc", "x": 15.25, "y": 0 },
-                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
-                { "label": "Pause", "x": 17.25, "y": 0 },
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "!", "x": 1, "y": 1.25 },
-                { "label": "@", "x": 2, "y": 1.25 },
-                { "label": "#", "x": 3, "y": 1.25 },
-                { "label": "$", "x": 4, "y": 1.25 },
-                { "label": "%", "x": 5, "y": 1.25 },
-                { "label": "^", "x": 6, "y": 1.25 },
-                { "label": "&", "x": 7, "y": 1.25 },
-                { "label": "*", "x": 8, "y": 1.25 },
-                { "label": "(", "x": 9, "y": 1.25 },
-                { "label": ")", "x": 10, "y": 1.25 },
-                { "label": "_", "x": 11, "y": 1.25 },
-                { "label": "+", "x": 12, "y": 1.25 },
-                { "x": 13, "y": 1.25 },
-                { "label": "Bksp", "x": 14, "y": 1.25 },
-                { "label": "Insert", "x": 15.25, "y": 1.25 },
-                { "label": "Home", "x": 16.25, "y": 1.25 },
-                { "label": "PgUp", "x": 17.25, "y": 1.25 },
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "{", "x": 11.5, "y": 2.25 },
-                { "label": "}", "x": 12.5, "y": 2.25 },
-                { "label": "|", "x": 13.5, "y": 2.25, "w": 1.5 },
-                { "label": "Delete", "x": 15.25, "y": 2.25 },
-                { "label": "End", "x": 16.25, "y": 2.25 },
-                { "label": "PgDn", "x": 17.25, "y": 2.25 },
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ":", "x": 10.75, "y": 3.25 },
-                { "label": "\"", "x": 11.75, "y": 3.25 },
-                { "x": 12.75, "y": 3.25 },
-                { "label": "Enter", "x": 13.75, "y": 3.25, "w": 1.25 },
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
-                { "x": 1.25, "y": 4.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": "<", "x": 9.25, "y": 4.25 },
-                { "label": ">", "x": 10.25, "y": 4.25 },
-                { "label": "?", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 1.75 },
-                { "x": 14, "y": 4.25 },
-                { "label": "\u2191", "x": 16.25, "y": 4.25 },
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 15.25, "y": 5.25 },
-                { "label": "\u2193", "x": 16.25, "y": 5.25 },
-                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+                {"matrix": [0, 0], "x": 0, "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": [6, 0], "x": 6.5, "y": 0},
+                {"matrix": [6, 6], "x": 7.5, "y": 0},
+                {"matrix": [7, 6], "x": 8.5, "y": 0},
+                {"matrix": [7, 0], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 7], "x": 11, "y": 0},
+                {"matrix": [0, 8], "x": 12, "y": 0},
+                {"matrix": [0, 9], "x": 13, "y": 0},
+                {"matrix": [0, 10], "x": 14, "y": 0},
+
+                {"matrix": [4, 9], "x": 15.25, "y": 0},
+                {"matrix": [4, 10], "x": 16.25, "y": 0},
+                {"matrix": [3, 10], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [6, 1], "x": 6, "y": 1.25},
+                {"matrix": [6, 7], "x": 7, "y": 1.25},
+                {"matrix": [7, 7], "x": 8, "y": 1.25},
+                {"matrix": [7, 1], "x": 9, "y": 1.25},
+                {"matrix": [1, 6], "x": 10, "y": 1.25},
+                {"matrix": [1, 7], "x": 11, "y": 1.25},
+                {"matrix": [1, 8], "x": 12, "y": 1.25},
+                {"matrix": [1, 9], "x": 13, "y": 1.25},
+                {"matrix": [1, 10], "x": 14, "y": 1.25},
+
+                {"matrix": [5, 9], "x": 15.25, "y": 1.25},
+                {"matrix": [5, 10], "x": 16.25, "y": 1.25},
+                {"matrix": [7, 11], "x": 17.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [6, 2], "x": 6.5, "y": 2.25},
+                {"matrix": [6, 8], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [7, 14], "x": 15.25, "y": 2.25},
+                {"matrix": [7, 13], "x": 16.25, "y": 2.25},
+                {"matrix": [7, 12], "x": 17.25, "y": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+                {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+                {"matrix": [6, 9], "x": 7.75, "y": 3.25},
+                {"matrix": [7, 9], "x": 8.75, "y": 3.25},
+                {"matrix": [7, 3], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 6], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 7], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [5, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+                {"matrix": [6, 4], "x": 7.25, "y": 4.25},
+                {"matrix": [6, 10], "x": 8.25, "y": 4.25},
+                {"matrix": [7, 10], "x": 9.25, "y": 4.25},
+                {"matrix": [7, 4], "x": 10.25, "y": 4.25},
+                {"matrix": [4, 6], "x": 11.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 12.25, "y": 4.25, "w": 1.75},
+                {"matrix": [4, 8], "x": 14, "y": 4.25},
+
+                {"matrix": [6, 12], "x": 16.25, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [6, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+                {"matrix": [7, 5], "x": 10, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 6], "x": 11.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 7], "x": 12.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 8], "x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"matrix": [6, 14], "x": 15.25, "y": 5.25},
+                {"matrix": [6, 13], "x": 16.25, "y": 5.25},
+                {"matrix": [6, 11], "x": 17.25, "y": 5.25}
             ]
         }
     }