g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
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 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) { static void print_status_narrow(void) {
oled_set_cursor(0,1); oled_set_cursor(0,1);
oled_write_raw_P(merge_logo, sizeof(merge_logo)); 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_ln_P(PSTR(" "), false);
oled_write_P(PSTR("-----"), false); oled_write_P(PSTR("-----"), false);
#ifdef WPM_ENABLE
// WPM counter Start // WPM counter Start
oled_set_cursor(0,13); oled_set_cursor(0,13);
oled_write(" ", false); oled_write(" ", false);
@ -93,6 +92,7 @@ static void print_status_narrow(void) {
oled_set_cursor(0,14); oled_set_cursor(0,14);
oled_write(" WPM ", false); oled_write(" WPM ", false);
// WPM counter End // WPM counter End
#endif
} }
bool oled_task_kb(void) { bool oled_task_kb(void) {