aboutsummaryrefslogtreecommitdiff
path: root/keyboards/custommk
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/custommk')
-rw-r--r--keyboards/custommk/cmk11/keyboard.json (renamed from keyboards/custommk/cmk11/info.json)3
-rw-r--r--keyboards/custommk/cmk11/rules.mk1
-rw-r--r--keyboards/custommk/ergostrafer/keyboard.json (renamed from keyboards/custommk/ergostrafer/info.json)3
-rw-r--r--keyboards/custommk/ergostrafer/rules.mk1
-rw-r--r--keyboards/custommk/evo70/keyboard.json (renamed from keyboards/custommk/evo70/info.json)0
-rw-r--r--keyboards/custommk/evo70/keymaps/default/keymap.c2
-rw-r--r--keyboards/custommk/evo70/keymaps/via/keymap.c2
-rw-r--r--keyboards/custommk/evo70/rules.mk1
-rw-r--r--keyboards/custommk/evo70_r2/config.h4
-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.c23
-rw-r--r--keyboards/custommk/evo70_r2/rules.mk2
-rw-r--r--keyboards/custommk/genesis/rev1/keyboard.json (renamed from keyboards/custommk/genesis/rev1/info.json)8
-rw-r--r--keyboards/custommk/genesis/rev1/rules.mk0
-rw-r--r--keyboards/custommk/genesis/rev2/keyboard.json (renamed from keyboards/custommk/genesis/rev2/info.json)8
-rw-r--r--keyboards/custommk/genesis/rev2/rules.mk13
-rw-r--r--keyboards/custommk/genesis/rules.mk14
17 files changed, 43 insertions, 49 deletions
diff --git a/keyboards/custommk/cmk11/info.json b/keyboards/custommk/cmk11/keyboard.json
index d831351aa7..9a853063ba 100644
--- a/keyboards/custommk/cmk11/info.json
+++ b/keyboards/custommk/cmk11/keyboard.json
@@ -18,6 +18,9 @@
"nkro": true,
"rgb_matrix": true
},
+ "audio": {
+ "driver": "pwm_hardware"
+ },
"matrix_pins": {
"cols": ["B0", "A1", "A2", "A3", "A6", "B10"],
"rows": ["A5", "A4"]
diff --git a/keyboards/custommk/cmk11/rules.mk b/keyboards/custommk/cmk11/rules.mk
deleted file mode 100644
index 72f75f4367..0000000000
--- a/keyboards/custommk/cmk11/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUDIO_DRIVER = pwm_hardware
diff --git a/keyboards/custommk/ergostrafer/info.json b/keyboards/custommk/ergostrafer/keyboard.json
index a1283114c8..4f23417415 100644
--- a/keyboards/custommk/ergostrafer/info.json
+++ b/keyboards/custommk/ergostrafer/keyboard.json
@@ -17,6 +17,9 @@
"encoder": true,
"audio": true
},
+ "audio": {
+ "driver": "pwm_hardware"
+ },
"matrix_pins": {
"cols": ["B0", "A1", "A2", "A3", "A6", "B6", "B10"],
"rows": ["C13", "C14", "C15", "B1", "A7", "A5"]
diff --git a/keyboards/custommk/ergostrafer/rules.mk b/keyboards/custommk/ergostrafer/rules.mk
deleted file mode 100644
index 72f75f4367..0000000000
--- a/keyboards/custommk/ergostrafer/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUDIO_DRIVER = pwm_hardware
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/keymaps/default/keymap.c b/keyboards/custommk/evo70/keymaps/default/keymap.c
index b577b885b2..2c0b1475f4 100644
--- a/keyboards/custommk/evo70/keymaps/default/keymap.c
+++ b/keyboards/custommk/evo70/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT(
- QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
+ QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_F7, KC_F8, KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_F9, KC_F10, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/custommk/evo70/keymaps/via/keymap.c b/keyboards/custommk/evo70/keymaps/via/keymap.c
index bff3309e63..2fc0380fb0 100644
--- a/keyboards/custommk/evo70/keymaps/via/keymap.c
+++ b/keyboards/custommk/evo70/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT(
- QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
+ QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_F7, KC_F8, KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_F9, KC_F10, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
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/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..5ee93a5c7d 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;
@@ -9,7 +10,7 @@ void matrix_wait_for_pin(pin_t pin, uint8_t target_state) {
rtcnt_t start = chSysGetRealtimeCounterX();
rtcnt_t end = start + 5000;
while (chSysIsCounterWithinX(chSysGetRealtimeCounterX(), start, end)) {
- if (readPin(pin) == target_state) {
+ if (gpio_read_pin(pin) == target_state) {
break;
}
}
@@ -26,22 +27,22 @@ void matrix_wait_for_port(stm32_gpio_t *port, uint32_t target_bitmask) {
}
void shift_pulse_clock(void) {
- writePinHigh(COL_SHIFT_CLK_PIN);
+ gpio_write_pin_high(COL_SHIFT_CLK_PIN);
matrix_wait_for_pin(COL_SHIFT_CLK_PIN, 1);
- writePinLow(COL_SHIFT_CLK_PIN);
+ gpio_write_pin_low(COL_SHIFT_CLK_PIN);
}
void matrix_init_custom(void) {
//set all row pins as input with pullups
for (int i = 0; i < MATRIX_ROWS; ++i) {
- writePinHigh(row_pins[i]);
- setPinInputHigh(row_pins[i]);
+ gpio_write_pin_high(row_pins[i]);
+ gpio_set_pin_input_high(row_pins[i]);
}
//set all column pins high in ROW2COL matrix
- setPinOutput(COL_SHIFT_IN_PIN);
- setPinOutput(COL_SHIFT_CLK_PIN);
- writePinHigh(COL_SHIFT_IN_PIN);
+ gpio_set_pin_output(COL_SHIFT_IN_PIN);
+ gpio_set_pin_output(COL_SHIFT_CLK_PIN);
+ gpio_write_pin_high(COL_SHIFT_IN_PIN);
matrix_wait_for_pin(COL_SHIFT_IN_PIN, 1);
for (int i = 0; i < MATRIX_COLS; ++i) {
@@ -53,13 +54,13 @@ void matrix_init_custom(void) {
bool matrix_scan_custom(matrix_row_t current_matrix[]) {
static matrix_row_t temp_matrix[MATRIX_ROWS] = {0};
- writePinLow(COL_SHIFT_IN_PIN);
+ gpio_write_pin_low(COL_SHIFT_IN_PIN);
matrix_wait_for_pin(COL_SHIFT_IN_PIN, 0);
// Setup the output column pin
shift_pulse_clock();
- writePinHigh(COL_SHIFT_IN_PIN);
+ gpio_write_pin_high(COL_SHIFT_IN_PIN);
for (int current_col = 0; current_col < MATRIX_COLS; ++current_col) {
// Read the column ports
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
diff --git a/keyboards/custommk/genesis/rev1/info.json b/keyboards/custommk/genesis/rev1/keyboard.json
index f859a6b9bf..7025834d91 100644
--- a/keyboards/custommk/genesis/rev1/info.json
+++ b/keyboards/custommk/genesis/rev1/keyboard.json
@@ -45,6 +45,14 @@
},
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true,
+ "encoder": true
+ },
"layouts": {
"LAYOUT_ortho_5x4": {
"layout": [
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
diff --git a/keyboards/custommk/genesis/rev2/info.json b/keyboards/custommk/genesis/rev2/keyboard.json
index 5760ba52cd..d56cdb9df5 100644
--- a/keyboards/custommk/genesis/rev2/info.json
+++ b/keyboards/custommk/genesis/rev2/keyboard.json
@@ -45,6 +45,14 @@
},
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true,
+ "encoder": true
+ },
"layouts": {
"LAYOUT_ortho_5x4": {
"layout": [
diff --git a/keyboards/custommk/genesis/rev2/rules.mk b/keyboards/custommk/genesis/rev2/rules.mk
deleted file mode 100644
index 212c267b25..0000000000
--- a/keyboards/custommk/genesis/rev2/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/custommk/genesis/rules.mk b/keyboards/custommk/genesis/rules.mk
index cb164c1a89..3d64c0af2b 100644
--- a/keyboards/custommk/genesis/rules.mk
+++ b/keyboards/custommk/genesis/rules.mk
@@ -1,15 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-
DEFAULT_FOLDER = custommk/genesis/rev2