diff options
Diffstat (limited to 'keyboards/converter')
75 files changed, 2932 insertions, 4009 deletions
diff --git a/keyboards/converter/a1200/a1200.c b/keyboards/converter/a1200/a1200.c deleted file mode 100644 index 5e7e404287..0000000000 --- a/keyboards/converter/a1200/a1200.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 8bits4ever - * - * 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 "a1200.h" diff --git a/keyboards/converter/a1200/a1200.h b/keyboards/converter/a1200/a1200.h deleted file mode 100644 index 3f7defb244..0000000000 --- a/keyboards/converter/a1200/a1200.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2021 8bits4ever - * - * 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 - -#define _x_ KC_NO - -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * The first section contains "names" for physical keys of the keyboard - * and defines their position on the board. - * The second section defines position of the keys on the switch matrix - * (where COLUMNS and ROWS crosses). */ - -#define LAYOUT( \ - K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, \ - \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N,K4O, K4P, K4Q, K4R, K4S, K4T, K4U, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3R, K3S, K3T, K3U, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K2O, K2P, K2Q, K2R, K2S, K2T, \ - K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K0F, K0G, K0H, K1O, K1P, K1Q, K1R, \ - K0A, K0B, K0C, K0D, K0E, K0I, K0J \ -) \ -{ \ -/* "Q" */ { K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K2O, K0F, K1A }, \ -/* "A" */ { K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K4P, K0H, K0B }, \ -/* "Z" */ { K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K4O, K0C, K4O, K0G, K0A }, \ -/* PAD */ { K4U, K2T, K3T, K2S, K1Q, K0J, K3S, K2R, K1P, K1R, K3R, K2Q, K1O, K0I, K3U, K1A }, \ -/* "1" */ { K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K2P, K2A }, \ -/* 05 */ { _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, K1M }, \ -/* FN */ { K5A, K4R, K5B, K5C, K5D, K5E, K5F, K4S, K5G, K4T, K5H, K5I, K5J, K5K, K4Q, K0D }, \ -/* 07 */ { _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, K0E }, \ -} -/* A(15) B(16) C(17) D(18) E(19) F(20) G(21) H(22) I(23) J(24) K(25) L(26) M(27) N(28) O(29) P(30) */ diff --git a/keyboards/converter/a1200/info.json b/keyboards/converter/a1200/info.json index 1b46444ba8..6f11b01e5c 100644 --- a/keyboards/converter/a1200/info.json +++ b/keyboards/converter/a1200/info.json @@ -1,109 +1,120 @@ { - "maintainer": "8bits4ever", + "maintainer": "8bits4ever", "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":2, "y":0}, - {"label":"F2", "x":3, "y":0}, - {"label":"F3", "x":4, "y":0}, - {"label":"F4", "x":5, "y":0}, - {"label":"F5", "x":6, "y":0}, - {"label":"F6", "x":8, "y":0}, - {"label":"F7", "x":9, "y":0}, - {"label":"F8", "x":10, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - - {"label":"~", "x":0, "y":1.5}, - {"label":"!", "x":1, "y":1.5}, - {"label":"@", "x":2, "y":1.5}, - {"label":"#", "x":3, "y":1.5}, - {"label":"$", "x":4, "y":1.5}, - {"label":"%", "x":5, "y":1.5}, - {"label":"^", "x":6, "y":1.5}, - {"label":"&", "x":7, "y":1.5}, - {"label":"*", "x":8, "y":1.5}, - {"label":"(", "x":9, "y":1.5}, - {"label":")", "x":10, "y":1.5}, - {"label":"_", "x":11, "y":1.5}, - {"label":"+", "x":12, "y":1.5}, - {"label":"`", "x":13, "y":1.5}, - {"label":"Backspace", "x":14, "y":1.5}, - {"label":"Del", "x":15.25, "y":1.5, "w":1.5}, - {"label":"Help", "x":16.75, "y":1.5, "w":1.5}, - {"label":"Num Lock", "x":18.5, "y":1.5}, - {"label":"/", "x":19.5, "y":1.5}, - {"label":"*", "x":20.5, "y":1.5}, - {"label":"-", "x":21.5, "y":1.5}, - - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"{", "x":11.5, "y":2.5}, - {"label":"}", "x":12.5, "y":2.5}, - {"label":"7", "x":18.5, "y":2.5}, - {"label":"8", "x":19.5, "y":2.5}, - {"label":"9", "x":20.5, "y":2.5}, - {"label":"+", "x":21.5, "y":2.5}, - - {"label":"CTRL", "x":0, "y":3.5}, - {"label":"Caps Lock", "x":1, "y":3.5}, - {"label":"A", "x":2, "y":3.5}, - {"label":"S", "x":3, "y":3.5}, - {"label":"D", "x":4, "y":3.5}, - {"label":"F", "x":5, "y":3.5}, - {"label":"G", "x":6, "y":3.5}, - {"label":"H", "x":7, "y":3.5}, - {"label":"J", "x":8, "y":3.5}, - {"label":"K", "x":9, "y":3.5}, - {"label":"L", "x":10, "y":3.5}, - {"label":":", "x":11, "y":3.5}, - {"label":"\"", "x":12, "y":3.5}, - {"label":"~", "x":13, "y":3.5}, - {"label":"Enter", "x":14, "y":2.5, "w":1, "h":2}, - {"label":"\u2191", "x":16.25, "y":3.5}, - {"label":"4", "x":18.5, "y":3.5}, - {"label":"5", "x":19.5, "y":3.5}, - {"label":"6", "x":20.5, "y":3.5}, - {"label":"+", "x":21.5, "y":3.5}, - - {"label":"Shift", "x":0, "y":4.5, "w":1.25}, - {"label":"|", "x":1.25, "y":4.5}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":"<", "x":9.25, "y":4.5}, - {"label":">", "x":10.25, "y":4.5}, - {"label":"?", "x":11.25, "y":4.5}, - {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, - {"label":"\u2190", "x":15.25, "y":4.5}, - {"label":"\u2193", "x":16.25, "y":4.5}, - {"label":"\u2192", "x":17.25, "y":4.5}, - {"label":"1", "x":18.5, "y":4.5}, - {"label":"2", "x":19.5, "y":4.5}, - {"label":"3", "x":20.5, "y":4.5}, - {"label":"Enter", "x":21.5, "y":4.5, "h":2}, - - {"label":"Alt", "x":1, "y":5.5, "w":1.5}, - {"label":"Amiga", "x":2.5, "y":5.5, "w":1.5}, - {"label":"Space", "x":4, "y":5.5, "w":7}, - {"label":"Amiga", "x":11, "y":5.5, "w":1.5}, - {"label":"Alt", "x":12.5, "y":5.5, "w":1.5}, - {"label":"0", "x":18.5, "y":5.5, "w":2}, - {"label":".", "x":20.5, "y":5.5}] + {"matrix": [6, 0], "x": 0, "y": 0}, + + {"matrix": [6, 2], "x": 2, "y": 0}, + {"matrix": [6, 3], "x": 3, "y": 0}, + {"matrix": [6, 4], "x": 4, "y": 0}, + {"matrix": [6, 5], "x": 5, "y": 0}, + {"matrix": [6, 6], "x": 6, "y": 0}, + + {"matrix": [6, 8], "x": 8, "y": 0}, + {"matrix": [6, 10], "x": 9, "y": 0}, + {"matrix": [6, 11], "x": 10, "y": 0}, + {"matrix": [6, 12], "x": 11, "y": 0}, + {"matrix": [6, 13], "x": 12, "y": 0}, + + {"matrix": [4, 0], "x": 0, "y": 1.5}, + {"matrix": [4, 1], "x": 1, "y": 1.5}, + {"matrix": [4, 2], "x": 2, "y": 1.5}, + {"matrix": [4, 3], "x": 3, "y": 1.5}, + {"matrix": [4, 4], "x": 4, "y": 1.5}, + {"matrix": [4, 5], "x": 5, "y": 1.5}, + {"matrix": [4, 6], "x": 6, "y": 1.5}, + {"matrix": [4, 7], "x": 7, "y": 1.5}, + {"matrix": [4, 8], "x": 8, "y": 1.5}, + {"matrix": [4, 9], "x": 9, "y": 1.5}, + {"matrix": [4, 10], "x": 10, "y": 1.5}, + {"matrix": [4, 11], "x": 11, "y": 1.5}, + {"matrix": [4, 12], "x": 12, "y": 1.5}, + {"matrix": [4, 13], "x": 13, "y": 1.5}, + {"matrix": [2, 11], "x": 14, "y": 1.5}, + + {"matrix": [1, 13], "x": 15.25, "y": 1.5, "w": 1.5}, + {"matrix": [6, 14], "x": 16.75, "y": 1.5, "w": 1.5}, + + {"matrix": [6, 1], "x": 18.5, "y": 1.5}, + {"matrix": [6, 7], "x": 19.5, "y": 1.5}, + {"matrix": [6, 9], "x": 20.5, "y": 1.5}, + {"matrix": [3, 0], "x": 21.5, "y": 1.5}, + + {"matrix": [0, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 2.5}, + {"matrix": [0, 2], "x": 2.5, "y": 2.5}, + {"matrix": [0, 3], "x": 3.5, "y": 2.5}, + {"matrix": [0, 4], "x": 4.5, "y": 2.5}, + {"matrix": [0, 5], "x": 5.5, "y": 2.5}, + {"matrix": [0, 6], "x": 6.5, "y": 2.5}, + {"matrix": [0, 7], "x": 7.5, "y": 2.5}, + {"matrix": [0, 8], "x": 8.5, "y": 2.5}, + {"matrix": [0, 9], "x": 9.5, "y": 2.5}, + {"matrix": [0, 10], "x": 10.5, "y": 2.5}, + {"matrix": [0, 11], "x": 11.5, "y": 2.5}, + {"matrix": [0, 12], "x": 12.5, "y": 2.5}, + + {"matrix": [3, 10], "x": 18.5, "y": 2.5}, + {"matrix": [3, 6], "x": 19.5, "y": 2.5}, + {"matrix": [3, 2], "x": 20.5, "y": 2.5}, + {"matrix": [3, 14], "x": 21.5, "y": 2.5}, + + {"matrix": [4, 15], "x": 0, "y": 3.5}, + {"matrix": [1, 0], "x": 1, "y": 3.5}, + {"matrix": [1, 1], "x": 2, "y": 3.5}, + {"matrix": [1, 2], "x": 3, "y": 3.5}, + {"matrix": [1, 3], "x": 4, "y": 3.5}, + {"matrix": [1, 4], "x": 5, "y": 3.5}, + {"matrix": [1, 5], "x": 6, "y": 3.5}, + {"matrix": [1, 6], "x": 7, "y": 3.5}, + {"matrix": [1, 7], "x": 8, "y": 3.5}, + {"matrix": [1, 8], "x": 9, "y": 3.5}, + {"matrix": [1, 9], "x": 10, "y": 3.5}, + {"matrix": [1, 10], "x": 11, "y": 3.5}, + {"matrix": [1, 11], "x": 12, "y": 3.5}, + {"matrix": [1, 12], "x": 13, "y": 3.5}, + {"matrix": [0, 13], "x": 14, "y": 2.5, "h": 2}, + + {"matrix": [4, 14], "x": 16.25, "y": 3.5}, + + {"matrix": [3, 11], "x": 18.5, "y": 3.5}, + {"matrix": [3, 7], "x": 19.5, "y": 3.5}, + {"matrix": [3, 3], "x": 20.5, "y": 3.5}, + {"matrix": [3, 1], "x": 21.5, "y": 3.5}, + + {"matrix": [3, 15], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [2, 0], "x": 1.25, "y": 4.5}, + {"matrix": [2, 1], "x": 2.25, "y": 4.5}, + {"matrix": [2, 2], "x": 3.25, "y": 4.5}, + {"matrix": [2, 3], "x": 4.25, "y": 4.5}, + {"matrix": [2, 4], "x": 5.25, "y": 4.5}, + {"matrix": [2, 5], "x": 6.25, "y": 4.5}, + {"matrix": [2, 6], "x": 7.25, "y": 4.5}, + {"matrix": [2, 7], "x": 8.25, "y": 4.5}, + {"matrix": [2, 8], "x": 9.25, "y": 4.5}, + {"matrix": [2, 9], "x": 10.25, "y": 4.5}, + {"matrix": [2, 10], "x": 11.25, "y": 4.5}, + {"matrix": [5, 15], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [0, 14], "x": 15.25, "y": 4.5}, + {"matrix": [2, 14], "x": 16.25, "y": 4.5}, + {"matrix": [1, 14], "x": 17.25, "y": 4.5}, + + {"matrix": [3, 12], "x": 18.5, "y": 4.5}, + {"matrix": [3, 8], "x": 19.5, "y": 4.5}, + {"matrix": [3, 4], "x": 20.5, "y": 4.5}, + {"matrix": [3, 9], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [2, 15], "x": 1, "y": 5.5, "w": 1.5}, + {"matrix": [1, 15], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [2, 12], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [6, 15], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [7, 15], "x": 12.5, "y": 5.5, "w": 1.5}, + + {"matrix": [3, 13], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [3, 5], "x": 20.5, "y": 5.5} + ] } } } diff --git a/keyboards/converter/a1200/miss1200/config.h b/keyboards/converter/a1200/miss1200/config.h deleted file mode 100644 index 07e8b9ac93..0000000000 --- a/keyboards/converter/a1200/miss1200/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2021 8bits4ever - -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 - - -/* - * 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 { F7, F6, F5, F4, F1, F0, B1, B3 } -#define MATRIX_COL_PINS { D0, D1, C7, D6, B7, B6, B5, B4, E6, D7, C6, D4, B2, D5, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/converter/a1200/miss1200/info.json b/keyboards/converter/a1200/miss1200/info.json index 326d73ec83..74d569b8d9 100644 --- a/keyboards/converter/a1200/miss1200/info.json +++ b/keyboards/converter/a1200/miss1200/info.json @@ -6,6 +6,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "C7", "D6", "B7", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "B2", "D5", "D3", "D2"], + "rows": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B3"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B0", "on_state": 0 diff --git a/keyboards/converter/a1200/mistress1200/config.h b/keyboards/converter/a1200/mistress1200/config.h index 6b2204ec43..21ba99e0b7 100644 --- a/keyboards/converter/a1200/mistress1200/config.h +++ b/keyboards/converter/a1200/mistress1200/config.h @@ -17,23 +17,6 @@ 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 { F7, F6, F5, F4, F1, F0, B1, B3 } -#define MATRIX_COL_PINS { D0, D1, C7, D6, B7, B6, B5, B4, E6, D7, C6, D4, B2, D5, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - #define TAPPING_TOGGLE 3 #undef LOCKING_SUPPORT_ENABLE diff --git a/keyboards/converter/a1200/mistress1200/info.json b/keyboards/converter/a1200/mistress1200/info.json index dfbe75c79c..c37bdadd61 100644 --- a/keyboards/converter/a1200/mistress1200/info.json +++ b/keyboards/converter/a1200/mistress1200/info.json @@ -6,6 +6,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "C7", "D6", "B7", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "B2", "D5", "D3", "D2"], + "rows": ["F7", "F6", "F5", "F4", "F1", "F0", "B1", "B3"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B0", "on_state": 0 diff --git a/keyboards/converter/a1200/teensy2pp/config.h b/keyboards/converter/a1200/teensy2pp/config.h deleted file mode 100644 index c859413d18..0000000000 --- a/keyboards/converter/a1200/teensy2pp/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2021 8bits4ever - -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 - - -/* - * 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 { F0, F1, F2, F3, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D2, D3, D4, D5, D6, D7, E0, E1, C0, C1, C2, C3, C4, C5, C6, C7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/converter/a1200/teensy2pp/info.json b/keyboards/converter/a1200/teensy2pp/info.json index a69aa38278..e4d0c09c0f 100644 --- a/keyboards/converter/a1200/teensy2pp/info.json +++ b/keyboards/converter/a1200/teensy2pp/info.json @@ -6,6 +6,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7"], + "rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B6" }, diff --git a/keyboards/converter/adb_usb/adb_usb.c b/keyboards/converter/adb_usb/adb_usb.c deleted file mode 100644 index 7026d62751..0000000000 --- a/keyboards/converter/adb_usb/adb_usb.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "adb_usb.h" -#include <avr/io.h> -#include "quantum.h" diff --git a/keyboards/converter/adb_usb/adb_usb.h b/keyboards/converter/adb_usb/adb_usb.h deleted file mode 100644 index ddbbd71564..0000000000 --- a/keyboards/converter/adb_usb/adb_usb.h +++ /dev/null @@ -1,108 +0,0 @@ -/* -Copyright 2011,2012,2013 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. - -Ported to QMK by Peter Roe <pete@13bit.me> -*/ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -/* M0115/M3501 Apple Extended Keyboard ANSI - * ,---. ,---------------. ,---------------. ,---------------. ,-----------. ,---. - * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |Pwr| - * `---' `---------------' `---------------' `---------------' `-----------' `---' - * ,-----------------------------------------------------------. ,-----------. ,---------------. - * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backspa| |Ins|Hom|PgU| |NmL| =| /| *| - * |-----------------------------------------------------------| |-----------| |---------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| | 7| 8| 9| -| - * |-----------------------------------------------------------| `-----------' |---------------| - * |CapsLo| A| S| D| F| G| H| J| K| L| ;| '|Return | | 4| 5| 6| +| - * |-----------------------------------------------------------| ,---. |---------------| - * |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3| | - * |-----------------------------------------------------------| ,-----------. |-----------|Ent| - * |Ctrl |Opt |Cmd | Space | |Opt |Ctrl | |Lef|Dow|Rig| | 0| .| | - * `-----------------------------------------------------------' `-----------' `---------------' - */ -#define LAYOUT_ext_ansi( \ - k35, k7A, k78, k63, k76, k60, k61, k62, k64, k65, k6D, k67, k6F, k69, k6B, k71, k7F, \ - k32, k12, k13, k14, k15, k17, k16, k1A, k1C, k19, k1D, k1B, k18, k33, k72, k73, k74, k47, k51, k4B, k43, \ - k30, k0C, k0D, k0E, k0F, k11, k10, k20, k22, k1F, k23, k21, k1E, k2A, k75, k77, k79, k59, k5B, k5C, k4E, \ - k39, k00, k01, k02, k03, k05, k04, k26, k28, k25, k29, k27, k24, k56, k57, k58, k45, \ - k38, k06, k07, k08, k09, k0B, k2D, k2E, k2B, k2F, k2C, k7B, k3E, k53, k54, k55,\ - k36, k3A, k37, k31, k7C, k7D, k3B, k3D, k3C, k52, k41, k4C \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { k08, k09, XXX, k0B, k0C, k0D, k0E, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17 }, \ - { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ - { k30, k31, k32, k33, XXX, k35, k36, k37 }, \ - { k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \ - { XXX, k41, XXX, k43, XXX, k45, XXX, k47 }, \ - { XXX, XXX, XXX, k4B, k4C, XXX, k4E, XXX }, \ - { XXX, k51, k52, k53, k54, k55, k56, k57 }, \ - { k58, k59, XXX, k5B, k5C, XXX, XXX, XXX }, \ - { k60, k61, k62, k63, k64, k65, XXX, k67 }, \ - { XXX, k69, XXX, k6B, XXX, k6D, XXX, k6F }, \ - { XXX, k71, k72, k73, k74, k75, k76, k77 }, \ - { k78, k79, k7A, k7B, k7C, k7D, XXX, k7F } \ -} - -/* M0116 Apple Standard Keyboard ANSI - * +-------+ - * | power | - * +-------+ - * +---+---+---+---+---+---+---+---+---+---+---+---+---+-----+ +---+---+---+---+ - * |esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | bks | |clr| = | / | * | - * +---------------------------------------------------------+ +---+---+---+---+ - * | tab | q | w | e | r | t | y | u | i | o | p | [ | ] | | | 7 | 8 | 9 | + | - * +-----------------------------------------------------+ | +---+---+---+---+ - * | ctrl | a | s | d | f | g | h | j | k | l | ; | ' |return| | 4 | 5 | 6 | - | - * +---------------------------------------------------------+ +---+---+---+---+ - * | shift | z | x | c | v | b | n | m | , | . | / | shift | | 1 | 2 | 3 | | - * +---------------------------------------------------------+ +-------+---|ent| - * |cap|opt|comnd| ` | | \ |lef|rig|dwn|up | | 0 | . | | - * +---------------------------------------------------------+ +-------+---+---+ - */ -#define LAYOUT_m0116_ansi( \ - k7F, \ - k35, k12, k13, k14, k15, k17, k16, k1A, k1C, k19, k1D, k1B, k18, k33, k47, k51, k4B, k43, \ - k30, k0C, k0D, k0E, k0F, k11, k10, k20, k22, k1F, k23, k21, k1E, k59, k5B, k5C, k45, \ - k36, k00, k01, k02, k03, k05, k04, k26, k28, k25, k29, k27, k24, k56, k57, k58, k4E, \ - k38, k06, k07, k08, k09, k0B, k2D, k2E, k2B, k2F, k2C, k7B, k53, k54, k55, \ - k39, k3A, k37, k32, k31, k2A, k3B, k3C, k3D, k3E, k52, k41, k4C \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { k08, k09, XXX, k0B, k0C, k0D, k0E, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17 }, \ - { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ - { k30, k31, k32, k33, XXX, k35, k36, k37 }, \ - { k38, k39, k3A, k3B, k3C, k3D, k3E, XXX }, \ - { XXX, k41, XXX, k43, XXX, k45, XXX, k47 }, \ - { XXX, XXX, XXX, k4B, k4C, XXX, k4E, XXX }, \ - { XXX, k51, k52, k53, k54, k55, k56, k57 }, \ - { k58, k59, XXX, k5B, k5C, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, k7B, XXX, XXX, XXX, k7F } \ -} diff --git a/keyboards/converter/adb_usb/info.json b/keyboards/converter/adb_usb/info.json index f64616e212..b553dfc10f 100644 --- a/keyboards/converter/adb_usb/info.json +++ b/keyboards/converter/adb_usb/info.json @@ -11,195 +11,224 @@ "layouts": { "LAYOUT_ext_ansi": { "layout": [ - {"label":"Escape", "x":0, "y":0}, - {"label":"F1", "x":2, "y":0}, - {"label":"F2", "x":3, "y":0}, - {"label":"F3", "x":4, "y":0}, - {"label":"F4", "x":5, "y":0}, - {"label":"F5", "x":6.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - {"label":"F11", "x":13, "y":0}, - {"label":"F12", "x":14, "y":0}, - {"label":"Print Screen", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - {"label":"Eject", "x":21.5, "y":0}, - {"label":"`", "x":0, "y":2}, - {"label":"1", "x":1, "y":2}, - {"label":"2", "x":2, "y":2}, - {"label":"3", "x":3, "y":2}, - {"label":"4", "x":4, "y":2}, - {"label":"5", "x":5, "y":2}, - {"label":"6", "x":6, "y":2}, - {"label":"7", "x":7, "y":2}, - {"label":"8", "x":8, "y":2}, - {"label":"9", "x":9, "y":2}, - {"label":"0", "x":10, "y":2}, - {"label":"-", "x":11, "y":2}, - {"label":"=", "x":12, "y":2}, - {"label":"Backspace", "x":13, "y":2, "w":2}, - {"label":"Insert", "x":15.25, "y":2}, - {"label":"Home", "x":16.25, "y":2}, - {"label":"Page Up", "x":17.25, "y":2}, - {"label":"Num Lock", "x":18.5, "y":2}, - {"label":"Num =", "x":19.5, "y":2}, - {"label":"Num /", "x":20.5, "y":2}, - {"label":"Num *", "x":21.5, "y":2}, - {"label":"Tab", "x":0, "y":3, "w":1.5}, - {"label":"Q", "x":1.5, "y":3}, - {"label":"W", "x":2.5, "y":3}, - {"label":"E", "x":3.5, "y":3}, - {"label":"R", "x":4.5, "y":3}, - {"label":"T", "x":5.5, "y":3}, - {"label":"Y", "x":6.5, "y":3}, - {"label":"U", "x":7.5, "y":3}, - {"label":"I", "x":8.5, "y":3}, - {"label":"O", "x":9.5, "y":3}, - {"label":"P", "x":10.5, "y":3}, - {"label":"[", "x":11.5, "y":3}, - {"label":"]", "x":12.5, "y":3}, - {"label":"\\", "x":13.5, "y":3, "w":1.5}, - {"label":"Delete", "x":15.25, "y":3}, - {"label":"End", "x":16.25, "y":3}, - {"label":"Page Down", "x":17.25, "y":3}, - {"label":"Num 7", "x":18.5, "y":3}, - {"label":"Num 8", "x":19.5, "y":3}, - {"label":"Num 9", "x":20.5, "y":3}, - {"label":"Num -", "x":21.5, "y":3}, - {"label":"Lcap", "x":0, "y":4, "w":1.75}, - {"label":"A", "x":1.75, "y":4}, - {"label":"S", "x":2.75, "y":4}, - {"label":"D", "x":3.75, "y":4}, - {"label":"F", "x":4.75, "y":4}, - {"label":"G", "x":5.75, "y":4}, - {"label":"H", "x":6.75, "y":4}, - {"label":"J", "x":7.75, "y":4}, - {"label":"K", "x":8.75, "y":4}, - {"label":"L", "x":9.75, "y":4}, - {"label":";", "x":10.75, "y":4}, - {"label":"\"", "x":11.75, "y":4}, - {"label":"Enter", "x":12.75, "y":4, "w":2.25}, - {"label":"Num 4", "x":18.5, "y":4}, - {"label":"Num 5", "x":19.5, "y":4}, - {"label":"Num 6", "x":20.5, "y":4}, - {"label":"Num +", "x":21.5, "y":4}, - {"label":"Shift", "x":0, "y":5, "w":2.25}, - {"label":"Z", "x":2.25, "y":5}, - {"label":"X", "x":3.25, "y":5}, - {"label":"C", "x":4.25, "y":5}, - {"label":"V", "x":5.25, "y":5}, - {"label":"B", "x":6.25, "y":5}, - {"label":"N", "x":7.25, "y":5}, - {"label":"M", "x":8.25, "y":5}, - {"label":",", "x":9.25, "y":5}, - {"label":".", "x":10.25, "y":5}, - {"label":"/", "x":11.25, "y":5}, - {"label":"Shift", "x":12.25, "y":5, "w":2.75}, - {"label":"Up", "x":16.25, "y":5}, - {"label":"Num 1", "x":18.5, "y":5}, - {"label":"Num 2", "x":19.5, "y":5}, - {"label":"Num 3", "x":20.5, "y":5}, - {"label":"Ctrl", "x":0, "y":6, "w":1.5}, - {"label":"Alt", "x":1.5, "y":6, "w":1.25}, - {"label":"Command", "x":2.75, "y":6, "w":1.5}, - {"label":"Space", "x":4.25, "y":6, "w":6.5}, - {"label":"Alt", "x":12.25, "y":6, "w":1.25}, - {"label":"Ctrl", "x":13.5, "y":6, "w":1.5}, - {"label":"Left", "x":15.25, "y":6}, - {"label":"Down", "x":16.25, "y":6}, - {"label":"Right", "x":17.25, "y":6}, - {"label":"Num 0", "x":18.5, "y":6, "w":2}, - {"label":"Num .", "x":20.5, "y":6}, - {"label":"Num Enter", "x":21.5, "y":5, "h":2} + {"matrix": [6, 5], "x": 0, "y": 0}, + + {"matrix": [15, 2], "x": 2, "y": 0}, + {"matrix": [15, 0], "x": 3, "y": 0}, + {"matrix": [12, 3], "x": 4, "y": 0}, + {"matrix": [14, 6], "x": 5, "y": 0}, + + {"matrix": [12, 0], "x": 6.5, "y": 0}, + {"matrix": [12, 1], "x": 7.5, "y": 0}, + {"matrix": [12, 2], "x": 8.5, "y": 0}, + {"matrix": [12, 4], "x": 9.5, "y": 0}, + + {"matrix": [12, 5], "x": 11, "y": 0}, + {"matrix": [13, 5], "x": 12, "y": 0}, + {"matrix": [12, 7], "x": 13, "y": 0}, + {"matrix": [13, 7], "x": 14, "y": 0}, + + {"matrix": [13, 1], "x": 15.25, "y": 0}, + {"matrix": [13, 3], "x": 16.25, "y": 0}, + {"matrix": [14, 1], "x": 17.25, "y": 0}, + + {"matrix": [15, 7], "x": 21.5, "y": 0}, + + {"matrix": [6, 2], "x": 0, "y": 2}, + {"matrix": [2, 2], "x": 1, "y": 2}, + {"matrix": [2, 3], "x": 2, "y": 2}, + {"matrix": [2, 4], "x": 3, "y": 2}, + {"matrix": [2, 5], "x": 4, "y": 2}, + {"matrix": [2, 7], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [3, 2], "x": 7, "y": 2}, + {"matrix": [3, 4], "x": 8, "y": 2}, + {"matrix": [3, 1], "x": 9, "y": 2}, + {"matrix": [3, 5], "x": 10, "y": 2}, + {"matrix": [3, 3], "x": 11, "y": 2}, + {"matrix": [3, 0], "x": 12, "y": 2}, + {"matrix": [6, 3], "x": 13, "y": 2, "w": 2}, + + {"matrix": [14, 2], "x": 15.25, "y": 2}, + {"matrix": [14, 3], "x": 16.25, "y": 2}, + {"matrix": [14, 4], "x": 17.25, "y": 2}, + + {"matrix": [8, 7], "x": 18.5, "y": 2}, + {"matrix": [10, 1], "x": 19.5, "y": 2}, + {"matrix": [9, 3], "x": 20.5, "y": 2}, + {"matrix": [8, 3], "x": 21.5, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [1, 4], "x": 1.5, "y": 3}, + {"matrix": [1, 5], "x": 2.5, "y": 3}, + {"matrix": [1, 6], "x": 3.5, "y": 3}, + {"matrix": [1, 7], "x": 4.5, "y": 3}, + {"matrix": [2, 1], "x": 5.5, "y": 3}, + {"matrix": [2, 0], "x": 6.5, "y": 3}, + {"matrix": [4, 0], "x": 7.5, "y": 3}, + {"matrix": [4, 2], "x": 8.5, "y": 3}, + {"matrix": [3, 7], "x": 9.5, "y": 3}, + {"matrix": [4, 3], "x": 10.5, "y": 3}, + {"matrix": [4, 1], "x": 11.5, "y": 3}, + {"matrix": [3, 6], "x": 12.5, "y": 3}, + {"matrix": [5, 2], "x": 13.5, "y": 3, "w": 1.5}, + + {"matrix": [14, 5], "x": 15.25, "y": 3}, + {"matrix": [14, 7], "x": 16.25, "y": 3}, + {"matrix": [15, 1], "x": 17.25, "y": 3}, + + {"matrix": [11, 1], "x": 18.5, "y": 3}, + {"matrix": [11, 3], "x": 19.5, "y": 3}, + {"matrix": [11, 4], "x": 20.5, "y": 3}, + {"matrix": [9, 6], "x": 21.5, "y": 3}, + + {"matrix": [7, 1], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [0, 0], "x": 1.75, "y": 4}, + {"matrix": [0, 1], "x": 2.75, "y": 4}, + {"matrix": [0, 2], "x": 3.75, "y": 4}, + {"matrix": [0, 3], "x": 4.75, "y": 4}, + {"matrix": [0, 5], "x": 5.75, "y": 4}, + {"matrix": [0, 4], "x": 6.75, "y": 4}, + {"matrix": [4, 6], "x": 7.75, "y": 4}, + {"matrix": [5, 0], "x": 8.75, "y": 4}, + {"matrix": [4, 5], "x": 9.75, "y": 4}, + {"matrix": [5, 1], "x": 10.75, "y": 4}, + {"matrix": [4, 7], "x": 11.75, "y": 4}, + {"matrix": [4, 4], "x": 12.75, "y": 4, "w": 2.25}, + + {"matrix": [10, 6], "x": 18.5, "y": 4}, + {"matrix": [10, 7], "x": 19.5, "y": 4}, + {"matrix": [11, 0], "x": 20.5, "y": 4}, + {"matrix": [8, 5], "x": 21.5, "y": 4}, + + {"matrix": [7, 0], "x": 0, "y": 5, "w": 2.25}, + {"matrix": [0, 6], "x": 2.25, "y": 5}, + {"matrix": [0, 7], "x": 3.25, "y": 5}, + {"matrix": [1, 0], "x": 4.25, "y": 5}, + {"matrix": [1, 1], "x": 5.25, "y": 5}, + {"matrix": [1, 3], "x": 6.25, "y": 5}, + {"matrix": [5, 5], "x": 7.25, "y": 5}, + {"matrix": [5, 6], "x": 8.25, "y": 5}, + {"matrix": [5, 3], "x": 9.25, "y": 5}, + {"matrix": [5, 7], "x": 10.25, "y": 5}, + {"matrix": [5, 4], "x": 11.25, "y": 5}, + {"matrix": [15, 3], "x": 12.25, "y": 5, "w": 2.75}, + + {"matrix": [7, 6], "x": 16.25, "y": 5}, + + {"matrix": [10, 3], "x": 18.5, "y": 5}, + {"matrix": [10, 4], "x": 19.5, "y": 5}, + {"matrix": [10, 5], "x": 20.5, "y": 5}, + + {"matrix": [6, 6], "x": 0, "y": 6, "w": 1.5}, + {"matrix": [7, 2], "x": 1.5, "y": 6, "w": 1.25}, + {"matrix": [6, 7], "x": 2.75, "y": 6, "w": 1.5}, + {"matrix": [6, 1], "x": 4.25, "y": 6, "w": 6.5}, + {"matrix": [15, 4], "x": 12.25, "y": 6, "w": 1.25}, + {"matrix": [15, 5], "x": 13.5, "y": 6, "w": 1.5}, + + {"matrix": [7, 3], "x": 15.25, "y": 6}, + {"matrix": [7, 5], "x": 16.25, "y": 6}, + {"matrix": [7, 4], "x": 17.25, "y": 6}, + + {"matrix": [10, 2], "x": 18.5, "y": 6, "w": 2}, + {"matrix": [8, 1], "x": 20.5, "y": 6}, + {"matrix": [9, 4], "x": 21.5, "y": 5, "h": 2} ] }, "LAYOUT_m0116_ansi": { "layout": [ - {"label":"Power", "x":5, "y":0, "w":2}, - {"label":"Esc", "x":0, "y":1.25}, - {"label":"1", "x":1, "y":1.25}, - {"label":"2", "x":2, "y":1.25}, - {"label":"3", "x":3, "y":1.25}, - {"label":"4", "x":4, "y":1.25}, - {"label":"5", "x":5, "y":1.25}, - {"label":"6", "x":6, "y":1.25}, - {"label":"7", "x":7, "y":1.25}, - {"label":"8", "x":8, "y":1.25}, - {"label":"9", "x":9, "y":1.25}, - {"label":"0", "x":10, "y":1.25}, - {"label":"-", "x":11, "y":1.25}, - {"label":"=", "x":12, "y":1.25}, - {"label":"Delete", "x":13, "y":1.25, "w":1.5}, - {"label":"Clear", "x":15.5, "y":1.25}, - {"label":"Num =", "x":16.5, "y":1.25}, - {"label":"Num /", "x":17.5, "y":1.25}, - {"label":"Num *", "x":18.5, "y":1.25}, - {"label":"Tab", "x":0, "y":2.25, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.25}, - {"label":"W", "x":2.5, "y":2.25}, - {"label":"E", "x":3.5, "y":2.25}, - {"label":"R", "x":4.5, "y":2.25}, - {"label":"T", "x":5.5, "y":2.25}, - {"label":"Y", "x":6.5, "y":2.25}, - {"label":"U", "x":7.5, "y":2.25}, - {"label":"I", "x":8.5, "y":2.25}, - {"label":"O", "x":9.5, "y":2.25}, - {"label":"P", "x":10.5, "y":2.25}, - {"label":"[", "x":11.5, "y":2.25}, - {"label":"]", "x":12.5, "y":2.25}, - {"label":"Num 7", "x":15.5, "y":2.25}, - {"label":"Num 8", "x":16.5, "y":2.25}, - {"label":"Num 9", "x":17.5, "y":2.25}, - {"label":"Num +", "x":18.5, "y":2.25}, - {"label":"Ctrl", "x":0, "y":3.25, "w":1.75}, - {"label":"A", "x":1.75, "y":3.25}, - {"label":"S", "x":2.75, "y":3.25}, - {"label":"D", "x":3.75, "y":3.25}, - {"label":"F", "x":4.75, "y":3.25}, - {"label":"G", "x":5.75, "y":3.25}, - {"label":"H", "x":6.75, "y":3.25}, - {"label":"J", "x":7.75, "y":3.25}, - {"label":"K", "x":8.75, "y":3.25}, - {"label":"L", "x":9.75, "y":3.25}, - {"label":";", "x":10.75, "y":3.25}, - {"label":"'", "x":11.75, "y":3.25}, - {"label":"Return", "x":12.75, "y":3.25, "w":1.75}, - {"label":"Num 4", "x":15.5, "y":3.25}, - {"label":"Num 5", "x":16.5, "y":3.25}, - {"label":"Num 6", "x":17.5, "y":3.25}, - {"label":"Num -", "x":18.5, "y":3.25}, - {"label":"Shift", "x":0, "y":4.25, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.25}, - {"label":"X", "x":3.25, "y":4.25}, - {"label":"C", "x":4.25, "y":4.25}, - {"label":"V", "x":5.25, "y":4.25}, - {"label":"B", "x":6.25, "y":4.25}, - {"label":"N", "x":7.25, "y":4.25}, - {"label":"M", "x":8.25, "y":4.25}, - {"label":",", "x":9.25, "y":4.25}, - {"label":".", "x":10.25, "y":4.25}, - {"label":"/", "x":11.25, "y":4.25}, - {"label":"Shift", "x":12.25, "y":4.25, "w":2.25}, - {"label":"Num 1", "x":15.5, "y":4.25}, - {"label":"Num 2", "x":16.5, "y":4.25}, - {"label":"Num 3", "x":17.5, "y":4.25}, - {"label":"Caps Lock", "x":0, "y":5.25}, - {"label":"Option", "x":1, "y":5.25}, - {"label":"Command", "x":2, "y":5.25, "w":1.75}, - {"label":"`", "x":3.75, "y":5.25}, - {"label":"Space", "x":4.75, "y":5.25, "w":4.75}, - {"label":"\\", "x":9.5, "y":5.25}, - {"label":"Left", "x":10.5, "y":5.25}, - {"label":"Right", "x":11.5, "y":5.25}, - {"label":"Down", "x":12.5, "y":5.25}, - {"label":"Up", "x":13.5, "y":5.25}, - {"label":"Num 0", "x":15.5, "y":5.25, "w":2}, - {"label":"Num .", "x":17.5, "y":5.25}, - {"label":"Num Enter", "x":18.5, "y":4.25, "h":2} + {"matrix": [15, 7], "x": 5, "y": 0, "w": 2}, + + {"matrix": [6, 5], "x": 0, "y": 1.25}, + {"matrix": [2, 2], "x": 1, "y": 1.25}, + {"matrix": [2, 3], "x": 2, "y": 1.25}, + {"matrix": [2, 4], "x": 3, "y": 1.25}, + {"matrix": [2, 5], "x": 4, "y": 1.25}, + {"matrix": [2, 7], "x": 5, "y": 1.25}, + {"matrix": [2, 6], "x": 6, "y": 1.25}, + {"matrix": [3, 2], "x": 7, "y": 1.25}, + {"matrix": [3, 4], "x": 8, "y": 1.25}, + {"matrix": [3, 1], "x": 9, "y": 1.25}, + {"matrix": [3, 5], "x": 10, "y": 1.25}, + {"matrix": [3, 3], "x": 11, "y": 1.25}, + {"matrix": [3, 0], "x": 12, "y": 1.25}, + {"matrix": [6, 3], "x": 13, "y": 1.25, "w": 1.5}, + + {"matrix": [8, 7], "x": 15.5, "y": 1.25}, + {"matrix": [10, 1], "x": 16.5, "y": 1.25}, + {"matrix": [9, 3], "x": 17.5, "y": 1.25}, + {"matrix": [8, 3], "x": 18.5, "y": 1.25}, + + {"matrix": [6, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [1, 4], "x": 1.5, "y": 2.25}, + {"matrix": [1, 5], "x": 2.5, "y": 2.25}, + {"matrix": [1, 6], "x": 3.5, "y": 2.25}, + {"matrix": [1, 7], "x": 4.5, "y": 2.25}, + {"matrix": [2, 1], "x": 5.5, "y": 2.25}, + {"matrix": [2, 0], "x": 6.5, "y": 2.25}, + {"matrix": [4, 0], "x": 7.5, "y": 2.25}, + {"matrix": [4, 2], "x": 8.5, "y": 2.25}, + {"matrix": [3, 7], "x": 9.5, "y": 2.25}, + {"matrix": [4, 3], "x": 10.5, "y": 2.25}, + {"matrix": [4, 1], "x": 11.5, "y": 2.25}, + {"matrix": [3, 6], "x": 12.5, "y": 2.25}, + + {"matrix": [11, 1], "x": 15.5, "y": 2.25}, + {"matrix": [11, 3], "x": 16.5, "y": 2.25}, + {"matrix": [11, 4], "x": 17.5, "y": 2.25}, + {"matrix": [8, 5], "x": 18.5, "y": 2.25}, + + {"matrix": [6, 6], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [0, 0], "x": 1.75, "y": 3.25}, + {"matrix": [0, 1], "x": 2.75, "y": 3.25}, + {"matrix": [0, 2], "x": 3.75, "y": 3.25}, + {"matrix": [0, 3], "x": 4.75, "y": 3.25}, + {"matrix": [0, 5], "x": 5.75, "y": 3.25}, + {"matrix": [0, 4], "x": 6.75, "y": 3.25}, + {"matrix": [4, 6], "x": 7.75, "y": 3.25}, + {"matrix": [5, 0], "x": 8.75, "y": 3.25}, + {"matrix": [4, 5], "x": 9.75, "y": 3.25}, + {"matrix": [5, 1], "x": 10.75, "y": 3.25}, + {"matrix": [4, 7], "x": 11.75, "y": 3.25}, + {"matrix": [4, 4], "x": 12.75, "y": 3.25, "w": 1.75}, + + {"matrix": [10, 6], "x": 15.5, "y": 3.25}, + {"matrix": [10, 7], "x": 16.5, "y": 3.25}, + {"matrix": [11, 0], "x": 17.5, "y": 3.25}, + {"matrix": [9, 6], "x": 18.5, "y": 3.25}, + + {"matrix": [7, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [0, 6], "x": 2.25, "y": 4.25}, + {"matrix": [0, 7], "x": 3.25, "y": 4.25}, + {"matrix": [1, 0], "x": 4.25, "y": 4.25}, + {"matrix": [1, 1], "x": 5.25, "y": 4.25}, + {"matrix": [1, 3], "x": 6.25, "y": 4.25}, + {"matrix": [5, 5], "x": 7.25, "y": 4.25}, + {"matrix": [5, 6], "x": 8.25, "y": 4.25}, + {"matrix": [5, 3], "x": 9.25, "y": 4.25}, + {"matrix": [5, 7], "x": 10.25, "y": 4.25}, + {"matrix": [5, 4], "x": 11.25, "y": 4.25}, + {"matrix": [15, 3], "x": 12.25, "y": 4.25, "w": 2.25}, + + {"matrix": [10, 3], "x": 15.5, "y": 4.25}, + {"matrix": [10, 4], "x": 16.5, "y": 4.25}, + {"matrix": [10, 5], "x": 17.5, "y": 4.25}, + + {"matrix": [7, 1], "x": 0, "y": 5.25}, + {"matrix": [7, 2], "x": 1, "y": 5.25}, + {"matrix": [6, 7], "x": 2, "y": 5.25, "w": 1.75}, + {"matrix": [6, 2], "x": 3.75, "y": 5.25}, + {"matrix": [6, 1], "x": 4.75, "y": 5.25, "w": 4.75}, + {"matrix": [5, 2], "x": 9.5, "y": 5.25}, + {"matrix": [7, 3], "x": 10.5, "y": 5.25}, + {"matrix": [7, 4], "x": 11.5, "y": 5.25}, + {"matrix": [7, 5], "x": 12.5, "y": 5.25}, + {"matrix": [7, 6], "x": 13.5, "y": 5.25}, + + {"matrix": [10, 2], "x": 15.5, "y": 5.25, "w": 2}, + {"matrix": [8, 1], "x": 17.5, "y": 5.25}, + {"matrix": [9, 4], "x": 18.5, "y": 4.25, "h": 2} ] } } diff --git a/keyboards/converter/hp_46010a/hp_46010a.c b/keyboards/converter/hp_46010a/hp_46010a.c deleted file mode 100644 index 915a220f91..0000000000 --- a/keyboards/converter/hp_46010a/hp_46010a.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "hp_46010a.h" -#include <avr/io.h> -#include "quantum.h"
\ No newline at end of file diff --git a/keyboards/converter/hp_46010a/hp_46010a.h b/keyboards/converter/hp_46010a/hp_46010a.h deleted file mode 100644 index fd5adfc639..0000000000 --- a/keyboards/converter/hp_46010a/hp_46010a.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -Copyright 2018 listofoptions <listofoptions@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include "quantum.h" - -/* ,---------. ,---------------------------------------------------------. ,---------. ,-------------------. - * | res|stop| | f1| f2| f3| f4|menu|user| f5| f6| f7| f8| |clrl|clrd| | | | | | - * `---------' `---------------------------------------------------------' `---------' `-------------------' - * ,------------------------------------------------------------------------..---------. ,-------------------. - * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| +| back||insl|dell| | *| /| +| -| - * |------------------------------------------------------------------------||---------| |-------------------| - * | tab| q| w| e| r| t| y| u| i| o| p| [| ]| \||insc|delc| | 7| 8| 9|pade| - * |------------------------------------------------------------------------||---------| |-------------------| - * |caps|ctrl| a| s| d| f| g| h| j| k| l| ;| '| retr|| cur|prev| | 4| 5| 6| ,| - * |------------------------------------------------------------------------------------ |-------------------| - * |dele|lshf | z| x| c| v| b| n| m| ,| .| /|rshf |sel | up|next| | 1| 2| 3| tab| - * |-------------------------------------------------------------------------|---------| |--------------- | - * |prnt| |lalt| space |ralt| |left|down|rght| | 0| .| | - * `-----------------------------------------------------------------------------------' `-------------------' - */ - -#define LAYOUT( \ - KEY_RES, KEY_STOP, KEY_F1, KEY_F2, KEY_F3, KEY_F4,KEY_MENU,KEY_USER, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_CLRL, KEY_CLRD, KEY_B1, KEY_B2, KEY_B3, KEY_B4, \ - KEY_GRAV, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0, KEY_MINU, KEY_PLUS, KEY_BACK, KEY_INSL, KEY_DELL, KEY_MULT, KEY_DIV, KEY_ADD, KEY_SUBT, \ - KEY_TAB, KEY_Q,KEY_W, KEY_E, KEY_R, KEY_T, KEY_Y, KEY_U, KEY_I, KEY_O, KEY_P, KEY_LBRA, KEY_RBRA, KEY_PIPE, KEY_INSC, KEY_DELC, KEY_P7, KEY_P8, KEY_P9, KEY_PADE, \ - KEY_CAPS, KEY_CTRL, KEY_A, KEY_S, KEY_D, KEY_F, KEY_G, KEY_H, KEY_J, KEY_K, KEY_L, KEY_SEMI, KEY_QUOT, KEY_RETR, KEY_CUR, KEY_PREV, KEY_P4, KEY_P5, KEY_P6, KEY_PCOM, \ - KEY_DELE, KEY_LSHF, KEY_Z, KEY_X, KEY_C, KEY_V, KEY_B, KEY_N, KEY_M, KEY_COMA, KEY_DOT, KEY_SLAS,KEY_RSHF, KEY_SEL, KEY_UP, KEY_NEXT, KEY_P1, KEY_P2, KEY_P3, KEY_PTAB, \ - KEY_PRNT, KEY_LALT, KEY_SPACE , KEY_RALT, KEY_LEFT, KEY_DOWN, KEY_RGHT, KEY_P0, KEY_PDOT \ -) { \ - {KEY_USER, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_CLRL, KEY_CLRD, KEY_MENU }, \ - {KEY_9, KEY_0, KEY_MINU, KEY_PLUS, KEY_BACK, KEY_INSL, KEY_DELL, KEY_8 }, \ - {KEY_O, KEY_P, KEY_LBRA, KEY_RBRA, KEY_PIPE, KEY_INSC, KEY_DELC, KEY_I }, \ - {KEY_K, KEY_L, KEY_SEMI, KEY_QUOT, KEY_RETR, KEY_CUR, KEY_PREV, KEY_J }, \ - {KEY_COMA, KEY_DOT, KEY_SLAS, KEY_1, KEY_SEL, KEY_UP, KEY_NEXT, KEY_M }, \ - {KEY_SPACE, KEY_LALT, KEY_RALT, KC_NO, KEY_LEFT, KEY_DOWN, KEY_RGHT, KC_NO }, \ - {KEY_F3, KEY_F2, KEY_F1, KEY_GRAV, KEY_CTRL, KEY_STOP, KEY_G, KEY_F4 }, \ - {KEY_6, KEY_5, KEY_4, KEY_3, KEY_CAPS, KEY_RSHF, KEY_LSHF, KEY_7 }, \ - {KEY_Y, KEY_T, KEY_R, KEY_E, KEY_W, KEY_Q, KEY_TAB, KEY_U }, \ - {KEY_RES, KEY_F, KEY_D, KEY_S, KEY_A, KC_NO, KEY_2, KEY_H }, \ - {KEY_P7, KEY_P4, KEY_P8, KEY_P5, KEY_P9, KEY_P6, KEY_PADE, KEY_PCOM }, \ - {KEY_MULT, KEY_P1, KEY_DIV, KEY_P2, KEY_PLUS, KEY_P3, KEY_MINU, KEY_PTAB }, \ - {KEY_B1, KEY_P0, KEY_B2, KC_NO, KEY_B3, KEY_PDOT, KEY_B4, KC_NO }, \ - {KEY_B, KEY_V, KEY_C, KEY_X, KEY_Z, KEY_PRNT, KEY_DELE, KEY_N }, \ -} diff --git a/keyboards/converter/hp_46010a/info.json b/keyboards/converter/hp_46010a/info.json index 8492d5f200..da29c72fac 100644 --- a/keyboards/converter/hp_46010a/info.json +++ b/keyboards/converter/hp_46010a/info.json @@ -13,113 +13,131 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Reset", "x":0, "y":0}, - {"label":"Stop", "x":1, "y":0}, - {"label":"F1", "x":2.5, "y":0, "w":1.25}, - {"label":"F2", "x":3.75, "y":0, "w":1.25}, - {"label":"F3", "x":5, "y":0, "w":1.25}, - {"label":"F4", "x":6.25, "y":0, "w":1.25}, - {"label":"Menu", "x":7.5, "y":0}, - {"label":"User", "x":8.5, "y":0}, - {"label":"F5", "x":9.5, "y":0, "w":1.25}, - {"label":"F6", "x":10.75, "y":0, "w":1.25}, - {"label":"F7", "x":12, "y":0, "w":1.25}, - {"label":"F8", "x":13.25, "y":0, "w":1.25}, - {"label":"Clear line", "x":15, "y":0}, - {"label":"Clear display", "x":16, "y":0}, - {"x":18, "y":0}, - {"x":19, "y":0}, - {"x":20, "y":0}, - {"x":21, "y":0}, - {"label":"`", "x":0, "y":2, "w":1.25}, - {"label":"1", "x":1.25, "y":2}, - {"label":"2", "x":2.25, "y":2}, - {"label":"3", "x":3.25, "y":2}, - {"label":"4", "x":4.25, "y":2}, - {"label":"5", "x":5.25, "y":2}, - {"label":"6", "x":6.25, "y":2}, - {"label":"7", "x":7.25, "y":2}, - {"label":"8", "x":8.25, "y":2}, - {"label":"9", "x":9.25, "y":2}, - {"label":"0", "x":10.25, "y":2}, - {"label":"-", "x":11.25, "y":2}, - {"label":"=", "x":12.25, "y":2}, - {"label":"Backspace", "x":13.25, "y":2, "w":1.5}, - {"label":"Insert line", "x":15, "y":2}, - {"label":"Delete line", "x":16, "y":2}, - {"label":"*", "x":18, "y":2}, - {"label":"/", "x":19, "y":2}, - {"label":"+", "x":20, "y":2}, - {"label":"-", "x":21, "y":2}, - {"label":"Tab", "x":0, "y":3, "w":1.75}, - {"label":"Q", "x":1.75, "y":3}, - {"label":"W", "x":2.75, "y":3}, - {"label":"E", "x":3.75, "y":3}, - {"label":"R", "x":4.75, "y":3}, - {"label":"T", "x":5.75, "y":3}, - {"label":"Y", "x":6.75, "y":3}, - {"label":"U", "x":7.75, "y":3}, - {"label":"I", "x":8.75, "y":3}, - {"label":"O", "x":9.75, "y":3}, - {"label":"P", "x":10.75, "y":3}, - {"label":"[", "x":11.75, "y":3}, - {"label":"]", "x":12.75, "y":3}, - {"label":"\\", "x":13.75, "y":3}, - {"label":"Insert char", "x":15, "y":3}, - {"label":"Delete char", "x":16, "y":3}, - {"label":"7", "x":18, "y":3}, - {"label":"8", "x":19, "y":3}, - {"label":"9", "x":20, "y":3}, - {"label":"Enter", "x":21, "y":3}, - {"label":"Caps Lock", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"A", "x":2, "y":4}, - {"label":"S", "x":3, "y":4}, - {"label":"D", "x":4, "y":4}, - {"label":"F", "x":5, "y":4}, - {"label":"G", "x":6, "y":4}, - {"label":"H", "x":7, "y":4}, - {"label":"J", "x":8, "y":4}, - {"label":"K", "x":9, "y":4}, - {"label":"L", "x":10, "y":4}, - {"label":";", "x":11, "y":4}, - {"label":"'", "x":12, "y":4}, - {"label":"Return", "x":13, "y":4, "w":1.75}, - {"label":"Cursor", "x":15, "y":4}, - {"label":"Prev", "x":16, "y":4}, - {"label":"4", "x":18, "y":4}, - {"label":"5", "x":19, "y":4}, - {"label":"6", "x":20, "y":4}, - {"label":",", "x":21, "y":4}, - {"label":"Del", "x":0, "y":5}, - {"label":"Shift", "x":1.25, "y":5, "w":1.25}, - {"label":"Z", "x":2.5, "y":5}, - {"label":"X", "x":3.5, "y":5}, - {"label":"C", "x":4.5, "y":5}, - {"label":"V", "x":5.5, "y":5}, - {"label":"B", "x":6.5, "y":5}, - {"label":"N", "x":7.5, "y":5}, - {"label":"M", "x":8.5, "y":5}, - {"label":",", "x":9.5, "y":5}, - {"label":".", "x":10.5, "y":5}, - {"label":"/", "x":11.5, "y":5}, - {"label":"Shift", "x":12.5, "y":5, "w":1.25}, - {"label":"Select", "x":14, "y":5}, - {"label":"Up", "x":15, "y":5}, - {"label":"Next", "x":16, "y":5}, - {"label":"1", "x":18, "y":5}, - {"label":"2", "x":19, "y":5}, - {"label":"3", "x":20, "y":5}, - {"label":"Tab", "x":21, "y":5, "h":2}, - {"label":"Win", "x":0, "y":6}, - {"label":"Extend Char", "x":2.5, "y":6}, - {"x":3.5, "y":6, "w":8}, - {"label":"Extend Char", "x":11.5, "y":6}, - {"label":"Left", "x":14, "y":6}, - {"label":"Down", "x":15, "y":6}, - {"label":"Right", "x":16, "y":6}, - {"label":"0", "x":18, "y":6, "w":2}, - {"label":".", "x":20, "y":6} + {"matrix": [9, 0], "x": 0, "y": 0}, + {"matrix": [6, 5], "x": 1, "y": 0}, + + {"matrix": [6, 2], "x": 2.5, "y": 0, "w": 1.25}, + {"matrix": [6, 1], "x": 3.75, "y": 0, "w": 1.25}, + {"matrix": [6, 0], "x": 5, "y": 0, "w": 1.25}, + {"matrix": [6, 7], "x": 6.25, "y": 0, "w": 1.25}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 0], "x": 8.5, "y": 0}, + {"matrix": [0, 1], "x": 9.5, "y": 0, "w": 1.25}, + {"matrix": [0, 2], "x": 10.75, "y": 0, "w": 1.25}, + {"matrix": [0, 3], "x": 12, "y": 0, "w": 1.25}, + {"matrix": [0, 4], "x": 13.25, "y": 0, "w": 1.25}, + + {"matrix": [0, 5], "x": 15, "y": 0}, + {"matrix": [0, 6], "x": 16, "y": 0}, + + {"matrix": [12, 0], "x": 18, "y": 0}, + {"matrix": [12, 2], "x": 19, "y": 0}, + {"matrix": [12, 4], "x": 20, "y": 0}, + {"matrix": [12, 6], "x": 21, "y": 0}, + + {"matrix": [6, 3], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [4, 3], "x": 1.25, "y": 2}, + {"matrix": [9, 6], "x": 2.25, "y": 2}, + {"matrix": [7, 3], "x": 3.25, "y": 2}, + {"matrix": [7, 2], "x": 4.25, "y": 2}, + {"matrix": [7, 1], "x": 5.25, "y": 2}, + {"matrix": [7, 0], "x": 6.25, "y": 2}, + {"matrix": [7, 7], "x": 7.25, "y": 2}, + {"matrix": [1, 7], "x": 8.25, "y": 2}, + {"matrix": [1, 0], "x": 9.25, "y": 2}, + {"matrix": [1, 1], "x": 10.25, "y": 2}, + {"matrix": [1, 2], "x": 11.25, "y": 2}, + {"matrix": [1, 3], "x": 12.25, "y": 2}, + {"matrix": [1, 4], "x": 13.25, "y": 2, "w": 1.5}, + + {"matrix": [1, 5], "x": 15, "y": 2}, + {"matrix": [1, 6], "x": 16, "y": 2}, + + {"matrix": [11, 0], "x": 18, "y": 2}, + {"matrix": [11, 2], "x": 19, "y": 2}, + {"matrix": [11, 4], "x": 20, "y": 2}, + {"matrix": [11, 6], "x": 21, "y": 2}, + + {"matrix": [8, 6], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [8, 5], "x": 1.75, "y": 3}, + {"matrix": [8, 4], "x": 2.75, "y": 3}, + {"matrix": [8, 3], "x": 3.75, "y": 3}, + {"matrix": [8, 2], "x": 4.75, "y": 3}, + {"matrix": [8, 1], "x": 5.75, "y": 3}, + {"matrix": [8, 0], "x": 6.75, "y": 3}, + {"matrix": [8, 7], "x": 7.75, "y": 3}, + {"matrix": [2, 7], "x": 8.75, "y": 3}, + {"matrix": [2, 0], "x": 9.75, "y": 3}, + {"matrix": [2, 1], "x": 10.75, "y": 3}, + {"matrix": [2, 2], "x": 11.75, "y": 3}, + {"matrix": [2, 3], "x": 12.75, "y": 3}, + {"matrix": [2, 4], "x": 13.75, "y": 3}, + + {"matrix": [2, 5], "x": 15, "y": 3}, + {"matrix": [2, 6], "x": 16, "y": 3}, + + {"matrix": [10, 0], "x": 18, "y": 3}, + {"matrix": [10, 2], "x": 19, "y": 3}, + {"matrix": [10, 4], "x": 20, "y": 3}, + {"matrix": [10, 6], "x": 21, "y": 3}, + + {"matrix": [7, 4], "x": 0, "y": 4}, + {"matrix": [6, 4], "x": 1, "y": 4}, + {"matrix": [9, 4], "x": 2, "y": 4}, + {"matrix": [9, 3], "x": 3, "y": 4}, + {"matrix": [9, 2], "x": 4, "y": 4}, + {"matrix": [9, 1], "x": 5, "y": 4}, + {"matrix": [6, 6], "x": 6, "y": 4}, + {"matrix": [9, 7], "x": 7, "y": 4}, + {"matrix": [3, 7], "x": 8, "y": 4}, + {"matrix": [3, 0], "x": 9, "y": 4}, + {"matrix": [3, 1], "x": 10, "y": 4}, + {"matrix": [3, 2], "x": 11, "y": 4}, + {"matrix": [3, 3], "x": 12, "y": 4}, + {"matrix": [3, 4], "x": 13, "y": 4, "w": 1.75}, + + {"matrix": [3, 5], "x": 15, "y": 4}, + {"matrix": [3, 6], "x": 16, "y": 4}, + + {"matrix": [10, 1], "x": 18, "y": 4}, + {"matrix": [10, 3], "x": 19, "y": 4}, + {"matrix": [10, 5], "x": 20, "y": 4}, + {"matrix": [10, 7], "x": 21, "y": 4}, + + {"matrix": [13, 6], "x": 0, "y": 5}, + {"matrix": [7, 6], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [13, 4], "x": 2.5, "y": 5}, + {"matrix": [13, 3], "x": 3.5, "y": 5}, + {"matrix": [13, 2], "x": 4.5, "y": 5}, + {"matrix": [13, 1], "x": 5.5, "y": 5}, + {"matrix": [13, 0], "x": 6.5, "y": 5}, + {"matrix": [13, 7], "x": 7.5, "y": 5}, + {"matrix": [4, 7], "x": 8.5, "y": 5}, + {"matrix": [4, 0], "x": 9.5, "y": 5}, + {"matrix": [4, 1], "x": 10.5, "y": 5}, + {"matrix": [4, 2], "x": 11.5, "y": 5}, + {"matrix": [7, 5], "x": 12.5, "y": 5, "w": 1.25}, + + {"matrix": [4, 4], "x": 14, "y": 5}, + {"matrix": [4, 5], "x": 15, "y": 5}, + {"matrix": [4, 6], "x": 16, "y": 5}, + + {"matrix": [11, 1], "x": 18, "y": 5}, + {"matrix": [11, 3], "x": 19, "y": 5}, + {"matrix": [11, 5], "x": 20, "y": 5}, + {"matrix": [11, 7], "x": 21, "y": 5, "h": 2}, + + {"matrix": [13, 5], "x": 0, "y": 6}, + {"matrix": [5, 1], "x": 2.5, "y": 6}, + {"matrix": [5, 0], "x": 3.5, "y": 6, "w": 8}, + {"matrix": [5, 2], "x": 11.5, "y": 6}, + + {"matrix": [5, 4], "x": 14, "y": 6}, + {"matrix": [5, 5], "x": 15, "y": 6}, + {"matrix": [5, 6], "x": 16, "y": 6}, + + {"matrix": [12, 1], "x": 18, "y": 6, "w": 2}, + {"matrix": [12, 5], "x": 20, "y": 6} ] } } diff --git a/keyboards/converter/ibm_terminal/ibm_terminal.c b/keyboards/converter/ibm_terminal/ibm_terminal.c deleted file mode 100644 index fd64a21ace..0000000000 --- a/keyboards/converter/ibm_terminal/ibm_terminal.c +++ /dev/null @@ -1 +0,0 @@ -#include "ibm_terminal.h" diff --git a/keyboards/converter/ibm_terminal/ibm_terminal.h b/keyboards/converter/ibm_terminal/ibm_terminal.h deleted file mode 100644 index ce50e5f437..0000000000 --- a/keyboards/converter/ibm_terminal/ibm_terminal.h +++ /dev/null @@ -1,81 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -void matrix_init_user(void); - -/* - * IBM Terminal keyboard 6110345(122keys)/1392595(102keys) - * http://geekhack.org/showthread.php?10737-What-Can-I-Do-With-a-Terminal-Model-M - * http://www.seasip.info/VintagePC/ibm_1391406.html - * - * Keymap array: - * 8 bytes - * +---------+ - * 0| | - * :| | 0x00-0x87 - * ;| | - * 17| | - * +---------+ - */ -#define LAYOUT( \ - k08, k10, k18, k20, k28, k30, k38, k40, k48, k50, k57, k5F, \ - k07, k0F, k17, k1F, k27, k2F, k37, k3F, k47, k4F, k56, k5E, \ -\ - k05, k06, k0E, k16, k1E, k26, k25, k2E, k36, k3D, k3E, k46, k45, k4E, k55, k5D, k66, k67, k6E, k6F, k76, k77, k7E, k84, \ - k04, k0C, k0D, k15, k1D, k24, k2D, k2C, k35, k3C, k43, k44, k4D, k54, k5B, k5C, k64, k65, k6D, k6C, k75, k7D, k7C, \ - k03, k0B, k14, k1C, k1B, k23, k2B, k34, k33, k3B, k42, k4B, k4C, k52, k53, k5A, k63, k6B, k73, k74, k7B, \ - k83, k0A, k12, k13, k1A, k22, k21, k2A, k32, k31, k3A, k41, k49, k4A, k51, k59, k61, k62, k6A, k69, k72, k7A, k79, \ - k01, k09, k11, k19, k29, k39, k58, k60, k68, k70, k71, k78 \ -) { \ - { XXX, k01, XXX, k03, k04, k05, k06, k07 }, \ - { k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17 }, \ - { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ - { k40, k41, k42, k43, k44, k45, k46, k47 }, \ - { k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ - { k50, k51, k52, k53, k54, k55, k56, k57 }, \ - { k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ - { k60, k61, k62, k63, k64, k65, k66, k67 }, \ - { k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 }, \ - { k78, k79, k7A, k7B, k7C, k7D, k7E, XXX }, \ - { XXX, XXX, XXX, k83, k84, XXX, XXX, XXX } \ -} - -/* - * IBM Terminal keyboard 1399625, 101-key - */ -#define LAYOUT_101( \ - k08, k07, k0F, k17, k1F, k27, k2F, k37, k3F, k47, k4F, k56, k5E, k57, k5F, k62, \ -\ - k0E, k16, k1E, k26, k25, k2E, k36, k3D, k3E, k46, k45, k4E, k55, k66, k67, k6E, k6F, k76, k77, k7E, k84, \ - k0D, k15, k1D, k24, k2D, k2C, k35, k3C, k43, k44, k4D, k54, k5B, k5C, k64, k65, k6D, k6C, k75, k7D, \ - k14, k1C, k1B, k23, k2B, k34, k33, k3B, k42, k4B, k4C, k52, k5A, k6B, k73, k74, k7C, \ - k12, k1A, k22, k21, k2A, k32, k31, k3A, k41, k49, k4A, k59, k63, k69, k72, k7A, \ - k11, k19, k29, k39, k58, k61, k60, k6A, k70, k71, k79 \ -) { \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k07 }, \ - { k08, XXX, XXX, XXX, XXX, k0D, k0E, k0F }, \ - { XXX, k11, k12, XXX, k14, k15, k16, k17 }, \ - { XXX, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { XXX, k21, k22, k23, k24, k25, k26, k27 }, \ - { XXX, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ - { XXX, k31, k32, k33, k34, k35, k36, k37 }, \ - { XXX, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ - { XXX, k41, k42, k43, k44, k45, k46, k47 }, \ - { XXX, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ - { XXX, XXX, k52, XXX, k54, k55, k56, k57 }, \ - { k58, k59, k5A, k5B, k5C, XXX, k5E, k5F }, \ - { k60, k61, k62, k63, k64, k65, k66, k67 }, \ - { XXX, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 }, \ - { XXX, k79, k7A, XXX, k7C, k7D, k7E, XXX }, \ - { XXX, XXX, XXX, XXX, k84, XXX, XXX, XXX } \ -} diff --git a/keyboards/converter/ibm_terminal/info.json b/keyboards/converter/ibm_terminal/info.json index 51bc208c9c..39840eb627 100644 --- a/keyboards/converter/ibm_terminal/info.json +++ b/keyboards/converter/ibm_terminal/info.json @@ -13,238 +13,276 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"F13", "x":3.25, "y":0}, - {"label":"F14", "x":4.25, "y":0}, - {"label":"F15", "x":5.25, "y":0}, - {"label":"F16", "x":6.25, "y":0}, - {"label":"F17", "x":7.25, "y":0}, - {"label":"F18", "x":8.25, "y":0}, - {"label":"F19", "x":9.25, "y":0}, - {"label":"F20", "x":10.25, "y":0}, - {"label":"F21", "x":11.25, "y":0}, - {"label":"F22", "x":12.25, "y":0}, - {"label":"F23", "x":13.25, "y":0}, - {"label":"F24", "x":14.25, "y":0}, - {"label":"F1", "x":3.25, "y":1}, - {"label":"F2", "x":4.25, "y":1}, - {"label":"F3", "x":5.25, "y":1}, - {"label":"F4", "x":6.25, "y":1}, - {"label":"F5", "x":7.25, "y":1}, - {"label":"F6", "x":8.25, "y":1}, - {"label":"F7", "x":9.25, "y":1}, - {"label":"F8", "x":10.25, "y":1}, - {"label":"F9", "x":11.25, "y":1}, - {"label":"F10", "x":12.25, "y":1}, - {"label":"F11", "x":13.25, "y":1}, - {"label":"F12", "x":14.25, "y":1}, - {"label":"Print Screen", "x":0, "y":3}, - {"label":"Esc", "x":1, "y":3}, - {"label":"Esc", "x":2.25, "y":3}, - {"label":"1", "x":3.25, "y":3}, - {"label":"2", "x":4.25, "y":3}, - {"label":"3", "x":5.25, "y":3}, - {"label":"4", "x":6.25, "y":3}, - {"label":"5", "x":7.25, "y":3}, - {"label":"6", "x":8.25, "y":3}, - {"label":"7", "x":9.25, "y":3}, - {"label":"8", "x":10.25, "y":3}, - {"label":"9", "x":11.25, "y":3}, - {"label":"0", "x":12.25, "y":3}, - {"label":"-", "x":13.25, "y":3}, - {"label":"=", "x":14.25, "y":3}, - {"label":"No", "x":15.25, "y":3}, - {"label":"Back Space", "x":16.25, "y":3}, - {"label":"Insert", "x":17.5, "y":3}, - {"label":"Home", "x":18.5, "y":3}, - {"label":"Page Up", "x":19.5, "y":3}, - {"label":"Num Lock", "x":20.75, "y":3}, - {"label":"/", "x":21.75, "y":3}, - {"label":"*", "x":22.75, "y":3}, - {"label":"-", "x":23.75, "y":3}, - {"label":"Scroll Lock", "x":0, "y":4}, - {"label":"Int4", "x":1, "y":4}, - {"label":"Tab", "x":2.25, "y":4, "w":1.5}, - {"label":"Q", "x":3.75, "y":4}, - {"label":"W", "x":4.75, "y":4}, - {"label":"E", "x":5.75, "y":4}, - {"label":"R", "x":6.75, "y":4}, - {"label":"T", "x":7.75, "y":4}, - {"label":"Y", "x":8.75, "y":4}, - {"label":"U", "x":9.75, "y":4}, - {"label":"I", "x":10.75, "y":4}, - {"label":"O", "x":11.75, "y":4}, - {"label":"P", "x":12.75, "y":4}, - {"label":"[", "x":13.75, "y":4}, - {"label":"]", "x":14.75, "y":4}, - {"label":"No", "x":15.75, "y":4, "w":1.5}, - {"label":"Delete", "x":17.5, "y":4}, - {"label":"End", "x":18.5, "y":4}, - {"label":"Page Down", "x":19.5, "y":4}, - {"label":"7", "x":20.75, "y":4}, - {"label":"8", "x":21.75, "y":4}, - {"label":"9", "x":22.75, "y":4}, - {"label":"+", "x":23.75, "y":4}, - {"label":"Pause", "x":0, "y":5}, - {"label":"Int5", "x":1, "y":5}, - {"label":"Caps Lock", "x":2.25, "y":5, "w":1.75}, - {"label":"A", "x":4, "y":5}, - {"label":"S", "x":5, "y":5}, - {"label":"D", "x":6, "y":5}, - {"label":"F", "x":7, "y":5}, - {"label":"G", "x":8, "y":5}, - {"label":"H", "x":9, "y":5}, - {"label":"J", "x":10, "y":5}, - {"label":"K", "x":11, "y":5}, - {"label":"L", "x":12, "y":5}, - {"label":";", "x":13, "y":5}, - {"label":"'", "x":14, "y":5}, - {"label":"\\", "x":15, "y":5}, - {"label":"Enter", "x":16, "y":5, "w":1.25}, - {"label":"Up", "x":18.5, "y":5}, - {"label":"4", "x":20.75, "y":5}, - {"label":"5", "x":21.75, "y":5}, - {"label":"6", "x":22.75, "y":5}, - {"label":",", "x":23.75, "y":5}, - {"label":"App", "x":0, "y":6}, - {"label":"Int6", "x":1, "y":6}, - {"label":"Shift", "x":2.25, "y":6, "w":1.25}, - {"label":"ISO \\", "x":3.5, "y":6}, - {"label":"Z", "x":4.5, "y":6}, - {"label":"X", "x":5.5, "y":6}, - {"label":"C", "x":6.5, "y":6}, - {"label":"V", "x":7.5, "y":6}, - {"label":"B", "x":8.5, "y":6}, - {"label":"N", "x":9.5, "y":6}, - {"label":"M", "x":10.5, "y":6}, - {"label":",", "x":11.5, "y":6}, - {"label":".", "x":12.5, "y":6}, - {"label":"/", "x":13.5, "y":6}, - {"label":"No", "x":14.5, "y":6}, - {"label":"Shift", "x":15.5, "y":6, "w":1.75}, - {"label":"Left", "x":17.5, "y":6}, - {"label":"Int2", "x":18.5, "y":6}, - {"label":"Right", "x":19.5, "y":6}, - {"label":"1", "x":20.75, "y":6}, - {"label":"2", "x":21.75, "y":6}, - {"label":"3", "x":22.75, "y":6}, - {"label":"Enter", "x":23.75, "y":6}, - {"label":"RGUI", "x":0, "y":7}, - {"label":"lgui", "x":1, "y":7}, - {"label":"Ctrl", "x":2.25, "y":7, "w":1.5}, - {"label":"Alt", "x":4.75, "y":7, "w":1.5}, - {"label":"Space", "x":6.25, "y":7, "w":7}, - {"label":"Alt", "x":13.25, "y":7, "w":1.5}, - {"label":"Ctrl", "x":15.75, "y":7, "w":1.5}, - {"label":"Down", "x":18.5, "y":7}, - {"label":"No", "x":20.75, "y":7}, - {"label":"0", "x":21.75, "y":7}, - {"label":".", "x":22.75, "y":7}, - {"label":"No", "x":23.75, "y":7} + {"matrix": [1, 0], "x": 3.25, "y": 0}, + {"matrix": [2, 0], "x": 4.25, "y": 0}, + {"matrix": [3, 0], "x": 5.25, "y": 0}, + {"matrix": [4, 0], "x": 6.25, "y": 0}, + {"matrix": [5, 0], "x": 7.25, "y": 0}, + {"matrix": [6, 0], "x": 8.25, "y": 0}, + {"matrix": [7, 0], "x": 9.25, "y": 0}, + {"matrix": [8, 0], "x": 10.25, "y": 0}, + {"matrix": [9, 0], "x": 11.25, "y": 0}, + {"matrix": [10, 0], "x": 12.25, "y": 0}, + {"matrix": [10, 7], "x": 13.25, "y": 0}, + {"matrix": [11, 7], "x": 14.25, "y": 0}, + + {"matrix": [0, 7], "x": 3.25, "y": 1}, + {"matrix": [1, 7], "x": 4.25, "y": 1}, + {"matrix": [2, 7], "x": 5.25, "y": 1}, + {"matrix": [3, 7], "x": 6.25, "y": 1}, + {"matrix": [4, 7], "x": 7.25, "y": 1}, + {"matrix": [5, 7], "x": 8.25, "y": 1}, + {"matrix": [6, 7], "x": 9.25, "y": 1}, + {"matrix": [7, 7], "x": 10.25, "y": 1}, + {"matrix": [8, 7], "x": 11.25, "y": 1}, + {"matrix": [9, 7], "x": 12.25, "y": 1}, + {"matrix": [10, 6], "x": 13.25, "y": 1}, + {"matrix": [11, 6], "x": 14.25, "y": 1}, + + {"matrix": [0, 5], "x": 0, "y": 3}, + {"matrix": [0, 6], "x": 1, "y": 3}, + + {"matrix": [1, 6], "x": 2.25, "y": 3}, + {"matrix": [2, 6], "x": 3.25, "y": 3}, + {"matrix": [3, 6], "x": 4.25, "y": 3}, + {"matrix": [4, 6], "x": 5.25, "y": 3}, + {"matrix": [4, 5], "x": 6.25, "y": 3}, + {"matrix": [5, 6], "x": 7.25, "y": 3}, + {"matrix": [6, 6], "x": 8.25, "y": 3}, + {"matrix": [7, 5], "x": 9.25, "y": 3}, + {"matrix": [7, 6], "x": 10.25, "y": 3}, + {"matrix": [8, 6], "x": 11.25, "y": 3}, + {"matrix": [8, 5], "x": 12.25, "y": 3}, + {"matrix": [9, 6], "x": 13.25, "y": 3}, + {"matrix": [10, 5], "x": 14.25, "y": 3}, + {"matrix": [11, 5], "x": 15.25, "y": 3}, + {"matrix": [12, 6], "x": 16.25, "y": 3}, + + {"matrix": [12, 7], "x": 17.5, "y": 3}, + {"matrix": [13, 6], "x": 18.5, "y": 3}, + {"matrix": [13, 7], "x": 19.5, "y": 3}, + + {"matrix": [14, 6], "x": 20.75, "y": 3}, + {"matrix": [14, 7], "x": 21.75, "y": 3}, + {"matrix": [15, 6], "x": 22.75, "y": 3}, + {"matrix": [16, 4], "x": 23.75, "y": 3}, + + {"matrix": [0, 4], "x": 0, "y": 4}, + {"matrix": [1, 4], "x": 1, "y": 4}, + + {"matrix": [1, 5], "x": 2.25, "y": 4, "w": 1.5}, + {"matrix": [2, 5], "x": 3.75, "y": 4}, + {"matrix": [3, 5], "x": 4.75, "y": 4}, + {"matrix": [4, 4], "x": 5.75, "y": 4}, + {"matrix": [5, 5], "x": 6.75, "y": 4}, + {"matrix": [5, 4], "x": 7.75, "y": 4}, + {"matrix": [6, 5], "x": 8.75, "y": 4}, + {"matrix": [7, 4], "x": 9.75, "y": 4}, + {"matrix": [8, 3], "x": 10.75, "y": 4}, + {"matrix": [8, 4], "x": 11.75, "y": 4}, + {"matrix": [9, 5], "x": 12.75, "y": 4}, + {"matrix": [10, 4], "x": 13.75, "y": 4}, + {"matrix": [11, 3], "x": 14.75, "y": 4}, + {"matrix": [11, 4], "x": 15.75, "y": 4, "w": 1.5}, + + {"matrix": [12, 4], "x": 17.5, "y": 4}, + {"matrix": [12, 5], "x": 18.5, "y": 4}, + {"matrix": [13, 5], "x": 19.5, "y": 4}, + + {"matrix": [13, 4], "x": 20.75, "y": 4}, + {"matrix": [14, 5], "x": 21.75, "y": 4}, + {"matrix": [15, 5], "x": 22.75, "y": 4}, + {"matrix": [15, 4], "x": 23.75, "y": 4}, + + {"matrix": [0, 3], "x": 0, "y": 5}, + {"matrix": [1, 3], "x": 1, "y": 5}, + + {"matrix": [2, 4], "x": 2.25, "y": 5, "w": 1.75}, + {"matrix": [3, 4], "x": 4, "y": 5}, + {"matrix": [3, 3], "x": 5, "y": 5}, + {"matrix": [4, 3], "x": 6, "y": 5}, + {"matrix": [5, 3], "x": 7, "y": 5}, + {"matrix": [6, 4], "x": 8, "y": 5}, + {"matrix": [6, 3], "x": 9, "y": 5}, + {"matrix": [7, 3], "x": 10, "y": 5}, + {"matrix": [8, 2], "x": 11, "y": 5}, + {"matrix": [9, 3], "x": 12, "y": 5}, + {"matrix": [9, 4], "x": 13, "y": 5}, + {"matrix": [10, 2], "x": 14, "y": 5}, + {"matrix": [10, 3], "x": 15, "y": 5}, + {"matrix": [11, 2], "x": 16, "y": 5, "w": 1.25}, + + {"matrix": [12, 3], "x": 18.5, "y": 5}, + + {"matrix": [13, 3], "x": 20.75, "y": 5}, + {"matrix": [14, 3], "x": 21.75, "y": 5}, + {"matrix": [14, 4], "x": 22.75, "y": 5}, + {"matrix": [15, 3], "x": 23.75, "y": 5}, + + {"matrix": [16, 3], "x": 0, "y": 6}, + {"matrix": [1, 2], "x": 1, "y": 6}, + + {"matrix": [2, 2], "x": 2.25, "y": 6, "w": 1.25}, + {"matrix": [2, 3], "x": 3.5, "y": 6}, + {"matrix": [3, 2], "x": 4.5, "y": 6}, + {"matrix": [4, 2], "x": 5.5, "y": 6}, + {"matrix": [4, 1], "x": 6.5, "y": 6}, + {"matrix": [5, 2], "x": 7.5, "y": 6}, + {"matrix": [6, 2], "x": 8.5, "y": 6}, + {"matrix": [6, 1], "x": 9.5, "y": 6}, + {"matrix": [7, 2], "x": 10.5, "y": 6}, + {"matrix": [8, 1], "x": 11.5, "y": 6}, + {"matrix": [9, 1], "x": 12.5, "y": 6}, + {"matrix": [9, 2], "x": 13.5, "y": 6}, + {"matrix": [10, 1], "x": 14.5, "y": 6}, + {"matrix": [11, 1], "x": 15.5, "y": 6, "w": 1.75}, + + {"matrix": [12, 1], "x": 17.5, "y": 6}, + {"matrix": [12, 2], "x": 18.5, "y": 6}, + {"matrix": [13, 2], "x": 19.5, "y": 6}, + + {"matrix": [13, 1], "x": 20.75, "y": 6}, + {"matrix": [14, 2], "x": 21.75, "y": 6}, + {"matrix": [15, 2], "x": 22.75, "y": 6}, + {"matrix": [15, 1], "x": 23.75, "y": 6}, + + {"matrix": [0, 1], "x": 0, "y": 7}, + {"matrix": [1, 1], "x": 1, "y": 7}, + {"matrix": [2, 1], "x": 2.25, "y": 7, "w": 1.5}, + {"matrix": [3, 1], "x": 4.75, "y": 7, "w": 1.5}, + {"matrix": [5, 1], "x": 6.25, "y": 7, "w": 7}, + {"matrix": [7, 1], "x": 13.25, "y": 7, "w": 1.5}, + {"matrix": [11, 0], "x": 15.75, "y": 7, "w": 1.5}, + + {"matrix": [12, 0], "x": 18.5, "y": 7}, + + {"matrix": [13, 0], "x": 20.75, "y": 7}, + {"matrix": [14, 0], "x": 21.75, "y": 7}, + {"matrix": [14, 1], "x": 22.75, "y": 7}, + {"matrix": [15, 0], "x": 23.75, "y": 7} ] }, "LAYOUT_101": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":2, "y":0}, - {"label":"F2", "x":3, "y":0}, - {"label":"F3", "x":4, "y":0}, - {"label":"F4", "x":5, "y":0}, - {"label":"F5", "x":6.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - {"label":"F11", "x":13, "y":0}, - {"label":"F12", "x":14, "y":0}, - {"label":"Print Screen", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - {"label":"`", "x":0, "y":2}, - {"label":"1", "x":1, "y":2}, - {"label":"2", "x":2, "y":2}, - {"label":"3", "x":3, "y":2}, - {"label":"4", "x":4, "y":2}, - {"label":"5", "x":5, "y":2}, - {"label":"6", "x":6, "y":2}, - {"label":"7", "x":7, "y":2}, - {"label":"8", "x":8, "y":2}, - {"label":"9", "x":9, "y":2}, - {"label":"0", "x":10, "y":2}, - {"label":"-", "x":11, "y":2}, - {"label":"=", "x":12, "y":2}, - {"label":"Back Space", "x":13, "y":2, "w":2}, - {"label":"Insert", "x":15.25, "y":2}, - {"label":"Home", "x":16.25, "y":2}, - {"label":"Page Up", "x":17.25, "y":2}, - {"label":"Num Lock", "x":18.5, "y":2}, - {"label":"/", "x":19.5, "y":2}, - {"label":"*", "x":20.5, "y":2}, - {"label":"-", "x":21.5, "y":2}, - {"label":"Tab", "x":0, "y":3, "w":1.5}, - {"label":"Q", "x":1.5, "y":3}, - {"label":"W", "x":2.5, "y":3}, - {"label":"E", "x":3.5, "y":3}, - {"label":"R", "x":4.5, "y":3}, - {"label":"T", "x":5.5, "y":3}, - {"label":"Y", "x":6.5, "y":3}, - {"label":"U", "x":7.5, "y":3}, - {"label":"I", "x":8.5, "y":3}, - {"label":"O", "x":9.5, "y":3}, - {"label":"P", "x":10.5, "y":3}, - {"label":"[", "x":11.5, "y":3}, - {"label":"]", "x":12.5, "y":3}, - {"label":"\\", "x":13.5, "y":3, "w":1.5}, - {"label":"Delete", "x":15.25, "y":3}, - {"label":"End", "x":16.25, "y":3}, - {"label":"Page Down", "x":17.25, "y":3}, - {"label":"7", "x":18.5, "y":3}, - {"label":"8", "x":19.5, "y":3}, - {"label":"9", "x":20.5, "y":3}, - {"label":"Caps Lock", "x":0, "y":4, "w":1.75}, - {"label":"A", "x":1.75, "y":4}, - {"label":"S", "x":2.75, "y":4}, - {"label":"D", "x":3.75, "y":4}, - {"label":"F", "x":4.75, "y":4}, - {"label":"G", "x":5.75, "y":4}, - {"label":"H", "x":6.75, "y":4}, - {"label":"J", "x":7.75, "y":4}, - {"label":"K", "x":8.75, "y":4}, - {"label":"L", "x":9.75, "y":4}, - {"label":";", "x":10.75, "y":4}, - {"label":"'", "x":11.75, "y":4}, - {"label":"Enter", "x":12.75, "y":4, "w":2.25}, - {"label":"4", "x":18.5, "y":4}, - {"label":"5", "x":19.5, "y":4}, - {"label":"6", "x":20.5, "y":4}, - {"label":"+", "x":21.5, "y":3, "h":2}, - {"label":"Shift", "x":0, "y":5, "w":2.25}, - {"label":"Z", "x":2.25, "y":5}, - {"label":"X", "x":3.25, "y":5}, - {"label":"C", "x":4.25, "y":5}, - {"label":"V", "x":5.25, "y":5}, - {"label":"B", "x":6.25, "y":5}, - {"label":"N", "x":7.25, "y":5}, - {"label":"M", "x":8.25, "y":5}, - {"label":",", "x":9.25, "y":5}, - {"label":".", "x":10.25, "y":5}, - {"label":"/", "x":11.25, "y":5}, - {"label":"Shift", "x":12.25, "y":5, "w":2.75}, - {"label":"Up", "x":16.25, "y":5}, - {"label":"1", "x":18.5, "y":5}, - {"label":"2", "x":19.5, "y":5}, - {"label":"3", "x":20.5, "y":5}, - {"label":"Ctrl", "x":0, "y":6, "w":1.5}, - {"label":"Alt", "x":2.5, "y":6, "w":1.5}, - {"label":"Space", "x":4, "y":6, "w":7}, - {"label":"Alt", "x":11, "y":6, "w":1.5}, - {"label":"Ctrl", "x":13.5, "y":6, "w":1.5}, - {"label":"Left", "x":15.25, "y":6}, - {"label":"Down", "x":16.25, "y":6}, - {"label":"Right", "x":17.25, "y":6}, - {"label":"0", "x":18.5, "y":6, "w":2}, - {"label":".", "x":20.5, "y":6}, - {"label":"Enter", "x":21.5, "y":5, "h":2} + {"matrix": [1, 0], "x": 0, "y": 0}, + + {"matrix": [0, 7], "x": 2, "y": 0}, + {"matrix": [1, 7], "x": 3, "y": 0}, + {"matrix": [2, 7], "x": 4, "y": 0}, + {"matrix": [3, 7], "x": 5, "y": 0}, + + {"matrix": [4, 7], "x": 6.5, "y": 0}, + {"matrix": [5, 7], "x": 7.5, "y": 0}, + {"matrix": [6, 7], "x": 8.5, "y": 0}, + {"matrix": [7, 7], "x": 9.5, "y": 0}, + + {"matrix": [8, 7], "x": 11, "y": 0}, + {"matrix": [9, 7], "x": 12, "y": 0}, + {"matrix": [10, 6], "x": 13, "y": 0}, + {"matrix": [11, 6], "x": 14, "y": 0}, + + {"matrix": [10, 7], "x": 15.25, "y": 0}, + {"matrix": [11, 7], "x": 16.25, "y": 0}, + {"matrix": [12, 2], "x": 17.25, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 2}, + {"matrix": [2, 6], "x": 1, "y": 2}, + {"matrix": [3, 6], "x": 2, "y": 2}, + {"matrix": [4, 6], "x": 3, "y": 2}, + {"matrix": [4, 5], "x": 4, "y": 2}, + {"matrix": [5, 6], "x": 5, "y": 2}, + {"matrix": [6, 6], "x": 6, "y": 2}, + {"matrix": [7, 5], "x": 7, "y": 2}, + {"matrix": [7, 6], "x": 8, "y": 2}, + {"matrix": [8, 6], "x": 9, "y": 2}, + {"matrix": [8, 5], "x": 10, "y": 2}, + {"matrix": [9, 6], "x": 11, "y": 2}, + {"matrix": [10, 5], "x": 12, "y": 2}, + {"matrix": [12, 6], "x": 13, "y": 2, "w": 2}, + + {"matrix": [12, 7], "x": 15.25, "y": 2}, + {"matrix": [13, 6], "x": 16.25, "y": 2}, + {"matrix": [13, 7], "x": 17.25, "y": 2}, + + {"matrix": [14, 6], "x": 18.5, "y": 2}, + {"matrix": [14, 7], "x": 19.5, "y": 2}, + {"matrix": [15, 6], "x": 20.5, "y": 2}, + {"matrix": [16, 4], "x": 21.5, "y": 2}, + + {"matrix": [1, 5], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [2, 5], "x": 1.5, "y": 3}, + {"matrix": [3, 5], "x": 2.5, "y": 3}, + {"matrix": [4, 4], "x": 3.5, "y": 3}, + {"matrix": [5, 5], "x": 4.5, "y": 3}, + {"matrix": [5, 4], "x": 5.5, "y": 3}, + {"matrix": [6, 5], "x": 6.5, "y": 3}, + {"matrix": [7, 4], "x": 7.5, "y": 3}, + {"matrix": [8, 3], "x": 8.5, "y": 3}, + {"matrix": [8, 4], "x": 9.5, "y": 3}, + {"matrix": [9, 5], "x": 10.5, "y": 3}, + {"matrix": [10, 4], "x": 11.5, "y": 3}, + {"matrix": [11, 3], "x": 12.5, "y": 3}, + {"matrix": [11, 4], "x": 13.5, "y": 3, "w": 1.5}, + + {"matrix": [12, 4], "x": 15.25, "y": 3}, + {"matrix": [12, 5], "x": 16.25, "y": 3}, + {"matrix": [13, 5], "x": 17.25, "y": 3}, + + {"matrix": [13, 4], "x": 18.5, "y": 3}, + {"matrix": [14, 5], "x": 19.5, "y": 3}, + {"matrix": [15, 5], "x": 20.5, "y": 3}, + + {"matrix": [2, 4], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [3, 4], "x": 1.75, "y": 4}, + {"matrix": [3, 3], "x": 2.75, "y": 4}, + {"matrix": [4, 3], "x": 3.75, "y": 4}, + {"matrix": [5, 3], "x": 4.75, "y": 4}, + {"matrix": [6, 4], "x": 5.75, "y": 4}, + {"matrix": [6, 3], "x": 6.75, "y": 4}, + {"matrix": [7, 3], "x": 7.75, "y": 4}, + {"matrix": [8, 2], "x": 8.75, "y": 4}, + {"matrix": [9, 3], "x": 9.75, "y": 4}, + {"matrix": [9, 4], "x": 10.75, "y": 4}, + {"matrix": [10, 2], "x": 11.75, "y": 4}, + {"matrix": [11, 2], "x": 12.75, "y": 4, "w": 2.25}, + + {"matrix": [13, 3], "x": 18.5, "y": 4}, + {"matrix": [14, 3], "x": 19.5, "y": 4}, + {"matrix": [14, 4], "x": 20.5, "y": 4}, + {"matrix": [15, 4], "x": 21.5, "y": 3, "h": 2}, + + {"matrix": [2, 2], "x": 0, "y": 5, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 5}, + {"matrix": [4, 2], "x": 3.25, "y": 5}, + {"matrix": [4, 1], "x": 4.25, "y": 5}, + {"matrix": [5, 2], "x": 5.25, "y": 5}, + {"matrix": [6, 2], "x": 6.25, "y": 5}, + {"matrix": [6, 1], "x": 7.25, "y": 5}, + {"matrix": [7, 2], "x": 8.25, "y": 5}, + {"matrix": [8, 1], "x": 9.25, "y": 5}, + {"matrix": [9, 1], "x": 10.25, "y": 5}, + {"matrix": [9, 2], "x": 11.25, "y": 5}, + {"matrix": [11, 1], "x": 12.25, "y": 5, "w": 2.75}, + + {"matrix": [12, 3], "x": 16.25, "y": 5}, + + {"matrix": [13, 1], "x": 18.5, "y": 5}, + {"matrix": [14, 2], "x": 19.5, "y": 5}, + {"matrix": [15, 2], "x": 20.5, "y": 5}, + + {"matrix": [2, 1], "x": 0, "y": 6, "w": 1.5}, + {"matrix": [3, 1], "x": 2.5, "y": 6, "w": 1.5}, + {"matrix": [5, 1], "x": 4, "y": 6, "w": 7}, + {"matrix": [7, 1], "x": 11, "y": 6, "w": 1.5}, + {"matrix": [11, 0], "x": 13.5, "y": 6, "w": 1.5}, + + {"matrix": [12, 1], "x": 15.25, "y": 6}, + {"matrix": [12, 0], "x": 16.25, "y": 6}, + {"matrix": [13, 2], "x": 17.25, "y": 6}, + + {"matrix": [14, 0], "x": 18.5, "y": 6, "w": 2}, + {"matrix": [14, 1], "x": 20.5, "y": 6}, + {"matrix": [15, 1], "x": 21.5, "y": 5, "h": 2} ] } } diff --git a/keyboards/converter/m0110_usb/info.json b/keyboards/converter/m0110_usb/info.json index 86aae250df..1869d2dacb 100644 --- a/keyboards/converter/m0110_usb/info.json +++ b/keyboards/converter/m0110_usb/info.json @@ -13,163 +13,182 @@ "layouts": { "LAYOUT_ansi": { "layout": [ - {"label":"`", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"-", "x":11, "y":0}, - {"label":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":1.5}, - {"label":"Num Lock", "x":15.25, "y":0}, - {"label":"=", "x":16.25, "y":0}, - {"label":"/", "x":17.25, "y":0}, - {"label":"*", "x":18.25, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[", "x":11.5, "y":1}, - {"label":"]", "x":12.5, "y":1}, - {"label":"7", "x":15.25, "y":1}, - {"label":"8", "x":16.25, "y":1}, - {"label":"9", "x":17.25, "y":1}, - {"label":"-", "x":18.25, "y":1}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";", "x":10.75, "y":2}, - {"label":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":1.75}, - {"label":"4", "x":15.25, "y":2}, - {"label":"5", "x":16.25, "y":2}, - {"label":"6", "x":17.25, "y":2}, - {"label":"+", "x":18.25, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",", "x":9.25, "y":3}, - {"label":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"Up", "x":13.5, "y":3}, - {"label":"1", "x":15.25, "y":3}, - {"label":"2", "x":16.25, "y":3}, - {"label":"3", "x":17.25, "y":3}, - {"label":"Enter", "x":18.25, "y":3, "h":2}, - {"label":"Alt", "x":0, "y":4, "w":1.5}, - {"label":"GUI", "x":1.5, "y":4, "w":2}, - {"label":"Space", "x":3.5, "y":4, "w":6}, - {"label":"MO(1)", "x":9.5, "y":4}, - {"label":"\\", "x":10.5, "y":4}, - {"label":"Left", "x":11.5, "y":4}, - {"label":"Right", "x":12.5, "y":4}, - {"label":"Down", "x":13.5, "y":4}, - {"label":"0", "x":15.25, "y":4, "w":2}, - {"label":".", "x":17.25, "y":4} + {"matrix": [6, 2], "x": 0, "y": 0}, + {"matrix": [2, 2], "x": 1, "y": 0}, + {"matrix": [2, 3], "x": 2, "y": 0}, + {"matrix": [2, 4], "x": 3, "y": 0}, + {"matrix": [2, 5], "x": 4, "y": 0}, + {"matrix": [2, 7], "x": 5, "y": 0}, + {"matrix": [2, 6], "x": 6, "y": 0}, + {"matrix": [3, 2], "x": 7, "y": 0}, + {"matrix": [3, 4], "x": 8, "y": 0}, + {"matrix": [3, 1], "x": 9, "y": 0}, + {"matrix": [3, 5], "x": 10, "y": 0}, + {"matrix": [3, 3], "x": 11, "y": 0}, + {"matrix": [3, 0], "x": 12, "y": 0}, + {"matrix": [6, 3], "x": 13, "y": 0, "w": 1.5}, + + {"matrix": [8, 7], "x": 15.25, "y": 0}, + {"matrix": [13, 0], "x": 16.25, "y": 0}, + {"matrix": [13, 5], "x": 17.25, "y": 0}, + {"matrix": [12, 2], "x": 18.25, "y": 0}, + + {"matrix": [6, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 4], "x": 1.5, "y": 1}, + {"matrix": [1, 5], "x": 2.5, "y": 1}, + {"matrix": [1, 6], "x": 3.5, "y": 1}, + {"matrix": [1, 7], "x": 4.5, "y": 1}, + {"matrix": [2, 1], "x": 5.5, "y": 1}, + {"matrix": [2, 0], "x": 6.5, "y": 1}, + {"matrix": [4, 0], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [3, 7], "x": 9.5, "y": 1}, + {"matrix": [4, 3], "x": 10.5, "y": 1}, + {"matrix": [4, 1], "x": 11.5, "y": 1}, + {"matrix": [3, 6], "x": 12.5, "y": 1}, + + {"matrix": [11, 1], "x": 15.25, "y": 1}, + {"matrix": [11, 3], "x": 16.25, "y": 1}, + {"matrix": [11, 4], "x": 17.25, "y": 1}, + {"matrix": [9, 6], "x": 18.25, "y": 1}, + + {"matrix": [7, 1], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 0], "x": 1.75, "y": 2}, + {"matrix": [0, 1], "x": 2.75, "y": 2}, + {"matrix": [0, 2], "x": 3.75, "y": 2}, + {"matrix": [0, 3], "x": 4.75, "y": 2}, + {"matrix": [0, 5], "x": 5.75, "y": 2}, + {"matrix": [0, 4], "x": 6.75, "y": 2}, + {"matrix": [4, 6], "x": 7.75, "y": 2}, + {"matrix": [5, 0], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 1], "x": 10.75, "y": 2}, + {"matrix": [4, 7], "x": 11.75, "y": 2}, + {"matrix": [4, 4], "x": 12.75, "y": 2, "w": 1.75}, + + {"matrix": [10, 6], "x": 15.25, "y": 2}, + {"matrix": [10, 7], "x": 16.25, "y": 2}, + {"matrix": [11, 0], "x": 17.25, "y": 2}, + {"matrix": [12, 6], "x": 18.25, "y": 2}, + + {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [0, 6], "x": 2.25, "y": 3}, + {"matrix": [0, 7], "x": 3.25, "y": 3}, + {"matrix": [1, 0], "x": 4.25, "y": 3}, + {"matrix": [1, 1], "x": 5.25, "y": 3}, + {"matrix": [1, 3], "x": 6.25, "y": 3}, + {"matrix": [5, 5], "x": 7.25, "y": 3}, + {"matrix": [5, 6], "x": 8.25, "y": 3}, + {"matrix": [5, 3], "x": 9.25, "y": 3}, + {"matrix": [5, 7], "x": 10.25, "y": 3}, + {"matrix": [5, 4], "x": 11.25, "y": 3}, + + {"matrix": [9, 5], "x": 13.5, "y": 3}, + + {"matrix": [10, 3], "x": 15.25, "y": 3}, + {"matrix": [10, 4], "x": 16.25, "y": 3}, + {"matrix": [10, 5], "x": 17.25, "y": 3}, + {"matrix": [9, 4], "x": 18.25, "y": 3, "h": 2}, + + {"matrix": [7, 2], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [6, 7], "x": 1.5, "y": 4, "w": 2}, + {"matrix": [6, 1], "x": 3.5, "y": 4, "w": 6}, + {"matrix": [6, 4], "x": 9.5, "y": 4}, + {"matrix": [5, 2], "x": 10.5, "y": 4}, + {"matrix": [8, 6], "x": 11.5, "y": 4}, + {"matrix": [8, 2], "x": 12.5, "y": 4}, + {"matrix": [9, 0], "x": 13.5, "y": 4}, + + {"matrix": [10, 2], "x": 15.25, "y": 4, "w": 2}, + {"matrix": [8, 1], "x": 17.25, "y": 4} ] }, "LAYOUT_iso": { "layout": [ - {"label":"`", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"-", "x":11, "y":0}, - {"label":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":1.5}, - {"label":"Num Lock", "x":15.25, "y":0}, - {"label":"=", "x":16.25, "y":0}, - {"label":"/", "x":17.25, "y":0}, - {"label":"*", "x":18.25, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[", "x":11.5, "y":1}, - {"label":"]", "x":12.5, "y":1}, - {"label":"Return", "x":13.75, "y":1, "w":0.75, "h":2}, - {"label":"7", "x":15.25, "y":1}, - {"label":"8", "x":16.25, "y":1}, - {"label":"9", "x":17.25, "y":1}, - {"label":"-", "x":18.25, "y":1}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";", "x":10.75, "y":2}, - {"label":"'", "x":11.75, "y":2}, - {"label":"#", "x":12.75, "y":2}, - {"label":"4", "x":15.25, "y":2}, - {"label":"5", "x":16.25, "y":2}, - {"label":"6", "x":17.25, "y":2}, - {"label":"+", "x":18.25, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"\\", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",", "x":9.25, "y":3}, - {"label":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"1", "x":15.25, "y":3}, - {"label":"2", "x":16.25, "y":3}, - {"label":"3", "x":17.25, "y":3}, - {"label":"Enter", "x":18.25, "y":3, "h":2}, - {"label":"Option", "x":1, "y":4}, - {"label":"GUI", "x":2, "y":4, "w":1.5}, - {"label":"Space", "x":3.5, "y":4, "w":7.5}, - {"label":"Enter", "x":11, "y":4, "w":1.5}, - {"label":"0", "x":15.25, "y":4, "w":2}, - {"label":".", "x":17.25, "y":4} + {"matrix": [6, 2], "x": 0, "y": 0}, + {"matrix": [2, 2], "x": 1, "y": 0}, + {"matrix": [2, 3], "x": 2, "y": 0}, + {"matrix": [2, 4], "x": 3, "y": 0}, + {"matrix": [2, 5], "x": 4, "y": 0}, + {"matrix": [2, 7], "x": 5, "y": 0}, + {"matrix": [2, 6], "x": 6, "y": 0}, + {"matrix": [3, 2], "x": 7, "y": 0}, + {"matrix": [3, 4], "x": 8, "y": 0}, + {"matrix": [3, 1], "x": 9, "y": 0}, + {"matrix": [3, 5], "x": 10, "y": 0}, + {"matrix": [3, 3], "x": 11, "y": 0}, + {"matrix": [3, 0], "x": 12, "y": 0}, + {"matrix": [6, 3], "x": 13, "y": 0, "w": 1.5}, + + {"matrix": [8, 7], "x": 15.25, "y": 0}, + {"matrix": [13, 0], "x": 16.25, "y": 0}, + {"matrix": [13, 5], "x": 17.25, "y": 0}, + {"matrix": [12, 2], "x": 18.25, "y": 0}, + + {"matrix": [6, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 4], "x": 1.5, "y": 1}, + {"matrix": [1, 5], "x": 2.5, "y": 1}, + {"matrix": [1, 6], "x": 3.5, "y": 1}, + {"matrix": [1, 7], "x": 4.5, "y": 1}, + {"matrix": [2, 1], "x": 5.5, "y": 1}, + {"matrix": [2, 0], "x": 6.5, "y": 1}, + {"matrix": [4, 0], "x": 7.5, "y": 1}, + {"matrix": [4, 2], "x": 8.5, "y": 1}, + {"matrix": [3, 7], "x": 9.5, "y": 1}, + {"matrix": [4, 3], "x": 10.5, "y": 1}, + {"matrix": [4, 1], "x": 11.5, "y": 1}, + {"matrix": [3, 6], "x": 12.5, "y": 1}, + {"matrix": [5, 2], "x": 13.75, "y": 1, "w": 0.75, "h": 2}, + + {"matrix": [11, 1], "x": 15.25, "y": 1}, + {"matrix": [11, 3], "x": 16.25, "y": 1}, + {"matrix": [11, 4], "x": 17.25, "y": 1}, + {"matrix": [9, 6], "x": 18.25, "y": 1}, + + {"matrix": [7, 1], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 0], "x": 1.75, "y": 2}, + {"matrix": [0, 1], "x": 2.75, "y": 2}, + {"matrix": [0, 2], "x": 3.75, "y": 2}, + {"matrix": [0, 3], "x": 4.75, "y": 2}, + {"matrix": [0, 5], "x": 5.75, "y": 2}, + {"matrix": [0, 4], "x": 6.75, "y": 2}, + {"matrix": [4, 6], "x": 7.75, "y": 2}, + {"matrix": [5, 0], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 1], "x": 10.75, "y": 2}, + {"matrix": [4, 7], "x": 11.75, "y": 2}, + {"matrix": [4, 4], "x": 12.75, "y": 2}, + + {"matrix": [10, 6], "x": 15.25, "y": 2}, + {"matrix": [10, 7], "x": 16.25, "y": 2}, + {"matrix": [11, 0], "x": 17.25, "y": 2}, + {"matrix": [12, 6], "x": 18.25, "y": 2}, + + {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [0, 6], "x": 1.25, "y": 3}, + {"matrix": [0, 7], "x": 2.25, "y": 3}, + {"matrix": [1, 0], "x": 3.25, "y": 3}, + {"matrix": [1, 1], "x": 4.25, "y": 3}, + {"matrix": [1, 3], "x": 5.25, "y": 3}, + {"matrix": [5, 5], "x": 6.25, "y": 3}, + {"matrix": [5, 6], "x": 7.25, "y": 3}, + {"matrix": [5, 3], "x": 8.25, "y": 3}, + {"matrix": [5, 7], "x": 9.25, "y": 3}, + {"matrix": [5, 4], "x": 10.25, "y": 3}, + {"matrix": [1, 2], "x": 11.25, "y": 3}, + + {"matrix": [10, 3], "x": 15.25, "y": 3}, + {"matrix": [10, 4], "x": 16.25, "y": 3}, + {"matrix": [10, 5], "x": 17.25, "y": 3}, + {"matrix": [9, 4], "x": 18.25, "y": 3, "h": 2}, + + {"matrix": [7, 2], "x": 1, "y": 4}, + {"matrix": [6, 7], "x": 2, "y": 4, "w": 1.5}, + {"matrix": [6, 4], "x": 3.5, "y": 4, "w": 7.5}, + {"matrix": [6, 1], "x": 11, "y": 4, "w": 1.5}, + + {"matrix": [10, 2], "x": 15.25, "y": 4, "w": 2}, + {"matrix": [8, 1], "x": 17.25, "y": 4} ] } } diff --git a/keyboards/converter/m0110_usb/m0110_usb.c b/keyboards/converter/m0110_usb/m0110_usb.c deleted file mode 100644 index a2f98cced6..0000000000 --- a/keyboards/converter/m0110_usb/m0110_usb.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "m0110_usb.h" -#include <avr/io.h> -#include "quantum.h" diff --git a/keyboards/converter/m0110_usb/m0110_usb.h b/keyboards/converter/m0110_usb/m0110_usb.h deleted file mode 100644 index 944296afdc..0000000000 --- a/keyboards/converter/m0110_usb/m0110_usb.h +++ /dev/null @@ -1,131 +0,0 @@ -/* -Copyright 2011,2012,2014,2015 Jun Wako <wakojun@gmail.com> -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. - --------------- - -Ported to QMK by Techsock <info@techsock.com> -*/ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -/* Common layout for M0110 and M0110A - * This keymap works with both keyboards. As you can see, the M0110A is - * a superset of M0110 keyboard, only one exception is 'Enter'(34) of M0110 - * does not exist on the M0110A. - * - * ,---------------------------------------------------------. ,---------------. - * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Clr| =| /| *| - * |---------------------------------------------------------| |---------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | 7| 8| 9| -| - * |-----------------------------------------------------' | |---------------| - * |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return| | 4| 5| 6| +| - * |---------------------------------------------------------| |---------------| - * |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shft|Up | | 1| 2| 3| | - * |---------------------------------------------------------| |-----------|Ent| - * |Opt |Mac | Space |Ent| \|Lft|Rgt|Dn | | 0| .| | - * `---------------------------------------------------------' `---------------' - * - * M0110A scan codes - * ,---------------------------------------------------------. ,---------------. - * | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18| 33| | 47| 68| 6D| 62| - * |---------------------------------------------------------| |---------------| - * | 30| 0C| 0D| 0E| 0F| 11| 10| 20| 22| 1F| 23| 21| 1E| | | 59| 5B| 5C| 4E| - * |-----------------------------------------------------' | |---------------| - * | 39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27| 24| | 56| 57| 58| 66| - * |---------------------------------------------------------| |---------------| - * | 38| 06| 07| 08| 09| 0B| 2D| 2E| 2B| 2F| 2C| 38| 4D| | 53| 54| 55| | - * `---------------------------------------------------------' |-----------| 4C| - * | 3A| 37| 31 | 2A| 46| 42| 48| | 52| 41| | - * `---------------------------------------------------------' `---------------' - * - * M0110 + M0120 scan codes - * ,---------------------------------------------------------. ,---------------. - * | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18| 33| | 47| 68| 6D| 62| - * |---------------------------------------------------------| |---------------| - * | 30| 0C| 0D| 0E| 0F| 11| 10| 20| 22| 1F| 23| 21| 1E| 2A| | 59| 5B| 5C| 4E| - * |---------------------------------------------------------| |---------------| - * | 39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27| 24| | 56| 57| 58| 66| - * |---------------------------------------------------------| |---------------| - * | 38| 06| 07| 08| 09| 0B| 2D| 2E| 2B| 2F| 2C| 38| | 53| 54| 55| | - * `---------------------------------------------------------' |-----------| 4C| - * | 3A| 37| 31 | 34| 3A| | 52| 41| | - * `------------------------------------------------' `---------------' - * Two right and left keys of 38 and 3A are identical, you cannot discriminate those two. - */ -#define LAYOUT_ansi( \ - K32, K12, K13, K14, K15, K17, K16, K1A, K1C, K19, K1D, K1B, K18, K33, K47, K68, K6D, K62, \ - K30, K0C, K0D, K0E, K0F, K11, K10, K20, K22, K1F, K23, K21, K1E, K59, K5B, K5C, K4E, \ - K39, K00, K01, K02, K03, K05, K04, K26, K28, K25, K29, K27, K24, K56, K57, K58, K66, \ - K38, K06, K07, K08, K09, K0B, K2D, K2E, K2B, K2F, K2C, K4D, K53, K54, K55, K4C, \ - K3A, K37, K31, K34, K2A, K46, K42, K48, K52, K41 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K08, K09, XXX, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ - { K30, K31, K32, K33, K34, XXX, XXX, K37 }, \ - { K38, K39, K3A, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, K41, K42, XXX, XXX, XXX, K46, K47 }, \ - { K48, XXX, XXX, XXX, K4C, K4D, K4E, XXX }, \ - { XXX, XXX, K52, K53, K54, K55, K56, K57 }, \ - { K58, K59, XXX, K5B, K5C, XXX, XXX, XXX }, \ - { XXX, XXX, K62, XXX, XXX, XXX, K66, XXX }, \ - { K68, XXX, XXX, XXX, XXX, K6D, XXX, XXX } \ -} - -/* International keyboard layout for M0110 + M0120 - * https://en.wikipedia.org/wiki/File:Apple_Macintosh_Plus_Keyboard.jpg - * Probably International keyboard layout of M0110A doesn't exist. - * - * M0110 + M0120 scan codes - * ,---------------------------------------------------------. ,---------------. - * | 32| 12| 13| 14| 15| 17| 16| 1A| 1C| 19| 1D| 1B| 18| 33| | 47| 68| 6D| 62| - * |---------------------------------------------------------| |---------------| - * | 30| 0C| 0D| 0E| 0F| 11| 10| 20| 22| 1F| 23| 21| 1E| 2A| | 59| 5B| 5C| 4E| - * |------------------------------------------------------, | |---------------| - * | 39| 00| 01| 02| 03| 05| 04| 26| 28| 25| 29| 27| 24| | | 56| 57| 58| 66| - * |---------------------------------------------------------| |---------------| - * | 38| 06| 07| 08| 09| 0B| 2D| 2E| 2B| 2F| 2C| 0A| 38| | 53| 54| 55| | - * `---------------------------------------------------------' |-----------| 4C| - * | 3A| 37| 34 | 31| 3A| | 52| 41| | - * `------------------------------------------------' `---------------' - * Two right and left keys of 38 and 3A are identical, you cannot discriminate those two. - */ -#define LAYOUT_iso( \ - K32, K12, K13, K14, K15, K17, K16, K1A, K1C, K19, K1D, K1B, K18, K33, K47, K68, K6D, K62, \ - K30, K0C, K0D, K0E, K0F, K11, K10, K20, K22, K1F, K23, K21, K1E, K2A, K59, K5B, K5C, K4E, \ - K39, K00, K01, K02, K03, K05, K04, K26, K28, K25, K29, K27, K24, K56, K57, K58, K66, \ - K38, K06, K07, K08, K09, K0B, K2D, K2E, K2B, K2F, K2C, K0A, K53, K54, K55, K4C, \ - K3A, K37, K34, K31, K52, K41 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ - { K30, K31, K32, K33, K34, XXX, XXX, K37 }, \ - { K38, K39, K3A, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, K41, XXX, XXX, XXX, XXX, XXX, K47 }, \ - { XXX, XXX, XXX, XXX, K4C, XXX, K4E, XXX }, \ - { XXX, XXX, K52, K53, K54, K55, K56, K57 }, \ - { K58, K59, XXX, K5B, K5C, XXX, XXX, XXX }, \ - { XXX, XXX, K62, XXX, XXX, XXX, K66, XXX }, \ - { K68, XXX, XXX, XXX, XXX, K6D, XXX, XXX } \ -} diff --git a/keyboards/converter/modelm101/config.h b/keyboards/converter/modelm101/config.h index 00d991fcc8..764fb56f64 100644 --- a/keyboards/converter/modelm101/config.h +++ b/keyboards/converter/modelm101/config.h @@ -17,23 +17,6 @@ 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 { F7, F6, F5, F4, F3, F2, F1, F0 } -#define MATRIX_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, D6, D5, D4, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* The Model M has no diodes */ #define MATRIX_HAS_GHOST diff --git a/keyboards/converter/modelm101/info.json b/keyboards/converter/modelm101/info.json index 9bffe2e242..c59df57e81 100644 --- a/keyboards/converter/modelm101/info.json +++ b/keyboards/converter/modelm101/info.json @@ -1,18 +1,145 @@ { - "keyboard_name": "IBM Model M 101/102", + "keyboard_name": "IBM Model M 101/102", "manufacturer": "iw0rm3r", - "url": "https://github.com/iw0rm3r/qmk_firmware/tree/modelm101/keyboards/converter/modelm101", - "maintainer": "iw0rm3r", + "url": "https://github.com/iw0rm3r/qmk_firmware/tree/modelm101/keyboards/converter/modelm101", + "maintainer": "iw0rm3r", "usb": { "vid": "0xFEED", "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D6", "D5", "D4", "D3", "D2"], + "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0"] + }, + "diode_direction": "ROW2COL", "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.5}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] + "layout": [ + {"matrix": [0, 2], "x": 0, "y": 0}, + + {"matrix": [2, 3], "x": 2, "y": 0}, + {"matrix": [2, 4], "x": 3, "y": 0}, + {"matrix": [1, 4], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [1, 9], "x": 8.5, "y": 0}, + {"matrix": [2, 9], "x": 9.5, "y": 0}, + + {"matrix": [2, 6], "x": 11, "y": 0}, + {"matrix": [3, 6], "x": 12, "y": 0}, + {"matrix": [3, 11], "x": 13, "y": 0}, + {"matrix": [3, 12], "x": 14, "y": 0}, + + {"matrix": [3, 15], "x": 15.25, "y": 0}, + {"matrix": [4, 15], "x": 16.25, "y": 0}, + {"matrix": [6, 14], "x": 17.25, "y": 0}, + + {"matrix": [2, 2], "x": 0, "y": 1.5}, + {"matrix": [3, 2], "x": 1, "y": 1.5}, + {"matrix": [3, 3], "x": 2, "y": 1.5}, + {"matrix": [3, 4], "x": 3, "y": 1.5}, + {"matrix": [3, 5], "x": 4, "y": 1.5}, + {"matrix": [2, 5], "x": 5, "y": 1.5}, + {"matrix": [2, 7], "x": 6, "y": 1.5}, + {"matrix": [3, 7], "x": 7, "y": 1.5}, + {"matrix": [3, 8], "x": 8, "y": 1.5}, + {"matrix": [3, 9], "x": 9, "y": 1.5}, + {"matrix": [3, 10], "x": 10, "y": 1.5}, + {"matrix": [2, 10], "x": 11, "y": 1.5}, + {"matrix": [2, 8], "x": 12, "y": 1.5}, + {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [2, 12], "x": 15.25, "y": 1.5}, + {"matrix": [2, 14], "x": 16.25, "y": 1.5}, + {"matrix": [2, 13], "x": 17.25, "y": 1.5}, + + {"matrix": [6, 11], "x": 18.5, "y": 1.5}, + {"matrix": [6, 12], "x": 19.5, "y": 1.5}, + {"matrix": [6, 13], "x": 20.5, "y": 1.5}, + {"matrix": [7, 13], "x": 21.5, "y": 1.5}, + + {"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [4, 2], "x": 1.5, "y": 2.5}, + {"matrix": [4, 3], "x": 2.5, "y": 2.5}, + {"matrix": [4, 4], "x": 3.5, "y": 2.5}, + {"matrix": [4, 5], "x": 4.5, "y": 2.5}, + {"matrix": [1, 5], "x": 5.5, "y": 2.5}, + {"matrix": [1, 7], "x": 6.5, "y": 2.5}, + {"matrix": [4, 7], "x": 7.5, "y": 2.5}, + {"matrix": [4, 8], "x": 8.5, "y": 2.5}, + {"matrix": [4, 9], "x": 9.5, "y": 2.5}, + {"matrix": [4, 10], "x": 10.5, "y": 2.5}, + {"matrix": [1, 10], "x": 11.5, "y": 2.5}, + {"matrix": [1, 8], "x": 12.5, "y": 2.5}, + {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 11], "x": 15.25, "y": 2.5}, + {"matrix": [3, 14], "x": 16.25, "y": 2.5}, + {"matrix": [3, 13], "x": 17.25, "y": 2.5}, + + {"matrix": [4, 11], "x": 18.5, "y": 2.5}, + {"matrix": [4, 12], "x": 19.5, "y": 2.5}, + {"matrix": [4, 13], "x": 20.5, "y": 2.5}, + {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5}, + {"matrix": [5, 2], "x": 1.75, "y": 3.5}, + {"matrix": [5, 3], "x": 2.75, "y": 3.5}, + {"matrix": [5, 4], "x": 3.75, "y": 3.5}, + {"matrix": [5, 5], "x": 4.75, "y": 3.5}, + {"matrix": [0, 5], "x": 5.75, "y": 3.5}, + {"matrix": [0, 7], "x": 6.75, "y": 3.5}, + {"matrix": [5, 7], "x": 7.75, "y": 3.5}, + {"matrix": [5, 8], "x": 8.75, "y": 3.5}, + {"matrix": [5, 9], "x": 9.75, "y": 3.5}, + {"matrix": [5, 10], "x": 10.75, "y": 3.5}, + {"matrix": [0, 10], "x": 11.75, "y": 3.5}, + {"matrix": [6, 10], "x": 12.75, "y": 3.5}, + {"matrix": [6, 6], "x": 13.75, "y": 3.5, "w": 1.25}, + + {"matrix": [1, 11], "x": 18.5, "y": 3.5}, + {"matrix": [1, 12], "x": 19.5, "y": 3.5}, + {"matrix": [1, 13], "x": 20.5, "y": 3.5}, + + {"matrix": [1, 1], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [0, 3], "x": 1.25, "y": 4.5}, + {"matrix": [6, 2], "x": 2.25, "y": 4.5}, + {"matrix": [6, 3], "x": 3.25, "y": 4.5}, + {"matrix": [6, 4], "x": 4.25, "y": 4.5}, + {"matrix": [6, 5], "x": 5.25, "y": 4.5}, + {"matrix": [7, 5], "x": 6.25, "y": 4.5}, + {"matrix": [7, 7], "x": 7.25, "y": 4.5}, + {"matrix": [6, 7], "x": 8.25, "y": 4.5}, + {"matrix": [6, 8], "x": 9.25, "y": 4.5}, + {"matrix": [6, 9], "x": 10.25, "y": 4.5}, + {"matrix": [7, 10], "x": 11.25, "y": 4.5}, + {"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [0, 14], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 11], "x": 18.5, "y": 4.5}, + {"matrix": [5, 12], "x": 19.5, "y": 4.5}, + {"matrix": [5, 13], "x": 20.5, "y": 4.5}, + {"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5}, + + {"matrix": [7, 14], "x": 15.25, "y": 5.5}, + {"matrix": [7, 11], "x": 16.25, "y": 5.5}, + {"matrix": [7, 12], "x": 17.25, "y": 5.5}, + + {"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [0, 13], "x": 20.5, "y": 5.5} + ] } } } diff --git a/keyboards/converter/modelm101/modelm101.c b/keyboards/converter/modelm101/modelm101.c index 02d861b917..fa8669dc81 100644 --- a/keyboards/converter/modelm101/modelm101.c +++ b/keyboards/converter/modelm101/modelm101.c @@ -13,7 +13,7 @@ * 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 "modelm101.h" +#include "quantum.h" void led_init_ports(void) { /* Setting status LEDs pins to output and +5V (off) */ diff --git a/keyboards/converter/modelm101/modelm101.h b/keyboards/converter/modelm101/modelm101.h deleted file mode 100644 index 1a2cdc8b68..0000000000 --- a/keyboards/converter/modelm101/modelm101.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2019 iw0rm3r - * - * 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 "names" for physical keys of the keyboard - * and defines their position on the board. - * The second section defines position of the keys on the switch matrix - * (where COLUMNS and ROWS crosses). */ - -#define LAYOUT( \ - K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \ - \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, K4S, K4T, K4U, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, K3R, K3S, K3T, K3U, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K2O, K2P, K2Q, \ - K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1O, K1P, K1Q, K1R, \ - K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J \ -) \ -{ \ -/* 00 */ { KC_NO, KC_NO, K5A, K1B, K5E, K2F, K5F, K2G, K5G, KC_NO, K2L, KC_NO, K0I, K0J, K1N, K0B }, \ -/* 01 */ { KC_NO, K1A, K3A, K2A, K5D, K3F, K4N, K3G, K3M, K5H, K3L, K2O, K2P, K2Q, KC_NO, KC_NO }, \ -/* 02 */ { K0A, KC_NO, K4A, K5B, K5C, K4F, K5J, K4G, K4M, K5I, K4L, K3O, K4O, K4Q, K4P, KC_NO }, \ -/* 03 */ { KC_NO, KC_NO, K4B, K4C, K4D, K4E, K5K, K4H, K4I, K4J, K4K, K5L, K5M, K3Q, K3P, K5N }, \ -/* 04 */ { KC_NO, KC_NO, K3B, K3C, K3D, K3E, KC_NO, K3H, K3I, K3J, K3K, K3R, K3S, K3T, K3U, K5O }, \ -/* 05 */ { KC_NO, KC_NO, K2B, K2C, K2D, K2E, K3N, K2H, K2I, K2J, K2K, K1O, K1P, K1Q, K1R, KC_NO }, \ -/* 06 */ { K0E, K1M, K1C, K1D, K1E, K1F, K2N, K1I, K1J, K1K, K2M, K4R, K4S, K4T, K5P, KC_NO }, \ -/* 07 */ { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1G, K0C, K1H, KC_NO, KC_NO, K1L, K0G, K0H, K4U, K0F, K0D }, \ -} -/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
\ No newline at end of file diff --git a/keyboards/converter/modelm101_teensy2/config.h b/keyboards/converter/modelm101_teensy2/config.h index 7e0e627bd9..764fb56f64 100644 --- a/keyboards/converter/modelm101_teensy2/config.h +++ b/keyboards/converter/modelm101_teensy2/config.h @@ -17,23 +17,6 @@ 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 { D0, D1, D2, D3, C6, C7, D5, D4 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, B0, B1, B2, B3, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* The Model M has no diodes */ #define MATRIX_HAS_GHOST diff --git a/keyboards/converter/modelm101_teensy2/info.json b/keyboards/converter/modelm101_teensy2/info.json index 12ee7274d7..86dc44de0e 100644 --- a/keyboards/converter/modelm101_teensy2/info.json +++ b/keyboards/converter/modelm101_teensy2/info.json @@ -1,13 +1,18 @@ { - "keyboard_name": "IBM Model M 101/102", + "keyboard_name": "IBM Model M 101/102", "manufacturer": "wangfuco", - "url": "https://github.com/wangfuco/qmk_firmware/tree/modelm101_teensy2/keyboards/converter/modelm101_teensy2", - "maintainer": "wangfuco", + "url": "https://github.com/wangfuco/qmk_firmware/tree/modelm101_teensy2/keyboards/converter/modelm101_teensy2", + "maintainer": "wangfuco", "usb": { "vid": "0xFEED", "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "B0", "B1", "B2", "B3", "B7"], + "rows": ["D0", "D1", "D2", "D3", "C6", "C7", "D5", "D4"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "E6", "on_state": 0 @@ -16,7 +21,129 @@ "bootloader": "halfkay", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.5}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] + "layout": [ + {"matrix": [0, 2], "x": 0, "y": 0}, + + {"matrix": [2, 3], "x": 2, "y": 0}, + {"matrix": [2, 4], "x": 3, "y": 0}, + {"matrix": [1, 4], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [1, 9], "x": 8.5, "y": 0}, + {"matrix": [2, 9], "x": 9.5, "y": 0}, + + {"matrix": [2, 6], "x": 11, "y": 0}, + {"matrix": [3, 6], "x": 12, "y": 0}, + {"matrix": [3, 11], "x": 13, "y": 0}, + {"matrix": [3, 12], "x": 14, "y": 0}, + + {"matrix": [3, 15], "x": 15.25, "y": 0}, + {"matrix": [4, 15], "x": 16.25, "y": 0}, + {"matrix": [6, 14], "x": 17.25, "y": 0}, + + {"matrix": [2, 2], "x": 0, "y": 1.5}, + {"matrix": [3, 2], "x": 1, "y": 1.5}, + {"matrix": [3, 3], "x": 2, "y": 1.5}, + {"matrix": [3, 4], "x": 3, "y": 1.5}, + {"matrix": [3, 5], "x": 4, "y": 1.5}, + {"matrix": [2, 5], "x": 5, "y": 1.5}, + {"matrix": [2, 7], "x": 6, "y": 1.5}, + {"matrix": [3, 7], "x": 7, "y": 1.5}, + {"matrix": [3, 8], "x": 8, "y": 1.5}, + {"matrix": [3, 9], "x": 9, "y": 1.5}, + {"matrix": [3, 10], "x": 10, "y": 1.5}, + {"matrix": [2, 10], "x": 11, "y": 1.5}, + {"matrix": [2, 8], "x": 12, "y": 1.5}, + {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [2, 12], "x": 15.25, "y": 1.5}, + {"matrix": [2, 14], "x": 16.25, "y": 1.5}, + {"matrix": [2, 13], "x": 17.25, "y": 1.5}, + + {"matrix": [6, 11], "x": 18.5, "y": 1.5}, + {"matrix": [6, 12], "x": 19.5, "y": 1.5}, + {"matrix": [6, 13], "x": 20.5, "y": 1.5}, + {"matrix": [7, 13], "x": 21.5, "y": 1.5}, + + {"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [4, 2], "x": 1.5, "y": 2.5}, + {"matrix": [4, 3], "x": 2.5, "y": 2.5}, + {"matrix": [4, 4], "x": 3.5, "y": 2.5}, + {"matrix": [4, 5], "x": 4.5, "y": 2.5}, + {"matrix": [1, 5], "x": 5.5, "y": 2.5}, + {"matrix": [1, 7], "x": 6.5, "y": 2.5}, + {"matrix": [4, 7], "x": 7.5, "y": 2.5}, + {"matrix": [4, 8], "x": 8.5, "y": 2.5}, + {"matrix": [4, 9], "x": 9.5, "y": 2.5}, + {"matrix": [4, 10], "x": 10.5, "y": 2.5}, + {"matrix": [1, 10], "x": 11.5, "y": 2.5}, + {"matrix": [1, 8], "x": 12.5, "y": 2.5}, + {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 11], "x": 15.25, "y": 2.5}, + {"matrix": [3, 14], "x": 16.25, "y": 2.5}, + {"matrix": [3, 13], "x": 17.25, "y": 2.5}, + + {"matrix": [4, 11], "x": 18.5, "y": 2.5}, + {"matrix": [4, 12], "x": 19.5, "y": 2.5}, + {"matrix": [4, 13], "x": 20.5, "y": 2.5}, + {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5}, + {"matrix": [5, 2], "x": 1.75, "y": 3.5}, + {"matrix": [5, 3], "x": 2.75, "y": 3.5}, + {"matrix": [5, 4], "x": 3.75, "y": 3.5}, + {"matrix": [5, 5], "x": 4.75, "y": 3.5}, + {"matrix": [0, 5], "x": 5.75, "y": 3.5}, + {"matrix": [0, 7], "x": 6.75, "y": 3.5}, + {"matrix": [5, 7], "x": 7.75, "y": 3.5}, + {"matrix": [5, 8], "x": 8.75, "y": 3.5}, + {"matrix": [5, 9], "x": 9.75, "y": 3.5}, + {"matrix": [5, 10], "x": 10.75, "y": 3.5}, + {"matrix": [0, 10], "x": 11.75, "y": 3.5}, + {"matrix": [6, 10], "x": 12.75, "y": 3.5}, + {"matrix": [6, 6], "x": 13.75, "y": 3.5, "w": 1.25}, + + {"matrix": [1, 11], "x": 18.5, "y": 3.5}, + {"matrix": [1, 12], "x": 19.5, "y": 3.5}, + {"matrix": [1, 13], "x": 20.5, "y": 3.5}, + + {"matrix": [1, 1], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [0, 3], "x": 1.25, "y": 4.5}, + {"matrix": [6, 2], "x": 2.25, "y": 4.5}, + {"matrix": [6, 3], "x": 3.25, "y": 4.5}, + {"matrix": [6, 4], "x": 4.25, "y": 4.5}, + {"matrix": [6, 5], "x": 5.25, "y": 4.5}, + {"matrix": [7, 5], "x": 6.25, "y": 4.5}, + {"matrix": [7, 7], "x": 7.25, "y": 4.5}, + {"matrix": [6, 7], "x": 8.25, "y": 4.5}, + {"matrix": [6, 8], "x": 9.25, "y": 4.5}, + {"matrix": [6, 9], "x": 10.25, "y": 4.5}, + {"matrix": [7, 10], "x": 11.25, "y": 4.5}, + {"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [0, 14], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 11], "x": 18.5, "y": 4.5}, + {"matrix": [5, 12], "x": 19.5, "y": 4.5}, + {"matrix": [5, 13], "x": 20.5, "y": 4.5}, + {"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5}, + + {"matrix": [7, 14], "x": 15.25, "y": 5.5}, + {"matrix": [7, 11], "x": 16.25, "y": 5.5}, + {"matrix": [7, 12], "x": 17.25, "y": 5.5}, + + {"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [0, 13], "x": 20.5, "y": 5.5} + ] } } } diff --git a/keyboards/converter/modelm101_teensy2/modelm101_teensy2.c b/keyboards/converter/modelm101_teensy2/modelm101_teensy2.c deleted file mode 100644 index 8283d91eda..0000000000 --- a/keyboards/converter/modelm101_teensy2/modelm101_teensy2.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 iw0rm3r - * - * 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 "modelm101_teensy2.h" diff --git a/keyboards/converter/modelm101_teensy2/modelm101_teensy2.h b/keyboards/converter/modelm101_teensy2/modelm101_teensy2.h deleted file mode 100644 index 1a2cdc8b68..0000000000 --- a/keyboards/converter/modelm101_teensy2/modelm101_teensy2.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2019 iw0rm3r - * - * 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 "names" for physical keys of the keyboard - * and defines their position on the board. - * The second section defines position of the keys on the switch matrix - * (where COLUMNS and ROWS crosses). */ - -#define LAYOUT( \ - K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \ - \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, K4S, K4T, K4U, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, K3R, K3S, K3T, K3U, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K2O, K2P, K2Q, \ - K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1O, K1P, K1Q, K1R, \ - K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J \ -) \ -{ \ -/* 00 */ { KC_NO, KC_NO, K5A, K1B, K5E, K2F, K5F, K2G, K5G, KC_NO, K2L, KC_NO, K0I, K0J, K1N, K0B }, \ -/* 01 */ { KC_NO, K1A, K3A, K2A, K5D, K3F, K4N, K3G, K3M, K5H, K3L, K2O, K2P, K2Q, KC_NO, KC_NO }, \ -/* 02 */ { K0A, KC_NO, K4A, K5B, K5C, K4F, K5J, K4G, K4M, K5I, K4L, K3O, K4O, K4Q, K4P, KC_NO }, \ -/* 03 */ { KC_NO, KC_NO, K4B, K4C, K4D, K4E, K5K, K4H, K4I, K4J, K4K, K5L, K5M, K3Q, K3P, K5N }, \ -/* 04 */ { KC_NO, KC_NO, K3B, K3C, K3D, K3E, KC_NO, K3H, K3I, K3J, K3K, K3R, K3S, K3T, K3U, K5O }, \ -/* 05 */ { KC_NO, KC_NO, K2B, K2C, K2D, K2E, K3N, K2H, K2I, K2J, K2K, K1O, K1P, K1Q, K1R, KC_NO }, \ -/* 06 */ { K0E, K1M, K1C, K1D, K1E, K1F, K2N, K1I, K1J, K1K, K2M, K4R, K4S, K4T, K5P, KC_NO }, \ -/* 07 */ { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1G, K0C, K1H, KC_NO, KC_NO, K1L, K0G, K0H, K4U, K0F, K0D }, \ -} -/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */
\ No newline at end of file diff --git a/keyboards/converter/modelm_ssk/config.h b/keyboards/converter/modelm_ssk/config.h index f38e3db3dd..3b6e758833 100644 --- a/keyboards/converter/modelm_ssk/config.h +++ b/keyboards/converter/modelm_ssk/config.h @@ -17,23 +17,6 @@ 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_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, D5, D4, D3, D2, D1 } -#define MATRIX_ROW_PINS { F0, F1, F2, F3, F4, F5, F6, F7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* The Model M does not have NKRO */ #define MATRIX_HAS_GHOST diff --git a/keyboards/converter/modelm_ssk/info.json b/keyboards/converter/modelm_ssk/info.json index 348e6e6dca..ff2c6cc217 100644 --- a/keyboards/converter/modelm_ssk/info.json +++ b/keyboards/converter/modelm_ssk/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D5", "D4", "D3", "D2", "D1"], + "rows": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B6", "num_lock": "B4", diff --git a/keyboards/converter/numeric_keypad_iie/config.h b/keyboards/converter/numeric_keypad_iie/config.h deleted file mode 100644 index 81671354fd..0000000000 --- a/keyboards/converter/numeric_keypad_iie/config.h +++ /dev/null @@ -1,87 +0,0 @@ -/* -Copyright 2019 Adam Newbold <adam@neatnik.net> - -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 - - -/* - -Pin Mappings -============ - -Dsub-15 Connection ------------------- - - Dsub-15 (female) - ,-------------------------. - \ 08 07 06 05 04 03 02 01 / - \ 15 14 13 12 11 10 09 / - `---------------------' - -Header Pins ------------ - _____________________________________ -| | -| 11 10 9 8 7 6 5 4 3 2 1 | -|_____________________________________| - - -Header / Matrix ---------------- - -Pin Name Description --------------------------------------------------------------- -1,2,5,3,4,6 Y0-Y5 Y-direction key-matrix connections -7 NC -9,11,10,8 X4-X7 X-direction key-matrix connections - - -Microcontroller Configuration ------------------------------ - -(Pins are for an Arduino Micro) - -+-----------------------------------+ -| Dsub-15 | Header | Matrix | Micro | -|---------+--------+--------+-------| -| 12 | 11 | X5 | B0 | -| 11 | 10 | X6 | D3 | -| 10 | 9 | X4 | B2 | -| 9 | 8 | X7 | D2 | -| NC | 7 | NC | -- | -| 7 | 6 | Y5 | E6 | -| 6 | 5 | Y2 | D4 | -| 5 | 4 | Y4 | D7 | -| 3 | 3 | Y3 | C6 | -| 2 | 2 | Y1 | D0 | -| 1 | 1 | Y0 | D1 | -+-----------------------------------+ - -Note: Dsub-15 pins 4, 8, 13, 14, and 15 are unused - -Reference ---------- - -https://deskthority.net/wiki/Apple_Numeric_Keypad_IIe -https://geekhack.org/index.php?topic=78048.0 -http://wiki.apple2.org/index.php?title=Pinouts#Apple_.2F.2Fe_Numeric_Keypad_connector - -*/ - -#define MATRIX_ROW_PINS { B0, B2, D2, D3 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 } -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/converter/numeric_keypad_iie/info.json b/keyboards/converter/numeric_keypad_iie/info.json index 41b75f69b9..abec316be7 100644 --- a/keyboards/converter/numeric_keypad_iie/info.json +++ b/keyboards/converter/numeric_keypad_iie/info.json @@ -1,18 +1,59 @@ { - "keyboard_name": "Numeric Keypad IIe", + "keyboard_name": "Numeric Keypad IIe", "manufacturer": "Apple Inc.", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xFEED", "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "D7", "E6"], + "rows": ["B0", "B2", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"7", "x":2, "y":0}, {"label":"8", "x":3, "y":0}, {"label":"9", "x":4, "y":0}, {"label":"(", "x":5.5, "y":0}, {"label":")", "x":6.5, "y":0}, {"label":"\u2190", "x":0, "y":1}, {"label":"4", "x":2, "y":1}, {"label":"5", "x":3, "y":1}, {"label":"6", "x":4, "y":1}, {"label":"\u2212", "x":5.5, "y":1}, {"label":"\u00f7", "x":6.5, "y":1}, {"label":"\u2192", "x":0, "y":2}, {"label":"1", "x":2, "y":2}, {"label":"2", "x":3, "y":2}, {"label":"3", "x":4, "y":2}, {"label":"+", "x":5.5, "y":2}, {"label":"\u00d7", "x":6.5, "y":2}, {"label":"Space", "x":0, "y":3}, {"label":"0", "x":1.5, "y":3, "w":1.5}, {"label":",", "x":3, "y":3}, {"label":".", "x":4, "y":3}, {"label":"Ret", "x":5.5, "y":3}, {"label":"Print", "x":6.5, "y":3}] + "layout": [ + {"matrix": [0, 1], "x": 0, "y": 0}, + + {"matrix": [0, 5], "x": 2, "y": 0}, + {"matrix": [3, 2], "x": 3, "y": 0}, + {"matrix": [3, 3], "x": 4, "y": 0}, + + {"matrix": [2, 2], "x": 5.5, "y": 0}, + {"matrix": [0, 0], "x": 6.5, "y": 0}, + + {"matrix": [1, 1], "x": 0, "y": 1}, + + {"matrix": [0, 2], "x": 2, "y": 1}, + {"matrix": [0, 3], "x": 3, "y": 1}, + {"matrix": [0, 4], "x": 4, "y": 1}, + + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [1, 0], "x": 6.5, "y": 1}, + + {"matrix": [3, 1], "x": 0, "y": 2}, + + {"matrix": [1, 3], "x": 2, "y": 2}, + {"matrix": [1, 4], "x": 3, "y": 2}, + {"matrix": [1, 5], "x": 4, "y": 2}, + + {"matrix": [3, 5], "x": 5.5, "y": 2}, + {"matrix": [3, 0], "x": 6.5, "y": 2}, + + {"matrix": [2, 1], "x": 0, "y": 3}, + + {"matrix": [1, 2], "x": 1.5, "y": 3, "w": 1.5}, + {"matrix": [2, 5], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + + {"matrix": [2, 4], "x": 5.5, "y": 3}, + {"matrix": [2, 0], "x": 6.5, "y": 3} + ] } } } diff --git a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c deleted file mode 100644 index 341af05b31..0000000000 --- a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Adam Newbold <adam@neatnik.net> - * - * 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 "numeric_keypad_iie.h" diff --git a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h b/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h deleted file mode 100644 index 8892b5553b..0000000000 --- a/keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright Adam Newbold <adam@neatnik.net> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once -#include "quantum.h" - -#define LAYOUT( \ - K_ESC, K_7, K_8, K_9, K_LEFT_PARENS, K_RIGHT_PARENS, \ - K_LEFT, K_4, K_5, K_6, K_MINUS, K_DIVIDE, \ - K_RIGHT, K_1, K_2, K_3, K_PLUS, K_MULTIPLY, \ - K_SPACE, K_0, K_COMMA, K_DOT, K_RETURN, K_PRINT \ -){ \ - { K_RIGHT_PARENS, K_ESC, K_4, K_5, K_6, K_7 },\ - { K_DIVIDE, K_LEFT, K_0, K_1, K_2, K_3 },\ - { K_PRINT, K_SPACE, K_LEFT_PARENS, K_MINUS, K_RETURN, K_COMMA },\ - { K_MULTIPLY, K_RIGHT, K_8, K_9, K_DOT, K_PLUS },\ -} diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c index 4226dfa52c..016b562254 100644 --- a/keyboards/converter/palm_usb/matrix.c +++ b/keyboards/converter/palm_usb/matrix.c @@ -17,7 +17,9 @@ 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 QMK_KEYBOARD_H +#include "matrix.h" +#include "debug.h" +#include "wait.h" #include "uart.h" #include "timer.h" @@ -134,14 +136,14 @@ uint8_t rts_reset(void) { if (firstread) { writePinLow(RTS_PIN); } - _delay_ms(10); + wait_ms(10); writePinHigh(RTS_PIN); /* the future is Arm if (!palReadPad(RTS_PIN_IOPRT)) { - _delay_ms(10); + wait_ms(10); palSetPadMode(RTS_PINn_IOPORT, PinDirectionOutput_PUSHPULL); palSetPad(RTS_PORT, RTS_PIN); } @@ -150,13 +152,13 @@ uint8_t rts_reset(void) { palSetPadMode(RTS_PIN_RTS_PORT, PinDirectionOutput_PUSHPULL); palSetPad(RTS_PORT, RTS_PIN); palClearPad(RTS_PORT, RTS_PIN); - _delay_ms(10); + wait_ms(10); palSetPad(RTS_PORT, RTS_PIN); } */ - _delay_ms(5); + wait_ms(5); //print("rts\n"); return 1; } @@ -222,7 +224,7 @@ uint8_t handspring_handshake(void) { uint8_t handspring_reset(void) { writePinLow(VCC_PIN); - _delay_ms(5); + wait_ms(5); writePinHigh(VCC_PIN); if ( handspring_handshake() ) { @@ -257,7 +259,7 @@ void matrix_init(void) last_activity = timer_read(); } else { print("failed handshake"); - _delay_ms(1000); + wait_ms(1000); //BUG /should/ power cycle or toggle RTS & reset, but this usually works. } @@ -271,7 +273,7 @@ void matrix_init(void) last_activity = timer_read(); } else { print("failed handshake"); - _delay_ms(1000); + wait_ms(1000); //BUG /should/ power cycle or toggle RTS & reset, but this usually works. } diff --git a/keyboards/converter/palm_usb/stowaway/info.json b/keyboards/converter/palm_usb/stowaway/info.json index 34b1e1f83f..9a263327ad 100644 --- a/keyboards/converter/palm_usb/stowaway/info.json +++ b/keyboards/converter/palm_usb/stowaway/info.json @@ -1,77 +1,85 @@ { - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"1", "x":0.5, "y":0}, - {"label":"2", "x":1.5, "y":0}, - {"label":"3", "x":2.5, "y":0}, - {"label":"4", "x":3.5, "y":0}, - {"label":"5", "x":4.5, "y":0}, - {"label":"6", "x":5.5, "y":0}, - {"label":"7", "x":6.5, "y":0}, - {"label":"8", "x":7.5, "y":0}, - {"label":"9", "x":8.5, "y":0}, - {"label":"0", "x":9.5, "y":0}, - {"label":"MINS", "x":10.5, "y":0}, - {"label":"EQL", "x":11.5, "y":0}, - {"label":"BACK", "x":12.5, "y":0, "w":1.5}, - {"label":"APP0", "x":14.25, "y":1, "h":0.6875}, - {"label":"TAB", "x":0, "y":1}, - {"label":"Q", "x":1, "y":1}, - {"label":"W", "x":2, "y":1}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1}, - {"label":"T", "x":5, "y":1}, - {"label":"Y", "x":6, "y":1}, - {"label":"U", "x":7, "y":1}, - {"label":"I", "x":8, "y":1}, - {"label":"O", "x":9, "y":1}, - {"label":"P", "x":10, "y":1}, - {"label":"LBRC", "x":11, "y":1}, - {"label":"RBRC", "x":12, "y":1}, - {"label":"BSLS", "x":13, "y":1}, - {"label":"APP1", "x":14.25, "y":1.6875, "h":0.6875}, - {"label":"CAPS", "x":0, "y":2, "w":1.25}, - {"label":"A", "x":1.25, "y":2}, - {"label":"S", "x":2.25, "y":2}, - {"label":"D", "x":3.25, "y":2}, - {"label":"F", "x":4.25, "y":2}, - {"label":"G", "x":5.25, "y":2}, - {"label":"H", "x":6.25, "y":2}, - {"label":"J", "x":7.25, "y":2}, - {"label":"K", "x":8.25, "y":2}, - {"label":"L", "x":9.25, "y":2}, - {"label":"SCLN", "x":10.25, "y":2}, - {"label":"QUOT", "x":11.25, "y":2}, - {"label":"ENT", "x":12.25, "y":2, "w":1.75}, - {"label":"APP2", "x":14.25, "y":2.375, "h":0.6875}, - {"label":"LSFT", "x":0, "y":3, "w":1.75}, - {"label":"Z", "x":1.75, "y":3}, - {"label":"X", "x":2.75, "y":3}, - {"label":"C", "x":3.75, "y":3}, - {"label":"V", "x":4.75, "y":3}, - {"label":"B", "x":5.75, "y":3}, - {"label":"N", "x":6.75, "y":3}, - {"label":"M", "x":7.75, "y":3}, - {"label":"COMM", "x":8.75, "y":3}, - {"label":"DOT", "x":9.75, "y":3}, - {"label":"SLSH", "x":10.75, "y":3}, - {"label":"RSFT", "x":11.75, "y":3, "w":1.25}, - {"label":"UP", "x":13, "y":3}, - {"label":"APP3", "x":14.25, "y":3.0625, "h":0.6875}, - {"label":"LCTL", "x":0, "y":4, "w":1.25}, - {"label":"FN", "x":1.25, "y":4}, - {"label":"LALT", "x":2.25, "y":4}, - {"label":"CMD", "x":3.25, "y":4}, - {"label":"SPACE", "x":4.25, "y":4, "w":3.5}, - {"label":"SPACE/New", "x":7.75, "y":4}, - {"label":"GRAVE", "x":8.75, "y":4}, - {"label":"DONE", "x":9.75, "y":4}, - {"label":"DEL", "x":10.75, "y":4, "w":1.25}, - {"label":"LEFT", "x":12, "y":4}, - {"label":"DOWN", "x":13, "y":4}, - {"label":"RIGHT", "x":14, "y":4} - ] + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 6.5, "y": 0}, + {"matrix": [6, 4], "x": 7.5, "y": 0}, + {"matrix": [6, 5], "x": 8.5, "y": 0}, + {"matrix": [6, 6], "x": 9.5, "y": 0}, + {"matrix": [6, 0], "x": 10.5, "y": 0}, + {"matrix": [6, 1], "x": 11.5, "y": 0}, + {"matrix": [6, 2], "x": 12.5, "y": 0, "w": 1.5}, + + {"matrix": [6, 3], "x": 14.25, "y": 1, "h": 0.6875}, + + {"matrix": [3, 1], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [7, 4], "x": 7, "y": 1}, + {"matrix": [7, 5], "x": 8, "y": 1}, + {"matrix": [7, 6], "x": 9, "y": 1}, + {"matrix": [7, 7], "x": 10, "y": 1}, + {"matrix": [7, 0], "x": 11, "y": 1}, + {"matrix": [7, 1], "x": 12, "y": 1}, + {"matrix": [7, 2], "x": 13, "y": 1}, + + {"matrix": [7, 3], "x": 14.25, "y": 1.6875, "h": 0.6875}, + + {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [8, 4], "x": 7.25, "y": 2}, + {"matrix": [8, 5], "x": 8.25, "y": 2}, + {"matrix": [8, 6], "x": 9.25, "y": 2}, + {"matrix": [8, 7], "x": 10.25, "y": 2}, + {"matrix": [8, 0], "x": 11.25, "y": 2}, + {"matrix": [8, 1], "x": 12.25, "y": 2, "w": 1.75}, + + {"matrix": [8, 2], "x": 14.25, "y": 2.375, "h": 0.6875}, + + {"matrix": [11, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [0, 3], "x": 1.75, "y": 3}, + {"matrix": [2, 0], "x": 2.75, "y": 3}, + {"matrix": [5, 4], "x": 3.75, "y": 3}, + {"matrix": [5, 5], "x": 4.75, "y": 3}, + {"matrix": [5, 6], "x": 5.75, "y": 3}, + {"matrix": [5, 7], "x": 6.75, "y": 3}, + {"matrix": [9, 4], "x": 7.75, "y": 3}, + {"matrix": [9, 5], "x": 8.75, "y": 3}, + {"matrix": [9, 6], "x": 9.75, "y": 3}, + {"matrix": [9, 0], "x": 10.75, "y": 3}, + {"matrix": [11, 1], "x": 11.75, "y": 3, "w": 1.25}, + {"matrix": [9, 1], "x": 13, "y": 3}, + + {"matrix": [9, 2], "x": 14.25, "y": 3.0625, "h": 0.6875}, + + {"matrix": [3, 2], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 1.25, "y": 4}, + {"matrix": [4, 3], "x": 2.25, "y": 4}, + {"matrix": [1, 0], "x": 3.25, "y": 4}, + {"matrix": [2, 7], "x": 4.25, "y": 4, "w": 3.5}, + {"matrix": [6, 7], "x": 7.75, "y": 4}, + {"matrix": [1, 7], "x": 8.75, "y": 4}, + {"matrix": [9, 7], "x": 9.75, "y": 4}, + {"matrix": [10, 0], "x": 10.75, "y": 4, "w": 1.25}, + {"matrix": [10, 1], "x": 12, "y": 4}, + {"matrix": [10, 2], "x": 13, "y": 4}, + {"matrix": [10, 3], "x": 14, "y": 4} + ] + } } - } } diff --git a/keyboards/converter/palm_usb/stowaway/stowaway.h b/keyboards/converter/palm_usb/stowaway/stowaway.h deleted file mode 100644 index 71af9bf4a8..0000000000 --- a/keyboards/converter/palm_usb/stowaway/stowaway.h +++ /dev/null @@ -1,53 +0,0 @@ -/* -Copyright 2018 milestogo - -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" - - -/* Stowaway Keyboard - based on matrix from http://www.splorp.com/pdf/stowawayhwref.pdf - - 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, BACK APP0, - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, APP1, - CAPS, A, S, D, F, G, H, J, K, L, SCLN, QUOT, ENT, APP2, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, UP, APP3, - LCTL, FN, LALT, CMD, SPACE,SPACE,GRAVE,DONE, DEL, LEFT, DOWN, RIGHT - -*/ -#define LAYOUT( \ - K000, K001, K002, K004, K005, K006, K007, K064, K065, K066, K060, K061, K062, K063,\ - K031, K011, K012, K013, K014, K015, K016, K074, K075, K076, K077, K070, K071, K072, K073,\ - K030, K021, K022, K023, K024, K025, K026, K084, K085, K086, K087, K080, K081, K082,\ - K110, K003, K020, K054, K055, K056, K057, K094, K095, K096, K090, K111, K091, K092,\ - K032, K042, K043, K010, K027, K067, K017, K097, K100, K101, K102, K103 \ -) { \ - { K000, K001, K002 , K003, K004, K005, K006, K007 }, \ - { K010, K011, K012 , K013, K014, K015, K016, K017 }, \ - { K020, K021, K022 , K023, K024, K025, K026, K027 }, \ - { K030, K031, K032 , KC_NO,KC_NO, KC_NO,KC_NO, KC_NO }, \ - { KC_NO, KC_NO, K042 , K043, KC_NO, KC_NO,KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO,K054, K055, K056, K057 }, \ - { K060, K061, K062 , K063, K064, K065, K066, K067 }, \ - { K070, K071, K072 , K073, K074, K075, K076, K077 }, \ - { K080, K081, K082 , KC_NO,K084, K085, K086, K087 }, \ - { K090, K091, K092 , KC_NO,K094, K095, K096, K097 }, \ - { K100, K101, K102 , K103, KC_NO, KC_NO,KC_NO, KC_NO }, \ - { K110, K111, KC_NO, KC_NO,KC_NO, KC_NO,KC_NO, KC_NO } \ -} - diff --git a/keyboards/converter/periboard_512/info.json b/keyboards/converter/periboard_512/info.json index b21e21abdf..08cc8ee9bf 100644 --- a/keyboards/converter/periboard_512/info.json +++ b/keyboards/converter/periboard_512/info.json @@ -18,115 +18,127 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0, "h":0.833}, - {"label":"F1", "x":2, "y":0, "h":0.833}, - {"label":"F2", "x":3, "y":0, "h":0.833}, - {"label":"F3", "x":4, "y":0, "h":0.833}, - {"label":"F4", "x":5, "y":0, "h":0.833}, - {"label":"F5", "x":6, "y":0, "h":0.833}, - {"label":"F6", "x":7, "y":0, "h":0.833}, - {"label":"F7", "x":8, "y":0, "h":0.833}, - {"label":"F8", "x":9, "y":0, "h":0.833}, - {"label":"F9", "x":10, "y":0, "h":0.833}, - {"label":"F10", "x":11, "y":0, "h":0.833}, - {"label":"F11", "x":12, "y":0, "h":0.833}, - {"label":"F12", "x":13, "y":0, "h":0.833}, - {"label":"PrtSc", "x":14.25, "y":0, "h":0.833}, - {"label":"Scroll Lock", "x":15.25, "y":0, "h":0.833}, - {"label":"Pause", "x":16.25, "y":0, "h":0.833}, - - {"label":"~", "x":0, "y":1.333}, - {"label":"!", "x":1, "y":1.333}, - {"label":"@", "x":2, "y":1.333}, - {"label":"#", "x":3, "y":1.333}, - {"label":"$", "x":4, "y":1.333}, - {"label":"%", "x":5, "y":1.333}, - {"label":"^", "x":6, "y":1.333}, - {"label":"&", "x":7, "y":1.333}, - {"label":"*", "x":8, "y":1.333}, - {"label":"(", "x":9, "y":1.333}, - {"label":")", "x":10, "y":1.333}, - {"label":"_", "x":11, "y":1.333}, - {"label":"+", "x":12, "y":1.333}, - {"label":"Backspace", "x":13, "y":1.333, "w":2}, - {"label":"Insert", "x":16.25, "y":3, "h":0.833}, - {"label":"Home", "x":15.25, "y":1.333, "h":0.833}, - {"label":"PgUp", "x":16.25, "y":1.333, "h":0.833}, - {"label":"Num Lock", "x":17.5, "y":1.333}, - {"label":"/", "x":18.5, "y":1.333}, - {"label":"*", "x":19.5, "y":1.333}, - {"label":"-", "x":20.5, "y":1.333}, - - {"label":"Tab", "x":0, "y":2.333, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.333}, - {"label":"W", "x":2.5, "y":2.333}, - {"label":"E", "x":3.5, "y":2.333}, - {"label":"R", "x":4.5, "y":2.333}, - {"label":"T", "x":5.5, "y":2.333}, - {"label":"Y", "x":6.5, "y":2.333}, - {"label":"U", "x":7.5, "y":2.333}, - {"label":"I", "x":8.5, "y":2.333}, - {"label":"O", "x":9.5, "y":2.333}, - {"label":"P", "x":10.5, "y":2.333}, - {"label":"{", "x":11.5, "y":2.333}, - {"label":"}", "x":12.5, "y":2.333}, - {"label":"|", "x":13.5, "y":2.333, "w":1.5}, - {"label":"Delete", "x":15.25, "y":3, "h":0.833}, - {"label":"End", "x":15.25, "y":2.167, "h":0.833}, - {"label":"PgDn", "x":16.25, "y":2.167, "h":0.833}, - {"label":"7", "x":17.5, "y":2.333}, - {"label":"8", "x":18.5, "y":2.333}, - {"label":"9", "x":19.5, "y":2.333}, - {"label":"+", "x":20.5, "y":2.333, "h":2}, - - {"label":"Caps Lock", "x":0, "y":3.333, "w":1.75}, - {"label":"A", "x":1.75, "y":3.333}, - {"label":"S", "x":2.75, "y":3.333}, - {"label":"D", "x":3.75, "y":3.333}, - {"label":"F", "x":4.75, "y":3.333}, - {"label":"G", "x":5.75, "y":3.333}, - {"label":"H", "x":6.75, "y":3.333}, - {"label":"J", "x":7.75, "y":3.333}, - {"label":"K", "x":8.75, "y":3.333}, - {"label":"L", "x":9.75, "y":3.333}, - {"label":":", "x":10.75, "y":3.333}, - {"label":"\"", "x":11.75, "y":3.333}, - {"label":"Enter", "x":12.75, "y":3.333, "w":2.25}, - {"label":"4", "x":17.5, "y":3.333}, - {"label":"5", "x":18.5, "y":3.333}, - {"label":"6", "x":19.5, "y":3.333}, - - {"label":"Shift", "x":0, "y":4.333, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.333}, - {"label":"X", "x":3.25, "y":4.333}, - {"label":"C", "x":4.25, "y":4.333}, - {"label":"V", "x":5.25, "y":4.333}, - {"label":"B", "x":6.25, "y":4.333}, - {"label":"N", "x":7.25, "y":4.333}, - {"label":"M", "x":8.25, "y":4.333}, - {"label":"<", "x":9.25, "y":4.333}, - {"label":">", "x":10.25, "y":4.333}, - {"label":"?", "x":11.25, "y":4.333}, - {"label":"Shift", "x":12.25, "y":4.333, "w":2.75}, - {"label":"Up", "x":15.75, "y":3.833, "h":0.833}, - {"label":"1", "x":17.5, "y":4.333}, - {"label":"2", "x":18.5, "y":4.333}, - {"label":"3", "x":19.5, "y":4.333}, - {"label":"Enter", "x":20.5, "y":4.333, "h":2}, - - {"label":"Ctrl", "x":0, "y":5.333, "w":1.25}, - {"label":"GUI", "x":1.25, "y":5.333, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.333, "w":1.25}, - {"label":"Space", "x":3.75, "y":5.333, "w":6.25}, - {"label":"Alt", "x":10, "y":5.333, "w":1.25}, - {"label":"GUI", "x":11.25, "y":5.333, "w":1.25}, - {"label":"Menu", "x":12.5, "y":5.333, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":5.333, "w":1.25}, - {"label":"Left", "x":15.25, "y":4.667, "h":0.833}, - {"label":"Down", "x":15.75, "y":5.5, "h":0.833}, - {"label":"Right", "x":16.25, "y":4.667, "h":0.833}, - {"label":"0", "x":17.5, "y":5.333, "w":2}, - {"label":".", "x":19.5, "y":5.333} + {"matrix": [5, 7], "x": 0, "y": 0, "h": 0.833}, + + {"matrix": [0, 6], "x": 2, "y": 0, "h": 0.833}, + {"matrix": [0, 5], "x": 3, "y": 0, "h": 0.833}, + {"matrix": [4, 5], "x": 4, "y": 0, "h": 0.833}, + {"matrix": [5, 5], "x": 5, "y": 0, "h": 0.833}, + {"matrix": [5, 16], "x": 6, "y": 0, "h": 0.833}, + {"matrix": [5, 3], "x": 7, "y": 0, "h": 0.833}, + {"matrix": [4, 2], "x": 8, "y": 0, "h": 0.833}, + {"matrix": [0, 2], "x": 9, "y": 0, "h": 0.833}, + {"matrix": [0, 16], "x": 10, "y": 0, "h": 0.833}, + {"matrix": [1, 16], "x": 11, "y": 0, "h": 0.833}, + {"matrix": [1, 14], "x": 12, "y": 0, "h": 0.833}, + {"matrix": [1, 15], "x": 13, "y": 0, "h": 0.833}, + {"matrix": [1, 11], "x": 14.25, "y": 0, "h": 0.833}, + {"matrix": [2, 11], "x": 15.25, "y": 0, "h": 0.833}, + {"matrix": [6, 12], "x": 16.25, "y": 0, "h": 0.833}, + + {"matrix": [0, 7], "x": 0, "y": 1.333}, + {"matrix": [1, 7], "x": 1, "y": 1.333}, + {"matrix": [1, 6], "x": 2, "y": 1.333}, + {"matrix": [1, 5], "x": 3, "y": 1.333}, + {"matrix": [1, 10], "x": 4, "y": 1.333}, + {"matrix": [0, 10], "x": 5, "y": 1.333}, + {"matrix": [0, 18], "x": 6, "y": 1.333}, + {"matrix": [1, 18], "x": 7, "y": 1.333}, + {"matrix": [1, 3], "x": 8, "y": 1.333}, + {"matrix": [1, 2], "x": 9, "y": 1.333}, + {"matrix": [1, 1], "x": 10, "y": 1.333}, + {"matrix": [0, 1], "x": 11, "y": 1.333}, + {"matrix": [0, 3], "x": 12, "y": 1.333}, + {"matrix": [4, 16], "x": 13, "y": 1.333, "w": 2}, + + {"matrix": [0, 15], "x": 16.25, "y": 3, "h": 0.833}, + + {"matrix": [0, 12], "x": 15.25, "y": 1.333, "h": 0.833}, + {"matrix": [0, 13], "x": 16.25, "y": 1.333, "h": 0.833}, + + {"matrix": [6, 14], "x": 17.5, "y": 1.333}, + {"matrix": [6, 15], "x": 18.5, "y": 1.333}, + {"matrix": [6, 13], "x": 19.5, "y": 1.333}, + {"matrix": [7, 13], "x": 20.5, "y": 1.333}, + + {"matrix": [4, 7], "x": 0, "y": 2.333, "w": 1.5}, + {"matrix": [2, 7], "x": 1.5, "y": 2.333}, + {"matrix": [2, 6], "x": 2.5, "y": 2.333}, + {"matrix": [2, 5], "x": 3.5, "y": 2.333}, + {"matrix": [2, 10], "x": 4.5, "y": 2.333}, + {"matrix": [4, 10], "x": 5.5, "y": 2.333}, + {"matrix": [4, 4], "x": 6.5, "y": 2.333}, + {"matrix": [2, 4], "x": 7.5, "y": 2.333}, + {"matrix": [2, 3], "x": 8.5, "y": 2.333}, + {"matrix": [2, 2], "x": 9.5, "y": 2.333}, + {"matrix": [2, 1], "x": 10.5, "y": 2.333}, + {"matrix": [4, 1], "x": 11.5, "y": 2.333}, + {"matrix": [4, 3], "x": 12.5, "y": 2.333}, + {"matrix": [3, 16], "x": 13.5, "y": 2.333, "w": 1.5}, + + {"matrix": [0, 14], "x": 15.25, "y": 3, "h": 0.833}, + + {"matrix": [1, 12], "x": 15.25, "y": 2.167, "h": 0.833}, + {"matrix": [1, 13], "x": 16.25, "y": 2.167, "h": 0.833}, + + {"matrix": [2, 14], "x": 17.5, "y": 2.333}, + {"matrix": [2, 15], "x": 18.5, "y": 2.333}, + {"matrix": [2, 13], "x": 19.5, "y": 2.333}, + {"matrix": [2, 12], "x": 20.5, "y": 2.333, "h": 2}, + + {"matrix": [4, 6], "x": 0, "y": 3.333, "w": 1.75}, + {"matrix": [3, 7], "x": 1.75, "y": 3.333}, + {"matrix": [3, 6], "x": 2.75, "y": 3.333}, + {"matrix": [3, 5], "x": 3.75, "y": 3.333}, + {"matrix": [3, 10], "x": 4.75, "y": 3.333}, + {"matrix": [5, 10], "x": 5.75, "y": 3.333}, + {"matrix": [5, 4], "x": 6.75, "y": 3.333}, + {"matrix": [3, 4], "x": 7.75, "y": 3.333}, + {"matrix": [3, 3], "x": 8.75, "y": 3.333}, + {"matrix": [3, 2], "x": 9.75, "y": 3.333}, + {"matrix": [3, 1], "x": 10.75, "y": 3.333}, + {"matrix": [5, 1], "x": 11.75, "y": 3.333}, + {"matrix": [6, 16], "x": 12.75, "y": 3.333, "w": 2.25}, + + {"matrix": [4, 14], "x": 17.5, "y": 3.333}, + {"matrix": [4, 15], "x": 18.5, "y": 3.333}, + {"matrix": [4, 13], "x": 19.5, "y": 3.333}, + + {"matrix": [4, 9], "x": 0, "y": 4.333, "w": 2.25}, + {"matrix": [6, 7], "x": 2.25, "y": 4.333}, + {"matrix": [6, 6], "x": 3.25, "y": 4.333}, + {"matrix": [6, 5], "x": 4.25, "y": 4.333}, + {"matrix": [6, 10], "x": 5.25, "y": 4.333}, + {"matrix": [7, 10], "x": 6.25, "y": 4.333}, + {"matrix": [7, 4], "x": 7.25, "y": 4.333}, + {"matrix": [6, 4], "x": 8.25, "y": 4.333}, + {"matrix": [6, 3], "x": 9.25, "y": 4.333}, + {"matrix": [6, 2], "x": 10.25, "y": 4.333}, + {"matrix": [7, 1], "x": 11.25, "y": 4.333}, + {"matrix": [6, 9], "x": 12.25, "y": 4.333, "w": 2.75}, + + {"matrix": [5, 12], "x": 15.75, "y": 3.833, "h": 0.833}, + + {"matrix": [3, 14], "x": 17.5, "y": 4.333}, + {"matrix": [3, 15], "x": 18.5, "y": 4.333}, + {"matrix": [3, 13], "x": 19.5, "y": 4.333}, + {"matrix": [3, 12], "x": 20.5, "y": 4.333, "h": 2}, + + {"matrix": [0, 8], "x": 0, "y": 5.333, "w": 1.25}, + {"matrix": [3, 17], "x": 1.25, "y": 5.333, "w": 1.25}, + {"matrix": [5, 11], "x": 2.5, "y": 5.333, "w": 1.25}, + {"matrix": [7, 16], "x": 3.75, "y": 5.333, "w": 6.25}, + {"matrix": [7, 11], "x": 10, "y": 5.333, "w": 1.25}, + {"matrix": [6, 0], "x": 11.25, "y": 5.333, "w": 1.25}, + {"matrix": [2, 17], "x": 12.5, "y": 5.333, "w": 1.25}, + {"matrix": [6, 8], "x": 13.75, "y": 5.333, "w": 1.25}, + + {"matrix": [7, 12], "x": 15.25, "y": 4.667, "h": 0.833}, + {"matrix": [7, 14], "x": 15.75, "y": 5.5, "h": 0.833}, + {"matrix": [7, 15], "x": 16.25, "y": 4.667, "h": 0.833}, + + {"matrix": [5, 15], "x": 17.5, "y": 5.333, "w": 2}, + {"matrix": [5, 13], "x": 19.5, "y": 5.333} ] } } diff --git a/keyboards/converter/periboard_512/periboard_512.c b/keyboards/converter/periboard_512/periboard_512.c deleted file mode 100644 index 11c65e923a..0000000000 --- a/keyboards/converter/periboard_512/periboard_512.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Sife - * - * 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 "periboard_512.h" diff --git a/keyboards/converter/periboard_512/periboard_512.h b/keyboards/converter/periboard_512/periboard_512.h deleted file mode 100644 index d792642339..0000000000 --- a/keyboards/converter/periboard_512/periboard_512.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 Sife - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \ - \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, K4S, K4T, K4U, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, K3R, K3S, K3T, K3U, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K2O, K2P, \ - K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1O, K1P, K1Q, \ - K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, K0K, K0L, K0M \ -) \ -{ \ - { KC_NO, K4L, K5I, K4M, KC_NO, K5C, K5B, K4A, K0A, KC_NO, K4F, KC_NO, K4P, K4Q, K3O, K4O, K5J, KC_NO, K4G }, \ - { KC_NO, K4K, K4J, K4I, KC_NO, K4D, K4C, K4B, KC_NO, KC_NO, K4E, K5N, K3P, K3Q, K5L, K5M, K5K, KC_NO, K4H }, \ - { KC_NO, K3K, K3J, K3I, K3H, K3D, K3C, K3B, KC_NO, KC_NO, K3E, K5O, K3U, K3T, K3R, K3S, KC_NO, K0G, KC_NO }, \ - { KC_NO, K2K, K2J, K2I, K2H, K2D, K2C, K2B, KC_NO, KC_NO, K2E, KC_NO, K1Q, K1P, K1N, K1O, K3N, K0B, KC_NO }, \ - { KC_NO, K3L, K5H, K3M, K3G, K5D, K2A, K3A, KC_NO, K1A, K3F, KC_NO, KC_NO, K2P, K2N, K2O, K4N, KC_NO, KC_NO }, \ - { KC_NO, K2L, KC_NO, K5G, K2G, K5E, KC_NO, K5A, KC_NO, KC_NO, K2F, K0C, K1M, K0M, KC_NO, K0L, K5F, KC_NO, KC_NO }, \ - { K0F, KC_NO, K1J, K1I, K1H, K1D, K1C, K1B, K0H, K1L, K1E, KC_NO, K5P, K4T, K4R, K4S, K2M, KC_NO, KC_NO }, \ - { KC_NO, K1K, KC_NO, KC_NO, K1G, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1F, K0E, K0I, K4U, K0J, K0K, K0D, KC_NO, KC_NO }, \ -} diff --git a/keyboards/converter/siemens_tastatur/config.h b/keyboards/converter/siemens_tastatur/config.h index b21326d298..49725a9592 100644 --- a/keyboards/converter/siemens_tastatur/config.h +++ b/keyboards/converter/siemens_tastatur/config.h @@ -21,11 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROWS 5 #define MATRIX_COLS 19 -//This is all fake and not used -#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C15, C14, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } -#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 } -#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/converter/siemens_tastatur/info.json b/keyboards/converter/siemens_tastatur/info.json index db6560a03a..8ed2523c26 100644 --- a/keyboards/converter/siemens_tastatur/info.json +++ b/keyboards/converter/siemens_tastatur/info.json @@ -13,87 +13,87 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "w": 1.5}, - {"x": 1.5, "y": 0}, - {"x": 2.5, "y": 0}, - {"x": 3.5, "y": 0}, - {"x": 4.5, "y": 0}, - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 10.5, "y": 0}, - {"x": 11.5, "y": 0}, - {"x": 12.5, "y": 0}, - {"x": 13.5, "y": 0, "h": 2}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0, "h": 2}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, - {"x": 17, "y": 0}, - {"x": 18, "y": 0}, - {"x": 19, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [0, 15], "x": 16, "y": 0}, + {"matrix": [0, 16], "x": 17, "y": 0}, + {"matrix": [0, 17], "x": 18, "y": 0}, + {"matrix": [0, 18], "x": 19, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 6, "y": 1}, - {"x": 7, "y": 1}, - {"x": 8, "y": 1}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1, "w": 1.5}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1, "w": 1.5}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, - {"x": 17, "y": 1}, - {"x": 18, "y": 1}, - {"x": 19, "y": 1}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [1, 15], "x": 16, "y": 1}, + {"matrix": [1, 16], "x": 17, "y": 1}, + {"matrix": [1, 17], "x": 18, "y": 1}, + {"matrix": [1, 18], "x": 19, "y": 1}, - {"x": 0, "y": 2, "w": 1.25}, - {"x": 1.25, "y": 2}, - {"x": 2.25, "y": 2}, - {"x": 3.25, "y": 2}, - {"x": 4.25, "y": 2}, - {"x": 5.25, "y": 2}, - {"x": 6.25, "y": 2}, - {"x": 7.25, "y": 2}, - {"x": 8.25, "y": 2}, - {"x": 9.25, "y": 2}, - {"x": 10.25, "y": 2}, - {"x": 11.25, "y": 2}, - {"x": 12.25, "y": 2, "w": 1.25}, - {"x": 13.5, "y": 2, "h": 2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2}, + {"matrix": [2, 12], "x": 12.25, "y": 2, "w": 1.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "h": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, - {"x": 17, "y": 2}, - {"x": 18, "y": 2}, - {"x": 19, "y": 2}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [2, 15], "x": 16, "y": 2}, + {"matrix": [2, 16], "x": 17, "y": 2}, + {"matrix": [2, 17], "x": 18, "y": 2}, + {"matrix": [2, 18], "x": 19, "y": 2}, - {"x": 0, "y": 3, "w": 1.75}, - {"x": 1.75, "y": 3}, - {"x": 2.75, "y": 3}, - {"x": 3.75, "y": 3}, - {"x": 4.75, "y": 3}, - {"x": 5.75, "y": 3}, - {"x": 6.75, "y": 3}, - {"x": 7.75, "y": 3}, - {"x": 8.75, "y": 3}, - {"x": 9.75, "y": 3}, - {"x": 10.75, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, - {"x": 15, "y": 3}, - {"x": 16, "y": 3}, - {"x": 17, "y": 3}, - {"x": 18, "y": 3}, - {"x": 19, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [3, 15], "x": 16, "y": 3}, + {"matrix": [3, 16], "x": 17, "y": 3}, + {"matrix": [3, 17], "x": 18, "y": 3}, + {"matrix": [3, 18], "x": 19, "y": 3}, - {"x": 3.5, "y": 4, "w": 6.5} + {"matrix": [3, 11], "x": 3.5, "y": 4, "w": 6.5} ] } } diff --git a/keyboards/converter/siemens_tastatur/siemens_tastatur.c b/keyboards/converter/siemens_tastatur/siemens_tastatur.c deleted file mode 100644 index 21d00c8c30..0000000000 --- a/keyboards/converter/siemens_tastatur/siemens_tastatur.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2019 Yiancar - -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 "siemens_tastatur.h" diff --git a/keyboards/converter/siemens_tastatur/siemens_tastatur.h b/keyboards/converter/siemens_tastatur/siemens_tastatur.h deleted file mode 100644 index f14cd82a8d..0000000000 --- a/keyboards/converter/siemens_tastatur/siemens_tastatur.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2019 Yiancar - -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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, k0i, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, k1g, k1h, k1i, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, k2i, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3e, k3f, k3g, k3h, k3i, \ - k3b \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, k0i }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, k1e, k1f, k1g, k1h, k1i }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, k2i }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, KC_NO, k3e, k3f, k3g, k3h, k3i }, \ -} diff --git a/keyboards/converter/sun_usb/command_extra.c b/keyboards/converter/sun_usb/command_extra.c deleted file mode 100644 index b15f9dc9bd..0000000000 --- a/keyboards/converter/sun_usb/command_extra.c +++ /dev/null @@ -1,64 +0,0 @@ -#include QMK_KEYBOARD_H -#include "uart.h" - -bool sun_bell = false; -bool sun_click = false; - - -bool command_extra(uint8_t code) -{ - switch (code) { - case KC_H: - case KC_SLASH: /* ? */ - print("\n\n----- Sun converter Help -----\n"); - print("Home: Toggle Bell\n"); - print("End: Toggle Click\n"); - print("PgUp: LED all On\n"); - print("PgDown: LED all Off\n"); - print("Insert: Layout\n"); - print("Delete: Reset\n"); - return false; - case KC_DEL: - print("Reset\n"); - uart_write(0x01); - break; - case KC_HOME: - sun_bell = !sun_bell; - if (sun_bell) { - print("Bell On\n"); - uart_write(0x02); - } else { - print("Bell Off\n"); - uart_write(0x03); - } - break; - case KC_END: - sun_click = !sun_click; - if (sun_click) { - print("Click On\n"); - uart_write(0x0A); - } else { - print("Click Off\n"); - uart_write(0x0B); - } - break; - case KC_PGUP: - print("LED all on\n"); - uart_write(0x0E); - uart_write(0xFF); - break; - case KC_PGDN: - print("LED all off\n"); - uart_write(0x0E); - uart_write(0x00); - break; - case KC_INSERT: - print("layout\n"); - uart_write(0x0F); - break; - default: - xprintf("Unknown extra command: %02X\n", code); - return false; - } - return true; -} diff --git a/keyboards/converter/sun_usb/led.c b/keyboards/converter/sun_usb/led.c index f8d183fd48..493825bac8 100644 --- a/keyboards/converter/sun_usb/led.c +++ b/keyboards/converter/sun_usb/led.c @@ -15,7 +15,8 @@ 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 QMK_KEYBOARD_H +#include "led.h" +#include "print.h" #include "uart.h" void led_set(uint8_t usb_led) diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c index 9f22eca1eb..bf1d5f807f 100644 --- a/keyboards/converter/sun_usb/matrix.c +++ b/keyboards/converter/sun_usb/matrix.c @@ -15,7 +15,11 @@ 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 QMK_KEYBOARD_H +#include "matrix.h" +#include "host.h" +#include "led.h" +#include "debug.h" +#include "wait.h" #include "uart.h" /* @@ -86,9 +90,9 @@ void matrix_init(void) /* print("."); */ /* while (uart_read()); */ /* uart_write(0x01); */ - /* _delay_ms(500); */ + /* wait_ms(500); */ /* if (uart_read() == 0xFF) { */ - /* _delay_ms(500); */ + /* wait_ms(500); */ /* if (uart_read() == 0x04) */ /* break; */ /* } */ @@ -112,7 +116,7 @@ uint8_t matrix_scan(void) switch (code) { case 0xFF: // reset success: FF 04 print("reset: "); - _delay_ms(500); + wait_ms(500); code = uart_read(); xprintf("%02X\n", code); if (code == 0x04) { @@ -122,12 +126,12 @@ uint8_t matrix_scan(void) return 0; case 0xFE: // layout: FE <layout> print("layout: "); - _delay_ms(500); + wait_ms(500); xprintf("%02X\n", uart_read()); return 0; case 0x7E: // reset fail: 7E 01 print("reset fail: "); - _delay_ms(500); + wait_ms(500); xprintf("%02X\n", uart_read()); return 0; case 0x7F: diff --git a/keyboards/converter/sun_usb/type3/info.json b/keyboards/converter/sun_usb/type3/info.json index 383d7d65e5..6e065eaa73 100644 --- a/keyboards/converter/sun_usb/type3/info.json +++ b/keyboards/converter/sun_usb/type3/info.json @@ -1,103 +1,118 @@ { - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"STOP", "x":0, "y":0}, - {"label":"AGAIN", "x":1, "y":0}, - {"label":"CAPS LOCK", "x":2.5, "y":0}, - {"label":"F2", "x":3.5, "y":0}, - {"label":"F3", "x":4.5, "y":0, "w":2}, - {"label":"F4", "x":6.5, "y":0, "w":2}, - {"label":"F5", "x":8.5, "y":0, "w":2}, - {"label":"F6", "x":10.5, "y":0, "w":2}, - {"label":"F7", "x":12.5, "y":0, "w":2}, - {"label":"F8", "x":14.5, "y":0}, - {"label":"F9", "x":15.5, "y":0}, - {"label":"BACKSPACE", "x":16.5, "y":0}, - {"label":"R1", "x":18, "y":0}, - {"label":"R2", "x":19, "y":0}, - {"label":"R3", "x":20, "y":0}, - {"label":"PROPS", "x":0, "y":1}, - {"label":"UNDO", "x":1, "y":1}, - {"label":"ESC", "x":2.5, "y":1}, - {"label":"1", "x":3.5, "y":1}, - {"label":"2", "x":4.5, "y":1}, - {"label":"3", "x":5.5, "y":1}, - {"label":"4", "x":6.5, "y":1}, - {"label":"5", "x":7.5, "y":1}, - {"label":"6", "x":8.5, "y":1}, - {"label":"7", "x":9.5, "y":1}, - {"label":"8", "x":10.5, "y":1}, - {"label":"9", "x":11.5, "y":1}, - {"label":"0", "x":12.5, "y":1}, - {"label":"MINUS", "x":13.5, "y":1}, - {"label":"EQUAL", "x":14.5, "y":1}, - {"label":"BACKSLASH", "x":15.5, "y":1}, - {"label":"GRAVE", "x":16.5, "y":1}, - {"label":"R4", "x":18, "y":1}, - {"label":"R5", "x":19, "y":1}, - {"label":"R6", "x":20, "y":1}, - {"label":"FRONT", "x":0, "y":2}, - {"label":"COPY", "x":1, "y":2}, - {"label":"TAB", "x":2.5, "y":2, "w":1.5}, - {"label":"Q", "x":4, "y":2}, - {"label":"W", "x":5, "y":2}, - {"label":"E", "x":6, "y":2}, - {"label":"R", "x":7, "y":2}, - {"label":"T", "x":8, "y":2}, - {"label":"Y", "x":9, "y":2}, - {"label":"U", "x":10, "y":2}, - {"label":"I", "x":11, "y":2}, - {"label":"O", "x":12, "y":2}, - {"label":"P", "x":13, "y":2}, - {"label":"LBRACKET", "x":14, "y":2}, - {"label":"RBRACKET", "x":15, "y":2}, - {"label":"DELETE", "x":16, "y":2, "w":1.5}, - {"label":"R7", "x":18, "y":2}, - {"label":"R8", "x":19, "y":2}, - {"label":"R9", "x":20, "y":2}, - {"label":"OPEN", "x":0, "y":3}, - {"label":"PASTE", "x":1, "y":3}, - {"label":"CONTROL", "x":2.5, "y":3, "w":1.75}, - {"label":"A", "x":4.25, "y":3}, - {"label":"S", "x":5.25, "y":3}, - {"label":"D", "x":6.25, "y":3}, - {"label":"F", "x":7.25, "y":3}, - {"label":"G", "x":8.25, "y":3}, - {"label":"H", "x":9.25, "y":3}, - {"label":"J", "x":10.25, "y":3}, - {"label":"K", "x":11.25, "y":3}, - {"label":"L", "x":12.25, "y":3}, - {"label":"SEMICOLON", "x":13.25, "y":3}, - {"label":"QUOTE", "x":14.25, "y":3}, - {"label":"RETURN", "x":15.25, "y":3, "w":2.25}, - {"label":"R10", "x":18, "y":3}, - {"label":"R11", "x":19, "y":3}, - {"label":"R12", "x":20, "y":3}, - {"label":"FIND", "x":0, "y":4}, - {"label":"CUT", "x":1, "y":4}, - {"label":"LSHIFT", "x":2.5, "y":4, "w":2.25}, - {"label":"Z", "x":4.75, "y":4}, - {"label":"X", "x":5.75, "y":4}, - {"label":"C", "x":6.75, "y":4}, - {"label":"V", "x":7.75, "y":4}, - {"label":"B", "x":8.75, "y":4}, - {"label":"N", "x":9.75, "y":4}, - {"label":"M", "x":10.75, "y":4}, - {"label":"COMMA", "x":11.75, "y":4}, - {"label":"PERIOD", "x":12.75, "y":4}, - {"label":"SLASH", "x":13.75, "y":4}, - {"label":"RSHIFT", "x":14.75, "y":4, "w":1.75}, - {"label":"LINE FEED", "x":16.5, "y":4}, - {"label":"R13", "x":18, "y":4}, - {"label":"R14", "x":19, "y":4}, - {"label":"R15", "x":20, "y":4}, - {"label":"CAPS", "x":2.5, "y":5, "w":1.25}, - {"label":"LEFT", "x":3.75, "y":5, "w":1.5}, - {"label":"SPACE", "x":5.25, "y":5, "w":9}, - {"label":"RIGHT", "x":14.25, "y":5, "w":1.5}, - {"label":"ALTERNATE", "x":15.75, "y":5, "w":1.75} - ] + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 1], "x": 0, "y": 0}, + {"matrix": [0, 3], "x": 1, "y": 0}, + + {"matrix": [0, 5], "x": 2.5, "y": 0}, + {"matrix": [0, 6], "x": 3.5, "y": 0}, + {"matrix": [1, 0], "x": 4.5, "y": 0, "w": 2}, + {"matrix": [1, 2], "x": 6.5, "y": 0, "w": 2}, + {"matrix": [1, 4], "x": 8.5, "y": 0, "w": 2}, + {"matrix": [1, 6], "x": 10.5, "y": 0, "w": 2}, + {"matrix": [2, 0], "x": 12.5, "y": 0, "w": 2}, + {"matrix": [2, 1], "x": 14.5, "y": 0}, + {"matrix": [2, 2], "x": 15.5, "y": 0}, + {"matrix": [5, 3], "x": 16.5, "y": 0}, + + {"matrix": [2, 5], "x": 18, "y": 0}, + {"matrix": [2, 6], "x": 19, "y": 0}, + {"matrix": [2, 7], "x": 20, "y": 0}, + + {"matrix": [3, 1], "x": 0, "y": 1}, + {"matrix": [3, 2], "x": 1, "y": 1}, + + {"matrix": [3, 5], "x": 2.5, "y": 1}, + {"matrix": [3, 6], "x": 3.5, "y": 1}, + {"matrix": [3, 7], "x": 4.5, "y": 1}, + {"matrix": [4, 0], "x": 5.5, "y": 1}, + {"matrix": [4, 1], "x": 6.5, "y": 1}, + {"matrix": [4, 2], "x": 7.5, "y": 1}, + {"matrix": [4, 3], "x": 8.5, "y": 1}, + {"matrix": [4, 4], "x": 9.5, "y": 1}, + {"matrix": [4, 5], "x": 10.5, "y": 1}, + {"matrix": [4, 6], "x": 11.5, "y": 1}, + {"matrix": [4, 7], "x": 12.5, "y": 1}, + {"matrix": [5, 0], "x": 13.5, "y": 1}, + {"matrix": [5, 1], "x": 14.5, "y": 1}, + {"matrix": [11, 0], "x": 15.5, "y": 1}, + {"matrix": [5, 2], "x": 16.5, "y": 1}, + + {"matrix": [5, 5], "x": 18, "y": 1}, + {"matrix": [5, 6], "x": 19, "y": 1}, + {"matrix": [5, 7], "x": 20, "y": 1}, + + {"matrix": [6, 1], "x": 0, "y": 2}, + {"matrix": [6, 3], "x": 1, "y": 2}, + + {"matrix": [6, 5], "x": 2.5, "y": 2, "w": 1.5}, + {"matrix": [6, 6], "x": 4, "y": 2}, + {"matrix": [6, 7], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 6, "y": 2}, + {"matrix": [7, 1], "x": 7, "y": 2}, + {"matrix": [7, 2], "x": 8, "y": 2}, + {"matrix": [7, 3], "x": 9, "y": 2}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 5], "x": 11, "y": 2}, + {"matrix": [7, 6], "x": 12, "y": 2}, + {"matrix": [7, 7], "x": 13, "y": 2}, + {"matrix": [8, 0], "x": 14, "y": 2}, + {"matrix": [8, 1], "x": 15, "y": 2}, + {"matrix": [8, 2], "x": 16, "y": 2, "w": 1.5}, + + {"matrix": [8, 4], "x": 18, "y": 2}, + {"matrix": [8, 5], "x": 19, "y": 2}, + {"matrix": [8, 6], "x": 20, "y": 2}, + + {"matrix": [9, 0], "x": 0, "y": 3}, + {"matrix": [9, 1], "x": 1, "y": 3}, + + {"matrix": [9, 4], "x": 2.5, "y": 3, "w": 1.75}, + {"matrix": [9, 5], "x": 4.25, "y": 3}, + {"matrix": [9, 6], "x": 5.25, "y": 3}, + {"matrix": [9, 7], "x": 6.25, "y": 3}, + {"matrix": [10, 0], "x": 7.25, "y": 3}, + {"matrix": [10, 1], "x": 8.25, "y": 3}, + {"matrix": [10, 2], "x": 9.25, "y": 3}, + {"matrix": [10, 3], "x": 10.25, "y": 3}, + {"matrix": [10, 4], "x": 11.25, "y": 3}, + {"matrix": [10, 5], "x": 12.25, "y": 3}, + {"matrix": [10, 6], "x": 13.25, "y": 3}, + {"matrix": [10, 7], "x": 14.25, "y": 3}, + {"matrix": [11, 1], "x": 15.25, "y": 3, "w": 2.25}, + + {"matrix": [11, 3], "x": 18, "y": 3}, + {"matrix": [11, 4], "x": 19, "y": 3}, + {"matrix": [11, 5], "x": 20, "y": 3}, + + {"matrix": [11, 7], "x": 0, "y": 4}, + {"matrix": [12, 1], "x": 1, "y": 4}, + + {"matrix": [12, 3], "x": 2.5, "y": 4, "w": 2.25}, + {"matrix": [12, 4], "x": 4.75, "y": 4}, + {"matrix": [12, 5], "x": 5.75, "y": 4}, + {"matrix": [12, 6], "x": 6.75, "y": 4}, + {"matrix": [12, 7], "x": 7.75, "y": 4}, + {"matrix": [13, 0], "x": 8.75, "y": 4}, + {"matrix": [13, 1], "x": 9.75, "y": 4}, + {"matrix": [13, 2], "x": 10.75, "y": 4}, + {"matrix": [13, 3], "x": 11.75, "y": 4}, + {"matrix": [13, 4], "x": 12.75, "y": 4}, + {"matrix": [13, 5], "x": 13.75, "y": 4}, + {"matrix": [13, 6], "x": 14.75, "y": 4, "w": 1.75}, + {"matrix": [13, 7], "x": 16.5, "y": 4}, + + {"matrix": [14, 0], "x": 18, "y": 4}, + {"matrix": [14, 1], "x": 19, "y": 4}, + {"matrix": [14, 2], "x": 20, "y": 4}, + + {"matrix": [14, 7], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [15, 0], "x": 3.75, "y": 5, "w": 1.5}, + {"matrix": [15, 1], "x": 5.25, "y": 5, "w": 9}, + {"matrix": [15, 2], "x": 14.25, "y": 5, "w": 1.5}, + {"matrix": [2, 3], "x": 15.75, "y": 5, "w": 1.75} + ] + } } - } } diff --git a/keyboards/converter/sun_usb/type3/type3.h b/keyboards/converter/sun_usb/type3/type3.h deleted file mode 100644 index b84a703d6b..0000000000 --- a/keyboards/converter/sun_usb/type3/type3.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -/* Sun type 3 keyboard -,-------. ,-----------------------------------------------------------. ,-----------. -| 01| 03| | 05| 06| 08| 0A| 0C| 0E| 10| 11| 12| 2B| | 15| 16| 17| -|-------| |-----------------------------------------------------------| |-----------| -| 19| 1A| | 1D| 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| 58| 2A| | 2D| 2E| 2F| -|-------| |-----------------------------------------------------------| |-----------| -| 31| 33| | 35 | 36| 37| 38| 39| 3A| 3B| 3C| 3D| 3E| 3F| 40| 41| 42 | | 44| 45| 46| -|-------| |-----------------------------------------------------------| |-----------| -| 48| 49| | 4C | 4D| 4E| 4F| 50| 51| 52| 53| 54| 55| 56| 57| 59 | | 5B| 5C| 5D| -|-------| |-----------------------------------------------------------| |-----------| -| 5F| 61| | 63 | 64| 65| 66| 67| 68| 69| 6A| 6B| 6C| 6D| 6E| 6F| | 70| 71| 72| -`-------' |-----------------------------------------------------------| `-----------' - | 77 | 78 | 79 | 7A | 13 | - `-----------------------------------------------------------' -*/ -#define LAYOUT( \ - k01, k03, k05, k06, k08, k0A, k0C, k0E, k10, k11, k12, k2B, k15, k16, k17, \ - k19, k1A, k1D, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k58, k2A, k2D, k2E, k2F, \ - k31, k33, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k44, k45, k46, \ - k48, k49, k4C, k4D, k4E, k4F, k50, k51, k52, k53, k54, k55, k56, k57, k59, k5B, k5C, k5D, \ - k5F, k61, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k70, k71, k72, \ - k77, k78, k79, k7A, k13 \ -) { \ - { XXX, k01, XXX, k03, XXX, k05, k06, XXX }, \ - { k08, XXX, k0A, XXX, k0C, XXX, k0E, XXX }, \ - { k10, k11, k12, k13, XXX, k15, k16, k17 }, \ - { XXX, k19, k1A, XXX, XXX, k1D, k1E, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k28, k29, k2A, k2B, XXX, k2D, k2E, k2F }, \ - { XXX, k31, XXX, k33, XXX, k35, k36, k37 }, \ - { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ - { k40, k41, k42, XXX, k44, k45, k46, XXX }, \ - { k48, k49, XXX, XXX, k4C, k4D, k4E, k4F }, \ - { k50, k51, k52, k53, k54, k55, k56, k57 }, \ - { k58, k59, XXX, k5B, k5C, k5D, XXX, k5F }, \ - { XXX, k61, XXX, k63, k64, k65, k66, k67 }, \ - { k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \ - { k70, k71, k72, XXX, XXX, XXX, XXX, k77 }, \ - { k78, k79, k7A, XXX, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/converter/sun_usb/type5/info.json b/keyboards/converter/sun_usb/type5/info.json index 23d80c4121..c26e85a65b 100644 --- a/keyboards/converter/sun_usb/type5/info.json +++ b/keyboards/converter/sun_usb/type5/info.json @@ -2,373 +2,448 @@ "layouts": { "LAYOUT_jp_unix": { "layout": [ - {"label":"HELP", "x":0, "y":0, "w":2}, - {"label":"NO", "x":2.25, "y":0}, - {"label":"F1", "x":4.25, "y":0}, - {"label":"F2", "x":5.25, "y":0}, - {"label":"F3", "x":6.25, "y":0}, - {"label":"F4", "x":7.25, "y":0}, - {"label":"F5", "x":8.75, "y":0}, - {"label":"F6", "x":9.75, "y":0}, - {"label":"F7", "x":10.75, "y":0}, - {"label":"F8", "x":11.75, "y":0}, - {"label":"F9", "x":13.25, "y":0}, - {"label":"F10", "x":14.25, "y":0}, - {"label":"F11", "x":15.25, "y":0}, - {"label":"F12", "x":16.25, "y":0}, - {"label":"PRINT SCREEN", "x":17.5, "y":0}, - {"label":"SCROLL LOCK", "x":18.5, "y":0}, - {"label":"PAUSE", "x":19.5, "y":0}, - {"label":"MUTE", "x":20.75, "y":0}, - {"label":"VOLD", "x":21.75, "y":0}, - {"label":"VOLU", "x":22.75, "y":0}, - {"label":"PWR", "x":23.75, "y":0}, - {"label":"STOP", "x":0, "y":2}, - {"label":"AGAIN", "x":1, "y":2}, - {"label":"ESC", "x":2.25, "y":2}, - {"label":"1", "x":3.25, "y":2}, - {"label":"2", "x":4.25, "y":2}, - {"label":"3", "x":5.25, "y":2}, - {"label":"4", "x":6.25, "y":2}, - {"label":"5", "x":7.25, "y":2}, - {"label":"6", "x":8.25, "y":2}, - {"label":"7", "x":9.25, "y":2}, - {"label":"8", "x":10.25, "y":2}, - {"label":"9", "x":11.25, "y":2}, - {"label":"0", "x":12.25, "y":2}, - {"label":"MINUS", "x":13.25, "y":2}, - {"label":"EQUAL", "x":14.25, "y":2}, - {"label":"BACKSLASH", "x":15.25, "y":2}, - {"label":"GRAVE", "x":16.25, "y":2}, - {"label":"INSERT", "x":17.5, "y":2}, - {"label":"HOME", "x":18.5, "y":2}, - {"label":"PAGE UP", "x":19.5, "y":2}, - {"label":"NUM LOCK", "x":20.75, "y":2}, - {"label":"PSLASH", "x":21.75, "y":2}, - {"label":"PASTERISK", "x":22.75, "y":2}, - {"label":"PMINUS", "x":23.75, "y":2}, - {"label":"MENU", "x":0, "y":3}, - {"label":"UNDO", "x":1, "y":3}, - {"label":"TAB", "x":2.25, "y":3, "w":1.5}, - {"label":"Q", "x":3.75, "y":3}, - {"label":"W", "x":4.75, "y":3}, - {"label":"E", "x":5.75, "y":3}, - {"label":"R", "x":6.75, "y":3}, - {"label":"T", "x":7.75, "y":3}, - {"label":"Y", "x":8.75, "y":3}, - {"label":"U", "x":9.75, "y":3}, - {"label":"I", "x":10.75, "y":3}, - {"label":"O", "x":11.75, "y":3}, - {"label":"P", "x":12.75, "y":3}, - {"label":"LBRACKET", "x":13.75, "y":3}, - {"label":"RBRACKET", "x":14.75, "y":3}, - {"label":"BACKSPACE", "x":15.75, "y":3, "w":1.5}, - {"label":"DELETE", "x":17.5, "y":3}, - {"label":"END", "x":18.5, "y":3}, - {"label":"PAGE DOWN", "x":19.5, "y":3}, - {"label":"P7", "x":20.75, "y":3}, - {"label":"P8", "x":21.75, "y":3}, - {"label":"P9", "x":22.75, "y":3}, - {"label":"PPLUS", "x":23.75, "y":3, "h":2}, - {"label":"SELECT", "x":0, "y":4}, - {"label":"COPY", "x":1, "y":4}, - {"label":"LCTRL", "x":2.25, "y":4, "w":1.75}, - {"label":"A", "x":4, "y":4}, - {"label":"S", "x":5, "y":4}, - {"label":"D", "x":6, "y":4}, - {"label":"F", "x":7, "y":4}, - {"label":"G", "x":8, "y":4}, - {"label":"H", "x":9, "y":4}, - {"label":"J", "x":10, "y":4}, - {"label":"K", "x":11, "y":4}, - {"label":"L", "x":12, "y":4}, - {"label":"SEMICOLON", "x":13, "y":4}, - {"label":"QUOTE", "x":14, "y":4}, - {"label":"ENTER", "x":15, "y":4, "w":2.25}, - {"label":"P4", "x":20.75, "y":4}, - {"label":"P5", "x":21.75, "y":4}, - {"label":"P6", "x":22.75, "y":4}, - {"label":"EXECUTE", "x":0, "y":5}, - {"label":"PASTE", "x":1, "y":5}, - {"label":"LSHIFT", "x":2.25, "y":5, "w":2.25}, - {"label":"Z", "x":4.5, "y":5}, - {"label":"X", "x":5.5, "y":5}, - {"label":"C", "x":6.5, "y":5}, - {"label":"V", "x":7.5, "y":5}, - {"label":"B", "x":8.5, "y":5}, - {"label":"N", "x":9.5, "y":5}, - {"label":"M", "x":10.5, "y":5}, - {"label":"COMMA", "x":11.5, "y":5}, - {"label":"PERIOD", "x":12.5, "y":5}, - {"label":"SLASH", "x":13.5, "y":5}, - {"label":"RSHIFT", "x":14.5, "y":5, "w":2.75}, - {"label":"UP", "x":18.5, "y":5}, - {"label":"P1", "x":20.75, "y":5}, - {"label":"P2", "x":21.75, "y":5}, - {"label":"P3", "x":22.75, "y":5}, - {"label":"PENTER", "x":23.75, "y":5, "h":2}, - {"label":"FIND", "x":0, "y":6}, - {"label":"CUT", "x":1, "y":6}, - {"label":"CAPS LOCK", "x":2.25, "y":6}, - {"label":"LALT", "x":3.25, "y":6}, - {"label":"LGUI", "x":4.25, "y":6}, - {"label":"HENKAN", "x":5.25, "y":6, "w":1.5}, - {"label":"SPACE", "x":6.75, "y":6, "w":5}, - {"label":"MUHENKAN", "x":11.75, "y":6, "w":1.5}, - {"label":"KANA", "x":13.25, "y":6}, - {"label":"RGUI", "x":14.25, "y":6}, - {"label":"APP", "x":15.25, "y":6}, - {"label":"RALT", "x":16.25, "y":6}, - {"label":"LEFT", "x":17.5, "y":6}, - {"label":"DOWN", "x":18.5, "y":6}, - {"label":"RIGHT", "x":19.5, "y":6}, - {"label":"P0", "x":20.75, "y":6, "w":2}, - {"label":"PDOT", "x":22.75, "y":6} + {"matrix": [14, 6], "x": 0, "y": 0, "w": 2}, + + {"matrix": [1, 7], "x": 2.25, "y": 0}, + + {"matrix": [0, 5], "x": 4.25, "y": 0}, + {"matrix": [0, 6], "x": 5.25, "y": 0}, + {"matrix": [1, 0], "x": 6.25, "y": 0}, + {"matrix": [1, 2], "x": 7.25, "y": 0}, + + {"matrix": [1, 4], "x": 8.75, "y": 0}, + {"matrix": [1, 6], "x": 9.75, "y": 0}, + {"matrix": [2, 0], "x": 10.75, "y": 0}, + {"matrix": [2, 1], "x": 11.75, "y": 0}, + + {"matrix": [2, 2], "x": 13.25, "y": 0}, + {"matrix": [0, 7], "x": 14.25, "y": 0}, + {"matrix": [1, 1], "x": 15.25, "y": 0}, + {"matrix": [1, 3], "x": 16.25, "y": 0}, + + {"matrix": [2, 6], "x": 17.5, "y": 0}, + {"matrix": [2, 7], "x": 18.5, "y": 0}, + {"matrix": [2, 5], "x": 19.5, "y": 0}, + + {"matrix": [5, 5], "x": 20.75, "y": 0}, + {"matrix": [0, 2], "x": 21.75, "y": 0}, + {"matrix": [0, 4], "x": 22.75, "y": 0}, + {"matrix": [6, 0], "x": 23.75, "y": 0}, + + {"matrix": [0, 1], "x": 0, "y": 2}, + {"matrix": [0, 3], "x": 1, "y": 2}, + + {"matrix": [3, 5], "x": 2.25, "y": 2}, + {"matrix": [3, 6], "x": 3.25, "y": 2}, + {"matrix": [3, 7], "x": 4.25, "y": 2}, + {"matrix": [4, 0], "x": 5.25, "y": 2}, + {"matrix": [4, 1], "x": 6.25, "y": 2}, + {"matrix": [4, 2], "x": 7.25, "y": 2}, + {"matrix": [4, 3], "x": 8.25, "y": 2}, + {"matrix": [4, 4], "x": 9.25, "y": 2}, + {"matrix": [4, 5], "x": 10.25, "y": 2}, + {"matrix": [4, 6], "x": 11.25, "y": 2}, + {"matrix": [4, 7], "x": 12.25, "y": 2}, + {"matrix": [5, 0], "x": 13.25, "y": 2}, + {"matrix": [5, 1], "x": 14.25, "y": 2}, + {"matrix": [11, 0], "x": 15.25, "y": 2}, + {"matrix": [5, 2], "x": 16.25, "y": 2}, + + {"matrix": [5, 4], "x": 17.5, "y": 2}, + {"matrix": [6, 4], "x": 18.5, "y": 2}, + {"matrix": [12, 0], "x": 19.5, "y": 2}, + + {"matrix": [12, 2], "x": 20.75, "y": 2}, + {"matrix": [5, 6], "x": 21.75, "y": 2}, + {"matrix": [5, 7], "x": 22.75, "y": 2}, + {"matrix": [8, 7], "x": 23.75, "y": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3}, + {"matrix": [3, 2], "x": 1, "y": 3}, + + {"matrix": [6, 5], "x": 2.25, "y": 3, "w": 1.5}, + {"matrix": [6, 6], "x": 3.75, "y": 3}, + {"matrix": [6, 7], "x": 4.75, "y": 3}, + {"matrix": [7, 0], "x": 5.75, "y": 3}, + {"matrix": [7, 1], "x": 6.75, "y": 3}, + {"matrix": [7, 2], "x": 7.75, "y": 3}, + {"matrix": [7, 3], "x": 8.75, "y": 3}, + {"matrix": [7, 4], "x": 9.75, "y": 3}, + {"matrix": [7, 5], "x": 10.75, "y": 3}, + {"matrix": [7, 6], "x": 11.75, "y": 3}, + {"matrix": [7, 7], "x": 12.75, "y": 3}, + {"matrix": [8, 0], "x": 13.75, "y": 3}, + {"matrix": [8, 1], "x": 14.75, "y": 3}, + {"matrix": [5, 3], "x": 15.75, "y": 3, "w": 1.5}, + + {"matrix": [8, 2], "x": 17.5, "y": 3}, + {"matrix": [9, 2], "x": 18.5, "y": 3}, + {"matrix": [15, 3], "x": 19.5, "y": 3}, + + {"matrix": [8, 4], "x": 20.75, "y": 3}, + {"matrix": [8, 5], "x": 21.75, "y": 3}, + {"matrix": [8, 6], "x": 22.75, "y": 3}, + {"matrix": [15, 5], "x": 23.75, "y": 3, "h": 2}, + + {"matrix": [6, 1], "x": 0, "y": 4}, + {"matrix": [6, 3], "x": 1, "y": 4}, + + {"matrix": [9, 4], "x": 2.25, "y": 4, "w": 1.75}, + {"matrix": [9, 5], "x": 4, "y": 4}, + {"matrix": [9, 6], "x": 5, "y": 4}, + {"matrix": [9, 7], "x": 6, "y": 4}, + {"matrix": [10, 0], "x": 7, "y": 4}, + {"matrix": [10, 1], "x": 8, "y": 4}, + {"matrix": [10, 2], "x": 9, "y": 4}, + {"matrix": [10, 3], "x": 10, "y": 4}, + {"matrix": [10, 4], "x": 11, "y": 4}, + {"matrix": [10, 5], "x": 12, "y": 4}, + {"matrix": [10, 6], "x": 13, "y": 4}, + {"matrix": [10, 7], "x": 14, "y": 4}, + {"matrix": [11, 1], "x": 15, "y": 4, "w": 2.25}, + + {"matrix": [11, 3], "x": 20.75, "y": 4}, + {"matrix": [11, 4], "x": 21.75, "y": 4}, + {"matrix": [11, 5], "x": 22.75, "y": 4}, + + {"matrix": [9, 0], "x": 0, "y": 5}, + {"matrix": [9, 1], "x": 1, "y": 5}, + + {"matrix": [12, 3], "x": 2.25, "y": 5, "w": 2.25}, + {"matrix": [12, 4], "x": 4.5, "y": 5}, + {"matrix": [12, 5], "x": 5.5, "y": 5}, + {"matrix": [12, 6], "x": 6.5, "y": 5}, + {"matrix": [12, 7], "x": 7.5, "y": 5}, + {"matrix": [13, 0], "x": 8.5, "y": 5}, + {"matrix": [13, 1], "x": 9.5, "y": 5}, + {"matrix": [13, 2], "x": 10.5, "y": 5}, + {"matrix": [13, 3], "x": 11.5, "y": 5}, + {"matrix": [13, 4], "x": 12.5, "y": 5}, + {"matrix": [13, 5], "x": 13.5, "y": 5}, + {"matrix": [13, 6], "x": 14.5, "y": 5, "w": 2.75}, + + {"matrix": [2, 4], "x": 18.5, "y": 5}, + + {"matrix": [14, 0], "x": 20.75, "y": 5}, + {"matrix": [14, 1], "x": 21.75, "y": 5}, + {"matrix": [14, 2], "x": 22.75, "y": 5}, + {"matrix": [11, 2], "x": 23.75, "y": 5, "h": 2}, + + {"matrix": [11, 7], "x": 0, "y": 6}, + {"matrix": [12, 1], "x": 1, "y": 6}, + + {"matrix": [14, 7], "x": 2.25, "y": 6}, + {"matrix": [2, 3], "x": 3.25, "y": 6}, + {"matrix": [15, 0], "x": 4.25, "y": 6}, + {"matrix": [14, 3], "x": 5.25, "y": 6, "w": 1.5}, + {"matrix": [15, 1], "x": 6.75, "y": 6, "w": 5}, + {"matrix": [14, 4], "x": 11.75, "y": 6, "w": 1.5}, + {"matrix": [14, 5], "x": 13.25, "y": 6}, + {"matrix": [15, 2], "x": 14.25, "y": 6}, + {"matrix": [8, 3], "x": 15.25, "y": 6}, + {"matrix": [1, 5], "x": 16.25, "y": 6}, + + {"matrix": [3, 0], "x": 17.5, "y": 6}, + {"matrix": [3, 3], "x": 18.5, "y": 6}, + {"matrix": [3, 4], "x": 19.5, "y": 6}, + + {"matrix": [11, 6], "x": 20.75, "y": 6, "w": 2}, + {"matrix": [6, 2], "x": 22.75, "y": 6} ] }, "LAYOUT_us_unix": { "layout": [ - {"label":"HELP", "x":0, "y":0, "w":2}, - {"label":"NO", "x":2.25, "y":0}, - {"label":"F1", "x":4.25, "y":0}, - {"label":"F2", "x":5.25, "y":0}, - {"label":"F3", "x":6.25, "y":0}, - {"label":"F4", "x":7.25, "y":0}, - {"label":"F5", "x":8.75, "y":0}, - {"label":"F6", "x":9.75, "y":0}, - {"label":"F7", "x":10.75, "y":0}, - {"label":"F8", "x":11.75, "y":0}, - {"label":"F9", "x":13.25, "y":0}, - {"label":"F10", "x":14.25, "y":0}, - {"label":"F11", "x":15.25, "y":0}, - {"label":"F12", "x":16.25, "y":0}, - {"label":"PRINT SCREEN", "x":17.5, "y":0}, - {"label":"SCROLL LOCK", "x":18.5, "y":0}, - {"label":"PAUSE", "x":19.5, "y":0}, - {"label":"MUTE", "x":20.75, "y":0}, - {"label":"VOLD", "x":21.75, "y":0}, - {"label":"VOLU", "x":22.75, "y":0}, - {"label":"PWR", "x":23.75, "y":0}, - {"label":"STOP", "x":0, "y":2}, - {"label":"AGAIN", "x":1, "y":2}, - {"label":"ESC", "x":2.25, "y":2}, - {"label":"1", "x":3.25, "y":2}, - {"label":"2", "x":4.25, "y":2}, - {"label":"3", "x":5.25, "y":2}, - {"label":"4", "x":6.25, "y":2}, - {"label":"5", "x":7.25, "y":2}, - {"label":"6", "x":8.25, "y":2}, - {"label":"7", "x":9.25, "y":2}, - {"label":"8", "x":10.25, "y":2}, - {"label":"9", "x":11.25, "y":2}, - {"label":"0", "x":12.25, "y":2}, - {"label":"MINUS", "x":13.25, "y":2}, - {"label":"EQUAL", "x":14.25, "y":2}, - {"label":"BACKSLASH", "x":15.25, "y":2}, - {"label":"GRAVE", "x":16.25, "y":2}, - {"label":"INSERT", "x":17.5, "y":2}, - {"label":"HOME", "x":18.5, "y":2}, - {"label":"PAGE UP", "x":19.5, "y":2}, - {"label":"NUM LOCK", "x":20.75, "y":2}, - {"label":"PSLASH", "x":21.75, "y":2}, - {"label":"PASTERISK", "x":22.75, "y":2}, - {"label":"PMINUS", "x":23.75, "y":2}, - {"label":"MENU", "x":0, "y":3}, - {"label":"UNDO", "x":1, "y":3}, - {"label":"TAB", "x":2.25, "y":3, "w":1.5}, - {"label":"Q", "x":3.75, "y":3}, - {"label":"W", "x":4.75, "y":3}, - {"label":"E", "x":5.75, "y":3}, - {"label":"R", "x":6.75, "y":3}, - {"label":"T", "x":7.75, "y":3}, - {"label":"Y", "x":8.75, "y":3}, - {"label":"U", "x":9.75, "y":3}, - {"label":"I", "x":10.75, "y":3}, - {"label":"O", "x":11.75, "y":3}, - {"label":"P", "x":12.75, "y":3}, - {"label":"LBRACKET", "x":13.75, "y":3}, - {"label":"RBRACKET", "x":14.75, "y":3}, - {"label":"BACKSPACE", "x":15.75, "y":3, "w":1.5}, - {"label":"DELETE", "x":17.5, "y":3}, - {"label":"END", "x":18.5, "y":3}, - {"label":"PAGE DOWN", "x":19.5, "y":3}, - {"label":"P7", "x":20.75, "y":3}, - {"label":"P8", "x":21.75, "y":3}, - {"label":"P9", "x":22.75, "y":3}, - {"label":"PPLUS", "x":23.75, "y":3, "h":2}, - {"label":"SELECT", "x":0, "y":4}, - {"label":"COPY", "x":1, "y":4}, - {"label":"LCTRL", "x":2.25, "y":4, "w":1.75}, - {"label":"A", "x":4, "y":4}, - {"label":"S", "x":5, "y":4}, - {"label":"D", "x":6, "y":4}, - {"label":"F", "x":7, "y":4}, - {"label":"G", "x":8, "y":4}, - {"label":"H", "x":9, "y":4}, - {"label":"J", "x":10, "y":4}, - {"label":"K", "x":11, "y":4}, - {"label":"L", "x":12, "y":4}, - {"label":"SEMICOLON", "x":13, "y":4}, - {"label":"QUOTE", "x":14, "y":4}, - {"label":"ENTER", "x":15, "y":4, "w":2.25}, - {"label":"P4", "x":20.75, "y":4}, - {"label":"P5", "x":21.75, "y":4}, - {"label":"P6", "x":22.75, "y":4}, - {"label":"EXECUTE", "x":0, "y":5}, - {"label":"PASTE", "x":1, "y":5}, - {"label":"LSHIFT", "x":2.25, "y":5, "w":2.25}, - {"label":"Z", "x":4.5, "y":5}, - {"label":"X", "x":5.5, "y":5}, - {"label":"C", "x":6.5, "y":5}, - {"label":"V", "x":7.5, "y":5}, - {"label":"B", "x":8.5, "y":5}, - {"label":"N", "x":9.5, "y":5}, - {"label":"M", "x":10.5, "y":5}, - {"label":"COMMA", "x":11.5, "y":5}, - {"label":"PERIOD", "x":12.5, "y":5}, - {"label":"SLASH", "x":13.5, "y":5}, - {"label":"RSHIFT", "x":14.5, "y":5, "w":2.75}, - {"label":"UP", "x":18.5, "y":5}, - {"label":"P1", "x":20.75, "y":5}, - {"label":"P2", "x":21.75, "y":5}, - {"label":"P3", "x":22.75, "y":5}, - {"label":"PENTER", "x":23.75, "y":5, "h":2}, - {"label":"FIND", "x":0, "y":6}, - {"label":"CUT", "x":1, "y":6}, - {"label":"CAPS LOCK", "x":2.25, "y":6, "w":1.75}, - {"label":"LALT", "x":4, "y":6}, - {"label":"LGUI", "x":5, "y":6}, - {"label":"SPACE", "x":6, "y":6, "w":8.25}, - {"label":"RGUI", "x":14.25, "y":6}, - {"label":"APP", "x":15.25, "y":6}, - {"label":"RALT", "x":16.25, "y":6}, - {"label":"LEFT", "x":17.5, "y":6}, - {"label":"DOWN", "x":18.5, "y":6}, - {"label":"RIGHT", "x":19.5, "y":6}, - {"label":"P0", "x":20.75, "y":6, "w":2}, - {"label":"PDOT", "x":22.75, "y":6} + {"matrix": [14, 6], "x": 0, "y": 0, "w": 2}, + + {"matrix": [1, 7], "x": 2.25, "y": 0}, + + {"matrix": [0, 5], "x": 4.25, "y": 0}, + {"matrix": [0, 6], "x": 5.25, "y": 0}, + {"matrix": [1, 0], "x": 6.25, "y": 0}, + {"matrix": [1, 2], "x": 7.25, "y": 0}, + + {"matrix": [1, 4], "x": 8.75, "y": 0}, + {"matrix": [1, 6], "x": 9.75, "y": 0}, + {"matrix": [2, 0], "x": 10.75, "y": 0}, + {"matrix": [2, 1], "x": 11.75, "y": 0}, + + {"matrix": [2, 2], "x": 13.25, "y": 0}, + {"matrix": [0, 7], "x": 14.25, "y": 0}, + {"matrix": [1, 1], "x": 15.25, "y": 0}, + {"matrix": [1, 3], "x": 16.25, "y": 0}, + + {"matrix": [2, 6], "x": 17.5, "y": 0}, + {"matrix": [2, 7], "x": 18.5, "y": 0}, + {"matrix": [2, 5], "x": 19.5, "y": 0}, + + {"matrix": [5, 5], "x": 20.75, "y": 0}, + {"matrix": [0, 2], "x": 21.75, "y": 0}, + {"matrix": [0, 4], "x": 22.75, "y": 0}, + {"matrix": [6, 0], "x": 23.75, "y": 0}, + + {"matrix": [0, 1], "x": 0, "y": 2}, + {"matrix": [0, 3], "x": 1, "y": 2}, + + {"matrix": [3, 5], "x": 2.25, "y": 2}, + {"matrix": [3, 6], "x": 3.25, "y": 2}, + {"matrix": [3, 7], "x": 4.25, "y": 2}, + {"matrix": [4, 0], "x": 5.25, "y": 2}, + {"matrix": [4, 1], "x": 6.25, "y": 2}, + {"matrix": [4, 2], "x": 7.25, "y": 2}, + {"matrix": [4, 3], "x": 8.25, "y": 2}, + {"matrix": [4, 4], "x": 9.25, "y": 2}, + {"matrix": [4, 5], "x": 10.25, "y": 2}, + {"matrix": [4, 6], "x": 11.25, "y": 2}, + {"matrix": [4, 7], "x": 12.25, "y": 2}, + {"matrix": [5, 0], "x": 13.25, "y": 2}, + {"matrix": [5, 1], "x": 14.25, "y": 2}, + {"matrix": [11, 0], "x": 15.25, "y": 2}, + {"matrix": [5, 2], "x": 16.25, "y": 2}, + + {"matrix": [5, 4], "x": 17.5, "y": 2}, + {"matrix": [6, 4], "x": 18.5, "y": 2}, + {"matrix": [12, 0], "x": 19.5, "y": 2}, + + {"matrix": [12, 2], "x": 20.75, "y": 2}, + {"matrix": [5, 6], "x": 21.75, "y": 2}, + {"matrix": [5, 7], "x": 22.75, "y": 2}, + {"matrix": [8, 7], "x": 23.75, "y": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3}, + {"matrix": [3, 2], "x": 1, "y": 3}, + + {"matrix": [6, 5], "x": 2.25, "y": 3, "w": 1.5}, + {"matrix": [6, 6], "x": 3.75, "y": 3}, + {"matrix": [6, 7], "x": 4.75, "y": 3}, + {"matrix": [7, 0], "x": 5.75, "y": 3}, + {"matrix": [7, 1], "x": 6.75, "y": 3}, + {"matrix": [7, 2], "x": 7.75, "y": 3}, + {"matrix": [7, 3], "x": 8.75, "y": 3}, + {"matrix": [7, 4], "x": 9.75, "y": 3}, + {"matrix": [7, 5], "x": 10.75, "y": 3}, + {"matrix": [7, 6], "x": 11.75, "y": 3}, + {"matrix": [7, 7], "x": 12.75, "y": 3}, + {"matrix": [8, 0], "x": 13.75, "y": 3}, + {"matrix": [8, 1], "x": 14.75, "y": 3}, + {"matrix": [5, 3], "x": 15.75, "y": 3, "w": 1.5}, + + {"matrix": [8, 2], "x": 17.5, "y": 3}, + {"matrix": [9, 2], "x": 18.5, "y": 3}, + {"matrix": [15, 3], "x": 19.5, "y": 3}, + + {"matrix": [8, 4], "x": 20.75, "y": 3}, + {"matrix": [8, 5], "x": 21.75, "y": 3}, + {"matrix": [8, 6], "x": 22.75, "y": 3}, + {"matrix": [15, 5], "x": 23.75, "y": 3, "h": 2}, + + {"matrix": [6, 1], "x": 0, "y": 4}, + {"matrix": [6, 3], "x": 1, "y": 4}, + + {"matrix": [9, 4], "x": 2.25, "y": 4, "w": 1.75}, + {"matrix": [9, 5], "x": 4, "y": 4}, + {"matrix": [9, 6], "x": 5, "y": 4}, + {"matrix": [9, 7], "x": 6, "y": 4}, + {"matrix": [10, 0], "x": 7, "y": 4}, + {"matrix": [10, 1], "x": 8, "y": 4}, + {"matrix": [10, 2], "x": 9, "y": 4}, + {"matrix": [10, 3], "x": 10, "y": 4}, + {"matrix": [10, 4], "x": 11, "y": 4}, + {"matrix": [10, 5], "x": 12, "y": 4}, + {"matrix": [10, 6], "x": 13, "y": 4}, + {"matrix": [10, 7], "x": 14, "y": 4}, + {"matrix": [11, 1], "x": 15, "y": 4, "w": 2.25}, + + {"matrix": [11, 3], "x": 20.75, "y": 4}, + {"matrix": [11, 4], "x": 21.75, "y": 4}, + {"matrix": [11, 5], "x": 22.75, "y": 4}, + + {"matrix": [9, 0], "x": 0, "y": 5}, + {"matrix": [9, 1], "x": 1, "y": 5}, + + {"matrix": [12, 3], "x": 2.25, "y": 5, "w": 2.25}, + {"matrix": [12, 4], "x": 4.5, "y": 5}, + {"matrix": [12, 5], "x": 5.5, "y": 5}, + {"matrix": [12, 6], "x": 6.5, "y": 5}, + {"matrix": [12, 7], "x": 7.5, "y": 5}, + {"matrix": [13, 0], "x": 8.5, "y": 5}, + {"matrix": [13, 1], "x": 9.5, "y": 5}, + {"matrix": [13, 2], "x": 10.5, "y": 5}, + {"matrix": [13, 3], "x": 11.5, "y": 5}, + {"matrix": [13, 4], "x": 12.5, "y": 5}, + {"matrix": [13, 5], "x": 13.5, "y": 5}, + {"matrix": [13, 6], "x": 14.5, "y": 5, "w": 2.75}, + + {"matrix": [2, 4], "x": 18.5, "y": 5}, + + {"matrix": [14, 0], "x": 20.75, "y": 5}, + {"matrix": [14, 1], "x": 21.75, "y": 5}, + {"matrix": [14, 2], "x": 22.75, "y": 5}, + {"matrix": [11, 2], "x": 23.75, "y": 5, "h": 2}, + + {"matrix": [11, 7], "x": 0, "y": 6}, + {"matrix": [12, 1], "x": 1, "y": 6}, + + {"matrix": [14, 7], "x": 2.25, "y": 6, "w": 1.75}, + {"matrix": [2, 3], "x": 4, "y": 6}, + {"matrix": [15, 0], "x": 5, "y": 6}, + {"matrix": [15, 1], "x": 6, "y": 6, "w": 8.25}, + {"matrix": [15, 2], "x": 14.25, "y": 6}, + {"matrix": [8, 3], "x": 15.25, "y": 6}, + {"matrix": [1, 5], "x": 16.25, "y": 6}, + + {"matrix": [3, 0], "x": 17.5, "y": 6}, + {"matrix": [3, 3], "x": 18.5, "y": 6}, + {"matrix": [3, 4], "x": 19.5, "y": 6}, + + {"matrix": [11, 6], "x": 20.75, "y": 6, "w": 2}, + {"matrix": [6, 2], "x": 22.75, "y": 6} ] }, "LAYOUT_ansi": { "layout": [ - {"label":"HELP", "x":0, "y":0, "w":2}, - {"label":"ESC", "x":2.25, "y":0}, - {"label":"F1", "x":4.25, "y":0}, - {"label":"F2", "x":5.25, "y":0}, - {"label":"F3", "x":6.25, "y":0}, - {"label":"F4", "x":7.25, "y":0}, - {"label":"F5", "x":8.75, "y":0}, - {"label":"F6", "x":9.75, "y":0}, - {"label":"F7", "x":10.75, "y":0}, - {"label":"F8", "x":11.75, "y":0}, - {"label":"F9", "x":13.25, "y":0}, - {"label":"F10", "x":14.25, "y":0}, - {"label":"F11", "x":15.25, "y":0}, - {"label":"F12", "x":16.25, "y":0}, - {"label":"PRINT SCREEN", "x":17.5, "y":0}, - {"label":"SCROLL LOCK", "x":18.5, "y":0}, - {"label":"PAUSE", "x":19.5, "y":0}, - {"label":"MUTE", "x":20.75, "y":0}, - {"label":"VOLD", "x":21.75, "y":0}, - {"label":"VOLU", "x":22.75, "y":0}, - {"label":"PWR", "x":23.75, "y":0}, - {"label":"STOP", "x":0, "y":2}, - {"label":"AGAIN", "x":1, "y":2}, - {"label":"GRAVE", "x":2.25, "y":2}, - {"label":"1", "x":3.25, "y":2}, - {"label":"2", "x":4.25, "y":2}, - {"label":"3", "x":5.25, "y":2}, - {"label":"4", "x":6.25, "y":2}, - {"label":"5", "x":7.25, "y":2}, - {"label":"6", "x":8.25, "y":2}, - {"label":"7", "x":9.25, "y":2}, - {"label":"8", "x":10.25, "y":2}, - {"label":"9", "x":11.25, "y":2}, - {"label":"0", "x":12.25, "y":2}, - {"label":"MINUS", "x":13.25, "y":2}, - {"label":"EQUAL", "x":14.25, "y":2}, - {"label":"BACKSPACE", "x":15.25, "y":2, "w":2}, - {"label":"INSERT", "x":17.5, "y":2}, - {"label":"HOME", "x":18.5, "y":2}, - {"label":"PAGE UP", "x":19.5, "y":2}, - {"label":"NUM LOCK", "x":20.75, "y":2}, - {"label":"PSLASH", "x":21.75, "y":2}, - {"label":"PASTERISK", "x":22.75, "y":2}, - {"label":"PMINUS", "x":23.75, "y":2}, - {"label":"MENU", "x":0, "y":3}, - {"label":"UNDO", "x":1, "y":3}, - {"label":"TAB", "x":2.25, "y":3, "w":1.5}, - {"label":"Q", "x":3.75, "y":3}, - {"label":"W", "x":4.75, "y":3}, - {"label":"E", "x":5.75, "y":3}, - {"label":"R", "x":6.75, "y":3}, - {"label":"T", "x":7.75, "y":3}, - {"label":"Y", "x":8.75, "y":3}, - {"label":"U", "x":9.75, "y":3}, - {"label":"I", "x":10.75, "y":3}, - {"label":"O", "x":11.75, "y":3}, - {"label":"P", "x":12.75, "y":3}, - {"label":"LBRACKET", "x":13.75, "y":3}, - {"label":"RBRACKET", "x":14.75, "y":3}, - {"label":"BACKSLASH", "x":15.75, "y":3, "w":1.5}, - {"label":"DELETE", "x":17.5, "y":3}, - {"label":"END", "x":18.5, "y":3}, - {"label":"PAGE DOWN", "x":19.5, "y":3}, - {"label":"P7", "x":20.75, "y":3}, - {"label":"P8", "x":21.75, "y":3}, - {"label":"P9", "x":22.75, "y":3}, - {"label":"PPLUS", "x":23.75, "y":3, "h":2}, - {"label":"SELECT", "x":0, "y":4}, - {"label":"COPY", "x":1, "y":4}, - {"label":"CAPS LOCK", "x":2.25, "y":4, "w":1.75}, - {"label":"A", "x":4, "y":4}, - {"label":"S", "x":5, "y":4}, - {"label":"D", "x":6, "y":4}, - {"label":"F", "x":7, "y":4}, - {"label":"G", "x":8, "y":4}, - {"label":"H", "x":9, "y":4}, - {"label":"J", "x":10, "y":4}, - {"label":"K", "x":11, "y":4}, - {"label":"L", "x":12, "y":4}, - {"label":"SEMICOLON", "x":13, "y":4}, - {"label":"QUOTE", "x":14, "y":4}, - {"label":"ENTER", "x":15, "y":4, "w":2.25}, - {"label":"P4", "x":20.75, "y":4}, - {"label":"P5", "x":21.75, "y":4}, - {"label":"P6", "x":22.75, "y":4}, - {"label":"EXECUTE", "x":0, "y":5}, - {"label":"PASTE", "x":1, "y":5}, - {"label":"LSHIFT", "x":2.25, "y":5, "w":2.25}, - {"label":"Z", "x":4.5, "y":5}, - {"label":"X", "x":5.5, "y":5}, - {"label":"C", "x":6.5, "y":5}, - {"label":"V", "x":7.5, "y":5}, - {"label":"B", "x":8.5, "y":5}, - {"label":"N", "x":9.5, "y":5}, - {"label":"M", "x":10.5, "y":5}, - {"label":"COMMA", "x":11.5, "y":5}, - {"label":"PERIOD", "x":12.5, "y":5}, - {"label":"SLASH", "x":13.5, "y":5}, - {"label":"RSHIFT", "x":14.5, "y":5, "w":2.75}, - {"label":"UP", "x":18.5, "y":5}, - {"label":"P1", "x":20.75, "y":5}, - {"label":"P2", "x":21.75, "y":5}, - {"label":"P3", "x":22.75, "y":5}, - {"label":"PENTER", "x":23.75, "y":5, "h":2}, - {"label":"FIND", "x":0, "y":6}, - {"label":"CUT", "x":1, "y":6}, - {"label":"LCTRL", "x":2.25, "y":6, "w":1.75}, - {"label":"LALT", "x":4, "y":6}, - {"label":"LGUI", "x":5, "y":6}, - {"label":"SPACE", "x":6, "y":6, "w":8.25}, - {"label":"RGUI", "x":14.25, "y":6}, - {"label":"APP", "x":15.25, "y":6}, - {"label":"RALT", "x":16.25, "y":6}, - {"label":"LEFT", "x":17.5, "y":6}, - {"label":"DOWN", "x":18.5, "y":6}, - {"label":"RIGHT", "x":19.5, "y":6}, - {"label":"P0", "x":20.75, "y":6, "w":2}, - {"label":"PDOT", "x":22.75, "y":6} + {"matrix": [14, 6], "x": 0, "y": 0, "w": 2}, + + {"matrix": [3, 5], "x": 2.25, "y": 0}, + + {"matrix": [0, 5], "x": 4.25, "y": 0}, + {"matrix": [0, 6], "x": 5.25, "y": 0}, + {"matrix": [1, 0], "x": 6.25, "y": 0}, + {"matrix": [1, 2], "x": 7.25, "y": 0}, + + {"matrix": [1, 4], "x": 8.75, "y": 0}, + {"matrix": [1, 6], "x": 9.75, "y": 0}, + {"matrix": [2, 0], "x": 10.75, "y": 0}, + {"matrix": [2, 1], "x": 11.75, "y": 0}, + + {"matrix": [2, 2], "x": 13.25, "y": 0}, + {"matrix": [0, 7], "x": 14.25, "y": 0}, + {"matrix": [1, 1], "x": 15.25, "y": 0}, + {"matrix": [1, 3], "x": 16.25, "y": 0}, + + {"matrix": [2, 6], "x": 17.5, "y": 0}, + {"matrix": [2, 7], "x": 18.5, "y": 0}, + {"matrix": [2, 5], "x": 19.5, "y": 0}, + + {"matrix": [5, 5], "x": 20.75, "y": 0}, + {"matrix": [0, 2], "x": 21.75, "y": 0}, + {"matrix": [0, 4], "x": 22.75, "y": 0}, + {"matrix": [6, 0], "x": 23.75, "y": 0}, + + {"matrix": [0, 1], "x": 0, "y": 2}, + {"matrix": [0, 3], "x": 1, "y": 2}, + + {"matrix": [5, 2], "x": 2.25, "y": 2}, + {"matrix": [3, 6], "x": 3.25, "y": 2}, + {"matrix": [3, 7], "x": 4.25, "y": 2}, + {"matrix": [4, 0], "x": 5.25, "y": 2}, + {"matrix": [4, 1], "x": 6.25, "y": 2}, + {"matrix": [4, 2], "x": 7.25, "y": 2}, + {"matrix": [4, 3], "x": 8.25, "y": 2}, + {"matrix": [4, 4], "x": 9.25, "y": 2}, + {"matrix": [4, 5], "x": 10.25, "y": 2}, + {"matrix": [4, 6], "x": 11.25, "y": 2}, + {"matrix": [4, 7], "x": 12.25, "y": 2}, + {"matrix": [5, 0], "x": 13.25, "y": 2}, + {"matrix": [5, 1], "x": 14.25, "y": 2}, + {"matrix": [5, 3], "x": 15.25, "y": 2, "w": 2}, + + {"matrix": [5, 4], "x": 17.5, "y": 2}, + {"matrix": [6, 4], "x": 18.5, "y": 2}, + {"matrix": [12, 0], "x": 19.5, "y": 2}, + + {"matrix": [12, 2], "x": 20.75, "y": 2}, + {"matrix": [5, 6], "x": 21.75, "y": 2}, + {"matrix": [5, 7], "x": 22.75, "y": 2}, + {"matrix": [8, 7], "x": 23.75, "y": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3}, + {"matrix": [3, 2], "x": 1, "y": 3}, + + {"matrix": [6, 5], "x": 2.25, "y": 3, "w": 1.5}, + {"matrix": [6, 6], "x": 3.75, "y": 3}, + {"matrix": [6, 7], "x": 4.75, "y": 3}, + {"matrix": [7, 0], "x": 5.75, "y": 3}, + {"matrix": [7, 1], "x": 6.75, "y": 3}, + {"matrix": [7, 2], "x": 7.75, "y": 3}, + {"matrix": [7, 3], "x": 8.75, "y": 3}, + {"matrix": [7, 4], "x": 9.75, "y": 3}, + {"matrix": [7, 5], "x": 10.75, "y": 3}, + {"matrix": [7, 6], "x": 11.75, "y": 3}, + {"matrix": [7, 7], "x": 12.75, "y": 3}, + {"matrix": [8, 0], "x": 13.75, "y": 3}, + {"matrix": [8, 1], "x": 14.75, "y": 3}, + {"matrix": [11, 0], "x": 15.75, "y": 3, "w": 1.5}, + + {"matrix": [8, 2], "x": 17.5, "y": 3}, + {"matrix": [9, 2], "x": 18.5, "y": 3}, + {"matrix": [15, 3], "x": 19.5, "y": 3}, + + {"matrix": [8, 4], "x": 20.75, "y": 3}, + {"matrix": [8, 5], "x": 21.75, "y": 3}, + {"matrix": [8, 6], "x": 22.75, "y": 3}, + {"matrix": [15, 5], "x": 23.75, "y": 3, "h": 2}, + + {"matrix": [6, 1], "x": 0, "y": 4}, + {"matrix": [6, 3], "x": 1, "y": 4}, + + {"matrix": [14, 7], "x": 2.25, "y": 4, "w": 1.75}, + {"matrix": [9, 5], "x": 4, "y": 4}, + {"matrix": [9, 6], "x": 5, "y": 4}, + {"matrix": [9, 7], "x": 6, "y": 4}, + {"matrix": [10, 0], "x": 7, "y": 4}, + {"matrix": [10, 1], "x": 8, "y": 4}, + {"matrix": [10, 2], "x": 9, "y": 4}, + {"matrix": [10, 3], "x": 10, "y": 4}, + {"matrix": [10, 4], "x": 11, "y": 4}, + {"matrix": [10, 5], "x": 12, "y": 4}, + {"matrix": [10, 6], "x": 13, "y": 4}, + {"matrix": [10, 7], "x": 14, "y": 4}, + {"matrix": [11, 1], "x": 15, "y": 4, "w": 2.25}, + + {"matrix": [11, 3], "x": 20.75, "y": 4}, + {"matrix": [11, 4], "x": 21.75, "y": 4}, + {"matrix": [11, 5], "x": 22.75, "y": 4}, + + {"matrix": [9, 0], "x": 0, "y": 5}, + {"matrix": [9, 1], "x": 1, "y": 5}, + + {"matrix": [12, 3], "x": 2.25, "y": 5, "w": 2.25}, + {"matrix": [12, 4], "x": 4.5, "y": 5}, + {"matrix": [12, 5], "x": 5.5, "y": 5}, + {"matrix": [12, 6], "x": 6.5, "y": 5}, + {"matrix": [12, 7], "x": 7.5, "y": 5}, + {"matrix": [13, 0], "x": 8.5, "y": 5}, + {"matrix": [13, 1], "x": 9.5, "y": 5}, + {"matrix": [13, 2], "x": 10.5, "y": 5}, + {"matrix": [13, 3], "x": 11.5, "y": 5}, + {"matrix": [13, 4], "x": 12.5, "y": 5}, + {"matrix": [13, 5], "x": 13.5, "y": 5}, + {"matrix": [13, 6], "x": 14.5, "y": 5, "w": 2.75}, + + {"matrix": [2, 4], "x": 18.5, "y": 5}, + + {"matrix": [14, 0], "x": 20.75, "y": 5}, + {"matrix": [14, 1], "x": 21.75, "y": 5}, + {"matrix": [14, 2], "x": 22.75, "y": 5}, + {"matrix": [11, 2], "x": 23.75, "y": 5, "h": 2}, + + {"matrix": [11, 7], "x": 0, "y": 6}, + {"matrix": [12, 1], "x": 1, "y": 6}, + + {"matrix": [9, 4], "x": 2.25, "y": 6, "w": 1.75}, + {"matrix": [2, 3], "x": 4, "y": 6}, + {"matrix": [15, 0], "x": 5, "y": 6}, + {"matrix": [15, 1], "x": 6, "y": 6, "w": 8.25}, + {"matrix": [15, 2], "x": 14.25, "y": 6}, + {"matrix": [8, 3], "x": 15.25, "y": 6}, + {"matrix": [1, 5], "x": 16.25, "y": 6}, + + {"matrix": [3, 0], "x": 17.5, "y": 6}, + {"matrix": [3, 3], "x": 18.5, "y": 6}, + {"matrix": [3, 4], "x": 19.5, "y": 6}, + + {"matrix": [11, 6], "x": 20.75, "y": 6, "w": 2}, + {"matrix": [6, 2], "x": 22.75, "y": 6} ] } } diff --git a/keyboards/converter/sun_usb/type5/type5.h b/keyboards/converter/sun_usb/type5/type5.h deleted file mode 100644 index d4c9cc267c..0000000000 --- a/keyboards/converter/sun_usb/type5/type5.h +++ /dev/null @@ -1,148 +0,0 @@ -/* - Copyright 2012 Jun Wako <wakojun@gmail.com> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -/* sun type 5 keyboard, JP Unix-style -,-------. ,---, ,---------------. ,---------------. ,---------------. ,-----------. ,---------------. -| 76 | | 0F| | 05| 06| 08| 0A| | 0C| 0E| 10| 11| | 12| 07| 09| 0B| | 16| 17| 15| | 2D| 02| 04| 30| -`-------' `---' `---------------' `---------------' `---------------' `-----------' `---------------' -,-------. ,-----------------------------------------------------------. ,-----------. ,---------------. -| 01| 03| | 1D| 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| 58| 2A| | 2C| 34| 60| | 62| 2E| 2F| 47| -|-------| |-----------------------------------------------------------| |------------ |---------------| -| 19| 1A| | 35 | 36| 37| 38| 39| 3A| 3B| 3C| 3D| 3E| 3F| 40| 41| 2B | | 42| 4A| 7B| | 44| 45| 46| | -|-------| |-----------------------------------------------------------| `-----------' |-----------| 7D| -| 31| 33| | 4C | 4D| 4E| 4F| 50| 51| 52| 53| 54| 55| 56| 57| 59 | | 5B| 5C| 5D| | -|-------| |-----------------------------------------------------------| ,---. |-----------|---| -| 48| 49| | 63 | 64| 65| 66| 67| 68| 69| 6A| 6B| 6C| 6D| 6E | | 14| | 70| 71| 72| | -|-------| |-----------------------------------------------------------| .-----------. |-----------| 5A| -| 5F| 61| | 77 | 13| 78 |*73 | 79 |*74 |*75| 7A | 43| 0D| | 18| 1B| 1C| | 5E | 32| | -`-------' `-----------------------------------------------------------' `-----------' `---------------' -*/ -#define LAYOUT_jp_unix( \ - K76, K0F, K05, K06, K08, K0A, K0C, K0E, K10, K11, K12, K07, K09, K0B, K16, K17, K15, K2D, K02, K04, K30, \ - K01, K03, K1D, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K58, K2A, K2C, K34, K60, K62, K2E, K2F, K47, \ - K19, K1A, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K2B, K42, K4A, K7B, K44, K45, K46, K7D, \ - K31, K33, K4C, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57, K59, K5B, K5C, K5D, \ - K48, K49, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K14, K70, K71, K72, K5A, \ - K5F, K61, K77, K13, K78, K73, K79, K74, K75, K7A, K43, K0D, K18, K1B, K1C, K5E, K32 \ -) { \ - { XXX, K01, K02, K03, K04, K05, K06, K07 }, \ - { K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ - { K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \ - { K60, K61, K62, K63, K64, K65, K66, K67 }, \ - { K68, K69, K6A, K6B, K6C, K6D, K6E, XXX }, \ - { K70, K71, K72, K73, K74, K75, K76, K77 }, \ - { K78, K79, K7A, K7B, XXX, K7D, XXX, XXX } \ -} - -/* Sun type 5 keyboard, US Unix-style -,-------. ,---, ,---------------. ,---------------. ,---------------. ,-----------. ,---------------. -| 76 | | 0F| | 05| 06| 08| 0A| | 0C| 0E| 10| 11| | 12| 07| 09| 0B| | 16| 17| 15| | 2D| 02| 04| 30| -`-------' `---' `---------------' `---------------' `---------------' `-----------' `---------------' -,-------. ,-----------------------------------------------------------. ,-----------. ,---------------. -| 01| 03| | 1D| 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| 58| 2A| | 2C| 34| 60| | 62| 2E| 2F| 47| -|-------| |-----------------------------------------------------------| |------------ |---------------| -| 19| 1A| | 35 | 36| 37| 38| 39| 3A| 3B| 3C| 3D| 3E| 3F| 40| 41| 2B | | 42| 4A| 7B| | 44| 45| 46| | -|-------| |-----------------------------------------------------------| `-----------' |-----------| 7D| -| 31| 33| | 4C | 4D| 4E| 4F| 50| 51| 52| 53| 54| 55| 56| 57| 59 | | 5B| 5C| 5D| | -|-------| |-----------------------------------------------------------| ,---. |-----------|---| -| 48| 49| | 63 | 64| 65| 66| 67| 68| 69| 6A| 6B| 6C| 6D| 6E | | 14| | 70| 71| 72| | -|-------| |-----------------------------------------------------------| .-----------. |-----------| 5A| -| 5F| 61| | 77 | 13| 78 | 79 | 7A | 43| 0D| | 18| 1B| 1C| | 5E | 32| | -`-------' `-----------------------------------------------------------' `-----------' `---------------' -*/ -#define LAYOUT_us_unix( \ - K76, K0F, K05, K06, K08, K0A, K0C, K0E, K10, K11, K12, K07, K09, K0B, K16, K17, K15, K2D, K02, K04, K30, \ - K01, K03, K1D, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K58, K2A, K2C, K34, K60, K62, K2E, K2F, K47, \ - K19, K1A, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K2B, K42, K4A, K7B, K44, K45, K46, K7D, \ - K31, K33, K4C, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57, K59, K5B, K5C, K5D, \ - K48, K49, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K14, K70, K71, K72, K5A, \ - K5F, K61, K77, K13, K78, K79, K7A, K43, K0D, K18, K1B, K1C, K5E, K32 \ -) { \ - { XXX, K01, K02, K03, K04, K05, K06, K07 }, \ - { K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ - { K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \ - { K60, K61, K62, K63, K64, K65, K66, K67 }, \ - { K68, K69, K6A, K6B, K6C, K6D, K6E, XXX }, \ - { K70, K71, K72, XXX, XXX, XXX, K76, K77 }, \ - { K78, K79, K7A, K7B, XXX, K7D, XXX, XXX } \ -} - -/* Sun type 5 keyboard, US ANSI-style - ,-------. ,---, ,---------------. ,---------------. ,---------------. ,-----------. ,---------------. - | 76 | | 1D| | 05| 06| 08| 0A| | 0C| 0E| 10| 11| | 12| 07| 09| 0B| | 16| 17| 15| | 2D| 02| 04| 30| - `-------' `---' `---------------' `---------------' `---------------' `-----------' `---------------' - ,-------. ,-----------------------------------------------------------. ,-----------. ,---------------. - | 01| 03| | 2A| 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| 2B | | 2C| 34| 60| | 62| 2E| 2F| 47| - |-------| |-----------------------------------------------------------| |------------ |---------------| - | 19| 1A| | 35 | 36| 37| 38| 39| 3A| 3B| 3C| 3D| 3E| 3F| 40| 41| 58 | | 42| 4A| 7B| | 44| 45| 46| | - |-------| |-----------------------------------------------------------| `-----------' |-----------| 7D| - | 31| 33| | 77 | 4D| 4E| 4F| 50| 51| 52| 53| 54| 55| 56| 57| 59 | | 5B| 5C| 5D| | - |-------| |-----------------------------------------------------------| ,---. |-----------|---| - | 48| 49| | 63 | 64| 65| 66| 67| 68| 69| 6A| 6B| 6C| 6D| 6E | | 14| | 70| 71| 72| | - |-------| |-----------------------------------------------------------| .-----------. |-----------| 5A| - | 5F| 61| | 4C | 13| 78 | 79 | 7A | 43| 0D| | 18| 1B| 1C| | 5E | 32| | - `-------' `-----------------------------------------------------------' `-----------' `---------------' -*/ -#define LAYOUT_ansi( \ - K76, K1D, K05, K06, K08, K0A, K0C, K0E, K10, K11, K12, K07, K09, K0B, K16, K17, K15, K2D, K02, K04, K30, \ - K01, K03, K2A, K1E, K1F, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2B, K2C, K34, K60, K62, K2E, K2F, K47, \ - K19, K1A, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K40, K41, K58, K42, K4A, K7B, K44, K45, K46, K7D, \ - K31, K33, K77, K4D, K4E, K4F, K50, K51, K52, K53, K54, K55, K56, K57, K59, K5B, K5C, K5D, \ - K48, K49, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K14, K70, K71, K72, K5A, \ - K5F, K61, K4C, K13, K78, K79, K7A, K43, K0D, K18, K1B, K1C, K5E, K32 \ -) { \ - { XXX, K01, K02, K03, K04, K05, K06, K07 }, \ - { K08, K09, K0A, K0B, K0C, K0D, K0E, XXX }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ - { K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \ - { K60, K61, K62, K63, K64, K65, K66, K67 }, \ - { K68, K69, K6A, K6B, K6C, K6D, K6E, XXX }, \ - { K70, K71, K72, XXX, XXX, XXX, K76, K77 }, \ - { K78, K79, K7A, K7B, XXX, K7D, XXX, XXX } \ -} diff --git a/keyboards/converter/usb_usb/ble/ble.c b/keyboards/converter/usb_usb/ble/ble.c deleted file mode 100644 index 387eb8166c..0000000000 --- a/keyboards/converter/usb_usb/ble/ble.c +++ /dev/null @@ -1 +0,0 @@ -#include "ble.h" diff --git a/keyboards/converter/usb_usb/ble/ble.h b/keyboards/converter/usb_usb/ble/ble.h deleted file mode 100644 index 3351176047..0000000000 --- a/keyboards/converter/usb_usb/ble/ble.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "usb_usb.h" diff --git a/keyboards/converter/usb_usb/hasu/hasu.c b/keyboards/converter/usb_usb/hasu/hasu.c deleted file mode 100644 index 3357735ffd..0000000000 --- a/keyboards/converter/usb_usb/hasu/hasu.c +++ /dev/null @@ -1 +0,0 @@ -#include "hasu.h" diff --git a/keyboards/converter/usb_usb/hasu/hasu.h b/keyboards/converter/usb_usb/hasu/hasu.h deleted file mode 100644 index 3351176047..0000000000 --- a/keyboards/converter/usb_usb/hasu/hasu.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "usb_usb.h" diff --git a/keyboards/converter/usb_usb/info.json b/keyboards/converter/usb_usb/info.json index 8e4a28ab46..2f3e8913c5 100644 --- a/keyboards/converter/usb_usb/info.json +++ b/keyboards/converter/usb_usb/info.json @@ -13,550 +13,560 @@ "layouts": { "LAYOUT_all": { "layout": [ - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - - {"x": 0, "y": 1}, - - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 6.5, "y": 1}, - {"x": 7.5, "y": 1}, - {"x": 8.5, "y": 1}, - {"x": 9.5, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - - {"x": 15.25, "y": 1}, - {"x": 16.25, "y": 1}, - {"x": 17.25, "y": 1}, - - {"x": 18.5, "y": 1}, - {"x": 19.5, "y": 1}, - {"x": 20.5, "y": 1}, - {"x": 21.5, "y": 1}, - - {"x": 22.75, "y": 1}, - - {"x": 0, "y": 2.5}, - {"x": 1, "y": 2.5}, - {"x": 2, "y": 2.5}, - {"x": 3, "y": 2.5}, - {"x": 4, "y": 2.5}, - {"x": 5, "y": 2.5}, - {"x": 6, "y": 2.5}, - {"x": 7, "y": 2.5}, - {"x": 8, "y": 2.5}, - {"x": 9, "y": 2.5}, - {"x": 10, "y": 2.5}, - {"x": 11, "y": 2.5}, - {"x": 12, "y": 2.5}, - {"x": 13, "y": 2.5}, - {"x": 14, "y": 2.5}, - - {"x": 15.25, "y": 2.5}, - {"x": 16.25, "y": 2.5}, - {"x": 17.25, "y": 2.5}, - - {"x": 18.5, "y": 2.5}, - {"x": 19.5, "y": 2.5}, - {"x": 20.5, "y": 2.5}, - {"x": 21.5, "y": 2.5}, - - {"x": 22.75, "y": 2.5}, - {"x": 23.75, "y": 2.5}, - - {"x": 0, "y": 3.5, "w": 1.5}, - {"x": 1.5, "y": 3.5}, - {"x": 2.5, "y": 3.5}, - {"x": 3.5, "y": 3.5}, - {"x": 4.5, "y": 3.5}, - {"x": 5.5, "y": 3.5}, - {"x": 6.5, "y": 3.5}, - {"x": 7.5, "y": 3.5}, - {"x": 8.5, "y": 3.5}, - {"x": 9.5, "y": 3.5}, - {"x": 10.5, "y": 3.5}, - {"x": 11.5, "y": 3.5}, - {"x": 12.5, "y": 3.5}, - {"x": 13.5, "y": 3.5, "w": 1.5}, - - {"x": 15.25, "y": 3.5}, - {"x": 16.25, "y": 3.5}, - {"x": 17.25, "y": 3.5}, - - {"x": 18.5, "y": 3.5}, - {"x": 19.5, "y": 3.5}, - {"x": 20.5, "y": 3.5}, - {"x": 21.5, "y": 3.5}, - - {"x": 22.75, "y": 3.5}, - {"x": 23.75, "y": 3.5}, - - {"x": 0, "y": 4.5, "w": 1.75}, - {"x": 1.75, "y": 4.5}, - {"x": 2.75, "y": 4.5}, - {"x": 3.75, "y": 4.5}, - {"x": 4.75, "y": 4.5}, - {"x": 5.75, "y": 4.5}, - {"x": 6.75, "y": 4.5}, - {"x": 7.75, "y": 4.5}, - {"x": 8.75, "y": 4.5}, - {"x": 9.75, "y": 4.5}, - {"x": 10.75, "y": 4.5}, - {"x": 11.75, "y": 4.5}, - {"x": 12.75, "y": 4.5}, - {"x": 13.75, "y": 4.5, "w": 1.25}, - - {"x": 18.5, "y": 4.5}, - {"x": 19.5, "y": 4.5}, - {"x": 20.5, "y": 4.5}, - {"x": 21.5, "y": 4.5}, - - {"x": 22.75, "y": 4.5}, - {"x": 23.75, "y": 4.5}, - - {"x": 0, "y": 5.5, "w": 1.25}, - {"x": 1.25, "y": 5.5}, - {"x": 2.25, "y": 5.5}, - {"x": 3.25, "y": 5.5}, - {"x": 4.25, "y": 5.5}, - {"x": 5.25, "y": 5.5}, - {"x": 6.25, "y": 5.5}, - {"x": 7.25, "y": 5.5}, - {"x": 8.25, "y": 5.5}, - {"x": 9.25, "y": 5.5}, - {"x": 10.25, "y": 5.5}, - {"x": 11.25, "y": 5.5}, - {"x": 12.25, "y": 5.5}, - {"x": 13.25, "y": 5.5, "w": 1.75}, - - {"x": 16.25, "y": 5.5}, - - {"x": 18.5, "y": 5.5}, - {"x": 19.5, "y": 5.5}, - {"x": 20.5, "y": 5.5}, - {"x": 21.5, "y": 5.5}, - - {"x": 22.75, "y": 5.5}, - {"x": 23.75, "y": 5.5}, - - {"x": 0, "y": 6.5}, - {"x": 1, "y": 6.5}, - {"x": 2, "y": 6.5}, - {"x": 3, "y": 6.5}, - {"x": 4, "y": 6.5}, - {"x": 5, "y": 6.5, "w": 3}, - {"x": 8, "y": 6.5}, - {"x": 9, "y": 6.5}, - {"x": 10, "y": 6.5}, - {"x": 11, "y": 6.5}, - {"x": 12, "y": 6.5}, - {"x": 13, "y": 6.5}, - {"x": 14, "y": 6.5}, - - {"x": 15.25, "y": 6.5}, - {"x": 16.25, "y": 6.5}, - {"x": 17.25, "y": 6.5}, - - {"x": 18.5, "y": 6.5, "w": 2}, - {"x": 20.5, "y": 6.5}, - {"x": 21.5, "y": 6.5}, - - {"x": 22.75, "y": 6.5}, - {"x": 23.75, "y": 6.5} + {"matrix": [6, 8], "x": 2, "y": 0}, + {"matrix": [6, 9], "x": 3, "y": 0}, + {"matrix": [6, 10], "x": 4, "y": 0}, + {"matrix": [6, 11], "x": 5, "y": 0}, + + {"matrix": [6, 12], "x": 6.5, "y": 0}, + {"matrix": [6, 13], "x": 7.5, "y": 0}, + {"matrix": [6, 14], "x": 8.5, "y": 0}, + {"matrix": [6, 15], "x": 9.5, "y": 0}, + + {"matrix": [7, 0], "x": 11, "y": 0}, + {"matrix": [7, 1], "x": 12, "y": 0}, + {"matrix": [7, 2], "x": 13, "y": 0}, + {"matrix": [7, 3], "x": 14, "y": 0}, + + {"matrix": [2, 9], "x": 0, "y": 1}, + + {"matrix": [3, 10], "x": 2, "y": 1}, + {"matrix": [3, 11], "x": 3, "y": 1}, + {"matrix": [3, 12], "x": 4, "y": 1}, + {"matrix": [3, 13], "x": 5, "y": 1}, + + {"matrix": [3, 14], "x": 6.5, "y": 1}, + {"matrix": [3, 15], "x": 7.5, "y": 1}, + {"matrix": [4, 0], "x": 8.5, "y": 1}, + {"matrix": [4, 1], "x": 9.5, "y": 1}, + + {"matrix": [4, 2], "x": 11, "y": 1}, + {"matrix": [4, 3], "x": 12, "y": 1}, + {"matrix": [4, 4], "x": 13, "y": 1}, + {"matrix": [4, 5], "x": 14, "y": 1}, + + {"matrix": [4, 6], "x": 15.25, "y": 1}, + {"matrix": [4, 7], "x": 16.25, "y": 1}, + {"matrix": [4, 8], "x": 17.25, "y": 1}, + + {"matrix": [8, 1], "x": 18.5, "y": 1}, + {"matrix": [8, 0], "x": 19.5, "y": 1}, + {"matrix": [7, 15], "x": 20.5, "y": 1}, + {"matrix": [6, 6], "x": 21.5, "y": 1}, + + {"matrix": [7, 5], "x": 22.75, "y": 1}, + + {"matrix": [3, 5], "x": 0, "y": 2.5}, + {"matrix": [1, 14], "x": 1, "y": 2.5}, + {"matrix": [1, 15], "x": 2, "y": 2.5}, + {"matrix": [2, 0], "x": 3, "y": 2.5}, + {"matrix": [2, 1], "x": 4, "y": 2.5}, + {"matrix": [2, 2], "x": 5, "y": 2.5}, + {"matrix": [2, 3], "x": 6, "y": 2.5}, + {"matrix": [2, 4], "x": 7, "y": 2.5}, + {"matrix": [2, 5], "x": 8, "y": 2.5}, + {"matrix": [2, 6], "x": 9, "y": 2.5}, + {"matrix": [2, 7], "x": 10, "y": 2.5}, + {"matrix": [2, 13], "x": 11, "y": 2.5}, + {"matrix": [2, 14], "x": 12, "y": 2.5}, + {"matrix": [8, 9], "x": 13, "y": 2.5}, + {"matrix": [2, 10], "x": 14, "y": 2.5}, + + {"matrix": [4, 9], "x": 15.25, "y": 2.5}, + {"matrix": [4, 10], "x": 16.25, "y": 2.5}, + {"matrix": [4, 11], "x": 17.25, "y": 2.5}, + + {"matrix": [5, 3], "x": 18.5, "y": 2.5}, + {"matrix": [5, 4], "x": 19.5, "y": 2.5}, + {"matrix": [5, 5], "x": 20.5, "y": 2.5}, + {"matrix": [5, 6], "x": 21.5, "y": 2.5}, + + {"matrix": [7, 8], "x": 22.75, "y": 2.5}, + {"matrix": [7, 9], "x": 23.75, "y": 2.5}, + + {"matrix": [2, 11], "x": 0, "y": 3.5, "w": 1.5}, + {"matrix": [1, 4], "x": 1.5, "y": 3.5}, + {"matrix": [1, 10], "x": 2.5, "y": 3.5}, + {"matrix": [0, 8], "x": 3.5, "y": 3.5}, + {"matrix": [1, 5], "x": 4.5, "y": 3.5}, + {"matrix": [1, 7], "x": 5.5, "y": 3.5}, + {"matrix": [1, 12], "x": 6.5, "y": 3.5}, + {"matrix": [1, 8], "x": 7.5, "y": 3.5}, + {"matrix": [0, 12], "x": 8.5, "y": 3.5}, + {"matrix": [1, 2], "x": 9.5, "y": 3.5}, + {"matrix": [1, 3], "x": 10.5, "y": 3.5}, + {"matrix": [2, 15], "x": 11.5, "y": 3.5}, + {"matrix": [3, 0], "x": 12.5, "y": 3.5}, + {"matrix": [3, 1], "x": 13.5, "y": 3.5, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.25, "y": 3.5}, + {"matrix": [4, 13], "x": 16.25, "y": 3.5}, + {"matrix": [4, 14], "x": 17.25, "y": 3.5}, + + {"matrix": [5, 15], "x": 18.5, "y": 3.5}, + {"matrix": [6, 0], "x": 19.5, "y": 3.5}, + {"matrix": [6, 1], "x": 20.5, "y": 3.5}, + {"matrix": [5, 7], "x": 21.5, "y": 3.5}, + + {"matrix": [7, 6], "x": 22.75, "y": 3.5}, + {"matrix": [7, 10], "x": 23.75, "y": 3.5}, + + {"matrix": [3, 9], "x": 0, "y": 4.5, "w": 1.75}, + {"matrix": [0, 4], "x": 1.75, "y": 4.5}, + {"matrix": [1, 6], "x": 2.75, "y": 4.5}, + {"matrix": [0, 7], "x": 3.75, "y": 4.5}, + {"matrix": [0, 9], "x": 4.75, "y": 4.5}, + {"matrix": [0, 10], "x": 5.75, "y": 4.5}, + {"matrix": [0, 11], "x": 6.75, "y": 4.5}, + {"matrix": [0, 13], "x": 7.75, "y": 4.5}, + {"matrix": [0, 14], "x": 8.75, "y": 4.5}, + {"matrix": [0, 15], "x": 9.75, "y": 4.5}, + {"matrix": [3, 3], "x": 10.75, "y": 4.5}, + {"matrix": [3, 4], "x": 11.75, "y": 4.5}, + {"matrix": [3, 2], "x": 12.75, "y": 4.5}, + {"matrix": [2, 8], "x": 13.75, "y": 4.5, "w": 1.25}, + + {"matrix": [5, 12], "x": 18.5, "y": 4.5}, + {"matrix": [5, 13], "x": 19.5, "y": 4.5}, + {"matrix": [5, 14], "x": 20.5, "y": 4.5}, + {"matrix": [8, 5], "x": 21.5, "y": 4.5}, + + {"matrix": [7, 7], "x": 22.75, "y": 4.5}, + {"matrix": [7, 12], "x": 23.75, "y": 4.5}, + + {"matrix": [14, 1], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [6, 4], "x": 1.25, "y": 5.5}, + {"matrix": [1, 13], "x": 2.25, "y": 5.5}, + {"matrix": [1, 11], "x": 3.25, "y": 5.5}, + {"matrix": [0, 6], "x": 4.25, "y": 5.5}, + {"matrix": [1, 9], "x": 5.25, "y": 5.5}, + {"matrix": [0, 5], "x": 6.25, "y": 5.5}, + {"matrix": [1, 1], "x": 7.25, "y": 5.5}, + {"matrix": [1, 0], "x": 8.25, "y": 5.5}, + {"matrix": [3, 6], "x": 9.25, "y": 5.5}, + {"matrix": [3, 7], "x": 10.25, "y": 5.5}, + {"matrix": [3, 8], "x": 11.25, "y": 5.5}, + {"matrix": [8, 7], "x": 12.25, "y": 5.5}, + {"matrix": [14, 5], "x": 13.25, "y": 5.5, "w": 1.75}, + + {"matrix": [5, 2], "x": 16.25, "y": 5.5}, + + {"matrix": [5, 9], "x": 18.5, "y": 5.5}, + {"matrix": [5, 10], "x": 19.5, "y": 5.5}, + {"matrix": [5, 11], "x": 20.5, "y": 5.5}, + {"matrix": [6, 7], "x": 21.5, "y": 5.5}, + + {"matrix": [7, 4], "x": 22.75, "y": 5.5}, + {"matrix": [7, 13], "x": 23.75, "y": 5.5}, + + {"matrix": [14, 0], "x": 0, "y": 6.5}, + {"matrix": [14, 3], "x": 1, "y": 6.5}, + {"matrix": [14, 2], "x": 2, "y": 6.5}, + {"matrix": [8, 11], "x": 3, "y": 6.5}, + {"matrix": [9, 1], "x": 4, "y": 6.5}, + {"matrix": [2, 12], "x": 5, "y": 6.5, "w": 3}, + {"matrix": [9, 0], "x": 8, "y": 6.5}, + {"matrix": [8, 10], "x": 9, "y": 6.5}, + {"matrix": [8, 8], "x": 10, "y": 6.5}, + {"matrix": [14, 6], "x": 11, "y": 6.5}, + {"matrix": [14, 7], "x": 12, "y": 6.5}, + {"matrix": [6, 5], "x": 13, "y": 6.5}, + {"matrix": [14, 4], "x": 14, "y": 6.5}, + + {"matrix": [5, 0], "x": 15.25, "y": 6.5}, + {"matrix": [5, 1], "x": 16.25, "y": 6.5}, + {"matrix": [4, 15], "x": 17.25, "y": 6.5}, + + {"matrix": [6, 2], "x": 18.5, "y": 6.5, "w": 2}, + {"matrix": [6, 3], "x": 20.5, "y": 6.5}, + {"matrix": [5, 8], "x": 21.5, "y": 6.5}, + + {"matrix": [7, 14], "x": 22.75, "y": 6.5}, + {"matrix": [7, 11], "x": 23.75, "y": 6.5} ] }, "LAYOUT_fullsize_ansi": { "layout": [ - {"x": 0, "y": 0}, - - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - - {"x": 15.25, "y": 0}, - {"x": 16.25, "y": 0}, - {"x": 17.25, "y": 0}, - - {"x": 0, "y": 1.5}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1.5}, - {"x": 4, "y": 1.5}, - {"x": 5, "y": 1.5}, - {"x": 6, "y": 1.5}, - {"x": 7, "y": 1.5}, - {"x": 8, "y": 1.5}, - {"x": 9, "y": 1.5}, - {"x": 10, "y": 1.5}, - {"x": 11, "y": 1.5}, - {"x": 12, "y": 1.5}, - {"x": 13, "y": 1.5, "w": 2}, - - {"x": 15.25, "y": 1.5}, - {"x": 16.25, "y": 1.5}, - {"x": 17.25, "y": 1.5}, - - {"x": 18.5, "y": 1.5}, - {"x": 19.5, "y": 1.5}, - {"x": 20.5, "y": 1.5}, - {"x": 21.5, "y": 1.5}, - - {"x": 0, "y": 2.5, "w": 1.5}, - {"x": 1.5, "y": 2.5}, - {"x": 2.5, "y": 2.5}, - {"x": 3.5, "y": 2.5}, - {"x": 4.5, "y": 2.5}, - {"x": 5.5, "y": 2.5}, - {"x": 6.5, "y": 2.5}, - {"x": 7.5, "y": 2.5}, - {"x": 8.5, "y": 2.5}, - {"x": 9.5, "y": 2.5}, - {"x": 10.5, "y": 2.5}, - {"x": 11.5, "y": 2.5}, - {"x": 12.5, "y": 2.5}, - {"x": 13.5, "y": 2.5, "w": 1.5}, - - {"x": 15.25, "y": 2.5}, - {"x": 16.25, "y": 2.5}, - {"x": 17.25, "y": 2.5}, - - {"x": 18.5, "y": 2.5}, - {"x": 19.5, "y": 2.5}, - {"x": 20.5, "y": 2.5}, - {"x": 21.5, "y": 2.5, "h": 2}, - - {"x": 0, "y": 3.5, "w": 1.75}, - {"x": 1.75, "y": 3.5}, - {"x": 2.75, "y": 3.5}, - {"x": 3.75, "y": 3.5}, - {"x": 4.75, "y": 3.5}, - {"x": 5.75, "y": 3.5}, - {"x": 6.75, "y": 3.5}, - {"x": 7.75, "y": 3.5}, - {"x": 8.75, "y": 3.5}, - {"x": 9.75, "y": 3.5}, - {"x": 10.75, "y": 3.5}, - {"x": 11.75, "y": 3.5}, - {"x": 12.75, "y": 3.5, "w": 2.25}, - - {"x": 18.5, "y": 3.5}, - {"x": 19.5, "y": 3.5}, - {"x": 20.5, "y": 3.5}, - - {"x": 0, "y": 4.5, "w": 2.25}, - {"x": 2.25, "y": 4.5}, - {"x": 3.25, "y": 4.5}, - {"x": 4.25, "y": 4.5}, - {"x": 5.25, "y": 4.5}, - {"x": 6.25, "y": 4.5}, - {"x": 7.25, "y": 4.5}, - {"x": 8.25, "y": 4.5}, - {"x": 9.25, "y": 4.5}, - {"x": 10.25, "y": 4.5}, - {"x": 11.25, "y": 4.5}, - {"x": 12.25, "y": 4.5, "w": 2.75}, - - {"x": 16.25, "y": 4.5}, - - {"x": 18.5, "y": 4.5}, - {"x": 19.5, "y": 4.5}, - {"x": 20.5, "y": 4.5}, - {"x": 21.5, "y": 4.5, "h": 2}, - - {"x": 0, "y": 5.5, "w": 1.25}, - {"x": 1.25, "y": 5.5, "w": 1.25}, - {"x": 2.5, "y": 5.5, "w": 1.25}, - {"x": 3.75, "y": 5.5, "w": 6.25}, - {"x": 10, "y": 5.5, "w": 1.25}, - {"x": 11.25, "y": 5.5, "w": 1.25}, - {"x": 12.5, "y": 5.5, "w": 1.25}, - {"x": 13.75, "y": 5.5, "w": 1.25}, - - {"x": 15.25, "y": 5.5}, - {"x": 16.25, "y": 5.5}, - {"x": 17.25, "y": 5.5}, - - {"x": 18.5, "y": 5.5, "w": 2}, - {"x": 20.5, "y": 5.5} + {"matrix": [2, 9], "x": 0, "y": 0}, + + {"matrix": [3, 10], "x": 2, "y": 0}, + {"matrix": [3, 11], "x": 3, "y": 0}, + {"matrix": [3, 12], "x": 4, "y": 0}, + {"matrix": [3, 13], "x": 5, "y": 0}, + + {"matrix": [3, 14], "x": 6.5, "y": 0}, + {"matrix": [3, 15], "x": 7.5, "y": 0}, + {"matrix": [4, 0], "x": 8.5, "y": 0}, + {"matrix": [4, 1], "x": 9.5, "y": 0}, + + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 4], "x": 13, "y": 0}, + {"matrix": [4, 5], "x": 14, "y": 0}, + + {"matrix": [4, 6], "x": 15.25, "y": 0}, + {"matrix": [4, 7], "x": 16.25, "y": 0}, + {"matrix": [4, 8], "x": 17.25, "y": 0}, + + {"matrix": [3, 5], "x": 0, "y": 1.5}, + {"matrix": [1, 14], "x": 1, "y": 1.5}, + {"matrix": [1, 15], "x": 2, "y": 1.5}, + {"matrix": [2, 0], "x": 3, "y": 1.5}, + {"matrix": [2, 1], "x": 4, "y": 1.5}, + {"matrix": [2, 2], "x": 5, "y": 1.5}, + {"matrix": [2, 3], "x": 6, "y": 1.5}, + {"matrix": [2, 4], "x": 7, "y": 1.5}, + {"matrix": [2, 5], "x": 8, "y": 1.5}, + {"matrix": [2, 6], "x": 9, "y": 1.5}, + {"matrix": [2, 7], "x": 10, "y": 1.5}, + {"matrix": [2, 13], "x": 11, "y": 1.5}, + {"matrix": [2, 14], "x": 12, "y": 1.5}, + {"matrix": [2, 10], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [4, 9], "x": 15.25, "y": 1.5}, + {"matrix": [4, 10], "x": 16.25, "y": 1.5}, + {"matrix": [4, 11], "x": 17.25, "y": 1.5}, + + {"matrix": [5, 3], "x": 18.5, "y": 1.5}, + {"matrix": [5, 4], "x": 19.5, "y": 1.5}, + {"matrix": [5, 5], "x": 20.5, "y": 1.5}, + {"matrix": [5, 6], "x": 21.5, "y": 1.5}, + + {"matrix": [2, 11], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [1, 4], "x": 1.5, "y": 2.5}, + {"matrix": [1, 10], "x": 2.5, "y": 2.5}, + {"matrix": [0, 8], "x": 3.5, "y": 2.5}, + {"matrix": [1, 5], "x": 4.5, "y": 2.5}, + {"matrix": [1, 7], "x": 5.5, "y": 2.5}, + {"matrix": [1, 12], "x": 6.5, "y": 2.5}, + {"matrix": [1, 8], "x": 7.5, "y": 2.5}, + {"matrix": [0, 12], "x": 8.5, "y": 2.5}, + {"matrix": [1, 2], "x": 9.5, "y": 2.5}, + {"matrix": [1, 3], "x": 10.5, "y": 2.5}, + {"matrix": [2, 15], "x": 11.5, "y": 2.5}, + {"matrix": [3, 0], "x": 12.5, "y": 2.5}, + {"matrix": [3, 1], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.25, "y": 2.5}, + {"matrix": [4, 13], "x": 16.25, "y": 2.5}, + {"matrix": [4, 14], "x": 17.25, "y": 2.5}, + + {"matrix": [5, 15], "x": 18.5, "y": 2.5}, + {"matrix": [6, 0], "x": 19.5, "y": 2.5}, + {"matrix": [6, 1], "x": 20.5, "y": 2.5}, + {"matrix": [5, 7], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [3, 9], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [0, 4], "x": 1.75, "y": 3.5}, + {"matrix": [1, 6], "x": 2.75, "y": 3.5}, + {"matrix": [0, 7], "x": 3.75, "y": 3.5}, + {"matrix": [0, 9], "x": 4.75, "y": 3.5}, + {"matrix": [0, 10], "x": 5.75, "y": 3.5}, + {"matrix": [0, 11], "x": 6.75, "y": 3.5}, + {"matrix": [0, 13], "x": 7.75, "y": 3.5}, + {"matrix": [0, 14], "x": 8.75, "y": 3.5}, + {"matrix": [0, 15], "x": 9.75, "y": 3.5}, + {"matrix": [3, 3], "x": 10.75, "y": 3.5}, + {"matrix": [3, 4], "x": 11.75, "y": 3.5}, + {"matrix": [2, 8], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [5, 12], "x": 18.5, "y": 3.5}, + {"matrix": [5, 13], "x": 19.5, "y": 3.5}, + {"matrix": [5, 14], "x": 20.5, "y": 3.5}, + + {"matrix": [14, 1], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [1, 13], "x": 2.25, "y": 4.5}, + {"matrix": [1, 11], "x": 3.25, "y": 4.5}, + {"matrix": [0, 6], "x": 4.25, "y": 4.5}, + {"matrix": [1, 9], "x": 5.25, "y": 4.5}, + {"matrix": [0, 5], "x": 6.25, "y": 4.5}, + {"matrix": [1, 1], "x": 7.25, "y": 4.5}, + {"matrix": [1, 0], "x": 8.25, "y": 4.5}, + {"matrix": [3, 6], "x": 9.25, "y": 4.5}, + {"matrix": [3, 7], "x": 10.25, "y": 4.5}, + {"matrix": [3, 8], "x": 11.25, "y": 4.5}, + {"matrix": [14, 5], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [5, 2], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 9], "x": 18.5, "y": 4.5}, + {"matrix": [5, 10], "x": 19.5, "y": 4.5}, + {"matrix": [5, 11], "x": 20.5, "y": 4.5}, + {"matrix": [5, 8], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [14, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [14, 3], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [14, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [2, 12], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [14, 6], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [14, 7], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [6, 5], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [14, 4], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 0], "x": 15.25, "y": 5.5}, + {"matrix": [5, 1], "x": 16.25, "y": 5.5}, + {"matrix": [4, 15], "x": 17.25, "y": 5.5}, + + {"matrix": [6, 2], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [6, 3], "x": 20.5, "y": 5.5} ] }, "LAYOUT_fullsize_iso": { "layout": [ - {"x": 0, "y": 0}, - - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - - {"x": 15.25, "y": 0}, - {"x": 16.25, "y": 0}, - {"x": 17.25, "y": 0}, - - {"x": 0, "y": 1.5}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1.5}, - {"x": 4, "y": 1.5}, - {"x": 5, "y": 1.5}, - {"x": 6, "y": 1.5}, - {"x": 7, "y": 1.5}, - {"x": 8, "y": 1.5}, - {"x": 9, "y": 1.5}, - {"x": 10, "y": 1.5}, - {"x": 11, "y": 1.5}, - {"x": 12, "y": 1.5}, - {"x": 13, "y": 1.5, "w": 2}, - - {"x": 15.25, "y": 1.5}, - {"x": 16.25, "y": 1.5}, - {"x": 17.25, "y": 1.5}, - - {"x": 18.5, "y": 1.5}, - {"x": 19.5, "y": 1.5}, - {"x": 20.5, "y": 1.5}, - {"x": 21.5, "y": 1.5}, - - {"x": 0, "y": 2.5, "w": 1.5}, - {"x": 1.5, "y": 2.5}, - {"x": 2.5, "y": 2.5}, - {"x": 3.5, "y": 2.5}, - {"x": 4.5, "y": 2.5}, - {"x": 5.5, "y": 2.5}, - {"x": 6.5, "y": 2.5}, - {"x": 7.5, "y": 2.5}, - {"x": 8.5, "y": 2.5}, - {"x": 9.5, "y": 2.5}, - {"x": 10.5, "y": 2.5}, - {"x": 11.5, "y": 2.5}, - {"x": 12.5, "y": 2.5}, - - {"x": 15.25, "y": 2.5}, - {"x": 16.25, "y": 2.5}, - {"x": 17.25, "y": 2.5}, - - {"x": 18.5, "y": 2.5}, - {"x": 19.5, "y": 2.5}, - {"x": 20.5, "y": 2.5}, - {"x": 21.5, "y": 2.5, "h": 2}, - - {"x": 0, "y": 3.5, "w": 1.75}, - {"x": 1.75, "y": 3.5}, - {"x": 2.75, "y": 3.5}, - {"x": 3.75, "y": 3.5}, - {"x": 4.75, "y": 3.5}, - {"x": 5.75, "y": 3.5}, - {"x": 6.75, "y": 3.5}, - {"x": 7.75, "y": 3.5}, - {"x": 8.75, "y": 3.5}, - {"x": 9.75, "y": 3.5}, - {"x": 10.75, "y": 3.5}, - {"x": 11.75, "y": 3.5}, - {"x": 12.75, "y": 3.5}, - {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, - - {"x": 18.5, "y": 3.5}, - {"x": 19.5, "y": 3.5}, - {"x": 20.5, "y": 3.5}, - - {"x": 0, "y": 4.5, "w": 1.25}, - {"x": 1.25, "y": 4.5}, - {"x": 2.25, "y": 4.5}, - {"x": 3.25, "y": 4.5}, - {"x": 4.25, "y": 4.5}, - {"x": 5.25, "y": 4.5}, - {"x": 6.25, "y": 4.5}, - {"x": 7.25, "y": 4.5}, - {"x": 8.25, "y": 4.5}, - {"x": 9.25, "y": 4.5}, - {"x": 10.25, "y": 4.5}, - {"x": 11.25, "y": 4.5}, - {"x": 12.25, "y": 4.5, "w": 2.75}, - - {"x": 16.25, "y": 4.5}, - - {"x": 18.5, "y": 4.5}, - {"x": 19.5, "y": 4.5}, - {"x": 20.5, "y": 4.5}, - {"x": 21.5, "y": 4.5, "h": 2}, - - {"x": 0, "y": 5.5, "w": 1.25}, - {"x": 1.25, "y": 5.5, "w": 1.25}, - {"x": 2.5, "y": 5.5, "w": 1.25}, - {"x": 3.75, "y": 5.5, "w": 6.25}, - {"x": 10, "y": 5.5, "w": 1.25}, - {"x": 11.25, "y": 5.5, "w": 1.25}, - {"x": 12.5, "y": 5.5, "w": 1.25}, - {"x": 13.75, "y": 5.5, "w": 1.25}, - - {"x": 15.25, "y": 5.5}, - {"x": 16.25, "y": 5.5}, - {"x": 17.25, "y": 5.5}, - - {"x": 18.5, "y": 5.5, "w": 2}, - {"x": 20.5, "y": 5.5} + {"matrix": [2, 9], "x": 0, "y": 0}, + + {"matrix": [3, 10], "x": 2, "y": 0}, + {"matrix": [3, 11], "x": 3, "y": 0}, + {"matrix": [3, 12], "x": 4, "y": 0}, + {"matrix": [3, 13], "x": 5, "y": 0}, + + {"matrix": [3, 14], "x": 6.5, "y": 0}, + {"matrix": [3, 15], "x": 7.5, "y": 0}, + {"matrix": [4, 0], "x": 8.5, "y": 0}, + {"matrix": [4, 1], "x": 9.5, "y": 0}, + + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 4], "x": 13, "y": 0}, + {"matrix": [4, 5], "x": 14, "y": 0}, + + {"matrix": [4, 6], "x": 15.25, "y": 0}, + {"matrix": [4, 7], "x": 16.25, "y": 0}, + {"matrix": [4, 8], "x": 17.25, "y": 0}, + + {"matrix": [3, 5], "x": 0, "y": 1.5}, + {"matrix": [1, 14], "x": 1, "y": 1.5}, + {"matrix": [1, 15], "x": 2, "y": 1.5}, + {"matrix": [2, 0], "x": 3, "y": 1.5}, + {"matrix": [2, 1], "x": 4, "y": 1.5}, + {"matrix": [2, 2], "x": 5, "y": 1.5}, + {"matrix": [2, 3], "x": 6, "y": 1.5}, + {"matrix": [2, 4], "x": 7, "y": 1.5}, + {"matrix": [2, 5], "x": 8, "y": 1.5}, + {"matrix": [2, 6], "x": 9, "y": 1.5}, + {"matrix": [2, 7], "x": 10, "y": 1.5}, + {"matrix": [2, 13], "x": 11, "y": 1.5}, + {"matrix": [2, 14], "x": 12, "y": 1.5}, + {"matrix": [2, 10], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [4, 9], "x": 15.25, "y": 1.5}, + {"matrix": [4, 10], "x": 16.25, "y": 1.5}, + {"matrix": [4, 11], "x": 17.25, "y": 1.5}, + + {"matrix": [5, 3], "x": 18.5, "y": 1.5}, + {"matrix": [5, 4], "x": 19.5, "y": 1.5}, + {"matrix": [5, 5], "x": 20.5, "y": 1.5}, + {"matrix": [5, 6], "x": 21.5, "y": 1.5}, + + {"matrix": [2, 11], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [1, 4], "x": 1.5, "y": 2.5}, + {"matrix": [1, 10], "x": 2.5, "y": 2.5}, + {"matrix": [0, 8], "x": 3.5, "y": 2.5}, + {"matrix": [1, 5], "x": 4.5, "y": 2.5}, + {"matrix": [1, 7], "x": 5.5, "y": 2.5}, + {"matrix": [1, 12], "x": 6.5, "y": 2.5}, + {"matrix": [1, 8], "x": 7.5, "y": 2.5}, + {"matrix": [0, 12], "x": 8.5, "y": 2.5}, + {"matrix": [1, 2], "x": 9.5, "y": 2.5}, + {"matrix": [1, 3], "x": 10.5, "y": 2.5}, + {"matrix": [2, 15], "x": 11.5, "y": 2.5}, + {"matrix": [3, 0], "x": 12.5, "y": 2.5}, + + {"matrix": [4, 12], "x": 15.25, "y": 2.5}, + {"matrix": [4, 13], "x": 16.25, "y": 2.5}, + {"matrix": [4, 14], "x": 17.25, "y": 2.5}, + + {"matrix": [5, 15], "x": 18.5, "y": 2.5}, + {"matrix": [6, 0], "x": 19.5, "y": 2.5}, + {"matrix": [6, 1], "x": 20.5, "y": 2.5}, + {"matrix": [5, 7], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [3, 9], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [0, 4], "x": 1.75, "y": 3.5}, + {"matrix": [1, 6], "x": 2.75, "y": 3.5}, + {"matrix": [0, 7], "x": 3.75, "y": 3.5}, + {"matrix": [0, 9], "x": 4.75, "y": 3.5}, + {"matrix": [0, 10], "x": 5.75, "y": 3.5}, + {"matrix": [0, 11], "x": 6.75, "y": 3.5}, + {"matrix": [0, 13], "x": 7.75, "y": 3.5}, + {"matrix": [0, 14], "x": 8.75, "y": 3.5}, + {"matrix": [0, 15], "x": 9.75, "y": 3.5}, + {"matrix": [3, 3], "x": 10.75, "y": 3.5}, + {"matrix": [3, 4], "x": 11.75, "y": 3.5}, + {"matrix": [3, 2], "x": 12.75, "y": 3.5}, + {"matrix": [2, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [5, 12], "x": 18.5, "y": 3.5}, + {"matrix": [5, 13], "x": 19.5, "y": 3.5}, + {"matrix": [5, 14], "x": 20.5, "y": 3.5}, + + {"matrix": [14, 1], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [6, 4], "x": 1.25, "y": 4.5}, + {"matrix": [1, 13], "x": 2.25, "y": 4.5}, + {"matrix": [1, 11], "x": 3.25, "y": 4.5}, + {"matrix": [0, 6], "x": 4.25, "y": 4.5}, + {"matrix": [1, 9], "x": 5.25, "y": 4.5}, + {"matrix": [0, 5], "x": 6.25, "y": 4.5}, + {"matrix": [1, 1], "x": 7.25, "y": 4.5}, + {"matrix": [1, 0], "x": 8.25, "y": 4.5}, + {"matrix": [3, 6], "x": 9.25, "y": 4.5}, + {"matrix": [3, 7], "x": 10.25, "y": 4.5}, + {"matrix": [3, 8], "x": 11.25, "y": 4.5}, + {"matrix": [14, 5], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [5, 2], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 9], "x": 18.5, "y": 4.5}, + {"matrix": [5, 10], "x": 19.5, "y": 4.5}, + {"matrix": [5, 11], "x": 20.5, "y": 4.5}, + {"matrix": [5, 8], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [14, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [14, 3], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [14, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [2, 12], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [14, 6], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [14, 7], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [6, 5], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [14, 4], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 0], "x": 15.25, "y": 5.5}, + {"matrix": [5, 1], "x": 16.25, "y": 5.5}, + {"matrix": [4, 15], "x": 17.25, "y": 5.5}, + + {"matrix": [6, 2], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [6, 3], "x": 20.5, "y": 5.5} ] }, "LAYOUT_fullsize_jis": { "layout": [ - {"x": 0, "y": 0}, - - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - - {"x": 15.25, "y": 0}, - {"x": 16.25, "y": 0}, - {"x": 17.25, "y": 0}, - - {"x": 0, "y": 1.5}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1.5}, - {"x": 4, "y": 1.5}, - {"x": 5, "y": 1.5}, - {"x": 6, "y": 1.5}, - {"x": 7, "y": 1.5}, - {"x": 8, "y": 1.5}, - {"x": 9, "y": 1.5}, - {"x": 10, "y": 1.5}, - {"x": 11, "y": 1.5}, - {"x": 12, "y": 1.5}, - {"x": 13, "y": 1.5}, - {"x": 14, "y": 1.5}, - - {"x": 15.25, "y": 1.5}, - {"x": 16.25, "y": 1.5}, - {"x": 17.25, "y": 1.5}, - - {"x": 18.5, "y": 1.5}, - {"x": 19.5, "y": 1.5}, - {"x": 20.5, "y": 1.5}, - {"x": 21.5, "y": 1.5}, - - {"x": 0, "y": 2.5, "w": 1.5}, - {"x": 1.5, "y": 2.5}, - {"x": 2.5, "y": 2.5}, - {"x": 3.5, "y": 2.5}, - {"x": 4.5, "y": 2.5}, - {"x": 5.5, "y": 2.5}, - {"x": 6.5, "y": 2.5}, - {"x": 7.5, "y": 2.5}, - {"x": 8.5, "y": 2.5}, - {"x": 9.5, "y": 2.5}, - {"x": 10.5, "y": 2.5}, - {"x": 11.5, "y": 2.5}, - {"x": 12.5, "y": 2.5}, - - {"x": 15.25, "y": 2.5}, - {"x": 16.25, "y": 2.5}, - {"x": 17.25, "y": 2.5}, - - {"x": 18.5, "y": 2.5}, - {"x": 19.5, "y": 2.5}, - {"x": 20.5, "y": 2.5}, - {"x": 21.5, "y": 2.5, "h": 2}, - - {"x": 0, "y": 3.5, "w": 1.75}, - {"x": 1.75, "y": 3.5}, - {"x": 2.75, "y": 3.5}, - {"x": 3.75, "y": 3.5}, - {"x": 4.75, "y": 3.5}, - {"x": 5.75, "y": 3.5}, - {"x": 6.75, "y": 3.5}, - {"x": 7.75, "y": 3.5}, - {"x": 8.75, "y": 3.5}, - {"x": 9.75, "y": 3.5}, - {"x": 10.75, "y": 3.5}, - {"x": 11.75, "y": 3.5}, - {"x": 12.75, "y": 3.5}, - {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, - - {"x": 18.5, "y": 3.5}, - {"x": 19.5, "y": 3.5}, - {"x": 20.5, "y": 3.5}, - - {"x": 0, "y": 4.5, "w": 2.25}, - {"x": 2.25, "y": 4.5}, - {"x": 3.25, "y": 4.5}, - {"x": 4.25, "y": 4.5}, - {"x": 5.25, "y": 4.5}, - {"x": 6.25, "y": 4.5}, - {"x": 7.25, "y": 4.5}, - {"x": 8.25, "y": 4.5}, - {"x": 9.25, "y": 4.5}, - {"x": 10.25, "y": 4.5}, - {"x": 11.25, "y": 4.5}, - {"x": 12.25, "y": 4.5}, - {"x": 13.25, "y": 4.5, "w": 1.75}, - - {"x": 16.25, "y": 4.5}, - - {"x": 18.5, "y": 4.5}, - {"x": 19.5, "y": 4.5}, - {"x": 20.5, "y": 4.5}, - {"x": 21.5, "y": 4.5, "h": 2}, - - {"x": 0, "y": 5.5, "w": 1.25}, - {"x": 1.25, "y": 5.5, "w": 1.25}, - {"x": 2.5, "y": 5.5, "w": 1.25}, - {"x": 3.75, "y": 5.5, "w": 1.25}, - {"x": 5, "y": 5.5, "w": 2.5}, - {"x": 7.5, "y": 5.5, "w": 1.25}, - {"x": 8.75, "y": 5.5, "w": 1.25}, - {"x": 10, "y": 5.5, "w": 1.25}, - {"x": 11.25, "y": 5.5, "w": 1.25}, - {"x": 12.5, "y": 5.5, "w": 1.25}, - {"x": 13.75, "y": 5.5, "w": 1.25}, - - {"x": 15.25, "y": 5.5}, - {"x": 16.25, "y": 5.5}, - {"x": 17.25, "y": 5.5}, - - {"x": 18.5, "y": 5.5, "w": 2}, - {"x": 20.5, "y": 5.5} + {"matrix": [2, 9], "x": 0, "y": 0}, + + {"matrix": [3, 10], "x": 2, "y": 0}, + {"matrix": [3, 11], "x": 3, "y": 0}, + {"matrix": [3, 12], "x": 4, "y": 0}, + {"matrix": [3, 13], "x": 5, "y": 0}, + + {"matrix": [3, 14], "x": 6.5, "y": 0}, + {"matrix": [3, 15], "x": 7.5, "y": 0}, + {"matrix": [4, 0], "x": 8.5, "y": 0}, + {"matrix": [4, 1], "x": 9.5, "y": 0}, + + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 4], "x": 13, "y": 0}, + {"matrix": [4, 5], "x": 14, "y": 0}, + + {"matrix": [4, 6], "x": 15.25, "y": 0}, + {"matrix": [4, 7], "x": 16.25, "y": 0}, + {"matrix": [4, 8], "x": 17.25, "y": 0}, + + {"matrix": [3, 5], "x": 0, "y": 1.5}, + {"matrix": [1, 14], "x": 1, "y": 1.5}, + {"matrix": [1, 15], "x": 2, "y": 1.5}, + {"matrix": [2, 0], "x": 3, "y": 1.5}, + {"matrix": [2, 1], "x": 4, "y": 1.5}, + {"matrix": [2, 2], "x": 5, "y": 1.5}, + {"matrix": [2, 3], "x": 6, "y": 1.5}, + {"matrix": [2, 4], "x": 7, "y": 1.5}, + {"matrix": [2, 5], "x": 8, "y": 1.5}, + {"matrix": [2, 6], "x": 9, "y": 1.5}, + {"matrix": [2, 7], "x": 10, "y": 1.5}, + {"matrix": [2, 13], "x": 11, "y": 1.5}, + {"matrix": [2, 14], "x": 12, "y": 1.5}, + {"matrix": [8, 9], "x": 13, "y": 1.5}, + {"matrix": [2, 10], "x": 14, "y": 1.5}, + + {"matrix": [4, 9], "x": 15.25, "y": 1.5}, + {"matrix": [4, 10], "x": 16.25, "y": 1.5}, + {"matrix": [4, 11], "x": 17.25, "y": 1.5}, + + {"matrix": [5, 3], "x": 18.5, "y": 1.5}, + {"matrix": [5, 4], "x": 19.5, "y": 1.5}, + {"matrix": [5, 5], "x": 20.5, "y": 1.5}, + {"matrix": [5, 6], "x": 21.5, "y": 1.5}, + + {"matrix": [2, 11], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [1, 4], "x": 1.5, "y": 2.5}, + {"matrix": [1, 10], "x": 2.5, "y": 2.5}, + {"matrix": [0, 8], "x": 3.5, "y": 2.5}, + {"matrix": [1, 5], "x": 4.5, "y": 2.5}, + {"matrix": [1, 7], "x": 5.5, "y": 2.5}, + {"matrix": [1, 12], "x": 6.5, "y": 2.5}, + {"matrix": [1, 8], "x": 7.5, "y": 2.5}, + {"matrix": [0, 12], "x": 8.5, "y": 2.5}, + {"matrix": [1, 2], "x": 9.5, "y": 2.5}, + {"matrix": [1, 3], "x": 10.5, "y": 2.5}, + {"matrix": [2, 15], "x": 11.5, "y": 2.5}, + {"matrix": [3, 0], "x": 12.5, "y": 2.5}, + + {"matrix": [4, 12], "x": 15.25, "y": 2.5}, + {"matrix": [4, 13], "x": 16.25, "y": 2.5}, + {"matrix": [4, 14], "x": 17.25, "y": 2.5}, + + {"matrix": [5, 15], "x": 18.5, "y": 2.5}, + {"matrix": [6, 0], "x": 19.5, "y": 2.5}, + {"matrix": [6, 1], "x": 20.5, "y": 2.5}, + {"matrix": [5, 7], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [3, 9], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [0, 4], "x": 1.75, "y": 3.5}, + {"matrix": [1, 6], "x": 2.75, "y": 3.5}, + {"matrix": [0, 7], "x": 3.75, "y": 3.5}, + {"matrix": [0, 9], "x": 4.75, "y": 3.5}, + {"matrix": [0, 10], "x": 5.75, "y": 3.5}, + {"matrix": [0, 11], "x": 6.75, "y": 3.5}, + {"matrix": [0, 13], "x": 7.75, "y": 3.5}, + {"matrix": [0, 14], "x": 8.75, "y": 3.5}, + {"matrix": [0, 15], "x": 9.75, "y": 3.5}, + {"matrix": [3, 3], "x": 10.75, "y": 3.5}, + {"matrix": [3, 4], "x": 11.75, "y": 3.5}, + {"matrix": [3, 2], "x": 12.75, "y": 3.5}, + {"matrix": [2, 8], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [5, 12], "x": 18.5, "y": 3.5}, + {"matrix": [5, 13], "x": 19.5, "y": 3.5}, + {"matrix": [5, 14], "x": 20.5, "y": 3.5}, + + {"matrix": [14, 1], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [1, 13], "x": 2.25, "y": 4.5}, + {"matrix": [1, 11], "x": 3.25, "y": 4.5}, + {"matrix": [0, 6], "x": 4.25, "y": 4.5}, + {"matrix": [1, 9], "x": 5.25, "y": 4.5}, + {"matrix": [0, 5], "x": 6.25, "y": 4.5}, + {"matrix": [1, 1], "x": 7.25, "y": 4.5}, + {"matrix": [1, 0], "x": 8.25, "y": 4.5}, + {"matrix": [3, 6], "x": 9.25, "y": 4.5}, + {"matrix": [3, 7], "x": 10.25, "y": 4.5}, + {"matrix": [3, 8], "x": 11.25, "y": 4.5}, + {"matrix": [8, 7], "x": 12.25, "y": 4.5}, + {"matrix": [14, 5], "x": 13.25, "y": 4.5, "w": 1.75}, + + {"matrix": [5, 2], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 9], "x": 18.5, "y": 4.5}, + {"matrix": [5, 10], "x": 19.5, "y": 4.5}, + {"matrix": [5, 11], "x": 20.5, "y": 4.5}, + {"matrix": [5, 8], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [14, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [14, 3], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [14, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [8, 11], "x": 3.75, "y": 5.5, "w": 1.25}, + {"matrix": [2, 12], "x": 5, "y": 5.5, "w": 2.5}, + {"matrix": [8, 10], "x": 7.5, "y": 5.5, "w": 1.25}, + {"matrix": [8, 8], "x": 8.75, "y": 5.5, "w": 1.25}, + {"matrix": [14, 6], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [14, 7], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [6, 5], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [14, 4], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 0], "x": 15.25, "y": 5.5}, + {"matrix": [5, 1], "x": 16.25, "y": 5.5}, + {"matrix": [4, 15], "x": 17.25, "y": 5.5}, + + {"matrix": [6, 2], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [6, 3], "x": 20.5, "y": 5.5} ] } } diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/combo.c b/keyboards/converter/usb_usb/keymaps/chriskopher/combo.c index 68a3eda04c..3b89488648 100644 --- a/keyboards/converter/usb_usb/keymaps/chriskopher/combo.c +++ b/keyboards/converter/usb_usb/keymaps/chriskopher/combo.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM sd_combo[] = {KC_S, KC_D, COMBO_END}; // Combo: S + D fo const uint16_t PROGMEM kl_combo[] = {KC_K, KC_L, COMBO_END}; // Combo: K + L for Meh modifier // Register the combo action -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [SD_LAYER_COMBO] = COMBO_ACTION(sd_combo), [KL_MEH_COMBO] = COMBO_ACTION(kl_combo), }; diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/config.h b/keyboards/converter/usb_usb/keymaps/chriskopher/config.h index 04066edc02..8f26d25799 100644 --- a/keyboards/converter/usb_usb/keymaps/chriskopher/config.h +++ b/keyboards/converter/usb_usb/keymaps/chriskopher/config.h @@ -20,5 +20,4 @@ #define HOLD_ON_OTHER_KEY_PRESS_PER_KEY // Allows configuration of hold on other key press per key in keymap.c -#define COMBO_COUNT 2 // Number of defined combos #define COMBO_TERM 20 // Delay for combo keys to be chained together diff --git a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c index 76cf311462..d34f91d21e 100644 --- a/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c +++ b/keyboards/converter/usb_usb/keymaps/chriskopher/keymap.c @@ -87,12 +87,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------' `-----------' `---------------' */ [_SUPERDUPER] = LAYOUT_fullsize_ansi( - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - ______, ______, ______, ______, ______, ______, ______, C(KC_1), C(S(KC_TAB)), C(KC_TAB), C(KC_9), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - ______, KC_LALT, ______, ______, KC_BSPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_DEL, ______, ______, ______, ______, ______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, TG(_SUPERDUPER), ______, ______, ______, ______, ______, ______, - ______, ______, ______, KC_LSFT, ______, ______, ______, ______, ______, ______, ______, ______, ______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, C(KC_1), C(S(KC_TAB)), C(KC_TAB), C(KC_9), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_LALT, _______, _______, KC_BSPC, KC_LCTL, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_DEL, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG(_SUPERDUPER), _______, _______, _______, _______, _______, _______, + _______, _______, _______, KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), /* Dev @@ -112,12 +112,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------' `-----------' `---------------' */ [_DEV] = LAYOUT_fullsize_ansi( - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - ______, ______, ______, ______, ______, ______, ______, KC_MINS, S(KC_EQL), S(KC_9), S(KC_0), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - ______, ______, ______, ______, ______, ______, S(KC_MINS), KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), ______, ______, ______, ______, ______, - ______, ______, ______, ______, ______, ______, KC_EQL, S(KC_BSLS), S(KC_COMM), S(KC_DOT), S(KC_SLSH), ______, ______, ______, ______, ______, ______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, KC_MINS, S(KC_EQL), S(KC_9), S(KC_0), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, S(KC_MINS), KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, KC_EQL, S(KC_BSLS), S(KC_COMM), S(KC_DOT), S(KC_SLSH), _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), /* Adjust @@ -137,12 +137,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------' `-----------' `---------------' */ [_ADJUST] = LAYOUT_fullsize_ansi( - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MPLY, KC_MNXT, KC_VOLU, ______, ______, ______, ______, - ______, DF(_QWERTY), ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, KC_MSTP, KC_MPRV, KC_VOLD, ______, ______, ______, ______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - ______, ______, ______, DF(_CKO), ______, ______, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, TG(_SUPERDUPER), ______, ______, ______, ______, ______, ______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MNXT, KC_VOLU, _______, _______, _______, _______, + _______, DF(_QWERTY), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MSTP, KC_MPRV, KC_VOLD, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, DF(_CKO), _______, _______, KC_MPLY, KC_MUTE, KC_VOLD, KC_VOLU, TG(_SUPERDUPER), _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) /* Empty layout for future reference @@ -163,12 +163,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ /* * [_EMPTY] = LAYOUT_fullsize_ansi( - * ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - * ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - * ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - * ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - * ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - * ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______ + * _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + * _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + * _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + * _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + * _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + * _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ * ), */ }; diff --git a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c index fc9ebfa15d..67e1075654 100644 --- a/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c +++ b/keyboards/converter/usb_usb/keymaps/coloneljesus/keymap.c @@ -55,13 +55,13 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_LNG2, KC_SPC, KC_LNG1, KC_INT4, KC_INT2, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT, KC_FIND, KC_CUT ), LAYOUT_all( - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______, - KC_GRV, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______,______, - KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______,______, - ______, KC_MUTE, KC_VOLD, KC_MPLY, ______, ______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, ______, ______, ______, ______, ______,______,______,______, ______,______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______,______, ______,______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, QK_BOOT, ______,______,______, ______, ______,______, ______,______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_CAPS, KC_MPRV, KC_VOLU, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, KC_MUTE, KC_VOLD, KC_MPLY, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/converter/usb_usb/keymaps/default/keymap.c b/keyboards/converter/usb_usb/keymaps/default/keymap.c index 51a7a179af..36d5cd8780 100644 --- a/keyboards/converter/usb_usb/keymaps/default/keymap.c +++ b/keyboards/converter/usb_usb/keymaps/default/keymap.c @@ -46,12 +46,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_LNG2, KC_SPC, KC_LNG1, KC_INT4, KC_INT2, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT, KC_FIND, KC_CUT ), [1] = LAYOUT_all( - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______,______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______,______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______,______, ______,______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______,______, ______,______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______, ______,______, ______,______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/converter/usb_usb/keymaps/narze/config.h b/keyboards/converter/usb_usb/keymaps/narze/config.h index 9ab1637306..a7fccc4187 100644 --- a/keyboards/converter/usb_usb/keymaps/narze/config.h +++ b/keyboards/converter/usb_usb/keymaps/narze/config.h @@ -24,9 +24,7 @@ #define TAPPING_TERM 100 #define COMBO_TERM 20 -#define COMBO_COUNT 1 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define SUPER_DUPER_SOUND S__NOTE(_B1) diff --git a/keyboards/converter/usb_usb/keymaps/narze/keymap.c b/keyboards/converter/usb_usb/keymaps/narze/keymap.c index 78faa7975e..7b1b0ec445 100644 --- a/keyboards/converter/usb_usb/keymaps/narze/keymap.c +++ b/keyboards/converter/usb_usb/keymaps/narze/keymap.c @@ -76,13 +76,13 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { KC_LCTL, KC_LALT, GUI_UNDS,KC_INT5, KC_LNG2, KC_SPC, KC_LNG1, KC_INT4, KC_INT2, KC_BSPC, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT, KC_FIND, KC_CUT ), [_SUPERDUPER] = LAYOUT_all( - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, - QK_BOOT, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______,______, - ______, ______, ______, ______, ______, ______, ______, ______, BRWS_L, BRWS_R, ______, ______, ______, ______, ______,______,______, ______,______,______,______, ______,______, - KC_SPC, KC_LALT, _______, _______, KC_BSPC,KC_LGUI,KC_LEFT, KC_DOWN, KC_UP,KC_RGHT, KC_DEL, ______, ______, ______, ______,______,______,______, ______,______, - ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,______,______,______, ______,______, - ______, ______, ______, ______, ______, KC_LSFT, ______, ______, ______, ______, ______, ______, ______, ______,______,______, ______, ______,______, ______,______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, BRWS_L, BRWS_R, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + KC_SPC, KC_LALT, _______, _______, KC_BSPC, KC_LGUI, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/converter/usb_usb/pro_micro/pro_micro.c b/keyboards/converter/usb_usb/pro_micro/pro_micro.c deleted file mode 100644 index f10142f81a..0000000000 --- a/keyboards/converter/usb_usb/pro_micro/pro_micro.c +++ /dev/null @@ -1 +0,0 @@ -#include "pro_micro.h" diff --git a/keyboards/converter/usb_usb/pro_micro/pro_micro.h b/keyboards/converter/usb_usb/pro_micro/pro_micro.h deleted file mode 100644 index 3351176047..0000000000 --- a/keyboards/converter/usb_usb/pro_micro/pro_micro.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "usb_usb.h" diff --git a/keyboards/converter/usb_usb/usb_usb.c b/keyboards/converter/usb_usb/usb_usb.c deleted file mode 100644 index e8f224ad46..0000000000 --- a/keyboards/converter/usb_usb/usb_usb.c +++ /dev/null @@ -1 +0,0 @@ -#include "usb_usb.h" diff --git a/keyboards/converter/usb_usb/usb_usb.h b/keyboards/converter/usb_usb/usb_usb.h deleted file mode 100644 index bcd8b52974..0000000000 --- a/keyboards/converter/usb_usb/usb_usb.h +++ /dev/null @@ -1,226 +0,0 @@ -/* -Copyright 2017 Balz Guenat <balz.guenat@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_converter_usb_usb_ble) -# include "ble.h" -#elif defined(KEYBOARD_converter_usb_usb_hasu) -# include "hasu.h" -#elif defined(KEYBOARD_converter_usb_usb_pro_micro) -# include "pro_micro.h" -#endif - -#define XXX KC_NO - -#define ______ KC_TRNS - -/* ,---------------. ,---------------. ,---------------. - * |F13|F14|F15|F16| |F17|F18|F19|F20| |F21|F22|F23|F24| - * ,---. |---------------| |---------------| |---------------| ,-----------. ,---------------. ,-------. - * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|Pwr| | Help | - * `---' `---------------' `---------------' `---------------' `-----------' `---------------' `-------' - * ,-----------------------------------------------------------. ,-----------. ,---------------. ,-------. - * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|JPY|Bsp| |Ins|Hom|PgU| |NmL| /| *| -| |Stp|Agn| - * |-----------------------------------------------------------| |-----------| |---------------| |-------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ | |Del|End|PgD| | 7| 8| 9| +| |Mnu|Und| - * |-----------------------------------------------------------| `-----------' |---------------| |-------| - * |CapsL | A| S| D| F| G| H| J| K| L| ;| :| #|Retn| | 4| 5| 6|KP,| |Sel|Cpy| - * |-----------------------------------------------------------| ,---. |---------------| |-------| - * |Shft| <| Z| X| C| V| B| N| M| ,| ,| /| RO|Shift | |Up | | 1| 2| 3|KP=| |Exe|Pst| - * |-----------------------------------------------------------| ,-----------. |---------------| |-------| - * |Ctl|Gui|Alt|MHEN|HNJ| Space |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0 | .|Ent| |Fnd|Cut| - * `-----------------------------------------------------------' `-----------' `---------------' `-------' - * - * - * App: Windows Menu key - * Gui: Windows key, Mac ⌘ key or Meta key - * - * Pwr: Power for Unix and Mac - * VDn,Vup,Mut: Volume control for Unix and Mac - * Stp,Agn..: for Unix - * - * KP,: Brazilian Keypad Comma - * KP=: Keypad = for Mac - * <,#: ISO keys(UK legend) - * JPY: Japanese Yen(￥) - * RO: Japanese ろ or Brazilian / - * MHEN: Japanese 無変換 Non Conversion - * HENK: Japanese 変換 Conversion - * KANA: Japanese かな Hiragana/Katakana - * https://en.wikipedia.org/wiki/Keyboard_layout#Japanese - * H/E: Korean 한/영 Hangul/English - * HNJ: Korean 한자 Hanja - * https://en.wikipedia.org/wiki/Keyboard_layout#Hangul_.28for_Korean.29 - * - * TODO: use same keycode to pass through instead of KC_NO? - */ -#define LAYOUT_all( \ - k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k70, k71, k72, k73, \ - k29, k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45, k46, k47, k48, k81, k80, k7F, k66, k75, \ -\ - k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k89, k2A, k49, k4A, k4B, k53, k54, k55, k56, k78, k79, \ - k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30, k31, k4C, k4D, k4E, k5F, k60, k61, k57, k76, k7A, \ - k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34, k32, k28, k5C, k5D, k5E, k85, k77, k7C, \ - kE1, k64, k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38, k87, kE5, k52, k59, k5A, k5B, k67, k74, k7D, \ - kE0, kE3, kE2, k8B, k91, k2C, k90, k8A, k88, kE6, kE7, k65, kE4, k50, k51, k4F, k62, k63, k58, k7E, k7B \ -) { \ - { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F }, \ - { k80, k81, XXX, XXX, XXX, k85, XXX, k87, k88, k89, k8A, k8B, XXX, XXX, XXX, XXX }, \ - { k90, k91, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ -} - -/* ,---. ,---------------. ,---------------. ,---------------. ,-----------. - * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - * `---' `---------------' `---------------' `---------------' `-----------' - * ,-----------------------------------------------------------. ,-----------. ,---------------. - * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Bsp| |Ins|Hom|PgU| |NmL| /| *| -| - * |-----------------------------------------------------------| |-----------| |---------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ | |Del|End|PgD| | 7| 8| 9| +| - * |-----------------------------------------------------------| `-----------' |-----------| | - * |CapsL | A| S| D| F| G| H| J| K| L| ;| '| Return| | 4| 5| 6| +| - * |-----------------------------------------------------------| ,---. |---------------| - * |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3| | - * |-----------------------------------------------------------| ,-----------. |-----------| | - * |Ctl|Gui|Alt| Space |Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0| .|Ent| - * `-----------------------------------------------------------' `-----------' `---------------' - */ -#define LAYOUT_fullsize_ansi( \ - k29, k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45, k46, k47, k48, \ -\ - k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k2A, k49, k4A, k4B, k53, k54, k55, k56, \ - k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30, k31, k4C, k4D, k4E, k5F, k60, k61, k57, \ - k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34, k28, k5C, k5D, k5E, \ - kE1, k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38, kE5, k52, k59, k5A, k5B, k58, \ - kE0, kE3, kE2, k2C, kE6, kE7, k65, kE4, k50, k51, k4F, k62, k63 \ -) { \ - { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ - { k30, k31, XXX, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ - { k60, k61, k62, k63, XXX, k65, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ -} - -/* ,---. ,---------------. ,---------------. ,---------------. ,-----------. - * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - * `---' `---------------' `---------------' `---------------' `-----------' - * ,-----------------------------------------------------------. ,-----------. ,---------------. - * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| Bsp| |Ins|Hom|PgU| |NmL| /| *| -| - * |-----------------------------------------------------------| |-----------| |---------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| Retn| |Del|End|PgD| | 7| 8| 9| +| - * |------------------------------------------------------` | `-----------' |-----------| | - * |CapsL | A| S| D| F| G| H| J| K| L| ;| :| #| | | 4| 5| 6| | - * |-----------------------------------------------------------| ,---. |---------------| - * |Shft| <| Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3|Ent| - * |-----------------------------------------------------------| ,-----------. |-----------| | - * |Ctl|Gui|Alt| Space |Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0| .| | - * `-----------------------------------------------------------' `-----------' `---------------' - */ -#define LAYOUT_fullsize_iso( \ - k29, k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45, k46, k47, k48, \ -\ - k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k2A, k49, k4A, k4B, k53, k54, k55, k56, \ - k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30, k4C, k4D, k4E, k5F, k60, k61, k57, \ - k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34, k32, k28, k5C, k5D, k5E, \ - kE1, k64, k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38, kE5, k52, k59, k5A, k5B, k58, \ - kE0, kE3, kE2, k2C, kE6, kE7, k65, kE4, k50, k51, k4F, k62, k63 \ -) { \ - { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ - { k60, k61, k62, k63, k64, k65, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX,}, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX,}, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ -} - -/* ,---. ,---------------. ,---------------. ,---------------. ,-----------. - * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - * `---' `---------------' `---------------' `---------------' `-----------' - * ,-----------------------------------------------------------. ,-----------. ,---------------. - * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| ^|JPY|Bsp| |Ins|Hom|PgU| |NmL| /| *| -| - * |-----------------------------------------------------------| |-----------| |---------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| @| [| Retn| |Del|End|PgD| | 7| 8| 9| +| - * |------------------------------------------------------` | `-----------' |-----------| | - * |CapsL | A| S| D| F| G| H| J| K| L| ;| :| ]| | | 4| 5| 6| | - * |-----------------------------------------------------------| ,---. |---------------| - * |Shft | Z| X| C| V| B| N| M| ,| ,| /| RO|Shift | |Up | | 1| 2| 3|Ent| - * |-----------------------------------------------------------| ,-----------. |-----------| | - * |Ctl|Gui|Alt|MHEN| Space |HENK|KNA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0| .| | - * `-----------------------------------------------------------' `-----------' `---------------' - */ -#define LAYOUT_fullsize_jis( \ - k29, k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k45, k46, k47, k48, \ -\ - k35, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k2D, k2E, k89, k2A, k49, k4A, k4B, k53, k54, k55, k56, \ - k2B, k14, k1A, k08, k15, k17, k1C, k18, k0C, k12, k13, k2F, k30, k4C, k4D, k4E, k5F, k60, k61, k57, \ - k39, k04, k16, k07, k09, k0A, k0B, k0D, k0E, k0F, k33, k34, k32, k28, k5C, k5D, k5E, \ - kE1, k1D, k1B, k06, k19, k05, k11, k10, k36, k37, k38, k87, kE5, k52, k59, k5A, k5B, k58, \ - kE0, kE3, kE2, k8B, k2C, k8A, k88, kE6, kE7, k65, kE4, k50, k51, k4F, k62, k63 \ -) { \ - { XXX, XXX, XXX, XXX, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ - { k60, k61, k62, k63, XXX, k65, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k87, k88, k89, k8A, k8B, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { kE0, kE1, kE2, kE3, kE4, kE5, kE6, kE7, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/converter/xmk/info.json b/keyboards/converter/xmk/info.json index 670010f1e2..7e8cd4ec79 100644 --- a/keyboards/converter/xmk/info.json +++ b/keyboards/converter/xmk/info.json @@ -23,42 +23,42 @@ "layouts": { "LAYOUT_split_3x5_3": { "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0.25 }, - { "matrix": [0, 1], "x": 1, "y": 0.125 }, - { "matrix": [0, 2], "x": 2, "y": 0 }, - { "matrix": [0, 3], "x": 3, "y": 0.125 }, - { "matrix": [0, 4], "x": 4, "y": 0.25 }, - { "matrix": [0, 5], "x": 7, "y": 0.25 }, - { "matrix": [0, 6], "x": 8, "y": 0.125 }, - { "matrix": [0, 7], "x": 9, "y": 0 }, - { "matrix": [0, 8], "x": 10, "y": 0.125 }, - { "matrix": [0, 9], "x": 11, "y": 0.25 }, - { "matrix": [0, 10], "x": 0, "y": 1.25 }, - { "matrix": [0, 11], "x": 1, "y": 1.125 }, - { "matrix": [0, 12], "x": 2, "y": 1 }, - { "matrix": [0, 13], "x": 3, "y": 1.125 }, - { "matrix": [0, 14], "x": 4, "y": 1.25 }, - { "matrix": [0, 15], "x": 7, "y": 1.25 }, - { "matrix": [0, 16], "x": 8, "y": 1.125 }, - { "matrix": [0, 17], "x": 9, "y": 1 }, - { "matrix": [0, 18], "x": 10, "y": 1.125 }, - { "matrix": [0, 19], "x": 11, "y": 1.25 }, - { "matrix": [0, 20], "x": 0, "y": 2.25 }, - { "matrix": [0, 21], "x": 1, "y": 2.125 }, - { "matrix": [0, 22], "x": 2, "y": 2 }, - { "matrix": [0, 23], "x": 3, "y": 2.125 }, - { "matrix": [0, 24], "x": 4, "y": 2.25 }, - { "matrix": [0, 25], "x": 7, "y": 2.25 }, - { "matrix": [0, 26], "x": 8, "y": 2.125 }, - { "matrix": [0, 27], "x": 9, "y": 2 }, - { "matrix": [0, 28], "x": 10, "y": 2.125 }, - { "matrix": [0, 29], "x": 11, "y": 2.25 }, - { "matrix": [0, 30], "x": 2.5, "y": 3.25 }, - { "matrix": [0, 31], "x": 3.5, "y": 3.5 }, - { "matrix": [1, 0], "x": 4.5, "y": 3.75 }, - { "matrix": [1, 1], "x": 6.5, "y": 3.75 }, - { "matrix": [1, 2], "x": 7.5, "y": 3.5 }, - { "matrix": [1, 3], "x": 8.5, "y": 3.25 } + {"matrix": [0, 0], "x": 0, "y": 0.25}, + {"matrix": [0, 1], "x": 1, "y": 0.125}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.125}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 7, "y": 0.25}, + {"matrix": [0, 6], "x": 8, "y": 0.125}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0.125}, + {"matrix": [0, 9], "x": 11, "y": 0.25}, + {"matrix": [0, 10], "x": 0, "y": 1.25}, + {"matrix": [0, 11], "x": 1, "y": 1.125}, + {"matrix": [0, 12], "x": 2, "y": 1}, + {"matrix": [0, 13], "x": 3, "y": 1.125}, + {"matrix": [0, 14], "x": 4, "y": 1.25}, + {"matrix": [0, 15], "x": 7, "y": 1.25}, + {"matrix": [0, 16], "x": 8, "y": 1.125}, + {"matrix": [0, 17], "x": 9, "y": 1}, + {"matrix": [0, 18], "x": 10, "y": 1.125}, + {"matrix": [0, 19], "x": 11, "y": 1.25}, + {"matrix": [0, 20], "x": 0, "y": 2.25}, + {"matrix": [0, 21], "x": 1, "y": 2.125}, + {"matrix": [0, 22], "x": 2, "y": 2}, + {"matrix": [0, 23], "x": 3, "y": 2.125}, + {"matrix": [0, 24], "x": 4, "y": 2.25}, + {"matrix": [0, 25], "x": 7, "y": 2.25}, + {"matrix": [0, 26], "x": 8, "y": 2.125}, + {"matrix": [0, 27], "x": 9, "y": 2}, + {"matrix": [0, 28], "x": 10, "y": 2.125}, + {"matrix": [0, 29], "x": 11, "y": 2.25}, + {"matrix": [0, 30], "x": 2.5, "y": 3.25}, + {"matrix": [0, 31], "x": 3.5, "y": 3.5}, + {"matrix": [1, 0], "x": 4.5, "y": 3.75}, + {"matrix": [1, 1], "x": 6.5, "y": 3.75}, + {"matrix": [1, 2], "x": 7.5, "y": 3.5}, + {"matrix": [1, 3], "x": 8.5, "y": 3.25} ] } } diff --git a/keyboards/converter/xmk/xmk.c b/keyboards/converter/xmk/xmk.c index a0426e95dc..e0df96fc2d 100644 --- a/keyboards/converter/xmk/xmk.c +++ b/keyboards/converter/xmk/xmk.c @@ -3,7 +3,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later -#include QMK_KEYBOARD_H +#include "quantum.h" #if defined (XMK_DEBUG) void keyboard_post_init_kb(void) { diff --git a/keyboards/converter/xmk/xmk_matrix.c b/keyboards/converter/xmk/xmk_matrix.c index 7327ad5cfe..41eca9fe46 100644 --- a/keyboards/converter/xmk/xmk_matrix.c +++ b/keyboards/converter/xmk/xmk_matrix.c @@ -4,6 +4,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "xmk_matrix.h" +#include "matrix.h" +#include "debug.h" bool xmk_changed = false; matrix_row_t xmk_rows[MATRIX_ROWS]; diff --git a/keyboards/converter/xmk/xmk_matrix.h b/keyboards/converter/xmk/xmk_matrix.h index 45514dea04..2a988253f9 100644 --- a/keyboards/converter/xmk/xmk_matrix.h +++ b/keyboards/converter/xmk/xmk_matrix.h @@ -5,6 +5,7 @@ #pragma once -#include QMK_KEYBOARD_H +#include <stdbool.h> +#include <stdint.h> void xmk_matrix_key(bool press, uint8_t key); diff --git a/keyboards/converter/xt_usb/info.json b/keyboards/converter/xt_usb/info.json index d266a1d3c1..1c9bcf5e34 100644 --- a/keyboards/converter/xt_usb/info.json +++ b/keyboards/converter/xt_usb/info.json @@ -13,221 +13,248 @@ "layouts": { "LAYOUT_xt": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2.25, "y": 0}, - {"x": 3.25, "y": 0}, - {"x": 4.25, "y": 0}, - {"x": 5.25, "y": 0}, - {"x": 6.25, "y": 0}, - {"x": 7.25, "y": 0}, - {"x": 8.25, "y": 0}, - {"x": 9.25, "y": 0}, - {"x": 10.25, "y": 0}, - {"x": 11.25, "y": 0}, - {"x": 12.25, "y": 0}, - {"x": 13.25, "y": 0}, - {"x": 14.25, "y": 0}, - {"x": 15.25, "y": 0, "w": 1.75}, - {"x": 17, "y": 0, "w": 2}, - {"x": 19, "y": 0, "w": 2}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2.25, "y": 1, "w": 1.5}, - {"x": 3.75, "y": 1}, - {"x": 4.75, "y": 1}, - {"x": 5.75, "y": 1}, - {"x": 6.75, "y": 1}, - {"x": 7.75, "y": 1}, - {"x": 8.75, "y": 1}, - {"x": 9.75, "y": 1}, - {"x": 10.75, "y": 1}, - {"x": 11.75, "y": 1}, - {"x": 12.75, "y": 1}, - {"x": 13.75, "y": 1}, - {"x": 14.75, "y": 1, "w": 1.25}, - {"x": 17, "y": 1}, - {"x": 18, "y": 1}, - {"x": 19, "y": 1}, - {"x": 20, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2.25, "y": 2, "w": 1.75}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, - {"x": 6, "y": 2}, - {"x": 7, "y": 2}, - {"x": 8, "y": 2}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 1, "h": 2}, - {"x": 17, "y": 2}, - {"x": 18, "y": 2}, - {"x": 19, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2.25, "y": 3, "w": 1.25}, - {"x": 3.5, "y": 3}, - {"x": 4.5, "y": 3}, - {"x": 5.5, "y": 3}, - {"x": 6.5, "y": 3}, - {"x": 7.5, "y": 3}, - {"x": 8.5, "y": 3}, - {"x": 9.5, "y": 3}, - {"x": 10.5, "y": 3}, - {"x": 11.5, "y": 3}, - {"x": 12.5, "y": 3}, - {"x": 13.5, "y": 3}, - {"x": 14.5, "y": 3, "w": 1.5}, - {"x": 16, "y": 3}, - {"x": 17, "y": 3}, - {"x": 18, "y": 3}, - {"x": 19, "y": 3}, - {"x": 20, "y": 2, "h": 3}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2.25, "y": 4, "w": 2}, - {"x": 4.25, "y": 4, "w": 9.75}, - {"x": 14, "y": 4, "w": 2}, - {"x": 16, "y": 4, "w": 2}, - {"x": 18, "y": 4, "w": 2} + {"matrix": [7, 3], "x": 0, "y": 0}, + {"matrix": [7, 4], "x": 1, "y": 0}, + + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [0, 2], "x": 3.25, "y": 0}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"matrix": [0, 4], "x": 5.25, "y": 0}, + {"matrix": [0, 5], "x": 6.25, "y": 0}, + {"matrix": [0, 6], "x": 7.25, "y": 0}, + {"matrix": [0, 7], "x": 8.25, "y": 0}, + {"matrix": [1, 0], "x": 9.25, "y": 0}, + {"matrix": [1, 1], "x": 10.25, "y": 0}, + {"matrix": [1, 2], "x": 11.25, "y": 0}, + {"matrix": [1, 3], "x": 12.25, "y": 0}, + {"matrix": [1, 4], "x": 13.25, "y": 0}, + {"matrix": [1, 5], "x": 14.25, "y": 0}, + {"matrix": [1, 6], "x": 15.25, "y": 0, "w": 1.75}, + {"matrix": [8, 5], "x": 17, "y": 0, "w": 2}, + {"matrix": [8, 6], "x": 19, "y": 0, "w": 2}, + + {"matrix": [7, 5], "x": 0, "y": 1}, + {"matrix": [7, 6], "x": 1, "y": 1}, + + {"matrix": [1, 7], "x": 2.25, "y": 1, "w": 1.5}, + {"matrix": [2, 0], "x": 3.75, "y": 1}, + {"matrix": [2, 1], "x": 4.75, "y": 1}, + {"matrix": [2, 2], "x": 5.75, "y": 1}, + {"matrix": [2, 3], "x": 6.75, "y": 1}, + {"matrix": [2, 4], "x": 7.75, "y": 1}, + {"matrix": [2, 5], "x": 8.75, "y": 1}, + {"matrix": [2, 6], "x": 9.75, "y": 1}, + {"matrix": [2, 7], "x": 10.75, "y": 1}, + {"matrix": [3, 0], "x": 11.75, "y": 1}, + {"matrix": [3, 1], "x": 12.75, "y": 1}, + {"matrix": [3, 2], "x": 13.75, "y": 1}, + {"matrix": [3, 3], "x": 14.75, "y": 1, "w": 1.25}, + {"matrix": [8, 7], "x": 17, "y": 1}, + {"matrix": [9, 0], "x": 18, "y": 1}, + {"matrix": [9, 1], "x": 19, "y": 1}, + {"matrix": [9, 2], "x": 20, "y": 1}, + + {"matrix": [7, 7], "x": 0, "y": 2}, + {"matrix": [8, 0], "x": 1, "y": 2}, + + {"matrix": [3, 5], "x": 2.25, "y": 2, "w": 1.75}, + {"matrix": [3, 6], "x": 4, "y": 2}, + {"matrix": [3, 7], "x": 5, "y": 2}, + {"matrix": [4, 0], "x": 6, "y": 2}, + {"matrix": [4, 1], "x": 7, "y": 2}, + {"matrix": [4, 2], "x": 8, "y": 2}, + {"matrix": [4, 3], "x": 9, "y": 2}, + {"matrix": [4, 4], "x": 10, "y": 2}, + {"matrix": [4, 5], "x": 11, "y": 2}, + {"matrix": [4, 6], "x": 12, "y": 2}, + {"matrix": [4, 7], "x": 13, "y": 2}, + {"matrix": [5, 0], "x": 14, "y": 2}, + {"matrix": [5, 1], "x": 15, "y": 2}, + {"matrix": [3, 4], "x": 16, "y": 1, "h": 2}, + {"matrix": [9, 3], "x": 17, "y": 2}, + {"matrix": [9, 4], "x": 18, "y": 2}, + {"matrix": [9, 5], "x": 19, "y": 2}, + + {"matrix": [8, 1], "x": 0, "y": 3}, + {"matrix": [8, 2], "x": 1, "y": 3}, + + {"matrix": [5, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [5, 3], "x": 3.5, "y": 3}, + {"matrix": [5, 4], "x": 4.5, "y": 3}, + {"matrix": [5, 5], "x": 5.5, "y": 3}, + {"matrix": [5, 6], "x": 6.5, "y": 3}, + {"matrix": [5, 7], "x": 7.5, "y": 3}, + {"matrix": [6, 0], "x": 8.5, "y": 3}, + {"matrix": [6, 1], "x": 9.5, "y": 3}, + {"matrix": [6, 2], "x": 10.5, "y": 3}, + {"matrix": [6, 3], "x": 11.5, "y": 3}, + {"matrix": [6, 4], "x": 12.5, "y": 3}, + {"matrix": [6, 5], "x": 13.5, "y": 3}, + {"matrix": [6, 6], "x": 14.5, "y": 3, "w": 1.5}, + {"matrix": [6, 7], "x": 16, "y": 3}, + {"matrix": [9, 7], "x": 17, "y": 3}, + {"matrix": [10, 0], "x": 18, "y": 3}, + {"matrix": [10, 1], "x": 19, "y": 3}, + {"matrix": [9, 6], "x": 20, "y": 2, "h": 3}, + + {"matrix": [8, 3], "x": 0, "y": 4}, + {"matrix": [8, 4], "x": 1, "y": 4}, + + {"matrix": [7, 0], "x": 2.25, "y": 4, "w": 2}, + {"matrix": [7, 1], "x": 4.25, "y": 4, "w": 9.75}, + {"matrix": [7, 2], "x": 14, "y": 4, "w": 2}, + {"matrix": [10, 2], "x": 16, "y": 4, "w": 2}, + {"matrix": [10, 3], "x": 18, "y": 4, "w": 2} ] }, "LAYOUT": { "layout": [ - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 0, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 6, "y": 1}, - {"x": 7, "y": 1}, - {"x": 8, "y": 1}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 15.25, "y": 1}, - {"x": 16.25, "y": 1}, - {"x": 17.25, "y": 1}, - {"x": 19.5, "y": 1}, - {"x": 20.5, "y": 1}, - {"x": 21.5, "y": 1}, - {"x": 0, "y": 2.5}, - {"x": 1, "y": 2.5}, - {"x": 2, "y": 2.5}, - {"x": 3, "y": 2.5}, - {"x": 4, "y": 2.5}, - {"x": 5, "y": 2.5}, - {"x": 6, "y": 2.5}, - {"x": 7, "y": 2.5}, - {"x": 8, "y": 2.5}, - {"x": 9, "y": 2.5}, - {"x": 10, "y": 2.5}, - {"x": 11, "y": 2.5}, - {"x": 12, "y": 2.5}, - {"x": 13, "y": 2.5}, - {"x": 14, "y": 2.5}, - {"x": 15.25, "y": 2.5}, - {"x": 16.25, "y": 2.5}, - {"x": 17.25, "y": 2.5}, - {"x": 18.5, "y": 2.5}, - {"x": 19.5, "y": 2.5}, - {"x": 20.5, "y": 2.5}, - {"x": 21.5, "y": 2.5}, - {"x": 0, "y": 3.5, "w": 1.5}, - {"x": 1.5, "y": 3.5}, - {"x": 2.5, "y": 3.5}, - {"x": 3.5, "y": 3.5}, - {"x": 4.5, "y": 3.5}, - {"x": 5.5, "y": 3.5}, - {"x": 6.5, "y": 3.5}, - {"x": 7.5, "y": 3.5}, - {"x": 8.5, "y": 3.5}, - {"x": 9.5, "y": 3.5}, - {"x": 10.5, "y": 3.5}, - {"x": 11.5, "y": 3.5}, - {"x": 12.5, "y": 3.5}, - {"x": 13.5, "y": 3.5, "w": 1.5}, - {"x": 15.25, "y": 3.5}, - {"x": 16.25, "y": 3.5}, - {"x": 17.25, "y": 3.5}, - {"x": 18.5, "y": 3.5}, - {"x": 19.5, "y": 3.5}, - {"x": 20.5, "y": 3.5}, - {"x": 21.5, "y": 3.5}, - {"x": 0, "y": 4.5, "w": 1.75}, - {"x": 1.75, "y": 4.5}, - {"x": 2.75, "y": 4.5}, - {"x": 3.75, "y": 4.5}, - {"x": 4.75, "y": 4.5}, - {"x": 5.75, "y": 4.5}, - {"x": 6.75, "y": 4.5}, - {"x": 7.75, "y": 4.5}, - {"x": 8.75, "y": 4.5}, - {"x": 9.75, "y": 4.5}, - {"x": 10.75, "y": 4.5}, - {"x": 11.75, "y": 4.5}, - {"x": 12.75, "y": 4.5}, - {"x": 13.75, "y": 4.5, "w": 1.25}, - {"x": 18.5, "y": 4.5}, - {"x": 19.5, "y": 4.5}, - {"x": 20.5, "y": 4.5}, - {"x": 21.5, "y": 4.5}, - {"x": 0, "y": 5.5, "w": 1.25}, - {"x": 1.25, "y": 5.5}, - {"x": 2.25, "y": 5.5}, - {"x": 3.25, "y": 5.5}, - {"x": 4.25, "y": 5.5}, - {"x": 5.25, "y": 5.5}, - {"x": 6.25, "y": 5.5}, - {"x": 7.25, "y": 5.5}, - {"x": 8.25, "y": 5.5}, - {"x": 9.25, "y": 5.5}, - {"x": 10.25, "y": 5.5}, - {"x": 11.25, "y": 5.5}, - {"x": 12.25, "y": 5.5}, - {"x": 13.25, "y": 5.5, "w": 1.75}, - {"x": 16.25, "y": 5.5}, - {"x": 18.5, "y": 5.5}, - {"x": 19.5, "y": 5.5}, - {"x": 20.5, "y": 5.5}, - {"x": 21.5, "y": 5.5}, - {"x": 0, "y": 6.5, "w": 1.25}, - {"x": 1.25, "y": 6.5, "w": 1.25}, - {"x": 2.5, "y": 6.5, "w": 1.25}, - {"x": 3.75, "y": 6.5, "w": 1.25}, - {"x": 5, "y": 6.5, "w": 3.25}, - {"x": 8.25, "y": 6.5, "w": 1.25}, - {"x": 9.5, "y": 6.5, "w": 1.25}, - {"x": 10.75, "y": 6.5}, - {"x": 11.75, "y": 6.5}, - {"x": 12.75, "y": 6.5}, - {"x": 13.75, "y": 6.5, "w": 1.25}, - {"x": 15.25, "y": 6.5}, - {"x": 16.25, "y": 6.5}, - {"x": 17.25, "y": 6.5}, - {"x": 18.5, "y": 6.5, "w": 2}, - {"x": 20.5, "y": 6.5}, - {"x": 21.5, "y": 6.5} + {"matrix": [12, 4], "x": 2, "y": 0}, + {"matrix": [12, 5], "x": 3, "y": 0}, + {"matrix": [12, 6], "x": 4, "y": 0}, + {"matrix": [12, 7], "x": 5, "y": 0}, + {"matrix": [13, 0], "x": 6, "y": 0}, + {"matrix": [13, 1], "x": 7, "y": 0}, + {"matrix": [13, 2], "x": 8, "y": 0}, + {"matrix": [13, 3], "x": 9, "y": 0}, + {"matrix": [13, 4], "x": 10, "y": 0}, + {"matrix": [13, 5], "x": 11, "y": 0}, + {"matrix": [13, 6], "x": 12, "y": 0}, + {"matrix": [14, 6], "x": 13, "y": 0}, + + {"matrix": [0, 1], "x": 0, "y": 1}, + + {"matrix": [7, 3], "x": 2, "y": 1}, + {"matrix": [7, 4], "x": 3, "y": 1}, + {"matrix": [7, 5], "x": 4, "y": 1}, + {"matrix": [7, 6], "x": 5, "y": 1}, + {"matrix": [7, 7], "x": 6, "y": 1}, + {"matrix": [8, 0], "x": 7, "y": 1}, + {"matrix": [8, 1], "x": 8, "y": 1}, + {"matrix": [8, 2], "x": 9, "y": 1}, + {"matrix": [8, 3], "x": 10, "y": 1}, + {"matrix": [8, 4], "x": 11, "y": 1}, + {"matrix": [10, 7], "x": 12, "y": 1}, + {"matrix": [11, 0], "x": 13, "y": 1}, + + {"matrix": [10, 4], "x": 15.25, "y": 1}, + {"matrix": [8, 6], "x": 16.25, "y": 1}, + {"matrix": [10, 5], "x": 17.25, "y": 1}, + + {"matrix": [11, 5], "x": 19.5, "y": 1}, + {"matrix": [11, 6], "x": 20.5, "y": 1}, + {"matrix": [11, 7], "x": 21.5, "y": 1}, + + {"matrix": [5, 1], "x": 0, "y": 2.5}, + {"matrix": [0, 2], "x": 1, "y": 2.5}, + {"matrix": [0, 3], "x": 2, "y": 2.5}, + {"matrix": [0, 4], "x": 3, "y": 2.5}, + {"matrix": [0, 5], "x": 4, "y": 2.5}, + {"matrix": [0, 6], "x": 5, "y": 2.5}, + {"matrix": [0, 7], "x": 6, "y": 2.5}, + {"matrix": [1, 0], "x": 7, "y": 2.5}, + {"matrix": [1, 1], "x": 8, "y": 2.5}, + {"matrix": [1, 2], "x": 9, "y": 2.5}, + {"matrix": [1, 3], "x": 10, "y": 2.5}, + {"matrix": [1, 4], "x": 11, "y": 2.5}, + {"matrix": [1, 5], "x": 12, "y": 2.5}, + {"matrix": [15, 5], "x": 13, "y": 2.5}, + {"matrix": [1, 6], "x": 14, "y": 2.5}, + + {"matrix": [14, 1], "x": 15.25, "y": 2.5}, + {"matrix": [14, 4], "x": 16.25, "y": 2.5}, + {"matrix": [14, 7], "x": 17.25, "y": 2.5}, + + {"matrix": [8, 5], "x": 18.5, "y": 2.5}, + {"matrix": [15, 7], "x": 19.5, "y": 2.5}, + {"matrix": [6, 7], "x": 20.5, "y": 2.5}, + {"matrix": [9, 2], "x": 21.5, "y": 2.5}, + + {"matrix": [1, 7], "x": 0, "y": 3.5, "w": 1.5}, + {"matrix": [2, 0], "x": 1.5, "y": 3.5}, + {"matrix": [2, 1], "x": 2.5, "y": 3.5}, + {"matrix": [2, 2], "x": 3.5, "y": 3.5}, + {"matrix": [2, 3], "x": 4.5, "y": 3.5}, + {"matrix": [2, 4], "x": 5.5, "y": 3.5}, + {"matrix": [2, 5], "x": 6.5, "y": 3.5}, + {"matrix": [2, 6], "x": 7.5, "y": 3.5}, + {"matrix": [2, 7], "x": 8.5, "y": 3.5}, + {"matrix": [3, 0], "x": 9.5, "y": 3.5}, + {"matrix": [3, 1], "x": 10.5, "y": 3.5}, + {"matrix": [3, 2], "x": 11.5, "y": 3.5}, + {"matrix": [3, 3], "x": 12.5, "y": 3.5}, + {"matrix": [5, 3], "x": 13.5, "y": 3.5, "w": 1.5}, + + {"matrix": [14, 2], "x": 15.25, "y": 3.5}, + {"matrix": [14, 5], "x": 16.25, "y": 3.5}, + {"matrix": [15, 0], "x": 17.25, "y": 3.5}, + + {"matrix": [8, 7], "x": 18.5, "y": 3.5}, + {"matrix": [9, 0], "x": 19.5, "y": 3.5}, + {"matrix": [9, 1], "x": 20.5, "y": 3.5}, + {"matrix": [9, 6], "x": 21.5, "y": 3.5}, + + {"matrix": [7, 2], "x": 0, "y": 4.5, "w": 1.75}, + {"matrix": [3, 6], "x": 1.75, "y": 4.5}, + {"matrix": [3, 7], "x": 2.75, "y": 4.5}, + {"matrix": [4, 0], "x": 3.75, "y": 4.5}, + {"matrix": [4, 1], "x": 4.75, "y": 4.5}, + {"matrix": [4, 2], "x": 5.75, "y": 4.5}, + {"matrix": [4, 3], "x": 6.75, "y": 4.5}, + {"matrix": [4, 4], "x": 7.75, "y": 4.5}, + {"matrix": [4, 5], "x": 8.75, "y": 4.5}, + {"matrix": [4, 6], "x": 9.75, "y": 4.5}, + {"matrix": [4, 7], "x": 10.75, "y": 4.5}, + {"matrix": [5, 0], "x": 11.75, "y": 4.5}, + {"matrix": [0, 0], "x": 12.75, "y": 4.5}, + {"matrix": [3, 4], "x": 13.75, "y": 4.5, "w": 1.25}, + + {"matrix": [9, 3], "x": 18.5, "y": 4.5}, + {"matrix": [9, 4], "x": 19.5, "y": 4.5}, + {"matrix": [9, 5], "x": 20.5, "y": 4.5}, + {"matrix": [15, 6], "x": 21.5, "y": 4.5}, + + {"matrix": [5, 2], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [10, 6], "x": 1.25, "y": 5.5}, + {"matrix": [5, 4], "x": 2.25, "y": 5.5}, + {"matrix": [5, 5], "x": 3.25, "y": 5.5}, + {"matrix": [5, 6], "x": 4.25, "y": 5.5}, + {"matrix": [5, 7], "x": 5.25, "y": 5.5}, + {"matrix": [6, 0], "x": 6.25, "y": 5.5}, + {"matrix": [6, 1], "x": 7.25, "y": 5.5}, + {"matrix": [6, 2], "x": 8.25, "y": 5.5}, + {"matrix": [6, 3], "x": 9.25, "y": 5.5}, + {"matrix": [6, 4], "x": 10.25, "y": 5.5}, + {"matrix": [6, 5], "x": 11.25, "y": 5.5}, + {"matrix": [14, 3], "x": 12.25, "y": 5.5}, + {"matrix": [6, 6], "x": 13.25, "y": 5.5, "w": 1.75}, + + {"matrix": [12, 0], "x": 16.25, "y": 5.5}, + + {"matrix": [9, 7], "x": 18.5, "y": 5.5}, + {"matrix": [10, 0], "x": 19.5, "y": 5.5}, + {"matrix": [10, 1], "x": 20.5, "y": 5.5}, + {"matrix": [13, 7], "x": 21.5, "y": 5.5}, + + {"matrix": [3, 5], "x": 0, "y": 6.5, "w": 1.25}, + {"matrix": [11, 2], "x": 1.25, "y": 6.5, "w": 1.25}, + {"matrix": [7, 0], "x": 2.5, "y": 6.5, "w": 1.25}, + {"matrix": [15, 3], "x": 3.75, "y": 6.5, "w": 1.25}, + {"matrix": [7, 1], "x": 5, "y": 6.5, "w": 3.25}, + {"matrix": [15, 1], "x": 8.25, "y": 6.5, "w": 1.25}, + {"matrix": [14, 0], "x": 9.5, "y": 6.5, "w": 1.25}, + {"matrix": [15, 4], "x": 10.75, "y": 6.5}, + {"matrix": [11, 3], "x": 11.75, "y": 6.5}, + {"matrix": [11, 4], "x": 12.75, "y": 6.5}, + {"matrix": [15, 2], "x": 13.75, "y": 6.5, "w": 1.25}, + + {"matrix": [12, 1], "x": 15.25, "y": 6.5}, + {"matrix": [12, 2], "x": 16.25, "y": 6.5}, + {"matrix": [12, 3], "x": 17.25, "y": 6.5}, + + {"matrix": [10, 2], "x": 18.5, "y": 6.5, "w": 2}, + {"matrix": [10, 3], "x": 20.5, "y": 6.5}, + {"matrix": [11, 1], "x": 21.5, "y": 6.5} ] } } diff --git a/keyboards/converter/xt_usb/xt_usb.c b/keyboards/converter/xt_usb/xt_usb.c deleted file mode 100644 index 88acee0b0f..0000000000 --- a/keyboards/converter/xt_usb/xt_usb.c +++ /dev/null @@ -1 +0,0 @@ -#include "xt_usb.h" diff --git a/keyboards/converter/xt_usb/xt_usb.h b/keyboards/converter/xt_usb/xt_usb.h deleted file mode 100644 index 570f1a376c..0000000000 --- a/keyboards/converter/xt_usb/xt_usb.h +++ /dev/null @@ -1,134 +0,0 @@ -/* -Copyright 2011,2012,2013 Jun Wako <wakojun@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -/* IBM XT keyboard layout - * ,-------. ,--------------------------------------------------------------------------. - * | F1| F2| |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| BS |NumLck |ScrLck | - * |-------| |--------------------------------------------------------------------------| - * | F3| F4| | Tab | Q| W| E| R| T| Y| U| I| O| P| [| ] | | 7| 8| 9| -| - * |-------| |------------------------------------------------------|Ent|---------------| - * | F5| F6| | Ctrl | A| S| D| F| G| H| J| K| L| ;| '| `| | 4| 5| 6| | - * |-------| |----------------------------------------------------------------------| | - * | F7| F8| |Shif| \| Z| X| C| V| B| N| M| ,| .| /|Shift| *| 1| 2| 3| +| - * |-------| |----------------------------------------------------------------------| | - * | F9|F10| | Alt | Space |CapsLck| 0 | . | | - * `-------' `--------------------------------------------------------------------------' - * Scan code set 1 - * ,-------. ,--------------------------------------------------------------------------. - * | 3B| 3C| | 01| 02| 03| 04| 05| 06| 07| 08| 09| 0A| 0B| 0C| 0D| 0E | 45 | 46 | - * |-------| |--------------------------------------------------------------------------| - * | 3D| 3E| | 0F | 10| 11| 12| 13| 14| 15| 16| 17| 18| 19| 1A| 1B | | 47| 48| 49| 4A| - * |-------| |------------------------------------------------------| 1C|---------------| - * | 3F| 40| | 1D | 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| | 4B| 4C| 4D| | - * |-------| |----------------------------------------------------------------------| | - * | 41| 42| | 2A | 2B| 2C| 2D| 2E| 2F| 30| 31| 32| 33| 34| 35| 36 | 37| 4F| 50| 51| 4E| - * |-------| |----------------------------------------------------------------------| | - * | 43| 44| | 38 | 39 | 3A | 52 | 53 | | - * `-------' `--------------------------------------------------------------------------' - */ -#define LAYOUT_xt( \ - k3B, k3C, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k45, k46, \ - k3D, k3E, k0F, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k47, k48, k49, k4A, \ - k3F, k40, k1D, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k1C, k4B, k4C, k4D, \ - k41, k42, k2A, k2B, k2C, k2D, k2E, k2F, k30, k31, k32, k33, k34, k35, k36, k37, k4F, k50, k51, k4E, \ - k43, k44, k38, k39, k3A, k52, k53 \ -) { \ - { XXX, k01, k02, k03, k04, k05, k06, k07 }, \ - { k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17 }, \ - { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ - { k40, k41, k42, k43, k44, k45, k46, k47 }, \ - { k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ - { k50, k51, k52, k53, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ -} - -/* Extended keyboard layout - * ,-----------------------------------------------. - * |F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24| - * ,---. |-----------------------------------------------| ,-----------. ,-----------. - * |Esc| |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut| - * `---' `-----------------------------------------------' `-----------' `-----------' - * ,-----------------------------------------------------------. ,-----------. ,---------------. - * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|JPY|Bsp| |Ins|Hom|PgU| |NmL| /| *| -| - * |-----------------------------------------------------------| |-----------| |---------------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ | |Del|End|PgD| | 7| 8| 9| +| - * |-----------------------------------------------------------| `-----------' |---------------| - * |CapsL | A| S| D| F| G| H| J| K| L| ;| '| #|Entr| | 4| 5| 6|KP,| - * |-----------------------------------------------------------| ,---. |---------------| - * |Shft| <| Z| X| C| V| B| N| M| ,| .| /| RO|Shift | |Up | | 1| 2| 3|Ent| - * |-----------------------------------------------------------| ,-----------. |---------------| - * |Ctl|Gui|Alt|MHEN| Space |HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| | 0| .|KP=| - * `-----------------------------------------------------------' `-----------' `---------------' - * ,-----------------------------------------------. - * | 64| 65| 66| 67| 68| 69| 6A| 6B| 6C| 6D| 6E| 76| - * ,---. |-----------------------------------------------| ,-----------. ,-----------. - * | 01| | 3B| 3C| 3D| 3E| 3F| 40| 41| 42| 43| 44| 57| 58| |*37| 46|*45| |e5E|e5F|e63| - * `---' `-----------------------------------------------' `-----------' `-----------' - * ,-----------------------------------------------------------. ,-----------. ,---------------. - * | 29| 02| 03| 04| 05| 06| 07| 08| 09| 0A| 0B| 0C| 0D| 7D| 0E| |e52|e47|e49| | 45|e35| 37| 4A| - * |-----------------------------------------------------------| |-----------| |---------------| - * | 0F | 10| 11| 12| 13| 14| 15| 16| 17| 18| 19| 1A| 1B| 2B | |e53|e4F|e51| | 47| 48| 49| 4E| - * |-----------------------------------------------------------| `-----------' |---------------| - * | 3A | 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 00| 1C | | 4B| 4C| 4D| 7E| - * |-----------------------------------------------------------| ,---. |---------------| - * | 2A | 56| 2C| 2D| 2E| 2F| 30| 31| 32| 33| 34| 35| 73| 36 | |e48| | 4F| 50| 51|e1C| - * |-----------------------------------------------------------| ,-----------. |---------------| - * | 1D|e5B| 38| 7B | 39 | 79 | 70 |e38|e5C|e5D|e1D| |e4B|e50|e4D| | 52| 53| 59| - * `-----------------------------------------------------------' `-----------' `---------------' - * e: E0-escaped codes - * *: special handling codes - */ -#define LAYOUT( \ - k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k76, \ - k01, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k43, k44, k57, k58, k54, k46, k55, k5D, k5E, k5F, \ - k29, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k7D, k0E, k71, k74, k77, k45, k7F, k37, k4A, \ - k0F, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k2B, k72, k75, k78, k47, k48, k49, k4E, \ - k3A, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k28, k00, k1C, k4B, k4C, k4D, k7E, \ - k2A, k56, k2C, k2D, k2E, k2F, k30, k31, k32, k33, k34, k35, k73, k36, k60, k4F, k50, k51, k6F, \ - k1D, k5A, k38, k7B, k39, k79, k70, k7C, k5B, k5C, k7A, k61, k62, k63, k52, k53, k59 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17 }, \ - { k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ - { k40, k41, k42, k43, k44, k45, k46, k47 }, \ - { k48, k49, k4A, k4B, k4C, k4D, k4E, k4F }, \ - { k50, k51, k52, k53, k54, k55, k56, k57 }, \ - { k58, k59, k5A, k5B, k5C, k5D, k5E, k5F }, \ - { k60, k61, k62, k63, k64, k65, k66, k67 }, \ - { k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 }, \ - { k78, k79, k7A, k7B, k7C, k7D, k7E, k7F } \ -} |