diff options
Diffstat (limited to 'keyboards/custommk/evo70_r2')
-rw-r--r-- | keyboards/custommk/evo70_r2/config.h | 4 | ||||
-rw-r--r-- | keyboards/custommk/evo70_r2/keyboard.json (renamed from keyboards/custommk/evo70_r2/info.json) | 7 | ||||
-rw-r--r-- | keyboards/custommk/evo70_r2/matrix.c | 3 | ||||
-rw-r--r-- | keyboards/custommk/evo70_r2/rules.mk | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/keyboards/custommk/evo70_r2/config.h b/keyboards/custommk/evo70_r2/config.h index 62606cf1ee..bd8744204c 100644 --- a/keyboards/custommk/evo70_r2/config.h +++ b/keyboards/custommk/evo70_r2/config.h @@ -78,8 +78,8 @@ #define WS2812_PWM_DRIVER PWMD1 #define WS2812_PWM_CHANNEL 3 #define WS2812_PWM_PAL_MODE 1 -#define WS2812_DMA_STREAM STM32_DMA2_STREAM5 -#define WS2812_DMA_CHANNEL 6 +#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5 +#define WS2812_PWM_DMA_CHANNEL 6 #define TAP_CODE_DELAY 10 diff --git a/keyboards/custommk/evo70_r2/info.json b/keyboards/custommk/evo70_r2/keyboard.json index a11daef092..5f10d6705d 100644 --- a/keyboards/custommk/evo70_r2/info.json +++ b/keyboards/custommk/evo70_r2/keyboard.json @@ -51,6 +51,9 @@ "twinkle": true } }, + "audio": { + "driver": "pwm_hardware" + }, "ws2812": { "driver": "pwm", "pin": "A10" @@ -121,7 +124,7 @@ {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3}, {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3}, {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, - {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3, "w": 1}, + {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3}, {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3}, {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3}, {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3}, @@ -286,7 +289,7 @@ {"label": "F3", "matrix": [3, 1], "x": 0, "y": 3}, {"label": "F4", "matrix": [3, 0], "x": 1, "y": 3}, {"label": "Shift", "matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, - {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3, "w": 1}, + {"label": "\u2298", "matrix": [0, 1], "x": 3.5, "y": 3}, {"label": "Z", "matrix": [3, 3], "x": 4.5, "y": 3}, {"label": "X", "matrix": [3, 4], "x": 5.5, "y": 3}, {"label": "C", "matrix": [3, 5], "x": 6.5, "y": 3}, diff --git a/keyboards/custommk/evo70_r2/matrix.c b/keyboards/custommk/evo70_r2/matrix.c index 99a23a4542..99c3428d80 100644 --- a/keyboards/custommk/evo70_r2/matrix.c +++ b/keyboards/custommk/evo70_r2/matrix.c @@ -1,6 +1,7 @@ // Copyright 2023 David Hoelscher (@customMK) // SPDX-License-Identifier: GPL-2.0-or-later -#include "quantum.h" +#include "matrix.h" +#include <string.h> // Pin definitions static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; diff --git a/keyboards/custommk/evo70_r2/rules.mk b/keyboards/custommk/evo70_r2/rules.mk index 193fe4f1a4..3961343ce4 100644 --- a/keyboards/custommk/evo70_r2/rules.mk +++ b/keyboards/custommk/evo70_r2/rules.mk @@ -1,5 +1,3 @@ -AUDIO_DRIVER = pwm_hardware - # project specific files SRC += matrix.c |