summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-09 17:27:37 +0000
committerQMK Bot <hello@qmk.fm>2022-07-09 17:27:37 +0000
commita15e44cfb3b80d3074db1f9a110af58939f00e80 (patch)
tree314cfc466a25d88ccc8d3d34492da0c22bafacf3
parent39e1e27ea9137bb7aaa97f2d6c6a8cad61223ef8 (diff)
parent2106acc24a5c223a5429ea5413bd78f6f0ad038c (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/merge/um80/um80.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/keyboards/merge/um80/um80.c b/keyboards/merge/um80/um80.c
index 4bb925c6c9..557197c89d 100644
--- a/keyboards/merge/um80/um80.c
+++ b/keyboards/merge/um80/um80.c
@@ -16,6 +16,10 @@
#include "um80.h"
+#ifndef WPM_ENABLE
+# define get_current_wpm() 0
+#endif
+
#ifdef OLED_ENABLE
void suspend_power_down_kb(void) {
oled_off();
@@ -61,8 +65,6 @@ static const char PROGMEM merge_logo[] = {
0x01, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00
};
-uint8_t current_wpm = 0;
-
static void print_status_narrow(void) {
oled_set_cursor(0,1);
oled_write_raw_P(merge_logo, sizeof(merge_logo));
@@ -108,7 +110,6 @@ static void print_status_narrow(void) {
bool oled_task_kb(void) {
if (!oled_task_user()) { return false; }
- current_wpm = get_current_wpm();
if (is_keyboard_master()) {
print_status_narrow();
//render_logo();