diff options
Diffstat (limited to 'keyboards/draculad')
-rw-r--r-- | keyboards/draculad/config.h | 9 | ||||
-rw-r--r-- | keyboards/draculad/draculad.c | 18 | ||||
-rw-r--r-- | keyboards/draculad/draculad.h | 40 | ||||
-rw-r--r-- | keyboards/draculad/info.json | 85 |
4 files changed, 47 insertions, 105 deletions
diff --git a/keyboards/draculad/config.h b/keyboards/draculad/config.h index 63c16c1c71..a9f78283d0 100644 --- a/keyboards/draculad/config.h +++ b/keyboards/draculad/config.h @@ -17,19 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS {D4, C6, D7, E6} -#define MATRIX_COL_PINS {F4, F5,F6, F7, B1} - -#define DIODE_DIRECTION COL2ROW - #ifdef OLED_ENABLE #define OLED_DISPLAY_128X64 #define OLED_TIMEOUT 30000 #endif -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_RAINBOW_SWIRL #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_STATIC_GRADIENT @@ -40,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#endif #define EE_HANDS diff --git a/keyboards/draculad/draculad.c b/keyboards/draculad/draculad.c deleted file mode 100644 index 04a83ef2e3..0000000000 --- a/keyboards/draculad/draculad.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 @mangoiv - -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 "draculad.h"
\ No newline at end of file diff --git a/keyboards/draculad/draculad.h b/keyboards/draculad/draculad.h deleted file mode 100644 index b98bb0d2c4..0000000000 --- a/keyboards/draculad/draculad.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2021 @mangoiv - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - 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, R33, \ - L31, L32, L33, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { XXX, L30, L31, L32, L33 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { XXX, R33, R32, R31, R30 } \ - } diff --git a/keyboards/draculad/info.json b/keyboards/draculad/info.json index 83b071e98b..57250d57ef 100644 --- a/keyboards/draculad/info.json +++ b/keyboards/draculad/info.json @@ -8,6 +8,14 @@ "pid": "0x1B1E", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B6"}, @@ -30,52 +38,53 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":1}, - {"label":"L01", "x":1, "y":0.35}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0.35}, - {"label":"L04", "x":4, "y":0.5}, + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 0.35}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.35}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, + + {"matrix": [4, 4], "x": 8, "y": 0.5}, + {"matrix": [4, 3], "x": 9, "y": 0.35}, + {"matrix": [4, 2], "x": 10, "y": 0}, + {"matrix": [4, 1], "x": 11, "y": 0.35}, + {"matrix": [4, 0], "x": 12, "y": 1}, - {"label":"R00", "x":8, "y":0.5}, - {"label":"R01", "x":9, "y":0.35}, - {"label":"R02", "x":10, "y":0}, - {"label":"R03", "x":11, "y":0.35}, - {"label":"R04", "x":12, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 1.35}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.35}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, - {"label":"L10", "x":0, "y":2}, - {"label":"L11", "x":1, "y":1.35}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1.35}, - {"label":"L14", "x":4, "y":1.5}, + {"matrix": [5, 4], "x": 8, "y": 1.5}, + {"matrix": [5, 3], "x": 9, "y": 1.35}, + {"matrix": [5, 2], "x": 10, "y": 1}, + {"matrix": [5, 1], "x": 11, "y": 1.35}, + {"matrix": [5, 0], "x": 12, "y": 2}, - {"label":"R10", "x":8, "y":1.5}, - {"label":"R11", "x":9, "y":1.35}, - {"label":"R12", "x":10, "y":1}, - {"label":"R13", "x":11, "y":1.35}, - {"label":"R14", "x":12, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 2.35}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.35}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, - {"label":"L20", "x":0, "y":3}, - {"label":"L21", "x":1, "y":2.35}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2.35}, - {"label":"L24", "x":4, "y":2.5}, + {"matrix": [6, 4], "x": 8, "y": 2.5}, + {"matrix": [6, 3], "x": 9, "y": 2.35}, + {"matrix": [6, 2], "x": 10, "y": 2}, + {"matrix": [6, 1], "x": 11, "y": 2.35}, + {"matrix": [6, 0], "x": 12, "y": 3}, - {"label":"R20", "x":8, "y":2.5}, - {"label":"R21", "x":9, "y":2.35}, - {"label":"R22", "x":10, "y":2}, - {"label":"R23", "x":11, "y":2.35}, - {"label":"R24", "x":12, "y":3}, + {"matrix": [3, 1], "x": 4.25, "y": 3.5}, - {"label":"L30", "x":4.25, "y":3.5}, - {"label":"R33", "x":7.75, "y":3.5}, + {"matrix": [7, 1], "x": 7.75, "y": 3.5}, - {"label":"L31", "x":3, "y":4.5}, - {"label":"L32", "x":4, "y":4.5}, - {"label":"L33", "x":5, "y":4.5}, + {"matrix": [3, 2], "x": 3, "y": 4.5}, + {"matrix": [3, 3], "x": 4, "y": 4.5}, + {"matrix": [3, 4], "x": 5, "y": 4.5}, - {"label":"R30", "x":7, "y":4.5}, - {"label":"R31", "x":8, "y":4.5}, - {"label":"R32", "x":9, "y":4.5} + {"matrix": [7, 4], "x": 7, "y": 4.5}, + {"matrix": [7, 3], "x": 8, "y": 4.5}, + {"matrix": [7, 2], "x": 9, "y": 4.5} ] } } |