diff options
Diffstat (limited to 'keyboards/cipulot')
-rw-r--r-- | keyboards/cipulot/kallos/config.h | 10 | ||||
-rw-r--r-- | keyboards/cipulot/kallos/info.json | 5 | ||||
-rw-r--r-- | keyboards/cipulot/kallos/kallos.c | 17 | ||||
-rw-r--r-- | keyboards/cipulot/kawayo/config.h | 8 | ||||
-rw-r--r-- | keyboards/cipulot/kawayo/info.json | 5 | ||||
-rw-r--r-- | keyboards/cipulot/kawayo/kawayo.c | 17 | ||||
-rw-r--r-- | keyboards/cipulot/rf_r1_8_9xu/info.json | 296 |
7 files changed, 158 insertions, 200 deletions
diff --git a/keyboards/cipulot/kallos/config.h b/keyboards/cipulot/kallos/config.h index 66140bc3ed..62e682cd0c 100644 --- a/keyboards/cipulot/kallos/config.h +++ b/keyboards/cipulot/kallos/config.h @@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS \ - { B3, B2, F0, C7, F4, F1 } -#define MATRIX_COL_PINS \ - { F5, F6, C6, B6, B5, B4, D7, D6, D4, D5, D3, F7, D2, D1, B7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Lightbar pin and LED count definitions*/ #define RGB_DI_PIN D0 #define RGBLED_NUM 13 diff --git a/keyboards/cipulot/kallos/info.json b/keyboards/cipulot/kallos/info.json index 1295d76e7f..a0e9aefe17 100644 --- a/keyboards/cipulot/kallos/info.json +++ b/keyboards/cipulot/kallos/info.json @@ -8,6 +8,11 @@ "pid": "0x6B7A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F6", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "F7", "D2", "D1", "B7"], + "rows": ["B3", "B2", "F0", "C7", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/cipulot/kallos/kallos.c b/keyboards/cipulot/kallos/kallos.c deleted file mode 100644 index 77f41f9075..0000000000 --- a/keyboards/cipulot/kallos/kallos.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Cipulot - * - * 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 "kallos.h" diff --git a/keyboards/cipulot/kawayo/config.h b/keyboards/cipulot/kawayo/config.h index 1a9b80ee58..a87365e69d 100644 --- a/keyboards/cipulot/kawayo/config.h +++ b/keyboards/cipulot/kawayo/config.h @@ -16,14 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS \ - { B1, B12, C13, A7, B0 } -#define MATRIX_COL_PINS \ - { B10, A0, B9, B8, B7, B6, B5, B4, B3, A15, A14, A4, A3, A2, A1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/cipulot/kawayo/info.json b/keyboards/cipulot/kawayo/info.json index f335b2b76c..317149fa67 100644 --- a/keyboards/cipulot/kawayo/info.json +++ b/keyboards/cipulot/kawayo/info.json @@ -8,6 +8,11 @@ "pid": "0x6B7F", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "A0", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14", "A4", "A3", "A2", "A1"], + "rows": ["B1", "B12", "C13", "A7", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu", "layout_aliases": { diff --git a/keyboards/cipulot/kawayo/kawayo.c b/keyboards/cipulot/kawayo/kawayo.c deleted file mode 100644 index 1dee38696e..0000000000 --- a/keyboards/cipulot/kawayo/kawayo.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Cipulot - * - * 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 "kawayo.h"
\ No newline at end of file diff --git a/keyboards/cipulot/rf_r1_8_9xu/info.json b/keyboards/cipulot/rf_r1_8_9xu/info.json index 53e401f6cf..b72dee4696 100644 --- a/keyboards/cipulot/rf_r1_8_9xu/info.json +++ b/keyboards/cipulot/rf_r1_8_9xu/info.json @@ -54,41 +54,41 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, - { "label": "0,1", "matrix": [0, 1], "x": 2.0, "y": 0.0 }, - { "label": "0,2", "matrix": [0, 2], "x": 3.0, "y": 0.0 }, - { "label": "0,3", "matrix": [0, 3], "x": 4.0, "y": 0.0 }, - { "label": "0,4", "matrix": [0, 4], "x": 5.0, "y": 0.0 }, - { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0.0 }, - { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0.0 }, - { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0.0 }, - { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0.0 }, - { "label": "0,9", "matrix": [0, 9], "x": 11.0, "y": 0.0 }, - { "label": "0,10", "matrix": [0, 10], "x": 12.0, "y": 0.0 }, - { "label": "0,11", "matrix": [0, 11], "x": 13.0, "y": 0.0 }, - { "label": "0,12", "matrix": [0, 12], "x": 14.0, "y": 0.0 }, - { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0.0 }, - { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0.0 }, - { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0.0 }, - { "label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.25 }, - { "label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.25 }, - { "label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.25 }, - { "label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.25 }, - { "label": "1,4", "matrix": [1, 4], "x": 4.0, "y": 1.25 }, - { "label": "1,5", "matrix": [1, 5], "x": 5.0, "y": 1.25 }, - { "label": "1,6", "matrix": [1, 6], "x": 6.0, "y": 1.25 }, - { "label": "1,7", "matrix": [1, 7], "x": 7.0, "y": 1.25 }, - { "label": "1,8", "matrix": [1, 8], "x": 8.0, "y": 1.25 }, - { "label": "1,9", "matrix": [1, 9], "x": 9.0, "y": 1.25 }, - { "label": "1,10", "matrix": [1, 10], "x": 10.0, "y": 1.25 }, - { "label": "1,11", "matrix": [1, 11], "x": 11.0, "y": 1.25 }, - { "label": "1,12", "matrix": [1, 12], "x": 12.0, "y": 1.25 }, - { "label": "1,13", "matrix": [1, 13], "x": 13.0, "y": 1.25 }, - { "label": "1,14", "matrix": [1, 14], "x": 14.0, "y": 1.25 }, + { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 }, + { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 }, + { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 }, + { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 }, + { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 }, + { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 }, + { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 }, + { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 }, + { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 }, + { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 }, + { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 }, + { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 }, + { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 }, + { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 }, + { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 }, + { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 }, + { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 }, + { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 }, + { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 }, + { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 }, + { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 }, + { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 }, + { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 }, + { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 }, + { "label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25 }, + { "label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25 }, { "label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25 }, { "label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25 }, { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25 }, - { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 }, + { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 }, { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 }, { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 }, @@ -106,7 +106,7 @@ { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25 }, { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25 }, { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 }, - { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 }, + { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 }, { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 }, { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 }, @@ -120,7 +120,7 @@ { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 }, { "label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25 }, { "label": "3,13", "matrix": [3, 13], "w": 1.25, "x": 13.75, "y": 3.25 }, - { "label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 }, + { "label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 }, { "label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25 }, { "label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25 }, { "label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25 }, @@ -135,14 +135,14 @@ { "label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25 }, { "label": "4,13", "matrix": [4, 13], "w": 1.75, "x": 13.25, "y": 4.25 }, { "label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25 }, - { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 }, + { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 }, { "label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25 }, { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 }, - { "label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4.0, "y": 5.25 }, + { "label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4, "y": 5.25 }, { "label": "5,6", "matrix": [5, 6], "w": 2.5, "x": 5.5, "y": 5.25 }, - { "label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8.0, "y": 5.25 }, + { "label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8, "y": 5.25 }, { "label": "5,8", "matrix": [5, 8], "w": 1.5, "x": 9.5, "y": 5.25 }, - { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11.0, "y": 5.25 }, + { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25 }, { "label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25 }, { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25 }, { "label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25 }, @@ -152,40 +152,40 @@ }, "LAYOUT_tkl_ansi_tsangan": { "layout": [ - { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, - { "label": "0,1", "matrix": [0, 1], "x": 2.0, "y": 0.0 }, - { "label": "0,2", "matrix": [0, 2], "x": 3.0, "y": 0.0 }, - { "label": "0,3", "matrix": [0, 3], "x": 4.0, "y": 0.0 }, - { "label": "0,4", "matrix": [0, 4], "x": 5.0, "y": 0.0 }, - { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0.0 }, - { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0.0 }, - { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0.0 }, - { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0.0 }, - { "label": "0,9", "matrix": [0, 9], "x": 11.0, "y": 0.0 }, - { "label": "0,10", "matrix": [0, 10], "x": 12.0, "y": 0.0 }, - { "label": "0,11", "matrix": [0, 11], "x": 13.0, "y": 0.0 }, - { "label": "0,12", "matrix": [0, 12], "x": 14.0, "y": 0.0 }, - { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0.0 }, - { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0.0 }, - { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0.0 }, - { "label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.25 }, - { "label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.25 }, - { "label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.25 }, - { "label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.25 }, - { "label": "1,4", "matrix": [1, 4], "x": 4.0, "y": 1.25 }, - { "label": "1,5", "matrix": [1, 5], "x": 5.0, "y": 1.25 }, - { "label": "1,6", "matrix": [1, 6], "x": 6.0, "y": 1.25 }, - { "label": "1,7", "matrix": [1, 7], "x": 7.0, "y": 1.25 }, - { "label": "1,8", "matrix": [1, 8], "x": 8.0, "y": 1.25 }, - { "label": "1,9", "matrix": [1, 9], "x": 9.0, "y": 1.25 }, - { "label": "1,10", "matrix": [1, 10], "x": 10.0, "y": 1.25 }, - { "label": "1,11", "matrix": [1, 11], "x": 11.0, "y": 1.25 }, - { "label": "1,12", "matrix": [1, 12], "x": 12.0, "y": 1.25 }, - { "label": "1,14", "matrix": [1, 14], "w": 2, "x": 13.0, "y": 1.25 }, + { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 }, + { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 }, + { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 }, + { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 }, + { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 }, + { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 }, + { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 }, + { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 }, + { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 }, + { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 }, + { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 }, + { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 }, + { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 }, + { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 }, + { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 }, + { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 }, + { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 }, + { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 }, + { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 }, + { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 }, + { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 }, + { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 }, + { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 }, + { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 }, + { "label": "1,14", "matrix": [1, 14], "w": 2, "x": 13, "y": 1.25 }, { "label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25 }, { "label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25 }, { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25 }, - { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 }, + { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 }, { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 }, { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 }, @@ -202,7 +202,7 @@ { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25 }, { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25 }, { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 }, - { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 }, + { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 }, { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 }, { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 }, @@ -215,7 +215,7 @@ { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 }, { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 }, { "label": "3,13", "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 }, - { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0.0, "y": 4.25 }, + { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 }, { "label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25 }, { "label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25 }, { "label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25 }, @@ -228,11 +228,11 @@ { "label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25 }, { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25 }, { "label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25 }, - { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 }, + { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 }, { "label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25 }, { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 }, - { "label": "5,6", "matrix": [5, 6], "w": 7, "x": 4.0, "y": 5.25 }, - { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11.0, "y": 5.25 }, + { "label": "5,6", "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 }, + { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25 }, { "label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25 }, { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25 }, { "label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25 }, @@ -242,40 +242,40 @@ }, "LAYOUT_tkl_iso_tsangan": { "layout": [ - { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, - { "label": "0,1", "matrix": [0, 1], "x": 2.0, "y": 0.0 }, - { "label": "0,2", "matrix": [0, 2], "x": 3.0, "y": 0.0 }, - { "label": "0,3", "matrix": [0, 3], "x": 4.0, "y": 0.0 }, - { "label": "0,4", "matrix": [0, 4], "x": 5.0, "y": 0.0 }, - { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0.0 }, - { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0.0 }, - { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0.0 }, - { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0.0 }, - { "label": "0,9", "matrix": [0, 9], "x": 11.0, "y": 0.0 }, - { "label": "0,10", "matrix": [0, 10], "x": 12.0, "y": 0.0 }, - { "label": "0,11", "matrix": [0, 11], "x": 13.0, "y": 0.0 }, - { "label": "0,12", "matrix": [0, 12], "x": 14.0, "y": 0.0 }, - { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0.0 }, - { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0.0 }, - { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0.0 }, - { "label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.25 }, - { "label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.25 }, - { "label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.25 }, - { "label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.25 }, - { "label": "1,4", "matrix": [1, 4], "x": 4.0, "y": 1.25 }, - { "label": "1,5", "matrix": [1, 5], "x": 5.0, "y": 1.25 }, - { "label": "1,6", "matrix": [1, 6], "x": 6.0, "y": 1.25 }, - { "label": "1,7", "matrix": [1, 7], "x": 7.0, "y": 1.25 }, - { "label": "1,8", "matrix": [1, 8], "x": 8.0, "y": 1.25 }, - { "label": "1,9", "matrix": [1, 9], "x": 9.0, "y": 1.25 }, - { "label": "1,10", "matrix": [1, 10], "x": 10.0, "y": 1.25 }, - { "label": "1,11", "matrix": [1, 11], "x": 11.0, "y": 1.25 }, - { "label": "1,12", "matrix": [1, 12], "x": 12.0, "y": 1.25 }, - { "label": "1,14", "matrix": [1, 14], "w": 2, "x": 13.0, "y": 1.25 }, + { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 }, + { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 }, + { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 }, + { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 }, + { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 }, + { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 }, + { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 }, + { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 }, + { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 }, + { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 }, + { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 }, + { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 }, + { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 }, + { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 }, + { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 }, + { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 }, + { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 }, + { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 }, + { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 }, + { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 }, + { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 }, + { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 }, + { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 }, + { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 }, + { "label": "1,14", "matrix": [1, 14], "w": 2, "x": 13, "y": 1.25 }, { "label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25 }, { "label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25 }, { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25 }, - { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 }, + { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 }, { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 }, { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 }, @@ -292,7 +292,7 @@ { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25 }, { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25 }, { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 }, - { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 }, + { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 }, { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 }, { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 }, @@ -305,7 +305,7 @@ { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 }, { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 }, { "label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25 }, - { "label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 }, + { "label": "4,0", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 }, { "label": "4,1", "matrix": [4, 1], "x": 1.25, "y": 4.25 }, { "label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25 }, { "label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25 }, @@ -319,11 +319,11 @@ { "label": "4,11", "matrix": [4, 11], "x": 11.25, "y": 4.25 }, { "label": "4,13", "matrix": [4, 13], "w": 2.75, "x": 12.25, "y": 4.25 }, { "label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25 }, - { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 }, + { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 }, { "label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25 }, { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 }, - { "label": "5,6", "matrix": [5, 6], "w": 7, "x": 4.0, "y": 5.25 }, - { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11.0, "y": 5.25 }, + { "label": "5,6", "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 }, + { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25 }, { "label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25 }, { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25 }, { "label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25 }, @@ -333,41 +333,41 @@ }, "LAYOUT_tkl_jis": { "layout": [ - { "label": "0,0", "matrix": [0, 0], "x": 0.0, "y": 0.0 }, - { "label": "0,1", "matrix": [0, 1], "x": 2.0, "y": 0.0 }, - { "label": "0,2", "matrix": [0, 2], "x": 3.0, "y": 0.0 }, - { "label": "0,3", "matrix": [0, 3], "x": 4.0, "y": 0.0 }, - { "label": "0,4", "matrix": [0, 4], "x": 5.0, "y": 0.0 }, - { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0.0 }, - { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0.0 }, - { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0.0 }, - { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0.0 }, - { "label": "0,9", "matrix": [0, 9], "x": 11.0, "y": 0.0 }, - { "label": "0,10", "matrix": [0, 10], "x": 12.0, "y": 0.0 }, - { "label": "0,11", "matrix": [0, 11], "x": 13.0, "y": 0.0 }, - { "label": "0,12", "matrix": [0, 12], "x": 14.0, "y": 0.0 }, - { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0.0 }, - { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0.0 }, - { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0.0 }, - { "label": "1,0", "matrix": [1, 0], "x": 0.0, "y": 1.25 }, - { "label": "1,1", "matrix": [1, 1], "x": 1.0, "y": 1.25 }, - { "label": "1,2", "matrix": [1, 2], "x": 2.0, "y": 1.25 }, - { "label": "1,3", "matrix": [1, 3], "x": 3.0, "y": 1.25 }, - { "label": "1,4", "matrix": [1, 4], "x": 4.0, "y": 1.25 }, - { "label": "1,5", "matrix": [1, 5], "x": 5.0, "y": 1.25 }, - { "label": "1,6", "matrix": [1, 6], "x": 6.0, "y": 1.25 }, - { "label": "1,7", "matrix": [1, 7], "x": 7.0, "y": 1.25 }, - { "label": "1,8", "matrix": [1, 8], "x": 8.0, "y": 1.25 }, - { "label": "1,9", "matrix": [1, 9], "x": 9.0, "y": 1.25 }, - { "label": "1,10", "matrix": [1, 10], "x": 10.0, "y": 1.25 }, - { "label": "1,11", "matrix": [1, 11], "x": 11.0, "y": 1.25 }, - { "label": "1,12", "matrix": [1, 12], "x": 12.0, "y": 1.25 }, - { "label": "1,13", "matrix": [1, 13], "x": 13.0, "y": 1.25 }, - { "label": "1,14", "matrix": [1, 14], "x": 14.0, "y": 1.25 }, + { "label": "0,0", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "0,1", "matrix": [0, 1], "x": 2, "y": 0 }, + { "label": "0,2", "matrix": [0, 2], "x": 3, "y": 0 }, + { "label": "0,3", "matrix": [0, 3], "x": 4, "y": 0 }, + { "label": "0,4", "matrix": [0, 4], "x": 5, "y": 0 }, + { "label": "0,5", "matrix": [0, 5], "x": 6.5, "y": 0 }, + { "label": "0,6", "matrix": [0, 6], "x": 7.5, "y": 0 }, + { "label": "0,7", "matrix": [0, 7], "x": 8.5, "y": 0 }, + { "label": "0,8", "matrix": [0, 8], "x": 9.5, "y": 0 }, + { "label": "0,9", "matrix": [0, 9], "x": 11, "y": 0 }, + { "label": "0,10", "matrix": [0, 10], "x": 12, "y": 0 }, + { "label": "0,11", "matrix": [0, 11], "x": 13, "y": 0 }, + { "label": "0,12", "matrix": [0, 12], "x": 14, "y": 0 }, + { "label": "0,13", "matrix": [0, 13], "x": 15.25, "y": 0 }, + { "label": "0,14", "matrix": [0, 14], "x": 16.25, "y": 0 }, + { "label": "0,15", "matrix": [0, 15], "x": 17.25, "y": 0 }, + { "label": "1,0", "matrix": [1, 0], "x": 0, "y": 1.25 }, + { "label": "1,1", "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "label": "1,2", "matrix": [1, 2], "x": 2, "y": 1.25 }, + { "label": "1,3", "matrix": [1, 3], "x": 3, "y": 1.25 }, + { "label": "1,4", "matrix": [1, 4], "x": 4, "y": 1.25 }, + { "label": "1,5", "matrix": [1, 5], "x": 5, "y": 1.25 }, + { "label": "1,6", "matrix": [1, 6], "x": 6, "y": 1.25 }, + { "label": "1,7", "matrix": [1, 7], "x": 7, "y": 1.25 }, + { "label": "1,8", "matrix": [1, 8], "x": 8, "y": 1.25 }, + { "label": "1,9", "matrix": [1, 9], "x": 9, "y": 1.25 }, + { "label": "1,10", "matrix": [1, 10], "x": 10, "y": 1.25 }, + { "label": "1,11", "matrix": [1, 11], "x": 11, "y": 1.25 }, + { "label": "1,12", "matrix": [1, 12], "x": 12, "y": 1.25 }, + { "label": "1,13", "matrix": [1, 13], "x": 13, "y": 1.25 }, + { "label": "1,14", "matrix": [1, 14], "x": 14, "y": 1.25 }, { "label": "3,14", "matrix": [3, 14], "x": 15.25, "y": 1.25 }, { "label": "2,15", "matrix": [2, 15], "x": 16.25, "y": 1.25 }, { "label": "1,15", "matrix": [1, 15], "x": 17.25, "y": 1.25 }, - { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 }, + { "label": "2,0", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, { "label": "2,1", "matrix": [2, 1], "x": 1.5, "y": 2.25 }, { "label": "2,2", "matrix": [2, 2], "x": 2.5, "y": 2.25 }, { "label": "2,3", "matrix": [2, 3], "x": 3.5, "y": 2.25 }, @@ -384,7 +384,7 @@ { "label": "4,14", "matrix": [4, 14], "x": 15.25, "y": 2.25 }, { "label": "4,15", "matrix": [4, 15], "x": 16.25, "y": 2.25 }, { "label": "3,15", "matrix": [3, 15], "x": 17.25, "y": 2.25 }, - { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 }, + { "label": "3,0", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 }, { "label": "3,1", "matrix": [3, 1], "x": 1.75, "y": 3.25 }, { "label": "3,2", "matrix": [3, 2], "x": 2.75, "y": 3.25 }, { "label": "3,3", "matrix": [3, 3], "x": 3.75, "y": 3.25 }, @@ -397,7 +397,7 @@ { "label": "3,10", "matrix": [3, 10], "x": 10.75, "y": 3.25 }, { "label": "3,11", "matrix": [3, 11], "x": 11.75, "y": 3.25 }, { "label": "3,12", "matrix": [3, 12], "x": 12.75, "y": 3.25 }, - { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0.0, "y": 4.25 }, + { "label": "4,0", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.25 }, { "label": "4,2", "matrix": [4, 2], "x": 2.25, "y": 4.25 }, { "label": "4,3", "matrix": [4, 3], "x": 3.25, "y": 4.25 }, { "label": "4,4", "matrix": [4, 4], "x": 4.25, "y": 4.25 }, @@ -411,14 +411,14 @@ { "label": "4,12", "matrix": [4, 12], "x": 12.25, "y": 4.25 }, { "label": "4,13", "matrix": [4, 13], "w": 1.75, "x": 13.25, "y": 4.25 }, { "label": "5,14", "matrix": [5, 14], "x": 16.25, "y": 4.25 }, - { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 }, + { "label": "5,0", "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 }, { "label": "5,1", "matrix": [5, 1], "x": 1.5, "y": 5.25 }, { "label": "5,2", "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 }, - { "label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4.0, "y": 5.25 }, + { "label": "5,4", "matrix": [5, 4], "w": 1.5, "x": 4, "y": 5.25 }, { "label": "5,6", "matrix": [5, 6], "w": 2.5, "x": 5.5, "y": 5.25 }, - { "label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8.0, "y": 5.25 }, + { "label": "5,7", "matrix": [5, 7], "w": 1.5, "x": 8, "y": 5.25 }, { "label": "5,8", "matrix": [5, 8], "w": 1.5, "x": 9.5, "y": 5.25 }, - { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11.0, "y": 5.25 }, + { "label": "5,9", "matrix": [5, 9], "w": 1.5, "x": 11, "y": 5.25 }, { "label": "5,10", "matrix": [5, 10], "x": 12.5, "y": 5.25 }, { "label": "5,11", "matrix": [5, 11], "w": 1.5, "x": 13.5, "y": 5.25 }, { "label": "5,12", "matrix": [5, 12], "x": 15.25, "y": 5.25 }, |