diff options
Diffstat (limited to 'keyboards/kbdfans/kbdpad')
-rw-r--r-- | keyboards/kbdfans/kbdpad/mk1/config.h | 6 | ||||
-rw-r--r-- | keyboards/kbdfans/kbdpad/mk1/info.json | 136 | ||||
-rw-r--r-- | keyboards/kbdfans/kbdpad/mk1/mk1.c | 17 | ||||
-rw-r--r-- | keyboards/kbdfans/kbdpad/mk1/mk1.h | 71 | ||||
-rw-r--r-- | keyboards/kbdfans/kbdpad/mk1/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/kbdfans/kbdpad/mk2/config.h | 19 | ||||
-rw-r--r-- | keyboards/kbdfans/kbdpad/mk2/info.json | 90 | ||||
-rw-r--r-- | keyboards/kbdfans/kbdpad/mk2/mk2.c | 16 | ||||
-rw-r--r-- | keyboards/kbdfans/kbdpad/mk2/mk2.h | 60 | ||||
-rw-r--r-- | keyboards/kbdfans/kbdpad/mk3/info.json | 40 |
10 files changed, 157 insertions, 299 deletions
diff --git a/keyboards/kbdfans/kbdpad/mk1/config.h b/keyboards/kbdfans/kbdpad/mk1/config.h index acd78533ee..a3a9a993df 100644 --- a/keyboards/kbdfans/kbdpad/mk1/config.h +++ b/keyboards/kbdfans/kbdpad/mk1/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 } -#define MATRIX_COL_PINS { A0, A1, A2, A3 } - -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/kbdfans/kbdpad/mk1/info.json b/keyboards/kbdfans/kbdpad/mk1/info.json index 97d4c827a1..3527370e4c 100644 --- a/keyboards/kbdfans/kbdpad/mk1/info.json +++ b/keyboards/kbdfans/kbdpad/mk1/info.json @@ -8,10 +8,18 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4", "breathing": true }, + "ws2812": { + "driver": "i2c" + }, "indicators": { "num_lock": "D0" }, @@ -21,93 +29,93 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":2, "y":0}, - {"x":3, "y":0}, + {"matrix": [5, 2], "x": 2, "y": 0}, + {"matrix": [5, 3], "x": 3, "y": 0}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, + {"matrix": [4, 0], "x": 0, "y": 1.25}, + {"matrix": [4, 1], "x": 1, "y": 1.25}, + {"matrix": [4, 2], "x": 2, "y": 1.25}, + {"matrix": [4, 3], "x": 3, "y": 1.25}, - {"x":0, "y":2.25}, - {"x":1, "y":2.25}, - {"x":2, "y":2.25}, + {"matrix": [3, 0], "x": 0, "y": 2.25}, + {"matrix": [3, 1], "x": 1, "y": 2.25}, + {"matrix": [3, 2], "x": 2, "y": 2.25}, - {"x":0, "y":3.25}, - {"x":1, "y":3.25}, - {"x":2, "y":3.25}, - {"x":3, "y":2.25, "h":2}, + {"matrix": [2, 0], "x": 0, "y": 3.25}, + {"matrix": [2, 1], "x": 1, "y": 3.25}, + {"matrix": [2, 2], "x": 2, "y": 3.25}, + {"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2}, - {"x":0, "y":4.25}, - {"x":1, "y":4.25}, - {"x":2, "y":4.25}, + {"matrix": [1, 0], "x": 0, "y": 4.25}, + {"matrix": [1, 1], "x": 1, "y": 4.25}, + {"matrix": [1, 2], "x": 2, "y": 4.25}, - {"x":0, "y":5.25, "w":2}, - {"x":2, "y":5.25}, - {"x":3, "y":4.25, "h":2} + {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [0, 2], "x": 2, "y": 5.25}, + {"matrix": [0, 3], "x": 3, "y": 4.25, "h": 2} ] }, "LAYOUT_numpad_6x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [5, 1], "x": 1, "y": 0}, + {"matrix": [5, 2], "x": 2, "y": 0}, + {"matrix": [5, 3], "x": 3, "y": 0}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, + {"matrix": [4, 0], "x": 0, "y": 1.25}, + {"matrix": [4, 1], "x": 1, "y": 1.25}, + {"matrix": [4, 2], "x": 2, "y": 1.25}, + {"matrix": [4, 3], "x": 3, "y": 1.25}, - {"x":0, "y":2.25}, - {"x":1, "y":2.25}, - {"x":2, "y":2.25}, + {"matrix": [3, 0], "x": 0, "y": 2.25}, + {"matrix": [3, 1], "x": 1, "y": 2.25}, + {"matrix": [3, 2], "x": 2, "y": 2.25}, - {"x":0, "y":3.25}, - {"x":1, "y":3.25}, - {"x":2, "y":3.25}, - {"x":3, "y":2.25, "h":2}, + {"matrix": [2, 0], "x": 0, "y": 3.25}, + {"matrix": [2, 1], "x": 1, "y": 3.25}, + {"matrix": [2, 2], "x": 2, "y": 3.25}, + {"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2}, - {"x":0, "y":4.25}, - {"x":1, "y":4.25}, - {"x":2, "y":4.25}, + {"matrix": [1, 0], "x": 0, "y": 4.25}, + {"matrix": [1, 1], "x": 1, "y": 4.25}, + {"matrix": [1, 2], "x": 2, "y": 4.25}, - {"x":0, "y":5.25, "w":2}, - {"x":2, "y":5.25}, - {"x":3, "y":4.25, "h":2} + {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [0, 2], "x": 2, "y": 5.25}, + {"matrix": [0, 3], "x": 3, "y": 4.25, "h": 2} ] }, "LAYOUT_ortho_6x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [5, 1], "x": 1, "y": 0}, + {"matrix": [5, 2], "x": 2, "y": 0}, + {"matrix": [5, 3], "x": 3, "y": 0}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, + {"matrix": [4, 0], "x": 0, "y": 1.25}, + {"matrix": [4, 1], "x": 1, "y": 1.25}, + {"matrix": [4, 2], "x": 2, "y": 1.25}, + {"matrix": [4, 3], "x": 3, "y": 1.25}, - {"x":0, "y":2.25}, - {"x":1, "y":2.25}, - {"x":2, "y":2.25}, - {"x":3, "y":2.25}, + {"matrix": [3, 0], "x": 0, "y": 2.25}, + {"matrix": [3, 1], "x": 1, "y": 2.25}, + {"matrix": [3, 2], "x": 2, "y": 2.25}, + {"matrix": [3, 3], "x": 3, "y": 2.25}, - {"x":0, "y":3.25}, - {"x":1, "y":3.25}, - {"x":2, "y":3.25}, - {"x":3, "y":3.25}, + {"matrix": [2, 0], "x": 0, "y": 3.25}, + {"matrix": [2, 1], "x": 1, "y": 3.25}, + {"matrix": [2, 2], "x": 2, "y": 3.25}, + {"matrix": [2, 3], "x": 3, "y": 3.25}, - {"x":0, "y":4.25}, - {"x":1, "y":4.25}, - {"x":2, "y":4.25}, - {"x":3, "y":4.25}, + {"matrix": [1, 0], "x": 0, "y": 4.25}, + {"matrix": [1, 1], "x": 1, "y": 4.25}, + {"matrix": [1, 2], "x": 2, "y": 4.25}, + {"matrix": [1, 3], "x": 3, "y": 4.25}, - {"x":0, "y":5.25}, - {"x":1, "y":5.25}, - {"x":2, "y":5.25}, - {"x":3, "y":5.25} + {"matrix": [0, 0], "x": 0, "y": 5.25}, + {"matrix": [0, 1], "x": 1, "y": 5.25}, + {"matrix": [0, 2], "x": 2, "y": 5.25}, + {"matrix": [0, 3], "x": 3, "y": 5.25} ] } } diff --git a/keyboards/kbdfans/kbdpad/mk1/mk1.c b/keyboards/kbdfans/kbdpad/mk1/mk1.c deleted file mode 100644 index 5635b0a589..0000000000 --- a/keyboards/kbdfans/kbdpad/mk1/mk1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 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/>. - */ - -#include "mk1.h" diff --git a/keyboards/kbdfans/kbdpad/mk1/mk1.h b/keyboards/kbdfans/kbdpad/mk1/mk1.h deleted file mode 100644 index 36b0287278..0000000000 --- a/keyboards/kbdfans/kbdpad/mk1/mk1.h +++ /dev/null @@ -1,71 +0,0 @@ -/* Copyright 2019 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" - -// This is a shortcut to help you visually see your layout. -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array - -#define LAYOUT( \ - k52, k53, \ - k40, k41, k42, k43, \ - k30, k31, k32, \ - k20, k21, k22, k23, \ - k10, k11, k12, \ - k00, k02, k03 \ -) { \ - { k00, KC_NO, k02, k03 }, \ - { k10, k11, k12, KC_NO }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, KC_NO }, \ - { k40, k41, k42, k43 }, \ - { KC_NO, KC_NO, k52, k53 } \ -} - -#define LAYOUT_numpad_6x4( \ - k50, k51, k52, k53, \ - k40, k41, k42, k43, \ - k30, k31, k32, \ - k20, k21, k22, k23, \ - k10, k11, k12, \ - k00, k02, k03 \ -) { \ - { k00, KC_NO, k02, k03 }, \ - { k10, k11, k12, KC_NO }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, KC_NO }, \ - { k40, k41, k42, k43 }, \ - { k50, k51, k52, k53 } \ -} - -#define LAYOUT_ortho_6x4( \ - k50, k51, k52, k53, \ - k40, k41, k42, k43, \ - k30, k31, k32, k33, \ - k20, k21, k22, k23, \ - k10, k11, k12, k13, \ - k00, k01, k02, k03 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 }, \ - { k50, k51, k52, k53 } \ -} diff --git a/keyboards/kbdfans/kbdpad/mk1/rules.mk b/keyboards/kbdfans/kbdpad/mk1/rules.mk index 98e6c70143..ae7a0b4e16 100644 --- a/keyboards/kbdfans/kbdpad/mk1/rules.mk +++ b/keyboards/kbdfans/kbdpad/mk1/rules.mk @@ -8,4 +8,3 @@ CONSOLE_ENABLE = no COMMAND_ENABLE = no BACKLIGHT_ENABLE = yes RGBLIGHT_ENABLE = no # PCB has underglow LEDs, but case doesn't let them show. -WS2812_DRIVER = i2c diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h index ffc9d00e5f..5ea4fba8e2 100644 --- a/keyboards/kbdfans/kbdpad/mk2/config.h +++ b/keyboards/kbdfans/kbdpad/mk2/config.h @@ -17,25 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D3, D1, D2, C6, C7, B6 } -#define MATRIX_COL_PINS { C4, C5, B3, B2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN B5 -#ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -52,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/kbdfans/kbdpad/mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json index 54657e5c12..424771ae3d 100644 --- a/keyboards/kbdfans/kbdpad/mk2/info.json +++ b/keyboards/kbdfans/kbdpad/mk2/info.json @@ -8,6 +8,11 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C4", "C5", "B3", "B2"], + "rows": ["D3", "D1", "D2", "C6", "C7", "B6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, @@ -21,33 +26,68 @@ "bootloader": "atmel-dfu", "community_layouts": ["ortho_6x4"], "layouts": { + "LAYOUT_numpad_6x4": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3.25, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4.25}, + {"matrix": [4, 1], "x": 1, "y": 4.25}, + {"matrix": [4, 2], "x": 2, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 5.25} + ] + }, "LAYOUT_ortho_6x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":0, "y":2.25}, - {"x":1, "y":2.25}, - {"x":2, "y":2.25}, - {"x":3, "y":2.25}, - {"x":0, "y":3.25}, - {"x":1, "y":3.25}, - {"x":2, "y":3.25}, - {"x":3, "y":3.25}, - {"x":0, "y":4.25}, - {"x":1, "y":4.25}, - {"x":2, "y":4.25}, - {"x":3, "y":4.25}, - {"x":0, "y":5.25}, - {"x":1, "y":5.25}, - {"x":2, "y":5.25}, - {"x":3, "y":5.25} - ] + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25}, + {"matrix": [4, 1], "x": 1, "y": 4.25}, + {"matrix": [4, 2], "x": 2, "y": 4.25}, + {"matrix": [4, 3], "x": 3, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25}, + {"matrix": [5, 1], "x": 1, "y": 5.25}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 5.25} + ] } } } diff --git a/keyboards/kbdfans/kbdpad/mk2/mk2.c b/keyboards/kbdfans/kbdpad/mk2/mk2.c deleted file mode 100644 index 2449724126..0000000000 --- a/keyboards/kbdfans/kbdpad/mk2/mk2.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Ryota Goto - * - * 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 "mk2.h" diff --git a/keyboards/kbdfans/kbdpad/mk2/mk2.h b/keyboards/kbdfans/kbdpad/mk2/mk2.h deleted file mode 100644 index 0dfa995fe2..0000000000 --- a/keyboards/kbdfans/kbdpad/mk2/mk2.h +++ /dev/null @@ -1,60 +0,0 @@ -/* Copyright 2019 Ryota Goto - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_ortho_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43, \ - K50, K51, K52, K53 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 }, \ - { K50, K51, K52, K53 } \ -} - -#define LAYOUT_numpad_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, \ - K30, K31, K32, K33, \ - K40, K41, K42, \ - K50, K52, K53 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, KC_NO }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, KC_NO }, \ - { K50, KC_NO, K52, K53 } \ -} diff --git a/keyboards/kbdfans/kbdpad/mk3/info.json b/keyboards/kbdfans/kbdpad/mk3/info.json index a22c82c681..ec522cc82c 100644 --- a/keyboards/kbdfans/kbdpad/mk3/info.json +++ b/keyboards/kbdfans/kbdpad/mk3/info.json @@ -57,27 +57,27 @@ "layouts": { "LAYOUT_numpad_6x4": { "layout": [ - { "label": "K00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "K01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "K02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "K03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "K10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, - { "label": "K11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 }, - { "label": "K12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 }, - { "label": "K13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 }, - { "label": "K20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, - { "label": "K21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, - { "label": "K22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, - { "label": "K30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, - { "label": "K31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, - { "label": "K32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 }, - { "h": 2, "label": "K23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 }, - { "label": "K40", "matrix": [4, 0], "w": 1, "x": 0, "y": 4 }, - { "label": "K41", "matrix": [4, 1], "w": 1, "x": 1, "y": 4 }, - { "label": "K42", "matrix": [4, 2], "w": 1, "x": 2, "y": 4 }, + { "label": "K00", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "K01", "matrix": [0, 1], "x": 1, "y": 0 }, + { "label": "K02", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "K03", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "K10", "matrix": [1, 0], "x": 0, "y": 1 }, + { "label": "K11", "matrix": [1, 1], "x": 1, "y": 1 }, + { "label": "K12", "matrix": [1, 2], "x": 2, "y": 1 }, + { "label": "K13", "matrix": [1, 3], "x": 3, "y": 1 }, + { "label": "K20", "matrix": [2, 0], "x": 0, "y": 2 }, + { "label": "K21", "matrix": [2, 1], "x": 1, "y": 2 }, + { "label": "K22", "matrix": [2, 2], "x": 2, "y": 2 }, + { "label": "K30", "matrix": [3, 0], "x": 0, "y": 3 }, + { "label": "K31", "matrix": [3, 1], "x": 1, "y": 3 }, + { "label": "K32", "matrix": [3, 2], "x": 2, "y": 3 }, + { "h": 2, "label": "K23", "matrix": [2, 3], "x": 3, "y": 2 }, + { "label": "K40", "matrix": [4, 0], "x": 0, "y": 4 }, + { "label": "K41", "matrix": [4, 1], "x": 1, "y": 4 }, + { "label": "K42", "matrix": [4, 2], "x": 2, "y": 4 }, { "label": "K50", "matrix": [5, 0], "w": 2, "x": 0, "y": 5 }, - { "label": "K52", "matrix": [5, 2], "w": 1, "x": 2, "y": 5 }, - { "h": 2, "label": "K43", "matrix": [4, 3], "w": 1, "x": 3, "y": 4 } + { "label": "K52", "matrix": [5, 2], "x": 2, "y": 5 }, + { "h": 2, "label": "K43", "matrix": [4, 3], "x": 3, "y": 4 } ] } } |