diff options
Diffstat (limited to 'keyboards/foxlab')
27 files changed, 633 insertions, 953 deletions
diff --git a/keyboards/foxlab/key65/hotswap/config.h b/keyboards/foxlab/key65/hotswap/config.h index 1b8e4a8fd0..41bd1c1ce3 100644 --- a/keyboards/foxlab/key65/hotswap/config.h +++ b/keyboards/foxlab/key65/hotswap/config.h @@ -16,25 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D2, D1, D0, D3, B3 } -#define MATRIX_COL_PINS { F5, F4, F1, F0, B0, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -51,7 +32,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/foxlab/key65/hotswap/hotswap.c b/keyboards/foxlab/key65/hotswap/hotswap.c deleted file mode 100644 index 31fb011ad5..0000000000 --- a/keyboards/foxlab/key65/hotswap/hotswap.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Jumail Mundekkat / MxBlue - * - * 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 "hotswap.h" diff --git a/keyboards/foxlab/key65/hotswap/hotswap.h b/keyboards/foxlab/key65/hotswap/hotswap.h deleted file mode 100644 index 878a61bcef..0000000000 --- a/keyboards/foxlab/key65/hotswap/hotswap.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 Jumail Mundekkat / MxBlue - * - * 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( \ - 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, K2E, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K47, 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, K2C, KC_NO, K2E }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, KC_NO, K4B, K4C, K4D, K4E }, \ -} diff --git a/keyboards/foxlab/key65/hotswap/info.json b/keyboards/foxlab/key65/hotswap/info.json index 712897a7f3..619f59671d 100644 --- a/keyboards/foxlab/key65/hotswap/info.json +++ b/keyboards/foxlab/key65/hotswap/info.json @@ -8,10 +8,18 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F4", "F1", "F0", "B0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["D2", "D1", "D0", "D3", "B3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "E2" + }, "indicators": { "scroll_lock": "E6", "on_state": 0 @@ -21,72 +29,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D2,F5)", "x":0, "y":0}, - {"label":"K01 (D2,F4)", "x":1, "y":0}, - {"label":"K02 (D2,F1)", "x":2, "y":0}, - {"label":"K03 (D2,F0)", "x":3, "y":0}, - {"label":"K04 (D2,B0)", "x":4, "y":0}, - {"label":"K05 (D2,F6)", "x":5, "y":0}, - {"label":"K06 (D2,F7)", "x":6, "y":0}, - {"label":"K07 (D2,C7)", "x":7, "y":0}, - {"label":"K08 (D2,C6)", "x":8, "y":0}, - {"label":"K09 (D2,B6)", "x":9, "y":0}, - {"label":"K0A (D2,B5)", "x":10, "y":0}, - {"label":"K0B (D2,B4)", "x":11, "y":0}, - {"label":"K0C (D2,D7)", "x":12, "y":0}, - {"label":"K0D (D2,D6)", "x":13, "y":0, "w":2}, - {"label":"K0E (D2,D4)", "x":15, "y":0}, - {"label":"K10 (D1,F5)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (D1,F4)", "x":1.5, "y":1}, - {"label":"K12 (D1,F1)", "x":2.5, "y":1}, - {"label":"K13 (D1,F0)", "x":3.5, "y":1}, - {"label":"K14 (D1,B0)", "x":4.5, "y":1}, - {"label":"K15 (D1,F6)", "x":5.5, "y":1}, - {"label":"K16 (D1,F7)", "x":6.5, "y":1}, - {"label":"K17 (D1,C7)", "x":7.5, "y":1}, - {"label":"K18 (D1,C6)", "x":8.5, "y":1}, - {"label":"K19 (D1,B6)", "x":9.5, "y":1}, - {"label":"K1A (D1,B5)", "x":10.5, "y":1}, - {"label":"K1B (D1,B4)", "x":11.5, "y":1}, - {"label":"K1C (D1,D7)", "x":12.5, "y":1}, - {"label":"K1D (D1,D6)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1E (D1,D4)", "x":15, "y":1}, - {"label":"K20 (D0,F5)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (D0,F4)", "x":1.75, "y":2}, - {"label":"K22 (D0,F1)", "x":2.75, "y":2}, - {"label":"K23 (D0,F0)", "x":3.75, "y":2}, - {"label":"K24 (D0,B0)", "x":4.75, "y":2}, - {"label":"K25 (D0,F6)", "x":5.75, "y":2}, - {"label":"K26 (D0,F7)", "x":6.75, "y":2}, - {"label":"K27 (D0,C7)", "x":7.75, "y":2}, - {"label":"K28 (D0,C6)", "x":8.75, "y":2}, - {"label":"K29 (D0,B6)", "x":9.75, "y":2}, - {"label":"K2A (D0,B5)", "x":10.75, "y":2}, - {"label":"K2B (D0,B4)", "x":11.75, "y":2}, - {"label":"K2C (D0,D7)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2E (D0,D4)", "x":15, "y":2}, - {"label":"K30 (D3,F5)", "x":0, "y":3, "w":2.25}, - {"label":"K32 (D3,F1)", "x":2.25, "y":3}, - {"label":"K33 (D3,F0)", "x":3.25, "y":3}, - {"label":"K34 (D3,B0)", "x":4.25, "y":3}, - {"label":"K35 (D3,F6)", "x":5.25, "y":3}, - {"label":"K36 (D3,F7)", "x":6.25, "y":3}, - {"label":"K37 (D3,C7)", "x":7.25, "y":3}, - {"label":"K38 (D3,C6)", "x":8.25, "y":3}, - {"label":"K39 (D3,B6)", "x":9.25, "y":3}, - {"label":"K3A (D3,B5)", "x":10.25, "y":3}, - {"label":"K3B (D3,B4)", "x":11.25, "y":3}, - {"label":"K3C (D3,D7)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D (D3,D6)", "x":14, "y":3}, - {"label":"K3E (D3,D4)", "x":15, "y":3}, - {"label":"K40 (B3,F5)", "x":0, "y":4, "w":1.5}, - {"label":"K41 (B3,F4)", "x":1.5, "y":4}, - {"label":"K42 (B3,F1)", "x":2.5, "y":4, "w":1.5}, - {"label":"K47 (B3,C7)", "x":4, "y":4, "w":7}, - {"label":"K4B (B3,B4)", "x":11, "y":4, "w":1.5}, - {"label":"K4C (B3,D7)", "x":13, "y":4}, - {"label":"K4D (B3,D6)", "x":14, "y":4}, - {"label":"K4E (B3,D4)", "x":15, "y":4} + {"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, 12], "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.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + + {"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/foxlab/key65/universal/config.h b/keyboards/foxlab/key65/universal/config.h index 159e0cff79..23f868d2ac 100644 --- a/keyboards/foxlab/key65/universal/config.h +++ b/keyboards/foxlab/key65/universal/config.h @@ -16,25 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D0, D1, F0, F4, F1 } -#define MATRIX_COL_PINS { B1, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -51,7 +32,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/foxlab/key65/universal/info.json b/keyboards/foxlab/key65/universal/info.json index a886275ff5..ef7c4386c8 100644 --- a/keyboards/foxlab/key65/universal/info.json +++ b/keyboards/foxlab/key65/universal/info.json @@ -8,10 +8,18 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B0"], + "rows": ["D0", "D1", "F0", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 }, + "ws2812": { + "pin": "E2" + }, "indicators": { "scroll_lock": "E6", "on_state": 0 @@ -22,295 +30,311 @@ "layouts": { "LAYOUT_65_ansi_blocker_split_bs": { "layout": [ - {"label":"K00 (D0,B1)", "x":0, "y":0}, - {"label":"K01 (D0,F5)", "x":1, "y":0}, - {"label":"K02 (D0,F6)", "x":2, "y":0}, - {"label":"K03 (D0,F7)", "x":3, "y":0}, - {"label":"K04 (D0,C7)", "x":4, "y":0}, - {"label":"K05 (D0,C6)", "x":5, "y":0}, - {"label":"K06 (D0,B6)", "x":6, "y":0}, - {"label":"K07 (D0,B5)", "x":7, "y":0}, - {"label":"K08 (D0,B4)", "x":8, "y":0}, - {"label":"K09 (D0,D7)", "x":9, "y":0}, - {"label":"K0A (D0,D6)", "x":10, "y":0}, - {"label":"K0B (D0,D4)", "x":11, "y":0}, - {"label":"K0C (D0,D5)", "x":12, "y":0}, - {"label":"K0D (D0,D3)", "x":13, "y":0}, - {"label":"K0E (D0,D2)", "x":14, "y":0}, - {"label":"K0F (D0,B0)", "x":15, "y":0}, - {"label":"K10 (D1,B1)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (D1,F5)", "x":1.5, "y":1}, - {"label":"K12 (D1,F6)", "x":2.5, "y":1}, - {"label":"K13 (D1,F7)", "x":3.5, "y":1}, - {"label":"K14 (D1,C7)", "x":4.5, "y":1}, - {"label":"K15 (D1,C6)", "x":5.5, "y":1}, - {"label":"K16 (D1,B6)", "x":6.5, "y":1}, - {"label":"K17 (D1,B5)", "x":7.5, "y":1}, - {"label":"K18 (D1,B4)", "x":8.5, "y":1}, - {"label":"K19 (D1,D7)", "x":9.5, "y":1}, - {"label":"K1A (D1,D6)", "x":10.5, "y":1}, - {"label":"K1B (D1,D4)", "x":11.5, "y":1}, - {"label":"K1C (D1,D5)", "x":12.5, "y":1}, - {"label":"K1D (D1,D3)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1F (D1,B0)", "x":15, "y":1}, - {"label":"K20 (F0,B1)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (F0,F5)", "x":1.75, "y":2}, - {"label":"K22 (F0,F6)", "x":2.75, "y":2}, - {"label":"K23 (F0,F7)", "x":3.75, "y":2}, - {"label":"K24 (F0,C7)", "x":4.75, "y":2}, - {"label":"K25 (F0,C6)", "x":5.75, "y":2}, - {"label":"K26 (F0,B6)", "x":6.75, "y":2}, - {"label":"K27 (F0,B5)", "x":7.75, "y":2}, - {"label":"K28 (F0,B4)", "x":8.75, "y":2}, - {"label":"K29 (F0,D7)", "x":9.75, "y":2}, - {"label":"K2A (F0,D6)", "x":10.75, "y":2}, - {"label":"K2B (F0,D4)", "x":11.75, "y":2}, - {"label":"K2D (F0,D3)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2F (F0,B0)", "x":15, "y":2}, - {"label":"K30 (F4,B1)", "x":0, "y":3, "w":2.25}, - {"label":"K32 (F4,F6)", "x":2.25, "y":3}, - {"label":"K33 (F4,F7)", "x":3.25, "y":3}, - {"label":"K34 (F4,C7)", "x":4.25, "y":3}, - {"label":"K35 (F4,C6)", "x":5.25, "y":3}, - {"label":"K36 (F4,B6)", "x":6.25, "y":3}, - {"label":"K37 (F4,B5)", "x":7.25, "y":3}, - {"label":"K38 (F4,B4)", "x":8.25, "y":3}, - {"label":"K39 (F4,D7)", "x":9.25, "y":3}, - {"label":"K3A (F4,D6)", "x":10.25, "y":3}, - {"label":"K3B (F4,D4)", "x":11.25, "y":3}, - {"label":"K3C (F4,D5)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D (F4,D3)", "x":14, "y":3}, - {"label":"K3F (F4,B0)", "x":15, "y":3}, - {"label":"K40 (F1,B1)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (F1,F5)", "x":1.25, "y":4, "w":1.25}, - {"label":"K42 (F1,F6)", "x":2.5, "y":4, "w":1.25}, - {"label":"K46 (F1,B6)", "x":3.75, "y":4, "w":6.25}, - {"label":"K4A (F1,D6)", "x":10, "y":4, "w":1.25}, - {"label":"K4B (F1,D4)", "x":11.25, "y":4, "w":1.25}, - {"label":"K4C (F1,D5)", "x":13, "y":4}, - {"label":"K4D (F1,D3)", "x":14, "y":4}, - {"label":"K4F (F1,B0)", "x":15, "y":4} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"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, 15], "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, 15], "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, 15], "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, 15], "x": 15, "y": 4} ] }, "LAYOUT_65_ansi_blocker_tsangan_split_bs": { "layout": [ - {"label":"K00 (D0,B1)", "x":0, "y":0}, - {"label":"K01 (D0,F5)", "x":1, "y":0}, - {"label":"K02 (D0,F6)", "x":2, "y":0}, - {"label":"K03 (D0,F7)", "x":3, "y":0}, - {"label":"K04 (D0,C7)", "x":4, "y":0}, - {"label":"K05 (D0,C6)", "x":5, "y":0}, - {"label":"K06 (D0,B6)", "x":6, "y":0}, - {"label":"K07 (D0,B5)", "x":7, "y":0}, - {"label":"K08 (D0,B4)", "x":8, "y":0}, - {"label":"K09 (D0,D7)", "x":9, "y":0}, - {"label":"K0A (D0,D6)", "x":10, "y":0}, - {"label":"K0B (D0,D4)", "x":11, "y":0}, - {"label":"K0C (D0,D5)", "x":12, "y":0}, - {"label":"K0D (D0,D3)", "x":13, "y":0}, - {"label":"K0E (D0,D2)", "x":14, "y":0}, - {"label":"K0F (D0,B0)", "x":15, "y":0}, - {"label":"K10 (D1,B1)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (D1,F5)", "x":1.5, "y":1}, - {"label":"K12 (D1,F6)", "x":2.5, "y":1}, - {"label":"K13 (D1,F7)", "x":3.5, "y":1}, - {"label":"K14 (D1,C7)", "x":4.5, "y":1}, - {"label":"K15 (D1,C6)", "x":5.5, "y":1}, - {"label":"K16 (D1,B6)", "x":6.5, "y":1}, - {"label":"K17 (D1,B5)", "x":7.5, "y":1}, - {"label":"K18 (D1,B4)", "x":8.5, "y":1}, - {"label":"K19 (D1,D7)", "x":9.5, "y":1}, - {"label":"K1A (D1,D6)", "x":10.5, "y":1}, - {"label":"K1B (D1,D4)", "x":11.5, "y":1}, - {"label":"K1C (D1,D5)", "x":12.5, "y":1}, - {"label":"K1D (D1,D3)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1F (D1,B0)", "x":15, "y":1}, - {"label":"K20 (F0,B1)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (F0,F5)", "x":1.75, "y":2}, - {"label":"K22 (F0,F6)", "x":2.75, "y":2}, - {"label":"K23 (F0,F7)", "x":3.75, "y":2}, - {"label":"K24 (F0,C7)", "x":4.75, "y":2}, - {"label":"K25 (F0,C6)", "x":5.75, "y":2}, - {"label":"K26 (F0,B6)", "x":6.75, "y":2}, - {"label":"K27 (F0,B5)", "x":7.75, "y":2}, - {"label":"K28 (F0,B4)", "x":8.75, "y":2}, - {"label":"K29 (F0,D7)", "x":9.75, "y":2}, - {"label":"K2A (F0,D6)", "x":10.75, "y":2}, - {"label":"K2B (F0,D4)", "x":11.75, "y":2}, - {"label":"K2D (F0,D3)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2F (F0,B0)", "x":15, "y":2}, - {"label":"K30 (F4,B1)", "x":0, "y":3, "w":2.25}, - {"label":"K32 (F4,F6)", "x":2.25, "y":3}, - {"label":"K33 (F4,F7)", "x":3.25, "y":3}, - {"label":"K34 (F4,C7)", "x":4.25, "y":3}, - {"label":"K35 (F4,C6)", "x":5.25, "y":3}, - {"label":"K36 (F4,B6)", "x":6.25, "y":3}, - {"label":"K37 (F4,B5)", "x":7.25, "y":3}, - {"label":"K38 (F4,B4)", "x":8.25, "y":3}, - {"label":"K39 (F4,D7)", "x":9.25, "y":3}, - {"label":"K3A (F4,D6)", "x":10.25, "y":3}, - {"label":"K3B (F4,D4)", "x":11.25, "y":3}, - {"label":"K3C (F4,D5)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D (F4,D3)", "x":14, "y":3}, - {"label":"K3F (F4,B0)", "x":15, "y":3}, - {"label":"K40 (F1,B1)", "x":0, "y":4, "w":1.5}, - {"label":"K41 (F1,F5)", "x":1.5, "y":4}, - {"label":"K42 (F1,F6)", "x":2.5, "y":4, "w":1.5}, - {"label":"K46 (F1,B6)", "x":4, "y":4, "w":7}, - {"label":"K4A (F1,D6)", "x":11, "y":4, "w":1.5}, - {"label":"K4C (F1,D5)", "x":13, "y":4}, - {"label":"K4D (F1,D3)", "x":14, "y":4}, - {"label":"K4F (F1,B0)", "x":15, "y":4} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"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, 15], "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, 15], "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, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] }, "LAYOUT_iso_all": { "layout": [ - {"label":"K00 (D0,B1)", "x":0, "y":0}, - {"label":"K01 (D0,F5)", "x":1, "y":0}, - {"label":"K02 (D0,F6)", "x":2, "y":0}, - {"label":"K03 (D0,F7)", "x":3, "y":0}, - {"label":"K04 (D0,C7)", "x":4, "y":0}, - {"label":"K05 (D0,C6)", "x":5, "y":0}, - {"label":"K06 (D0,B6)", "x":6, "y":0}, - {"label":"K07 (D0,B5)", "x":7, "y":0}, - {"label":"K08 (D0,B4)", "x":8, "y":0}, - {"label":"K09 (D0,D7)", "x":9, "y":0}, - {"label":"K0A (D0,D6)", "x":10, "y":0}, - {"label":"K0B (D0,D4)", "x":11, "y":0}, - {"label":"K0C (D0,D5)", "x":12, "y":0}, - {"label":"K0D (D0,D3)", "x":13, "y":0}, - {"label":"K0E (D0,D2)", "x":14, "y":0}, - {"label":"K0F (D0,B0)", "x":15, "y":0}, - {"label":"K10 (D1,B1)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (D1,F5)", "x":1.5, "y":1}, - {"label":"K12 (D1,F6)", "x":2.5, "y":1}, - {"label":"K13 (D1,F7)", "x":3.5, "y":1}, - {"label":"K14 (D1,C7)", "x":4.5, "y":1}, - {"label":"K15 (D1,C6)", "x":5.5, "y":1}, - {"label":"K16 (D1,B6)", "x":6.5, "y":1}, - {"label":"K17 (D1,B5)", "x":7.5, "y":1}, - {"label":"K18 (D1,B4)", "x":8.5, "y":1}, - {"label":"K19 (D1,D7)", "x":9.5, "y":1}, - {"label":"K1A (D1,D6)", "x":10.5, "y":1}, - {"label":"K1B (D1,D4)", "x":11.5, "y":1}, - {"label":"K1C (D1,D5)", "x":12.5, "y":1}, - {"label":"K1F (D1,B0)", "x":15, "y":1}, - {"label":"K20 (F0,B1)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (F0,F5)", "x":1.75, "y":2}, - {"label":"K22 (F0,F6)", "x":2.75, "y":2}, - {"label":"K23 (F0,F7)", "x":3.75, "y":2}, - {"label":"K24 (F0,C7)", "x":4.75, "y":2}, - {"label":"K25 (F0,C6)", "x":5.75, "y":2}, - {"label":"K26 (F0,B6)", "x":6.75, "y":2}, - {"label":"K27 (F0,B5)", "x":7.75, "y":2}, - {"label":"K28 (F0,B4)", "x":8.75, "y":2}, - {"label":"K29 (F0,D7)", "x":9.75, "y":2}, - {"label":"K2A (F0,D6)", "x":10.75, "y":2}, - {"label":"K2B (F0,D4)", "x":11.75, "y":2}, - {"label":"K1D (D1,D3)", "x":12.75, "y":2}, - {"label":"K2D (F0,D3)", "x":13.75, "y":1, "w":1.25, "h":2}, - {"label":"K2F (F0,B0)", "x":15, "y":2}, - {"label":"K30 (F4,B1)", "x":0, "y":3, "w":1.25}, - {"label":"K31 (F4,F5)", "x":1.25, "y":3}, - {"label":"K32 (F4,F6)", "x":2.25, "y":3}, - {"label":"K33 (F4,F7)", "x":3.25, "y":3}, - {"label":"K34 (F4,C7)", "x":4.25, "y":3}, - {"label":"K35 (F4,C6)", "x":5.25, "y":3}, - {"label":"K36 (F4,B6)", "x":6.25, "y":3}, - {"label":"K37 (F4,B5)", "x":7.25, "y":3}, - {"label":"K38 (F4,B4)", "x":8.25, "y":3}, - {"label":"K39 (F4,D7)", "x":9.25, "y":3}, - {"label":"K3A (F4,D6)", "x":10.25, "y":3}, - {"label":"K3B (F4,D4)", "x":11.25, "y":3}, - {"label":"K3C (F4,D5)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D (F4,D3)", "x":14, "y":3}, - {"label":"K3F (F4,B0)", "x":15, "y":3}, - {"label":"K40 (F1,B1)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (F1,F5)", "x":1.25, "y":4, "w":1.25}, - {"label":"K42 (F1,F6)", "x":2.5, "y":4, "w":1.25}, - {"label":"K44 (F1,C7)", "x":3.75, "y":4, "w":2.25}, - {"label":"K46 (F1,B6)", "x":6, "y":4, "w":1.25}, - {"label":"K48 (F1,B4)", "x":7.25, "y":4, "w":2.75}, - {"label":"K4A (F1,D6)", "x":10, "y":4, "w":1.25}, - {"label":"K4B (F1,D4)", "x":11.25, "y":4, "w":1.25}, - {"label":"K4C (F1,D5)", "x":13, "y":4}, - {"label":"K4D (F1,D3)", "x":14, "y":4}, - {"label":"K4F (F1,B0)", "x":15, "y":4} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"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, 15], "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": [1, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"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, 15], "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, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75}, + {"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, 15], "x": 15, "y": 4} ] }, "LAYOUT_all": { "layout": [ - {"label":"K00 (D0,B1)", "x":0, "y":0}, - {"label":"K01 (D0,F5)", "x":1, "y":0}, - {"label":"K02 (D0,F6)", "x":2, "y":0}, - {"label":"K03 (D0,F7)", "x":3, "y":0}, - {"label":"K04 (D0,C7)", "x":4, "y":0}, - {"label":"K05 (D0,C6)", "x":5, "y":0}, - {"label":"K06 (D0,B6)", "x":6, "y":0}, - {"label":"K07 (D0,B5)", "x":7, "y":0}, - {"label":"K08 (D0,B4)", "x":8, "y":0}, - {"label":"K09 (D0,D7)", "x":9, "y":0}, - {"label":"K0A (D0,D6)", "x":10, "y":0}, - {"label":"K0B (D0,D4)", "x":11, "y":0}, - {"label":"K0C (D0,D5)", "x":12, "y":0}, - {"label":"K0D (D0,D3)", "x":13, "y":0}, - {"label":"K0E (D0,D2)", "x":14, "y":0}, - {"label":"K0F (D0,B0)", "x":15, "y":0}, - {"label":"K10 (D1,B1)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (D1,F5)", "x":1.5, "y":1}, - {"label":"K12 (D1,F6)", "x":2.5, "y":1}, - {"label":"K13 (D1,F7)", "x":3.5, "y":1}, - {"label":"K14 (D1,C7)", "x":4.5, "y":1}, - {"label":"K15 (D1,C6)", "x":5.5, "y":1}, - {"label":"K16 (D1,B6)", "x":6.5, "y":1}, - {"label":"K17 (D1,B5)", "x":7.5, "y":1}, - {"label":"K18 (D1,B4)", "x":8.5, "y":1}, - {"label":"K19 (D1,D7)", "x":9.5, "y":1}, - {"label":"K1A (D1,D6)", "x":10.5, "y":1}, - {"label":"K1B (D1,D4)", "x":11.5, "y":1}, - {"label":"K1C (D1,D5)", "x":12.5, "y":1}, - {"label":"K1D (D1,D3)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1F (D1,B0)", "x":15, "y":1}, - {"label":"K20 (F0,B1)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (F0,F5)", "x":1.75, "y":2}, - {"label":"K22 (F0,F6)", "x":2.75, "y":2}, - {"label":"K23 (F0,F7)", "x":3.75, "y":2}, - {"label":"K24 (F0,C7)", "x":4.75, "y":2}, - {"label":"K25 (F0,C6)", "x":5.75, "y":2}, - {"label":"K26 (F0,B6)", "x":6.75, "y":2}, - {"label":"K27 (F0,B5)", "x":7.75, "y":2}, - {"label":"K28 (F0,B4)", "x":8.75, "y":2}, - {"label":"K29 (F0,D7)", "x":9.75, "y":2}, - {"label":"K2A (F0,D6)", "x":10.75, "y":2}, - {"label":"K2B (F0,D4)", "x":11.75, "y":2}, - {"label":"K2D (F0,D3)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2F (F0,B0)", "x":15, "y":2}, - {"label":"K30 (F4,B1)", "x":0, "y":3, "w":1.25}, - {"label":"K31 (F4,F5)", "x":1.25, "y":3}, - {"label":"K32 (F4,F6)", "x":2.25, "y":3}, - {"label":"K33 (F4,F7)", "x":3.25, "y":3}, - {"label":"K34 (F4,C7)", "x":4.25, "y":3}, - {"label":"K35 (F4,C6)", "x":5.25, "y":3}, - {"label":"K36 (F4,B6)", "x":6.25, "y":3}, - {"label":"K37 (F4,B5)", "x":7.25, "y":3}, - {"label":"K38 (F4,B4)", "x":8.25, "y":3}, - {"label":"K39 (F4,D7)", "x":9.25, "y":3}, - {"label":"K3A (F4,D6)", "x":10.25, "y":3}, - {"label":"K3B (F4,D4)", "x":11.25, "y":3}, - {"label":"K3C (F4,D5)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D (F4,D3)", "x":14, "y":3}, - {"label":"K3F (F4,B0)", "x":15, "y":3}, - {"label":"K40 (F1,B1)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (F1,F5)", "x":1.25, "y":4, "w":1.25}, - {"label":"K42 (F1,F6)", "x":2.5, "y":4, "w":1.25}, - {"label":"K44 (F1,C7)", "x":3.75, "y":4, "w":2.25}, - {"label":"K46 (F1,B6)", "x":6, "y":4, "w":1.25}, - {"label":"K48 (F1,B4)", "x":7.25, "y":4, "w":2.75}, - {"label":"K4A (F1,D6)", "x":10, "y":4, "w":1.25}, - {"label":"K4B (F1,D4)", "x":11.25, "y":4, "w":1.25}, - {"label":"K4C (F1,D5)", "x":13, "y":4}, - {"label":"K4D (F1,D3)", "x":14, "y":4}, - {"label":"K4F (F1,B0)", "x":15, "y":4} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"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, 15], "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, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"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, 15], "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, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75}, + {"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, 15], "x": 15, "y": 4} ] } } diff --git a/keyboards/foxlab/key65/universal/universal.c b/keyboards/foxlab/key65/universal/universal.c deleted file mode 100644 index 5fa9e8f171..0000000000 --- a/keyboards/foxlab/key65/universal/universal.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Jumail Mundekkat / MxBlue - * - * 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 "universal.h" diff --git a/keyboards/foxlab/key65/universal/universal.h b/keyboards/foxlab/key65/universal/universal.h deleted file mode 100644 index 9d92030c81..0000000000 --- a/keyboards/foxlab/key65/universal/universal.h +++ /dev/null @@ -1,75 +0,0 @@ -/* Copyright 2020 Jumail Mundekkat / MxBlue - * - * 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_65_ansi_blocker_split_bs( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \ - K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, K2F }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, K3F }, \ - { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, KC_NO, K4F }, \ -} - -#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \ - K40, K41, K42, K46, K4B, K4C, K4D, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, K2F }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, K3F }, \ - { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, KC_NO, K4B, K4C, K4D, KC_NO, K4F }, \ -} - -#define LAYOUT_iso_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, K2D, K2F, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \ - K40, K41, K42, K44, K46, K48, K4A, K4B, K4C, K4D, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, K3F }, \ - { K40, K41, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, K4B, K4C, K4D, KC_NO, K4F }, \ -} - -#define LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \ - K40, K41, K42, K44, K46, K48, K4A, K4B, K4C, K4D, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, K3F }, \ - { K40, K41, K42, KC_NO, K44, KC_NO, K46, KC_NO, K48, KC_NO, K4A, K4B, K4C, K4D, KC_NO, K4F }, \ -} diff --git a/keyboards/foxlab/leaf60/hotswap/config.h b/keyboards/foxlab/leaf60/hotswap/config.h index ee55e167d6..a7b28ae1db 100644 --- a/keyboards/foxlab/leaf60/hotswap/config.h +++ b/keyboards/foxlab/leaf60/hotswap/config.h @@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D2, D1, D0, D3, D5 } -#define MATRIX_COL_PINS { F5, F4, F1, F0, B0, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -52,8 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif - /* 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/foxlab/leaf60/hotswap/hotswap.c b/keyboards/foxlab/leaf60/hotswap/hotswap.c deleted file mode 100644 index e2de4a7e31..0000000000 --- a/keyboards/foxlab/leaf60/hotswap/hotswap.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Fox Lab - * - * 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 "hotswap.h" diff --git a/keyboards/foxlab/leaf60/hotswap/info.json b/keyboards/foxlab/leaf60/hotswap/info.json index 43f287ebca..487bf007eb 100644 --- a/keyboards/foxlab/leaf60/hotswap/info.json +++ b/keyboards/foxlab/leaf60/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F4", "F1", "F0", "B0", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["D2", "D1", "D0", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 4, @@ -17,6 +22,9 @@ "caps_lock": "E6", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/foxlab/leaf60/universal/config.h b/keyboards/foxlab/leaf60/universal/config.h index d856375a5d..a7b28ae1db 100644 --- a/keyboards/foxlab/leaf60/universal/config.h +++ b/keyboards/foxlab/leaf60/universal/config.h @@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { D0, D1, F0, F4, F1 } -#define MATRIX_COL_PINS { B0, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -51,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/foxlab/leaf60/universal/info.json b/keyboards/foxlab/leaf60/universal/info.json index c782a6e50f..a14d795573 100644 --- a/keyboards/foxlab/leaf60/universal/info.json +++ b/keyboards/foxlab/leaf60/universal/info.json @@ -8,6 +8,11 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], + "rows": ["D0", "D1", "F0", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true @@ -16,6 +21,9 @@ "caps_lock": "E6", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb"], diff --git a/keyboards/foxlab/leaf60/universal/universal.c b/keyboards/foxlab/leaf60/universal/universal.c deleted file mode 100644 index 197e411d70..0000000000 --- a/keyboards/foxlab/leaf60/universal/universal.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Fox Lab - * - * 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 "universal.h" diff --git a/keyboards/foxlab/time80/config.h b/keyboards/foxlab/time80/config.h index 4c41ecf073..615df15ac7 100644 --- a/keyboards/foxlab/time80/config.h +++ b/keyboards/foxlab/time80/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// 0 1 2 3 4 5 6 7 8 9 A B C D E -#define MATRIX_ROW_PINS { B1, B2, B3, B5, B6, B7, B0 } -#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7, A0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGBLED_NUM 16 //#define RGBLIGHT_HUE_STEP 8 //#define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/foxlab/time80/info.json b/keyboards/foxlab/time80/info.json index f59a287de2..682e70125c 100644 --- a/keyboards/foxlab/time80/info.json +++ b/keyboards/foxlab/time80/info.json @@ -8,9 +8,17 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "D7", "A0"], + "rows": ["B1", "B2", "B3", "B5", "B6", "B7", "B0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, + "ws2812": { + "driver": "i2c" + }, "processor": "atmega32a", "bootloader": "bootloadhid", "layouts": { diff --git a/keyboards/foxlab/time80/rules.mk b/keyboards/foxlab/time80/rules.mk index a3ca698e0b..62a9a9a51a 100644 --- a/keyboards/foxlab/time80/rules.mk +++ b/keyboards/foxlab/time80/rules.mk @@ -8,4 +8,3 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -WS2812_DRIVER = i2c diff --git a/keyboards/foxlab/time80/time80.c b/keyboards/foxlab/time80/time80.c deleted file mode 100644 index d2cf8cef2c..0000000000 --- a/keyboards/foxlab/time80/time80.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Lukas Alexander - * - * 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 "time80.h" diff --git a/keyboards/foxlab/time80/time80.h b/keyboards/foxlab/time80/time80.h index f451b32f01..54ac3fb9d7 100644 --- a/keyboards/foxlab/time80/time80.h +++ b/keyboards/foxlab/time80/time80.h @@ -34,11 +34,11 @@ k40, k4D, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4E, k4C, \ k50, k51, k52, k54, k58, k59, k5A, k5B, k5E, k5C, k57 \ ) { \ - { k00, KC_NO, k02, k03, k04, k05, KC_NO, k07, k08, k09, k0A, k0B, k0C, KC_NO, 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, KC_NO, 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, k54, KC_NO, KC_NO, k57, k58, k59, k5A, k5B, k5C, KC_NO, k5E }, \ - { KC_NO, k61, k62, KC_NO, k64, k65, k66, k67, k68, KC_NO, KC_NO, KC_NO, k6C, KC_NO, k6E } \ + { k00, k01, k02, k03, k04, k05, KC_NO, k07, k08, k09, k0A, k0B, k0C, KC_NO, 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, KC_NO, 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, k54, KC_NO, KC_NO, k57, k58, k59, k5A, k5B, k5C, KC_NO, k5E }, \ + { KC_NO, k61, k62, KC_NO, k64, k65, k66, k67, k68, KC_NO, KC_NO, KC_NO, k6C, KC_NO, k6E } \ } diff --git a/keyboards/foxlab/time_re/hotswap/config.h b/keyboards/foxlab/time_re/hotswap/config.h index 9a8820cfd9..83929a1c3d 100644 --- a/keyboards/foxlab/time_re/hotswap/config.h +++ b/keyboards/foxlab/time_re/hotswap/config.h @@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D1, D0, B3, B0, B2, B1 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D6, D2, D3, D5 } - -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN E2 - -#ifdef RGB_DI_PIN #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -52,4 +33,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/foxlab/time_re/hotswap/hotswap.c b/keyboards/foxlab/time_re/hotswap/hotswap.c deleted file mode 100644 index b3acfe7b4e..0000000000 --- a/keyboards/foxlab/time_re/hotswap/hotswap.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 DongXing - * - * 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 "hotswap.h" - diff --git a/keyboards/foxlab/time_re/hotswap/hotswap.h b/keyboards/foxlab/time_re/hotswap/hotswap.h deleted file mode 100644 index 6f7dda6dfd..0000000000 --- a/keyboards/foxlab/time_re/hotswap/hotswap.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 DongXing - * - * 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( \ - K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E, K1E, K1F, K1G, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \ - K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \ -) { \ - { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, KC_NO, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, KC_NO }, \ - { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \ -} diff --git a/keyboards/foxlab/time_re/hotswap/info.json b/keyboards/foxlab/time_re/hotswap/info.json index e955aaf4da..14f0772f8d 100644 --- a/keyboards/foxlab/time_re/hotswap/info.json +++ b/keyboards/foxlab/time_re/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "D2", "D3", "D5"], + "rows": ["D1", "D0", "B3", "B0", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, @@ -15,101 +20,117 @@ "caps_lock": "E6", "on_state": 0 }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,F0)", "x":0, "y":0}, - {"label":"K02 (D1,F4)", "x":2, "y":0}, - {"label":"K03 (D1,F5)", "x":3, "y":0}, - {"label":"K04 (D1,F6)", "x":4, "y":0}, - {"label":"K05 (D1,F7)", "x":5, "y":0}, - {"label":"K06 (D1,C7)", "x":6.5, "y":0}, - {"label":"K07 (D1,C6)", "x":7.5, "y":0}, - {"label":"K08 (D1,B6)", "x":8.5, "y":0}, - {"label":"K09 (D1,B5)", "x":9.5, "y":0}, - {"label":"K0A (D1,B4)", "x":11, "y":0}, - {"label":"K0B (D1,D7)", "x":12, "y":0}, - {"label":"K0C (D1,D4)", "x":13, "y":0}, - {"label":"K0D (D1,D6)", "x":14, "y":0}, - {"label":"K0E (D1,D2)", "x":15.25, "y":0}, - {"label":"K0F (D1,D3)", "x":16.25, "y":0}, - {"label":"K0G (D1,D5)", "x":17.25, "y":0}, - {"label":"K10 (D0,F0)", "x":0, "y":1.5}, - {"label":"K11 (D0,F1)", "x":1, "y":1.5}, - {"label":"K12 (D0,F4)", "x":2, "y":1.5}, - {"label":"K13 (D0,F5)", "x":3, "y":1.5}, - {"label":"K14 (D0,F6)", "x":4, "y":1.5}, - {"label":"K15 (D0,F7)", "x":5, "y":1.5}, - {"label":"K16 (D0,C7)", "x":6, "y":1.5}, - {"label":"K17 (D0,C6)", "x":7, "y":1.5}, - {"label":"K18 (D0,B6)", "x":8, "y":1.5}, - {"label":"K19 (D0,B5)", "x":9, "y":1.5}, - {"label":"K1A (D0,B4)", "x":10, "y":1.5}, - {"label":"K1B (D0,D7)", "x":11, "y":1.5}, - {"label":"K1C (D0,D4)", "x":12, "y":1.5}, - {"label":"K1D (D0,D6)", "x":13, "y":1.5}, - {"label":"K3E (B0,D2)", "x":14, "y":1.5}, - {"label":"K1E (D0,D2)", "x":15.25, "y":1.5}, - {"label":"K1F (D0,D3)", "x":16.25, "y":1.5}, - {"label":"K1G (D0,D5)", "x":17.25, "y":1.5}, - {"label":"K20 (B3,F0)", "x":0, "y":2.5, "w":1.5}, - {"label":"K21 (B3,F1)", "x":1.5, "y":2.5}, - {"label":"K22 (B3,F4)", "x":2.5, "y":2.5}, - {"label":"K23 (B3,F5)", "x":3.5, "y":2.5}, - {"label":"K24 (B3,F6)", "x":4.5, "y":2.5}, - {"label":"K25 (B3,F7)", "x":5.5, "y":2.5}, - {"label":"K26 (B3,C7)", "x":6.5, "y":2.5}, - {"label":"K27 (B3,C6)", "x":7.5, "y":2.5}, - {"label":"K28 (B3,B6)", "x":8.5, "y":2.5}, - {"label":"K29 (B3,B5)", "x":9.5, "y":2.5}, - {"label":"K2A (B3,B4)", "x":10.5, "y":2.5}, - {"label":"K2B (B3,D7)", "x":11.5, "y":2.5}, - {"label":"K2C (B3,D4)", "x":12.5, "y":2.5}, - {"label":"K2D (B3,D6)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K2E (B3,D2)", "x":15.25, "y":2.5}, - {"label":"K2F (B3,D3)", "x":16.25, "y":2.5}, - {"label":"K2G (B3,D5)", "x":17.25, "y":2.5}, - {"label":"K30 (B0,F0)", "x":0, "y":3.5, "w":1.75}, - {"label":"K31 (B0,F1)", "x":1.75, "y":3.5}, - {"label":"K32 (B0,F4)", "x":2.75, "y":3.5}, - {"label":"K33 (B0,F5)", "x":3.75, "y":3.5}, - {"label":"K34 (B0,F6)", "x":4.75, "y":3.5}, - {"label":"K35 (B0,F7)", "x":5.75, "y":3.5}, - {"label":"K36 (B0,C7)", "x":6.75, "y":3.5}, - {"label":"K37 (B0,C6)", "x":7.75, "y":3.5}, - {"label":"K38 (B0,B6)", "x":8.75, "y":3.5}, - {"label":"K39 (B0,B5)", "x":9.75, "y":3.5}, - {"label":"K3A (B0,B4)", "x":10.75, "y":3.5}, - {"label":"K3B (B0,D7)", "x":11.75, "y":3.5}, - {"label":"K3D (B0,D6)", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K40 (B2,F0)", "x":0, "y":4.5, "w":1.25}, - {"label":"K41 (B2,F1)", "x":1.25, "y":4.5}, - {"label":"K42 (B2,F4)", "x":2.25, "y":4.5}, - {"label":"K43 (B2,F5)", "x":3.25, "y":4.5}, - {"label":"K44 (B2,F6)", "x":4.25, "y":4.5}, - {"label":"K45 (B2,F7)", "x":5.25, "y":4.5}, - {"label":"K46 (B2,C7)", "x":6.25, "y":4.5}, - {"label":"K47 (B2,C6)", "x":7.25, "y":4.5}, - {"label":"K48 (B2,B6)", "x":8.25, "y":4.5}, - {"label":"K49 (B2,B5)", "x":9.25, "y":4.5}, - {"label":"K4A (B2,B4)", "x":10.25, "y":4.5}, - {"label":"K4B (B2,D7)", "x":11.25, "y":4.5}, - {"label":"K4C (B2,D4)", "x":12.25, "y":4.5, "w":1.75}, - {"label":"K4D (B2,D6)", "x":14, "y":4.5}, - {"label":"K4F (B2,D3)", "x":16.25, "y":4.5}, - {"label":"K50 (B1,F0)", "x":0, "y":5.5, "w":1.25}, - {"label":"K51 (B1,F1)", "x":1.25, "y":5.5, "w":1.25}, - {"label":"K52 (B1,F4)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"K56 (B1,C7)", "x":3.75, "y":5.5, "w":6.25}, - {"label":"K5A (B1,B4)", "x":10, "y":5.5, "w":1.25}, - {"label":"K5B (B1,D7)", "x":11.25, "y":5.5, "w":1.25}, - {"label":"K5C (B1,D4)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"K5D (B1,D6)", "x":13.75, "y":5.5, "w":1.25}, - {"label":"K5E (B1,D2)", "x":15.25, "y":5.5}, - {"label":"K5F (B1,D3)", "x":16.25, "y":5.5}, - {"label":"K5G (B1,D5)", "x":17.25, "y":5.5} + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5}, + {"matrix": [3, 14], "x": 14, "y": 1.5}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [1, 16], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.25, "y": 2.5}, + {"matrix": [2, 16], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.5}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"matrix": [5, 15], "x": 16.25, "y": 5.5}, + {"matrix": [5, 16], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/foxlab/time_re/universal/config.h b/keyboards/foxlab/time_re/universal/config.h index 9a8820cfd9..83929a1c3d 100644 --- a/keyboards/foxlab/time_re/universal/config.h +++ b/keyboards/foxlab/time_re/universal/config.h @@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D1, D0, B3, B0, B2, B1 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D6, D2, D3, D5 } - -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN E2 - -#ifdef RGB_DI_PIN #define RGBLED_NUM 5 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -52,4 +33,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/foxlab/time_re/universal/info.json b/keyboards/foxlab/time_re/universal/info.json index e955aaf4da..5cfbf7eec2 100644 --- a/keyboards/foxlab/time_re/universal/info.json +++ b/keyboards/foxlab/time_re/universal/info.json @@ -8,9 +8,17 @@ "pid": "0x0006", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "D2", "D3", "D5"], + "rows": ["D1", "D0", "B3", "B0", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "E6", "on_state": 0 @@ -20,96 +28,109 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,F0)", "x":0, "y":0}, - {"label":"K02 (D1,F4)", "x":2, "y":0}, - {"label":"K03 (D1,F5)", "x":3, "y":0}, - {"label":"K04 (D1,F6)", "x":4, "y":0}, - {"label":"K05 (D1,F7)", "x":5, "y":0}, - {"label":"K06 (D1,C7)", "x":6.5, "y":0}, - {"label":"K07 (D1,C6)", "x":7.5, "y":0}, - {"label":"K08 (D1,B6)", "x":8.5, "y":0}, - {"label":"K09 (D1,B5)", "x":9.5, "y":0}, - {"label":"K0A (D1,B4)", "x":11, "y":0}, - {"label":"K0B (D1,D7)", "x":12, "y":0}, - {"label":"K0C (D1,D4)", "x":13, "y":0}, - {"label":"K0D (D1,D6)", "x":14, "y":0}, - {"label":"K0E (D1,D2)", "x":15.25, "y":0}, - {"label":"K0F (D1,D3)", "x":16.25, "y":0}, - {"label":"K0G (D1,D5)", "x":17.25, "y":0}, - {"label":"K10 (D0,F0)", "x":0, "y":1.5}, - {"label":"K11 (D0,F1)", "x":1, "y":1.5}, - {"label":"K12 (D0,F4)", "x":2, "y":1.5}, - {"label":"K13 (D0,F5)", "x":3, "y":1.5}, - {"label":"K14 (D0,F6)", "x":4, "y":1.5}, - {"label":"K15 (D0,F7)", "x":5, "y":1.5}, - {"label":"K16 (D0,C7)", "x":6, "y":1.5}, - {"label":"K17 (D0,C6)", "x":7, "y":1.5}, - {"label":"K18 (D0,B6)", "x":8, "y":1.5}, - {"label":"K19 (D0,B5)", "x":9, "y":1.5}, - {"label":"K1A (D0,B4)", "x":10, "y":1.5}, - {"label":"K1B (D0,D7)", "x":11, "y":1.5}, - {"label":"K1C (D0,D4)", "x":12, "y":1.5}, - {"label":"K1D (D0,D6)", "x":13, "y":1.5}, - {"label":"K3E (B0,D2)", "x":14, "y":1.5}, - {"label":"K1E (D0,D2)", "x":15.25, "y":1.5}, - {"label":"K1F (D0,D3)", "x":16.25, "y":1.5}, - {"label":"K1G (D0,D5)", "x":17.25, "y":1.5}, - {"label":"K20 (B3,F0)", "x":0, "y":2.5, "w":1.5}, - {"label":"K21 (B3,F1)", "x":1.5, "y":2.5}, - {"label":"K22 (B3,F4)", "x":2.5, "y":2.5}, - {"label":"K23 (B3,F5)", "x":3.5, "y":2.5}, - {"label":"K24 (B3,F6)", "x":4.5, "y":2.5}, - {"label":"K25 (B3,F7)", "x":5.5, "y":2.5}, - {"label":"K26 (B3,C7)", "x":6.5, "y":2.5}, - {"label":"K27 (B3,C6)", "x":7.5, "y":2.5}, - {"label":"K28 (B3,B6)", "x":8.5, "y":2.5}, - {"label":"K29 (B3,B5)", "x":9.5, "y":2.5}, - {"label":"K2A (B3,B4)", "x":10.5, "y":2.5}, - {"label":"K2B (B3,D7)", "x":11.5, "y":2.5}, - {"label":"K2C (B3,D4)", "x":12.5, "y":2.5}, - {"label":"K2D (B3,D6)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K2E (B3,D2)", "x":15.25, "y":2.5}, - {"label":"K2F (B3,D3)", "x":16.25, "y":2.5}, - {"label":"K2G (B3,D5)", "x":17.25, "y":2.5}, - {"label":"K30 (B0,F0)", "x":0, "y":3.5, "w":1.75}, - {"label":"K31 (B0,F1)", "x":1.75, "y":3.5}, - {"label":"K32 (B0,F4)", "x":2.75, "y":3.5}, - {"label":"K33 (B0,F5)", "x":3.75, "y":3.5}, - {"label":"K34 (B0,F6)", "x":4.75, "y":3.5}, - {"label":"K35 (B0,F7)", "x":5.75, "y":3.5}, - {"label":"K36 (B0,C7)", "x":6.75, "y":3.5}, - {"label":"K37 (B0,C6)", "x":7.75, "y":3.5}, - {"label":"K38 (B0,B6)", "x":8.75, "y":3.5}, - {"label":"K39 (B0,B5)", "x":9.75, "y":3.5}, - {"label":"K3A (B0,B4)", "x":10.75, "y":3.5}, - {"label":"K3B (B0,D7)", "x":11.75, "y":3.5}, - {"label":"K3D (B0,D6)", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K40 (B2,F0)", "x":0, "y":4.5, "w":1.25}, - {"label":"K41 (B2,F1)", "x":1.25, "y":4.5}, - {"label":"K42 (B2,F4)", "x":2.25, "y":4.5}, - {"label":"K43 (B2,F5)", "x":3.25, "y":4.5}, - {"label":"K44 (B2,F6)", "x":4.25, "y":4.5}, - {"label":"K45 (B2,F7)", "x":5.25, "y":4.5}, - {"label":"K46 (B2,C7)", "x":6.25, "y":4.5}, - {"label":"K47 (B2,C6)", "x":7.25, "y":4.5}, - {"label":"K48 (B2,B6)", "x":8.25, "y":4.5}, - {"label":"K49 (B2,B5)", "x":9.25, "y":4.5}, - {"label":"K4A (B2,B4)", "x":10.25, "y":4.5}, - {"label":"K4B (B2,D7)", "x":11.25, "y":4.5}, - {"label":"K4C (B2,D4)", "x":12.25, "y":4.5, "w":1.75}, - {"label":"K4D (B2,D6)", "x":14, "y":4.5}, - {"label":"K4F (B2,D3)", "x":16.25, "y":4.5}, - {"label":"K50 (B1,F0)", "x":0, "y":5.5, "w":1.25}, - {"label":"K51 (B1,F1)", "x":1.25, "y":5.5, "w":1.25}, - {"label":"K52 (B1,F4)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"K56 (B1,C7)", "x":3.75, "y":5.5, "w":6.25}, - {"label":"K5A (B1,B4)", "x":10, "y":5.5, "w":1.25}, - {"label":"K5B (B1,D7)", "x":11.25, "y":5.5, "w":1.25}, - {"label":"K5C (B1,D4)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"K5D (B1,D6)", "x":13.75, "y":5.5, "w":1.25}, - {"label":"K5E (B1,D2)", "x":15.25, "y":5.5}, - {"label":"K5F (B1,D3)", "x":16.25, "y":5.5}, - {"label":"K5G (B1,D5)", "x":17.25, "y":5.5} + {"matrix": [0, 0], "x": 0, "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.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5}, + {"matrix": [3, 14], "x": 14, "y": 1.5}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [1, 16], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.25, "y": 2.5}, + {"matrix": [2, 16], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.5}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"matrix": [5, 15], "x": 16.25, "y": 5.5}, + {"matrix": [5, 16], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/foxlab/time_re/universal/universal.c b/keyboards/foxlab/time_re/universal/universal.c deleted file mode 100644 index 286104854b..0000000000 --- a/keyboards/foxlab/time_re/universal/universal.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 DongXing - * - * 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 "universal.h" - diff --git a/keyboards/foxlab/time_re/universal/universal.h b/keyboards/foxlab/time_re/universal/universal.h deleted file mode 100644 index 6f7dda6dfd..0000000000 --- a/keyboards/foxlab/time_re/universal/universal.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 DongXing - * - * 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( \ - K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E, K1E, K1F, K1G, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \ - K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \ -) { \ - { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, KC_NO, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, KC_NO }, \ - { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \ -} |