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

3 files changed, 156 insertions, 176 deletions

diff --git a/keyboards/boston/boston.c b/keyboards/boston/boston.c
index 2bcac21cba..7d16dae80c 100644
--- a/keyboards/boston/boston.c
+++ b/keyboards/boston/boston.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "boston.h"
+#include "quantum.h"
 
 void keyboard_post_init_kb(void) {
     /* this is to set an LED color at startup so it's not some random color*/
diff --git a/keyboards/boston/boston.h b/keyboards/boston/boston.h
deleted file mode 100644
index db245c5c29..0000000000
--- a/keyboards/boston/boston.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 Pylon
- *
- * 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 3 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,   K0G, K0H, K0I, \
-	K10,  K11, K12, K13, K14,  K15, K16, K17, K18,  K19, K1A, K1B, K1C,    K1D, K1E, K1F,   K1G, K1H, K1I, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K5E,  K2E,        K2F, K2G, K2H, K2I, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,       K3E,        K3F, K3G, K3H, K3I, \
-	K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,       K4E,        K4F, K4G, K4H, K4I, \
-	K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C,            K5D,        K5F, K5G, K5H, K5I, \
-    K60, K61, K62,      K64, K65,      K67,      K69, K6A, K6B,            K6C, K6D, K6E,   K6F, K6G, K6H \
-	) \
-    { \
-        {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I}, \
-        {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I}, \
-        {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I}, \
-        {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I}, \
-        {K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I}, \
-        {K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I}, \
-        {K60, K61, K62, ___, K64, K65, ___, K67, ___, K69, K6A, K6B, K6C, K6D, K6E, K6F, K6G, K6H, ___ } \
-    }
diff --git a/keyboards/boston/info.json b/keyboards/boston/info.json
index f169d0966c..dd20b49010 100644
--- a/keyboards/boston/info.json
+++ b/keyboards/boston/info.json
@@ -36,141 +36,161 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Encoder", "x":0, "y":0},
-                {"label":"P1", "x":1.5, "y":0},
-                {"label":"P2", "x":2.5, "y":0},
-                {"label":"P3", "x":3.5, "y":0},
-                {"label":"P4", "x":4.5, "y":0},
-                {"label":"P5", "x":5.75, "y":0},
-                {"label":"P6", "x":6.75, "y":0},
-                {"label":"P7", "x":7.75, "y":0},
-                {"label":"P8", "x":8.75, "y":0},
-                {"label":"P9", "x":10, "y":0},
-                {"label":"P10", "x":11, "y":0},
-                {"label":"P11", "x":12, "y":0},
-                {"label":"P12", "x":13, "y":0},
-                {"label":"P13", "x":14.25, "y":0},
-                {"label":"P14", "x":15.25, "y":0},
-                {"label":"P15", "x":16.25, "y":0},
-                {"label":"Insert", "x":17.5, "y":0},
-                {"label":"Home", "x":18.5, "y":0},
-                {"label":"PgUp", "x":19.5, "y":0},
-
-                {"label":"Esc", "x":0, "y":1},
-                {"label":"F1", "x":1.5, "y":1},
-                {"label":"F2", "x":2.5, "y":1},
-                {"label":"F3", "x":3.5, "y":1},
-                {"label":"F4", "x":4.5, "y":1},
-                {"label":"F5", "x":5.75, "y":1},
-                {"label":"F6", "x":6.75, "y":1},
-                {"label":"F7", "x":7.75, "y":1},
-                {"label":"F8", "x":8.75, "y":1},
-                {"label":"F9", "x":10, "y":1},
-                {"label":"F10", "x":11, "y":1},
-                {"label":"F11", "x":12, "y":1},
-                {"label":"F12", "x":13, "y":1},
-                {"label":"Print Screen", "x":14.25, "y":1},
-                {"label":"Scroll Lock", "x":15.25, "y":1},
-                {"label":"Pause", "x":16.25, "y":1},
-                {"label":"Delete", "x":17.5, "y":1},
-                {"label":"End", "x":18.5, "y":1},
-                {"label":"PgDn", "x":19.5, "y":1},
-
-                {"label":"~", "x":0, "y":2.5},
-                {"label":"!", "x":1, "y":2.5},
-                {"label":"@", "x":2, "y":2.5},
-                {"label":"#", "x":3, "y":2.5},
-                {"label":"$", "x":4, "y":2.5},
-                {"label":"%", "x":5, "y":2.5},
-                {"label":"^", "x":6, "y":2.5},
-                {"label":"&", "x":7, "y":2.5},
-                {"label":"*", "x":8, "y":2.5},
-                {"label":"(", "x":9, "y":2.5},
-                {"label":")", "x":10, "y":2.5},
-                {"label":"_", "x":11, "y":2.5},
-                {"label":"+", "x":12, "y":2.5},
-                {"label":"Backspace", "x":13, "y":2.5},
-                {"label":"Backspace", "x":14, "y":2.5},
-                {"label":"P16", "x":15.25, "y":2.5},
-                {"label":"Num Lock", "x":16.5, "y":2.5},
-                {"label":"/", "x":17.5, "y":2.5},
-                {"label":"*", "x":18.5, "y":2.5},
-                {"label":"-", "x":19.5, "y":2.5},
-
-                {"label":"Tab", "x":0, "y":3.5, "w":1.5},
-                {"label":"Q", "x":1.5, "y":3.5},
-                {"label":"W", "x":2.5, "y":3.5},
-                {"label":"E", "x":3.5, "y":3.5},
-                {"label":"R", "x":4.5, "y":3.5},
-                {"label":"T", "x":5.5, "y":3.5},
-                {"label":"Y", "x":6.5, "y":3.5},
-                {"label":"U", "x":7.5, "y":3.5},
-                {"label":"I", "x":8.5, "y":3.5},
-                {"label":"O", "x":9.5, "y":3.5},
-                {"label":"P", "x":10.5, "y":3.5},
-                {"label":"{", "x":11.5, "y":3.5},
-                {"label":"}", "x":12.5, "y":3.5},
-                {"label":"|", "x":13.5, "y":3.5, "w":1.5},
-                {"label":"P17", "x":15.25, "y":3.5},
-                {"label":"7", "x":16.5, "y":3.5},
-                {"label":"8", "x":17.5, "y":3.5},
-                {"label":"9", "x":18.5, "y":3.5},
-                {"label":"-", "x":19.5, "y":3.5},
-
-                {"label":"Caps Lock", "x":0, "y":4.5, "w":1.75},
-                {"label":"A", "x":1.75, "y":4.5},
-                {"label":"S", "x":2.75, "y":4.5},
-                {"label":"D", "x":3.75, "y":4.5},
-                {"label":"F", "x":4.75, "y":4.5},
-                {"label":"G", "x":5.75, "y":4.5},
-                {"label":"H", "x":6.75, "y":4.5},
-                {"label":"J", "x":7.75, "y":4.5},
-                {"label":"K", "x":8.75, "y":4.5},
-                {"label":"L", "x":9.75, "y":4.5},
-                {"label":"'", "x":10.75, "y":4.5},
-                {"label":"'", "x":11.75, "y":4.5},
-                {"label":"~", "x":12.75, "y":4.5},
-                {"label":"Enter", "x":13.75, "y":4.5, "w":1.25},
-                {"label":"P18", "x":15.25, "y":4.5},
-                {"label":"4", "x":16.5, "y":4.5},
-                {"label":"5", "x":17.5, "y":4.5},
-                {"label":"6", "x":18.5, "y":4.5},
-                {"label":"+", "x":19.5, "y":4.5},
-
-                {"label":"Left Shift", "x":0, "y":5.5, "w":1.25},
-                {"label":"Left Shift", "x":1.25, "y":5.5},
-                {"label":"Z", "x":2.25, "y":5.5},
-                {"label":"X", "x":3.25, "y":5.5},
-                {"label":"C", "x":4.25, "y":5.5},
-                {"label":"V", "x":5.25, "y":5.5},
-                {"label":"B", "x":6.25, "y":5.5},
-                {"label":"N", "x":7.25, "y":5.5},
-                {"label":"M", "x":8.25, "y":5.5},
-                {"label":"<", "x":9.25, "y":5.5},
-                {"label":">", "x":10.25, "y":5.5},
-                {"label":"?", "x":11.25, "y":5.5},
-                {"label":"Right Shift", "x":12.25, "y":5.5, "w":1.75},
-                {"label":"Up", "x":14.25, "y":5.75},
-                {"label":"1", "x":16.5, "y":5.5},
-                {"label":"2", "x":17.5, "y":5.5},
-                {"label":"3", "x":18.5, "y":5.5},
-                {"label":"Enter", "x":19.5, "y":5.5, "h":2},
-
-                {"label":"Ctrl", "x":0, "y":6.5, "w":1.25},
-                {"label":"OS", "x":1.25, "y":6.5, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":6.5, "w":1.25},
-                {"label":"Space", "x":3.75, "y":6.5, "w":2.25},
-                {"label":"Space", "x":6, "y":6.5, "w":1.25},
-                {"label":"Space", "x":7.25, "y":6.5, "w":2.75},
-                {"label":"Alt", "x":10, "y":6.5},
-                {"label":"Menu", "x":11, "y":6.5},
-                {"label":"Ctrl", "x":12, "y":6.5},
-                {"label":"Left", "x":13.25, "y":6.75},
-                {"label":"Down", "x":14.25, "y":6.75},
-                {"label":"Right", "x":15.25, "y":6.75},
-                {"label":"0", "x":16.5, "y":6.5},
-                {"label":"0", "x":17.5, "y":6.5},
-                {"label":".", "x":18.5, "y":6.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"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.75, "y": 0},
+                {"matrix": [0, 6], "x": 6.75, "y": 0},
+                {"matrix": [0, 7], "x": 7.75, "y": 0},
+                {"matrix": [0, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [0, 9], "x": 10, "y": 0},
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+
+                {"matrix": [0, 13], "x": 14.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.25, "y": 0},
+                {"matrix": [0, 15], "x": 16.25, "y": 0},
+
+                {"matrix": [0, 16], "x": 17.5, "y": 0},
+                {"matrix": [0, 17], "x": 18.5, "y": 0},
+                {"matrix": [0, 18], "x": 19.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+
+                {"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.75, "y": 1},
+                {"matrix": [1, 6], "x": 6.75, "y": 1},
+                {"matrix": [1, 7], "x": 7.75, "y": 1},
+                {"matrix": [1, 8], "x": 8.75, "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.25, "y": 1},
+                {"matrix": [1, 14], "x": 15.25, "y": 1},
+                {"matrix": [1, 15], "x": 16.25, "y": 1},
+
+                {"matrix": [1, 16], "x": 17.5, "y": 1},
+                {"matrix": [1, 17], "x": 18.5, "y": 1},
+                {"matrix": [1, 18], "x": 19.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5},
+                {"matrix": [2, 1], "x": 1, "y": 2.5},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2.5},
+                {"matrix": [2, 4], "x": 4, "y": 2.5},
+                {"matrix": [2, 5], "x": 5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6, "y": 2.5},
+                {"matrix": [2, 7], "x": 7, "y": 2.5},
+                {"matrix": [2, 8], "x": 8, "y": 2.5},
+                {"matrix": [2, 9], "x": 9, "y": 2.5},
+                {"matrix": [2, 10], "x": 10, "y": 2.5},
+                {"matrix": [2, 11], "x": 11, "y": 2.5},
+                {"matrix": [2, 12], "x": 12, "y": 2.5},
+                {"matrix": [2, 13], "x": 13, "y": 2.5},
+                {"matrix": [5, 14], "x": 14, "y": 2.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+
+                {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+                {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+                {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.5},
+                {"matrix": [3, 1], "x": 1.5, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.5, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.5, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.5, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.5, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.5, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.5, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.5, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.5, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.5, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.5, "y": 3.5},
+                {"matrix": [3, 13], "x": 13.5, "y": 3.5, "w": 1.5},
+
+                {"matrix": [3, 14], "x": 15.25, "y": 3.5},
+
+                {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+                {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+                {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+                {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 4.5},
+                {"matrix": [4, 2], "x": 2.75, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.75, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.75, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.75, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.75, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.75, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.75, "y": 4.5},
+                {"matrix": [4, 9], "x": 9.75, "y": 4.5},
+                {"matrix": [4, 10], "x": 10.75, "y": 4.5},
+                {"matrix": [4, 11], "x": 11.75, "y": 4.5},
+                {"matrix": [4, 12], "x": 12.75, "y": 4.5},
+                {"matrix": [4, 13], "x": 13.75, "y": 4.5, "w": 1.25},
+
+                {"matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+                {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+                {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+                {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+                {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.25, "y": 5.5},
+                {"matrix": [5, 3], "x": 3.25, "y": 5.5},
+                {"matrix": [5, 4], "x": 4.25, "y": 5.5},
+                {"matrix": [5, 5], "x": 5.25, "y": 5.5},
+                {"matrix": [5, 6], "x": 6.25, "y": 5.5},
+                {"matrix": [5, 7], "x": 7.25, "y": 5.5},
+                {"matrix": [5, 8], "x": 8.25, "y": 5.5},
+                {"matrix": [5, 9], "x": 9.25, "y": 5.5},
+                {"matrix": [5, 10], "x": 10.25, "y": 5.5},
+                {"matrix": [5, 11], "x": 11.25, "y": 5.5},
+                {"matrix": [5, 12], "x": 12.25, "y": 5.5, "w": 1.75},
+
+                {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+
+                {"matrix": [5, 15], "x": 16.5, "y": 5.5},
+                {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+                {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+                {"matrix": [5, 18], "x": 19.5, "y": 5.5, "h": 2},
+
+                {"matrix": [6, 0], "x": 0, "y": 6.5, "w": 1.25},
+                {"matrix": [6, 1], "x": 1.25, "y": 6.5, "w": 1.25},
+                {"matrix": [6, 2], "x": 2.5, "y": 6.5, "w": 1.25},
+                {"matrix": [6, 4], "x": 3.75, "y": 6.5, "w": 2.25},
+                {"matrix": [6, 5], "x": 6, "y": 6.5, "w": 1.25},
+                {"matrix": [6, 7], "x": 7.25, "y": 6.5, "w": 2.75},
+                {"matrix": [6, 9], "x": 10, "y": 6.5},
+                {"matrix": [6, 10], "x": 11, "y": 6.5},
+                {"matrix": [6, 11], "x": 12, "y": 6.5},
+
+                {"matrix": [6, 12], "x": 13.25, "y": 6.75},
+                {"matrix": [6, 13], "x": 14.25, "y": 6.75},
+                {"matrix": [6, 14], "x": 15.25, "y": 6.75},
+
+                {"matrix": [6, 15], "x": 16.5, "y": 6.5},
+                {"matrix": [6, 16], "x": 17.5, "y": 6.5},
+                {"matrix": [6, 17], "x": 18.5, "y": 6.5}
             ]
         }
     }