diff options
Diffstat (limited to 'keyboards/bluebell')
-rw-r--r-- | keyboards/bluebell/swoop/config.h | 8 | ||||
-rw-r--r-- | keyboards/bluebell/swoop/info.json | 87 | ||||
-rw-r--r-- | keyboards/bluebell/swoop/swoop.c | 16 | ||||
-rw-r--r-- | keyboards/bluebell/swoop/swoop.h | 36 |
4 files changed, 51 insertions, 96 deletions
diff --git a/keyboards/bluebell/swoop/config.h b/keyboards/bluebell/swoop/config.h index de47d3a071..23f99a7211 100644 --- a/keyboards/bluebell/swoop/config.h +++ b/keyboards/bluebell/swoop/config.h @@ -15,11 +15,6 @@ */ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { B1, F7, F6, F5, F4 } -#define DIODE_DIRECTION COL2ROW - #define EE_HANDS // OLED driver @@ -29,8 +24,6 @@ #endif // RGB underglow and per key -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_STATIC_GRADIENT @@ -44,4 +37,3 @@ #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/bluebell/swoop/info.json b/keyboards/bluebell/swoop/info.json index 49dcc857e9..ee671fea27 100644 --- a/keyboards/bluebell/swoop/info.json +++ b/keyboards/bluebell/swoop/info.json @@ -8,6 +8,14 @@ "pid": "0x3046", "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["B1", "F7", "F6", "F5", "F4"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B4", "pin_b": "B5"} @@ -29,42 +37,49 @@ "layouts": { "LAYOUT_split_3x5_3": { "layout": [ - {"label":"SW1", "x":0, "y":0.375}, - {"label":"SW2", "x":1, "y":0.125}, - {"label":"SW3", "x":2, "y":0}, - {"label":"SW4", "x":3, "y":0.125}, - {"label":"SW5", "x":4, "y":0.25}, - {"label":"SW19", "x":8, "y":0.25}, - {"label":"SW20", "x":9, "y":0.125}, - {"label":"SW21", "x":10, "y":0}, - {"label":"SW22", "x":11, "y":0.125}, - {"label":"SW23", "x":12, "y":0.375}, - {"label":"SW6", "x":0, "y":1.375}, - {"label":"SW7", "x":1, "y":1.125}, - {"label":"SW8", "x":2, "y":1}, - {"label":"SW9", "x":3, "y":1.125}, - {"label":"SW10", "x":4, "y":1.25}, - {"label":"SW24", "x":8, "y":1.25}, - {"label":"SW25", "x":9, "y":1.125}, - {"label":"SW26", "x":10, "y":1}, - {"label":"SW27", "x":11, "y":1.125}, - {"label":"SW28", "x":12, "y":1.375}, - {"label":"SW11", "x":0, "y":2.375}, - {"label":"SW12", "x":1, "y":2.125}, - {"label":"SW13", "x":2, "y":2}, - {"label":"SW14", "x":3, "y":2.125}, - {"label":"SW15", "x":4, "y":2.25}, - {"label":"SW29", "x":8, "y":2.25}, - {"label":"SW30", "x":9, "y":2.125}, - {"label":"SW31", "x":10, "y":2}, - {"label":"SW32", "x":11, "y":2.125}, - {"label":"SW33", "x":12, "y":2.375}, - {"label":"SW16", "x":2.875, "y":3.25}, - {"label":"SW17", "x":4, "y":3.375}, - {"label":"SW28", "x":5.125, "y":3.625}, - {"label":"SW34", "x":6.875, "y":3.625}, - {"label":"SW35", "x":8, "y":3.375}, - {"label":"SW36", "x":9.125, "y":3.25} + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.125}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.125}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + + {"matrix": [4, 4], "x": 8, "y": 0.25}, + {"matrix": [4, 3], "x": 9, "y": 0.125}, + {"matrix": [4, 2], "x": 10, "y": 0}, + {"matrix": [4, 1], "x": 11, "y": 0.125}, + {"matrix": [4, 0], "x": 12, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.125}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.125}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + + {"matrix": [5, 4], "x": 8, "y": 1.25}, + {"matrix": [5, 3], "x": 9, "y": 1.125}, + {"matrix": [5, 2], "x": 10, "y": 1}, + {"matrix": [5, 1], "x": 11, "y": 1.125}, + {"matrix": [5, 0], "x": 12, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.125}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.125}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + + {"matrix": [6, 4], "x": 8, "y": 2.25}, + {"matrix": [6, 3], "x": 9, "y": 2.125}, + {"matrix": [6, 2], "x": 10, "y": 2}, + {"matrix": [6, 1], "x": 11, "y": 2.125}, + {"matrix": [6, 0], "x": 12, "y": 2.375}, + + {"matrix": [3, 2], "x": 2.875, "y": 3.25}, + {"matrix": [3, 3], "x": 4, "y": 3.375}, + {"matrix": [3, 4], "x": 5.125, "y": 3.625}, + + {"matrix": [7, 4], "x": 6.875, "y": 3.625}, + {"matrix": [7, 3], "x": 8, "y": 3.375}, + {"matrix": [7, 2], "x": 9.125, "y": 3.25} ] } } diff --git a/keyboards/bluebell/swoop/swoop.c b/keyboards/bluebell/swoop/swoop.c deleted file mode 100644 index a373b48c47..0000000000 --- a/keyboards/bluebell/swoop/swoop.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 James White <jamesmnw@gmail.com> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#include "swoop.h" diff --git a/keyboards/bluebell/swoop/swoop.h b/keyboards/bluebell/swoop/swoop.h deleted file mode 100644 index 4160f3af8a..0000000000 --- a/keyboards/bluebell/swoop/swoop.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2022 James White <jamesmnw@gmail.com> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -#pragma once -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT_split_3x5_3( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L30, L31, L32, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { ___, ___, L30, L31, L32 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { ___, ___, R32, R31, R30 } \ - } |