From dd086a51d82a574a55eb3b89e8943301d72296f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 10 Mar 2023 22:16:56 +1100 Subject: Move matrix config to info.json, part 2 (#19987) --- keyboards/ogre/ergo_single/config.h | 8 -------- keyboards/ogre/ergo_single/info.json | 5 +++++ keyboards/ogre/ergo_split/config.h | 8 -------- keyboards/ogre/ergo_split/info.json | 5 +++++ 4 files changed, 10 insertions(+), 16 deletions(-) (limited to 'keyboards/ogre') diff --git a/keyboards/ogre/ergo_single/config.h b/keyboards/ogre/ergo_single/config.h index 8069bd427b..46b598cf02 100644 --- a/keyboards/ogre/ergo_single/config.h +++ b/keyboards/ogre/ergo_single/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B6 #define RGBLED_NUM 14 #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 13, 12,11, 10, 9, 8, 7} diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json index 04db9ff8d5..c6e8eea75c 100644 --- a/keyboards/ogre/ergo_single/info.json +++ b/keyboards/ogre/ergo_single/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ogre/ergo_split/config.h b/keyboards/ogre/ergo_split/config.h index 017d4792ff..724905efd7 100644 --- a/keyboards/ogre/ergo_split/config.h +++ b/keyboards/ogre/ergo_split/config.h @@ -17,14 +17,6 @@ along with this program. If not, see . #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN D1 #define RGB_DI_PIN B6 diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json index 42cc158acf..e01e6873d1 100644 --- a/keyboards/ogre/ergo_split/info.json +++ b/keyboards/ogre/ergo_split/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3" }, -- cgit v1.2.3 From 02ccc50e6085a9d0a4f38f252960e2d14ffe4d1f Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Mar 2023 14:02:04 +1100 Subject: Remove more empty headers (#20155) --- keyboards/ogre/ergo_single/ergo_single.c | 17 ----------------- keyboards/ogre/ergo_split/ergo_split.c | 17 ----------------- 2 files changed, 34 deletions(-) delete mode 100644 keyboards/ogre/ergo_single/ergo_single.c delete mode 100644 keyboards/ogre/ergo_split/ergo_split.c (limited to 'keyboards/ogre') diff --git a/keyboards/ogre/ergo_single/ergo_single.c b/keyboards/ogre/ergo_single/ergo_single.c deleted file mode 100644 index b48b0a02e2..0000000000 --- a/keyboards/ogre/ergo_single/ergo_single.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 ctrlshiftba - * - * 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 . - */ - -#include "ergo_single.h" diff --git a/keyboards/ogre/ergo_split/ergo_split.c b/keyboards/ogre/ergo_split/ergo_split.c deleted file mode 100644 index 0d83a5e8e4..0000000000 --- a/keyboards/ogre/ergo_split/ergo_split.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 ctrlshiftba - * - * 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 . - */ - -#include "ergo_split.h" -- cgit v1.2.3 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- keyboards/ogre/ergo_single/config.h | 1 - keyboards/ogre/ergo_single/info.json | 3 +++ keyboards/ogre/ergo_split/config.h | 1 - keyboards/ogre/ergo_split/info.json | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) (limited to 'keyboards/ogre') diff --git a/keyboards/ogre/ergo_single/config.h b/keyboards/ogre/ergo_single/config.h index 46b598cf02..c6739d7f66 100644 --- a/keyboards/ogre/ergo_single/config.h +++ b/keyboards/ogre/ergo_single/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN B6 #define RGBLED_NUM 14 #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 13, 12,11, 10, 9, 8, 7} #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json index c6e8eea75c..b2f4493362 100644 --- a/keyboards/ogre/ergo_single/info.json +++ b/keyboards/ogre/ergo_single/info.json @@ -13,6 +13,9 @@ "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] }, "diode_direction": "COL2ROW", + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/ogre/ergo_split/config.h b/keyboards/ogre/ergo_split/config.h index 724905efd7..92535947de 100644 --- a/keyboards/ogre/ergo_split/config.h +++ b/keyboards/ogre/ergo_split/config.h @@ -19,7 +19,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN D1 -#define RGB_DI_PIN B6 #define RGBLED_SPLIT { 7, 7 } #define RGBLED_NUM 14 #define RGBLIGHT_LED_MAP { 6, 5, 4, 3, 2, 1, 0, 13, 12,11, 10, 9, 8, 7} diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json index e01e6873d1..84452270de 100644 --- a/keyboards/ogre/ergo_split/info.json +++ b/keyboards/ogre/ergo_split/info.json @@ -16,6 +16,9 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { -- cgit v1.2.3 From 5bd68e3695a82ff504c358c33445b4530c2a327f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 12 Apr 2023 13:42:51 +1000 Subject: Move single `LAYOUT`s to data driven (#20365) --- keyboards/ogre/ergo_single/ergo_single.h | 39 --------- keyboards/ogre/ergo_single/info.json | 142 +++++++++++++++---------------- keyboards/ogre/ergo_split/ergo_split.h | 39 --------- keyboards/ogre/ergo_split/info.json | 142 +++++++++++++++---------------- 4 files changed, 140 insertions(+), 222 deletions(-) delete mode 100644 keyboards/ogre/ergo_single/ergo_single.h delete mode 100644 keyboards/ogre/ergo_split/ergo_split.h (limited to 'keyboards/ogre') diff --git a/keyboards/ogre/ergo_single/ergo_single.h b/keyboards/ogre/ergo_single/ergo_single.h deleted file mode 100644 index f8f9ddf65f..0000000000 --- a/keyboards/ogre/ergo_single/ergo_single.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2020 ctrlshiftba - * - * 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 . - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k63, k00, k10, k20, k30, k40, k50, k60, k65, k55, k45, k35, k25, k15, k05, k68, \ - k01, k11, k21, k31, k41, k51, k61, k66, k56, k46, k36, k26, k16, k06, \ - k02, k12, k22, k32, k42, k52, k62, k67, k57, k47, k37, k27, k17, k07, \ - k03, k13, k23, k33, k43, k53, k58, k48, k38, k28, k18, k08, \ - k04, k14, k24, k34, k44, k54, k64, k69, k59, k49, k39, k29, k19, k09 \ -) \ -{ \ - { k00, k10, k20, k30, k40, k50, k60 }, \ - { k01, k11, k21, k31, k41, k51, k61 }, \ - { k02, k12, k22, k32, k42, k52, k62 }, \ - { k03, k13, k23, k33, k43, k53, k63 }, \ - { k04, k14, k24, k34, k44, k54, k64 }, \ - { k05, k15, k25, k35, k45, k55, k65 }, \ - { k06, k16, k26, k36, k46, k56, k66 }, \ - { k07, k17, k27, k37, k47, k57, k67 }, \ - { k08, k18, k28, k38, k48, k58, k68 }, \ - { k09, k19, k29, k39, k49, k59, k69 }, \ -} diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json index b2f4493362..4a5b96b8ad 100644 --- a/keyboards/ogre/ergo_single/info.json +++ b/keyboards/ogre/ergo_single/info.json @@ -21,87 +21,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0.25, "y": 0.5}, - {"x": 1.25, "y": 0.5}, - {"x": 2.25, "y": 0.5}, - {"x": 3.25, "y": 0.25}, - {"x": 4.25, "y": 0}, - {"x": 5.25, "y": 0.25}, - {"x": 6.25, "y": 0.5}, - {"x": 7.25, "y": 0.5}, + {"matrix": [3, 6], "x": 0.25, "y": 0.5}, + {"matrix": [0, 0], "x": 1.25, "y": 0.5}, + {"matrix": [0, 1], "x": 2.25, "y": 0.5}, + {"matrix": [0, 2], "x": 3.25, "y": 0.25}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"matrix": [0, 4], "x": 5.25, "y": 0.25}, + {"matrix": [0, 5], "x": 6.25, "y": 0.5}, + {"matrix": [0, 6], "x": 7.25, "y": 0.5}, - {"x": 11.25, "y": 0.5}, - {"x": 12.25, "y": 0.5}, - {"x": 13.25, "y": 0.25}, - {"x": 14.25, "y": 0}, - {"x": 15.25, "y": 0.25}, - {"x": 16.25, "y": 0.5}, - {"x": 17.25, "y": 0.5}, - {"x": 18.25, "y": 0.5}, + {"matrix": [5, 6], "x": 11.25, "y": 0.5}, + {"matrix": [5, 5], "x": 12.25, "y": 0.5}, + {"matrix": [5, 4], "x": 13.25, "y": 0.25}, + {"matrix": [5, 3], "x": 14.25, "y": 0}, + {"matrix": [5, 2], "x": 15.25, "y": 0.25}, + {"matrix": [5, 1], "x": 16.25, "y": 0.5}, + {"matrix": [5, 0], "x": 17.25, "y": 0.5}, + {"matrix": [8, 6], "x": 18.25, "y": 0.5}, - {"x": 0.75, "y": 1.5, "w": 1.5}, - {"x": 2.25, "y": 1.5}, - {"x": 3.25, "y": 1.25}, - {"x": 4.25, "y": 1}, - {"x": 5.25, "y": 1.25}, - {"x": 6.25, "y": 1.5}, - {"x": 7.25, "y": 1.5}, + {"matrix": [1, 0], "x": 0.75, "y": 1.5, "w": 1.5}, + {"matrix": [1, 1], "x": 2.25, "y": 1.5}, + {"matrix": [1, 2], "x": 3.25, "y": 1.25}, + {"matrix": [1, 3], "x": 4.25, "y": 1}, + {"matrix": [1, 4], "x": 5.25, "y": 1.25}, + {"matrix": [1, 5], "x": 6.25, "y": 1.5}, + {"matrix": [1, 6], "x": 7.25, "y": 1.5}, - {"x": 11.25, "y": 1.5}, - {"x": 12.25, "y": 1.5}, - {"x": 13.25, "y": 1.25}, - {"x": 14.25, "y": 1}, - {"x": 15.25, "y": 1.25}, - {"x": 16.25, "y": 1.5}, - {"x": 17.25, "y": 1.5, "w": 1.5}, + {"matrix": [6, 6], "x": 11.25, "y": 1.5}, + {"matrix": [6, 5], "x": 12.25, "y": 1.5}, + {"matrix": [6, 4], "x": 13.25, "y": 1.25}, + {"matrix": [6, 3], "x": 14.25, "y": 1}, + {"matrix": [6, 2], "x": 15.25, "y": 1.25}, + {"matrix": [6, 1], "x": 16.25, "y": 1.5}, + {"matrix": [6, 0], "x": 17.25, "y": 1.5, "w": 1.5}, - {"x": 0.5, "y": 2.5, "w": 1.75}, - {"x": 2.25, "y": 2.5}, - {"x": 3.25, "y": 2.25}, - {"x": 4.25, "y": 2}, - {"x": 5.25, "y": 2.25}, - {"x": 6.25, "y": 2.5}, - {"x": 7.25, "y": 2.5}, + {"matrix": [2, 0], "x": 0.5, "y": 2.5, "w": 1.75}, + {"matrix": [2, 1], "x": 2.25, "y": 2.5}, + {"matrix": [2, 2], "x": 3.25, "y": 2.25}, + {"matrix": [2, 3], "x": 4.25, "y": 2}, + {"matrix": [2, 4], "x": 5.25, "y": 2.25}, + {"matrix": [2, 5], "x": 6.25, "y": 2.5}, + {"matrix": [2, 6], "x": 7.25, "y": 2.5}, - {"x": 11.25, "y": 2.5}, - {"x": 12.25, "y": 2.5}, - {"x": 13.25, "y": 2.25}, - {"x": 14.25, "y": 2}, - {"x": 15.25, "y": 2.25}, - {"x": 16.25, "y": 2.5}, - {"x": 17.25, "y": 2.5, "w": 1.75}, + {"matrix": [7, 6], "x": 11.25, "y": 2.5}, + {"matrix": [7, 5], "x": 12.25, "y": 2.5}, + {"matrix": [7, 4], "x": 13.25, "y": 2.25}, + {"matrix": [7, 3], "x": 14.25, "y": 2}, + {"matrix": [7, 2], "x": 15.25, "y": 2.25}, + {"matrix": [7, 1], "x": 16.25, "y": 2.5}, + {"matrix": [7, 0], "x": 17.25, "y": 2.5, "w": 1.75}, - {"x": 0, "y": 3.5, "w": 2.25}, - {"x": 2.25, "y": 3.5}, - {"x": 3.25, "y": 3.25}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3.25}, - {"x": 6.25, "y": 3.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.5}, + {"matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3.5}, - {"x": 12.25, "y": 3.5}, - {"x": 13.25, "y": 3.25}, - {"x": 14.25, "y": 3}, - {"x": 15.25, "y": 3.25}, - {"x": 16.25, "y": 3.5}, - {"x": 17.25, "y": 3.5, "w": 2.25}, + {"matrix": [8, 5], "x": 12.25, "y": 3.5}, + {"matrix": [8, 4], "x": 13.25, "y": 3.25}, + {"matrix": [8, 3], "x": 14.25, "y": 3}, + {"matrix": [8, 2], "x": 15.25, "y": 3.25}, + {"matrix": [8, 1], "x": 16.25, "y": 3.5}, + {"matrix": [8, 0], "x": 17.25, "y": 3.5, "w": 2.25}, - {"x": 1, "y": 4.5, "w": 1.25}, - {"x": 2.25, "y": 4.5}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4}, + {"matrix": [4, 0], "x": 1, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4}, + {"matrix": [4, 4], "x": 6.25, "y": 5.5, "w": 1.25}, + {"matrix": [4, 5], "x": 7.5, "y": 3.75, "h": 2.75}, + {"matrix": [4, 6], "x": 8.5, "y": 4.5, "h": 2}, - {"x": 6.25, "y": 5.5, "w": 1.25}, - {"x": 7.5, "y": 3.75, "h": 2.75}, - {"x": 8.5, "y": 4.5, "h": 2}, - - {"x": 10, "y": 5, "h": 1.5}, - {"x": 11, "y": 4.5, "h": 2}, - {"x": 12, "y": 5.5, "w": 1.25}, - - {"x": 14.25, "y": 4}, - {"x": 15.25, "y": 4.25}, - {"x": 16.25, "y": 4.5}, - {"x": 17.25, "y": 4.5, "w": 1.25} + {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.5}, + {"matrix": [9, 5], "x": 11, "y": 4.5, "h": 2}, + {"matrix": [9, 4], "x": 12, "y": 5.5, "w": 1.25}, + {"matrix": [9, 3], "x": 14.25, "y": 4}, + {"matrix": [9, 2], "x": 15.25, "y": 4.25}, + {"matrix": [9, 1], "x": 16.25, "y": 4.5}, + {"matrix": [9, 0], "x": 17.25, "y": 4.5, "w": 1.25} ] } } diff --git a/keyboards/ogre/ergo_split/ergo_split.h b/keyboards/ogre/ergo_split/ergo_split.h deleted file mode 100644 index f8f9ddf65f..0000000000 --- a/keyboards/ogre/ergo_split/ergo_split.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2020 ctrlshiftba - * - * 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 . - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k63, k00, k10, k20, k30, k40, k50, k60, k65, k55, k45, k35, k25, k15, k05, k68, \ - k01, k11, k21, k31, k41, k51, k61, k66, k56, k46, k36, k26, k16, k06, \ - k02, k12, k22, k32, k42, k52, k62, k67, k57, k47, k37, k27, k17, k07, \ - k03, k13, k23, k33, k43, k53, k58, k48, k38, k28, k18, k08, \ - k04, k14, k24, k34, k44, k54, k64, k69, k59, k49, k39, k29, k19, k09 \ -) \ -{ \ - { k00, k10, k20, k30, k40, k50, k60 }, \ - { k01, k11, k21, k31, k41, k51, k61 }, \ - { k02, k12, k22, k32, k42, k52, k62 }, \ - { k03, k13, k23, k33, k43, k53, k63 }, \ - { k04, k14, k24, k34, k44, k54, k64 }, \ - { k05, k15, k25, k35, k45, k55, k65 }, \ - { k06, k16, k26, k36, k46, k56, k66 }, \ - { k07, k17, k27, k37, k47, k57, k67 }, \ - { k08, k18, k28, k38, k48, k58, k68 }, \ - { k09, k19, k29, k39, k49, k59, k69 }, \ -} diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json index 84452270de..2a1bbbdcd6 100644 --- a/keyboards/ogre/ergo_split/info.json +++ b/keyboards/ogre/ergo_split/info.json @@ -24,87 +24,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0.25, "y": 0.5}, - {"x": 1.25, "y": 0.5}, - {"x": 2.25, "y": 0.5}, - {"x": 3.25, "y": 0.25}, - {"x": 4.25, "y": 0}, - {"x": 5.25, "y": 0.25}, - {"x": 6.25, "y": 0.5}, - {"x": 7.25, "y": 0.5}, + {"matrix": [3, 6], "x": 0.25, "y": 0.5}, + {"matrix": [0, 0], "x": 1.25, "y": 0.5}, + {"matrix": [0, 1], "x": 2.25, "y": 0.5}, + {"matrix": [0, 2], "x": 3.25, "y": 0.25}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"matrix": [0, 4], "x": 5.25, "y": 0.25}, + {"matrix": [0, 5], "x": 6.25, "y": 0.5}, + {"matrix": [0, 6], "x": 7.25, "y": 0.5}, - {"x": 11.25, "y": 0.5}, - {"x": 12.25, "y": 0.5}, - {"x": 13.25, "y": 0.25}, - {"x": 14.25, "y": 0}, - {"x": 15.25, "y": 0.25}, - {"x": 16.25, "y": 0.5}, - {"x": 17.25, "y": 0.5}, - {"x": 18.25, "y": 0.5}, + {"matrix": [5, 6], "x": 11.25, "y": 0.5}, + {"matrix": [5, 5], "x": 12.25, "y": 0.5}, + {"matrix": [5, 4], "x": 13.25, "y": 0.25}, + {"matrix": [5, 3], "x": 14.25, "y": 0}, + {"matrix": [5, 2], "x": 15.25, "y": 0.25}, + {"matrix": [5, 1], "x": 16.25, "y": 0.5}, + {"matrix": [5, 0], "x": 17.25, "y": 0.5}, + {"matrix": [8, 6], "x": 18.25, "y": 0.5}, - {"x": 0.75, "y": 1.5, "w": 1.5}, - {"x": 2.25, "y": 1.5}, - {"x": 3.25, "y": 1.25}, - {"x": 4.25, "y": 1}, - {"x": 5.25, "y": 1.25}, - {"x": 6.25, "y": 1.5}, - {"x": 7.25, "y": 1.5}, + {"matrix": [1, 0], "x": 0.75, "y": 1.5, "w": 1.5}, + {"matrix": [1, 1], "x": 2.25, "y": 1.5}, + {"matrix": [1, 2], "x": 3.25, "y": 1.25}, + {"matrix": [1, 3], "x": 4.25, "y": 1}, + {"matrix": [1, 4], "x": 5.25, "y": 1.25}, + {"matrix": [1, 5], "x": 6.25, "y": 1.5}, + {"matrix": [1, 6], "x": 7.25, "y": 1.5}, - {"x": 11.25, "y": 1.5}, - {"x": 12.25, "y": 1.5}, - {"x": 13.25, "y": 1.25}, - {"x": 14.25, "y": 1}, - {"x": 15.25, "y": 1.25}, - {"x": 16.25, "y": 1.5}, - {"x": 17.25, "y": 1.5, "w": 1.5}, + {"matrix": [6, 6], "x": 11.25, "y": 1.5}, + {"matrix": [6, 5], "x": 12.25, "y": 1.5}, + {"matrix": [6, 4], "x": 13.25, "y": 1.25}, + {"matrix": [6, 3], "x": 14.25, "y": 1}, + {"matrix": [6, 2], "x": 15.25, "y": 1.25}, + {"matrix": [6, 1], "x": 16.25, "y": 1.5}, + {"matrix": [6, 0], "x": 17.25, "y": 1.5, "w": 1.5}, - {"x": 0.5, "y": 2.5, "w": 1.75}, - {"x": 2.25, "y": 2.5}, - {"x": 3.25, "y": 2.25}, - {"x": 4.25, "y": 2}, - {"x": 5.25, "y": 2.25}, - {"x": 6.25, "y": 2.5}, - {"x": 7.25, "y": 2.5}, + {"matrix": [2, 0], "x": 0.5, "y": 2.5, "w": 1.75}, + {"matrix": [2, 1], "x": 2.25, "y": 2.5}, + {"matrix": [2, 2], "x": 3.25, "y": 2.25}, + {"matrix": [2, 3], "x": 4.25, "y": 2}, + {"matrix": [2, 4], "x": 5.25, "y": 2.25}, + {"matrix": [2, 5], "x": 6.25, "y": 2.5}, + {"matrix": [2, 6], "x": 7.25, "y": 2.5}, - {"x": 11.25, "y": 2.5}, - {"x": 12.25, "y": 2.5}, - {"x": 13.25, "y": 2.25}, - {"x": 14.25, "y": 2}, - {"x": 15.25, "y": 2.25}, - {"x": 16.25, "y": 2.5}, - {"x": 17.25, "y": 2.5, "w": 1.75}, + {"matrix": [7, 6], "x": 11.25, "y": 2.5}, + {"matrix": [7, 5], "x": 12.25, "y": 2.5}, + {"matrix": [7, 4], "x": 13.25, "y": 2.25}, + {"matrix": [7, 3], "x": 14.25, "y": 2}, + {"matrix": [7, 2], "x": 15.25, "y": 2.25}, + {"matrix": [7, 1], "x": 16.25, "y": 2.5}, + {"matrix": [7, 0], "x": 17.25, "y": 2.5, "w": 1.75}, - {"x": 0, "y": 3.5, "w": 2.25}, - {"x": 2.25, "y": 3.5}, - {"x": 3.25, "y": 3.25}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3.25}, - {"x": 6.25, "y": 3.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.5}, + {"matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3.5}, - {"x": 12.25, "y": 3.5}, - {"x": 13.25, "y": 3.25}, - {"x": 14.25, "y": 3}, - {"x": 15.25, "y": 3.25}, - {"x": 16.25, "y": 3.5}, - {"x": 17.25, "y": 3.5, "w": 2.25}, + {"matrix": [8, 5], "x": 12.25, "y": 3.5}, + {"matrix": [8, 4], "x": 13.25, "y": 3.25}, + {"matrix": [8, 3], "x": 14.25, "y": 3}, + {"matrix": [8, 2], "x": 15.25, "y": 3.25}, + {"matrix": [8, 1], "x": 16.25, "y": 3.5}, + {"matrix": [8, 0], "x": 17.25, "y": 3.5, "w": 2.25}, - {"x": 1, "y": 4.5, "w": 1.25}, - {"x": 2.25, "y": 4.5}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4}, + {"matrix": [4, 0], "x": 1, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4}, + {"matrix": [4, 4], "x": 6.25, "y": 5.5, "w": 1.25}, + {"matrix": [4, 5], "x": 7.5, "y": 3.75, "h": 2.75}, + {"matrix": [4, 6], "x": 8.5, "y": 4.5, "h": 2}, - {"x": 6.25, "y": 5.5, "w": 1.25}, - {"x": 7.5, "y": 3.75, "h": 2.75}, - {"x": 8.5, "y": 4.5, "h": 2}, - - {"x": 10, "y": 5, "h": 1.5}, - {"x": 11, "y": 4.5, "h": 2}, - {"x": 12, "y": 5.5, "w": 1.25}, - - {"x": 14.25, "y": 4}, - {"x": 15.25, "y": 4.25}, - {"x": 16.25, "y": 4.5}, - {"x": 17.25, "y": 4.5, "w": 1.25} + {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.5}, + {"matrix": [9, 5], "x": 11, "y": 4.5, "h": 2}, + {"matrix": [9, 4], "x": 12, "y": 5.5, "w": 1.25}, + {"matrix": [9, 3], "x": 14.25, "y": 4}, + {"matrix": [9, 2], "x": 15.25, "y": 4.25}, + {"matrix": [9, 1], "x": 16.25, "y": 4.5}, + {"matrix": [9, 0], "x": 17.25, "y": 4.5, "w": 1.25} ] } } -- cgit v1.2.3