diff options
Diffstat (limited to 'keyboards/cannonkeys/obliterated75')
-rw-r--r-- | keyboards/cannonkeys/obliterated75/config.h | 5 | ||||
-rw-r--r-- | keyboards/cannonkeys/obliterated75/info.json | 9 | ||||
-rw-r--r-- | keyboards/cannonkeys/obliterated75/obliterated75.c | 1 | ||||
-rw-r--r-- | keyboards/cannonkeys/obliterated75/rules.mk | 1 |
4 files changed, 9 insertions, 7 deletions
diff --git a/keyboards/cannonkeys/obliterated75/config.h b/keyboards/cannonkeys/obliterated75/config.h index 6d2ab14c6b..65ffa50103 100644 --- a/keyboards/cannonkeys/obliterated75/config.h +++ b/keyboards/cannonkeys/obliterated75/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { A5, B10, A3, A2, B0, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 } -#define MATRIX_ROW_PINS { A13, B12, B11, B14, A8, A1 } -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 @@ -40,7 +36,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 20 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/info.json index 30ea22bd74..bc8d774009 100644 --- a/keyboards/cannonkeys/obliterated75/info.json +++ b/keyboards/cannonkeys/obliterated75/info.json @@ -8,11 +8,20 @@ "pid": "0x0B75", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A5", "B10", "A3", "A2", "B0", "A9", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"], + "rows": ["A13", "B12", "B11", "B14", "A8", "A1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "A6", "levels": 6, "breathing": true }, + "ws2812": { + "pin": "B15", + "driver": "spi" + }, "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/cannonkeys/obliterated75/obliterated75.c b/keyboards/cannonkeys/obliterated75/obliterated75.c deleted file mode 100644 index 347a643836..0000000000 --- a/keyboards/cannonkeys/obliterated75/obliterated75.c +++ /dev/null @@ -1 +0,0 @@ -#include "obliterated75.h" diff --git a/keyboards/cannonkeys/obliterated75/rules.mk b/keyboards/cannonkeys/obliterated75/rules.mk index 2eaae2dc9b..42e73a4650 100644 --- a/keyboards/cannonkeys/obliterated75/rules.mk +++ b/keyboards/cannonkeys/obliterated75/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 |