diff options
Diffstat (limited to 'keyboards/capsunlocked')
-rw-r--r-- | keyboards/capsunlocked/cu24/config.h | 17 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu24/cu24.c | 16 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu24/info.json | 5 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu65/config.h | 17 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu65/cu65.c | 14 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu65/info.json | 553 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu7/config.h | 19 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu7/cu7.c | 14 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu7/info.json | 5 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu75/config.h | 5 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu75/cu75.c | 1 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu75/info.json | 5 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu80/v1/config.h | 7 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu80/v1/info.json | 5 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu80/v1/v1.c | 18 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu80/v2_ansi/info.json | 144 | ||||
-rw-r--r-- | keyboards/capsunlocked/cu80/v2_iso/info.json | 148 |
17 files changed, 445 insertions, 548 deletions
diff --git a/keyboards/capsunlocked/cu24/config.h b/keyboards/capsunlocked/cu24/config.h index 65f64c2f09..e6492683ee 100644 --- a/keyboards/capsunlocked/cu24/config.h +++ b/keyboards/capsunlocked/cu24/config.h @@ -16,23 +16,6 @@ #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 { E6, F5, B4, B6, C6, C7 } -#define MATRIX_COL_PINS { F0, F1, D0, D1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* RGB Glow */ #define RGB_DI_PIN F4 // The pin the LED strip is connected to #define RGBLED_NUM 5 // Number of LEDs in your strip diff --git a/keyboards/capsunlocked/cu24/cu24.c b/keyboards/capsunlocked/cu24/cu24.c deleted file mode 100644 index 0c976f076f..0000000000 --- a/keyboards/capsunlocked/cu24/cu24.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 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 "cu24.h" diff --git a/keyboards/capsunlocked/cu24/info.json b/keyboards/capsunlocked/cu24/info.json index ea361a2bf4..a95382d562 100644 --- a/keyboards/capsunlocked/cu24/info.json +++ b/keyboards/capsunlocked/cu24/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "D0", "D1"], + "rows": ["E6", "F5", "B4", "B6", "C6", "C7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B5", "levels": 5, diff --git a/keyboards/capsunlocked/cu65/config.h b/keyboards/capsunlocked/cu65/config.h index fd829724fc..cf38d9dcc6 100644 --- a/keyboards/capsunlocked/cu65/config.h +++ b/keyboards/capsunlocked/cu65/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 { F1, F4, F5, F6, D3 } -#define MATRIX_COL_PINS { D6, D7, D4, B4, B5, B6, C6, D5, C7, F0, E6, B0, B1, B7, B3, B2 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/capsunlocked/cu65/cu65.c b/keyboards/capsunlocked/cu65/cu65.c deleted file mode 100644 index 2b7f720e13..0000000000 --- a/keyboards/capsunlocked/cu65/cu65.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2020 CapsUnlocked -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 "cu65.h" diff --git a/keyboards/capsunlocked/cu65/info.json b/keyboards/capsunlocked/cu65/info.json index 8f91a34974..ce45526d31 100644 --- a/keyboards/capsunlocked/cu65/info.json +++ b/keyboards/capsunlocked/cu65/info.json @@ -8,314 +8,319 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D6", "D7", "D4", "B4", "B5", "B6", "C6", "D5", "C7", "F0", "E6", "B0", "B1", "B7", "B3", "B2"], + "rows": ["F1", "F4", "F5", "F6", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker", "65_iso_blocker", "65_iso_blocker_split_bs"], "layouts": { "LAYOUT_all": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"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":14, "y":0}, - {"x":15, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, - {"x":0, "y":1, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - {"x":15, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2}, - {"x":13.75, "y":2, "w":1.25}, - {"x":15, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, - {"x":15, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 3], "x": 2.25, "y": 3}, + {"matrix": [3, 4], "x": 3.25, "y": 3}, + {"matrix": [3, 5], "x": 4.25, "y": 3}, + {"matrix": [3, 6], "x": 5.25, "y": 3}, + {"matrix": [3, 7], "x": 6.25, "y": 3}, + {"matrix": [3, 8], "x": 7.25, "y": 3}, + {"matrix": [3, 9], "x": 8.25, "y": 3}, + {"matrix": [3, 10], "x": 9.25, "y": 3}, + {"matrix": [3, 11], "x": 10.25, "y": 3}, + {"matrix": [3, 12], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, - {"x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4, "w":1.25}, - {"x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"x":10, "y":4, "w":1.25}, - {"x":11.25, "y":4, "w":1.25}, - {"x":13, "y":4}, - {"x":14, "y":4}, - {"x":15, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] }, "LAYOUT_65_ansi_blocker": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Insert", "x":15, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 15], "x": 15, "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":"|", "x":13.5, "y":1, "w":1.5}, - {"label":"Delete", "x":15, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "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":2.25}, - {"label":"PgUp", "x":15, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 15, "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":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"\u2191", "x":14, "y":3}, - {"label":"PgDn", "x":15, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 3], "x": 2.25, "y": 3}, + {"matrix": [3, 4], "x": 3.25, "y": 3}, + {"matrix": [3, 5], "x": 4.25, "y": 3}, + {"matrix": [3, 6], "x": 5.25, "y": 3}, + {"matrix": [3, 7], "x": 6.25, "y": 3}, + {"matrix": [3, 8], "x": 7.25, "y": 3}, + {"matrix": [3, 9], "x": 8.25, "y": 3}, + {"matrix": [3, 10], "x": 9.25, "y": 3}, + {"matrix": [3, 11], "x": 10.25, "y": 3}, + {"matrix": [3, 12], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, - {"label":"\u2190", "x":13, "y":4}, - {"label":"\u2193", "x":14, "y":4}, - {"label":"\u2192", "x":15, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] }, "LAYOUT_65_iso_blocker": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Insert", "x":15, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 15], "x": 15, "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":"Delete", "x":15, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 15], "x": 15, "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":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, - {"label":"PgUp", "x":15, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 15], "x": 15, "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":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"\u2191", "x":14, "y":3}, - {"label":"PgDn", "x":15, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 3], "x": 2.25, "y": 3}, + {"matrix": [3, 4], "x": 3.25, "y": 3}, + {"matrix": [3, 5], "x": 4.25, "y": 3}, + {"matrix": [3, 6], "x": 5.25, "y": 3}, + {"matrix": [3, 7], "x": 6.25, "y": 3}, + {"matrix": [3, 8], "x": 7.25, "y": 3}, + {"matrix": [3, 9], "x": 8.25, "y": 3}, + {"matrix": [3, 10], "x": 9.25, "y": 3}, + {"matrix": [3, 11], "x": 10.25, "y": 3}, + {"matrix": [3, 12], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, - {"label":"\u2190", "x":13, "y":4}, - {"label":"\u2193", "x":14, "y":4}, - {"label":"\u2192", "x":15, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] }, "LAYOUT_65_iso_blocker_split_bs": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0}, - {"label":"Delete", "x":14, "y":0}, - {"label":"Insert", "x":15, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "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":"Home", "x":15, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 15], "x": 15, "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":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, - {"label":"PgUp", "x":15, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 15], "x": 15, "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":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"\u2191", "x":14, "y":3}, - {"label":"PgDn", "x":15, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 3], "x": 2.25, "y": 3}, + {"matrix": [3, 4], "x": 3.25, "y": 3}, + {"matrix": [3, 5], "x": 4.25, "y": 3}, + {"matrix": [3, 6], "x": 5.25, "y": 3}, + {"matrix": [3, 7], "x": 6.25, "y": 3}, + {"matrix": [3, 8], "x": 7.25, "y": 3}, + {"matrix": [3, 9], "x": 8.25, "y": 3}, + {"matrix": [3, 10], "x": 9.25, "y": 3}, + {"matrix": [3, 11], "x": 10.25, "y": 3}, + {"matrix": [3, 12], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"Fn", "x":11.25, "y":4, "w":1.25}, - {"label":"\u2190", "x":13, "y":4}, - {"label":"\u2193", "x":14, "y":4}, - {"label":"\u2192", "x":15, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] } } diff --git a/keyboards/capsunlocked/cu7/config.h b/keyboards/capsunlocked/cu7/config.h index cdc031b93b..22cec290b1 100644 --- a/keyboards/capsunlocked/cu7/config.h +++ b/keyboards/capsunlocked/cu7/config.h @@ -16,30 +16,12 @@ 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 { D7, F0, F6 } -#define MATRIX_COL_PINS { F5, F7, F4 } - -/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */ -#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 */ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -57,4 +39,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 #define RGBLIGHT_LIMIT_VAL 50 -#endif diff --git a/keyboards/capsunlocked/cu7/cu7.c b/keyboards/capsunlocked/cu7/cu7.c deleted file mode 100644 index 815ac53c94..0000000000 --- a/keyboards/capsunlocked/cu7/cu7.c +++ /dev/null @@ -1,14 +0,0 @@ -/* -Copyright 2021 CapsUnlocked -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 "cu7.h" diff --git a/keyboards/capsunlocked/cu7/info.json b/keyboards/capsunlocked/cu7/info.json index ebd7b6d491..c210f9a96c 100644 --- a/keyboards/capsunlocked/cu7/info.json +++ b/keyboards/capsunlocked/cu7/info.json @@ -8,6 +8,11 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F7", "F4"], + "rows": ["D7", "F0", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D6", "pin_b": "D4", "resolution": 2} diff --git a/keyboards/capsunlocked/cu75/config.h b/keyboards/capsunlocked/cu75/config.h index 52dff09103..c37363f63d 100644 --- a/keyboards/capsunlocked/cu75/config.h +++ b/keyboards/capsunlocked/cu75/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define DIODE_DIRECTION COL2ROW -#define MATRIX_ROW_PINS {F1, B7, B3, D2, D3, B2} -#define MATRIX_COL_PINS {F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, B1, B0, F0} - #define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile #define RGBLED_NUM 24 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/capsunlocked/cu75/cu75.c b/keyboards/capsunlocked/cu75/cu75.c index fff0c10ef6..c894d18602 100644 --- a/keyboards/capsunlocked/cu75/cu75.c +++ b/keyboards/capsunlocked/cu75/cu75.c @@ -2,7 +2,6 @@ #include <avr/timer_avr.h> #include <avr/wdt.h> #include "cu75.h" -#include "keymap.h" #include "debug.h" #include "../lfkeyboards/issi.h" #include "../lfkeyboards/TWIlib.h" diff --git a/keyboards/capsunlocked/cu75/info.json b/keyboards/capsunlocked/cu75/info.json index 7f4eb623ac..14565d0f70 100644 --- a/keyboards/capsunlocked/cu75/info.json +++ b/keyboards/capsunlocked/cu75/info.json @@ -8,6 +8,11 @@ "pid": "0x6062", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "B1", "B0", "F0"], + "rows": ["F1", "B7", "B3", "D2", "D3", "B2"] + }, + "diode_direction": "COL2ROW", "backlight": { "driver": "custom", "levels": 8 diff --git a/keyboards/capsunlocked/cu80/v1/config.h b/keyboards/capsunlocked/cu80/v1/config.h index d604623f6e..991c996ea8 100644 --- a/keyboards/capsunlocked/cu80/v1/config.h +++ b/keyboards/capsunlocked/cu80/v1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B1, B5, B4, F7, D7, D6 } -#define MATRIX_COL_PINS { F6, F5, F4, F1, F0, C7, C6, B6, B0, E6, B7, B3, B2, D2, D3, D5, D4} - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/capsunlocked/cu80/v1/info.json b/keyboards/capsunlocked/cu80/v1/info.json index 72b2e681c9..655318e063 100644 --- a/keyboards/capsunlocked/cu80/v1/info.json +++ b/keyboards/capsunlocked/cu80/v1/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B0", "E6", "B7", "B3", "B2", "D2", "D3", "D5", "D4"], + "rows": ["B1", "B5", "B4", "F7", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_iso", "tkl_ansi"], diff --git a/keyboards/capsunlocked/cu80/v1/v1.c b/keyboards/capsunlocked/cu80/v1/v1.c deleted file mode 100644 index 96161175b2..0000000000 --- a/keyboards/capsunlocked/cu80/v1/v1.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 Andy Holland - -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 "v1.h" diff --git a/keyboards/capsunlocked/cu80/v2_ansi/info.json b/keyboards/capsunlocked/cu80/v2_ansi/info.json index 09bf2e334c..4f652bf86b 100644 --- a/keyboards/capsunlocked/cu80/v2_ansi/info.json +++ b/keyboards/capsunlocked/cu80/v2_ansi/info.json @@ -53,82 +53,82 @@ "c_macro": true, "filename": "keyboards/capsunlocked/cu80/v2_ansi/v2_ansi.h", "layout": [ - { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "F1", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "F2", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "F3", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "F4", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "F5", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0 }, - { "label": "F6", "matrix": [0, 7], "w": 1, "x": 7.5, "y": 0 }, - { "label": "F7", "matrix": [0, 8], "w": 1, "x": 8.5, "y": 0 }, - { "label": "F8", "matrix": [0, 9], "w": 1, "x": 9.5, "y": 0 }, - { "label": "F9", "matrix": [0, 10], "w": 1, "x": 11, "y": 0 }, - { "label": "F10", "matrix": [0, 11], "w": 1, "x": 12, "y": 0 }, - { "label": "F11", "matrix": [0, 12], "w": 1, "x": 13, "y": 0 }, - { "label": "F12", "matrix": [0, 13], "w": 1, "x": 14, "y": 0 }, - { "label": "PrtSc", "matrix": [0, 14], "w": 1, "x": 15.25, "y": 0 }, - { "label": "Scroll Lock", "matrix": [0, 15], "w": 1, "x": 16.25, "y": 0 }, - { "label": "Pause", "matrix": [0, 16], "w": 1, "x": 17.25, "y": 0 }, - { "label": "\u00ac", "matrix": [1, 0], "w": 1, "x": 0, "y": 1.5 }, - { "label": "!", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.5 }, - { "label": "@", "matrix": [1, 2], "w": 1, "x": 2, "y": 1.5 }, - { "label": "\u00a3", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.5 }, - { "label": "$", "matrix": [1, 4], "w": 1, "x": 4, "y": 1.5 }, - { "label": "%", "matrix": [1, 5], "w": 1, "x": 5, "y": 1.5 }, - { "label": "^", "matrix": [1, 6], "w": 1, "x": 6, "y": 1.5 }, - { "label": "&", "matrix": [1, 7], "w": 1, "x": 7, "y": 1.5 }, - { "label": "*", "matrix": [1, 8], "w": 1, "x": 8, "y": 1.5 }, - { "label": "(", "matrix": [1, 9], "w": 1, "x": 9, "y": 1.5 }, - { "label": ")", "matrix": [1, 10], "w": 1, "x": 10, "y": 1.5 }, - { "label": "_", "matrix": [1, 11], "w": 1, "x": 11, "y": 1.5 }, - { "label": "+", "matrix": [1, 12], "w": 1, "x": 12, "y": 1.5 }, + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "F2", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "F3", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "F4", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0 }, + { "label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0 }, + { "label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0 }, + { "label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0 }, + { "label": "F9", "matrix": [0, 10], "x": 11, "y": 0 }, + { "label": "F10", "matrix": [0, 11], "x": 12, "y": 0 }, + { "label": "F11", "matrix": [0, 12], "x": 13, "y": 0 }, + { "label": "F12", "matrix": [0, 13], "x": 14, "y": 0 }, + { "label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0 }, + { "label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0 }, + { "label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0 }, + { "label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1.5 }, + { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.5 }, + { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.5 }, + { "label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1.5 }, + { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.5 }, + { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.5 }, + { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.5 }, + { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.5 }, + { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.5 }, + { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.5 }, + { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.5 }, + { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.5 }, + { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.5 }, { "label": "Backspace", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.5 }, - { "label": "Insert", "matrix": [1, 14], "w": 1, "x": 15.25, "y": 1.5 }, - { "label": "Home", "matrix": [1, 15], "w": 1, "x": 16.25, "y": 1.5 }, - { "label": "PgUp", "matrix": [1, 16], "w": 1, "x": 17.25, "y": 1.5 }, + { "label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.5 }, + { "label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.5 }, + { "label": "PgUp", "matrix": [1, 16], "x": 17.25, "y": 1.5 }, { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 }, - { "label": "Q", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.5 }, - { "label": "W", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.5 }, - { "label": "E", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2.5 }, - { "label": "R", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.5 }, - { "label": "T", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.5 }, - { "label": "Y", "matrix": [2, 6], "w": 1, "x": 6.5, "y": 2.5 }, - { "label": "U", "matrix": [2, 7], "w": 1, "x": 7.5, "y": 2.5 }, - { "label": "I", "matrix": [2, 8], "w": 1, "x": 8.5, "y": 2.5 }, - { "label": "O", "matrix": [2, 9], "w": 1, "x": 9.5, "y": 2.5 }, - { "label": "P", "matrix": [2, 10], "w": 1, "x": 10.5, "y": 2.5 }, - { "label": "{", "matrix": [2, 11], "w": 1, "x": 11.5, "y": 2.5 }, - { "label": "}", "matrix": [2, 12], "w": 1, "x": 12.5, "y": 2.5 }, + { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5 }, + { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5 }, + { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5 }, + { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5 }, + { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5 }, + { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5 }, + { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5 }, + { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5 }, + { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5 }, + { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5 }, + { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.5 }, + { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.5 }, { "label": "|", "matrix": [2, 13], "w": 1.5, "x": 13.5, "y": 2.5 }, - { "label": "Delete", "matrix": [2, 14], "w": 1, "x": 15.25, "y": 2.5 }, - { "label": "End", "matrix": [2, 15], "w": 1, "x": 16.25, "y": 2.5 }, - { "label": "PgDn", "matrix": [2, 16], "w": 1, "x": 17.25, "y": 2.5 }, + { "label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.5 }, + { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.5 }, + { "label": "PgDn", "matrix": [2, 16], "x": 17.25, "y": 2.5 }, { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 }, - { "label": "A", "matrix": [3, 1], "w": 1, "x": 1.75, "y": 3.5 }, - { "label": "S", "matrix": [3, 2], "w": 1, "x": 2.75, "y": 3.5 }, - { "label": "D", "matrix": [3, 3], "w": 1, "x": 3.75, "y": 3.5 }, - { "label": "F", "matrix": [3, 4], "w": 1, "x": 4.75, "y": 3.5 }, - { "label": "G", "matrix": [3, 5], "w": 1, "x": 5.75, "y": 3.5 }, - { "label": "H", "matrix": [3, 6], "w": 1, "x": 6.75, "y": 3.5 }, - { "label": "J", "matrix": [3, 7], "w": 1, "x": 7.75, "y": 3.5 }, - { "label": "K", "matrix": [3, 8], "w": 1, "x": 8.75, "y": 3.5 }, - { "label": "L", "matrix": [3, 9], "w": 1, "x": 9.75, "y": 3.5 }, - { "label": ":", "matrix": [3, 10], "w": 1, "x": 10.75, "y": 3.5 }, - { "label": "\"", "matrix": [3, 11], "w": 1, "x": 11.75, "y": 3.5 }, + { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5 }, + { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5 }, + { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5 }, + { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5 }, + { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5 }, + { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5 }, + { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5 }, + { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5 }, + { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5 }, + { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.5 }, + { "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.5 }, { "label": "Enter", "matrix": [3, 12], "w": 2.25, "x": 12.75, "y": 3.5 }, { "label": "Shift", "matrix": [4, 0], "w": 2.25, "x": 0, "y": 4.5 }, - { "label": "Z", "matrix": [4, 2], "w": 1, "x": 2.25, "y": 4.5 }, - { "label": "X", "matrix": [4, 3], "w": 1, "x": 3.25, "y": 4.5 }, - { "label": "C", "matrix": [4, 4], "w": 1, "x": 4.25, "y": 4.5 }, - { "label": "V", "matrix": [4, 5], "w": 1, "x": 5.25, "y": 4.5 }, - { "label": "B", "matrix": [4, 6], "w": 1, "x": 6.25, "y": 4.5 }, - { "label": "N", "matrix": [4, 7], "w": 1, "x": 7.25, "y": 4.5 }, - { "label": "M", "matrix": [4, 8], "w": 1, "x": 8.25, "y": 4.5 }, - { "label": "<", "matrix": [4, 9], "w": 1, "x": 9.25, "y": 4.5 }, - { "label": ">", "matrix": [4, 10], "w": 1, "x": 10.25, "y": 4.5 }, - { "label": "?", "matrix": [4, 11], "w": 1, "x": 11.25, "y": 4.5 }, + { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5 }, + { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5 }, + { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5 }, + { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5 }, + { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5 }, + { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5 }, + { "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5 }, + { "label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.5 }, + { "label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.5 }, + { "label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.5 }, { "label": "Shift", "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.5 }, - { "label": "Up", "matrix": [4, 15], "w": 1, "x": 16.25, "y": 4.5 }, + { "label": "Up", "matrix": [4, 15], "x": 16.25, "y": 4.5 }, { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.5 }, { "label": "Alt", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.5 }, { "label": "Win", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.5 }, @@ -137,9 +137,9 @@ { "label": "AltGr", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 5.5 }, { "label": "Ctrl", "matrix": [5, 11], "w": 1.25, "x": 12.5, "y": 5.5 }, { "label": "Fn", "matrix": [5, 12], "w": 1.25, "x": 13.75, "y": 5.5 }, - { "label": "Left", "matrix": [5, 13], "w": 1, "x": 15.25, "y": 5.5 }, - { "label": "Down", "matrix": [5, 15], "w": 1, "x": 16.25, "y": 5.5 }, - { "label": "Right", "matrix": [5, 16], "w": 1, "x": 17.25, "y": 5.5 } + { "label": "Left", "matrix": [5, 13], "x": 15.25, "y": 5.5 }, + { "label": "Down", "matrix": [5, 15], "x": 16.25, "y": 5.5 }, + { "label": "Right", "matrix": [5, 16], "x": 17.25, "y": 5.5 } ] } } diff --git a/keyboards/capsunlocked/cu80/v2_iso/info.json b/keyboards/capsunlocked/cu80/v2_iso/info.json index 0c71c940c1..4e2cfafff5 100644 --- a/keyboards/capsunlocked/cu80/v2_iso/info.json +++ b/keyboards/capsunlocked/cu80/v2_iso/info.json @@ -53,83 +53,83 @@ "c_macro": true, "filename": "keyboards/capsunlocked/cu80/v2_iso/v2_iso.h", "layout": [ - { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "F1", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "F2", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "F3", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "F4", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "F5", "matrix": [0, 6], "w": 1, "x": 6.5, "y": 0 }, - { "label": "F6", "matrix": [0, 7], "w": 1, "x": 7.5, "y": 0 }, - { "label": "F7", "matrix": [0, 8], "w": 1, "x": 8.5, "y": 0 }, - { "label": "F8", "matrix": [0, 9], "w": 1, "x": 9.5, "y": 0 }, - { "label": "F9", "matrix": [0, 10], "w": 1, "x": 11, "y": 0 }, - { "label": "F10", "matrix": [0, 11], "w": 1, "x": 12, "y": 0 }, - { "label": "F11", "matrix": [0, 12], "w": 1, "x": 13, "y": 0 }, - { "label": "F12", "matrix": [0, 13], "w": 1, "x": 14, "y": 0 }, - { "label": "PrtSc", "matrix": [0, 14], "w": 1, "x": 15.25, "y": 0 }, - { "label": "Scroll Lock", "matrix": [0, 15], "w": 1, "x": 16.25, "y": 0 }, - { "label": "Pause", "matrix": [0, 16], "w": 1, "x": 17.25, "y": 0 }, - { "label": "\u00ac", "matrix": [1, 0], "w": 1, "x": 0, "y": 1.5 }, - { "label": "!", "matrix": [1, 1], "w": 1, "x": 1, "y": 1.5 }, - { "label": "\"", "matrix": [1, 2], "w": 1, "x": 2, "y": 1.5 }, - { "label": "\u00a3", "matrix": [1, 3], "w": 1, "x": 3, "y": 1.5 }, - { "label": "$", "matrix": [1, 4], "w": 1, "x": 4, "y": 1.5 }, - { "label": "%", "matrix": [1, 5], "w": 1, "x": 5, "y": 1.5 }, - { "label": "^", "matrix": [1, 6], "w": 1, "x": 6, "y": 1.5 }, - { "label": "&", "matrix": [1, 7], "w": 1, "x": 7, "y": 1.5 }, - { "label": "*", "matrix": [1, 8], "w": 1, "x": 8, "y": 1.5 }, - { "label": "(", "matrix": [1, 9], "w": 1, "x": 9, "y": 1.5 }, - { "label": ")", "matrix": [1, 10], "w": 1, "x": 10, "y": 1.5 }, - { "label": "_", "matrix": [1, 11], "w": 1, "x": 11, "y": 1.5 }, - { "label": "+", "matrix": [1, 12], "w": 1, "x": 12, "y": 1.5 }, + { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, + { "label": "F1", "matrix": [0, 2], "x": 2, "y": 0 }, + { "label": "F2", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "F3", "matrix": [0, 4], "x": 4, "y": 0 }, + { "label": "F4", "matrix": [0, 5], "x": 5, "y": 0 }, + { "label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0 }, + { "label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0 }, + { "label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0 }, + { "label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0 }, + { "label": "F9", "matrix": [0, 10], "x": 11, "y": 0 }, + { "label": "F10", "matrix": [0, 11], "x": 12, "y": 0 }, + { "label": "F11", "matrix": [0, 12], "x": 13, "y": 0 }, + { "label": "F12", "matrix": [0, 13], "x": 14, "y": 0 }, + { "label": "PrtSc", "matrix": [0, 14], "x": 15.25, "y": 0 }, + { "label": "Scroll Lock", "matrix": [0, 15], "x": 16.25, "y": 0 }, + { "label": "Pause", "matrix": [0, 16], "x": 17.25, "y": 0 }, + { "label": "\u00ac", "matrix": [1, 0], "x": 0, "y": 1.5 }, + { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.5 }, + { "label": "\"", "matrix": [1, 2], "x": 2, "y": 1.5 }, + { "label": "\u00a3", "matrix": [1, 3], "x": 3, "y": 1.5 }, + { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.5 }, + { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.5 }, + { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.5 }, + { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.5 }, + { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.5 }, + { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.5 }, + { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.5 }, + { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.5 }, + { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.5 }, { "label": "Backspace", "matrix": [1, 13], "w": 2, "x": 13, "y": 1.5 }, - { "label": "Insert", "matrix": [1, 14], "w": 1, "x": 15.25, "y": 1.5 }, - { "label": "Home", "matrix": [1, 15], "w": 1, "x": 16.25, "y": 1.5 }, - { "label": "PgUp", "matrix": [1, 16], "w": 1, "x": 17.25, "y": 1.5 }, + { "label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.5 }, + { "label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.5 }, + { "label": "PgUp", "matrix": [1, 16], "x": 17.25, "y": 1.5 }, { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.5 }, - { "label": "Q", "matrix": [2, 1], "w": 1, "x": 1.5, "y": 2.5 }, - { "label": "W", "matrix": [2, 2], "w": 1, "x": 2.5, "y": 2.5 }, - { "label": "E", "matrix": [2, 3], "w": 1, "x": 3.5, "y": 2.5 }, - { "label": "R", "matrix": [2, 4], "w": 1, "x": 4.5, "y": 2.5 }, - { "label": "T", "matrix": [2, 5], "w": 1, "x": 5.5, "y": 2.5 }, - { "label": "Y", "matrix": [2, 6], "w": 1, "x": 6.5, "y": 2.5 }, - { "label": "U", "matrix": [2, 7], "w": 1, "x": 7.5, "y": 2.5 }, - { "label": "I", "matrix": [2, 8], "w": 1, "x": 8.5, "y": 2.5 }, - { "label": "O", "matrix": [2, 9], "w": 1, "x": 9.5, "y": 2.5 }, - { "label": "P", "matrix": [2, 10], "w": 1, "x": 10.5, "y": 2.5 }, - { "label": "{", "matrix": [2, 11], "w": 1, "x": 11.5, "y": 2.5 }, - { "label": "}", "matrix": [2, 12], "w": 1, "x": 12.5, "y": 2.5 }, - { "label": "Delete", "matrix": [2, 14], "w": 1, "x": 15.25, "y": 2.5 }, - { "label": "End", "matrix": [2, 15], "w": 1, "x": 16.25, "y": 2.5 }, - { "label": "PgDn", "matrix": [2, 16], "w": 1, "x": 17.25, "y": 2.5 }, + { "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.5 }, + { "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.5 }, + { "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.5 }, + { "label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.5 }, + { "label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.5 }, + { "label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.5 }, + { "label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.5 }, + { "label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.5 }, + { "label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.5 }, + { "label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.5 }, + { "label": "{", "matrix": [2, 11], "x": 11.5, "y": 2.5 }, + { "label": "}", "matrix": [2, 12], "x": 12.5, "y": 2.5 }, + { "label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.5 }, + { "label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.5 }, + { "label": "PgDn", "matrix": [2, 16], "x": 17.25, "y": 2.5 }, { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.5 }, - { "label": "A", "matrix": [3, 1], "w": 1, "x": 1.75, "y": 3.5 }, - { "label": "S", "matrix": [3, 2], "w": 1, "x": 2.75, "y": 3.5 }, - { "label": "D", "matrix": [3, 3], "w": 1, "x": 3.75, "y": 3.5 }, - { "label": "F", "matrix": [3, 4], "w": 1, "x": 4.75, "y": 3.5 }, - { "label": "G", "matrix": [3, 5], "w": 1, "x": 5.75, "y": 3.5 }, - { "label": "H", "matrix": [3, 6], "w": 1, "x": 6.75, "y": 3.5 }, - { "label": "J", "matrix": [3, 7], "w": 1, "x": 7.75, "y": 3.5 }, - { "label": "K", "matrix": [3, 8], "w": 1, "x": 8.75, "y": 3.5 }, - { "label": "L", "matrix": [3, 9], "w": 1, "x": 9.75, "y": 3.5 }, - { "label": ":", "matrix": [3, 10], "w": 1, "x": 10.75, "y": 3.5 }, - { "label": "@", "matrix": [3, 11], "w": 1, "x": 11.75, "y": 3.5 }, - { "label": "~", "matrix": [3, 12], "w": 1, "x": 12.75, "y": 3.5 }, + { "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.5 }, + { "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.5 }, + { "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.5 }, + { "label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.5 }, + { "label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.5 }, + { "label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.5 }, + { "label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.5 }, + { "label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.5 }, + { "label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.5 }, + { "label": ":", "matrix": [3, 10], "x": 10.75, "y": 3.5 }, + { "label": "@", "matrix": [3, 11], "x": 11.75, "y": 3.5 }, + { "label": "~", "matrix": [3, 12], "x": 12.75, "y": 3.5 }, { "h": 2, "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2.5 }, { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.5 }, - { "label": "|", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4.5 }, - { "label": "Z", "matrix": [4, 2], "w": 1, "x": 2.25, "y": 4.5 }, - { "label": "X", "matrix": [4, 3], "w": 1, "x": 3.25, "y": 4.5 }, - { "label": "C", "matrix": [4, 4], "w": 1, "x": 4.25, "y": 4.5 }, - { "label": "V", "matrix": [4, 5], "w": 1, "x": 5.25, "y": 4.5 }, - { "label": "B", "matrix": [4, 6], "w": 1, "x": 6.25, "y": 4.5 }, - { "label": "N", "matrix": [4, 7], "w": 1, "x": 7.25, "y": 4.5 }, - { "label": "M", "matrix": [4, 8], "w": 1, "x": 8.25, "y": 4.5 }, - { "label": "<", "matrix": [4, 9], "w": 1, "x": 9.25, "y": 4.5 }, - { "label": ">", "matrix": [4, 10], "w": 1, "x": 10.25, "y": 4.5 }, - { "label": "?", "matrix": [4, 11], "w": 1, "x": 11.25, "y": 4.5 }, + { "label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.5 }, + { "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.5 }, + { "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.5 }, + { "label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.5 }, + { "label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.5 }, + { "label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.5 }, + { "label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.5 }, + { "label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.5 }, + { "label": "<", "matrix": [4, 9], "x": 9.25, "y": 4.5 }, + { "label": ">", "matrix": [4, 10], "x": 10.25, "y": 4.5 }, + { "label": "?", "matrix": [4, 11], "x": 11.25, "y": 4.5 }, { "label": "Shift", "matrix": [4, 12], "w": 2.75, "x": 12.25, "y": 4.5 }, - { "label": "Up", "matrix": [4, 15], "w": 1, "x": 16.25, "y": 4.5 }, + { "label": "Up", "matrix": [4, 15], "x": 16.25, "y": 4.5 }, { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.5 }, { "label": "Alt", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.5 }, { "label": "Win", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.5 }, @@ -138,9 +138,9 @@ { "label": "AltGr", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 5.5 }, { "label": "Ctrl", "matrix": [5, 11], "w": 1.25, "x": 12.5, "y": 5.5 }, { "label": "Fn", "matrix": [5, 12], "w": 1.25, "x": 13.75, "y": 5.5 }, - { "label": "Left", "matrix": [5, 13], "w": 1, "x": 15.25, "y": 5.5 }, - { "label": "Down", "matrix": [5, 15], "w": 1, "x": 16.25, "y": 5.5 }, - { "label": "Right", "matrix": [5, 16], "w": 1, "x": 17.25, "y": 5.5 } + { "label": "Left", "matrix": [5, 13], "x": 15.25, "y": 5.5 }, + { "label": "Down", "matrix": [5, 15], "x": 16.25, "y": 5.5 }, + { "label": "Right", "matrix": [5, 16], "x": 17.25, "y": 5.5 } ] } } |