summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-03-06 21:58:55 +0000
committerQMK Bot <hello@qmk.fm>2022-03-06 21:58:55 +0000
commit0f9849ca68c38dbd834be46474c3e74d145bd1a1 (patch)
tree1cd46f0c8a3fc7e44251e50da3eba5079c683c3c /keyboards
parent621b4b73a1a0c79db896eea9876cd0eb13bd57ec (diff)
parent30209de9fd2e2d142ef1e086a851ceeb058cfcef (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/merge/uma/uma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/merge/uma/uma.c b/keyboards/merge/uma/uma.c
index 376cdfd3fe..565a09fb27 100644
--- a/keyboards/merge/uma/uma.c
+++ b/keyboards/merge/uma/uma.c
@@ -50,8 +50,6 @@ static const char PROGMEM merge_logo[] = {
0x01, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00
};
-int current_wpm = 0;
-
static void print_status_narrow(void) {
oled_set_cursor(0,1);
oled_write_raw_P(merge_logo, sizeof(merge_logo));
@@ -86,6 +84,7 @@ static void print_status_narrow(void) {
//oled_write_ln_P(PSTR(" "), false);
oled_write_P(PSTR("-----"), false);
+#ifdef WPM_ENABLE
// WPM counter Start
oled_set_cursor(0,13);
oled_write(" ", false);
@@ -93,6 +92,7 @@ static void print_status_narrow(void) {
oled_set_cursor(0,14);
oled_write(" WPM ", false);
// WPM counter End
+#endif
}
bool oled_task_kb(void) {