summaryrefslogtreecommitdiff
path: root/keyboards/merge
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/merge')
-rw-r--r--keyboards/merge/um70/keymaps/default/keymap.c3
-rw-r--r--keyboards/merge/um70/keymaps/via/keymap.c3
-rw-r--r--keyboards/merge/um70/rules.mk2
3 files changed, 5 insertions, 3 deletions
diff --git a/keyboards/merge/um70/keymaps/default/keymap.c b/keyboards/merge/um70/keymaps/default/keymap.c
index 0a775929d0..926f7836aa 100644
--- a/keyboards/merge/um70/keymaps/default/keymap.c
+++ b/keyboards/merge/um70/keymaps/default/keymap.c
@@ -169,7 +169,7 @@ static void print_status_narrow(void) {
// WPM counter End
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
current_wpm = get_current_wpm();
if (is_keyboard_master()) {
print_status_narrow();
@@ -178,6 +178,7 @@ void oled_task_user(void) {
render_logo();
//print_status_narrow();
}
+ return false;
}
#endif
diff --git a/keyboards/merge/um70/keymaps/via/keymap.c b/keyboards/merge/um70/keymaps/via/keymap.c
index aaf682ffd1..f7255eacf2 100644
--- a/keyboards/merge/um70/keymaps/via/keymap.c
+++ b/keyboards/merge/um70/keymaps/via/keymap.c
@@ -173,7 +173,7 @@ static void print_status_narrow(void) {
// WPM counter End
}
-void oled_task_user(void) {
+bool oled_task_user(void) {
current_wpm = get_current_wpm();
if (is_keyboard_master()) {
print_status_narrow();
@@ -182,6 +182,7 @@ void oled_task_user(void) {
render_logo();
//print_status_narrow();
}
+ return false;
}
#endif
diff --git a/keyboards/merge/um70/rules.mk b/keyboards/merge/um70/rules.mk
index b4334c6f9c..3347a8ebbf 100644
--- a/keyboards/merge/um70/rules.mk
+++ b/keyboards/merge/um70/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
#
-BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite
+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