Merge remote-tracking branch 'origin/master' into develop

8 files changed, 1245 insertions, 0 deletions

diff --git a/keyboards/keebio/sinc/keymaps/default/keymap.c b/keyboards/keebio/sinc/keymaps/default/keymap.c
index 20c12a4a6e..171b7a7d05 100644
--- a/keyboards/keebio/sinc/keymaps/default/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/default/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2023 Danny Nguyen (danny@keeb.io)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/keebio/sinc/keymaps/iso/keymap.c b/keyboards/keebio/sinc/keymaps/iso/keymap.c
index f7ad1047bf..f3eaaa5bca 100644
--- a/keyboards/keebio/sinc/keymaps/iso/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/iso/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2023 Danny Nguyen (danny@keeb.io)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/keebio/sinc/keymaps/via/keymap.c b/keyboards/keebio/sinc/keymaps/via/keymap.c
index 2a54d1aa5a..a1299ce112 100644
--- a/keyboards/keebio/sinc/keymaps/via/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/via/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2023 Danny Nguyen (danny@keeb.io)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/keebio/sinc/rev4/config.h b/keyboards/keebio/sinc/rev4/config.h
new file mode 100644
index 0000000000..b6c5785f4c
--- /dev/null
+++ b/keyboards/keebio/sinc/rev4/config.h
@@ -0,0 +1,72 @@
+// Copyright 2023 Danny Nguyen (danny@keeb.io)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define SPLIT_HAND_PIN GP4
+#define USB_VBUS_PIN GP14
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN GP0
+#define SERIAL_USART_RX_PIN GP1
+#define SERIAL_USART_PIN_SWAP
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
+#define I2C_DRIVER I2CD1
+#define I2C1_SDA_PIN GP22
+#define I2C1_SCL_PIN GP23
+
+// RGB Matrix
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120
+#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_LED_COUNT 117
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define SPLIT_TRANSPORT_MIRROR
diff --git a/keyboards/keebio/sinc/rev4/halconf.h b/keyboards/keebio/sinc/rev4/halconf.h
new file mode 100644
index 0000000000..64036dec35
--- /dev/null
+++ b/keyboards/keebio/sinc/rev4/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2023 Danny Nguyen (danny@keeb.io)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/keebio/sinc/rev4/info.json b/keyboards/keebio/sinc/rev4/info.json
new file mode 100644
index 0000000000..f985f64e48
--- /dev/null
+++ b/keyboards/keebio/sinc/rev4/info.json
@@ -0,0 +1,1146 @@
+{
+    "keyboard_name": "Sinc Rev. 4",
+    "usb": {
+        "pid": "0x4267",
+        "device_version": "4.0.0"
+    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "console": true,
+        "rgb_matrix": true
+    },
+    "split": {
+        "enabled": true,
+        "encoder": {
+            "right": {
+                "rotary": [
+                    {"pin_a": "GP5", "pin_b": "GP6"}
+                ]
+            }
+        },
+        "matrix_pins": {
+            "right": {
+                "cols": ["GP29", "GP28", "GP27", "GP7", "GP2", "GP3", "GP11", "GP12", "GP13"],
+                "rows": ["GP16", "GP19", "GP17", "GP9", "GP8", "GP26"]
+            }
+        }
+    },
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP7", "GP2", "GP3", "GP11", "GP12", "GP13"],
+        "rows": ["GP25", "GP19", "GP24", "GP17", "GP16", "GP26"]
+    },
+    "encoder": {
+        "enabled": true,
+        "rotary": [
+            {"pin_a": "GP21", "pin_b": "GP20"}
+        ]
+    },
+    "ws2812": {
+        "pin": "GP18",
+        "driver": "vendor"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812",
+        "split_count": [58, 59],
+        "layout": [
+            {"flags": 4, "matrix": [5, 2], "x": 30, "y": 0},
+            {"flags": 2, "x": 42, "y": 6},
+            {"flags": 4, "matrix": [5, 3], "x": 45, "y": 0},
+            {"flags": 4, "matrix": [5, 4], "x": 58, "y": 0},
+            {"flags": 2, "x": 67, "y": 6},
+            {"flags": 4, "matrix": [5, 5], "x": 70, "y": 0},
+            {"flags": 4, "matrix": [5, 6], "x": 82, "y": 0},
+            {"flags": 4, "matrix": [5, 7], "x": 97, "y": 0},
+            {"flags": 2, "x": 103, "y": 6},
+            {"flags": 4, "matrix": [5, 8], "x": 109, "y": 0},
+
+            {"flags": 4, "matrix": [0, 8], "x": 103, "y": 15},
+            {"flags": 4, "matrix": [0, 7], "x": 91, "y": 15},
+            {"flags": 4, "matrix": [0, 6], "x": 79, "y": 15},
+            {"flags": 4, "matrix": [0, 5], "x": 67, "y": 15},
+            {"flags": 4, "matrix": [0, 4], "x": 54, "y": 15},
+            {"flags": 4, "matrix": [0, 3], "x": 42, "y": 15},
+            {"flags": 4, "matrix": [0, 2], "x": 30, "y": 15},
+
+            {"flags": 4, "matrix": [1, 2], "x": 33, "y": 27},
+            {"flags": 4, "matrix": [1, 3], "x": 48, "y": 27},
+            {"flags": 4, "matrix": [1, 4], "x": 61, "y": 27},
+            {"flags": 4, "matrix": [1, 5], "x": 73, "y": 27},
+            {"flags": 4, "matrix": [1, 6], "x": 85, "y": 27},
+            {"flags": 4, "matrix": [1, 7], "x": 97, "y": 27},
+
+            {"flags": 4, "matrix": [2, 7], "x": 100, "y": 40},
+            {"flags": 4, "matrix": [2, 6], "x": 88, "y": 40},
+            {"flags": 4, "matrix": [2, 5], "x": 76, "y": 40},
+            {"flags": 4, "matrix": [2, 4], "x": 64, "y": 40},
+            {"flags": 4, "matrix": [2, 3], "x": 51, "y": 40},
+            {"flags": 4, "matrix": [2, 2], "x": 35, "y": 40},
+
+            {"flags": 4, "matrix": [3, 2], "x": 38, "y": 52},
+            {"flags": 4, "matrix": [3, 4], "x": 58, "y": 52},
+            {"flags": 4, "matrix": [3, 5], "x": 70, "y": 52},
+            {"flags": 4, "matrix": [3, 6], "x": 82, "y": 52},
+            {"flags": 4, "matrix": [3, 7], "x": 94, "y": 52},
+            {"flags": 2, "x": 100, "y": 55},
+            {"flags": 4, "matrix": [3, 8], "x": 106, "y": 52},
+
+            {"flags": 4, "x": 107, "y": 64},
+            {"flags": 4, "matrix": [4, 7], "x": 97, "y": 64},
+            {"flags": 4, "matrix": [4, 6], "x": 85, "y": 64},
+            {"flags": 4, "matrix": [4, 5], "x": 75, "y": 64},
+            {"flags": 2, "x": 70, "y": 64},
+            {"flags": 4, "matrix": [4, 4], "x": 62, "y": 64},
+            {"flags": 4, "matrix": [4, 3], "x": 47, "y": 64},
+            {"flags": 2, "x": 39, "y": 64},
+            {"flags": 4, "matrix": [4, 2], "x": 32, "y": 64},
+
+            {"flags": 4, "matrix": [4, 1], "x": 12, "y": 64},
+            {"flags": 2, "x": 6, "y": 64},
+            {"flags": 4, "matrix": [4, 0], "x": 0, "y": 64},
+
+            {"flags": 4, "matrix": [3, 0], "x": 0, "y": 52},
+            {"flags": 4, "matrix": [3, 1], "x": 12, "y": 52},
+            {"flags": 4, "matrix": [2, 1], "x": 12, "y": 40},
+            {"flags": 4, "matrix": [2, 0], "x": 0, "y": 40},
+            {"flags": 4, "matrix": [1, 0], "x": 0, "y": 27},
+            {"flags": 4, "matrix": [1, 1], "x": 12, "y": 27},
+            {"flags": 4, "matrix": [0, 1], "x": 12, "y": 15},
+            {"flags": 4, "matrix": [0, 0], "x": 0, "y": 15},
+            {"flags": 4, "matrix": [5, 0], "x": 0, "y": 0},
+            {"flags": 2, "x": 9, "y": 0},
+
+            {"flags": 2, "x": 224, "y": 6},
+            {"flags": 4, "matrix": [11, 8], "x": 224, "y": 0},
+            {"flags": 4, "matrix": [11, 7], "x": 212, "y": 0},
+            {"flags": 4, "matrix": [11, 6], "x": 197, "y": 0},
+            {"flags": 2, "x": 191, "y": 6},
+            {"flags": 4, "matrix": [11, 5], "x": 185, "y": 0},
+            {"flags": 4, "matrix": [11, 4], "x": 173, "y": 0},
+            {"flags": 2, "x": 166, "y": 6},
+            {"flags": 4, "matrix": [11, 3], "x": 160, "y": 0},
+            {"flags": 4, "matrix": [11, 2], "x": 145, "y": 0},
+            {"flags": 2, "x": 139, "y": 6},
+            {"flags": 4, "matrix": [11, 1], "x": 133, "y": 0},
+
+            {"flags": 4, "matrix": [6, 0], "x": 127, "y": 15},
+            {"flags": 4, "matrix": [6, 1], "x": 139, "y": 15},
+            {"flags": 4, "matrix": [6, 2], "x": 151, "y": 15},
+            {"flags": 4, "matrix": [6, 3], "x": 163, "y": 15},
+            {"flags": 4, "matrix": [6, 4], "x": 176, "y": 15},
+            {"flags": 4, "matrix": [6, 5], "x": 188, "y": 15},
+            {"flags": 4, "matrix": [6, 6], "x": 200, "y": 15},
+            {"flags": 4, "matrix": [6, 7], "x": 212, "y": 15},
+            {"flags": 4, "matrix": [6, 8], "x": 224, "y": 15},
+
+            {"flags": 4, "matrix": [7, 8], "x": 224, "y": 27},
+            {"flags": 4, "matrix": [7, 7], "x": 209, "y": 27},
+            {"flags": 4, "matrix": [7, 6], "x": 194, "y": 27},
+            {"flags": 4, "matrix": [7, 5], "x": 182, "y": 27},
+            {"flags": 4, "matrix": [7, 4], "x": 170, "y": 27},
+            {"flags": 4, "matrix": [7, 3], "x": 157, "y": 27},
+            {"flags": 4, "matrix": [7, 2], "x": 145, "y": 27},
+            {"flags": 4, "matrix": [7, 1], "x": 133, "y": 27},
+            {"flags": 4, "matrix": [7, 0], "x": 121, "y": 27},
+
+            {"flags": 4, "matrix": [8, 0], "x": 124, "y": 40},
+            {"flags": 4, "matrix": [8, 1], "x": 136, "y": 40},
+            {"flags": 4, "matrix": [8, 2], "x": 148, "y": 40},
+            {"flags": 4, "matrix": [8, 3], "x": 160, "y": 40},
+            {"flags": 4, "matrix": [8, 4], "x": 173, "y": 40},
+            {"flags": 4, "matrix": [8, 5], "x": 185, "y": 40},
+            {"flags": 4, "matrix": [8, 7], "x": 204, "y": 40},
+            {"flags": 4, "matrix": [8, 8], "x": 224, "y": 40},
+
+            {"flags": 4, "matrix": [9, 8], "x": 224, "y": 52},
+            {"flags": 4, "matrix": [9, 7], "x": 212, "y": 52},
+            {"flags": 4, "matrix": [9, 6], "x": 195, "y": 52},
+            {"flags": 4, "matrix": [9, 4], "x": 179, "y": 52},
+            {"flags": 4, "matrix": [9, 3], "x": 166, "y": 52},
+            {"flags": 4, "matrix": [9, 2], "x": 154, "y": 52},
+            {"flags": 4, "matrix": [9, 1], "x": 142, "y": 52},
+            {"flags": 4, "matrix": [9, 0], "x": 130, "y": 52},
+
+            {"flags": 2, "x": 136, "y": 55},
+            {"flags": 4, "matrix": [10, 0], "x": 132, "y": 64},
+            {"flags": 4, "matrix": [10, 1], "x": 139, "y": 64},
+            {"flags": 4, "x": 148, "y": 64},
+            {"flags": 2, "x": 154, "y": 64},
+            {"flags": 4, "matrix": [10, 2], "x": 163, "y": 64},
+            {"flags": 4, "matrix": [10, 3], "x": 176, "y": 64},
+            {"flags": 4, "matrix": [10, 4], "x": 188, "y": 64},
+            {"flags": 2, "x": 194, "y": 64},
+            {"flags": 4, "matrix": [10, 6], "x": 200, "y": 64},
+            {"flags": 4, "matrix": [10, 7], "x": 212, "y": 64},
+            {"flags": 4, "matrix": [10, 8], "x": 224, "y": 64},
+            {"flags": 2, "x": 224, "y": 55}
+          ]
+    },
+    "layouts": {
+        "LAYOUT_75": {
+            "layout": [
+                {"matrix": [5, 2], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1.25, "y": 0},
+                {"matrix": [5, 4], "x": 2.25, "y": 0},
+                {"matrix": [5, 5], "x": 3.25, "y": 0},
+                {"matrix": [5, 6], "x": 4.25, "y": 0},
+                {"matrix": [5, 7], "x": 5.5, "y": 0},
+                {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 0},
+                {"matrix": [11, 2], "x": 9.5, "y": 0},
+                {"matrix": [11, 3], "x": 10.75, "y": 0},
+                {"matrix": [11, 4], "x": 11.75, "y": 0},
+                {"matrix": [11, 5], "x": 12.75, "y": 0},
+                {"matrix": [11, 6], "x": 13.75, "y": 0},
+                {"matrix": [11, 7], "x": 15, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1.25},
+                {"matrix": [0, 3], "x": 1, "y": 1.25},
+                {"matrix": [0, 4], "x": 2, "y": 1.25},
+                {"matrix": [0, 5], "x": 3, "y": 1.25},
+                {"matrix": [0, 6], "x": 4, "y": 1.25},
+                {"matrix": [0, 7], "x": 5, "y": 1.25},
+                {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.25},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 7], "x": 14.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+                {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+                {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 7], "x": 13.75, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+                {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+                {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 5.25},
+                {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 11, "y": 5.25},
+                {"matrix": [10, 3], "x": 12, "y": 5.25},
+                {"matrix": [10, 4], "x": 13, "y": 5.25},
+                {"matrix": [10, 6], "x": 14, "y": 5.25},
+                {"matrix": [10, 7], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_75_iso": {
+            "layout": [
+                {"matrix": [5, 2], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1.25, "y": 0},
+                {"matrix": [5, 4], "x": 2.25, "y": 0},
+                {"matrix": [5, 5], "x": 3.25, "y": 0},
+                {"matrix": [5, 6], "x": 4.25, "y": 0},
+                {"matrix": [5, 7], "x": 5.5, "y": 0},
+                {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 0},
+                {"matrix": [11, 2], "x": 9.5, "y": 0},
+                {"matrix": [11, 3], "x": 10.75, "y": 0},
+                {"matrix": [11, 4], "x": 11.75, "y": 0},
+                {"matrix": [11, 5], "x": 12.75, "y": 0},
+                {"matrix": [11, 6], "x": 13.75, "y": 0},
+                {"matrix": [11, 7], "x": 15, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1.25},
+                {"matrix": [0, 3], "x": 1, "y": 1.25},
+                {"matrix": [0, 4], "x": 2, "y": 1.25},
+                {"matrix": [0, 5], "x": 3, "y": 1.25},
+                {"matrix": [0, 6], "x": 4, "y": 1.25},
+                {"matrix": [0, 7], "x": 5, "y": 1.25},
+                {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.25},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+
+                {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+                {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+                {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 7.75, "y": 3.25},
+                {"matrix": [8, 1], "x": 8.75, "y": 3.25},
+                {"matrix": [8, 2], "x": 9.75, "y": 3.25},
+                {"matrix": [8, 3], "x": 10.75, "y": 3.25},
+                {"matrix": [8, 4], "x": 11.75, "y": 3.25},
+                {"matrix": [8, 5], "x": 12.75, "y": 3.25},
+                {"matrix": [8, 6], "x": 13.75, "y": 3.25},
+                {"matrix": [7, 7], "x": 14.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 2], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [3, 3], "x": 1.25, "y": 4.25},
+                {"matrix": [3, 4], "x": 2.25, "y": 4.25},
+                {"matrix": [3, 5], "x": 3.25, "y": 4.25},
+                {"matrix": [3, 6], "x": 4.25, "y": 4.25},
+                {"matrix": [3, 7], "x": 5.25, "y": 4.25},
+                {"matrix": [3, 8], "x": 6.25, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 8.25, "y": 4.25},
+                {"matrix": [9, 1], "x": 9.25, "y": 4.25},
+                {"matrix": [9, 2], "x": 10.25, "y": 4.25},
+                {"matrix": [9, 3], "x": 11.25, "y": 4.25},
+                {"matrix": [9, 4], "x": 12.25, "y": 4.25},
+                {"matrix": [9, 6], "x": 13.25, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 15, "y": 4.25},
+
+                {"matrix": [4, 2], "x": 0, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 1.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 2.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 3.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 5, "y": 5.25},
+                {"matrix": [4, 7], "x": 6, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 8.25, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 9.5, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 11, "y": 5.25},
+                {"matrix": [10, 3], "x": 12, "y": 5.25},
+                {"matrix": [10, 4], "x": 13, "y": 5.25},
+                {"matrix": [10, 6], "x": 14, "y": 5.25},
+                {"matrix": [10, 7], "x": 15, "y": 5.25}
+            ]
+        },
+        "LAYOUT_75_iso_with_macro": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 6], "x": 16, "y": 3.25},
+                {"matrix": [7, 7], "x": 17, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 1.25},
+                {"matrix": [3, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+                {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_75_with_macro": {
+            "layout": [
+                {"matrix": [5, 0], "x": 0, "y": 0},
+                {"matrix": [5, 2], "x": 2.25, "y": 0},
+                {"matrix": [5, 3], "x": 3.5, "y": 0},
+                {"matrix": [5, 4], "x": 4.5, "y": 0},
+                {"matrix": [5, 5], "x": 5.5, "y": 0},
+                {"matrix": [5, 6], "x": 6.5, "y": 0},
+                {"matrix": [5, 7], "x": 7.75, "y": 0},
+                {"matrix": [5, 8], "x": 8.75, "y": 0},
+
+                {"matrix": [11, 1], "x": 10.75, "y": 0},
+                {"matrix": [11, 2], "x": 11.75, "y": 0},
+                {"matrix": [11, 3], "x": 13, "y": 0},
+                {"matrix": [11, 4], "x": 14, "y": 0},
+                {"matrix": [11, 5], "x": 15, "y": 0},
+                {"matrix": [11, 6], "x": 16, "y": 0},
+                {"matrix": [11, 7], "x": 17.25, "y": 0},
+
+                {"matrix": [0, 0], "x": 0, "y": 1.25},
+                {"matrix": [0, 1], "x": 1, "y": 1.25},
+                {"matrix": [0, 2], "x": 2.25, "y": 1.25},
+                {"matrix": [0, 3], "x": 3.25, "y": 1.25},
+                {"matrix": [0, 4], "x": 4.25, "y": 1.25},
+                {"matrix": [0, 5], "x": 5.25, "y": 1.25},
+                {"matrix": [0, 6], "x": 6.25, "y": 1.25},
+                {"matrix": [0, 7], "x": 7.25, "y": 1.25},
+                {"matrix": [0, 8], "x": 8.25, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 10.25, "y": 1.25},
+                {"matrix": [6, 1], "x": 11.25, "y": 1.25},
+                {"matrix": [6, 2], "x": 12.25, "y": 1.25},
+                {"matrix": [6, 3], "x": 13.25, "y": 1.25},
+                {"matrix": [6, 4], "x": 14.25, "y": 1.25},
+                {"matrix": [6, 5], "x": 15.25, "y": 1.25},
+                {"matrix": [6, 6], "x": 16.25, "y": 1.25},
+                {"matrix": [6, 7], "x": 17.25, "y": 1.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2.25},
+                {"matrix": [1, 2], "x": 2.25, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [1, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [1, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [1, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [1, 7], "x": 7.75, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 9.75, "y": 2.25},
+                {"matrix": [7, 1], "x": 10.75, "y": 2.25},
+                {"matrix": [7, 2], "x": 11.75, "y": 2.25},
+                {"matrix": [7, 3], "x": 12.75, "y": 2.25},
+                {"matrix": [7, 4], "x": 13.75, "y": 2.25},
+                {"matrix": [7, 5], "x": 14.75, "y": 2.25},
+                {"matrix": [7, 6], "x": 15.75, "y": 2.25},
+                {"matrix": [7, 7], "x": 16.75, "y": 2.25, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3.25},
+                {"matrix": [2, 2], "x": 2.25, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 4, "y": 3.25},
+                {"matrix": [2, 4], "x": 5, "y": 3.25},
+                {"matrix": [2, 5], "x": 6, "y": 3.25},
+                {"matrix": [2, 6], "x": 7, "y": 3.25},
+                {"matrix": [2, 7], "x": 8, "y": 3.25},
+
+                {"matrix": [8, 0], "x": 10, "y": 3.25},
+                {"matrix": [8, 1], "x": 11, "y": 3.25},
+                {"matrix": [8, 2], "x": 12, "y": 3.25},
+                {"matrix": [8, 3], "x": 13, "y": 3.25},
+                {"matrix": [8, 4], "x": 14, "y": 3.25},
+                {"matrix": [8, 5], "x": 15, "y": 3.25},
+                {"matrix": [8, 7], "x": 16, "y": 3.25, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 4.25},
+                {"matrix": [3, 1], "x": 1, "y": 4.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 4.25, "w": 2.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+                {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 4.25},
+                {"matrix": [3, 7], "x": 7.5, "y": 4.25},
+                {"matrix": [3, 8], "x": 8.5, "y": 4.25},
+
+                {"matrix": [9, 0], "x": 10.5, "y": 4.25},
+                {"matrix": [9, 1], "x": 11.5, "y": 4.25},
+                {"matrix": [9, 2], "x": 12.5, "y": 4.25},
+                {"matrix": [9, 3], "x": 13.5, "y": 4.25},
+                {"matrix": [9, 4], "x": 14.5, "y": 4.25},
+                {"matrix": [9, 6], "x": 15.5, "y": 4.25, "w": 1.75},
+                {"matrix": [9, 7], "x": 17.25, "y": 4.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 5.25},
+                {"matrix": [4, 1], "x": 1, "y": 5.25},
+                {"matrix": [4, 2], "x": 2.25, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 4], "x": 4.75, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 5.25},
+                {"matrix": [4, 7], "x": 8.25, "y": 5.25, "w": 1.25},
+
+                {"matrix": [10, 0], "x": 10.5, "y": 5.25, "w": 1.25},
+                {"matrix": [10, 1], "x": 11.75, "y": 5.25, "w": 1.5},
+                {"matrix": [10, 2], "x": 13.25, "y": 5.25},
+                {"matrix": [10, 3], "x": 14.25, "y": 5.25},
+                {"matrix": [10, 4], "x": 15.25, "y": 5.25},
+                {"matrix": [10, 6], "x": 16.25, "y": 5.25},
+                {"matrix": [10, 7], "x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_80": {
+            "layout": [
+                {"matrix": [5, 2], "x": 0, "y": 0},
+                {"matrix": [5, 3], "x": 1.25, "y": 0},
+                {"matrix": [5, 4], "x": 2.25, "y": 0},
+                {"matrix": [5, 5], "x": 3.25, "y": 0},
+                {"matrix": [5, 6], "x": 4.25, "y": 0},
+                {"matrix": [5, 7], "x": 5.5, "y": 0},
+                {"matrix": [5, 8], "x": 6.5, "y": 0},
+
+                {"matrix": [11, 1], "x": 8.5, "y": 0},
+                {"matrix": [11, 2], "x": 9.5, "y": 0},
+                {"matrix": [11, 3], "x": 10.75, "y": 0},
+                {"matrix": [11, 4], "x": 11.75, "y": 0},
+                {"matrix": [11, 5], "x": 12.75, "y": 0},
+                {"matrix": [11, 6], "x": 13.75, "y": 0},
+                {"matrix": [11, 7], "x": 15, "y": 0},
+                {"matrix": [11, 8], "x": 16, "y": 0},
+
+                {"matrix": [0, 2], "x": 0, "y": 1.25},
+                {"matrix": [0, 3], "x": 1, "y": 1.25},
+                {"matrix": [0, 4], "x": 2, "y": 1.25},
+                {"matrix": [0, 5], "x": 3, "y": 1.25},
+                {"matrix": [0, 6], "x": 4, "y": 1.25},
+                {"matrix": [0, 7], "x": 5, "y": 1.25},
+                {"matrix": [0, 8], "x": 6, "y": 1.25},
+
+                {"matrix": [6, 0], "x": 8, "y": 1.25},
+                {"matrix": [6, 1], "x": 9, "y": 1.25},
+                {"matrix": [6, 2], "x": 10, "y": 1.25},
+                {"matrix": [6, 3], "x": 11, "y": 1.25},
+                {"matrix": [6, 4], "x": 12, "y": 1.25},
+                {"matrix": [6, 5], "x": 13, "y": 1.25},
+                {"matrix": [6, 6], "x": 14, "y": 1.25},
+                {"matrix": [6, 7], "x": 15, "y": 1.25},
+                {"matrix": [6, 8], "x": 16, "y": 1.25},
+
+                {"matrix": [1, 2], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [1, 3], "x": 1.5, "y": 2.25},
+                {"matrix": [1, 4], "x": 2.5, "y": 2.25},
+                {"matrix": [1, 5], "x": 3.5, "y": 2.25},
+                {"matrix": [1, 6], "x": 4.5, "y": 2.25},
+                {"matrix": [1, 7], "x": 5.5, "y": 2.25},
+
+                {"matrix": [7, 0], "x": 7.5, "y": 2.25},
+                {"matrix": [7, 1], "x": 8.5, "y": 2.25},
+                {"matrix": [7, 2], "x": 9.5, "y": 2.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 2.25},
+                {"matrix": [7, 4], "x": 11.5, "y": 2.25},
+                {"matrix": [7, 5], "x": 12.5, "y": 2.25},
+                {"matrix": [7, 6], "x": 13.5, "y": 2.25},
+                {"matrix": [7, 7], "x": 14.5, "y": 2.25, "w": 1.5},
+                {"matrix": [7, 8], "x": 16, "y": 2.25},
+
+                {"matrix": [2, 2], "x": 0, "y": 3.25, "w": 1.75},
+                {"matrix": [2, 3], "x": 1.75, "y": 3.25},
+                {"matrix": [2, 4], "x": 2.75, "y": 3.25},
+                {"matrix": [2, 5], "x": 3.75, "y": 3.25},
+                {"matrix": [2, 6], "x": 4.75, "y": 3.25},
+                {"matrix": [2, 7], "x": 5.75, "y": 3.25},
+
+