Merge branch 'develop'

4 files changed, 170 insertions, 240 deletions

diff --git a/keyboards/handwired/swiftrax/digicarpice/config.h b/keyboards/handwired/swiftrax/digicarpice/config.h
deleted file mode 100644
index 18f75ffe69..0000000000
--- a/keyboards/handwired/swiftrax/digicarpice/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2022 Swiftrax <swiftrax@gmail.com>
-
-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
-
-
-// ROWS: Top to bottom, COLS: Left to right
-
-#define MATRIX_ROW_PINS { F0, D5, D7, D6, D4 }
-#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C7, D3, D2, D1, D0, B7, B3, B2, B1, B0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/swiftrax/digicarpice/digicarpice.c b/keyboards/handwired/swiftrax/digicarpice/digicarpice.c
deleted file mode 100644
index c40a20a1f0..0000000000
--- a/keyboards/handwired/swiftrax/digicarpice/digicarpice.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2022 Swiftrax <swiftrax@gmail.com>
-
-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/>.
-*/
-#include "digicarpice.h"
diff --git a/keyboards/handwired/swiftrax/digicarpice/digicarpice.h b/keyboards/handwired/swiftrax/digicarpice/digicarpice.h
deleted file mode 100644
index c8baf3e2f8..0000000000
--- a/keyboards/handwired/swiftrax/digicarpice/digicarpice.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2022 Swiftrax <swiftrax@gmail.com>
-
-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 K_NO KC_NO
-
-#define LAYOUT_unified_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K013,  K014,  \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,         K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213,          K214,\
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,         K313,       \
-    K400, K401,             K402, K404,       K407, K409,                   K411,   K412, K413, K414  \
-) \
-{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K_NO, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K_NO }, \
-    { K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413, K414 }  \
-}
-
-#define LAYOUT_split_bs( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212,  K014,  \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,         K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213,          K214,\
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,         K313,       \
-    K400, K401,             K402, K404,       K407, K409,                   K411,   K412, K413, K414  \
-) \
-{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K_NO }, \
-    { K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413, K414 }  \
-}
diff --git a/keyboards/handwired/swiftrax/digicarpice/info.json b/keyboards/handwired/swiftrax/digicarpice/info.json
index f311c9606d..538a39c14b 100644
--- a/keyboards/handwired/swiftrax/digicarpice/info.json
+++ b/keyboards/handwired/swiftrax/digicarpice/info.json
@@ -8,160 +8,185 @@
         "pid": "0xE79A",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"],
