aboutsummaryrefslogtreecommitdiff
path: root/keyboards/custommk
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/custommk')
-rw-r--r--keyboards/custommk/evo70/keyboard.json (renamed from keyboards/custommk/evo70/info.json)0
-rw-r--r--keyboards/custommk/evo70/rules.mk1
-rw-r--r--keyboards/custommk/evo70_r2/config.h4
-rw-r--r--keyboards/custommk/evo70_r2/info.json4
-rw-r--r--keyboards/custommk/evo70_r2/matrix.c3
-rw-r--r--keyboards/custommk/genesis/rev1/keyboard.json (renamed from keyboards/custommk/genesis/rev1/info.json)0
-rw-r--r--keyboards/custommk/genesis/rev1/rules.mk0
7 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/keyboard.json
index 95464e691a..95464e691a 100644
--- a/keyboards/custommk/evo70/info.json
+++ b/keyboards/custommk/evo70/keyboard.json
diff --git a/keyboards/custommk/evo70/rules.mk b/keyboards/custommk/evo70/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/custommk/evo70/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
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/info.json
index a11daef092..dea56ed257 100644
--- a/keyboards/custommk/evo70_r2/info.json
+++ b/keyboards/custommk/evo70_r2/info.json
@@ -121,7 +121,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 +286,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/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/keyboard.json
index f859a6b9bf..f859a6b9bf 100644
--- a/keyboards/custommk/genesis/rev1/info.json
+++ b/keyboards/custommk/genesis/rev1/keyboard.json
diff --git a/keyboards/custommk/genesis/rev1/rules.mk b/keyboards/custommk/genesis/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/custommk/genesis/rev1/rules.mk
+++ /dev/null