~ruther/qmk_firmware

0f9849ca68c38dbd834be46474c3e74d145bd1a1 — QMK Bot 3 years ago 621b4b7 + 30209de
Merge remote-tracking branch 'origin/master' into develop
1 files changed, 2 insertions(+), 2 deletions(-)

M keyboards/merge/uma/uma.c
M keyboards/merge/uma/uma.c => keyboards/merge/uma/uma.c +2 -2
@@ 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) {