+        "rows": ["F0", "D5", "D7", "D6", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_unified_bs": {
             "layout": [
-                {"label":"0,0", "x":0.42, "y":0},
-                {"label":"0,1", "x":1.42, "y":0},
-                {"label":"0,2", "x":2.55, "y":0},
-                {"label":"0,3", "x":3.55, "y":0},
-                {"label":"0,4", "x":4.55, "y":0},
-                {"label":"0,5", "x":5.55, "y":0},
-                {"label":"0,6", "x":6.55, "y":0},
-                {"label":"0,7", "x":9.55, "y":0},
-                {"label":"0,8", "x":10.55, "y":0},
-                {"label":"0,9", "x":11.55, "y":0},
-                {"label":"0,10", "x":12.55, "y":0},
-                {"label":"0,11", "x":13.68, "y":0},
-                {"label":"0,12", "x":14.68, "y":0},
-                {"label":"0,13", "x":15.68, "y":0, "w":2},
-                {"label":"0,14", "x":17.93, "y":0},
-
-                {"label":"1,0", "w":1.5, "x":0.29, "y":1},
-                {"label":"1,1", "x":1.79, "y":1},
-                {"label":"1,2", "x":3.05, "y":1},
-                {"label":"1,3", "x":4.05, "y":1},
-                {"label":"1,4", "x":5.05, "y":1},
-                {"label":"1,5", "x":6.05, "y":1},
-                {"label":"1,6", "x":9.05, "y":1},
-                {"label":"1,7", "x":10.05, "y":1},
-                {"label":"1,8", "x":11.05, "y":1},
-                {"label":"1,9", "x":12.05, "y":1},
-                {"label":"1,10", "x":13.3, "y":1},
-                {"label":"1,11", "x":14.3, "y":1},
-                {"label":"1,12", "x":15.3, "y":1},
-                {"label":"1,13", "w":1.5, "x":16.3, "y":1},
-                {"label":"1,14", "x":18.05, "y":1},
-
-                {"label":"2,0", "w":1.75, "x":0.15, "y":2},
-                {"label":"2,1", "x":1.9, "y":2},
-                {"label":"2,2", "x":3.3, "y":2},
-                {"label":"2,3", "x":4.3, "y":2},
-                {"label":"2,4", "x":5.3, "y":2},
-                {"label":"2,5", "x":6.3, "y":2},
-                {"label":"2,6", "x":9.3, "y":2},
-                {"label":"2,7", "x":10.3, "y":2},
-                {"label":"2,8", "x":11.3, "y":2},
-                {"label":"2,9", "x":12.3, "y":2},
-                {"label":"2,10", "x":13.71, "y":2},
-                {"label":"2,11", "x":14.71, "y":2},
-                {"label":"2,13", "w":2.25, "x":15.71, "y":2},
-                {"label":"2,14", "x":18.21, "y":2},
-
-                {"label":"3,0", "w":2.25, "x":0, "y":3},
-                {"label":"3,1", "x":2.25, "y":3},
-                {"label":"3,2", "x":3.8, "y":3},
-                {"label":"3,3", "x":4.8, "y":3},
-                {"label":"3,4", "x":5.8, "y":3},
-                {"label":"3,5", "x":6.8, "y":3},
-                {"label":"3,6", "x":8.8, "y":3},
-                {"label":"3,7", "x":9.8, "y":3},
-                {"label":"3,8", "x":10.8, "y":3},
-                {"label":"3,9", "x":11.8, "y":3},
-                {"label":"3,10", "x":13.37, "y":3},
-                {"label":"3,11", "x":14.37, "y":3},
-                {"label":"3,12", "w":1.75, "x":15.37, "y":3},
-                {"label":"3,13", "x":17.37, "y":3.25},
-
-                {"label":"4,0", "w":1.25, "x":0.15, "y":4},
-                {"label":"4,1", "w":1.25, "x":1.4, "y":4},
-                {"label":"4,2", "w":1.25, "x":4.3, "y":4},
-                {"label":"4,4", "w":2.25, "x":5.55, "y":4},
-                {"label":"4,7", "w":2.75, "x":8.8, "y":4},
-                {"label":"4,9", "w":1.25, "x":11.55, "y":4},
-                {"label":"4,11", "w":1.25, "x":14.87, "y":4},
-                {"label":"4,12", "x":16.37, "y":4.25},
-                {"label":"4,13", "x":17.37, "y":4.25},
-                {"label":"4,14", "x":18.37, "y":4.25}
+                {"matrix": [0, 0], "x": 0.42, "y": 0},
+                {"matrix": [0, 1], "x": 1.42, "y": 0},
+                {"matrix": [0, 2], "x": 2.55, "y": 0},
+                {"matrix": [0, 3], "x": 3.55, "y": 0},
+                {"matrix": [0, 4], "x": 4.55, "y": 0},
+                {"matrix": [0, 5], "x": 5.55, "y": 0},
+                {"matrix": [0, 6], "x": 6.55, "y": 0},
+
+                {"matrix": [0, 7], "x": 9.55, "y": 0},
+                {"matrix": [0, 8], "x": 10.55, "y": 0},
+                {"matrix": [0, 9], "x": 11.55, "y": 0},
+                {"matrix": [0, 10], "x": 12.55, "y": 0},
+                {"matrix": [0, 11], "x": 13.68, "y": 0},
+                {"matrix": [0, 12], "x": 14.68, "y": 0},
+                {"matrix": [0, 13], "x": 15.68, "y": 0, "w": 2},
+
+                {"matrix": [0, 14], "x": 17.93, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.29, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.79, "y": 1},
+                {"matrix": [1, 2], "x": 3.05, "y": 1},
+                {"matrix": [1, 3], "x": 4.05, "y": 1},
+                {"matrix": [1, 4], "x": 5.05, "y": 1},
+                {"matrix": [1, 5], "x": 6.05, "y": 1},
+
+                {"matrix": [1, 6], "x": 9.05, "y": 1},
+                {"matrix": [1, 7], "x": 10.05, "y": 1},
+                {"matrix": [1, 8], "x": 11.05, "y": 1},
+                {"matrix": [1, 9], "x": 12.05, "y": 1},
+                {"matrix": [1, 10], "x": 13.3, "y": 1},
+                {"matrix": [1, 11], "x": 14.3, "y": 1},
+                {"matrix": [1, 12], "x": 15.3, "y": 1},
+                {"matrix": [1, 13], "x": 16.3, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 18.05, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.15, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.9, "y": 2},
+                {"matrix": [2, 2], "x": 3.3, "y": 2},
+                {"matrix": [2, 3], "x": 4.3, "y": 2},
+                {"matrix": [2, 4], "x": 5.3, "y": 2},
+                {"matrix": [2, 5], "x": 6.3, "y": 2},
+
+                {"matrix": [2, 6], "x": 9.3, "y": 2},
+                {"matrix": [2, 7], "x": 10.3, "y": 2},
+                {"matrix": [2, 8], "x": 11.3, "y": 2},
+                {"matrix": [2, 9], "x": 12.3, "y": 2},
+                {"matrix": [2, 10], "x": 13.71, "y": 2},
+                {"matrix": [2, 11], "x": 14.71, "y": 2},
+                {"matrix": [2, 13], "x": 15.71, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 18.21, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.8, "y": 3},
+                {"matrix": [3, 3], "x": 4.8, "y": 3},
+                {"matrix": [3, 4], "x": 5.8, "y": 3},
+                {"matrix": [3, 5], "x": 6.8, "y": 3},
+
+                {"matrix": [3, 6], "x": 8.8, "y": 3},
+                {"matrix": [3, 7], "x": 9.8, "y": 3},
+                {"matrix": [3, 8], "x": 10.8, "y": 3},
+                {"matrix": [3, 9], "x": 11.8, "y": 3},
+                {"matrix": [3, 10], "x": 13.37, "y": 3},
+                {"matrix": [3, 11], "x": 14.37, "y": 3},
+                {"matrix": [3, 12], "x": 15.37, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 17.37, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.15, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.4, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.3, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.55, "y": 4, "w": 2.25},
+
+                {"matrix": [4, 7], "x": 8.8, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.55, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.87, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 16.37, "y": 4.25},
+                {"matrix": [4, 13], "x": 17.37, "y": 4.25},
+                {"matrix": [4, 14], "x": 18.37, "y": 4.25}
             ]
         },
         "LAYOUT_split_bs": {
             "layout": [
-                {"label":"0,0", "x":0.42, "y":0},
-                {"label":"0,1", "x":1.42, "y":0},
-                {"label":"0,2", "x":2.55, "y":0},
-                {"label":"0,3", "x":3.55, "y":0},
-                {"label":"0,4", "x":4.55, "y":0},
-                {"label":"0,5", "x":5.55, "y":0},
-                {"label":"0,6", "x":6.55, "y":0},
-                {"label":"0,7", "x":9.55, "y":0},
-                {"label":"0,8", "x":10.55, "y":0},
-                {"label":"0,9", "x":11.55, "y":0},
-                {"label":"0,10", "x":12.55, "y":0},
-                {"label":"0,11", "x":13.68, "y":0},
-                {"label":"0,12", "x":14.68, "y":0},
-                {"label":"0,13", "x":15.68, "y":0},
-                {"label":"2,12", "x":16.68, "y":0},
-                {"label":"0,14", "x":17.93, "y":0},
-
-                {"label":"1,0", "w":1.5, "x":0.29, "y":1},
-                {"label":"1,1", "x":1.79, "y":1},
-                {"label":"1,2", "x":3.05, "y":1},
-                {"label":"1,3", "x":4.05, "y":1},
-                {"label":"1,4", "x":5.05, "y":1},
-                {"label":"1,5", "x":6.05, "y":1},
-                {"label":"1,6", "x":9.05, "y":1},
-                {"label":"1,7", "x":10.05, "y":1},
-                {"label":"1,8", "x":11.05, "y":1},
-                {"label":"1,9", "x":12.05, "y":1},
-                {"label":"1,10", "x":13.3, "y":1},
-                {"label":"1,11", "x":14.3, "y":1},
-                {"label":"1,12", "x":15.3, "y":1},
-                {"label":"1,13", "w":1.5, "x":16.3, "y":1},
-                {"label":"1,14", "x":18.05, "y":1},
-
-                {"label":"2,0", "w":1.75, "x":0.15, "y":2},
-                {"label":"2,1", "x":1.9, "y":2},
-                {"label":"2,2", "x":3.3, "y":2},
-                {"label":"2,3", "x":4.3, "y":2},
-                {"label":"2,4", "x":5.3, "y":2},
-                {"label":"2,5", "x":6.3, "y":2},
-                {"label":"2,6", "x":9.3, "y":2},
-                {"label":"2,7", "x":10.3, "y":2},
-                {"label":"2,8", "x":11.3, "y":2},
-                {"label":"2,9", "x":12.3, "y":2},
-                {"label":"2,10", "x":13.71, "y":2},
-                {"label":"2,11", "x":14.71, "y":2},
-                {"label":"2,13", "w":2.25, "x":15.71, "y":2},
-                {"label":"2,14", "x":18.21, "y":2},
-
-                {"label":"3,0", "w":2.25, "x":0, "y":3},
-                {"label":"3,1", "x":2.25, "y":3},
-                {"label":"3,2", "x":3.8, "y":3},
-                {"label":"3,3", "x":4.8, "y":3},
-                {"label":"3,4", "x":5.8, "y":3},
-                {"label":"3,5", "x":6.8, "y":3},
-                {"label":"3,6", "x":8.8, "y":3},
-                {"label":"3,7", "x":9.8, "y":3},
-                {"label":"3,8", "x":10.8, "y":3},
-                {"label":"3,9", "x":11.8, "y":3},
-                {"label":"3,10", "x":13.37, "y":3},
-                {"label":"3,11", "x":14.37, "y":3},
-                {"label":"3,12", "w":1.75, "x":15.37, "y":3},
-                {"label":"3,13", "x":17.37, "y":3.25},
-
-                {"label":"4,0", "w":1.25, "x":0.15, "y":4},
-                {"label":"4,1", "w":1.25, "x":1.4, "y":4},
-                {"label":"4,2", "w":1.25, "x":4.3, "y":4},
-                {"label":"4,4", "w":2.25, "x":5.55, "y":4},
-                {"label":"4,7", "w":2.75, "x":8.8, "y":4},
-                {"label":"4,9", "w":1.25, "x":11.55, "y":4},
-                {"label":"4,11", "w":1.25, "x":14.87, "y":4},
-                {"label":"4,12", "x":16.37, "y":4.25},
-                {"label":"4,13", "x":17.37, "y":4.25},
-                {"label":"4,14", "x":18.37, "y":4.25}
+                {"matrix": [0, 0], "x": 0.42, "y": 0},
+                {"matrix": [0, 1], "x": 1.42, "y": 0},
+                {"matrix": [0, 2], "x": 2.55, "y": 0},
+                {"matrix": [0, 3], "x": 3.55, "y": 0},
+                {"matrix": [0, 4], "x": 4.55, "y": 0},
+                {"matrix": [0, 5], "x": 5.55, "y": 0},
+                {"matrix": [0, 6], "x": 6.55, "y": 0},
+
+                {"matrix": [0, 7], "x": 9.55, "y": 0},
+                {"matrix": [0, 8], "x": 10.55, "y": 0},
+                {"matrix": [0, 9], "x": 11.55, "y": 0},
+                {"matrix": [0, 10], "x": 12.55, "y": 0},
+                {"matrix": [0, 11], "x": 13.68, "y": 0},
+                {"matrix": [0, 12], "x": 14.68, "y": 0},
+                {"matrix": [0, 13], "x": 15.68, "y": 0},
+                {"matrix": [2, 12], "x": 16.68, "y": 0},
+
+                {"matrix": [0, 14], "x": 17.93, "y": 0},
+
+                {"matrix": [1, 0], "x": 0.29, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.79, "y": 1},
+                {"matrix": [1, 2], "x": 3.05, "y": 1},
+                {"matrix": [1, 3], "x": 4.05, "y": 1},
+                {"matrix": [1, 4], "x": 5.05, "y": 1},
+                {"matrix": [1, 5], "x": 6.05, "y": 1},
+
+                {"matrix": [1, 6], "x": 9.05, "y": 1},
+                {"matrix": [1, 7], "x": 10.05, "y": 1},
+                {"matrix": [1, 8], "x": 11.05, "y": 1},
+                {"matrix": [1, 9], "x": 12.05, "y": 1},
+                {"matrix": [1, 10], "x": 13.3, "y": 1},
+                {"matrix": [1, 11], "x": 14.3, "y": 1},
+                {"matrix": [1, 12], "x": 15.3, "y": 1},
+                {"matrix": [1, 13], "x": 16.3, "y": 1, "w": 1.5},
+
+                {"matrix": [1, 14], "x": 18.05, "y": 1},
+
+                {"matrix": [2, 0], "x": 0.15, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.9, "y": 2},
+                {"matrix": [2, 2], "x": 3.3, "y": 2},
+                {"matrix": [2, 3], "x": 4.3, "y": 2},
+                {"matrix": [2, 4], "x": 5.3, "y": 2},
+                {"matrix": [2, 5], "x": 6.3, "y": 2},
+
+                {"matrix": [2, 6], "x": 9.3, "y": 2},
+                {"matrix": [2, 7], "x": 10.3, "y": 2},
+                {"matrix": [2, 8], "x": 11.3, "y": 2},
+                {"matrix": [2, 9], "x": 12.3, "y": 2},
+                {"matrix": [2, 10], "x": 13.71, "y": 2},
+                {"matrix": [2, 11], "x": 14.71, "y": 2},
+                {"matrix": [2, 13], "x": 15.71, "y": 2, "w": 2.25},
+
+                {"matrix": [2, 14], "x": 18.21, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.8, "y": 3},
+                {"matrix": [3, 3], "x": 4.8, "y": 3},
+                {"matrix": [3, 4], "x": 5.8, "y": 3},
+                {"matrix": [3, 5], "x": 6.8, "y": 3},
+
+                {"matrix": [3, 6], "x": 8.8, "y": 3},
+                {"matrix": [3, 7], "x": 9.8, "y": 3},
+                {"matrix": [3, 8], "x": 10.8, "y": 3},
+                {"matrix": [3, 9], "x": 11.8, "y": 3},
+                {"matrix": [3, 10], "x": 13.37, "y": 3},
+                {"matrix": [3, 11], "x": 14.37, "y": 3},
+                {"matrix": [3, 12], "x": 15.37, "y": 3, "w": 1.75},
+
+                {"matrix": [3, 13], "x": 17.37, "y": 3.25},
+
+                {"matrix": [4, 0], "x": 0.15, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.4, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 4.3, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 5.55, "y": 4, "w": 2.25},
+
+                {"matrix": [4, 7], "x": 8.8, "y": 4, "w": 2.75},
+                {"matrix": [4, 9], "x": 11.55, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 14.87, "y": 4, "w": 1.25},
+
+                {"matrix": [4, 12], "x": 16.37, "y": 4.25},
+                {"matrix": [4, 13], "x": 17.37, "y": 4.25},
+                {"matrix": [4, 14], "x": 18.37, "y": 4.25}
             ]
         }
     }