summaryrefslogtreecommitdiff
path: root/keyboards/wolfmarkclub
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/wolfmarkclub')
-rw-r--r--keyboards/wolfmarkclub/wm1/config.h2
-rw-r--r--keyboards/wolfmarkclub/wm1/keymaps/default/keymap.c2
-rw-r--r--keyboards/wolfmarkclub/wm1/rules.mk9
-rw-r--r--keyboards/wolfmarkclub/wm1/wm1.c5
4 files changed, 11 insertions, 7 deletions
diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h
index 135700b988..ecbdc61eb3 100644
--- a/keyboards/wolfmarkclub/wm1/config.h
+++ b/keyboards/wolfmarkclub/wm1/config.h
@@ -75,5 +75,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/wolfmarkclub/wm1/keymaps/default/keymap.c b/keyboards/wolfmarkclub/wm1/keymaps/default/keymap.c
index 83e9ac21a7..9817557d66 100644
--- a/keyboards/wolfmarkclub/wm1/keymaps/default/keymap.c
+++ b/keyboards/wolfmarkclub/wm1/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ KC_LCTL, KC_LALT,KC_LGUI,KC_SPC, KC_SPC, KC_RALT,
[1] = LAYOUT(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______,
-RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
diff --git a/keyboards/wolfmarkclub/wm1/rules.mk b/keyboards/wolfmarkclub/wm1/rules.mk
index 18c26c3abc..a712747048 100644
--- a/keyboards/wolfmarkclub/wm1/rules.mk
+++ b/keyboards/wolfmarkclub/wm1/rules.mk
@@ -5,6 +5,9 @@ MCU = STM32F103
MCU_LDSCRIPT = wm1_f103
BOARD = STM32_F103_STM32DUINO
+# Bootloader selection
+BOOTLOADER = custom
+
PROGRAM_CMD = echo 'CLI flashing not supported' >&2
# Build Options
@@ -15,13 +18,11 @@ MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes # USB Nkey Rollover
+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
+SLEEP_LED_ENABLE = yes
LTO_ENABLE = yes
# Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/wolfmarkclub/wm1/wm1.c b/keyboards/wolfmarkclub/wm1/wm1.c
index d199546f89..0ad1ade4cc 100644
--- a/keyboards/wolfmarkclub/wm1/wm1.c
+++ b/keyboards/wolfmarkclub/wm1/wm1.c
@@ -1,5 +1,10 @@
#include "wm1.h"
+void bootloader_jump(void) {
+ // This board doesn't use the "standard" stm32duino bootloader, and no information is available regarding how to enter bootloader mode. All we can do here is reset.
+ NVIC_SystemReset();
+}
+
void matrix_init_kb(void) {
setPinOutput(B1); // Top Indicator LED
setPinOutput(B0); // Middle Indicator LED