summaryrefslogtreecommitdiff
path: root/keyboards/merge
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2022-03-06 21:58:08 +0000
committerGitHub <noreply@github.com>2022-03-06 21:58:08 +0000
commit30209de9fd2e2d142ef1e086a851ceeb058cfcef (patch)
treec3193fd408f1f8e11390dbb6d6b5ed73ed70799f /keyboards/merge
parent16cd1d9bf78539dfd2590a831ba9708dcac69411 (diff)
merge/uma - Resolve configurator issues (#16551)
Diffstat (limited to 'keyboards/merge')
-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) {