Move miscellaneous layouts to data driven (#20516)

3 files changed, 204 insertions, 240 deletions

diff --git a/keyboards/exclusive/e85/hotswap/hotswap.c b/keyboards/exclusive/e85/hotswap/hotswap.c
index db14971dab..a6d50b1f77 100644
--- a/keyboards/exclusive/e85/hotswap/hotswap.c
+++ b/keyboards/exclusive/e85/hotswap/hotswap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "hotswap.h"
+#include "quantum.h"
 
 void keyboard_pre_init_kb(void) {
     setPinOutput(C7);
diff --git a/keyboards/exclusive/e85/hotswap/hotswap.h b/keyboards/exclusive/e85/hotswap/hotswap.h
deleted file mode 100644
index 377dd8ad5a..0000000000
--- a/keyboards/exclusive/e85/hotswap/hotswap.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright 2020 MechMerlin
- *
- * 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_ansi_standard( \
-    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K68, K67, K65, K64,   K63,  K66, K62, K61,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73,       K76, K72, K71,  \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83,     K86, K82, K81,  \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93,                         \
-    K40,       K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4,                K92,       \
-    K50,   K51, K52,                  K56,             K58,  K57,   K54, K53,   KA6, KA2, KA1   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \
-    { K50,   K51,   K52,   K53,   K54,   KC_NO, K56,   K57,   K58   }, \
-    { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68   }, \
-    { K70,   K71,   K72,   K73,   KC_NO, K75,   K76,   K77,   K78   }, \
-    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87,   K88   }, \
-    { KC_NO, KC_NO, K92,   K93,   KC_NO, K95,   KC_NO, K97,   K98   }, \
-    { KC_NO, KA1,   KA2,   KC_NO, KA4,   KA5,   KA6,   KA7,   KA8   }, \
-}
-
-#define LAYOUT_ansi_tsangan( \
-    K00,  K01, K02, K03, K04,  K05, K06, K07, K08,  K68, K67, K65, K64,   K63,  K66, K62, K61,  \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73,       K76, K72, K71,  \
-    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83,     K86, K82, K81,  \
-    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93,                         \
-    K40,       K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4,                K92,       \
-    K50,   K51, K52,                  K56,                 K57,   K54, K53,     KA6, KA2, KA1   \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
-    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \
-    { K50,   K51,   K52,   K53,   K54,   KC_NO, K56,   K57,   KC_NO }, \
-    { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68   }, \
-    { K70,   K71,   K72,   K73,   KC_NO, K75,   K76,   K77,   K78   }, \
-    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87,   K88   }, \
-    { KC_NO, KC_NO, K92,   K93,   KC_NO, K95,   KC_NO, K97,   K98   }, \
-    { KC_NO, KA1,   KA2,   KC_NO, KA4,   KA5,   KA6,   KA7,   KA8   }, \
-}
diff --git a/keyboards/exclusive/e85/hotswap/info.json b/keyboards/exclusive/e85/hotswap/info.json
index 8db1f0fb01..60dc68eaf7 100644
--- a/keyboards/exclusive/e85/hotswap/info.json
+++ b/keyboards/exclusive/e85/hotswap/info.json
@@ -26,186 +26,213 @@
     "layouts": {
         "LAYOUT_ansi_standard": {
             "layout": [
-                {"label":"K00 (E6,D0)", "x":0, "y":0},
-                {"label":"K01 (E6,D1)", "x":1.25, "y":0},
-                {"label":"K02 (E6,D2)", "x":2.25, "y":0},
-                {"label":"K03 (E6,D3)", "x":3.25, "y":0},
-                {"label":"K04 (E6,D5)", "x":4.25, "y":0},
-                {"label":"K05 (E6,D4)", "x":5.5, "y":0},
-                {"label":"K06 (E6,D6)", "x":6.5, "y":0},
-                {"label":"K07 (E6,D7)", "x":7.5, "y":0},
-                {"label":"K08 (E6,B4)", "x":8.5, "y":0},
-                {"label":"K68 (F7,B4)", "x":9.75, "y":0},
-                {"label":"K67 (F7,D7)", "x":10.75, "y":0},
-                {"label":"K65 (F7,D4)", "x":11.75, "y":0},
-                {"label":"K64 (F7,D5)", "x":12.75, "y":0},
-                {"label":"K63 (F7,D3)", "x":14, "y":0},
-                {"label":"K66 (F7,D6)", "x":15.25, "y":0},
-                {"label":"K62 (F7,D2)", "x":16.25, "y":0},
-                {"label":"K61 (F7,D1)", "x":17.25, "y":0},
-                {"label":"K10 (B0,D0)", "x":0, "y":1.5},
-                {"label":"K11 (B0,D1)", "x":1, "y":1.5},
-                {"label":"K12 (B0,D2)", "x":2, "y":1.5},
-                {"label":"K13 (B0,D3)", "x":3, "y":1.5},
-                {"label":"K14 (B0,D5)", "x":4, "y":1.5},
-                {"label":"K15 (B0,D4)", "x":5, "y":1.5},
-                {"label":"K16 (B0,D6)", "x":6, "y":1.5},
-                {"label":"K17 (B0,D7)", "x":7, "y":1.5},
-                {"label":"K18 (B0,B4)", "x":8, "y":1.5},
-                {"label":"K78 (F6,B4)", "x":9, "y":1.5},
-                {"label":"K70 (F6,D0)", "x":10, "y":1.5},
-                {"label":"K77 (F6,D7)", "x":11, "y":1.5},
-                {"label":"K75 (F6,D4)", "x":12, "y":1.5},
-                {"label":"K73 (F6,D3)", "x":13, "y":1.5, "w":2},
-                {"label":"K76 (F6,D6)", "x":15.25, "y":1.5},
-                {"label":"K72 (F6,D2)", "x":16.25, "y":1.5},
-                {"label":"K71 (F6,D1)", "x":17.25, "y":1.5},
-                {"label":"K20 (B1,D0)", "x":0, "y":2.5, "w":1.5},
-                {"label":"K21 (B1,D1)", "x":1.5, "y":2.5},
-                {"label":"K22 (B1,D2)", "x":2.5, "y":2.5},
-                {"label":"K23 (B1,D3)", "x":3.5, "y":2.5},
-                {"label":"K24 (B1,D5)", "x":4.5, "y":2.5},
-                {"label":"K25 (B1,D4)", "x":5.5, "y":2.5},
-                {"label":"K26 (B1,D6)", "x":6.5, "y":2.5},
-                {"label":"K27 (B1,D7)", "x":7.5, "y":2.5},
-                {"label":"K28 (B1,B4)", "x":8.5, "y":2.5},
-                {"label":"K88 (F5,B4)", "x":9.5, "y":2.5},
-                {"label":"K87 (F5,D7)", "x":10.5, "y":2.5},
-                {"label":"K85 (F5,D4)", "x":11.5, "y":2.5},
-                {"label":"K84 (F5,D5)", "x":12.5, "y":2.5},
-                {"label":"K83 (F5,D3)", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"K86 (F5,D6)", "x":15.25, "y":2.5},
-                {"label":"K82 (F5,D2)", "x":16.25, "y":2.5},
-                {"label":"K81 (F5,D1)", "x":17.25, "y":2.5},
-                {"label":"K30 (B2,D0)", "x":0, "y":3.5, "w":1.75},
-                {"label":"K31 (B2,D1)", "x":1.75, "y":3.5},
-                {"label":"K32 (B2,D2)", "x":2.75, "y":3.5},
-                {"label":"K33 (B2,D3)", "x":3.75, "y":3.5},
-                {"label":"K34 (B2,D5)", "x":4.75, "y":3.5},
-                {"label":"K35 (B2,D4)", "x":5.75, "y":3.5},
-                {"label":"K36 (B2,D6)", "x":6.75, "y":3.5},
-                {"label":"K37 (B2,D7)", "x":7.75, "y":3.5},
-                {"label":"K38 (B2,B4)", "x":8.75, "y":3.5},
-                {"label":"K98 (F4,B4)", "x":9.75, "y":3.5},
-                {"label":"K97 (F4,D7)", "x":10.75, "y":3.5},
-                {"label":"K95 (F4,D4)", "x":11.75, "y":3.5},
-                {"label":"K93 (F4,D3)", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"K40 (B3,D0)", "x":0, "y":4.5, "w":2.25},
-                {"label":"K42 (B3,D2)", "x":2.25, "y":4.5},
-                {"label":"K43 (B3,D3)", "x":3.25, "y":4.5},
-                {"label":"K44 (B3,D5)", "x":4.25, "y":4.5},
-                {"label":"K45 (B3,D4)", "x":5.25, "y":4.5},
-                {"label":"K46 (B3,D6)", "x":6.25, "y":4.5},
-                {"label":"K47 (B3,D7)", "x":7.25, "y":4.5},
-                {"label":"K48 (B3,B4)", "x":8.25, "y":4.5},
-                {"label":"KA8 (F1,B4)", "x":9.25, "y":4.5},
-                {"label":"KA7 (F1,D7)", "x":10.25, "y":4.5},
-                {"label":"KA5 (F1,D4)", "x":11.25, "y":4.5},
-                {"label":"KA4 (F1,D5)", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"K92 (F4,D2)", "x":16.25, "y":4.5},
-                {"label":"K50 (B7,D0)", "x":0, "y":5.5, "w":1.25},
-                {"label":"K51 (B7,D1)", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"K52 (B7,D2)", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"K56 (B7,D6)", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"K58 (B7,B4)", "x":10, "y":5.5, "w":1.25},
-                {"label":"K57 (B7,D7)", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"K54 (B7,D5)", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"K53 (B7,D3)", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"KA6 (F1,D6)", "x":15.25, "y":5.5},
-                {"label":"KA2 (F1,D2)", "x":16.25, "y":5.5},
-                {"label":"KA1 (F1,D1)", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "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": [6, 8], "x": 9.75, "y": 0},
+                {"matrix": [6, 7], "x": 10.75, "y": 0},
+                {"matrix": [6, 5], "x": 11.75, "y": 0},
+                {"matrix": [6, 4], "x": 12.75, "y": 0},
+
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [6, 6], "x": 15.25, "y": 0},
+                {"matrix": [6, 2], "x": 16.25, "y": 0},
+                {"matrix": [6, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [7, 8], "x": 9, "y": 1.5},
+                {"matrix": [7, 0], "x": 10, "y": 1.5},
+                {"matrix": [7, 7], "x": 11, "y": 1.5},
+                {"matrix": [7, 5], "x": 12, "y": 1.5},
+                {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+                {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+                {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+                {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+                {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+                {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+                {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+                {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+                {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [9, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 4], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 1], "x": 17.25, "y": 5.5}
             ]
         },
-
         "LAYOUT_ansi_tsangan": {
             "layout": [
-                {"label":"K00 (E6,D0)", "x":0, "y":0},
-                {"label":"K01 (E6,D1)", "x":1.25, "y":0},
-                {"label":"K02 (E6,D2)", "x":2.25, "y":0},
-                {"label":"K03 (E6,D3)", "x":3.25, "y":0},
-                {"label":"K04 (E6,D5)", "x":4.25, "y":0},
-                {"label":"K05 (E6,D4)", "x":5.5, "y":0},
-                {"label":"K06 (E6,D6)", "x":6.5, "y":0},
-                {"label":"K07 (E6,D7)", "x":7.5, "y":0},
-                {"label":"K08 (E6,B4)", "x":8.5, "y":0},
-                {"label":"K68 (F7,B4)", "x":9.75, "y":0},
-                {"label":"K67 (F7,D7)", "x":10.75, "y":0},
-                {"label":"K65 (F7,D4)", "x":11.75, "y":0},
-                {"label":"K64 (F7,D5)", "x":12.75, "y":0},
-                {"label":"K63 (F7,D3)", "x":14, "y":0},
-                {"label":"K66 (F7,D6)", "x":15.25, "y":0},
-                {"label":"K62 (F7,D2)", "x":16.25, "y":0},
-                {"label":"K61 (F7,D1)", "x":17.25, "y":0},
-                {"label":"K10 (B0,D0)", "x":0, "y":1.5},
-                {"label":"K11 (B0,D1)", "x":1, "y":1.5},
-                {"label":"K12 (B0,D2)", "x":2, "y":1.5},
-                {"label":"K13 (B0,D3)", "x":3, "y":1.5},
-                {"label":"K14 (B0,D5)", "x":4, "y":1.5},
-                {"label":"K15 (B0,D4)", "x":5, "y":1.5},
-                {"label":"K16 (B0,D6)", "x":6, "y":1.5},
-                {"label":"K17 (B0,D7)", "x":7, "y":1.5},
-                {"label":"K18 (B0,B4)", "x":8, "y":1.5},
-                {"label":"K78 (F6,B4)", "x":9, "y":1.5},
-                {"label":"K70 (F6,D0)", "x":10, "y":1.5},
-                {"label":"K77 (F6,D7)", "x":11, "y":1.5},
-                {"label":"K75 (F6,D4)", "x":12, "y":1.5},
-                {"label":"K73 (F6,D3)", "x":13, "y":1.5, "w":2},
-                {"label":"K76 (F6,D6)", "x":15.25, "y":1.5},
-                {"label":"K72 (F6,D2)", "x":16.25, "y":1.5},
-                {"label":"K71 (F6,D1)", "x":17.25, "y":1.5},
-                {"label":"K20 (B1,D0)", "x":0, "y":2.5, "w":1.5},
-                {"label":"K21 (B1,D1)", "x":1.5, "y":2.5},
-                {"label":"K22 (B1,D2)", "x":2.5, "y":2.5},
-                {"label":"K23 (B1,D3)", "x":3.5, "y":2.5},
-                {"label":"K24 (B1,D5)", "x":4.5, "y":2.5},
-                {"label":"K25 (B1,D4)", "x":5.5, "y":2.5},
-                {"label":"K26 (B1,D6)", "x":6.5, "y":2.5},
-                {"label":"K27 (B1,D7)", "x":7.5, "y":2.5},
-                {"label":"K28 (B1,B4)", "x":8.5, "y":2.5},
-                {"label":"K88 (F5,B4)", "x":9.5, "y":2.5},
-                {"label":"K87 (F5,D7)", "x":10.5, "y":2.5},
-                {"label":"K85 (F5,D4)", "x":11.5, "y":2.5},
-                {"label":"K84 (F5,D5)", "x":12.5, "y":2.5},
-                {"label":"K83 (F5,D3)", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"K86 (F5,D6)", "x":15.25, "y":2.5},
-                {"label":"K82 (F5,D2)", "x":16.25, "y":2.5},
-                {"label":"K81 (F5,D1)", "x":17.25, "y":2.5},
-                {"label":"K30 (B2,D0)", "x":0, "y":3.5, "w":1.75},
-                {"label":"K31 (B2,D1)", "x":1.75, "y":3.5},
-                {"label":"K32 (B2,D2)", "x":2.75, "y":3.5},
-                {"label":"K33 (B2,D3)", "x":3.75, "y":3.5},
-                {"label":"K34 (B2,D5)", "x":4.75, "y":3.5},
-                {"label":"K35 (B2,D4)", "x":5.75, "y":3.5},
-                {"label":"K36 (B2,D6)", "x":6.75, "y":3.5},
-                {"label":"K37 (B2,D7)", "x":7.75, "y":3.5},
-                {"label":"K38 (B2,B4)", "x":8.75, "y":3.5},
-                {"label":"K98 (F4,B4)", "x":9.75, "y":3.5},
-                {"label":"K97 (F4,D7)", "x":10.75, "y":3.5},
-                {"label":"K95 (F4,D4)", "x":11.75, "y":3.5},
-                {"label":"K93 (F4,D3)", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"K40 (B3,D0)", "x":0, "y":4.5, "w":2.25},
-                {"label":"K42 (B3,D2)", "x":2.25, "y":4.5},
-                {"label":"K43 (B3,D3)", "x":3.25, "y":4.5},
-                {"label":"K44 (B3,D5)", "x":4.25, "y":4.5},
-                {"label":"K45 (B3,D4)", "x":5.25, "y":4.5},
-                {"label":"K46 (B3,D6)", "x":6.25, "y":4.5},
-                {"label":"K47 (B3,D7)", "x":7.25, "y":4.5},
-                {"label":"K48 (B3,B4)", "x":8.25, "y":4.5},
-                {"label":"KA8 (F1,B4)", "x":9.25, "y":4.5},
-                {"label":"KA7 (F1,D7)", "x":10.25, "y":4.5},
-                {"label":"KA5 (F1,D4)", "x":11.25, "y":4.5},
-                {"label":"KA4 (F1,D5)", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"K92 (F4,D2)", "x":16.25, "y":4.5},
-                {"label":"K50 (B7,D0)", "x":0, "y":5.5, "w":1.5},
-                {"label":"K51 (B7,D1)", "x":1.5, "y":5.5},
-                {"label":"K52 (B7,D2)", "x":2.5, "y":5.5, "w":1.5},
-                {"label":"K56 (B7,D6)", "x":4, "y":5.5, "w":7},
-                {"label":"K57 (B7,D7)", "x":11, "y":5.5, "w":1.5},
-                {"label":"K54 (B7,D5)", "x":12.5, "y":5.5},
-                {"label":"K53 (B7,D3)", "x":13.5, "y":5.5, "w":1.5},
-                {"label":"KA6 (F1,D6)", "x":15.25, "y":5.5},
-                {"label":"KA2 (F1,D2)", "x":16.25, "y":5.5},
-                {"label":"KA1 (F1,D1)", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "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": [6, 8], "x": 9.75, "y": 0},
+                {"matrix": [6, 7], "x": 10.75, "y": 0},
+                {"matrix": [6, 5], "x": 11.75, "y": 0},
+                {"matrix": [6, 4], "x": 12.75, "y": 0},
+
+                {"matrix": [6, 3], "x": 14, "y": 0},
+
+                {"matrix": [6, 6], "x": 15.25, "y": 0},
+                {"matrix": [6, 2], "x": 16.25, "y": 0},
+                {"matrix": [6, 1], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [7, 8], "x": 9, "y": 1.5},
+                {"matrix": [7, 0], "x": 10, "y": 1.5},
+                {"matrix": [7, 7], "x": 11, "y": 1.5},
+                {"matrix": [7, 5], "x": 12, "y": 1.5},
+                {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [7, 6], "x": 15.25, "y": 1.5},
+                {"matrix": [7, 2], "x": 16.25, "y": 1.5},
+                {"matrix": [7, 1], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [8, 8], "x": 9.5, "y": 2.5},
+                {"matrix": [8, 7], "x": 10.5, "y": 2.5},
+                {"matrix": [8, 5], "x": 11.5, "y": 2.5},
+                {"matrix": [8, 4], "x": 12.5, "y": 2.5},
+                {"matrix": [8, 3], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [8, 6], "x": 15.25, "y": 2.5},
+                {"matrix": [8, 2], "x": 16.25, "y": 2.5},
+                {"matrix": [8, 1], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [9, 8], "x": 9.75, "y": 3.5},
+                {"matrix": [9, 7], "x": 10.75, "y": 3.5},
+                {"matrix": [9, 5], "x": 11.75, "y": 3.5},
+                {"matrix": [9, 3], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+                {"matrix": [10, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [10, 7], "x": 10.25, "y": 4.5},
+                {"matrix": [10, 5], "x": 11.25, "y": 4.5},
+                {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [9, 2], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7},
+                {"matrix": [5, 7], "x": 11, "y": 5.5, "w": 1.5},
+                {"matrix": [5, 4], "x": 12.5, "y": 5.5},
+                {"matrix": [5, 3], "x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"matrix": [10, 6], "x": 15.25, "y": 5.5},
+                {"matrix": [10, 2], "x": 16.25, "y": 5.5},
+                {"matrix": [10, 1], "x": 17.25, "y": 5.5}
             ]
         }
     }