fern/qmk-firmware
1
0
Fork 0
mirror of https://github.com/firewalkwithm3/qmk_firmware.git synced 2024-11-23 03:50:28 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2022-03-06 21:58:55 +00:00
parent 621b4b73a1 30209de9fd
commit 0f9849ca68
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
keyboards/merge/uma/uma.c
View file

@ -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) {