diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-05-29 06:17:24 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-05-29 06:17:24 +1000 |
| commit | 5024370dd0b441e86ace3089193e84c5b050d892 (patch) | |
| tree | b661d5b154be987f9c3dba3a526b70e0b63f9fef /keyboards/mt | |
| parent | 16767e4d59c2334fcd2d5e6556a68d5ff60ffd7b (diff) | |
| parent | 8b1d86eabf399e82af7738fb675b9c74195d0f98 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'keyboards/mt')
34 files changed, 1109 insertions, 893 deletions
diff --git a/keyboards/mt/blocked65/blocked65.c b/keyboards/mt/blocked65/blocked65.c deleted file mode 100644 index 81da8005b0..0000000000 --- a/keyboards/mt/blocked65/blocked65.c +++ /dev/null @@ -1 +0,0 @@ -#include "blocked65.h" diff --git a/keyboards/mt/blocked65/blocked65.h b/keyboards/mt/blocked65/blocked65.h deleted file mode 100644 index 09fe673a66..0000000000 --- a/keyboards/mt/blocked65/blocked65.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once -#include "quantum.h" - -// readability -#define _x_ KC_NO -#define LAYOUT_65_ansi_blocker( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \ -){ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \ - { K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, _x_, K4A, K4B, K4C, K4D, K4E }, \ -} diff --git a/keyboards/mt/blocked65/config.h b/keyboards/mt/blocked65/config.h index bd4c880e3b..b61be3ea8f 100644 --- a/keyboards/mt/blocked65/config.h +++ b/keyboards/mt/blocked65/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ @@ -33,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Backlight configuration */ -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/mt/blocked65/info.json b/keyboards/mt/blocked65/info.json index c16d04cd5b..db328f8dad 100644 --- a/keyboards/mt/blocked65/info.json +++ b/keyboards/mt/blocked65/info.json @@ -1,13 +1,21 @@ { - "keyboard_name": "Blocked65", + "keyboard_name": "Blocked65", "manufacturer": "Dou", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x5746", "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 6 @@ -17,7 +25,79 @@ "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"PrScr", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Del", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Fn", "x":10, "y":4, "w":1.25}, {"label":"Alt", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] } } } diff --git a/keyboards/mt/mt40/config.h b/keyboards/mt/mt40/config.h index 8a77b3dc7b..bb90137436 100644 --- a/keyboards/mt/mt40/config.h +++ b/keyboards/mt/mt40/config.h @@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define RGB_DI_PIN C0 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD @@ -31,27 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -/* #define CC6 0x63 // C3 */ -/* #define CB6 0x37 // B7 */ -/* #define CC7 0x62 // C2 */ - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B6, B7 } -#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ /* #define LOCKING_SUPPORT_ENABLE */ /* Locking resynchronize hack */ diff --git a/keyboards/mt/mt40/info.json b/keyboards/mt/mt40/info.json index 730cdf6c24..4d3cab4eba 100644 --- a/keyboards/mt/mt40/info.json +++ b/keyboards/mt/mt40/info.json @@ -8,15 +8,77 @@ "pid": "0x422D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D2" }, + "ws2812": { + "driver": "i2c" + }, "processor": "atmega32a", "bootloader": "bootloadhid", "community_layouts": ["planck_mit"], + "layout_aliases": { + "LAYOUT": "LAYOUT_planck_mit" + }, "layouts": { "LAYOUT_planck_mit": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3, "w":2}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [3, 1], "x": 1, "y": 0}, + {"matrix": [3, 2], "x": 2, "y": 0}, + {"matrix": [3, 3], "x": 3, "y": 0}, + {"matrix": [3, 4], "x": 4, "y": 0}, + {"matrix": [3, 5], "x": 5, "y": 0}, + {"matrix": [5, 2], "x": 6, "y": 0}, + {"matrix": [5, 12], "x": 7, "y": 0}, + {"matrix": [6, 12], "x": 8, "y": 0}, + {"matrix": [6, 2], "x": 9, "y": 0}, + {"matrix": [3, 10], "x": 10, "y": 0}, + {"matrix": [4, 14], "x": 11, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1}, + {"matrix": [2, 5], "x": 5, "y": 1}, + {"matrix": [5, 3], "x": 6, "y": 1}, + {"matrix": [5, 13], "x": 7, "y": 1}, + {"matrix": [6, 13], "x": 8, "y": 1}, + {"matrix": [6, 3], "x": 9, "y": 1}, + {"matrix": [2, 10], "x": 10, "y": 1}, + {"matrix": [2, 11], "x": 11, "y": 1}, + + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 2}, + {"matrix": [1, 3], "x": 3, "y": 2}, + {"matrix": [1, 4], "x": 4, "y": 2}, + {"matrix": [1, 5], "x": 5, "y": 2}, + {"matrix": [5, 4], "x": 6, "y": 2}, + {"matrix": [5, 14], "x": 7, "y": 2}, + {"matrix": [6, 14], "x": 8, "y": 2}, + {"matrix": [6, 4], "x": 9, "y": 2}, + {"matrix": [1, 10], "x": 10, "y": 2}, + {"matrix": [6, 6], "x": 11, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [0, 0], "x": 1, "y": 3}, + {"matrix": [0, 1], "x": 2, "y": 3}, + {"matrix": [0, 2], "x": 3, "y": 3}, + {"matrix": [0, 4], "x": 4, "y": 3}, + {"matrix": [0, 5], "x": 5, "y": 3, "w": 2}, + {"matrix": [0, 11], "x": 7, "y": 3}, + {"matrix": [5, 6], "x": 8, "y": 3}, + {"matrix": [5, 8], "x": 9, "y": 3}, + {"matrix": [5, 7], "x": 10, "y": 3}, + {"matrix": [5, 9], "x": 11, "y": 3} + ] } } } diff --git a/keyboards/mt/mt40/mt40.c b/keyboards/mt/mt40/mt40.c deleted file mode 100644 index dd079e7d81..0000000000 --- a/keyboards/mt/mt40/mt40.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2017 REPLACE_WITH_YOUR_NAME - * - * 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 "mt40.h" diff --git a/keyboards/mt/mt40/mt40.h b/keyboards/mt/mt40/mt40.h deleted file mode 100644 index dc0de22b28..0000000000 --- a/keyboards/mt/mt40/mt40.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2017 REPLACE_WITH_YOUR_NAME - * - * 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 - -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_planck_mit( \ - k40, k31, k32, k33, k34, k35, k52, k5C, k6C, k62, k3A, k4E, \ - k30, k21, k22, k23, k24, k25, k53, k5D, k6D, k63, k2A, k2B, \ - k10, k11, k12, k13, k14, k15, k54, k5E, k6E, k64, k1A, k66, \ - k20, k00, k01, k02, k04, k05, k0B, k56, k58, k57, k59 \ -) { \ - { k00, k01, k02, XXX, k04, k05, XXX, XXX, XXX, XXX, XXX, k0B, XXX, XXX, XXX }, \ - { k10, k11, k12, k13, k14, k15, XXX, XXX, XXX, XXX, k1A, XXX, XXX, XXX, XXX }, \ - { k20, k21, k22, k23, k24, k25, XXX, XXX, XXX, XXX, k2A, k2B, XXX, XXX, XXX }, \ - { k30, k31, k32, k33, k34, k35, XXX, XXX, XXX, XXX, k3A, XXX, XXX, XXX, XXX }, \ - { k40, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k4E }, \ - { XXX, XXX, k52, k53, k54, k05, k56, k57, k58, k59, XXX, XXX, k5C, k5D, k5E }, \ - { XXX, XXX, k62, k63, k64, XXX, k66, XXX, XXX, XXX, XXX, XXX, k6C, k6D, k6E } \ -} - -#define LAYOUT LAYOUT_planck_mit diff --git a/keyboards/mt/mt40/rules.mk b/keyboards/mt/mt40/rules.mk index 05b8900231..b50ebe5888 100644 --- a/keyboards/mt/mt40/rules.mk +++ b/keyboards/mt/mt40/rules.mk @@ -10,6 +10,5 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -WS2812_DRIVER = i2c LAYOUTS_HAS_RGB = no diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h index d989525a1b..afcb90c5d2 100644 --- a/keyboards/mt/mt64rgb/config.h +++ b/keyboards/mt/mt64rgb/config.h @@ -15,23 +15,6 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D7, D6, D5, D3, D2 } -#define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6,F5, F4, F1, F0, B1, B2, B3, B7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS @@ -97,8 +80,6 @@ #endif -#define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -106,15 +87,14 @@ #define RGBLIGHT_EFFECT_KNIGHT #define RGBLIGHT_EFFECT_CHRISTMAS #define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING +// #define RGBLIGHT_EFFECT_RGB_TEST +// #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 18 #define RGBLIGHT_HUE_STEP 5 #define RGBLIGHT_SAT_STEP 5 #define RGBLIGHT_VAL_STEP 5 #define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mt/mt64rgb/info.json b/keyboards/mt/mt64rgb/info.json index 20acbceedb..58ded7742c 100644 --- a/keyboards/mt/mt64rgb/info.json +++ b/keyboards/mt/mt64rgb/info.json @@ -1,19 +1,99 @@ { - "keyboard_name": "MT64RGB", + "keyboard_name": "MT64RGB", "manufacturer": "MT", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4D54", "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, + "matrix_pins": { + "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"], + "rows": ["D7", "D6", "D5", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["64_ansi"], "layouts": { "LAYOUT_64_ansi": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"label":"Shift", "x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3}, + {"matrix": [3, 12], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4} + ] } } } diff --git a/keyboards/mt/mt64rgb/keymaps/via/keymap.c b/keyboards/mt/mt64rgb/keymaps/via/keymap.c index 6db46423e7..df4884a3a3 100644 --- a/keyboards/mt/mt64rgb/keymaps/via/keymap.c +++ b/keyboards/mt/mt64rgb/keymaps/via/keymap.c @@ -27,22 +27,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] =LAYOUT_64_ansi( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, - KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_UP, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,RGB_VAI, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, RGB_MOD, RGB_HUI, RGB_VAD, RGB_HUD), - [2] = LAYOUT_64_ansi( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - [3] = LAYOUT_64_ansi( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DOWN, BL_TOGG, BL_UP, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_TOGG, BL_UP, BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, RGB_MOD, RGB_HUI, RGB_VAD, RGB_HUD) }; bool rgb_matrix_indicators_user(void) { diff --git a/keyboards/mt/mt64rgb/mt64rgb.c b/keyboards/mt/mt64rgb/mt64rgb.c index c87e0d3610..9fb25fb168 100644 --- a/keyboards/mt/mt64rgb/mt64rgb.c +++ b/keyboards/mt/mt64rgb/mt64rgb.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "mt64rgb.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/mt/mt64rgb/mt64rgb.h b/keyboards/mt/mt64rgb/mt64rgb.h deleted file mode 100644 index dac98dfeb1..0000000000 --- a/keyboards/mt/mt64rgb/mt64rgb.h +++ /dev/null @@ -1,33 +0,0 @@ - /* Copyright 2020 MT - * - * 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_64_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, K0B, K0C, K0D, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \ - k40, k41, k42, k45, k48, k4A, k4B, k4C, k4D \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, K0B, K0C, K0D}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, KC_NO}, \ - {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D}, \ - {k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO,KC_NO, k48, k4A, k4B, k4C, k4D} \ -} diff --git a/keyboards/mt/mt64rgb/rules.mk b/keyboards/mt/mt64rgb/rules.mk index 56bc9f5752..f72e92e8a8 100644 --- a/keyboards/mt/mt64rgb/rules.mk +++ b/keyboards/mt/mt64rgb/rules.mk @@ -10,7 +10,6 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3733 AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mt/mt84/config.h b/keyboards/mt/mt84/config.h index 0eba561a04..1a2d49d734 100644 --- a/keyboards/mt/mt84/config.h +++ b/keyboards/mt/mt84/config.h @@ -15,23 +15,6 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D7, D6, D5, D3, D2, D4 } -#define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6,F5, F4, F1, F0, B1, B2, B3, B7, E6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS @@ -100,8 +83,6 @@ #endif -#define RGB_DI_PIN B0 -#ifdef RGB_DI_PIN # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RAINBOW_SWIRL # define RGBLIGHT_EFFECT_BREATHING @@ -110,7 +91,6 @@ # define RGBLIGHT_SAT_STEP 8 # define RGBLIGHT_VAL_STEP 8 # define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/mt/mt84/info.json b/keyboards/mt/mt84/info.json index ad101223aa..e7a7507d7e 100644 --- a/keyboards/mt/mt84/info.json +++ b/keyboards/mt/mt84/info.json @@ -1,19 +1,120 @@ { - "keyboard_name": "MT84", + "keyboard_name": "MT84", "manufacturer": "MT", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x4D54", "pid": "0x0002", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, + "rgb_matrix": { + "driver": "IS31FL3737" + }, + "matrix_pins": { + "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7", "E6"], + "rows": ["D7", "D6", "D5", "D3", "D2", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["75_ansi"], "layouts": { "LAYOUT_75_ansi": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Delete", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Fn", "x":11, "y":5}, {"label":"Ctrl", "x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [4, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4}, + {"matrix": [4, 2], "x": 3.25, "y": 4}, + {"matrix": [4, 3], "x": 4.25, "y": 4}, + {"matrix": [4, 4], "x": 5.25, "y": 4}, + {"matrix": [4, 5], "x": 6.25, "y": 4}, + {"matrix": [4, 6], "x": 7.25, "y": 4}, + {"matrix": [4, 7], "x": 8.25, "y": 4}, + {"matrix": [4, 8], "x": 9.25, "y": 4}, + {"matrix": [4, 9], "x": 10.25, "y": 4}, + {"matrix": [4, 10], "x": 11.25, "y": 4}, + {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 12], "x": 14, "y": 4}, + {"matrix": [4, 13], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5}, + {"matrix": [5, 10], "x": 11, "y": 5}, + {"matrix": [5, 11], "x": 12, "y": 5}, + {"matrix": [5, 12], "x": 13, "y": 5}, + {"matrix": [5, 13], "x": 14, "y": 5}, + {"matrix": [5, 14], "x": 15, "y": 5} + ] } } } diff --git a/keyboards/mt/mt84/mt84.c b/keyboards/mt/mt84/mt84.c index 049878419f..fcbf65cf46 100644 --- a/keyboards/mt/mt84/mt84.c +++ b/keyboards/mt/mt84/mt84.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "mt84.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/mt/mt84/mt84.h b/keyboards/mt/mt84/mt84.h deleted file mode 100644 index d3de007c94..0000000000 --- a/keyboards/mt/mt84/mt84.h +++ /dev/null @@ -1,35 +0,0 @@ - /* Copyright 2020 MaiKong<704340378@qq.com> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#pragma once - -#include "quantum.h" - -#define LAYOUT_75_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k4E, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,\ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E,\ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, \ - k50, k51, k52, k55, k59, k5A, k5B, k5C, k5D, k5E \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E}, \ - {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, KC_NO, k3E}, \ - {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E}, \ - {k50, k51, k52, KC_NO,KC_NO, k55, KC_NO,KC_NO,KC_NO, k59, k5A, k5B, k5C, k5D, k5E} \ -} diff --git a/keyboards/mt/mt84/rules.mk b/keyboards/mt/mt84/rules.mk index fc03a2e534..03f1dd8986 100644 --- a/keyboards/mt/mt84/rules.mk +++ b/keyboards/mt/mt84/rules.mk @@ -9,7 +9,6 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGB_MATRIX_ENABLE = yes # Use RGB Matrix -RGB_MATRIX_DRIVER = IS31FL3737 RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h index 8a5dbe68f8..eff34dc521 100644 --- a/keyboards/mt/mt980/config.h +++ b/keyboards/mt/mt980/config.h @@ -1,21 +1,11 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -30,5 +20,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_LIMIT_VAL 185 -#endif diff --git a/keyboards/mt/mt980/info.json b/keyboards/mt/mt980/info.json index 59afd26650..809474914f 100644 --- a/keyboards/mt/mt980/info.json +++ b/keyboards/mt/mt980/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6" }, @@ -17,6 +22,12 @@ "scroll_lock": "B5", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, + "rgblight": { + "max_brightness": 185 + }, "bootmagic": { "matrix": [5, 0] }, @@ -25,109 +36,125 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K50", "x":0, "y":0}, - {"label":"K52", "x":1.25, "y":0}, - {"label":"K53", "x":2.25, "y":0}, - {"label":"K54", "x":3.25, "y":0}, - {"label":"K55", "x":4.25, "y":0}, - {"label":"K57", "x":5.5, "y":0}, - {"label":"K58", "x":6.5, "y":0}, - {"label":"KB8", "x":7.5, "y":0}, - {"label":"KB7", "x":8.5, "y":0}, - {"label":"KB5", "x":9.75, "y":0}, - {"label":"KB4", "x":10.75, "y":0}, - {"label":"KB3", "x":11.75, "y":0}, - {"label":"KB6", "x":12.75, "y":0}, - {"label":"K51", "x":14, "y":0}, - {"label":"KB2", "x":15.5, "y":0}, - {"label":"KB1", "x":16.5, "y":0}, - {"label":"KB0", "x":17.5, "y":0}, - {"label":"K63", "x":18.5, "y":0}, - {"label":"K40", "x":0, "y":1.5}, - {"label":"K41", "x":1, "y":1.5}, - {"label":"K42", "x":2, "y":1.5}, - {"label":"K43", "x":3, "y":1.5}, - {"label":"K44", "x":4, "y":1.5}, - {"label":"K45", "x":5, "y":1.5}, - {"label":"K46", "x":6, "y":1.5}, - {"label":"K47", "x":7, "y":1.5}, - {"label":"K48", "x":8, "y":1.5}, - {"label":"KA8", "x":9, "y":1.5}, - {"label":"KA7", "x":10, "y":1.5}, - {"label":"KA5", "x":11, "y":1.5}, - {"label":"KA4", "x":12, "y":1.5}, - {"label":"KA3", "x":13, "y":1.5}, - {"label":"KA6", "x":14, "y":1.5}, - {"label":"KA2", "x":15.5, "y":1.5}, - {"label":"KA1", "x":16.5, "y":1.5}, - {"label":"KA0", "x":17.5, "y":1.5}, - {"label":"K64", "x":18.5, "y":1.5}, - {"label":"K30", "x":0, "y":2.5, "w":1.5}, - {"label":"K31", "x":1.5, "y":2.5}, - {"label":"K32", "x":2.5, "y":2.5}, - {"label":"K33", "x":3.5, "y":2.5}, - {"label":"K34", "x":4.5, "y":2.5}, - {"label":"K35", "x":5.5, "y":2.5}, - {"label":"K36", "x":6.5, "y":2.5}, - {"label":"K37", "x":7.5, "y":2.5}, - {"label":"K38", "x":8.5, "y":2.5}, - {"label":"K98", "x":9.5, "y":2.5}, - {"label":"K97", "x":10.5, "y":2.5}, - {"label":"K95", "x":11.5, "y":2.5}, - {"label":"K94", "x":12.5, "y":2.5}, - {"label":"K84", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K96", "x":15.5, "y":2.5}, - {"label":"K92", "x":16.5, "y":2.5}, - {"label":"K91", "x":17.5, "y":2.5}, - {"label":"K90", "x":18.5, "y":2.5}, - {"label":"K20", "x":0, "y":3.5, "w":1.75}, - {"label":"K21", "x":1.75, "y":3.5}, - {"label":"K22", "x":2.75, "y":3.5}, - {"label":"K23", "x":3.75, "y":3.5}, - {"label":"K24", "x":4.75, "y":3.5}, - {"label":"K25", "x":5.75, "y":3.5}, - {"label":"K26", "x":6.75, "y":3.5}, - {"label":"K27", "x":7.75, "y":3.5}, - {"label":"K28", "x":8.75, "y":3.5}, - {"label":"K88", "x":9.75, "y":3.5}, - {"label":"K87", "x":10.75, "y":3.5}, - {"label":"K85", "x":11.75, "y":3.5}, - {"label":"K93", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K86", "x":15.5, "y":3.5}, - {"label":"K82", "x":16.5, "y":3.5}, - {"label":"K81", "x":17.5, "y":3.5}, - {"label":"K80", "x":18.5, "y":3.5}, - {"label":"K10", "x":0, "y":4.5, "w":1.25}, - {"label":"K11", "x":1.25, "y":4.5}, - {"label":"K12", "x":2.25, "y":4.5}, - {"label":"K13", "x":3.25, "y":4.5}, - {"label":"K14", "x":4.25, "y":4.5}, - {"label":"K15", "x":5.25, "y":4.5}, - {"label":"K16", "x":6.25, "y":4.5}, - {"label":"K17", "x":7.25, "y":4.5}, - {"label":"K18", "x":8.25, "y":4.5}, - {"label":"K78", "x":9.25, "y":4.5}, - {"label":"K77", "x":10.25, "y":4.5}, - {"label":"K75", "x":11.25, "y":4.5}, - {"label":"K74", "x":12.25, "y":4.5, "w":1.75}, - {"label":"K73", "x":14.25, "y":4.75}, - {"label":"K76", "x":15.5, "y":4.5}, - {"label":"K72", "x":16.5, "y":4.5}, - {"label":"K71", "x":17.5, "y":4.5}, - {"label":"K70", "x":18.5, "y":4.5}, - {"label":"K00", "x":0, "y":5.5, "w":1.25}, - {"label":"K01", "x":1.25, "y":5.5}, - {"label":"K02", "x":2.25, "y":5.5, "w":1.25}, - {"label":"K06", "x":3.5, "y":5.5, "w":6.25}, - {"label":"K08", "x":9.75, "y":5.5}, - {"label":"K07", "x":10.75, "y":5.5}, - {"label":"K05", "x":11.75, "y":5.5, "w":1.25}, - {"label":"K04", "x":13.25, "y":5.75}, - {"label":"K03", "x":14.25, "y":5.75}, - {"label":"K66", "x":15.25, "y":5.75}, - {"label":"K62", "x":16.5, "y":5.5}, - {"label":"K61", "x":17.5, "y":5.5}, - {"label":"K60", "x":18.5, "y":5.5} + {"matrix": [5, 0], "x": 0, "y": 0}, + + {"matrix": [5, 2], "x": 1.25, "y": 0}, + {"matrix": [5, 3], "x": 2.25, "y": 0}, + {"matrix": [5, 4], "x": 3.25, "y": 0}, + {"matrix": [5, 5], "x": 4.25, "y": 0}, + + {"matrix": [5, 7], "x": 5.5, "y": 0}, + {"matrix": [5, 8], "x": 6.5, "y": 0}, + {"matrix": [11, 8], "x": 7.5, "y": 0}, + {"matrix": [11, 7], "x": 8.5, "y": 0}, + + {"matrix": [11, 5], "x": 9.75, "y": 0}, + {"matrix": [11, 4], "x": 10.75, "y": 0}, + {"matrix": [11, 3], "x": 11.75, "y": 0}, + {"matrix": [11, 6], "x": 12.75, "y": 0}, + + {"matrix": [5, 1], "x": 14, "y": 0}, + + {"matrix": [11, 2], "x": 15.5, "y": 0}, + {"matrix": [11, 1], "x": 16.5, "y": 0}, + {"matrix": [11, 0], "x": 17.5, "y": 0}, + {"matrix": [6, 3], "x": 18.5, "y": 0}, + + {"matrix": [4, 0], "x": 0, "y": 1.5}, + {"matrix": [4, 1], "x": 1, "y": 1.5}, + {"matrix": [4, 2], "x": 2, "y": 1.5}, + {"matrix": [4, 3], "x": 3, "y": 1.5}, + {"matrix": [4, 4], "x": 4, "y": 1.5}, + {"matrix": [4, 5], "x": 5, "y": 1.5}, + {"matrix": [4, 6], "x": 6, "y": 1.5}, + {"matrix": [4, 7], "x": 7, "y": 1.5}, + {"matrix": [4, 8], "x": 8, "y": 1.5}, + {"matrix": [10, 8], "x": 9, "y": 1.5}, + {"matrix": [10, 7], "x": 10, "y": 1.5}, + {"matrix": [10, 5], "x": 11, "y": 1.5}, + {"matrix": [10, 4], "x": 12, "y": 1.5}, + {"matrix": [10, 3], "x": 13, "y": 1.5}, + {"matrix": [10, 6], "x": 14, "y": 1.5}, + + {"matrix": [10, 2], "x": 15.5, "y": 1.5}, + {"matrix": [10, 1], "x": 16.5, "y": 1.5}, + {"matrix": [10, 0], "x": 17.5, "y": 1.5}, + {"matrix": [6, 4], "x": 18.5, "y": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 2.5}, + {"matrix": [3, 2], "x": 2.5, "y": 2.5}, + {"matrix": [3, 3], "x": 3.5, "y": 2.5}, + {"matrix": [3, 4], "x": 4.5, "y": 2.5}, + {"matrix": [3, 5], "x": 5.5, "y": 2.5}, + {"matrix": [3, 6], "x": 6.5, "y": 2.5}, + {"matrix": [3, 7], "x": 7.5, "y": 2.5}, + {"matrix": [3, 8], "x": 8.5, "y": 2.5}, + {"matrix": [9, 8], "x": 9.5, "y": 2.5}, + {"matrix": [9, 7], "x": 10.5, "y": 2.5}, + {"matrix": [9, 5], "x": 11.5, "y": 2.5}, + {"matrix": [9, 4], "x": 12.5, "y": 2.5}, + {"matrix": [8, 4], "x": 13.5, "y": 2.5, "w": 1.5}, + {"matrix": [9, 6], "x": 15.5, "y": 2.5}, + {"matrix": [9, 2], "x": 16.5, "y": 2.5}, + {"matrix": [9, 1], "x": 17.5, "y": 2.5}, + {"matrix": [9, 0], "x": 18.5, "y": 2.5}, + + {"matrix": [2, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 3.5}, + {"matrix": [2, 2], "x": 2.75, "y": 3.5}, + {"matrix": [2, 3], "x": 3.75, "y": 3.5}, + {"matrix": [2, 4], "x": 4.75, "y": 3.5}, + {"matrix": [2, 5], "x": 5.75, "y": 3.5}, + {"matrix": [2, 6], "x": 6.75, "y": 3.5}, + {"matrix": [2, 7], "x": 7.75, "y": 3.5}, + {"matrix": [2, 8], "x": 8.75, "y": 3.5}, + {"matrix": [8, 8], "x": 9.75, "y": 3.5}, + {"matrix": [8, 7], "x": 10.75, "y": 3.5}, + {"matrix": [8, 5], "x": 11.75, "y": 3.5}, + {"matrix": [9, 3], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [8, 6], "x": 15.5, "y": 3.5}, + {"matrix": [8, 2], "x": 16.5, "y": 3.5}, + {"matrix": [8, 1], "x": 17.5, "y": 3.5}, + {"matrix": [8, 0], "x": 18.5, "y": 3.5}, + + {"matrix": [1, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 4.5}, + {"matrix": [1, 2], "x": 2.25, "y": 4.5}, + {"matrix": [1, 3], "x": 3.25, "y": 4.5}, + {"matrix": [1, 4], "x": 4.25, "y": 4.5}, + {"matrix": [1, 5], "x": 5.25, "y": 4.5}, + {"matrix": [1, 6], "x": 6.25, "y": 4.5}, + {"matrix": [1, 7], "x": 7.25, "y": 4.5}, + {"matrix": [1, 8], "x": 8.25, "y": 4.5}, + {"matrix": [7, 8], "x": 9.25, "y": 4.5}, + {"matrix": [7, 7], "x": 10.25, "y": 4.5}, + {"matrix": [7, 5], "x": 11.25, "y": 4.5}, + {"matrix": [7, 4], "x": 12.25, "y": 4.5, "w": 1.75}, + + {"matrix": [7, 3], "x": 14.25, "y": 4.75}, + + {"matrix": [7, 6], "x": 15.5, "y": 4.5}, + {"matrix": [7, 2], "x": 16.5, "y": 4.5}, + {"matrix": [7, 1], "x": 17.5, "y": 4.5}, + {"matrix": [7, 0], "x": 18.5, "y": 4.5}, + + {"matrix": [0, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 5.5}, + {"matrix": [0, 2], "x": 2.25, "y": 5.5, "w": 1.25}, + {"matrix": [0, 6], "x": 3.5, "y": 5.5, "w": 6.25}, + {"matrix": [0, 8], "x": 9.75, "y": 5.5}, + {"matrix": [0, 7], "x": 10.75, "y": 5.5}, + {"matrix": [0, 5], "x": 11.75, "y": 5.5, "w": 1.25}, + + {"matrix": [0, 4], "x": 13.25, "y": 5.75}, + {"matrix": [0, 3], "x": 14.25, "y": 5.75}, + {"matrix": [6, 6], "x": 15.25, "y": 5.75}, + + {"matrix": [6, 2], "x": 16.5, "y": 5.5}, + {"matrix": [6, 1], "x": 17.5, "y": 5.5}, + {"matrix": [6, 0], "x": 18.5, "y": 5.5} ] } } diff --git a/keyboards/mt/mt980/keymaps/walker/keymap.c b/keyboards/mt/mt980/keymaps/walker/keymap.c index 4e284ec913..e98a1d71de 100644 --- a/keyboards/mt/mt980/keymaps/walker/keymap.c +++ b/keyboards/mt/mt980/keymaps/walker/keymap.c @@ -1,4 +1,4 @@ -#include "mt980.h" +#include QMK_KEYBOARD_H bool numlock_on = true; diff --git a/keyboards/mt/mt980/mt980.c b/keyboards/mt/mt980/mt980.c deleted file mode 100644 index 69f7cc491a..0000000000 --- a/keyboards/mt/mt980/mt980.c +++ /dev/null @@ -1 +0,0 @@ -#include "mt980.h" diff --git a/keyboards/mt/mt980/mt980.h b/keyboards/mt/mt980/mt980.h deleted file mode 100644 index d9804b3392..0000000000 --- a/keyboards/mt/mt980/mt980.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K050, K052, K053, K054, K055, K057, K058, K118, K117, K115, K114, K113, K116, K051, K112, K111, K110, K063, \ - K040, K041, K042, K043, K044, K045, K046, K047, K048, K108, K107, K105, K104, K103, K106, K102, K101, K100, K064, \ - K030, K031, K032, K033, K034, K035, K036, K037, K038, K098, K097, K095, K094, K084, K096, K092, K091, K090, \ - K020, K021, K022, K023, K024, K025, K026, K027, K028, K088, K087, K085, K093, K086, K082, K081, K080, \ - K010, K011, K012, K013, K014, K015, K016, K017, K018, K078, K077, K075, K074, K073, K076, K072, K071, K070, \ - K000, K001, K002, K006, K008, K007, K005, K004, K003, K066, K062, K061, K060 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008 }, \ - { K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \ - { K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \ - { K030, K031, K032, K033, K034, K035, K036, K037, K038 }, \ - { K040, K041, K042, K043, K044, K045, K046, K047, K048 }, \ - { K050, K051, K052, K053, K054, K055, KC_NO, K057, K058 }, \ - { K060, K061, K062, K063, K064, KC_NO, K066, KC_NO, KC_NO}, \ - { K070, K071, K072, K073, K074, K075, K076, K077, K078 }, \ - { K080, K081, K082, KC_NO, K084, K085, K086, K087, K088 }, \ - { K090, K091, K092, K093, K094, K095, K096, K097, K098 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108 }, \ - { K110, K111, K112, K113, K114, K115, K116, K117, K118 } \ -} diff --git a/keyboards/mt/ncr80/hotswap/config.h b/keyboards/mt/ncr80/hotswap/config.h index 65ca63af7e..59b05a0f9b 100644 --- a/keyboards/mt/ncr80/hotswap/config.h +++ b/keyboards/mt/ncr80/hotswap/config.h @@ -17,23 +17,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - */ -#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -#define DIODE_DIRECTION ROW2COL - -#define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -48,5 +31,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#define RGBLIGHT_LIMIT_VAL 180 -#endif diff --git a/keyboards/mt/ncr80/hotswap/info.json b/keyboards/mt/ncr80/hotswap/info.json index ed288b9e8d..f02a2f7405 100644 --- a/keyboards/mt/ncr80/hotswap/info.json +++ b/keyboards/mt/ncr80/hotswap/info.json @@ -8,110 +8,121 @@ "pid": "0x2002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "C6", "num_lock": "B5", "scroll_lock": "C7", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, + "rgblight": { + "max_brightness": 180 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - { "x": 0, "y": 0, "matrix": [0, 0] }, + {"x": 0, "y": 0, "matrix": [0, 0]}, - { "x": 2, "y": 0, "matrix": [0, 2] }, - { "x": 3, "y": 0, "matrix": [0, 3] }, - { "x": 4, "y": 0, "matrix": [0, 4] }, - { "x": 5, "y": 0, "matrix": [0, 5] }, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]}, + {"x": 4, "y": 0, "matrix": [0, 4]}, + {"x": 5, "y": 0, "matrix": [0, 5]}, - { "x": 6.5, "y": 0, "matrix": [0, 6] }, - { "x": 7.5, "y": 0, "matrix": [0, 7] }, - { "x": 8.5, "y": 0, "matrix": [0, 8] }, - { "x": 9.5, "y": 0, "matrix": [6, 8] }, + {"x": 6.5, "y": 0, "matrix": [0, 6]}, + {"x": 7.5, "y": 0, "matrix": [0, 7]}, + {"x": 8.5, "y": 0, "matrix": [0, 8]}, + {"x": 9.5, "y": 0, "matrix": [6, 8]}, - { "x": 11, "y": 0, "matrix": [6, 7] }, - { "x": 12, "y": 0, "matrix": [6, 5] }, - { "x": 13, "y": 0, "matrix": [6, 4] }, - { "x": 14, "y": 0, "matrix": [6, 3] }, + {"x": 11, "y": 0, "matrix": [6, 7]}, + {"x": 12, "y": 0, "matrix": [6, 5]}, + {"x": 13, "y": 0, "matrix": [6, 4]}, + {"x": 14, "y": 0, "matrix": [6, 3]}, - { "x": 0, "y": 1.5, "matrix": [1, 0] }, - { "x": 1, "y": 1.5, "matrix": [1, 1] }, - { "x": 2, "y": 1.5, "matrix": [1, 2] }, - { "x": 3, "y": 1.5, "matrix": [1, 3] }, - { "x": 4, "y": 1.5, "matrix": [1, 4] }, - { "x": 5, "y": 1.5, "matrix": [1, 5] }, - { "x": 6, "y": 1.5, "matrix": [1, 6] }, - { "x": 7, "y": 1.5, "matrix": [1, 7] }, - { "x": 8, "y": 1.5, "matrix": [1, 8] }, - { "x": 9, "y": 1.5, "matrix": [7, 8] }, - { "x": 10, "y": 1.5, "matrix": [7, 0] }, - { "x": 11, "y": 1.5, "matrix": [7, 7] }, - { "x": 12, "y": 1.5, "matrix": [7, 5] }, - { "x": 13, "y": 1.5, "w": 2, "matrix": [7, 3] }, + {"x": 0, "y": 1.5, "matrix": [1, 0]}, + {"x": 1, "y": 1.5, "matrix": [1, 1]}, + {"x": 2, "y": 1.5, "matrix": [1, 2]}, + {"x": 3, "y": 1.5, "matrix": [1, 3]}, + {"x": 4, "y": 1.5, "matrix": [1, 4]}, + {"x": 5, "y": 1.5, "matrix": [1, 5]}, + {"x": 6, "y": 1.5, "matrix": [1, 6]}, + {"x": 7, "y": 1.5, "matrix": [1, 7]}, + {"x": 8, "y": 1.5, "matrix": [1, 8]}, + {"x": 9, "y": 1.5, "matrix": [7, 8]}, + {"x": 10, "y": 1.5, "matrix": [7, 0]}, + {"x": 11, "y": 1.5, "matrix": [7, 7]}, + {"x": 12, "y": 1.5, "matrix": [7, 5]}, + {"x": 13, "y": 1.5, "w": 2, "matrix": [7, 3]}, - { "x": 15.25, "y": 1.5, "matrix": [7, 6] }, - { "x": 16.25, "y": 1.5, "matrix": [7, 2] }, - { "x": 17.25, "y": 1.5, "matrix": [7, 1] }, + {"x": 15.25, "y": 1.5, "matrix": [7, 6]}, + {"x": 16.25, "y": 1.5, "matrix": [7, 2]}, + {"x": 17.25, "y": 1.5, "matrix": [7, 1]}, - { "x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0] }, - { "x": 1.5, "y": 2.5, "matrix": [2, 1] }, - { "x": 2.5, "y": 2.5, "matrix": [2, 2] }, - { "x": 3.5, "y": 2.5, "matrix": [2, 3] }, - { "x": 4.5, "y": 2.5, "matrix": [2, 4] }, - { "x": 5.5, "y": 2.5, "matrix": [2, 5] }, - { "x": 6.5, "y": 2.5, "matrix": [2, 6] }, - { "x": 7.5, "y": 2.5, "matrix": [2, 7] }, - { "x": 8.5, "y": 2.5, "matrix": [2, 8] }, - { "x": 9.5, "y": 2.5, "matrix": [8, 8] }, - { "x": 10.5, "y": 2.5, "matrix": [8, 7] }, - { "x": 11.5, "y": 2.5, "matrix": [8, 5] }, - { "x": 12.5, "y": 2.5, "matrix": [8, 4] }, - { "x": 13.5, "y": 2.5, "w": 1.5, "matrix": [8, 3] }, + {"x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0]}, + {"x": 1.5, "y": 2.5, "matrix": [2, 1]}, + {"x": 2.5, "y": 2.5, "matrix": [2, 2]}, + {"x": 3.5, "y": 2.5, "matrix": [2, 3]}, + {"x": 4.5, "y": 2.5, "matrix": [2, 4]}, + {"x": 5.5, "y": 2.5, "matrix": [2, 5]}, + {"x": 6.5, "y": 2.5, "matrix": [2, 6]}, + {"x": 7.5, "y": 2.5, "matrix": [2, 7]}, + {"x": 8.5, "y": 2.5, "matrix": [2, 8]}, + {"x": 9.5, "y": 2.5, "matrix": [8, 8]}, + {"x": 10.5, "y": 2.5, "matrix": [8, 7]}, + {"x": 11.5, "y": 2.5, "matrix": [8, 5]}, + {"x": 12.5, "y": 2.5, "matrix": [8, 4]}, + {"x": 13.5, "y": 2.5, "w": 1.5, "matrix": [8, 3]}, - { "x": 15.25, "y": 2.5, "matrix": [8, 6] }, - { "x": 16.25, "y": 2.5, "matrix": [8, 2] }, - { "x": 17.25, "y": 2.5, "matrix": [8, 1] }, + {"x": 15.25, "y": 2.5, "matrix": [8, 6]}, + {"x": 16.25, "y": 2.5, "matrix": [8, 2]}, + {"x": 17.25, "y": 2.5, "matrix": [8, 1]}, - { "x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0] }, - { "x": 1.75, "y": 3.5, "matrix": [3, 1] }, - { "x": 2.75, "y": 3.5, "matrix": [3, 2] }, - { "x": 3.75, "y": 3.5, "matrix": [3, 3] }, - { "x": 4.75, "y": 3.5, "matrix": [3, 4] }, - { "x": 5.75, "y": 3.5, "matrix": [3, 5] }, - { "x": 6.75, "y": 3.5, "matrix": [3, 6] }, - { "x": 7.75, "y": 3.5, "matrix": [3, 7] }, - { "x": 8.75, "y": 3.5, "matrix": [3, 8] }, - { "x": 9.75, "y": 3.5, "matrix": [9, 8] }, - { "x": 10.75, "y": 3.5, "matrix": [9, 7] }, - { "x": 11.75, "y": 3.5, "matrix": [9, 5] }, - { "x": 12.75, "y": 3.5, "w": 2.25, "matrix": [9, 3] }, + {"x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0]}, + {"x": 1.75, "y": 3.5, "matrix": [3, 1]}, + {"x": 2.75, "y": 3.5, "matrix": [3, 2]}, + {"x": 3.75, "y": 3.5, "matrix": [3, 3]}, + {"x": 4.75, "y": 3.5, "matrix": [3, 4]}, + {"x": 5.75, "y": 3.5, "matrix": [3, 5]}, + {"x": 6.75, "y": 3.5, "matrix": [3, 6]}, + {"x": 7.75, "y": 3.5, "matrix": [3, 7]}, + {"x": 8.75, "y": 3.5, "matrix": [3, 8]}, + {"x": 9.75, "y": 3.5, "matrix": [9, 8]}, + {"x": 10.75, "y": 3.5, "matrix": [9, 7]}, + {"x": 11.75, "y": 3.5, "matrix": [9, 5]}, + {"x": 12.75, "y": 3.5, "w": 2.25, "matrix": [9, 3]}, - { "x": 0, "y": 4.5, "w": 2.25, "matrix": [4, 0] }, - { "x": 2.25, "y": 4.5, "matrix": [4, 2] }, - { "x": 3.25, "y": 4.5, "matrix": [4, 3] }, - { "x": 4.25, "y": 4.5, "matrix": [4, 4] }, - { "x": 5.25, "y": 4.5, "matrix": [4, 5] }, - { "x": 6.25, "y": 4.5, "matrix": [4, 6] }, - { "x": 7.25, "y": 4.5, "matrix": [4, 7] }, - { "x": 8.25, "y": 4.5, "matrix": [4, 8] }, - { "x": 9.25, "y": 4.5, "matrix": [10, 8] }, - { "x": 10.25, "y": 4.5, "matrix": [10, 7] }, - { "x": 11.25, "y": 4.5, "matrix": [10, 5] }, - { "x": 12.25, "y": 4.5, "w": 2.75, "matrix": [10, 4] }, + {"x": 0, "y": 4.5, "w": 2.25, "matrix": [4, 0]}, + {"x": 2.25, "y": 4.5, "matrix": [4, 2]}, + {"x": 3.25, "y": 4.5, "matrix": [4, 3]}, + {"x": 4.25, "y": 4.5, "matrix": [4, 4]}, + {"x": 5.25, "y": 4.5, "matrix": [4, 5]}, + {"x": 6.25, "y": 4.5, "matrix": [4, 6]}, + {"x": 7.25, "y": 4.5, "matrix": [4, 7]}, + {"x": 8.25, "y": 4.5, "matrix": [4, 8]}, + {"x": 9.25, "y": 4.5, "matrix": [10, 8]}, + {"x": 10.25, "y": 4.5, "matrix": [10, 7]}, + {"x": 11.25, "y": 4.5, "matrix": [10, 5]}, + {"x": 12.25, "y": 4.5, "w": 2.75, "matrix": [10, 4]}, - { "x": 16.25, "y": 4.5, "matrix": [9, 2] }, + {"x": 16.25, "y": 4.5, "matrix": [9, 2]}, - { "x": 0, "y": 5.5, "w": 1.5, "matrix": [5, 0] }, - { "x": 2.5, "y": 5.5, "w": 1.5, "matrix": [5, 2] }, - { "x": 4, "y": 5.5, "w": 7, "matrix": [5, 6] }, - { "x": 11, "y": 5.5, "w": 1.5, "matrix": [5, 7] }, - { "x": 13.5, "y": 5.5, "w": 1.5, "matrix": [5, 3] }, + {"x": 0, "y": 5.5, "w": 1.5, "matrix": [5, 0]}, + {"x": 2.5, "y": 5.5, "w": 1.5, "matrix": [5, 2]}, + {"x": 4, "y": 5.5, "w": 7, "matrix": [5, 6]}, + {"x": 11, "y": 5.5, "w": 1.5, "matrix": [5, 7]}, + {"x": 13.5, "y": 5.5, "w": 1.5, "matrix": [5, 3]}, - { "x": 15.25, "y": 5.5, "matrix": [10, 6] }, - { "x": 16.25, "y": 5.5, "matrix": [10, 2] }, - { "x": 17.25, "y": 5.5, "matrix": [10, 1] } + {"x": 15.25, "y": 5.5, "matrix": [10, 6]}, + {"x": 16.25, "y": 5.5, "matrix": [10, 2]}, + {"x": 17.25, "y": 5.5, "matrix": [10, 1]} ] } } diff --git a/keyboards/mt/ncr80/solder/config.h b/keyboards/mt/ncr80/solder/config.h deleted file mode 100644 index c6828a9323..0000000000 --- a/keyboards/mt/ncr80/solder/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2022 Jordan Duabe - * Copyright 2022 peepeetee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - */ -#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/mt/ncr80/solder/info.json b/keyboards/mt/ncr80/solder/info.json index 2005f45d48..ead9ed409d 100644 --- a/keyboards/mt/ncr80/solder/info.json +++ b/keyboards/mt/ncr80/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x2001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 5 @@ -23,317 +28,317 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "x": 0, "y": 0, "matrix": [0, 0] }, - - { "x": 2, "y": 0, "matrix": [0, 2] }, - { "x": 3, "y": 0, "matrix": [0, 3] }, - { "x": 4, "y": 0, "matrix": [0, 4] }, - { "x": 5, "y": 0, "matrix": [0, 5] }, - - { "x": 6.5, "y": 0, "matrix": [0, 6] }, - { "x": 7.5, "y": 0, "matrix": [0, 7] }, - { "x": 8.5, "y": 0, "matrix": [0, 8] }, - { "x": 9.5, "y": 0, "matrix": [6, 8] }, - - { "x": 11, "y": 0, "matrix": [6, 7] }, - { "x": 12, "y": 0, "matrix": [6, 5] }, - { "x": 13, "y": 0, "matrix": [6, 4] }, - { "x": 14, "y": 0, "matrix": [6, 3] }, - - { "x": 15.25, "y": 0, "matrix": [6, 6] }, - { "x": 16.25, "y": 0, "matrix": [6, 2] }, - { "x": 17.25, "y": 0, "matrix": [6, 1] }, - - { "x": 0, "y": 1.5, "matrix": [1, 0] }, - { "x": 1, "y": 1.5, "matrix": [1, 1] }, - { "x": 2, "y": 1.5, "matrix": [1, 2] }, - { "x": 3, "y": 1.5, "matrix": [1, 3] }, - { "x": 4, "y": 1.5, "matrix": [1, 4] }, - { "x": 5, "y": 1.5, "matrix": [1, 5] }, - { "x": 6, "y": 1.5, "matrix": [1, 6] }, - { "x": 7, "y": 1.5, "matrix": [1, 7] }, - { "x": 8, "y": 1.5, "matrix": [1, 8] }, - { "x": 9, "y": 1.5, "matrix": [7, 8] }, - { "x": 10, "y": 1.5, "matrix": [7, 0] }, - { "x": 11, "y": 1.5, "matrix": [7, 7] }, - { "x": 12, "y": 1.5, "matrix": [7, 5] }, - { "x": 13, "y": 1.5, "matrix": [7, 4] }, - { "x": 14, "y": 1.5, "matrix": [7, 3] }, - - { "x": 15.25, "y": 1.5, "matrix": [7, 6] }, - { "x": 16.25, "y": 1.5, "matrix": [7, 2] }, - { "x": 17.25, "y": 1.5, "matrix": [7, 1] }, - - { "x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0] }, - { "x": 1.5, "y": 2.5, "matrix": [2, 1] }, - { "x": 2.5, "y": 2.5, "matrix": [2, 2] }, - { "x": 3.5, "y": 2.5, "matrix": [2, 3] }, - { "x": 4.5, "y": 2.5, "matrix": [2, 4] }, - { "x": 5.5, "y": 2.5, "matrix": [2, 5] }, - { "x": 6.5, "y": 2.5, "matrix": [2, 6] }, - { "x": 7.5, "y": 2.5, "matrix": [2, 7] }, - { "x": 8.5, "y": 2.5, "matrix": [2, 8] }, - { "x": 9.5, "y": 2.5, "matrix": [8, 8] }, - { "x": 10.5, "y": 2.5, "matrix": [8, 7] }, - { "x": 11.5, "y": 2.5, "matrix": [8, 5] }, - { "x": 12.5, "y": 2.5, "matrix": [8, 4] }, - { "x": 13.5, "y": 2.5, "w": 1.5, "matrix": [9, 4] }, - - { "x": 15.25, "y": 2.5, "matrix": [8, 6] }, - { "x": 16.25, "y": 2.5, "matrix": [8, 2] }, - { "x": 17.25, "y": 2.5, "matrix": [8, 1] }, - - { "x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0] }, - { "x": 1.75, "y": 3.5, "matrix": [3, 1] }, - { "x": 2.75, "y": 3.5, "matrix": [3, 2] }, - { "x": 3.75, "y": 3.5, "matrix": [3, 3] }, - { "x": 4.75, "y": 3.5, "matrix": [3, 4] }, - { "x": 5.75, "y": 3.5, "matrix": [3, 5] }, - { "x": 6.75, "y": 3.5, "matrix": [3, 6] }, - { "x": 7.75, "y": 3.5, "matrix": [3, 7] }, - { "x": 8.75, "y": 3.5, "matrix": [3, 8] }, - { "x": 9.75, "y": 3.5, "matrix": [9, 8] }, - { "x": 10.75, "y": 3.5, "matrix": [9, 7] }, - { "x": 11.75, "y": 3.5, "matrix": [9, 5] }, - { "x": 12.75, "y": 3.5, "w": 2.25, "matrix": [8, 3] }, - - { "x": 0, "y": 4.5, "w": 1.25, "matrix": [4, 0] }, - { "x": 1.25, "y": 4.5, "matrix": [4, 1] }, - { "x": 2.25, "y": 4.5, "matrix": [4, 2] }, - { "x": 3.25, "y": 4.5, "matrix": [4, 3] }, - { "x": 4.25, "y": 4.5, "matrix": [4, 4] }, - { "x": 5.25, "y": 4.5, "matrix": [4, 5] }, - { "x": 6.25, "y": 4.5, "matrix": [4, 6] }, - { "x": 7.25, "y": 4.5, "matrix": [4, 7] }, - { "x": 8.25, "y": 4.5, "matrix": [4, 8] }, - { "x": 9.25, "y": 4.5, "matrix": [10, 8] }, - { "x": 10.25, "y": 4.5, "matrix": [10, 7] }, - { "x": 11.25, "y": 4.5, "matrix": [10, 5] }, - { "x": 12.25, "y": 4.5, "w": 1.75, "matrix": [10, 4] }, - { "x": 14, "y": 4.5, "matrix": [10, 3] }, - - { "x": 16.25, "y": 4.5, "matrix": [9, 2] }, - - { "x": 0, "y": 5.5, "w": 1.25, "matrix": [5, 0] }, - { "x": 1.25, "y": 5.5, "w": 1.25, "matrix": [5, 1] }, - { "x": 2.5, "y": 5.5, "w": 1.25, "matrix": [5, 2] }, - { "x": 3.75, "y": 5.5, "w": 6.25, "matrix": [5, 6] }, - { "x": 10, "y": 5.5, "w": 1.25, "matrix": [5, 8] }, - { "x": 11.25, "y": 5.5, "w": 1.25, "matrix": [5, 7] }, - { "x": 12.5, "y": 5.5, "w": 1.25, "matrix": [5, 4] }, - { "x": 13.75, "y": 5.5, "w": 1.25, "matrix": [5, 3] }, - - { "x": 15.25, "y": 5.5, "matrix": [10, 6] }, - { "x": 16.25, "y": 5.5, "matrix": [10, 2] }, - { "x": 17.25, "y": 5.5, "matrix": [10, 1] } + {"x": 0, "y": 0, "matrix": [0, 0]}, + + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]}, + {"x": 4, "y": 0, "matrix": [0, 4]}, + {"x": 5, "y": 0, "matrix": [0, 5]}, + + {"x": 6.5, "y": 0, "matrix": [0, 6]}, + {"x": 7.5, "y": 0, "matrix": [0, 7]}, + {"x": 8.5, "y": 0, "matrix": [0, 8]}, + {"x": 9.5, "y": 0, "matrix": [6, 8]}, + + {"x": 11, "y": 0, "matrix": [6, 7]}, + {"x": 12, "y": 0, "matrix": [6, 5]}, + {"x": 13, "y": 0, "matrix": [6, 4]}, + {"x": 14, "y": 0, "matrix": [6, 3]}, + + {"x": 15.25, "y": 0, "matrix": [6, 6]}, + {"x": 16.25, "y": 0, "matrix": [6, 2]}, + {"x": 17.25, "y": 0, "matrix": [6, 1]}, + + {"x": 0, "y": 1.5, "matrix": [1, 0]}, + {"x": 1, "y": 1.5, "matrix": [1, 1]}, + {"x": 2, "y": 1.5, "matrix": [1, 2]}, + {"x": 3, "y": 1.5, "matrix": [1, 3]}, + {"x": 4, "y": 1.5, "matrix": [1, 4]}, + {"x": 5, "y": 1.5, "matrix": [1, 5]}, + {"x": 6, "y": 1.5, "matrix": [1, 6]}, + {"x": 7, "y": 1.5, "matrix": [1, 7]}, + {"x": 8, "y": 1.5, "matrix": [1, 8]}, + {"x": 9, "y": 1.5, "matrix": [7, 8]}, + {"x": 10, "y": 1.5, "matrix": [7, 0]}, + {"x": 11, "y": 1.5, "matrix": [7, 7]}, + {"x": 12, "y": 1.5, "matrix": [7, 5]}, + {"x": 13, "y": 1.5, "matrix": [7, 4]}, + {"x": 14, "y": 1.5, "matrix": [7, 3]}, + + {"x": 15.25, "y": 1.5, "matrix": [7, 6]}, + {"x": 16.25, "y": 1.5, "matrix": [7, 2]}, + {"x": 17.25, "y": 1.5, "matrix": [7, 1]}, + + {"x": 0, "y": 2.5, "w": 1.5, "matrix": [2, 0]}, + {"x": 1.5, "y": 2.5, "matrix": [2, 1]}, + {"x": 2.5, "y": 2.5, "matrix": [2, 2]}, + {"x": 3.5, "y": 2.5, "matrix": [2, 3]}, + {"x": 4.5, "y": 2.5, "matrix": [2, 4]}, + {"x": 5.5, "y": 2.5, "matrix": [2, 5]}, + {"x": 6.5, "y": 2.5, "matrix": [2, 6]}, + {"x": 7.5, "y": 2.5, "matrix": [2, 7]}, + {"x": 8.5, "y": 2.5, "matrix": [2, 8]}, + {"x": 9.5, "y": 2.5, "matrix": [8, 8]}, + {"x": 10.5, "y": 2.5, "matrix": [8, 7]}, + {"x": 11.5, "y": 2.5, "matrix": [8, 5]}, + {"x": 12.5, "y": 2.5, "matrix": [8, 4]}, + {"x": 13.5, "y": 2.5, "w": 1.5, "matrix": [9, 4]}, + + {"x": 15.25, "y": 2.5, "matrix": [8, 6]}, + {"x": 16.25, "y": 2.5, "matrix": [8, 2]}, + {"x": 17.25, "y": 2.5, "matrix": [8, 1]}, + + {"x": 0, "y": 3.5, "w": 1.75, "matrix": [3, 0]}, + {"x": 1.75, "y": 3.5, "matrix": [3, 1]}, + {"x": 2.75, "y": 3.5, "matrix": [3, 2]}, + {"x": 3.75, "y": 3.5, "matrix": [3, 3]}, + {"x": 4.75, "y": 3.5, "matrix": [3, 4]}, + {"x": 5.75, "y": 3.5, "matrix": [3, 5]}, + {"x": 6.75, "y": 3.5, "matrix": [3, 6]}, + {"x": 7.75, "y": 3.5, "matrix": [3, 7]}, + {"x": 8.75, "y": 3.5, "matrix": [3, 8]}, + {"x": 9.75, "y": 3.5, "matrix": [9, 8]}, + {"x": 10.75, "y": 3.5, "matrix": [9, 7]}, + {"x": 11.75, "y": 3.5, "matrix": [9, 5]}, + {"x": 12.75, "y": 3.5, "w": 2.25, "matrix": [8, 3]}, + + {"x": 0, "y": 4.5, "w": 1.25, "matrix": [4, 0]}, + {"x": 1.25, "y": 4.5, "matrix": [4, 1]}, + {"x": 2.25, "y": 4.5, "matrix": [4, 2]}, + {"x": 3.25, "y": 4.5, "matrix": [4, 3]}, + {"x": 4.25, "y": 4.5, "matrix": [4, 4]}, + {"x": 5.25, "y": 4.5, "matrix": [4, 5]}, + {"x": 6.25, "y": 4.5, "matrix": [4, 6]}, + {"x": 7.25, "y": 4.5, "matrix": [4, 7]}, + {"x": 8.25, "y": 4.5, "matrix": [4, 8]}, + {"x": 9.25, "y": 4.5, "matrix": [10, 8]}, + {"x": 10.25, "y": 4.5, "matrix": [10, 7]}, + {"x": 11.25, "y": 4.5, "matrix": [10, 5]}, + {"x": 12.25, "y": 4.5, "w": 1.75, "matrix": [10, 4]}, + {"x": 14, "y": 4.5, "matrix": [10, 3]}, + + {"x": 16.25, "y": 4.5, "matrix": [9, 2]}, + + {"x": 0, "y": 5.5, "w": 1.25, "matrix": [5, 0]}, + {"x": 1.25, "y": 5.5, "w": 1.25, "matrix": [5, 1]}, + {"x": 2.5, "y": 5.5, "w": 1.25, "matrix": [5, 2]}, + {"x": 3.75, "y": 5.5, "w": 6.25, "matrix": [5, 6]}, + {"x": 10, "y": 5.5, "w": 1.25, "matrix": [5, 8]}, + {"x": 11.25, "y": 5.5, "w": 1.25, "matrix": [5, 7]}, + {"x": 12.5, "y": 5.5, "w": 1.25, "matrix": [5, 4]}, + {"x": 13.75, "y": 5.5, "w": 1.25, "matrix": [5, 3]}, + + {"x": 15.25, "y": 5.5, "matrix": [10, 6]}, + {"x": 16.25, "y": 5.5, "matrix": [10, 2]}, + {"x": 17.25, "y": 5.5, "matrix": [10, 1]} ] }, "LAYOUT_tkl_ansi": { "layout": [ - { "x": 0, "y": 0, "matrix": [0, 0] }, - - { "x": 2, "y": 0, "matrix": [0, 2] }, - { "x": 3, "y": 0, "matrix": [0, 3] }, - { "x": 4, "y": 0, "matrix": [0, 4] }, - { "x": 5, "y": 0, "matrix": [0, 5] }, - - { "x": 6.5, "y": 0, "matrix": [0, 6] }, - { "x": 7.5, "y": 0, "matrix": [0, 7] }, - { "x": 8.5, "y": 0, "matrix": [0, 8] }, - { "x": 9.5, "y": 0, "matrix": [6, 8] }, - - { "x": 11, "y": 0, "matrix": [6, 7] }, - { "x": 12, "y": 0, "matrix": [6, 5] }, - { "x": 13, "y": 0, "matrix": [6, 4] }, - { "x": 14, "y": 0, "matrix": [6, 3] }, - - { "x": 15.25, "y": 0, "matrix": [6, 6] }, - { "x": 16.25, "y": 0, "matrix": [6, 2] }, - { "x": 17.25, "y": 0, "matrix": [6, 1] }, - - { "x": 0, "y": 1.25, "matrix": [1, 0] }, - { "x": 1, "y": 1.25, "matrix": [1, 1] }, - { "x": 2, "y": 1.25, "matrix": [1, 2] }, - { "x": 3, "y": 1.25, "matrix": [1, 3] }, - { "x": 4, "y": 1.25, "matrix": [1, 4] }, - { "x": 5, "y": 1.25, "matrix": [1, 5] }, - { "x": 6, "y": 1.25, "matrix": [1, 6] }, - { "x": 7, "y": 1.25, "matrix": [1, 7] }, - { "x": 8, "y": 1.25, "matrix": [1, 8] }, - { "x": 9, "y": 1.25, "matrix": [7, 8] }, - { "x": 10, "y": 1.25, "matrix": [7, 0] }, - { "x": 11, "y": 1.25, "matrix": [7, 7] }, - { "x": 12, "y": 1.25, "matrix": [7, 5] }, - { "x": 13, "y": 1.25, "w": 2, "matrix": [7, 3] }, - - { "x": 15.25, "y": 1.25, "matrix": [7, 6] }, - { "x": 16.25, "y": 1.25, "matrix": [7, 2] }, - { "x": 17.25, "y": 1.25, "matrix": [7, 1] }, - - { "x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0] }, - { "x": 1.5, "y": 2.25, "matrix": [2, 1] }, - { "x": 2.5, "y": 2.25, "matrix": [2, 2] }, - { "x": 3.5, "y": 2.25, "matrix": [2, 3] }, - { "x": 4.5, "y": 2.25, "matrix": [2, 4] }, - { "x": 5.5, "y": 2.25, "matrix": [2, 5] }, - { "x": 6.5, "y": 2.25, "matrix": [2, 6] }, - { "x": 7.5, "y": 2.25, "matrix": [2, 7] }, - { "x": 8.5, "y": 2.25, "matrix": [2, 8] }, - { "x": 9.5, "y": 2.25, "matrix": [8, 8] }, - { "x": 10.5, "y": 2.25, "matrix": [8, 7] }, - { "x": 11.5, "y": 2.25, "matrix": [8, 5] }, - { "x": 12.5, "y": 2.25, "matrix": [8, 4] }, - { "x": 13.5, "y": 2.25, "w": 1.5, "matrix": [9, 4] }, - - { "x": 15.25, "y": 2.25, "matrix": [8, 6] }, - { "x": 16.25, "y": 2.25, "matrix": [8, 2] }, - { "x": 17.25, "y": 2.25, "matrix": [8, 1] }, - - { "x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0] }, - { "x": 1.75, "y": 3.25, "matrix": [3, 1] }, - { "x": 2.75, "y": 3.25, "matrix": [3, 2] }, - { "x": 3.75, "y": 3.25, "matrix": [3, 3] }, - { "x": 4.75, "y": 3.25, "matrix": [3, 4] }, - { "x": 5.75, "y": 3.25, "matrix": [3, 5] }, - { "x": 6.75, "y": 3.25, "matrix": [3, 6] }, - { "x": 7.75, "y": 3.25, "matrix": [3, 7] }, - { "x": 8.75, "y": 3.25, "matrix": [3, 8] }, - { "x": 9.75, "y": 3.25, "matrix": [9, 8] }, - { "x": 10.75, "y": 3.25, "matrix": [9, 7] }, - { "x": 11.75, "y": 3.25, "matrix": [9, 5] }, - { "x": 12.75, "y": 3.25, "w": 2.25, "matrix": [8, 3] }, - - { "x": 0, "y": 4.25, "w": 2.25, "matrix": [4, 0] }, - { "x": 2.25, "y": 4.25, "matrix": [4, 2] }, - { "x": 3.25, "y": 4.25, "matrix": [4, 3] }, - { "x": 4.25, "y": 4.25, "matrix": [4, 4] }, - { "x": 5.25, "y": 4.25, "matrix": [4, 5] }, - { "x": 6.25, "y": 4.25, "matrix": [4, 6] }, - { "x": 7.25, "y": 4.25, "matrix": [4, 7] }, - { "x": 8.25, "y": 4.25, "matrix": [4, 8] }, - { "x": 9.25, "y": 4.25, "matrix": [10, 8] }, - { "x": 10.25, "y": 4.25, "matrix": [10, 7] }, - { "x": 11.25, "y": 4.25, "matrix": [10, 5] }, - { "x": 12.25, "y": 4.25, "w": 2.75, "matrix": [10, 4] }, - - { "x": 16.25, "y": 4.25, "matrix": [9, 2] }, - - { "x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0] }, - { "x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1] }, - { "x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 2] }, - { "x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6] }, - { "x": 10, "y": 5.25, "w": 1.25, "matrix": [5, 8] }, - { "x": 11.25, "y": 5.25, "w": 1.25, "matrix": [5, 7] }, - { "x": 12.5, "y": 5.25, "w": 1.25, "matrix": [5, 4] }, - { "x": 13.75, "y": 5.25, "w": 1.25, "matrix": [5, 3] }, - { "x": 15.25, "y": 5.25, "matrix": [10, 6] }, - { "x": 16.25, "y": 5.25, "matrix": [10, 2] }, - { "x": 17.25, "y": 5.25, "matrix": [10, 1] } + {"x": 0, "y": 0, "matrix": [0, 0]}, + + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]}, + {"x": 4, "y": 0, "matrix": [0, 4]}, + {"x": 5, "y": 0, "matrix": [0, 5]}, + + {"x": 6.5, "y": 0, "matrix": [0, 6]}, + {"x": 7.5, "y": 0, "matrix": [0, 7]}, + {"x": 8.5, "y": 0, "matrix": [0, 8]}, + {"x": 9.5, "y": 0, "matrix": [6, 8]}, + + {"x": 11, "y": 0, "matrix": [6, 7]}, + {"x": 12, "y": 0, "matrix": [6, 5]}, + {"x": 13, "y": 0, "matrix": [6, 4]}, + {"x": 14, "y": 0, "matrix": [6, 3]}, + + {"x": 15.25, "y": 0, "matrix": [6, 6]}, + {"x": 16.25, "y": 0, "matrix": [6, 2]}, + {"x": 17.25, "y": 0, "matrix": [6, 1]}, + + {"x": 0, "y": 1.25, "matrix": [1, 0]}, + {"x": 1, "y": 1.25, "matrix": [1, 1]}, + {"x": 2, "y": 1.25, "matrix": [1, 2]}, + {"x": 3, "y": 1.25, "matrix": [1, 3]}, + {"x": 4, "y": 1.25, "matrix": [1, 4]}, + {"x": 5, "y": 1.25, "matrix": [1, 5]}, + {"x": 6, "y": 1.25, "matrix": [1, 6]}, + {"x": 7, "y": 1.25, "matrix": [1, 7]}, + {"x": 8, "y": 1.25, "matrix": [1, 8]}, + {"x": 9, "y": 1.25, "matrix": [7, 8]}, + {"x": 10, "y": 1.25, "matrix": [7, 0]}, + {"x": 11, "y": 1.25, "matrix": [7, 7]}, + {"x": 12, "y": 1.25, "matrix": [7, 5]}, + {"x": 13, "y": 1.25, "w": 2, "matrix": [7, 3]}, + + {"x": 15.25, "y": 1.25, "matrix": [7, 6]}, + {"x": 16.25, "y": 1.25, "matrix": [7, 2]}, + {"x": 17.25, "y": 1.25, "matrix": [7, 1]}, + + {"x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]}, + {"x": 1.5, "y": 2.25, "matrix": [2, 1]}, + {"x": 2.5, "y": 2.25, "matrix": [2, 2]}, + {"x": 3.5, "y": 2.25, "matrix": [2, 3]}, + {"x": 4.5, "y": 2.25, "matrix": [2, 4]}, + {"x": 5.5, "y": 2.25, "matrix": [2, 5]}, + {"x": 6.5, "y": 2.25, "matrix": [2, 6]}, + {"x": 7.5, "y": 2.25, "matrix": [2, 7]}, + {"x": 8.5, "y": 2.25, "matrix": [2, 8]}, + {"x": 9.5, "y": 2.25, "matrix": [8, 8]}, + {"x": 10.5, "y": 2.25, "matrix": [8, 7]}, + {"x": 11.5, "y": 2.25, "matrix": [8, 5]}, + {"x": 12.5, "y": 2.25, "matrix": [8, 4]}, + {"x": 13.5, "y": 2.25, "w": 1.5, "matrix": [9, 4]}, + + {"x": 15.25, "y": 2.25, "matrix": [8, 6]}, + {"x": 16.25, "y": 2.25, "matrix": [8, 2]}, + {"x": 17.25, "y": 2.25, "matrix": [8, 1]}, + + {"x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]}, + {"x": 1.75, "y": 3.25, "matrix": [3, 1]}, + {"x": 2.75, "y": 3.25, "matrix": [3, 2]}, + {"x": 3.75, "y": 3.25, "matrix": [3, 3]}, + {"x": 4.75, "y": 3.25, "matrix": [3, 4]}, + {"x": 5.75, "y": 3.25, "matrix": [3, 5]}, + {"x": 6.75, "y": 3.25, "matrix": [3, 6]}, + {"x": 7.75, "y": 3.25, "matrix": [3, 7]}, + {"x": 8.75, "y": 3.25, "matrix": [3, 8]}, + {"x": 9.75, "y": 3.25, "matrix": [9, 8]}, + {"x": 10.75, "y": 3.25, "matrix": [9, 7]}, + {"x": 11.75, "y": 3.25, "matrix": [9, 5]}, + {"x": 12.75, "y": 3.25, "w": 2.25, "matrix": [8, 3]}, + + {"x": 0, "y": 4.25, "w": 2.25, "matrix": [4, 0]}, + {"x": 2.25, "y": 4.25, "matrix": [4, 2]}, + {"x": 3.25, "y": 4.25, "matrix": [4, 3]}, + {"x": 4.25, "y": 4.25, "matrix": [4, 4]}, + {"x": 5.25, "y": 4.25, "matrix": [4, 5]}, + {"x": 6.25, "y": 4.25, "matrix": [4, 6]}, + {"x": 7.25, "y": 4.25, "matrix": [4, 7]}, + {"x": 8.25, "y": 4.25, "matrix": [4, 8]}, + {"x": 9.25, "y": 4.25, "matrix": [10, 8]}, + {"x": 10.25, "y": 4.25, "matrix": [10, 7]}, + {"x": 11.25, "y": 4.25, "matrix": [10, 5]}, + {"x": 12.25, "y": 4.25, "w": 2.75, "matrix": [10, 4]}, + + {"x": 16.25, "y": 4.25, "matrix": [9, 2]}, + + {"x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0]}, + {"x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1]}, + {"x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 2]}, + {"x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6]}, + {"x": 10, "y": 5.25, "w": 1.25, "matrix": [5, 8]}, + {"x": 11.25, "y": 5.25, "w": 1.25, "matrix": [5, 7]}, + {"x": 12.5, "y": 5.25, "w": 1.25, "matrix": [5, 4]}, + {"x": 13.75, "y": 5.25, "w": 1.25, "matrix": [5, 3]}, + {"x": 15.25, "y": 5.25, "matrix": [10, 6]}, + {"x": 16.25, "y": 5.25, "matrix": [10, 2]}, + {"x": 17.25, "y": 5.25, "matrix": [10, 1]} ] }, "LAYOUT_tkl_iso": { "layout": [ - { "x": 0, "y": 0, "matrix": [0, 0] }, - - { "x": 2, "y": 0, "matrix": [0, 2] }, - { "x": 3, "y": 0, "matrix": [0, 3] }, - { "x": 4, "y": 0, "matrix": [0, 4] }, - { "x": 5, "y": 0, "matrix": [0, 5] }, - - { "x": 6.5, "y": 0, "matrix": [0, 6] }, - { "x": 7.5, "y": 0, "matrix": [0, 7] }, - { "x": 8.5, "y": 0, "matrix": [0, 8] }, - { "x": 9.5, "y": 0, "matrix": [6, 8] }, - - { "x": 11, "y": 0, "matrix": [6, 7] }, - { "x": 12, "y": 0, "matrix": [6, 5] }, - { "x": 13, "y": 0, "matrix": [6, 4] }, - { "x": 14, "y": 0, "matrix": [6, 3] }, - - { "x": 15.25, "y": 0, "matrix": [6, 6] }, - { "x": 16.25, "y": 0, "matrix": [6, 2] }, - { "x": 17.25, "y": 0, "matrix": [6, 1] }, - - { "x": 0, "y": 1.25, "matrix": [1, 0] }, - { "x": 1, "y": 1.25, "matrix": [1, 1] }, - { "x": 2, "y": 1.25, "matrix": [1, 2] }, - { "x": 3, "y": 1.25, "matrix": [1, 3] }, - { "x": 4, "y": 1.25, "matrix": [1, 4] }, - { "x": 5, "y": 1.25, "matrix": [1, 5] }, - { "x": 6, "y": 1.25, "matrix": [1, 6] }, - { "x": 7, "y": 1.25, "matrix": [1, 7] }, - { "x": 8, "y": 1.25, "matrix": [1, 8] }, - { "x": 9, "y": 1.25, "matrix": [7, 8] }, - { "x": 10, "y": 1.25, "matrix": [7, 0] }, - { "x": 11, "y": 1.25, "matrix": [7, 7] }, - { "x": 12, "y": 1.25, "matrix": [7, 5] }, - { "x": 13, "y": 1.25, "w": 2, "matrix": [7, 3] }, - - { "x": 15.25, "y": 1.25, "matrix": [7, 6] }, - { "x": 16.25, "y": 1.25, "matrix": [7, 2] }, - { "x": 17.25, "y": 1.25, "matrix": [7, 1] }, - - { "x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0] }, - { "x": 1.5, "y": 2.25, "matrix": [2, 1] }, - { "x": 2.5, "y": 2.25, "matrix": [2, 2] }, - { "x": 3.5, "y": 2.25, "matrix": [2, 3] }, - { "x": 4.5, "y": 2.25, "matrix": [2, 4] }, - { "x": 5.5, "y": 2.25, "matrix": [2, 5] }, - { "x": 6.5, "y": 2.25, "matrix": [2, 6] }, - { "x": 7.5, "y": 2.25, "matrix": [2, 7] }, - { "x": 8.5, "y": 2.25, "matrix": [2, 8] }, - { "x": 9.5, "y": 2.25, "matrix": [8, 8] }, - { "x": 10.5, "y": 2.25, "matrix": [8, 7] }, - { "x": 11.5, "y": 2.25, "matrix": [8, 5] }, - { "x": 12.5, "y": 2.25, "matrix": [8, 4] }, - - { "x": 15.25, "y": 2.25, "matrix": [8, 6] }, - { "x": 16.25, "y": 2.25, "matrix": [8, 2] }, - { "x": 17.25, "y": 2.25, "matrix": [8, 1] }, - - { "x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0] }, - { "x": 1.75, "y": 3.25, "matrix": [3, 1] }, - { "x": 2.75, "y": 3.25, "matrix": [3, 2] }, - { "x": 3.75, "y": 3.25, "matrix": [3, 3] }, - { "x": 4.75, "y": 3.25, "matrix": [3, 4] }, - { "x": 5.75, "y": 3.25, "matrix": [3, 5] }, - { "x": 6.75, "y": 3.25, "matrix": [3, 6] }, - { "x": 7.75, "y": 3.25, "matrix": [3, 7] }, - { "x": 8.75, "y": 3.25, "matrix": [3, 8] }, - { "x": 9.75, "y": 3.25, "matrix": [9, 8] }, - { "x": 10.75, "y": 3.25, "matrix": [9, 7] }, - { "x": 11.75, "y": 3.25, "matrix": [9, 5] }, - { "x": 12.75, "y": 3.25, "matrix": [9, 4] }, - { "x": 13.75, "y": 2.25, "w": 1.25, "h": 2, "matrix": [8, 3] }, - - { "x": 0, "y": 4.25, "w": 1.25, "matrix": [4, 0] }, - { "x": 1.25, "y": 4.25, "matrix": [4, 1] }, - { "x": 2.25, "y": 4.25, "matrix": [4, 2] }, - { "x": 3.25, "y": 4.25, "matrix": [4, 3] }, - { "x": 4.25, "y": 4.25, "matrix": [4, 4] }, - { "x": 5.25, "y": 4.25, "matrix": [4, 5] }, - { "x": 6.25, "y": 4.25, "matrix": [4, 6] }, - { "x": 7.25, "y": 4.25, "matrix": [4, 7] }, - { "x": 8.25, "y": 4.25, "matrix": [4, 8] }, - { "x": 9.25, "y": 4.25, "matrix": [10, 8] }, - { "x": 10.25, "y": 4.25, "matrix": [10, 7] }, - { "x": 11.25, "y": 4.25, "matrix": [10, 5] }, - { "x": 12.25, "y": 4.25, "w": 2.75, "matrix": [10, 4] }, - - { "x": 16.25, "y": 4.25, "matrix": [9, 2] }, - - { "x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0] }, - { "x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1] }, - { "x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 2] }, - { "x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6] }, - { "x": 10, "y": 5.25, "w": 1.25, "matrix": [5, 8] }, - { "x": 11.25, "y": 5.25, "w": 1.25, "matrix": [5, 7] }, - { "x": 12.5, "y": 5.25, "w": 1.25, "matrix": [5, 4] }, - { "x": 13.75, "y": 5.25, "w": 1.25, "matrix": [5, 3] }, - - { "x": 15.25, "y": 5.25, "matrix": [10, 6] }, - { "x": 16.25, "y": 5.25, "matrix": [10, 2] }, - { "x": 17.25, "y": 5.25, "matrix": [10, 1] } + {"x": 0, "y": 0, "matrix": [0, 0]}, + + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]}, + {"x": 4, "y": 0, "matrix": [0, 4]}, + {"x": 5, "y": 0, "matrix": [0, 5]}, + + {"x": 6.5, "y": 0, "matrix": [0, 6]}, + {"x": 7.5, "y": 0, "matrix": [0, 7]}, + {"x": 8.5, "y": 0, "matrix": [0, 8]}, + {"x": 9.5, "y": 0, "matrix": [6, 8]}, + + {"x": 11, "y": 0, "matrix": [6, 7]}, + {"x": 12, "y": 0, "matrix": [6, 5]}, + {"x": 13, "y": 0, "matrix": [6, 4]}, + {"x": 14, "y": 0, "matrix": [6, 3]}, + + {"x": 15.25, "y": 0, "matrix": [6, 6]}, + {"x": 16.25, "y": 0, "matrix": [6, 2]}, + {"x": 17.25, "y": 0, "matrix": [6, 1]}, + + {"x": 0, "y": 1.25, "matrix": [1, 0]}, + {"x": 1, "y": 1.25, "matrix": [1, 1]}, + {"x": 2, "y": 1.25, "matrix": [1, 2]}, + {"x": 3, "y": 1.25, "matrix": [1, 3]}, + {"x": 4, "y": 1.25, "matrix": [1, 4]}, + {"x": 5, "y": 1.25, "matrix": [1, 5]}, + {"x": 6, "y": 1.25, "matrix": [1, 6]}, + {"x": 7, "y": 1.25, "matrix": [1, 7]}, + {"x": 8, "y": 1.25, "matrix": [1, 8]}, + {"x": 9, "y": 1.25, "matrix": [7, 8]}, + {"x": 10, "y": 1.25, "matrix": [7, 0]}, + {"x": 11, "y": 1.25, "matrix": [7, 7]}, + {"x": 12, "y": 1.25, "matrix": [7, 5]}, + {"x": 13, "y": 1.25, "w": 2, "matrix": [7, 3]}, + + {"x": 15.25, "y": 1.25, "matrix": [7, 6]}, + {"x": 16.25, "y": 1.25, "matrix": [7, 2]}, + {"x": 17.25, "y": 1.25, "matrix": [7, 1]}, + + {"x": 0, "y": 2.25, "w": 1.5, "matrix": [2, 0]}, + {"x": 1.5, "y": 2.25, "matrix": [2, 1]}, + {"x": 2.5, "y": 2.25, "matrix": [2, 2]}, + {"x": 3.5, "y": 2.25, "matrix": [2, 3]}, + {"x": 4.5, "y": 2.25, "matrix": [2, 4]}, + {"x": 5.5, "y": 2.25, "matrix": [2, 5]}, + {"x": 6.5, "y": 2.25, "matrix": [2, 6]}, + {"x": 7.5, "y": 2.25, "matrix": [2, 7]}, + {"x": 8.5, "y": 2.25, "matrix": [2, 8]}, + {"x": 9.5, "y": 2.25, "matrix": [8, 8]}, + {"x": 10.5, "y": 2.25, "matrix": [8, 7]}, + {"x": 11.5, "y": 2.25, "matrix": [8, 5]}, + {"x": 12.5, "y": 2.25, "matrix": [8, 4]}, + + {"x": 15.25, "y": 2.25, "matrix": [8, 6]}, + {"x": 16.25, "y": 2.25, "matrix": [8, 2]}, + {"x": 17.25, "y": 2.25, "matrix": [8, 1]}, + + {"x": 0, "y": 3.25, "w": 1.75, "matrix": [3, 0]}, + {"x": 1.75, "y": 3.25, "matrix": [3, 1]}, + {"x": 2.75, "y": 3.25, "matrix": [3, 2]}, + {"x": 3.75, "y": 3.25, "matrix": [3, 3]}, + {"x": 4.75, "y": 3.25, "matrix": [3, 4]}, + {"x": 5.75, "y": 3.25, "matrix": [3, 5]}, + {"x": 6.75, "y": 3.25, "matrix": [3, 6]}, + {"x": 7.75, "y": 3.25, "matrix": [3, 7]}, + {"x": 8.75, "y": 3.25, "matrix": [3, 8]}, + {"x": 9.75, "y": 3.25, "matrix": [9, 8]}, + {"x": 10.75, "y": 3.25, "matrix": [9, 7]}, + {"x": 11.75, "y": 3.25, "matrix": [9, 5]}, + {"x": 12.75, "y": 3.25, "matrix": [9, 4]}, + {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2, "matrix": [8, 3]}, + + {"x": 0, "y": 4.25, "w": 1.25, "matrix": [4, 0]}, + {"x": 1.25, "y": 4.25, "matrix": [4, 1]}, + {"x": 2.25, "y": 4.25, "matrix": [4, 2]}, + {"x": 3.25, "y": 4.25, "matrix": [4, 3]}, + {"x": 4.25, "y": 4.25, "matrix": [4, 4]}, + {"x": 5.25, "y": 4.25, "matrix": [4, 5]}, + {"x": 6.25, "y": 4.25, "matrix": [4, 6]}, + {"x": 7.25, "y": 4.25, "matrix": [4, 7]}, + {"x": 8.25, "y": 4.25, "matrix": [4, 8]}, + {"x": 9.25, "y": 4.25, "matrix": [10, 8]}, + {"x": 10.25, "y": 4.25, "matrix": [10, 7]}, + {"x": 11.25, "y": 4.25, "matrix": [10, 5]}, + {"x": 12.25, "y": 4.25, "w": 2.75, "matrix": [10, 4]}, + + {"x": 16.25, "y": 4.25, "matrix": [9, 2]}, + + {"x": 0, "y": 5.25, "w": 1.25, "matrix": [5, 0]}, + {"x": 1.25, "y": 5.25, "w": 1.25, "matrix": [5, 1]}, + {"x": 2.5, "y": 5.25, "w": 1.25, "matrix": [5, 2]}, + {"x": 3.75, "y": 5.25, "w": 6.25, "matrix": [5, 6]}, + {"x": 10, "y": 5.25, "w": 1.25, "matrix": [5, 8]}, + {"x": 11.25, "y": 5.25, "w": 1.25, "matrix": [5, 7]}, + {"x": 12.5, "y": 5.25, "w": 1.25, "matrix": [5, 4]}, + {"x": 13.75, "y": 5.25, "w": 1.25, "matrix": [5, 3]}, + + {"x": 15.25, "y": 5.25, "matrix": [10, 6]}, + {"x": 16.25, "y": 5.25, "matrix": [10, 2]}, + {"x": 17.25, "y": 5.25, "matrix": [10, 1]} ] } } diff --git a/keyboards/mt/split75/info.json b/keyboards/mt/split75/info.json index e97d70bf3b..dc20f93dbc 100644 --- a/keyboards/mt/split75/info.json +++ b/keyboards/mt/split75/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Split75", + "keyboard_name": "Split75", "manufacturer": "YMDK", - "url": "", - "maintainer": "Michael L. Walker", + "url": "", + "maintainer": "Michael L. Walker", "usb": { "vid": "0x594D", "pid": "0x0001", @@ -11,6 +11,9 @@ "backlight": { "pin": "D4" }, + "ws2812": { + "driver": "i2c" + }, "indicators": { "caps_lock": "D1", "num_lock": "D0", @@ -20,10 +23,237 @@ "bootloader": "bootloadhid", "layouts": { "LAYOUT": { - "layout": [{"label":"ESC", "x":2.25, "y":0}, {"label":"F1", "x":3.25, "y":0}, {"label":"F2", "x":4.25, "y":0}, {"label":"F3", "x":5.25, "y":0}, {"label":"F4", "x":6.25, "y":0}, {"label":"F5", "x":7.25, "y":0}, {"label":"F6", "x":8.25, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.25, "y":0}, {"label":"F10", "x":13.25, "y":0}, {"label":"F11", "x":14.25, "y":0}, {"label":"F12", "x":15.25, "y":0}, {"label":"Prt", "x":16.25, "y":0}, {"label":"Ins", "x":17.25, "y":0}, {"label":"Del", "x":18.25, "y":0}, {"label":"8", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"~", "x":2.25, "y":1}, {"label":"!", "x":3.25, "y":1}, {"label":"@", "x":4.25, "y":1}, {"label":"#", "x":5.25, "y":1}, {"label":"$", "x":6.25, "y":1}, {"label":"%", "x":7.25, "y":1}, {"label":"^", "x":8.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1}, {"label":"_", "x":14.25, "y":1}, {"label":"+", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":2}, {"label":"Home", "x":18.25, "y":1}, {"label":"6", "x":0, "y":2}, {"label":"7", "x":1, "y":2}, {"label":"Tab", "x":2.25, "y":2, "w":1.5}, {"label":"Q", "x":3.75, "y":2}, {"label":"W", "x":4.75, "y":2}, {"label":"E", "x":5.75, "y":2}, {"label":"R", "x":6.75, "y":2}, {"label":"T", "x":7.75, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"U", "x":10.75, "y":2}, {"label":"I", "x":11.75, "y":2}, {"label":"O", "x":12.75, "y":2}, {"label":"P", "x":13.75, "y":2}, {"label":"{", "x":14.75, "y":2}, {"label":"}", "x":15.75, "y":2}, {"label":"|", "x":16.75, "y":2, "w":1.5}, {"label":"PgUp", "x":18.25, "y":2}, {"label":"4", "x":0, "y":3}, {"label":"5", "x":1, "y":3}, {"label":"Caps Lock", "x":2.25, "y":3, "w":1.75}, {"label":"A", "x":4, "y":3}, {"label":"S", "x":5, "y":3}, {"label":"D", "x":6, "y":3}, {"label":"F", "x":7, "y":3}, {"label":"G", "x":8, "y":3}, {"label":"H", "x":10, "y":3}, {"label":"J", "x":11, "y":3}, {"label":"K", "x":12, "y":3}, {"label":"L", "x":13, "y":3}, {"label":":", "x":14, "y":3}, {"label":"\"", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3, "w":2.25}, {"label":"PgDn", "x":18.25, "y":3}, {"label":"2", "x":0, "y":4}, {"label":"3", "x":1, "y":4}, {"label":"Shift", "x":2.25, "y":4, "w":2.25}, {"label":"Z", "x":4.5, "y":4}, {"label":"X", "x":5.5, "y":4}, {"label":"C", "x":6.5, "y":4}, {"label":"V", "x":7.5, "y":4}, {"label":"B", "x":8.5, "y":4}, {"label":"N", "x":10.5, "y":4}, {"label":"M", "x":11.5, "y":4}, {"label":"<", "x":12.5, "y":4}, {"label":">", "x":13.5, "y":4}, {"label":"?", "x":14.5, "y":4}, {"label":"Shift", "x":15.5, "y":4, "w":1.75}, {"label":"\u2191", "x":17.25, "y":4}, {"label":"End", "x":18.25, "y":4}, {"label":"0", "x":0, "y":5}, {"label":"1", "x":1, "y":5}, {"label":"Ctrl", "x":2.25, "y":5, "w":1.25}, {"label":"Win", "x":3.5, "y":5, "w":1.25}, {"label":"Alt", "x":4.75, "y":5, "w":1.25}, {"x":6, "y":5, "w":2}, {"x":8, "y":5}, {"x":10, "y":5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5, "w":1.25}, {"label":"Fn", "x":14, "y":5}, {"label":"Ctrl", "x":15, "y":5, "w":1.25}, {"label":"\u2190", "x":16.25, "y":5}, {"label":"\u2193", "x":17.25, "y":5}, {"label":"\u2192", "x":18.25, "y":5}] + "layout": [ + {"matrix": [5, 0], "x": 2.25, "y": 0}, + {"matrix": [5, 1], "x": 3.25, "y": 0}, + {"matrix": [5, 2], "x": 4.25, "y": 0}, + {"matrix": [5, 3], "x": 5.25, "y": 0}, + {"matrix": [5, 4], "x": 6.25, "y": 0}, + {"matrix": [5, 5], "x": 7.25, "y": 0}, + {"matrix": [5, 6], "x": 8.25, "y": 0}, + + {"matrix": [5, 7], "x": 10.25, "y": 0}, + {"matrix": [5, 8], "x": 11.25, "y": 0}, + {"matrix": [5, 9], "x": 12.25, "y": 0}, + {"matrix": [5, 10], "x": 13.25, "y": 0}, + {"matrix": [5, 11], "x": 14.25, "y": 0}, + {"matrix": [5, 12], "x": 15.25, "y": 0}, + {"matrix": [5, 13], "x": 16.25, "y": 0}, + {"matrix": [6, 8], "x": 17.25, "y": 0}, + {"matrix": [7, 8], "x": 18.25, "y": 0}, + + {"matrix": [7, 4], "x": 0, "y": 1}, + {"matrix": [6, 4], "x": 1, "y": 1}, + + {"matrix": [4, 0], "x": 2.25, "y": 1}, + {"matrix": [4, 1], "x": 3.25, "y": 1}, + {"matrix": [4, 2], "x": 4.25, "y": 1}, + {"matrix": [4, 3], "x": 5.25, "y": 1}, + {"matrix": [4, 4], "x": 6.25, "y": 1}, + {"matrix": [4, 5], "x": 7.25, "y": 1}, + {"matrix": [4, 6], "x": 8.25, "y": 1}, + + {"matrix": [4, 7], "x": 10.25, "y": 1}, + {"matrix": [4, 8], "x": 11.25, "y": 1}, + {"matrix": [4, 9], "x": 12.25, "y": 1}, + {"matrix": [4, 10], "x": 13.25, "y": 1}, + {"matrix": [4, 11], "x": 14.25, "y": 1}, + {"matrix": [4, 12], "x": 15.25, "y": 1}, + {"matrix": [6, 9], "x": 16.25, "y": 1, "w": 2}, + {"matrix": [7, 9], "x": 18.25, "y": 1}, + + {"matrix": [7, 3], "x": 0, "y": 2}, + {"matrix": [6, 3], "x": 1, "y": 2}, + + {"matrix": [3, 0], "x": 2.25, "y": 2, "w": 1.5}, + {"matrix": [3, 1], "x": 3.75, "y": 2}, + {"matrix": [3, 2], "x": 4.75, "y": 2}, + {"matrix": [3, 3], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + + {"matrix": [3, 7], "x": 9.75, "y": 2}, + {"matrix": [3, 8], "x": 10.75, "y": 2}, + {"matrix": [3, 9], "x": 11.75, "y": 2}, + {"matrix": [3, 10], "x": 12.75, "y": 2}, + {"matrix": [3, 11], "x": 13.75, "y": 2}, + {"matrix": [3, 12], "x": 14.75, "y": 2}, + {"matrix": [3, 13], "x": 15.75, "y": 2}, + {"matrix": [6, 10], "x": 16.75, "y": 2, "w": 1.5}, + {"matrix": [7, 10], "x": 18.25, "y": 2}, + + {"matrix": [7, 2], "x": 0, "y": 3}, + {"matrix": [6, 2], "x": 1, "y": 3}, + + {"matrix": [2, 0], "x": 2.25, "y": 3, "w": 1.75}, + {"matrix": [2, 1], "x": 4, "y": 3}, + {"matrix": [2, 2], "x": 5, "y": 3}, + {"matrix": [2, 3], "x": 6, "y": 3}, + {"matrix": [2, 4], "x": 7, "y": 3}, + {"matrix": [2, 5], "x": 8, "y": 3}, + + {"matrix": [2, 7], "x": 10, "y": 3}, + {"matrix": [2, 8], "x": 11, "y": 3}, + {"matrix": [2, 9], "x": 12, "y": 3}, + {"matrix": [2, 10], "x": 13, "y": 3}, + {"matrix": [2, 11], "x": 14, "y": 3}, + {"matrix": [2, 12], "x": 15, "y": 3}, + {"matrix": [6, 11], "x": 16, "y": 3, "w": 2.25}, + {"matrix": [7, 11], "x": 18.25, "y": 3}, + + {"matrix": [7, 1], "x": 0, "y": 4}, + {"matrix": [6, 1], "x": 1, "y": 4}, + + {"matrix": [1, 0], "x": 2.25, "y": 4, "w": 2.25}, + {"matrix": [1, 2], "x": 4.5, "y": 4}, + {"matrix": [1, 3], "x": 5.5, "y": 4}, + {"matrix": [1, 4], "x": 6.5, "y": 4}, + {"matrix": [1, 5], "x": 7.5, "y": 4}, + {"matrix": [1, 6], "x": 8.5, "y": 4}, + + {"matrix": [1, 7], "x": 10.5, "y": 4}, + {"matrix": [1, 8], "x": 11.5, "y": 4}, + {"matrix": [1, 9], "x": 12.5, "y": 4}, + {"matrix": [1, 10], "x": 13.5, "y": 4}, + {"matrix": [1, 11], "x": 14.5, "y": 4}, + {"matrix": [1, 13], "x": 15.5, "y": 4, "w": 1.75}, + {"matrix": [6, 12], "x": 17.25, "y": 4}, + {"matrix": [7, 12], "x": 18.25, "y": 4}, + + {"matrix": [7, 0], "x": 0, "y": 5}, + {"matrix": [6, 0], "x": 1, "y": 5}, + + {"matrix": [0, 0], "x": 2.25, "y": 5, "w": 1.25}, + {"matrix": [0, 1], "x": 3.5, "y": 5, "w": 1.25}, + {"matrix": [0, 2], "x": 4.75, "y": 5, "w": 1.25}, + {"matrix": [0, 3], "x": 6, "y": 5, "w": 2}, + {"matrix": [0, 4], "x": 8, "y": 5}, + + {"matrix": [0, 7], "x": 10, "y": 5, "w": 2.75}, + {"matrix": [0, 10], "x": 12.75, "y": 5, "w": 1.25}, + {"matrix": [0, 11], "x": 14, "y": 5}, + {"matrix": [0, 12], "x": 15, "y": 5, "w": 1.25}, + {"matrix": [0, 13], "x": 16.25, "y": 5}, + {"matrix": [6, 13], "x": 17.25, "y": 5}, + {"matrix": [7, 13], "x": 18.25, "y": 5} + ] }, "LAYOUT_iso": { - "layout": [{"label":"ESC", "x":2.25, "y":0}, {"label":"F1", "x":3.25, "y":0}, {"label":"F2", "x":4.25, "y":0}, {"label":"F3", "x":5.25, "y":0}, {"label":"F4", "x":6.25, "y":0}, {"label":"F5", "x":7.25, "y":0}, {"label":"F6", "x":8.25, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.25, "y":0}, {"label":"F10", "x":13.25, "y":0}, {"label":"F11", "x":14.25, "y":0}, {"label":"F12", "x":15.25, "y":0}, {"label":"Prt", "x":16.25, "y":0}, {"label":"Ins", "x":17.25, "y":0}, {"label":"Del", "x":18.25, "y":0}, {"label":"8", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"~", "x":2.25, "y":1}, {"label":"!", "x":3.25, "y":1}, {"label":"@", "x":4.25, "y":1}, {"label":"#", "x":5.25, "y":1}, {"label":"$", "x":6.25, "y":1}, {"label":"%", "x":7.25, "y":1}, {"label":"^", "x":8.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1}, {"label":"_", "x":14.25, "y":1}, {"label":"+", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":2}, {"label":"Home", "x":18.25, "y":1}, {"label":"6", "x":0, "y":2}, {"label":"7", "x":1, "y":2}, {"label":"Tab", "x":2.25, "y":2, "w":1.5}, {"label":"Q", "x":3.75, "y":2}, {"label":"W", "x":4.75, "y":2}, {"label":"E", "x":5.75, "y":2}, {"label":"R", "x":6.75, "y":2}, {"label":"T", "x":7.75, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"U", "x":10.75, "y":2}, {"label":"I", "x":11.75, "y":2}, {"label":"O", "x":12.75, "y":2}, {"label":"P", "x":13.75, "y":2}, {"label":"{", "x":14.75, "y":2}, {"label":"}", "x":15.75, "y":2}, {"label":"PgUp", "x":18.25, "y":2}, {"label":"4", "x":0, "y":3}, {"label":"5", "x":1, "y":3}, {"label":"Caps Lock", "x":2.25, "y":3, "w":1.75}, {"label":"A", "x":4, "y":3}, {"label":"S", "x":5, "y":3}, {"label":"D", "x":6, "y":3}, {"label":"F", "x":7, "y":3}, {"label":"G", "x":8, "y":3}, {"label":"H", "x":10, "y":3}, {"label":"J", "x":11, "y":3}, {"label":"K", "x":12, "y":3}, {"label":"L", "x":13, "y":3}, {"label":":", "x":14, "y":3}, {"label":"\"", "x":15, "y":3}, {"label":"'", "x":16, "y":3}, {"label":"Enter", "x":17, "y":2, "w":1.25, "h":2}, {"label":"PgDn", "x":18.25, "y":3}, {"label":"2", "x":0, "y":4}, {"label":"3", "x":1, "y":4}, {"label":"Shift", "x":2.25, "y":4, "w":1.25}, {"label":"|", "x":3.5, "y":4, "w":1}, {"label":"Z", "x":4.5, "y":4}, {"label":"X", "x":5.5, "y":4}, {"label":"C", "x":6.5, "y":4}, {"label":"V", "x":7.5, "y":4}, {"label":"B", "x":8.5, "y":4}, {"label":"N", "x":10.5, "y":4}, {"label":"M", "x":11.5, "y":4}, {"label":"<", "x":12.5, "y":4}, {"label":">", "x":13.5, "y":4}, {"label":"?", "x":14.5, "y":4}, {"label":"Shift", "x":15.5, "y":4, "w":1.75}, {"label":"\u2191", "x":17.25, "y":4}, {"label":"End", "x":18.25, "y":4}, {"label":"0", "x":0, "y":5}, {"label":"1", "x":1, "y":5}, {"label":"Ctrl", "x":2.25, "y":5, "w":1.25}, {"label":"Win", "x":3.5, "y":5, "w":1.25}, {"label":"Alt", "x":4.75, "y":5, "w":1.25}, {"x":6, "y":5, "w":2}, {"x":8, "y":5}, {"x":10, "y":5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5, "w":1.25}, {"label":"Fn", "x":14, "y":5}, {"label":"Ctrl", "x":15, "y":5, "w":1.25}, {"label":"\u2190", "x":16.25, "y":5}, {"label":"\u2193", "x":17.25, "y":5}, {"label":"\u2192", "x":18.25, "y":5}] + "layout": [ + {"matrix": [5, 0], "x": 2.25, "y": 0}, + {"matrix": [5, 1], "x": 3.25, "y": 0}, + {"matrix": [5, 2], "x": 4.25, "y": 0}, + {"matrix": [5, 3], "x": 5.25, "y": 0}, + {"matrix": [5, 4], "x": 6.25, "y": 0}, + {"matrix": [5, 5], "x": 7.25, "y": 0}, + {"matrix": [5, 6], "x": 8.25, "y": 0}, + + {"matrix": [5, 7], "x": 10.25, "y": 0}, + {"matrix": [5, 8], "x": 11.25, "y": 0}, + {"matrix": [5, 9], "x": 12.25, "y": 0}, + {"matrix": [5, 10], "x": 13.25, "y": 0}, + {"matrix": [5, 11], "x": 14.25, "y": 0}, + {"matrix": [5, 12], "x": 15.25, "y": 0}, + {"matrix": [5, 13], "x": 16.25, "y": 0}, + {"matrix": [6, 8], "x": 17.25, "y": 0}, + {"matrix": [7, 8], "x": 18.25, "y": 0}, + + {"matrix": [7, 4], "x": 0, "y": 1}, + {"matrix": [6, 4], "x": 1, "y": 1}, + + {"matrix": [4, 0], "x": 2.25, "y": 1}, + {"matrix": [4, 1], "x": 3.25, "y": 1}, + {"matrix": [4, 2], "x": 4.25, "y": 1}, + {"matrix": [4, 3], "x": 5.25, "y": 1}, + {"matrix": [4, 4], "x": 6.25, "y": 1}, + {"matrix": [4, 5], "x": 7.25, "y": 1}, + {"matrix": [4, 6], "x": 8.25, "y": 1}, + + {"matrix": [4, 7], "x": 10.25, "y": 1}, + {"matrix": [4, 8], "x": 11.25, "y": 1}, + {"matrix": [4, 9], "x": 12.25, "y": 1}, + {"matrix": [4, 10], "x": 13.25, "y": 1}, + {"matrix": [4, 11], "x": 14.25, "y": 1}, + {"matrix": [4, 12], "x": 15.25, "y": 1}, + {"matrix": [6, 9], "x": 16.25, "y": 1, "w": 2}, + {"matrix": [7, 9], "x": 18.25, "y": 1}, + + {"matrix": [7, 3], "x": 0, "y": 2}, + {"matrix": [6, 3], "x": 1, "y": 2}, + + {"matrix": [3, 0], "x": 2.25, "y": 2, "w": 1.5}, + {"matrix": [3, 1], "x": 3.75, "y": 2}, + {"matrix": [3, 2], "x": 4.75, "y": 2}, + {"matrix": [3, 3], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + + {"matrix": [3, 7], "x": 9.75, "y": 2}, + {"matrix": [3, 8], "x": 10.75, "y": 2}, + {"matrix": [3, 9], "x": 11.75, "y": 2}, + {"matrix": [3, 10], "x": 12.75, "y": 2}, + {"matrix": [3, 11], "x": 13.75, "y": 2}, + {"matrix": [3, 12], "x": 14.75, "y": 2}, + {"matrix": [3, 13], "x": 15.75, "y": 2}, + {"matrix": [7, 10], "x": 18.25, "y": 2}, + + {"matrix": [7, 2], "x": 0, "y": 3}, + {"matrix": [6, 2], "x": 1, "y": 3}, + + {"matrix": [2, 0], "x": 2.25, "y": 3, "w": 1.75}, + {"matrix": [2, 1], "x": 4, "y": 3}, + {"matrix": [2, 2], "x": 5, "y": 3}, + {"matrix": [2, 3], "x": 6, "y": 3}, + {"matrix": [2, 4], "x": 7, "y": 3}, + {"matrix": [2, 5], "x": 8, "y": 3}, + + {"matrix": [2, 7], "x": 10, "y": 3}, + {"matrix": [2, 8], "x": 11, "y": 3}, + {"matrix": [2, 9], "x": 12, "y": 3}, + {"matrix": [2, 10], "x": 13, "y": 3}, + {"matrix": [2, 11], "x": 14, "y": 3}, + {"matrix": [2, 12], "x": 15, "y": 3}, + {"matrix": [2, 13], "x": 16, "y": 3}, + {"matrix": [6, 11], "x": 17, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [7, 11], "x": 18.25, "y": 3}, + + {"matrix": [7, 1], "x": 0, "y": 4}, + {"matrix": [6, 1], "x": 1, "y": 4}, + + {"matrix": [1, 0], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [1, 1], "x": 3.5, "y": 4}, + {"matrix": [1, 2], "x": 4.5, "y": 4}, + {"matrix": [1, 3], "x": 5.5, "y": 4}, + {"matrix": [1, 4], "x": 6.5, "y": 4}, + {"matrix": [1, 5], "x": 7.5, "y": 4}, + {"matrix": [1, 6], "x": 8.5, "y": 4}, + + {"matrix": [1, 7], "x": 10.5, "y": 4}, + {"matrix": [1, 8], "x": 11.5, "y": 4}, + {"matrix": [1, 9], "x": 12.5, "y": 4}, + {"matrix": [1, 10], "x": 13.5, "y": 4}, + {"matrix": [1, 11], "x": 14.5, "y": 4}, + {"matrix": [1, 13], "x": 15.5, "y": 4, "w": 1.75}, + {"matrix": [6, 12], "x": 17.25, "y": 4}, + {"matrix": [7, 12], "x": 18.25, "y": 4}, + + {"matrix": [7, 0], "x": 0, "y": 5}, + {"matrix": [6, 0], "x": 1, "y": 5}, + + {"matrix": [0, 0], "x": 2.25, "y": 5, "w": 1.25}, + {"matrix": [0, 1], "x": 3.5, "y": 5, "w": 1.25}, + {"matrix": [0, 2], "x": 4.75, "y": 5, "w": 1.25}, + {"matrix": [0, 3], "x": 6, "y": 5, "w": 2}, + {"matrix": [0, 4], "x": 8, "y": 5}, + + {"matrix": [0, 7], "x": 10, "y": 5, "w": 2.75}, + {"matrix": [0, 10], "x": 12.75, "y": 5, "w": 1.25}, + {"matrix": [0, 11], "x": 14, "y": 5}, + {"matrix": [0, 12], "x": 15, "y": 5, "w": 1.25}, + {"matrix": [0, 13], "x": 16.25, "y": 5}, + {"matrix": [6, 13], "x": 17.25, "y": 5}, + {"matrix": [7, 13], "x": 18.25, "y": 5} + ] } } } diff --git a/keyboards/mt/split75/matrix.c b/keyboards/mt/split75/matrix.c index 9e86bfc376..196a543faa 100644 --- a/keyboards/mt/split75/matrix.c +++ b/keyboards/mt/split75/matrix.c @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include <stdio.h> #include "quantum.h" #include "i2c_master.h" -#include "split75.h" #define RIGHT_HALF diff --git a/keyboards/mt/split75/rules.mk b/keyboards/mt/split75/rules.mk index ebcb8a1159..f616b9400e 100644 --- a/keyboards/mt/split75/rules.mk +++ b/keyboards/mt/split75/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -WS2812_DRIVER = i2c # custom matrix setup CUSTOM_MATRIX = lite diff --git a/keyboards/mt/split75/split75.c b/keyboards/mt/split75/split75.c deleted file mode 100644 index 890c9d1de3..0000000000 --- a/keyboards/mt/split75/split75.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Artjoms Rizihs (@artjomsR) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "split75.h" diff --git a/keyboards/mt/split75/split75.h b/keyboards/mt/split75/split75.h deleted file mode 100644 index a01db5188e..0000000000 --- a/keyboards/mt/split75/split75.h +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright 2022 Artjoms Rizihs (@artjomsR) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -// Number of keys in rows -// 0 + 7 / 9 -// 2 + 7 / 8 -// 2 + 6 / 9 -// 2 + 6 / 8 -// 2 + 6 / 8 -// 2 + 5 / 7 - -#define LAYOUT( \ - K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125, K135, K86, K87, \ - K47, K46, K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, K96, K97, \ - K37, K36, K03, K13, K23, K33, K43, K53, K73, K83, K93, K103, K113, K123, K133, K106, K107, \ - K27, K26, K02, K12, K22, K32, K42, K52, K72, K82, K92, K102, K112, K122, K116, K117, \ - K17, K16, K01, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, K131, K126, K127, \ - K07, K06, K00, K10, K20, K30, K40, K70, K100, K110, K120, K130, K136, K137 \ -){ \ - { K00, K10, K20, K30, K40, KC_NO, KC_NO, K70, KC_NO, KC_NO, K100, K110, K120, K130 }, \ - { K01, KC_NO, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, KC_NO, K131 }, \ - { K02, K12, K22, K32, K42, K52, KC_NO, K72, K82, K92, K102, K112, K122, }, \ - { K03, K13, K23, K33, K43, K53, KC_NO, K73, K83, K93, K103, K113, K123, K133 }, \ - { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, }, \ - { K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125, K135 }, \ - { K06, K16, K26, K36, K46, KC_NO, KC_NO, KC_NO, K86, K96, K106, K116, K126, K136 }, \ - { K07, K17, K27, K37, K47, KC_NO, KC_NO, KC_NO, K87, K97, K107, K117, K127, K137 } \ -} - -#define LAYOUT_iso( \ - K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125, K135, K86, K87, \ - K47, K46, K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, K96, K97, \ - K37, K36, K03, K13, K23, K33, K43, K53, K73, K83, K93, K103, K113, K123, K133, K107, \ - K27, K26, K02, K12, K22, K32, K42, K52, K72, K82, K92, K102, K112, K122, K132, K116, K117, \ - K17, K16, K01, K11, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, K131, K126, K127, \ - K07, K06, K00, K10, K20, K30, K40, K70, K100, K110, K120, K130, K136, K137 \ -){ \ - { K00, K10, K20, K30, K40, KC_NO, KC_NO, K70, KC_NO, KC_NO, K100, K110, K120, K130 }, \ - { K01, K11, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, KC_NO, K131 }, \ - { K02, K12, K22, K32, K42, K52, KC_NO, K72, K82, K92, K102, K112, K122, K132 }, \ - { K03, K13, K23, K33, K43, K53, KC_NO, K73, K83, K93, K103, K113, K123, K133 }, \ - { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, }, \ - { K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125, K135 }, \ - { K06, K16, K26, K36, K46, KC_NO, KC_NO, KC_NO, K86, K96, KC_NO, K116, K126, K136 }, \ - { K07, K17, K27, K37, K47, KC_NO, KC_NO, KC_NO, K87, K97, K107, K117, K127, K137 } \ -} |