diff options
Diffstat (limited to 'keyboards/merge')
| -rw-r--r-- | keyboards/merge/iso_macro/config.h | 24 | ||||
| -rw-r--r-- | keyboards/merge/iso_macro/info.json | 25 | ||||
| -rw-r--r-- | keyboards/merge/iso_macro/iso_macro.c | 17 | ||||
| -rw-r--r-- | keyboards/merge/iso_macro/iso_macro.h | 29 | ||||
| -rw-r--r-- | keyboards/merge/uc1/config.h | 8 | ||||
| -rw-r--r-- | keyboards/merge/uc1/info.json | 19 | ||||
| -rw-r--r-- | keyboards/merge/uc1/uc1.c | 17 | ||||
| -rw-r--r-- | keyboards/merge/uc1/uc1.h | 27 | ||||
| -rw-r--r-- | keyboards/merge/um70/config.h | 8 | ||||
| -rw-r--r-- | keyboards/merge/um70/info.json | 377 | ||||
| -rw-r--r-- | keyboards/merge/um70/um70.c | 2 | ||||
| -rw-r--r-- | keyboards/merge/um70/um70.h | 97 | ||||
| -rw-r--r-- | keyboards/merge/um80/config.h | 8 | ||||
| -rw-r--r-- | keyboards/merge/um80/info.json | 127 | ||||
| -rw-r--r-- | keyboards/merge/um80/um80.c | 2 | ||||
| -rw-r--r-- | keyboards/merge/um80/um80.h | 43 | ||||
| -rw-r--r-- | keyboards/merge/uma/config.h | 6 | ||||
| -rw-r--r-- | keyboards/merge/uma/info.json | 840 | ||||
| -rw-r--r-- | keyboards/merge/uma/uma.c | 2 | ||||
| -rw-r--r-- | keyboards/merge/uma/uma.h | 192 |
20 files changed, 1366 insertions, 504 deletions
diff --git a/keyboards/merge/iso_macro/config.h b/keyboards/merge/iso_macro/config.h deleted file mode 100644 index 7bf2b1b33b..0000000000 --- a/keyboards/merge/iso_macro/config.h +++ /dev/null @@ -1,24 +0,0 @@ - /* Copyright 2021 duoshock - * - * 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 MATRIX_ROW_PINS { F4, F5, F6} -#define MATRIX_COL_PINS { B4, B5, B6} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/info.json index bc4269755f..fe20e701ba 100644 --- a/keyboards/merge/iso_macro/info.json +++ b/keyboards/merge/iso_macro/info.json @@ -8,6 +8,11 @@ "pid": "0x1200", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "B5", "B6"], + "rows": ["F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F0", "pin_b": "F1"}, @@ -22,16 +27,18 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.5, "y":0, "w":1.25, "h":2}, + {"matrix": [2, 1], "x": 0, "y": 0}, + + {"matrix": [0, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [0, 2], "x": 3.25, "y": 0}, + {"matrix": [2, 0], "x": 4.5, "y": 0, "w": 1.25, "h": 2}, + + {"matrix": [2, 2], "x": 0, "y": 1}, - {"x":0, "y":1}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1} + {"matrix": [1, 0], "x": 1.5, "y": 1}, + {"matrix": [1, 1], "x": 2.5, "y": 1}, + {"matrix": [1, 2], "x": 3.5, "y": 1} ] } } diff --git a/keyboards/merge/iso_macro/iso_macro.c b/keyboards/merge/iso_macro/iso_macro.c deleted file mode 100644 index 6052f9cce9..0000000000 --- a/keyboards/merge/iso_macro/iso_macro.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2021 duoshock - * - * 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 "iso_macro.h" diff --git a/keyboards/merge/iso_macro/iso_macro.h b/keyboards/merge/iso_macro/iso_macro.h deleted file mode 100644 index dfa9386449..0000000000 --- a/keyboards/merge/iso_macro/iso_macro.h +++ /dev/null @@ -1,29 +0,0 @@ - /* Copyright 2021 duoshock - * - * 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( \ - k21, k00, k01, k02, k20, \ - k22, k10, k11, k12 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 } \ -} diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h index 9dcfb6e074..945f753599 100644 --- a/keyboards/merge/uc1/config.h +++ b/keyboards/merge/uc1/config.h @@ -16,10 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { B1, B2 } -#define MATRIX_COL_PINS { B3, B4 } - -#define RGB_DI_PIN B5 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -34,8 +30,4 @@ #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 -#define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_SLEEP - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json index 55b68a4510..95de5a2e20 100644 --- a/keyboards/merge/uc1/info.json +++ b/keyboards/merge/uc1/info.json @@ -8,6 +8,14 @@ "pid": "0x5543", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, + "matrix_pins": { + "cols": ["B3", "B4"], + "rows": ["B1", "B2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F6"} @@ -17,11 +25,12 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [ - {"label":"0", "x":0, "y":0}, - {"label":"1", "x":1.25, "y":0}, - {"label":"2", "x":2.25, "y":0}, - {"label":"3", "x":3.25, "y":0} + "layout": [ + {"matrix": [1, 1], "x": 0, "y": 0}, + + {"matrix": [0, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [1, 0], "x": 3.25, "y": 0} ] } } diff --git a/keyboards/merge/uc1/uc1.c b/keyboards/merge/uc1/uc1.c deleted file mode 100644 index d23e7426d8..0000000000 --- a/keyboards/merge/uc1/uc1.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2021 duoshock - * - * 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 "uc1.h" diff --git a/keyboards/merge/uc1/uc1.h b/keyboards/merge/uc1/uc1.h deleted file mode 100644 index 84e655d1b9..0000000000 --- a/keyboards/merge/uc1/uc1.h +++ /dev/null @@ -1,27 +0,0 @@ - /* Copyright 2021 duoshock - * - * 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( \ - k11, k00, k01, k10 \ -) \ -{ \ - { k00, k01 }, \ - { k10, k11 } \ -} diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h index c249a1816a..bbc2f5b5fb 100644 --- a/keyboards/merge/um70/config.h +++ b/keyboards/merge/um70/config.h @@ -16,17 +16,10 @@ #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_USB_DETECT #define MASTER_LEFT #define SPLIT_MODS_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_SPLIT #define RGBLED_NUM 83 #define RGBLED_SPLIT { 39, 44 } @@ -35,7 +28,6 @@ # define RGB_MATRIX_SPLIT RGBLED_SPLIT #endif #define RGBLIGHT_SLEEP -#define RGBLIGHT_LIMIT_VAL 150 #define B6_AUDIO diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json index e548d63151..84f44ba6d1 100644 --- a/keyboards/merge/um70/info.json +++ b/keyboards/merge/um70/info.json @@ -8,6 +8,11 @@ "pid": "0x3222", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} @@ -16,20 +21,384 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, + "rgblight": { + "max_brightness": 150 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_rspace_2u_bksp": { - "layout": [{"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":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":2}, {"x":17.75, "y":0}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "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}, {"x":15.75, "y":1, "w":1.5}, {"x":17.75, "y":1}, {"x":0, "y":2}, {"x":1.5, "y":2, "w":1.75}, {"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":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, "w":2.25}, {"x":17.75, "y":2}, {"x":0, "y":3}, {"x":1.5, "y":3, "w":2.25}, {"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":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.75}, {"x":16.5, "y":3.25}, {"x":0, "y":4}, {"x":1.5, "y":4, "w":1.25}, {"x":2.75, "y":4, "w":1.25}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2.25}, {"x":9.5, "y":4, "w":2.75}, {"x":12.25, "y":4, "w":1.5}, {"x":13.75, "y":4, "w":1.5}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25}] + "layout": [ + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + + {"matrix": [5, 0], "x": 9.25, "y": 0}, + {"matrix": [5, 1], "x": 10.25, "y": 0}, + {"matrix": [5, 2], "x": 11.25, "y": 0}, + {"matrix": [5, 3], "x": 12.25, "y": 0}, + {"matrix": [5, 4], "x": 13.25, "y": 0}, + {"matrix": [5, 5], "x": 14.25, "y": 0}, + {"matrix": [5, 7], "x": 15.25, "y": 0, "w": 2}, + + {"matrix": [7, 7], "x": 17.75, "y": 0}, + + {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 7, "y": 1}, + + {"matrix": [6, 0], "x": 8.75, "y": 1}, + {"matrix": [6, 1], "x": 9.75, "y": 1}, + {"matrix": [6, 2], "x": 10.75, "y": 1}, + {"matrix": [6, 3], "x": 11.75, "y": 1}, + {"matrix": [6, 4], "x": 12.75, "y": 1}, + {"matrix": [6, 5], "x": 13.75, "y": 1}, + {"matrix": [6, 6], "x": 14.75, "y": 1}, + {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5}, + + {"matrix": [8, 7], "x": 17.75, "y": 1}, + + {"matrix": [4, 5], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [2, 3], "x": 5.25, "y": 2}, + {"matrix": [2, 4], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.25, "y": 2}, + + {"matrix": [7, 0], "x": 9, "y": 2}, + {"matrix": [7, 1], "x": 10, "y": 2}, + {"matrix": [7, 2], "x": 11, "y": 2}, + {"matrix": [7, 3], "x": 12, "y": 2}, + {"matrix": [7, 4], "x": 13, "y": 2}, + {"matrix": [7, 5], "x": 14, "y": 2}, + {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25}, + + {"matrix": [9, 7], "x": 17.75, "y": 2}, + + {"matrix": [4, 6], "x": 0, "y": 3}, + + {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 3.75, "y": 3}, + {"matrix": [3, 2], "x": 4.75, "y": 3}, + {"matrix": [3, 3], "x": 5.75, "y": 3}, + {"matrix": [3, 4], "x": 6.75, "y": 3}, + {"matrix": [3, 5], "x": 7.75, "y": 3}, + + {"matrix": [8, 0], "x": 9.5, "y": 3}, + {"matrix": [8, 1], "x": 10.5, "y": 3}, + {"matrix": [8, 2], "x": 11.5, "y": 3}, + {"matrix": [8, 3], "x": 12.5, "y": 3}, + {"matrix": [8, 4], "x": 13.5, "y": 3}, + {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75}, + + {"matrix": [8, 6], "x": 16.5, "y": 3.25}, + + {"matrix": [4, 7], "x": 0, "y": 4}, + + {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25}, + + {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75}, + {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5}, + + {"matrix": [9, 3], "x": 15.5, "y": 4.25}, + {"matrix": [9, 4], "x": 16.5, "y": 4.25}, + {"matrix": [9, 5], "x": 17.5, "y": 4.25} + ] }, "LAYOUT_rspace_split_bksp": { - "layout": [{"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":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}, {"x":16.25, "y":0}, {"x":17.75, "y":0}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "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}, {"x":15.75, "y":1, "w":1.5}, {"x":17.75, "y":1}, {"x":0, "y":2}, {"x":1.5, "y":2, "w":1.75}, {"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":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, "w":2.25}, {"x":17.75, "y":2}, {"x":0, "y":3}, {"x":1.5, "y":3, "w":2.25}, {"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":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.75}, {"x":16.5, "y":3.25}, {"x":0, "y":4}, {"x":1.5, "y":4, "w":1.25}, {"x":2.75, "y":4, "w":1.25}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2.25}, {"x":9.5, "y":4, "w":2.75}, {"x":12.25, "y":4, "w":1.5}, {"x":13.75, "y":4, "w":1.5}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25}] + "layout": [ + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + + {"matrix": [5, 0], "x": 9.25, "y": 0}, + {"matrix": [5, 1], "x": 10.25, "y": 0}, + {"matrix": [5, 2], "x": 11.25, "y": 0}, + {"matrix": [5, 3], "x": 12.25, "y": 0}, + {"matrix": [5, 4], "x": 13.25, "y": 0}, + {"matrix": [5, 5], "x": 14.25, "y": 0}, + {"matrix": [5, 6], "x": 15.25, "y": 0}, + {"matrix": [5, 7], "x": 16.25, "y": 0}, + + {"matrix": [7, 7], "x": 17.75, "y": 0}, + + {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 7, "y": 1}, + + {"matrix": [6, 0], "x": 8.75, "y": 1}, + {"matrix": [6, 1], "x": 9.75, "y": 1}, + {"matrix": [6, 2], "x": 10.75, "y": 1}, + {"matrix": [6, 3], "x": 11.75, "y": 1}, + {"matrix": [6, 4], "x": 12.75, "y": 1}, + {"matrix": [6, 5], "x": 13.75, "y": 1}, + {"matrix": [6, 6], "x": 14.75, "y": 1}, + {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5}, + + {"matrix": [8, 7], "x": 17.75, "y": 1}, + + {"matrix": [4, 5], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [2, 3], "x": 5.25, "y": 2}, + {"matrix": [2, 4], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.25, "y": 2}, + + {"matrix": [7, 0], "x": 9, "y": 2}, + {"matrix": [7, 1], "x": 10, "y": 2}, + {"matrix": [7, 2], "x": 11, "y": 2}, + {"matrix": [7, 3], "x": 12, "y": 2}, + {"matrix": [7, 4], "x": 13, "y": 2}, + {"matrix": [7, 5], "x": 14, "y": 2}, + {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25}, + + {"matrix": [9, 7], "x": 17.75, "y": 2}, + + {"matrix": [4, 6], "x": 0, "y": 3}, + + {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 3.75, "y": 3}, + {"matrix": [3, 2], "x": 4.75, "y": 3}, + {"matrix": [3, 3], "x": 5.75, "y": 3}, + {"matrix": [3, 4], "x": 6.75, "y": 3}, + {"matrix": [3, 5], "x": 7.75, "y": 3}, + + {"matrix": [8, 0], "x": 9.5, "y": 3}, + {"matrix": [8, 1], "x": 10.5, "y": 3}, + {"matrix": [8, 2], "x": 11.5, "y": 3}, + {"matrix": [8, 3], "x": 12.5, "y": 3}, + {"matrix": [8, 4], "x": 13.5, "y": 3}, + {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75}, + + {"matrix": [8, 6], "x": 16.5, "y": 3.25}, + + {"matrix": [4, 7], "x": 0, "y": 4}, + + {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25}, + + {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75}, + {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5}, + + {"matrix": [9, 3], "x": 15.5, "y": 4.25}, + {"matrix": [9, 4], "x": 16.5, "y": 4.25}, + {"matrix": [9, 5], "x": 17.5, "y": 4.25} + ] }, "LAYOUT_lspace_2u_bksp": { - "layout": [{"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":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":2}, {"x":17.75, "y":0}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "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}, {"x":15.75, "y":1, "w":1.5}, {"x":17.75, "y":1}, {"x":0, "y":2}, {"x":1.5, "y":2, "w":1.75}, {"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":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, "w":2.25}, {"x":17.75, "y":2}, {"x":0, "y":3}, {"x":1.5, "y":3, "w":2.25}, {"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":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.75}, {"x":16.5, "y":3.25}, {"x":0, "y":4}, {"x":1.5, "y":4, "w":1.25}, {"x":2.75, "y":4, "w":1.25}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":2.25}, {"x":7.5, "y":4, "w":1.25}, {"x":9.5, "y":4, "w":2.75}, {"x":12.25, "y":4, "w":1.5}, {"x":13.75, "y":4, "w":1.5}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25}] + "layout": [ + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + + {"matrix": [5, 0], "x": 9.25, "y": 0}, + {"matrix": [5, 1], "x": 10.25, "y": 0}, + {"matrix": [5, 2], "x": 11.25, "y": 0}, + {"matrix": [5, 3], "x": 12.25, "y": 0}, + {"matrix": [5, 4], "x": 13.25, "y": 0}, + {"matrix": [5, 5], "x": 14.25, "y": 0}, + {"matrix": [5, 7], "x": 15.25, "y": 0, "w": 2}, + + {"matrix": [7, 7], "x": 17.75, "y": 0}, + + {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 7, "y": 1}, + + {"matrix": [6, 0], "x": 8.75, "y": 1}, + {"matrix": [6, 1], "x": 9.75, "y": 1}, + {"matrix": [6, 2], "x": 10.75, "y": 1}, + {"matrix": [6, 3], "x": 11.75, "y": 1}, + {"matrix": [6, 4], "x": 12.75, "y": 1}, + {"matrix": [6, 5], "x": 13.75, "y": 1}, + {"matrix": [6, 6], "x": 14.75, "y": 1}, + {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5}, + + {"matrix": [8, 7], "x": 17.75, "y": 1}, + + {"matrix": [4, 5], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [2, 3], "x": 5.25, "y": 2}, + {"matrix": [2, 4], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.25, "y": 2}, + + {"matrix": [7, 0], "x": 9, "y": 2}, + {"matrix": [7, 1], "x": 10, "y": 2}, + {"matrix": [7, 2], "x": 11, "y": 2}, + {"matrix": [7, 3], "x": 12, "y": 2}, + {"matrix": [7, 4], "x": 13, "y": 2}, + {"matrix": [7, 5], "x": 14, "y": 2}, + {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25}, + + {"matrix": [9, 7], "x": 17.75, "y": 2}, + + {"matrix": [4, 6], "x": 0, "y": 3}, + + {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 3.75, "y": 3}, + {"matrix": [3, 2], "x": 4.75, "y": 3}, + {"matrix": [3, 3], "x": 5.75, "y": 3}, + {"matrix": [3, 4], "x": 6.75, "y": 3}, + {"matrix": [3, 5], "x": 7.75, "y": 3}, + + {"matrix": [8, 0], "x": 9.5, "y": 3}, + {"matrix": [8, 1], "x": 10.5, "y": 3}, + {"matrix": [8, 2], "x": 11.5, "y": 3}, + {"matrix": [8, 3], "x": 12.5, "y": 3}, + {"matrix": [8, 4], "x": 13.5, "y": 3}, + {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75}, + + {"matrix": [8, 6], "x": 16.5, "y": 3.25}, + + {"matrix": [4, 7], "x": 0, "y": 4}, + + {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25}, + {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75}, + {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5}, + + {"matrix": [9, 3], "x": 15.5, "y": 4.25}, + {"matrix": [9, 4], "x": 16.5, "y": 4.25}, + {"matrix": [9, 5], "x": 17.5, "y": 4.25} + ] }, "LAYOUT_lspace_split_bksp": { - "layout": [{"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":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}, {"x":16.25, "y":0}, {"x":17.75, "y":0}, {"x":1.5, "y":1, "w":1.5}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "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}, {"x":15.75, "y":1, "w":1.5}, {"x":17.75, "y":1}, {"x":0, "y":2}, {"x":1.5, "y":2, "w":1.75}, {"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":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, "w":2.25}, {"x":17.75, "y":2}, {"x":0, "y":3}, {"x":1.5, "y":3, "w":2.25}, {"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":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.75}, {"x":16.5, "y":3.25}, {"x":0, "y":4}, {"x":1.5, "y":4, "w":1.25}, {"x":2.75, "y":4, "w":1.25}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":2.25}, {"x":7.5, "y":4, "w":1.25}, {"x":9.5, "y":4, "w":2.75}, {"x":12.25, "y":4, "w":1.5}, {"x":13.75, "y":4, "w":1.5}, {"x":15.5, "y":4.25}, {"x":16.5, "y":4.25}, {"x":17.5, "y":4.25}] + "layout": [ + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + + {"matrix": [5, 0], "x": 9.25, "y": 0}, + {"matrix": [5, 1], "x": 10.25, "y": 0}, + {"matrix": [5, 2], "x": 11.25, "y": 0}, + {"matrix": [5, 3], "x": 12.25, "y": 0}, + {"matrix": [5, 4], "x": 13.25, "y": 0}, + {"matrix": [5, 5], "x": 14.25, "y": 0}, + {"matrix": [5, 6], "x": 15.25, "y": 0}, + {"matrix": [5, 7], "x": 16.25, "y": 0}, + + {"matrix": [7, 7], "x": 17.75, "y": 0}, + + {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 7, "y": 1}, + + {"matrix": [6, 0], "x": 8.75, "y": 1}, + {"matrix": [6, 1], "x": 9.75, "y": 1}, + {"matrix": [6, 2], "x": 10.75, "y": 1}, + {"matrix": [6, 3], "x": 11.75, "y": 1}, + {"matrix": [6, 4], "x": 12.75, "y": 1}, + {"matrix": [6, 5], "x": 13.75, "y": 1}, + {"matrix": [6, 6], "x": 14.75, "y": 1}, + {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5}, + + {"matrix": [8, 7], "x": 17.75, "y": 1}, + + {"matrix": [4, 5], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [2, 3], "x": 5.25, "y": 2}, + {"matrix": [2, 4], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.25, "y": 2}, + + {"matrix": [7, 0], "x": 9, "y": 2}, + {"matrix": [7, 1], "x": 10, "y": 2}, + {"matrix": [7, 2], "x": 11, "y": 2}, + {"matrix": [7, 3], "x": 12, "y": 2}, + {"matrix": [7, 4], "x": 13, "y": 2}, + {"matrix": [7, 5], "x": 14, "y": 2}, + {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25}, + + {"matrix": [9, 7], "x": 17.75, "y": 2}, + + {"matrix": [4, 6], "x": 0, "y": 3}, + + {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 3.75, "y": 3}, + {"matrix": [3, 2], "x": 4.75, "y": 3}, + {"matrix": [3, 3], "x": 5.75, "y": 3}, + {"matrix": [3, 4], "x": 6.75, "y": 3}, + {"matrix": [3, 5], "x": 7.75, "y": 3}, + + {"matrix": [8, 0], "x": 9.5, "y": 3}, + {"matrix": [8, 1], "x": 10.5, "y": 3}, + {"matrix": [8, 2], "x": 11.5, "y": 3}, + {"matrix": [8, 3], "x": 12.5, "y": 3}, + {"matrix": [8, 4], "x": 13.5, "y": 3}, + {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75}, + + {"matrix": [8, 6], "x": 16.5, "y": 3.25}, + + {"matrix": [4, 7], "x": 0, "y": 4}, + + {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25}, + {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 0], "x": 9.5, "y": 4, "w": 2.75}, + {"matrix": [9, 1], "x": 12.25, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 13.75, "y": 4, "w": 1.5}, + + {"matrix": [9, 3], "x": 15.5, "y": 4.25}, + {"matrix": [9, 4], "x": 16.5, "y": 4.25}, + {"matrix": [9, 5], "x": 17.5, "y": 4.25} + ] } } } diff --git a/keyboards/merge/um70/um70.c b/keyboards/merge/um70/um70.c index 3283e7e26b..b63fcdbedd 100644 --- a/keyboards/merge/um70/um70.c +++ b/keyboards/merge/um70/um70.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "um70.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE /* diff --git a/keyboards/merge/um70/um70.h b/keyboards/merge/um70/um70.h deleted file mode 100644 index 9b46c94a96..0000000000 --- a/keyboards/merge/um70/um70.h +++ /dev/null @@ -1,97 +0,0 @@ -/* Copyright 2021 duoshock - * - * 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 - -#define LAYOUT_rspace_split_bksp( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R27, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ - L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ - L46, L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36,\ - L47, L40, L41, L42, L43, L44, R40, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ - { L40, L41, L42, L43, L44, L45, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, XXX, R47 } \ -} - -#define LAYOUT_rspace_2u_bksp( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, R27, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ - L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ - L46, L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36,\ - L47, L40, L41, L42, L43, L44, R40, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ - { L40, L41, L42, L43, L44, L45, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, XXX, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, XXX, R47 } \ -} - -#define LAYOUT_lspace_2u_bksp( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, R27, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ - L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ - L46, L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36,\ - L47, L40, L41, L42, L44, L43, R40, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ - { L40, L41, L42, L43, L44, L45, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, XXX, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, XXX, R47 } \ -} - -#define LAYOUT_lspace_split_bksp( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R27, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ - L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ - L46, L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36,\ - L47, L40, L41, L42, L44, L43, R40, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ - { L40, L41, L42, L43, L44, L45, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, XXX, R47 } \ -} diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h index 238e5f6d43..84b23cd33b 100644 --- a/keyboards/merge/um80/config.h +++ b/keyboards/merge/um80/config.h @@ -16,17 +16,10 @@ #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, C7 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_USB_DETECT #define MASTER_LEFT #define SPLIT_MODS_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_SPLIT #define RGBLED_NUM 100 #define RGBLED_SPLIT { 48, 52 } @@ -35,7 +28,6 @@ # define RGB_MATRIX_SPLIT RGBLED_SPLIT #endif #define RGBLIGHT_SLEEP -#define RGBLIGHT_LIMIT_VAL 120 #define AUDIO_PIN B6 diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json index e3e1359c92..2223b3d4c0 100644 --- a/keyboards/merge/um80/info.json +++ b/keyboards/merge/um80/info.json @@ -8,6 +8,11 @@ "pid": "0x3241", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"], + "rows": ["B0", "B1", "B2", "B3", "B7", "C7"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} @@ -16,11 +21,131 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, + "rgblight": { + "max_brightness": 120 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_rspace_split_bksp": { - "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"F1", "x":2.75, "y":0}, {"label":"F2", "x":3.75, "y":0}, {"label":"F3", "x":4.75, "y":0}, {"label":"F4", "x":5.75, "y":0}, {"label":"F5", "x":7, "y":0}, {"label":"F6", "x":8, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.5, "y":0}, {"label":"F10", "x":13.5, "y":0}, {"label":"F11", "x":14.5, "y":0}, {"label":"F12", "x":15.5, "y":0}, {"label":"Del", "x":16.75, "y":0}, {"label":"Encoder", "x":18.25, "y":0}, {"label":"~", "x":1.5, "y":1.25}, {"label":"!", "x":2.5, "y":1.25}, {"label":"@", "x":3.5, "y":1.25}, {"label":"#", "x":4.5, "y":1.25}, {"label":"$", "x":5.5, "y":1.25}, {"label":"%", "x":6.5, "y":1.25}, {"label":"^", "x":7.5, "y":1.25}, {"label":"&", "x":9.75, "y":1.25}, {"label":"*", "x":10.75, "y":1.25}, {"label":"(", "x":11.75, "y":1.25}, {"label":")", "x":12.75, "y":1.25}, {"label":"_", "x":13.75, "y":1.25}, {"label":"+", "x":14.75, "y":1.25}, {"label":"~", "x":15.75, "y":1.25}, {"label":"Bksp", "x":16.75, "y":1.25}, {"label":"Home", "x":18.25, "y":1.25}, {"label":"M0", "x":0, "y":2.25}, {"label":"Tab", "x":1.5, "y":2.25, "w":1.5}, {"label":"Q", "x":3, "y":2.25}, {"label":"W", "x":4, "y":2.25}, {"label":"E", "x":5, "y":2.25}, {"label":"R", "x":6, "y":2.25}, {"label":"T", "x":7, "y":2.25}, {"label":"Y", "x":9.25, "y":2.25}, {"label":"U", "x":10.25, "y":2.25}, {"label":"I", "x":11.25, "y":2.25}, {"label":"O", "x":12.25, "y":2.25}, {"label":"P", "x":13.25, "y":2.25}, {"label":"{", "x":14.25, "y":2.25}, {"label":"}", "x":15.25, "y":2.25}, {"label":"|", "x":16.25, "y":2.25, "w":1.5}, {"label":"PgUp", "x":18.25, "y":2.25}, {"label":"M1", "x":0, "y":3.25}, {"label":"Caps Lock", "x":1.5, "y":3.25, "w":1.75}, {"label":"A", "x":3.25, "y":3.25}, {"label":"S", "x":4.25, "y":3.25}, {"label":"D", "x":5.25, "y":3.25}, {"label":"F", "x":6.25, "y":3.25}, {"label":"G", "x":7.25, "y":3.25}, {"label":"H", "x":9.5, "y":3.25}, {"label":"J", "x":10.5, "y":3.25}, {"label":"K", "x":11.5, "y":3.25}, {"label":"L", "x":12.5, "y":3.25}, {"label":":", "x":13.5, "y":3.25}, {"label":"\"", "x":14.5, "y":3.25}, {"label":"Enter", "x":15.5, "y":3.25, "w":2.25}, {"label":"PgDn", "x":18.25, "y":3.25}, {"label":"M2", "x":0, "y":4.25}, {"label":"Shift", "x":1.5, "y":4.25, "w":2.25}, {"label":"Z", "x":3.75, "y":4.25}, {"label":"X", "x":4.75, "y":4.25}, {"label":"C", "x":5.75, "y":4.25}, {"label":"V", "x":6.75, "y":4.25}, {"label":"B", "x":7.75, "y":4.25}, {"label":"N", "x":10, "y":4.25}, {"label":"M", "x":11, "y":4.25}, {"label":"<", "x":12, "y":4.25}, {"label":">", "x":13, "y":4.25}, {"label":"?", "x":14, "y":4.25}, {"label":"Shift", "x":15, "y":4.25, "w":1.75}, {"label":"\u2191", "x":17, "y":4.5}, {"label":"M3", "x":0, "y":5.25}, {"label":"Ctrl", "x":1.5, "y":5.25, "w":1.25}, {"label":"Win", "x":2.75, "y":5.25, "w":1.25}, {"label":"Alt", "x":4, "y":5.25, "w":1.25}, {"x":5.25, "y":5.25, "w":1.25}, {"x":6.5, "y":5.25, "w":2.25}, {"x":10, "y":5.25, "w":2.75}, {"label":"Alt", "x":12.75, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":14.25, "y":5.25, "w":1.5}, {"label":"\u2190", "x":16, "y":5.5}, {"label":"\u2193", "x":17, "y":5.5}, {"label":"\u2192", "x":18, "y":5.5}] + "layout": [ + {"matrix": [0, 0], "x": 1.5, "y": 0}, + + {"matrix": [0, 1], "x": 2.75, "y": 0}, + {"matrix": [0, 2], "x": 3.75, "y": 0}, + {"matrix": [0, 3], "x": 4.75, "y": 0}, + {"matrix": [0, 4], "x": 5.75, "y": 0}, + + {"matrix": [0, 5], "x": 7, "y": 0}, + {"matrix": [0, 6], "x": 8, "y": 0}, + + {"matrix": [6, 0], "x": 10.25, "y": 0}, + {"matrix": [6, 1], "x": 11.25, "y": 0}, + + {"matrix": [6, 2], "x": 12.5, "y": 0}, + {"matrix": [6, 3], "x": 13.5, "y": 0}, + {"matrix": [6, 4], "x": 14.5, "y": 0}, + {"matrix": [6, 5], "x": 15.5, "y": 0}, + + {"matrix": [6, 6], "x": 16.75, "y": 0}, + + {"matrix": [6, 7], "x": 18.25, "y": 0}, + + {"matrix": [1, 0], "x": 1.5, "y": 1.25}, + {"matrix": [1, 1], "x": 2.5, "y": 1.25}, + {"matrix": [1, 2], "x": 3.5, "y": 1.25}, + {"matrix": [1, 3], "x": 4.5, "y": 1.25}, + {"matrix": [1, 4], "x": 5.5, "y": 1.25}, + {"matrix": [1, 5], "x": 6.5, "y": 1.25}, + {"matrix": [1, 6], "x": 7.5, "y": 1.25}, + + {"matrix": [7, 0], "x": 9.75, "y": 1.25}, + {"matrix": [7, 1], "x": 10.75, "y": 1.25}, + {"matrix": [7, 2], "x": 11.75, "y": 1.25}, + {"matrix": [7, 3], "x": 12.75, "y": 1.25}, + {"matrix": [7, 4], "x": 13.75, "y": 1.25}, + {"matrix": [7, 5], "x": 14.75, "y": 1.25}, + {"matrix": [7, 6], "x": 15.75, "y": 1.25}, + {"matrix": [7, 7], "x": 16.75, "y": 1.25}, + + {"matrix": [9, 7], "x": 18.25, "y": 1.25}, + + {"matrix": [2, 7], "x": 0, "y": 2.25}, + + {"matrix": [2, 0], "x": 1.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 3, "y": 2.25}, + {"matrix": [2, 2], "x": 4, "y": 2.25}, + {"matrix": [2, 3], "x": 5, "y": 2.25}, + {"matrix": [2, 4], "x": 6, "y": 2.25}, + {"matrix": [2, 5], "x": 7, "y": 2.25}, + + {"matrix": [8, 0], "x": 9.25, "y": 2.25}, + {"matrix": [8, 1], "x": 10.25, "y": 2.25}, + {"matrix": [8, 2], "x": 11.25, "y": 2.25}, + {"matrix": [8, 3], "x": 12.25, "y": 2.25}, + {"matrix": [8, 4], "x": 13.25, "y": 2.25}, + {"matrix": [8, 5], "x": 14.25, "y": 2.25}, + {"matrix": [8, 6], "x": 15.25, "y": 2.25}, + {"matrix": [8, 7], "x": 16.25, "y": 2.25, "w": 1.5}, + + {"matrix": [10, 7], "x": 18.25, "y": 2.25}, + + {"matrix": [3, 7], "x": 0, "y": 3.25}, + + {"matrix": [3, 0], "x": 1.5, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 3.25, "y": 3.25}, + {"matrix": [3, 2], "x": 4.25, "y": 3.25}, + {"matrix": [3, 3], "x": 5.25, "y": 3.25}, + {"matrix": [3, 4], "x": 6.25, "y": 3.25}, + {"matrix": [3, 5], "x": 7.25, "y": 3.25}, + + {"matrix": [9, 0], "x": 9.5, "y": 3.25}, + {"matrix": [9, 1], "x": 10.5, "y": 3.25}, + {"matrix": [9, 2], "x": 11.5, "y": 3.25}, + {"matrix": [9, 3], "x": 12.5, "y": 3.25}, + {"matrix": [9, 4], "x": 13.5, "y": 3.25}, + {"matrix": [9, 5], "x": 14.5, "y": 3.25}, + {"matrix": [9, 6], "x": 15.5, "y": 3.25, "w": 2.25}, + + {"matrix": [11, 7], "x": 18.25, "y": 3.25}, + + {"matrix": [4, 7], "x": 0, "y": 4.25}, + + {"matrix": [4, 0], "x": 1.5, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 3.75, "y": 4.25}, + {"matrix": [4, 2], "x": 4.75, "y": 4.25}, + {"matrix": [4, 3], "x": 5.75, "y": 4.25}, + {"matrix": [4, 4], "x": 6.75, "y": 4.25}, + {"matrix": [4, 5], "x": 7.75, "y": 4.25}, + + {"matrix": [10, 0], "x": 10, "y": 4.25}, + {"matrix": [10, 1], "x": 11, "y": 4.25}, + {"matrix": [10, 2], "x": 12, "y": 4.25}, + {"matrix": [10, 3], "x": 13, "y": 4.25}, + {"matrix": [10, 4], "x": 14, "y": 4.25}, + {"matrix": [10, 5], "x": 15, "y": 4.25, "w": 1.75}, + + {"matrix": [11, 6], "x": 17, "y": 4.5}, + + {"matrix": [5, 7], "x": 0, "y": 5.25}, + + {"matrix": [5, 0], "x": 1.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 2.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 4, "y": 5.25, "w": 1.25}, + {"matrix": [5, 3], "x": 5.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 4], "x": 6.5, "y": 5.25, "w": 2.25}, + + {"matrix": [11, 0], "x": 10, "y": 5.25, "w": 2.75}, + {"matrix": [11, 1], "x": 12.75, "y": 5.25, "w": 1.5}, + {"matrix": [11, 2], "x": 14.25, "y": 5.25, "w": 1.5}, + + {"matrix": [11, 3], "x": 16, "y": 5.5}, + {"matrix": [11, 4], "x": 17, "y": 5.5}, + {"matrix": [11, 5], "x": 18, "y": 5.5} + ] } } } diff --git a/keyboards/merge/um80/um80.c b/keyboards/merge/um80/um80.c index 557197c89d..d13f34562c 100644 --- a/keyboards/merge/um80/um80.c +++ b/keyboards/merge/um80/um80.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "um80.h" +#include "quantum.h" #ifndef WPM_ENABLE # define get_current_wpm() 0 diff --git a/keyboards/merge/um80/um80.h b/keyboards/merge/um80/um80.h deleted file mode 100644 index 9e17b70021..0000000000 --- a/keyboards/merge/um80/um80.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2021 duoshock - * - * 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 - -#define LAYOUT_rspace_split_bksp( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ - L27, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, R47, \ - L37, L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R57, \ - L47, L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, R56,\ - L57, L50, L51, L52, L53, L54, R50, R51, R52, R53, R54, R55 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, L16, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, L27 }, \ - { L30, L31, L32, L33, L34, L35, XXX, L37 }, \ - { L40, L41, L42, L43, L44, L45, XXX, L47 }, \ - { L50, L51, L52, L53, L54, XXX, XXX, L57 }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, XXX, R47 }, \ - { R50, R51, R52, R53, R54, R55, R56, R57 } \ -} diff --git a/keyboards/merge/uma/config.h b/keyboards/merge/uma/config.h index 6d21adc774..b02c9578cd 100644 --- a/keyboards/merge/uma/config.h +++ b/keyboards/merge/uma/config.h @@ -16,11 +16,5 @@ #pragma once -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_USB_DETECT #define SPLIT_MODS_ENABLE diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json index 1363705253..7de7cd251f 100644 --- a/keyboards/merge/uma/info.json +++ b/keyboards/merge/uma/info.json @@ -8,6 +8,11 @@ "pid": "0x3232", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "C6" }, @@ -22,17 +27,840 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + + {"matrix": [5, 0], "x": 10.5, "y": 0}, + {"matrix": [5, 1], "x": 11.5, "y": 0}, + {"matrix": [5, 2], "x": 12.5, "y": 0}, + {"matrix": [5, 3], "x": 13.5, "y": 0}, + {"matrix": [5, 4], "x": 14.5, "y": 0}, + {"matrix": [5, 5], "x": 15.5, "y": 0}, + {"matrix": [5, 6], "x": 16.5, "y": 0}, + {"matrix": [5, 7], "x": 17.5, "y": 0}, + + {"matrix": [7, 7], "x": 19, "y": 0}, + + {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 7, "y": 1}, + + {"matrix": [6, 0], "x": 10, "y": 1}, + {"matrix": [6, 1], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 4], "x": 14, "y": 1}, + {"matrix": [6, 5], "x": 15, "y": 1}, + {"matrix": [6, 6], "x": 16, "y": 1}, + {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5}, + + {"matrix": [8, 7], "x": 19, "y": 1}, + + {"matrix": [4, 5], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [2, 3], "x": 5.25, "y": 2}, + {"matrix": [2, 4], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.25, "y": 2}, + + {"matrix": [7, 0], "x": 10.25, "y": 2}, + {"matrix": [7, 1], "x": 11.25, "y": 2}, + {"matrix": [7, 2], "x": 12.25, "y": 2}, + {"matrix": [7, 3], "x": 13.25, "y": 2}, + {"matrix": [7, 4], "x": 14.25, "y": 2}, + {"matrix": [7, 5], "x": 15.25, "y": 2}, + {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25}, + + {"matrix": [9, 7], "x": 19, "y": 2}, + + {"matrix": [4, 6], "x": 0, "y": 3}, + + {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25}, + {"matrix": [4, 1], "x": 2.75, "y": 3}, + {"matrix": [3, 1], "x": 3.75, "y": 3}, + {"matrix": [3, 2], "x": 4.75, "y": 3}, + {"matrix": [3, 3], "x": 5.75, "y": 3}, + {"matrix": [3, 4], "x": 6.75, "y": 3}, + {"matrix": [3, 5], "x": 7.75, "y": 3}, + + {"matrix": [9, 6], "x": 9.75, "y": 3}, + {"matrix": [8, 0], "x": 10.75, "y": 3}, + {"matrix": [8, 1], "x": 11.75, "y": 3}, + {"matrix": [8, 2], "x": 12.75, "y": 3}, + {"matrix": [8, 3], "x": 13.75, "y": 3}, + {"matrix": [8, 4], "x": 14.75, "y": 3}, + {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75}, + + {"matrix": [8, 6], "x": 17.75, "y": 3.25}, + + {"matrix": [4, 7], "x": 0, "y": 4}, + + {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25}, + + {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75}, + {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5}, + + {"matrix": [9, 3], "x": 16.75, "y": 4.25}, + {"matrix": [9, 4], "x": 17.75, "y": 4.25}, + {"matrix": [9, 5], "x": 18.75, "y": 4.25} + ] + }, + "LAYOUT_ansi_lspace_2u_bksp": { + "layout": [ + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + + {"matrix": [5, 0], "x": 10.5, "y": 0}, + {"matrix": [5, 1], "x": 11.5, "y": 0}, + {"matrix": [5, 2], "x": 12.5, "y": 0}, + {"matrix": [5, 3], "x": 13.5, "y": 0}, + {"matrix": [5, 4], "x": 14.5, "y": 0}, + {"matrix": [5, 5], "x": 15.5, "y": 0}, + {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2}, + + {"matrix": [7, 7], "x": 19, "y": 0}, + + {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 7, "y": 1}, + + {"matrix": [6, 0], "x": 10, "y": 1}, + {"matrix": [6, 1], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 4], "x": 14, "y": 1}, + {"matrix": [6, 5], "x": 15, "y": 1}, + {"matrix": [6, 6], "x": 16, "y": 1}, + {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5}, + + {"matrix": [8, 7], "x": 19, "y": 1}, + + {"matrix": [4, 5], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [2, 3], "x": 5.25, "y": 2}, + {"matrix": [2, 4], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.25, "y": 2}, + + {"matrix": [7, 0], "x": 10.25, "y": 2}, + {"matrix": [7, 1], "x": 11.25, "y": 2}, + {"matrix": [7, 2], "x": 12.25, "y": 2}, + {"matrix": [7, 3], "x": 13.25, "y": 2}, + {"matrix": [7, 4], "x": 14.25, "y": 2}, + {"matrix": [7, 5], "x": 15.25, "y": 2}, + {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25}, + + {"matrix": [9, 7], "x": 19, "y": 2}, + + {"matrix": [4, 6], "x": 0, "y": 3}, + + {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 3.75, "y": 3}, + {"matrix": [3, 2], "x": 4.75, "y": 3}, + {"matrix": [3, 3], "x": 5.75, "y": 3}, + {"matrix": [3, 4], "x": 6.75, "y": 3}, + {"matrix": [3, 5], "x": 7.75, "y": 3}, + + {"matrix": [9, 6], "x": 9.75, "y": 3}, + {"matrix": [8, 0], "x": 10.75, "y": 3}, + {"matrix": [8, 1], "x": 11.75, "y": 3}, + {"matrix": [8, 2], "x": 12.75, "y": 3}, + {"matrix": [8, 3], "x": 13.75, "y": 3}, + {"matrix": [8, 4], "x": 14.75, "y": 3}, + {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75}, + {"matrix": [8, 6], "x": 17.75, "y": 3.25}, + + {"matrix": [4, 7], "x": 0, "y": 4}, + + {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25}, + {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75}, + {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5}, + + {"matrix": [9, 3], "x": 16.75, "y": 4.25}, + {"matrix": [9, 4], "x": 17.75, "y": 4.25}, + {"matrix": [9, 5], "x": 18.75, "y": 4.25} + ] + }, + "LAYOUT_ansi_lspace_split_bksp": { + "layout": [ + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + + {"matrix": [5, 0], "x": 10.5, "y": 0}, + {"matrix": [5, 1], "x": 11.5, "y": 0}, + {"matrix": [5, 2], "x": 12.5, "y": 0}, + {"matrix": [5, 3], "x": 13.5, "y": 0}, + {"matrix": [5, 4], "x": 14.5, "y": 0}, + {"matrix": [5, 5], "x": 15.5, "y": 0}, + {"matrix": [5, 6], "x": 16.5, "y": 0}, + {"matrix": [5, 7], "x": 17.5, "y": 0}, + + {"matrix": [7, 7], "x": 19, "y": 0}, + + {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 7, "y": 1}, + + {"matrix": [6, 0], "x": 10, "y": 1}, + {"matrix": [6, 1], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 4], "x": 14, "y": 1}, + {"matrix": [6, 5], "x": 15, "y": 1}, + {"matrix": [6, 6], "x": 16, "y": 1}, + {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5}, + + {"matrix": [8, 7], "x": 19, "y": 1}, + + {"matrix": [4, 5], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [2, 3], "x": 5.25, "y": 2}, + {"matrix": [2, 4], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.25, "y": 2}, + + {"matrix": [7, 0], "x": 10.25, "y": 2}, + {"matrix": [7, 1], "x": 11.25, "y": 2}, + {"matrix": [7, 2], "x": 12.25, "y": 2}, + {"matrix": [7, 3], "x": 13.25, "y": 2}, + {"matrix": [7, 4], "x": 14.25, "y": 2}, + {"matrix": [7, 5], "x": 15.25, "y": 2}, + {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25}, + + {"matrix": [9, 7], "x": 19, "y": 2}, + + {"matrix": [4, 6], "x": 0, "y": 3}, + + {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 3.75, "y": 3}, + {"matrix": [3, 2], "x": 4.75, "y": 3}, + {"matrix": [3, 3], "x": 5.75, "y": 3}, + {"matrix": [3, 4], "x": 6.75, "y": 3}, + {"matrix": [3, 5], "x": 7.75, "y": 3}, + + {"matrix": [9, 6], "x": 9.75, "y": 3}, + {"matrix": [8, 0], "x": 10.75, "y": 3}, + {"matrix": [8, 1], "x": 11.75, "y": 3}, + {"matrix": [8, 2], "x": 12.75, "y": 3}, + {"matrix": [8, 3], "x": 13.75, "y": 3}, + {"matrix": [8, 4], "x": 14.75, "y": 3}, + {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75}, + {"matrix": [8, 6], "x": 17.75, "y": 3.25}, + + {"matrix": [4, 7], "x": 0, "y": 4}, + + {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25}, + {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75}, + {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5}, + + {"matrix": [9, 3], "x": 16.75, "y": 4.25}, + {"matrix": [9, 4], "x": 17.75, "y": 4.25}, + {"matrix": [9, 5], "x": 18.75, "y": 4.25} + ] + }, "LAYOUT_ansi_rspace_2u_bksp": { - "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"Backspace", "x":16.5, "y":0, "w":2}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"label":"Alt", "x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}] + "layout": [ + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + + {"matrix": [5, 0], "x": 10.5, "y": 0}, + {"matrix": [5, 1], "x": 11.5, "y": 0}, + {"matrix": [5, 2], "x": 12.5, "y": 0}, + {"matrix": [5, 3], "x": 13.5, "y": 0}, + {"matrix": [5, 4], "x": 14.5, "y": 0}, + {"matrix": [5, 5], "x": 15.5, "y": 0}, + {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2}, + + {"matrix": [7, 7], "x": 19, "y": 0}, + + {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 7, "y": 1}, + + {"matrix": [6, 0], "x": 10, "y": 1}, + {"matrix": [6, 1], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 4], "x": 14, "y": 1}, + {"matrix": [6, 5], "x": 15, "y": 1}, + {"matrix": [6, 6], "x": 16, "y": 1}, + {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5}, + + {"matrix": [8, 7], "x": 19, "y": 1}, + + {"matrix": [4, 5], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [2, 3], "x": 5.25, "y": 2}, + {"matrix": [2, 4], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.25, "y": 2}, + + {"matrix": [7, 0], "x": 10.25, "y": 2}, + {"matrix": [7, 1], "x": 11.25, "y": 2}, + {"matrix": [7, 2], "x": 12.25, "y": 2}, + {"matrix": [7, 3], "x": 13.25, "y": 2}, + {"matrix": [7, 4], "x": 14.25, "y": 2}, + {"matrix": [7, 5], "x": 15.25, "y": 2}, + {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25}, + + {"matrix": [9, 7], "x": 19, "y": 2}, + + {"matrix": [4, 6], "x": 0, "y": 3}, + + {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 3.75, "y": 3}, + {"matrix": [3, 2], "x": 4.75, "y": 3}, + {"matrix": [3, 3], "x": 5.75, "y": 3}, + {"matrix": [3, 4], "x": 6.75, "y": 3}, + {"matrix": [3, 5], "x": 7.75, "y": 3}, + + {"matrix": [9, 6], "x": 9.75, "y": 3}, + {"matrix": [8, 0], "x": 10.75, "y": 3}, + {"matrix": [8, 1], "x": 11.75, "y": 3}, + {"matrix": [8, 2], "x": 12.75, "y": 3}, + {"matrix": [8, 3], "x": 13.75, "y": 3}, + {"matrix": [8, 4], "x": 14.75, "y": 3}, + {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75}, + {"matrix": [8, 6], "x": 17.75, "y": 3.25}, + + {"matrix": [4, 7], "x": 0, "y": 4}, + + {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25}, + + {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75}, + {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5}, + + {"matrix": [9, 3], "x": 16.75, "y": 4.25}, + {"matrix": [9, 4], "x": 17.75, "y": 4.25}, + {"matrix": [9, 5], "x": 18.75, "y": 4.25} + ] }, "LAYOUT_ansi_rspace_split_bksp": { - "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"~", "x":16.5, "y":0}, {"label":"Backspace", "x":17.5, "y":0}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"label":"Alt", "x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}] + "layout": [ + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + + {"matrix": [5, 0], "x": 10.5, "y": 0}, + {"matrix": [5, 1], "x": 11.5, "y": 0}, + {"matrix": [5, 2], "x": 12.5, "y": 0}, + {"matrix": [5, 3], "x": 13.5, "y": 0}, + {"matrix": [5, 4], "x": 14.5, "y": 0}, + {"matrix": [5, 5], "x": 15.5, "y": 0}, + {"matrix": [5, 6], "x": 16.5, "y": 0}, + {"matrix": [5, 7], "x": 17.5, "y": 0}, + + {"matrix": [7, 7], "x": 19, "y": 0}, + + {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 7, "y": 1}, + + {"matrix": [6, 0], "x": 10, "y": 1}, + {"matrix": [6, 1], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 4], "x": 14, "y": 1}, + {"matrix": [6, 5], "x": 15, "y": 1}, + {"matrix": [6, 6], "x": 16, "y": 1}, + {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5}, + + {"matrix": [8, 7], "x": 19, "y": 1}, + + {"matrix": [4, 5], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [2, 3], "x": 5.25, "y": 2}, + {"matrix": [2, 4], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.25, "y": 2}, + + {"matrix": [7, 0], "x": 10.25, "y": 2}, + {"matrix": [7, 1], "x": 11.25, "y": 2}, + {"matrix": [7, 2], "x": 12.25, "y": 2}, + {"matrix": [7, 3], "x": 13.25, "y": 2}, + {"matrix": [7, 4], "x": 14.25, "y": 2}, + {"matrix": [7, 5], "x": 15.25, "y": 2}, + {"matrix": [7, 6], "x": 16.25, "y": 2, "w": 2.25}, + + {"matrix": [9, 7], "x": 19, "y": 2}, + + {"matrix": [4, 6], "x": 0, "y": 3}, + + {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 3.75, "y": 3}, + {"matrix": [3, 2], "x": 4.75, "y": 3}, + {"matrix": [3, 3], "x": 5.75, "y": 3}, + {"matrix": [3, 4], "x": 6.75, "y": 3}, + {"matrix": [3, 5], "x": 7.75, "y": 3}, + + {"matrix": [9, 6], "x": 9.75, "y": 3}, + {"matrix": [8, 0], "x": 10.75, "y": 3}, + {"matrix": [8, 1], "x": 11.75, "y": 3}, + {"matrix": [8, 2], "x": 12.75, "y": 3}, + {"matrix": [8, 3], "x": 13.75, "y": 3}, + {"matrix": [8, 4], "x": 14.75, "y": 3}, + {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75}, + + {"matrix": [8, 6], "x": 17.75, "y": 3.25}, + + {"matrix": [4, 7], "x": 0, "y": 4}, + + {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25}, + + {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75}, + {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5}, + + {"matrix": [9, 3], "x": 16.75, "y": 4.25}, + {"matrix": [9, 4], "x": 17.75, "y": 4.25}, + {"matrix": [9, 5], "x": 18.75, "y": 4.25} + ] }, - "LAYOUT_ansi_lspace_2u_bksp": { - "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"Backspace", "x":16.5, "y":0, "w":2}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":2.25}, {"label":"Alt", "x":7.5, "y":4, "w":1.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}] + "LAYOUT_iso_lspace_2u_bksp": { + "layout": [ + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + + {"matrix": [5, 0], "x": 10.5, "y": 0}, + {"matrix": [5, 1], "x": 11.5, "y": 0}, + {"matrix": [5, 2], "x": 12.5, "y": 0}, + {"matrix": [5, 3], "x": 13.5, "y": 0}, + {"matrix": [5, 4], "x": 14.5, "y": 0}, + {"matrix": [5, 5], "x": 15.5, "y": 0}, + {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2}, + + {"matrix": [7, 7], "x": 19, "y": 0}, + + {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 7, "y": 1}, + + {"matrix": [6, 0], "x": 10, "y": 1}, + {"matrix": [6, 1], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 4], "x": 14, "y": 1}, + {"matrix": [6, 5], "x": 15, "y": 1}, + {"matrix": [6, 6], "x": 16, "y": 1}, + + {"matrix": [8, 7], "x": 19, "y": 1}, + + {"matrix": [4, 5], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [2, 3], "x": 5.25, "y": 2}, + {"matrix": [2, 4], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.25, "y": 2}, + + {"matrix": [7, 0], "x": 10.25, "y": 2}, + {"matrix": [7, 1], "x": 11.25, "y": 2}, + {"matrix": [7, 2], "x": 12.25, "y": 2}, + {"matrix": [7, 3], "x": 13.25, "y": 2}, + {"matrix": [7, 4], "x": 14.25, "y": 2}, + {"matrix": [7, 5], "x": 15.25, "y": 2}, + {"matrix": [6, 7], "x": 16.25, "y": 2}, + {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [9, 7], "x": 19, "y": 2}, + + {"matrix": [4, 6], "x": 0, "y": 3}, + + {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25}, + {"matrix": [4, 1], "x": 2.75, "y": 3}, + {"matrix": [3, 1], "x": 3.75, "y": 3}, + {"matrix": [3, 2], "x": 4.75, "y": 3}, + {"matrix": [3, 3], "x": 5.75, "y": 3}, + {"matrix": [3, 4], "x": 6.75, "y": 3}, + {"matrix": [3, 5], "x": 7.75, "y": 3}, + + {"matrix": [9, 6], "x": 9.75, "y": 3}, + {"matrix": [8, 0], "x": 10.75, "y": 3}, + {"matrix": [8, 1], "x": 11.75, "y": 3}, + {"matrix": [8, 2], "x": 12.75, "y": 3}, + {"matrix": [8, 3], "x": 13.75, "y": 3}, + {"matrix": [8, 4], "x": 14.75, "y": 3}, + {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75}, + + {"matrix": [8, 6], "x": 17.75, "y": 3.25}, + + {"matrix": [4, 7], "x": 0, "y": 4}, + + {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25}, + {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75}, + {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5}, + + {"matrix": [9, 3], "x": 16.75, "y": 4.25}, + {"matrix": [9, 4], "x": 17.75, "y": 4.25}, + {"matrix": [9, 5], "x": 18.75, "y": 4.25} + ] }, - "LAYOUT_ansi_lspace_split_bksp": { - "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"~", "x":16.5, "y":0}, {"label":"Backspace", "x":17.5, "y":0}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":2.25}, {"label":"Alt", "x":7.5, "y":4, "w":1.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}] + "LAYOUT_iso_lspace_split_bksp": { + "layout": [ + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + + {"matrix": [5, 0], "x": 10.5, "y": 0}, + {"matrix": [5, 1], "x": 11.5, "y": 0}, + {"matrix": [5, 2], "x": 12.5, "y": 0}, + {"matrix": [5, 3], "x": 13.5, "y": 0}, + {"matrix": [5, 4], "x": 14.5, "y": 0}, + {"matrix": [5, 5], "x": 15.5, "y": 0}, + {"matrix": [5, 6], "x": 16.5, "y": 0}, + {"matrix": [5, 7], "x": 17.5, "y": 0}, + + {"matrix": [7, 7], "x": 19, "y": 0}, + + {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 7, "y": 1}, + + {"matrix": [6, 0], "x": 10, "y": 1}, + {"matrix": [6, 1], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 4], "x": 14, "y": 1}, + {"matrix": [6, 5], "x": 15, "y": 1}, + {"matrix": [6, 6], "x": 16, "y": 1}, + + {"matrix": [8, 7], "x": 19, "y": 1}, + + {"matrix": [4, 5], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [2, 3], "x": 5.25, "y": 2}, + {"matrix": [2, 4], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.25, "y": 2}, + + {"matrix": [7, 0], "x": 10.25, "y": 2}, + {"matrix": [7, 1], "x": 11.25, "y": 2}, + {"matrix": [7, 2], "x": 12.25, "y": 2}, + {"matrix": [7, 3], "x": 13.25, "y": 2}, + {"matrix": [7, 4], "x": 14.25, "y": 2}, + {"matrix": [7, 5], "x": 15.25, "y": 2}, + {"matrix": [6, 7], "x": 16.25, "y": 2}, + {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [9, 7], "x": 19, "y": 2}, + + {"matrix": [4, 6], "x": 0, "y": 3}, + + {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25}, + {"matrix": [4, 1], "x": 2.75, "y": 3}, + {"matrix": [3, 1], "x": 3.75, "y": 3}, + {"matrix": [3, 2], "x": 4.75, "y": 3}, + {"matrix": [3, 3], "x": 5.75, "y": 3}, + {"matrix": [3, 4], "x": 6.75, "y": 3}, + {"matrix": [3, 5], "x": 7.75, "y": 3}, + + {"matrix": [9, 6], "x": 9.75, "y": 3}, + {"matrix": [8, 0], "x": 10.75, "y": 3}, + {"matrix": [8, 1], "x": 11.75, "y": 3}, + {"matrix": [8, 2], "x": 12.75, "y": 3}, + {"matrix": [8, 3], "x": 13.75, "y": 3}, + {"matrix": [8, 4], "x": 14.75, "y": 3}, + {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75}, + + {"matrix": [8, 6], "x": 17.75, "y": 3.25}, + + {"matrix": [4, 7], "x": 0, "y": 4}, + + {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25}, + {"matrix": [4, 3], "x": 7.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75}, + {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5}, + + {"matrix": [9, 3], "x": 16.75, "y": 4.25}, + {"matrix": [9, 4], "x": 17.75, "y": 4.25}, + {"matrix": [9, 5], "x": 18.75, "y": 4.25} + ] + }, + "LAYOUT_iso_rspace_2u_bksp": { + "layout": [ + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + + {"matrix": [5, 0], "x": 10.5, "y": 0}, + {"matrix": [5, 1], "x": 11.5, "y": 0}, + {"matrix": [5, 2], "x": 12.5, "y": 0}, + {"matrix": [5, 3], "x": 13.5, "y": 0}, + {"matrix": [5, 4], "x": 14.5, "y": 0}, + {"matrix": [5, 5], "x": 15.5, "y": 0}, + {"matrix": [5, 7], "x": 16.5, "y": 0, "w": 2}, + + {"matrix": [7, 7], "x": 19, "y": 0}, + + {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 7, "y": 1}, + + {"matrix": [6, 0], "x": 10, "y": 1}, + {"matrix": [6, 1], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 4], "x": 14, "y": 1}, + {"matrix": [6, 5], "x": 15, "y": 1}, + {"matrix": [6, 6], "x": 16, "y": 1}, + + {"matrix": [8, 7], "x": 19, "y": 1}, + + {"matrix": [4, 5], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [2, 3], "x": 5.25, "y": 2}, + {"matrix": [2, 4], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.25, "y": 2}, + + {"matrix": [7, 0], "x": 10.25, "y": 2}, + {"matrix": [7, 1], "x": 11.25, "y": 2}, + {"matrix": [7, 2], "x": 12.25, "y": 2}, + {"matrix": [7, 3], "x": 13.25, "y": 2}, + {"matrix": [7, 4], "x": 14.25, "y": 2}, + {"matrix": [7, 5], "x": 15.25, "y": 2}, + {"matrix": [6, 7], "x": 16.25, "y": 2}, + {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [9, 7], "x": 19, "y": 2}, + + {"matrix": [4, 6], "x": 0, "y": 3}, + + {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25}, + {"matrix": [4, 1], "x": 2.75, "y": 3}, + {"matrix": [3, 1], "x": 3.75, "y": 3}, + {"matrix": [3, 2], "x": 4.75, "y": 3}, + {"matrix": [3, 3], "x": 5.75, "y": 3}, + {"matrix": [3, 4], "x": 6.75, "y": 3}, + {"matrix": [3, 5], "x": 7.75, "y": 3}, + + {"matrix": [9, 6], "x": 9.75, "y": 3}, + {"matrix": [8, 0], "x": 10.75, "y": 3}, + {"matrix": [8, 1], "x": 11.75, "y": 3}, + {"matrix": [8, 2], "x": 12.75, "y": 3}, + {"matrix": [8, 3], "x": 13.75, "y": 3}, + {"matrix": [8, 4], "x": 14.75, "y": 3}, + {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75}, + + {"matrix": [8, 6], "x": 17.75, "y": 3.25}, + + {"matrix": [4, 7], "x": 0, "y": 4}, + + {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25}, + + {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75}, + {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5}, + + {"matrix": [9, 3], "x": 16.75, "y": 4.25}, + {"matrix": [9, 4], "x": 17.75, "y": 4.25}, + {"matrix": [9, 5], "x": 18.75, "y": 4.25} + ] + }, + "LAYOUT_iso_rspace_split_bksp": { + "layout": [ + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + + {"matrix": [5, 0], "x": 10.5, "y": 0}, + {"matrix": [5, 1], "x": 11.5, "y": 0}, + {"matrix": [5, 2], "x": 12.5, "y": 0}, + {"matrix": [5, 3], "x": 13.5, "y": 0}, + {"matrix": [5, 4], "x": 14.5, "y": 0}, + {"matrix": [5, 5], "x": 15.5, "y": 0}, + {"matrix": [5, 6], "x": 16.5, "y": 0}, + {"matrix": [5, 7], "x": 17.5, "y": 0}, + + {"matrix": [7, 7], "x": 19, "y": 0}, + + {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 7, "y": 1}, + + {"matrix": [6, 0], "x": 10, "y": 1}, + {"matrix": [6, 1], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 4], "x": 14, "y": 1}, + {"matrix": [6, 5], "x": 15, "y": 1}, + {"matrix": [6, 6], "x": 16, "y": 1}, + + {"matrix": [8, 7], "x": 19, "y": 1}, + + {"matrix": [4, 5], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [2, 3], "x": 5.25, "y": 2}, + {"matrix": [2, 4], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.25, "y": 2}, + + {"matrix": [7, 0], "x": 10.25, "y": 2}, + {"matrix": [7, 1], "x": 11.25, "y": 2}, + {"matrix": [7, 2], "x": 12.25, "y": 2}, + {"matrix": [7, 3], "x": 13.25, "y": 2}, + {"matrix": [7, 4], "x": 14.25, "y": 2}, + {"matrix": [7, 5], "x": 15.25, "y": 2}, + {"matrix": [6, 7], "x": 16.25, "y": 2}, + {"matrix": [7, 6], "x": 17.25, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [9, 7], "x": 19, "y": 2}, + + {"matrix": [4, 6], "x": 0, "y": 3}, + + {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 1.25}, + {"matrix": [4, 1], "x": 2.75, "y": 3}, + {"matrix": [3, 1], "x": 3.75, "y": 3}, + {"matrix": [3, 2], "x": 4.75, "y": 3}, + {"matrix": [3, 3], "x": 5.75, "y": 3}, + {"matrix": [3, 4], "x": 6.75, "y": 3}, + {"matrix": [3, 5], "x": 7.75, "y": 3}, + + {"matrix": [9, 6], "x": 9.75, "y": 3}, + {"matrix": [8, 0], "x": 10.75, "y": 3}, + {"matrix": [8, 1], "x": 11.75, "y": 3}, + {"matrix": [8, 2], "x": 12.75, "y": 3}, + {"matrix": [8, 3], "x": 13.75, "y": 3}, + {"matrix": [8, 4], "x": 14.75, "y": 3}, + {"matrix": [8, 5], "x": 15.75, "y": 3, "w": 1.75}, + + {"matrix": [8, 6], "x": 17.75, "y": 3.25}, + + {"matrix": [4, 7], "x": 0, "y": 4}, + + {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25}, + + {"matrix": [9, 0], "x": 9.75, "y": 4, "w": 2.75}, + {"matrix": [9, 1], "x": 13.5, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 15, "y": 4, "w": 1.5}, + + {"matrix": [9, 3], "x": 16.75, "y": 4.25}, + {"matrix": [9, 4], "x": 17.75, "y": 4.25}, + {"matrix": [9, 5], "x": 18.75, "y": 4.25} + ] } } } diff --git a/keyboards/merge/uma/uma.c b/keyboards/merge/uma/uma.c index 565a09fb27..35c91b8a6e 100644 --- a/keyboards/merge/uma/uma.c +++ b/keyboards/merge/uma/uma.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "uma.h" +#include "quantum.h" #ifdef OLED_ENABLE void suspend_power_down_user(void) { diff --git a/keyboards/merge/uma/uma.h b/keyboards/merge/uma/uma.h deleted file mode 100644 index b7fb9a5d61..0000000000 --- a/keyboards/merge/uma/uma.h +++ /dev/null @@ -1,192 +0,0 @@ -/* Copyright 2021 duoshock - * - * 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 - -#define LAYOUT_all( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R27, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ - L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ - L46, L30, L41, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ - L47, L40, L42, L43, L44, R40, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ - { L40, L41, L42, L43, L44, L45, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, R46, R47 } \ -} - -#define LAYOUT_ansi_rspace_split_bksp( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R27, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ - L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ - L46, L30, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ - L47, L40, L42, L43, L44, R40, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ - { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, R46, R47 } \ -} - -#define LAYOUT_ansi_rspace_2u_bksp( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, R27, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ - L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ - L46, L30, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ - L47, L40, L42, L43, L44, R40, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ - { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, XXX, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, R46, R47 } \ -} - -#define LAYOUT_ansi_lspace_2u_bksp( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, R27, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ - L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ - L46, L30, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ - L47, L40, L42, L44, L43, R40, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ - { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, XXX, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, R46, R47 } \ -} - -#define LAYOUT_ansi_lspace_split_bksp( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R27, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ - L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ - L46, L30, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ - L47, L40, L42, L44, L43, R40, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ - { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, R46, R47 } \ -} - -#define LAYOUT_iso_rspace_split_bksp( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R27, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ - L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ - L46, L30, L41, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ - L47, L40, L42, L43, L44, R40, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ - { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, R46, R47 } \ -} - -#define LAYOUT_iso_rspace_2u_bksp( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, R27, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ - L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ - L46, L30, L41, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ - L47, L40, L42, L43, L44, R40, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ - { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, XXX, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, R46, R47 } \ -} - -#define LAYOUT_iso_lspace_2u_bksp( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, R27, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ - L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ - L46, L30, L41, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ - L47, L40, L42, L44, L43, R40, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ - { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, XXX, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, R46, R47 } \ -} - -#define LAYOUT_iso_lspace_split_bksp( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R27, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R37, \ - L45, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R47, \ - L46, L30, L41, L31, L32, L33, L34, L35, R46, R30, R31, R32, R33, R34, R35, R36,\ - L47, L40, L42, L44, L43, R40, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { L30, L31, L32, L33, L34, L35, XXX, XXX }, \ - { L40, XXX, L42, L43, L44, L45, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, R46, R47 } \ -} |