diff options
Diffstat (limited to 'keyboards/cannonkeys/malicious_ergo')
-rw-r--r-- | keyboards/cannonkeys/malicious_ergo/config.h | 5 | ||||
-rw-r--r-- | keyboards/cannonkeys/malicious_ergo/info.json | 9 | ||||
-rw-r--r-- | keyboards/cannonkeys/malicious_ergo/malicious_ergo.c | 16 | ||||
-rw-r--r-- | keyboards/cannonkeys/malicious_ergo/rules.mk | 1 |
4 files changed, 9 insertions, 22 deletions
diff --git a/keyboards/cannonkeys/malicious_ergo/config.h b/keyboards/cannonkeys/malicious_ergo/config.h index 57fa0cf7c3..2c1baa101d 100644 --- a/keyboards/cannonkeys/malicious_ergo/config.h +++ b/keyboards/cannonkeys/malicious_ergo/config.h @@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B1, B0, A7, A1, A5, A4, A3, A10, B9, B8, B7, B6, B5, B4, B3, A15, A14 } -#define MATRIX_ROW_PINS { B2, B10, B11, A2, A0 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 @@ -42,7 +38,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 -#define RGB_DI_PIN B15 #define RGBLED_NUM 14 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json index 9058e07878..bd34061f68 100644 --- a/keyboards/cannonkeys/malicious_ergo/info.json +++ b/keyboards/cannonkeys/malicious_ergo/info.json @@ -8,11 +8,20 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B0", "A7", "A1", "A5", "A4", "A3", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], + "rows": ["B2", "B10", "B11", "A2", "A0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, "breathing": true }, + "ws2812": { + "pin": "B15", + "driver": "spi" + }, "indicators": { "caps_lock": "A8", "num_lock": "A9", diff --git a/keyboards/cannonkeys/malicious_ergo/malicious_ergo.c b/keyboards/cannonkeys/malicious_ergo/malicious_ergo.c deleted file mode 100644 index 58e33a3889..0000000000 --- a/keyboards/cannonkeys/malicious_ergo/malicious_ergo.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 Andrew Kannan - * - * 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 "malicious_ergo.h" diff --git a/keyboards/cannonkeys/malicious_ergo/rules.mk b/keyboards/cannonkeys/malicious_ergo/rules.mk index 2eaae2dc9b..42e73a4650 100644 --- a/keyboards/cannonkeys/malicious_ergo/rules.mk +++ b/keyboards/cannonkeys/malicious_ergo/rules.mk @@ -13,7 +13,6 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -WS2812_DRIVER = spi # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE |