From e933e0411f442fa411d3d5ec488180fee241e2ef Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 05:41:58 +1100 Subject: Move matrix config to info.json, part 5 (#20003) Co-authored-by: Nick Brassel --- keyboards/alfredslab/swift65/hotswap/config.h | 16 ---------------- keyboards/alfredslab/swift65/hotswap/info.json | 5 +++++ keyboards/alfredslab/swift65/solder/config.h | 16 ---------------- keyboards/alfredslab/swift65/solder/info.json | 5 +++++ 4 files changed, 10 insertions(+), 32 deletions(-) (limited to 'keyboards/alfredslab') diff --git a/keyboards/alfredslab/swift65/hotswap/config.h b/keyboards/alfredslab/swift65/hotswap/config.h index 585855ebe9..1fc317877d 100644 --- a/keyboards/alfredslab/swift65/hotswap/config.h +++ b/keyboards/alfredslab/swift65/hotswap/config.h @@ -16,22 +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 { B1, B2, B3, D6, D4 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, C7, C6, B6, B5, B4, D7, D5, D3, D1 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 22 diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json index 89ac7c7b17..775c580879 100644 --- a/keyboards/alfredslab/swift65/hotswap/info.json +++ b/keyboards/alfredslab/swift65/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0xD4C4", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D1"], + "rows": ["B1", "B2", "B3", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h index aa2502a0a1..ae3dc8c2e0 100644 --- a/keyboards/alfredslab/swift65/solder/config.h +++ b/keyboards/alfredslab/swift65/solder/config.h @@ -17,22 +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 { B1, B2, B3, D4, D6 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, C7, C6, B6, B5, B4, D7, D5, D3, D1, D0 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN D2 #ifdef RGB_DI_PIN #define RGBLED_NUM 14 diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json index 0f1d9c428e..23f3e16fc4 100644 --- a/keyboards/alfredslab/swift65/solder/info.json +++ b/keyboards/alfredslab/swift65/solder/info.json @@ -8,6 +8,11 @@ "pid": "0xD4C3", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D1", "D0"], + "rows": ["B1", "B2", "B3", "D4", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { -- cgit v1.2.3 From 02ccc50e6085a9d0a4f38f252960e2d14ffe4d1f Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Mar 2023 14:02:04 +1100 Subject: Remove more empty headers (#20155) --- keyboards/alfredslab/swift65/hotswap/hotswap.c | 19 ------------------- keyboards/alfredslab/swift65/solder/solder.c | 17 ----------------- 2 files changed, 36 deletions(-) delete mode 100644 keyboards/alfredslab/swift65/hotswap/hotswap.c delete mode 100644 keyboards/alfredslab/swift65/solder/solder.c (limited to 'keyboards/alfredslab') diff --git a/keyboards/alfredslab/swift65/hotswap/hotswap.c b/keyboards/alfredslab/swift65/hotswap/hotswap.c deleted file mode 100644 index 83546fff4e..0000000000 --- a/keyboards/alfredslab/swift65/hotswap/hotswap.c +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 Steven Phillips (spooknik) - * - * 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 . - */ - - -#include "hotswap.h" - diff --git a/keyboards/alfredslab/swift65/solder/solder.c b/keyboards/alfredslab/swift65/solder/solder.c deleted file mode 100644 index 4dd021ba7c..0000000000 --- a/keyboards/alfredslab/swift65/solder/solder.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Steven Phillips (spooknik) - * - * 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 . - */ - -#include "solder.h" -- cgit v1.2.3 From ad625e7c06929092231e8f426cbe972681d91a03 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 23 Mar 2023 21:38:01 +1100 Subject: Remove `RGB_DI_PIN` ifdefs (#20218) --- keyboards/alfredslab/swift65/hotswap/config.h | 2 -- keyboards/alfredslab/swift65/solder/config.h | 2 -- 2 files changed, 4 deletions(-) (limited to 'keyboards/alfredslab') diff --git a/keyboards/alfredslab/swift65/hotswap/config.h b/keyboards/alfredslab/swift65/hotswap/config.h index 1fc317877d..9f1b065678 100644 --- a/keyboards/alfredslab/swift65/hotswap/config.h +++ b/keyboards/alfredslab/swift65/hotswap/config.h @@ -17,7 +17,6 @@ #pragma once #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,4 +34,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h index ae3dc8c2e0..8acc73207e 100644 --- a/keyboards/alfredslab/swift65/solder/config.h +++ b/keyboards/alfredslab/swift65/solder/config.h @@ -18,7 +18,6 @@ #pragma once #define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -35,4 +34,3 @@ # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -#endif -- cgit v1.2.3 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- keyboards/alfredslab/swift65/hotswap/config.h | 1 - keyboards/alfredslab/swift65/hotswap/info.json | 3 +++ keyboards/alfredslab/swift65/solder/config.h | 1 - keyboards/alfredslab/swift65/solder/info.json | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) (limited to 'keyboards/alfredslab') diff --git a/keyboards/alfredslab/swift65/hotswap/config.h b/keyboards/alfredslab/swift65/hotswap/config.h index 9f1b065678..8fc29553d6 100644 --- a/keyboards/alfredslab/swift65/hotswap/config.h +++ b/keyboards/alfredslab/swift65/hotswap/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json index 775c580879..2e7f9bf2c2 100644 --- a/keyboards/alfredslab/swift65/hotswap/info.json +++ b/keyboards/alfredslab/swift65/hotswap/info.json @@ -8,6 +8,9 @@ "pid": "0xD4C4", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D1"], "rows": ["B1", "B2", "B3", "D6", "D4"] diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h index 8acc73207e..79c1824d08 100644 --- a/keyboards/alfredslab/swift65/solder/config.h +++ b/keyboards/alfredslab/swift65/solder/config.h @@ -17,7 +17,6 @@ #pragma once -#define RGB_DI_PIN D2 #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json index 23f3e16fc4..79583e099c 100644 --- a/keyboards/alfredslab/swift65/solder/info.json +++ b/keyboards/alfredslab/swift65/solder/info.json @@ -8,6 +8,9 @@ "pid": "0xD4C3", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3", "D1", "D0"], "rows": ["B1", "B2", "B3", "D4", "D6"] -- cgit v1.2.3 From f111bea3cda240b7c54bff2e12b5043b7b0797f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 25 Apr 2023 02:38:35 +1000 Subject: Move miscellaneous layouts to data driven (#20516) --- keyboards/alfredslab/swift65/hotswap/hotswap.h | 35 -- keyboards/alfredslab/swift65/hotswap/info.json | 138 +++--- keyboards/alfredslab/swift65/solder/info.json | 576 +++++++++++++------------ keyboards/alfredslab/swift65/solder/solder.h | 77 ---- 4 files changed, 369 insertions(+), 457 deletions(-) delete mode 100644 keyboards/alfredslab/swift65/hotswap/hotswap.h delete mode 100644 keyboards/alfredslab/swift65/solder/solder.h (limited to 'keyboards/alfredslab') diff --git a/keyboards/alfredslab/swift65/hotswap/hotswap.h b/keyboards/alfredslab/swift65/hotswap/hotswap.h deleted file mode 100644 index ab9c3d8250..0000000000 --- a/keyboards/alfredslab/swift65/hotswap/hotswap.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 Steven Phillips (spooknik) - * - * 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 . - */ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_7u_space( \ - 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, \ - K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K46, 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, XXX, K2D, K2E }, \ - { XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX }, \ - { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, K4E }, \ -} diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json index 2e7f9bf2c2..e246fcc85f 100644 --- a/keyboards/alfredslab/swift65/hotswap/info.json +++ b/keyboards/alfredslab/swift65/hotswap/info.json @@ -25,71 +25,79 @@ "layouts": { "LAYOUT_7u_space": { "layout": [ - { "label": "K00 (B1,F7)", "x": 0, "y": 0 }, - { "label": "K01 (B1,F6)", "x": 1, "y": 0 }, - { "label": "K02 (B1,F5)", "x": 2, "y": 0 }, - { "label": "K03 (B1,F4)", "x": 3, "y": 0 }, - { "label": "K04 (B1,F1)", "x": 4, "y": 0 }, - { "label": "K05 (B1,F0)", "x": 5, "y": 0 }, - { "label": "K06 (B1,C7)", "x": 6, "y": 0 }, - { "label": "K07 (B1,C6)", "x": 7, "y": 0 }, - { "label": "K08 (B1,B6)", "x": 8, "y": 0 }, - { "label": "K09 (B1,B5)", "x": 9, "y": 0 }, - { "label": "K0A (B1,B4)", "x": 10, "y": 0 }, - { "label": "K0B (B1,D7)", "x": 11, "y": 0 }, - { "label": "K0C (B1,D5)", "x": 12, "y": 0 }, - { "label": "K0D (B1,D3)", "x": 13, "y": 0, "w": 2 }, - { "label": "K0E (B1,D1)", "x": 15.25, "y": 0 }, - { "label": "K10 (B2,F7)", "x": 0, "y": 1, "w": 1.5 }, - { "label": "K11 (B2,F6)", "x": 1.5, "y": 1 }, - { "label": "K12 (B2,F5)", "x": 2.5, "y": 1 }, - { "label": "K13 (B2,F4)", "x": 3.5, "y": 1 }, - { "label": "K14 (B2,F1)", "x": 4.5, "y": 1 }, - { "label": "K15 (B2,F0)", "x": 5.5, "y": 1 }, - { "label": "K16 (B2,C7)", "x": 6.5, "y": 1 }, - { "label": "K17 (B2,C6)", "x": 7.5, "y": 1 }, - { "label": "K18 (B2,B6)", "x": 8.5, "y": 1 }, - { "label": "K19 (B2,B5)", "x": 9.5, "y": 1 }, - { "label": "K1A (B2,B4)", "x": 10.5, "y": 1 }, - { "label": "K1B (B2,D7)", "x": 11.5, "y": 1 }, - { "label": "K1C (B2,D5)", "x": 12.5, "y": 1 }, - { "label": "K1D (B2,D3)", "x": 13.5, "y": 1, "w": 1.5 }, - { "label": "K1E (B2,D1)", "x": 15.25, "y": 1 }, - { "label": "K20 (B3,F7)", "x": 0, "y": 2, "w": 1.75 }, - { "label": "K21 (B3,F6)", "x": 1.75, "y": 2 }, - { "label": "K22 (B3,F5)", "x": 2.75, "y": 2 }, - { "label": "K23 (B3,F4)", "x": 3.75, "y": 2 }, - { "label": "K24 (B3,F1)", "x": 4.75, "y": 2 }, - { "label": "K25 (B3,F0)", "x": 5.75, "y": 2 }, - { "label": "K26 (B3,C7)", "x": 6.75, "y": 2 }, - { "label": "K27 (B3,C6)", "x": 7.75, "y": 2 }, - { "label": "K28 (B3,B6)", "x": 8.75, "y": 2 }, - { "label": "K29 (B3,B5)", "x": 9.75, "y": 2 }, - { "label": "K2A (B3,B4)", "x": 10.75, "y": 2 }, - { "label": "K2B (B3,D7)", "x": 11.75, "y": 2 }, - { "label": "K2D (B3,D3)", "x": 12.75, "y": 2, "w": 2.25 }, - { "label": "K2E (B3,D1)", "x": 15.25, "y": 2 }, - { "label": "K31 (D6,F6)", "x": 0, "y": 3, "w": 2.25 }, - { "label": "K32 (D6,F5)", "x": 2.25, "y": 3 }, - { "label": "K33 (D6,F4)", "x": 3.25, "y": 3 }, - { "label": "K34 (D6,F1)", "x": 4.25, "y": 3 }, - { "label": "K35 (D6,F0)", "x": 5.25, "y": 3 }, - { "label": "K36 (D6,C7)", "x": 6.25, "y": 3 }, - { "label": "K37 (D6,C6)", "x": 7.25, "y": 3 }, - { "label": "K38 (D6,B6)", "x": 8.25, "y": 3 }, - { "label": "K39 (D6,B5)", "x": 9.25, "y": 3 }, - { "label": "K3A (D6,B4)", "x": 10.25, "y": 3 }, - { "label": "K3B (D6,D7)", "x": 11.25, "y": 3 }, - { "label": "K3C (D6,D5)", "x": 12.25, "y": 3, "w": 1.75 }, - { "label": "K3D (D6,D3)", "x": 14, "y": 3 }, - { "label": "K40 (D4,F7)", "x": 0, "y": 4, "w": 1.5 }, - { "label": "K41 (D4,F6)", "x": 1.5, "y": 4}, - { "label": "K42 (D4,F5)", "x": 2.5, "y": 4, "w": 1.5 }, - { "label": "K46 (D4,C7)", "x": 4, "y": 4, "w": 7}, - { "label": "K4B (D4,D7)", "x": 11, "y": 4, "w": 1.5 }, - { "label": "K4C (D4,D5)", "x": 13, "y": 4 }, - { "label": "K4D (D4,D3)", "x": 14, "y": 4 }, - { "label": "K4E (D4,D1)", "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.25, "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.25, "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.25, "y": 2}, + + {"matrix": [3, 1], "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": [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, 14], "x": 15, "y": 4} ] } } diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json index 79583e099c..abaaf12353 100644 --- a/keyboards/alfredslab/swift65/solder/info.json +++ b/keyboards/alfredslab/swift65/solder/info.json @@ -25,298 +25,314 @@ "layouts": { "LAYOUT_625u_space": { "layout": [ - {"label":"K00 (B1,F7)", "x":0, "y":0}, - {"label":"K01 (B1,F6)", "x":1, "y":0}, - {"label":"K02 (B1,F5)", "x":2, "y":0}, - {"label":"K03 (B1,F4)", "x":3, "y":0}, - {"label":"K04 (B1,F1)", "x":4, "y":0}, - {"label":"K05 (B1,F0)", "x":5, "y":0}, - {"label":"K06 (B1,C7)", "x":6, "y":0}, - {"label":"K07 (B1,C6)", "x":7, "y":0}, - {"label":"K08 (B1,B6)", "x":8, "y":0}, - {"label":"K09 (B1,B5)", "x":9, "y":0}, - {"label":"K0A (B1,B4)", "x":10, "y":0}, - {"label":"K0B (B1,D7)", "x":11, "y":0}, - {"label":"K0C (B1,D5)", "x":12, "y":0}, - {"label":"K0D (B1,D3)", "x":13, "y":0, "w":2}, - {"label":"K0E (B1,D1)", "x":15.25, "y":0}, - - {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B2,F6)", "x":1.5, "y":1}, - {"label":"K12 (B2,F5)", "x":2.5, "y":1}, - {"label":"K13 (B2,F4)", "x":3.5, "y":1}, - {"label":"K14 (B2,F1)", "x":4.5, "y":1}, - {"label":"K15 (B2,F0)", "x":5.5, "y":1}, - {"label":"K16 (B2,C7)", "x":6.5, "y":1}, - {"label":"K17 (B2,C6)", "x":7.5, "y":1}, - {"label":"K18 (B2,B6)", "x":8.5, "y":1}, - {"label":"K19 (B2,B5)", "x":9.5, "y":1}, - {"label":"K1A (B2,B4)", "x":10.5, "y":1}, - {"label":"K1B (B2,D7)", "x":11.5, "y":1}, - {"label":"K1C (B2,D5)", "x":12.5, "y":1}, - {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1E (B2,D1)", "x":15.25, "y":1}, - - {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (B3,F6)", "x":1.75, "y":2}, - {"label":"K22 (B3,F5)", "x":2.75, "y":2}, - {"label":"K23 (B3,F4)", "x":3.75, "y":2}, - {"label":"K24 (B3,F1)", "x":4.75, "y":2}, - {"label":"K25 (B3,F0)", "x":5.75, "y":2}, - {"label":"K26 (B3,C7)", "x":6.75, "y":2}, - {"label":"K27 (B3,C6)", "x":7.75, "y":2}, - {"label":"K28 (B3,B6)", "x":8.75, "y":2}, - {"label":"K29 (B3,B5)", "x":9.75, "y":2}, - {"label":"K2A (B3,B4)", "x":10.75, "y":2}, - {"label":"K2B (B3,D7)", "x":11.75, "y":2}, - {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2E (B3,D1)", "x":15.25, "y":2}, - - {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25}, - {"label":"K32 (D4,F5)", "x":2.25, "y":3}, - {"label":"K33 (D4,F4)", "x":3.25, "y":3}, - {"label":"K34 (D4,F1)", "x":4.25, "y":3}, - {"label":"K35 (D4,F0)", "x":5.25, "y":3}, - {"label":"K36 (D4,C7)", "x":6.25, "y":3}, - {"label":"K37 (D4,C6)", "x":7.25, "y":3}, - {"label":"K38 (D4,B6)", "x":8.25, "y":3}, - {"label":"K39 (D4,B5)", "x":9.25, "y":3}, - {"label":"K3A (D4,B4)", "x":10.25, "y":3}, - {"label":"K3B (D4,D7)", "x":11.25, "y":3}, - {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D (D4,D3)", "x":14, "y":3}, - - {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (D6,F6)", "x":1.25, "y":4, "w":1.25}, - {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.25}, - {"label":"K46 (D6,C7)", "x":3.75, "y":4, "w":6.25}, - {"label":"K4A (D6,B4)", "x":10, "y":4, "w":1.25}, - {"label":"K4B (D6,D7)", "x":11.25, "y":4, "w":1.25}, - {"label":"K4C (D6,D5)", "x":13, "y":4}, - {"label":"K4D (D6,D3)", "x":14, "y":4}, - {"label":"K4E (D6,D1)", "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.25, "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.25, "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.25, "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": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "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} ] }, "LAYOUT_625u_space_split_bs": { "layout": [ - {"label":"K00 (B1,F7)", "x":0, "y":0}, - {"label":"K01 (B1,F6)", "x":1, "y":0}, - {"label":"K02 (B1,F5)", "x":2, "y":0}, - {"label":"K03 (B1,F4)", "x":3, "y":0}, - {"label":"K04 (B1,F1)", "x":4, "y":0}, - {"label":"K05 (B1,F0)", "x":5, "y":0}, - {"label":"K06 (B1,C7)", "x":6, "y":0}, - {"label":"K07 (B1,C6)", "x":7, "y":0}, - {"label":"K08 (B1,B6)", "x":8, "y":0}, - {"label":"K09 (B1,B5)", "x":9, "y":0}, - {"label":"K0A (B1,B4)", "x":10, "y":0}, - {"label":"K0B (B1,D7)", "x":11, "y":0}, - {"label":"K0C (B1,D5)", "x":12, "y":0}, - {"label":"K0D (B1,D3)", "x":13, "y":0}, - {"label":"K0F (B1,D0)", "x":14, "y":0}, - {"label":"K0E (B1,D1)", "x":15.25, "y":0}, - - {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B2,F6)", "x":1.5, "y":1}, - {"label":"K12 (B2,F5)", "x":2.5, "y":1}, - {"label":"K13 (B2,F4)", "x":3.5, "y":1}, - {"label":"K14 (B2,F1)", "x":4.5, "y":1}, - {"label":"K15 (B2,F0)", "x":5.5, "y":1}, - {"label":"K16 (B2,C7)", "x":6.5, "y":1}, - {"label":"K17 (B2,C6)", "x":7.5, "y":1}, - {"label":"K18 (B2,B6)", "x":8.5, "y":1}, - {"label":"K19 (B2,B5)", "x":9.5, "y":1}, - {"label":"K1A (B2,B4)", "x":10.5, "y":1}, - {"label":"K1B (B2,D7)", "x":11.5, "y":1}, - {"label":"K1C (B2,D5)", "x":12.5, "y":1}, - {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1E (B2,D1)", "x":15.25, "y":1}, - - {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (B3,F6)", "x":1.75, "y":2}, - {"label":"K22 (B3,F5)", "x":2.75, "y":2}, - {"label":"K23 (B3,F4)", "x":3.75, "y":2}, - {"label":"K24 (B3,F1)", "x":4.75, "y":2}, - {"label":"K25 (B3,F0)", "x":5.75, "y":2}, - {"label":"K26 (B3,C7)", "x":6.75, "y":2}, - {"label":"K27 (B3,C6)", "x":7.75, "y":2}, - {"label":"K28 (B3,B6)", "x":8.75, "y":2}, - {"label":"K29 (B3,B5)", "x":9.75, "y":2}, - {"label":"K2A (B3,B4)", "x":10.75, "y":2}, - {"label":"K2B (B3,D7)", "x":11.75, "y":2}, - {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2E (B3,D1)", "x":15.25, "y":2}, - - {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25}, - {"label":"K32 (D4,F5)", "x":2.25, "y":3}, - {"label":"K33 (D4,F4)", "x":3.25, "y":3}, - {"label":"K34 (D4,F1)", "x":4.25, "y":3}, - {"label":"K35 (D4,F0)", "x":5.25, "y":3}, - {"label":"K36 (D4,C7)", "x":6.25, "y":3}, - {"label":"K37 (D4,C6)", "x":7.25, "y":3}, - {"label":"K38 (D4,B6)", "x":8.25, "y":3}, - {"label":"K39 (D4,B5)", "x":9.25, "y":3}, - {"label":"K3A (D4,B4)", "x":10.25, "y":3}, - {"label":"K3B (D4,D7)", "x":11.25, "y":3}, - {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D (D4,D3)", "x":14, "y":3}, - - {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (D6,F6)", "x":1.25, "y":4, "w":1.25}, - {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.25}, - {"label":"K46 (D6,C7)", "x":3.75, "y":4, "w":6.25}, - {"label":"K4A (D6,B4)", "x":10, "y":4, "w":1.25}, - {"label":"K4B (D6,D7)", "x":11.25, "y":4, "w":1.25}, - {"label":"K4C (D6,D5)", "x":13, "y":4}, - {"label":"K4D (D6,D3)", "x":14, "y":4}, - {"label":"K4E (D6,D1)", "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, 15], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.25, "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.25, "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.25, "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": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "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} ] }, "LAYOUT_7u_space": { "layout": [ - {"label":"K00 (B1,F7)", "x":0, "y":0}, - {"label":"K01 (B1,F6)", "x":1, "y":0}, - {"label":"K02 (B1,F5)", "x":2, "y":0}, - {"label":"K03 (B1,F4)", "x":3, "y":0}, - {"label":"K04 (B1,F1)", "x":4, "y":0}, - {"label":"K05 (B1,F0)", "x":5, "y":0}, - {"label":"K06 (B1,C7)", "x":6, "y":0}, - {"label":"K07 (B1,C6)", "x":7, "y":0}, - {"label":"K08 (B1,B6)", "x":8, "y":0}, - {"label":"K09 (B1,B5)", "x":9, "y":0}, - {"label":"K0A (B1,B4)", "x":10, "y":0}, - {"label":"K0B (B1,D7)", "x":11, "y":0}, - {"label":"K0C (B1,D5)", "x":12, "y":0}, - {"label":"K0D (B1,D3)", "x":13, "y":0, "w":2}, - {"label":"K0E (B1,D1)", "x":15.25, "y":0}, - - {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B2,F6)", "x":1.5, "y":1}, - {"label":"K12 (B2,F5)", "x":2.5, "y":1}, - {"label":"K13 (B2,F4)", "x":3.5, "y":1}, - {"label":"K14 (B2,F1)", "x":4.5, "y":1}, - {"label":"K15 (B2,F0)", "x":5.5, "y":1}, - {"label":"K16 (B2,C7)", "x":6.5, "y":1}, - {"label":"K17 (B2,C6)", "x":7.5, "y":1}, - {"label":"K18 (B2,B6)", "x":8.5, "y":1}, - {"label":"K19 (B2,B5)", "x":9.5, "y":1}, - {"label":"K1A (B2,B4)", "x":10.5, "y":1}, - {"label":"K1B (B2,D7)", "x":11.5, "y":1}, - {"label":"K1C (B2,D5)", "x":12.5, "y":1}, - {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1E (B2,D1)", "x":15.25, "y":1}, - - {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (B3,F6)", "x":1.75, "y":2}, - {"label":"K22 (B3,F5)", "x":2.75, "y":2}, - {"label":"K23 (B3,F4)", "x":3.75, "y":2}, - {"label":"K24 (B3,F1)", "x":4.75, "y":2}, - {"label":"K25 (B3,F0)", "x":5.75, "y":2}, - {"label":"K26 (B3,C7)", "x":6.75, "y":2}, - {"label":"K27 (B3,C6)", "x":7.75, "y":2}, - {"label":"K28 (B3,B6)", "x":8.75, "y":2}, - {"label":"K29 (B3,B5)", "x":9.75, "y":2}, - {"label":"K2A (B3,B4)", "x":10.75, "y":2}, - {"label":"K2B (B3,D7)", "x":11.75, "y":2}, - {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2E (B3,D1)", "x":15.25, "y":2}, - - {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25}, - {"label":"K32 (D4,F5)", "x":2.25, "y":3}, - {"label":"K33 (D4,F4)", "x":3.25, "y":3}, - {"label":"K34 (D4,F1)", "x":4.25, "y":3}, - {"label":"K35 (D4,F0)", "x":5.25, "y":3}, - {"label":"K36 (D4,C7)", "x":6.25, "y":3}, - {"label":"K37 (D4,C6)", "x":7.25, "y":3}, - {"label":"K38 (D4,B6)", "x":8.25, "y":3}, - {"label":"K39 (D4,B5)", "x":9.25, "y":3}, - {"label":"K3A (D4,B4)", "x":10.25, "y":3}, - {"label":"K3B (D4,D7)", "x":11.25, "y":3}, - {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D (D4,D3)", "x":14, "y":3}, - - {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.5}, - {"label":"K41 (D6,F6)", "x":1.5, "y":4}, - {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.5}, - {"label":"K46 (D6,C7)", "x":4, "y":4, "w":7}, - {"label":"K4B (D6,D7)", "x":11, "y":4, "w":1.5}, - {"label":"K4C (D6,D5)", "x":13, "y":4}, - {"label":"K4D (D6,D3)", "x":14, "y":4}, - {"label":"K4E (D6,D1)", "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.25, "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.25, "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.25, "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": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 3], "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, 14], "x": 15, "y": 4} ] }, "LAYOUT_7u_space_split_bs": { "layout": [ - {"label":"K00 (B1,F7)", "x":0, "y":0}, - {"label":"K01 (B1,F6)", "x":1, "y":0}, - {"label":"K02 (B1,F5)", "x":2, "y":0}, - {"label":"K03 (B1,F4)", "x":3, "y":0}, - {"label":"K04 (B1,F1)", "x":4, "y":0}, - {"label":"K05 (B1,F0)", "x":5, "y":0}, - {"label":"K06 (B1,C7)", "x":6, "y":0}, - {"label":"K07 (B1,C6)", "x":7, "y":0}, - {"label":"K08 (B1,B6)", "x":8, "y":0}, - {"label":"K09 (B1,B5)", "x":9, "y":0}, - {"label":"K0A (B1,B4)", "x":10, "y":0}, - {"label":"K0B (B1,D7)", "x":11, "y":0}, - {"label":"K0C (B1,D5)", "x":12, "y":0}, - {"label":"K0D (B1,D3)", "x":13, "y":0}, - {"label":"K0F (B1,D0)", "x":14, "y":0}, - {"label":"K0E (B1,D1)", "x":15.25, "y":0}, - - {"label":"K10 (B2,F7)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B2,F6)", "x":1.5, "y":1}, - {"label":"K12 (B2,F5)", "x":2.5, "y":1}, - {"label":"K13 (B2,F4)", "x":3.5, "y":1}, - {"label":"K14 (B2,F1)", "x":4.5, "y":1}, - {"label":"K15 (B2,F0)", "x":5.5, "y":1}, - {"label":"K16 (B2,C7)", "x":6.5, "y":1}, - {"label":"K17 (B2,C6)", "x":7.5, "y":1}, - {"label":"K18 (B2,B6)", "x":8.5, "y":1}, - {"label":"K19 (B2,B5)", "x":9.5, "y":1}, - {"label":"K1A (B2,B4)", "x":10.5, "y":1}, - {"label":"K1B (B2,D7)", "x":11.5, "y":1}, - {"label":"K1C (B2,D5)", "x":12.5, "y":1}, - {"label":"K1D (B2,D3)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1E (B2,D1)", "x":15.25, "y":1}, - - {"label":"K20 (B3,F7)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (B3,F6)", "x":1.75, "y":2}, - {"label":"K22 (B3,F5)", "x":2.75, "y":2}, - {"label":"K23 (B3,F4)", "x":3.75, "y":2}, - {"label":"K24 (B3,F1)", "x":4.75, "y":2}, - {"label":"K25 (B3,F0)", "x":5.75, "y":2}, - {"label":"K26 (B3,C7)", "x":6.75, "y":2}, - {"label":"K27 (B3,C6)", "x":7.75, "y":2}, - {"label":"K28 (B3,B6)", "x":8.75, "y":2}, - {"label":"K29 (B3,B5)", "x":9.75, "y":2}, - {"label":"K2A (B3,B4)", "x":10.75, "y":2}, - {"label":"K2B (B3,D7)", "x":11.75, "y":2}, - {"label":"K2C (B3,D5)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2E (B3,D1)", "x":15.25, "y":2}, - - {"label":"K30 (D4,F7)", "x":0, "y":3, "w":2.25}, - {"label":"K32 (D4,F5)", "x":2.25, "y":3}, - {"label":"K33 (D4,F4)", "x":3.25, "y":3}, - {"label":"K34 (D4,F1)", "x":4.25, "y":3}, - {"label":"K35 (D4,F0)", "x":5.25, "y":3}, - {"label":"K36 (D4,C7)", "x":6.25, "y":3}, - {"label":"K37 (D4,C6)", "x":7.25, "y":3}, - {"label":"K38 (D4,B6)", "x":8.25, "y":3}, - {"label":"K39 (D4,B5)", "x":9.25, "y":3}, - {"label":"K3A (D4,B4)", "x":10.25, "y":3}, - {"label":"K3B (D4,D7)", "x":11.25, "y":3}, - {"label":"K3C (D4,D5)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D (D4,D3)", "x":14, "y":3}, - - {"label":"K40 (D6,F7)", "x":0, "y":4, "w":1.5}, - {"label":"K41 (D6,F6)", "x":1.5, "y":4}, - {"label":"K43 (D6,F4)", "x":2.5, "y":4, "w":1.5}, - {"label":"K46 (D6,C7)", "x":4, "y":4, "w":7}, - {"label":"K4B (D6,D7)", "x":11, "y":4, "w":1.5}, - {"label":"K4C (D6,D5)", "x":13, "y":4}, - {"label":"K4D (D6,D3)", "x":14, "y":4}, - {"label":"K4E (D6,D1)", "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, 15], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.25, "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.25, "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.25, "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": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 3], "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, 14], "x": 15, "y": 4} ] } } diff --git a/keyboards/alfredslab/swift65/solder/solder.h b/keyboards/alfredslab/swift65/solder/solder.h deleted file mode 100644 index 651497bec4..0000000000 --- a/keyboards/alfredslab/swift65/solder/solder.h +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright 2021 Steven Phillips (spooknik) - * - * 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 . - */ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_625u_space( \ - 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, \ - K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, XXX }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \ - { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \ - { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, XXX }, \ -} - -#define LAYOUT_625u_space_split_bs( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, 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, \ - K40, K41, K43, K46, K4A, K4B, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \ - { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \ - { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, XXX }, \ -} - -#define LAYOUT_7u_space( \ - 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, \ - K40, K41, K43, K46, K4B, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, XXX }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \ - { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \ - { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, K4E, XXX }, \ -} - -#define LAYOUT_7u_space_split_bs( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, 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, \ - K40, K41, K43, K46, K4B, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, XXX }, \ - { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX }, \ - { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, K4E, XXX }, \ -} -- cgit v1.2.3 From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 May 2023 08:25:15 +1000 Subject: `info.json` whitespace cleanups (#20651) --- keyboards/alfredslab/swift65/hotswap/info.json | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/alfredslab') diff --git a/keyboards/alfredslab/swift65/hotswap/info.json b/keyboards/alfredslab/swift65/hotswap/info.json index e246fcc85f..d60bd0c85d 100644 --- a/keyboards/alfredslab/swift65/hotswap/info.json +++ b/keyboards/alfredslab/swift65/hotswap/info.json @@ -102,4 +102,3 @@ } } } - -- cgit v1.2.3 From 363bfdbfda5ea9fa996390920a9e8982535b76c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 27 May 2023 12:27:44 +1000 Subject: Move `RGBLIGHT_LIMIT_VAL` to data driven (#20974) Co-authored-by: Nick Brassel --- keyboards/alfredslab/swift65/hotswap/config.h | 1 - keyboards/alfredslab/swift65/solder/config.h | 1 - keyboards/alfredslab/swift65/solder/info.json | 3 +++ 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'keyboards/alfredslab') diff --git a/keyboards/alfredslab/swift65/hotswap/config.h b/keyboards/alfredslab/swift65/hotswap/config.h index 8fc29553d6..793bb4dd1e 100644 --- a/keyboards/alfredslab/swift65/hotswap/config.h +++ b/keyboards/alfredslab/swift65/hotswap/config.h @@ -20,7 +20,6 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 - #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ /*== all animations enable ==*/ #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/alfredslab/swift65/solder/config.h b/keyboards/alfredslab/swift65/solder/config.h index 79c1824d08..9ee0233356 100644 --- a/keyboards/alfredslab/swift65/solder/config.h +++ b/keyboards/alfredslab/swift65/solder/config.h @@ -21,7 +21,6 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 - #define RGBLIGHT_LIMIT_VAL 100 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/alfredslab/swift65/solder/info.json b/keyboards/alfredslab/swift65/solder/info.json index abaaf12353..129b0436d9 100644 --- a/keyboards/alfredslab/swift65/solder/info.json +++ b/keyboards/alfredslab/swift65/solder/info.json @@ -8,6 +8,9 @@ "pid": "0xD4C3", "device_version": "0.0.1" }, + "rgblight": { + "max_brightness": 100 + }, "ws2812": { "pin": "D2" }, -- cgit v1.2.3