From 7b2980970382c314e27ce0a399f0d9e746e3af1f Mon Sep 17 00:00:00 2001 From: Andreas Tacke Date: Sun, 7 Jan 2024 19:51:03 +0100 Subject: [PATCH] Remove calls to small water icon that aren't actually being shown --- src/Displaytemplateminimal.h | 20 +++++----- src/Displaytemplatescale.h | 25 ++++++++----- src/Displaytemplatestandard.h | 19 ++++++---- src/Displaytemplatetemponly.h | 17 +++++---- src/display.h | 70 ++++++++++++----------------------- 5 files changed, 71 insertions(+), 80 deletions(-) diff --git a/src/Displaytemplateminimal.h b/src/Displaytemplateminimal.h index 8aa72438..038b9280 100644 --- a/src/Displaytemplateminimal.h +++ b/src/Displaytemplateminimal.h @@ -53,7 +53,8 @@ void printScreen() { u8g2.setFont(u8g2_font_profont22_tf); u8g2.print(setpoint, numDecimalsSetpoint); } - } else { + } + else { u8g2.setCursor(2, 2); u8g2.setFont(u8g2_font_profont22_tf); u8g2.print(temperature, numDecimalsInput); @@ -62,7 +63,8 @@ void printScreen() { if (pidMode == 1) { u8g2.print(char(74)); - } else { + } + else { u8g2.print(char(70)); } @@ -73,13 +75,10 @@ void printScreen() { if (brewcounter > kBrewIdle) { u8g2.setFont(u8g2_font_profont17_tf); - - // Brew u8g2.setCursor(2, 30); - } else { + } + else { u8g2.setFont(u8g2_font_profont10_tf); - - // Brew u8g2.setCursor(36, 30); } @@ -89,7 +88,8 @@ void printScreen() { if (ONLYPID == 1) { u8g2.print(brewtimesoftware, 0); - } else { + } + else { u8g2.print(totalBrewTime / 1000, 0); } @@ -112,13 +112,13 @@ void printScreen() { u8g2.drawFrame(116, 28, 12, 12); u8g2.drawXBMP(118, 30, 8, 8, antenna_NOK_u8g2); } - } else { + } + else { u8g2.drawFrame(116, 28, 12, 12); u8g2.setCursor(120, 30); u8g2.print("O"); } - displayIcons(); u8g2.sendBuffer(); } } diff --git a/src/Displaytemplatescale.h b/src/Displaytemplatescale.h index d8a7ccc3..eee83d84 100644 --- a/src/Displaytemplatescale.h +++ b/src/Displaytemplatescale.h @@ -44,13 +44,15 @@ void printScreen() { u8g2.drawLine(12, 48, 12, 58 - (temperature / 2)); u8g2.drawLine(13, 48, 13, 58 - (temperature / 2)); } - } else if (temperature > 106) { + } + else if (temperature > 106) { u8g2.drawLine(9, 48, 9, 5); u8g2.drawLine(10, 48, 10, 4); u8g2.drawLine(11, 48, 11, 3); u8g2.drawLine(12, 48, 12, 4); u8g2.drawLine(13, 48, 13, 5); - } else { + } + else { u8g2.drawLine(9, 48, 9, 58 - (temperature / 2)); u8g2.drawLine(10, 48, 10, 58 - (temperature / 2)); u8g2.drawLine(11, 48, 11, 58 - (temperature / 2)); @@ -69,7 +71,8 @@ void printScreen() { if (ONLYPID == 1) { u8g2.print(brewtimesoftware, 0); // deaktivieren wenn Preinfusion ( // voransetzen ) - } else { + } + else { u8g2.print(totalBrewTime / 1000, 1); // aktivieren wenn Preinfusion und eine Nachkommastelle // oder alternativ keine } @@ -79,10 +82,12 @@ void printScreen() { if (scaleFailure) { u8g2.print("fault"); - } else { + } + else { if (brewswitch == LOW) { u8g2.print(weight, 0); - } else { + } + else { u8g2.print(weightBrew, 0); } @@ -114,7 +119,8 @@ void printScreen() { for (int b = 0; b <= signalBars; b++) { u8g2.drawVLine(45 + (b * 2), 10 - (b * 2), b * 2); } - } else { + } + else { u8g2.drawXBMP(40, 2, 8, 8, antenna_NOK_u8g2); u8g2.setCursor(88, 2); u8g2.print("RC: "); @@ -126,17 +132,18 @@ void printScreen() { u8g2.setCursor(60, 1); u8g2.setFont(u8g2_font_profont11_tf); u8g2.print("MQTT"); - } else { + } + else { u8g2.setCursor(60, 2); u8g2.print(""); } } - } else { + } + else { u8g2.setCursor(40, 2); u8g2.print("Offline Mode"); } - displayIcons(); u8g2.sendBuffer(); } } diff --git a/src/Displaytemplatestandard.h b/src/Displaytemplatestandard.h index 306e6ed5..96eec1e8 100644 --- a/src/Displaytemplatestandard.h +++ b/src/Displaytemplatestandard.h @@ -52,13 +52,15 @@ void printScreen() u8g2.drawLine(12, 48, 12, 58 - (temperature / 2)); u8g2.drawLine(13, 48, 13, 58 - (temperature / 2)); } - } else if (temperature > 106) { + } + else if (temperature > 106) { u8g2.drawLine(9, 48, 9, 5); u8g2.drawLine(10, 48, 10, 4); u8g2.drawLine(11, 48, 11, 3); u8g2.drawLine(12, 48, 12, 4); u8g2.drawLine(13, 48, 13, 5); - } else { + } + else { u8g2.drawLine(9, 48, 9, 58 - (temperature / 2)); u8g2.drawLine(10, 48, 10, 58 - (temperature / 2)); u8g2.drawLine(11, 48, 11, 58 - (temperature / 2)); @@ -88,7 +90,8 @@ void printScreen() if (pidOutput < 99) { u8g2.print(pidOutput / 10, 1); - } else { + } + else { u8g2.print(pidOutput / 10, 0); } @@ -110,7 +113,8 @@ void printScreen() else { u8g2.print(totalBrewTime / 1000, 1); // Activate if pre-infusion and one decimal place or alternatively none } - } else { + } + else { // Show uptime of machine u8g2.print(langstring_uptime); float seconds = millis() / 1000; @@ -138,7 +142,8 @@ void printScreen() for (int b = 0; b <= signalBars; b++) { u8g2.drawVLine(45 + (b * 2), 10 - (b * 2), b * 2); } - } else { + } + else { u8g2.drawXBMP(40, 2, 8, 8, antenna_NOK_u8g2); u8g2.setCursor(88, 1); u8g2.print("RC: "); @@ -155,12 +160,12 @@ void printScreen() u8g2.print(""); } } - } else { + } + else { u8g2.setCursor(40, 1); u8g2.print(langstring_offlinemode); } - displayIcons(); u8g2.sendBuffer(); } } diff --git a/src/Displaytemplatetemponly.h b/src/Displaytemplatetemponly.h index 8425e15a..b8403355 100644 --- a/src/Displaytemplatetemponly.h +++ b/src/Displaytemplatetemponly.h @@ -18,8 +18,8 @@ void printScreen() { if ((machineState == kAtSetpoint || machineState == kPidNormal || machineState == kBrewDetectionTrailing) || ((machineState == kBrew || machineState == kShotTimerAfterBrew) && SHOTTIMER == 0) || // shottimer == 0, auch Bezug anzeigen machineState == kCoolDown || ((machineState == kInit || machineState == kColdStart) && HEATINGLOGO == 0) || - ((machineState == kPidOffline) && OFFLINEGLOGO == 0)) { - + ((machineState == kPidOffline) && OFFLINEGLOGO == 0)) + { if (!sensorError) { u8g2.clearBuffer(); @@ -31,18 +31,21 @@ void printScreen() { u8g2.setCursor(13, 12); u8g2.setFont(u8g2_font_fub35_tf); u8g2.print(temperature, 1); - } else { + } + else { u8g2.setCursor(-1, 12); u8g2.setFont(u8g2_font_fub35_tf); u8g2.print(temperature, 1); } } - } else { + } + else { if (temperature < 99.999) { u8g2.setCursor(13, 12); u8g2.setFont(u8g2_font_fub35_tf); u8g2.print(temperature, 1); - } else { + } + else { u8g2.setCursor(-1, 12); u8g2.setFont(u8g2_font_fub35_tf); u8g2.print(temperature, 1); @@ -58,13 +61,13 @@ void printScreen() { u8g2.drawFrame(116, 28, 12, 12); u8g2.drawXBMP(118, 30, 8, 8, antenna_NOK_u8g2); } - } else { + } + else { u8g2.drawFrame(116, 28, 12, 12); u8g2.setCursor(120, 30); u8g2.print("O"); } - displayIcons(); u8g2.sendBuffer(); } } diff --git a/src/display.h b/src/display.h index 89f37ccf..e193cd44 100644 --- a/src/display.h +++ b/src/display.h @@ -8,7 +8,6 @@ #if (OLED_DISPLAY != 0) - /** * @brief initialize display */ @@ -22,16 +21,12 @@ void u8g2_prepare(void) { } /** - * Show water empty icon in upper right corner if water supply is low + * @brief Show water empty icon in upper right corner if water supply is low */ -void displayWaterIcon() { - if (!waterFull) { - u8g2.drawXBMP(119, 2, 8, 8, water_EMPTY_u8g2); - } -} - -void displayIcons() { - displayWaterIcon(); +void displayWaterIcon(int x, int y) { + if (!waterFull) { + u8g2.drawXBMP(x, y, 8, 8, water_EMPTY_u8g2); + } } /** @@ -51,7 +46,6 @@ void displayMessage(String text1, String text2, String text3, String text4, Stri u8g2.print(text5); u8g2.setCursor(0, 50); u8g2.print(text6); - displayIcons(); u8g2.sendBuffer(); } @@ -67,41 +61,22 @@ void displayLogo(String displaymessagetext, String displaymessagetext2) { // Rancilio startup logo switch (machine) { case RancilioSilvia: // Rancilio - u8g2.drawXBMP(41, 2, startLogoRancilio_width, startLogoRancilio_height, - startLogoRancilio_bits); + u8g2.drawXBMP(41, 2, startLogoRancilio_width, startLogoRancilio_height, startLogoRancilio_bits); break; case RancilioSilviaE: // Rancilio - u8g2.drawXBMP(41, 2, startLogoRancilio_width, startLogoRancilio_height, - startLogoRancilio_bits); + u8g2.drawXBMP(41, 2, startLogoRancilio_width, startLogoRancilio_height, startLogoRancilio_bits); break; case Gaggia: // Gaggia - u8g2.drawXBMP(0, 2, startLogoGaggia_width, startLogoGaggia_height, - startLogoGaggia_bits); + u8g2.drawXBMP(0, 2, startLogoGaggia_width, startLogoGaggia_height, startLogoGaggia_bits); break; case QuickMill: // Quickmill - u8g2.drawXBMP(22, 0, startLogoQuickMill_width, startLogoQuickMill_height, - startLogoQuickMill_bits); + u8g2.drawXBMP(22, 0, startLogoQuickMill_width, startLogoQuickMill_height, startLogoQuickMill_bits); break; } - displayIcons(); - u8g2.sendBuffer(); -} -/** - * @brief calibration mode - * - * @param display_distance - */ -void displayDistance(int display_distance) { - u8g2.clearBuffer(); - u8g2.setCursor(13, 12); - u8g2.setFont(u8g2_font_fub20_tf); - u8g2.printf("%d", display_distance); - u8g2.print("mm"); - displayIcons(); u8g2.sendBuffer(); } @@ -118,7 +93,7 @@ void displayShottimer(void) { u8g2.setCursor(64, 25); u8g2.print(timeBrewed / 1000, 1); u8g2.setFont(u8g2_font_profont11_tf); - displayIcons(); + displayWaterIcon(119, 1); u8g2.sendBuffer(); } @@ -133,7 +108,7 @@ void displayShottimer(void) { u8g2.setCursor(64, 25); u8g2.print(lastbrewTime / 1000, 1); u8g2.setFont(u8g2_font_profont11_tf); - displayIcons(); + displayWaterIcon(119, 1); u8g2.sendBuffer(); } @@ -151,7 +126,7 @@ void displayShottimer(void) { u8g2.print(weightBrew, 0); u8g2.print("g"); u8g2.setFont(u8g2_font_profont11_tf); - displayIcons(); + displayWaterIcon(119, 1); u8g2.sendBuffer(); } @@ -166,7 +141,7 @@ void displayShottimer(void) { u8g2.print(weightBrew, 0); u8g2.print(" g"); u8g2.setFont(u8g2_font_profont11_tf); - displayIcons(); + displayWaterIcon(119, 1); u8g2.sendBuffer(); } #endif @@ -191,7 +166,8 @@ void Displaymachinestate() { for (int b = 0; b <= signalBars; b++) { u8g2.drawVLine(45 + (b * 2), 10 - (b * 2), b * 2); } - } else { + } + else { u8g2.drawXBMP(40, 2, 8, 8, antenna_NOK_u8g2); u8g2.setCursor(88, 1); u8g2.print("RC: "); @@ -203,7 +179,8 @@ void Displaymachinestate() { u8g2.setCursor(60, 1); u8g2.setFont(u8g2_font_profont11_tf); u8g2.print("MQTT"); - } else { + } + else { u8g2.setCursor(60, 2); u8g2.print(""); } @@ -231,7 +208,6 @@ void Displaymachinestate() { u8g2.setCursor(92, 30); u8g2.setFont(u8g2_font_profont17_tf); u8g2.print(temperature, 1); - displayIcons(); u8g2.sendBuffer(); } @@ -242,7 +218,6 @@ void Displaymachinestate() { u8g2.setCursor(0, 55); u8g2.setFont(u8g2_font_profont10_tf); u8g2.print("PID is disabled manually"); - displayIcons(); u8g2.sendBuffer(); } @@ -252,7 +227,6 @@ void Displaymachinestate() { u8g2.setCursor(36, 55); u8g2.setFont(u8g2_font_profont10_tf); u8g2.print("Standby mode"); - displayIcons(); u8g2.sendBuffer(); } @@ -264,7 +238,7 @@ void Displaymachinestate() { u8g2.setFont(u8g2_font_profont22_tf); u8g2.print(temperature, 0); u8g2.setCursor(64, 25); - displayIcons(); + displayWaterIcon(119, 1); u8g2.sendBuffer(); } @@ -283,11 +257,13 @@ void Displaymachinestate() { #if OLED_DISPLAY != 0 displayMessage(langstring_bckffinished[0], langstring_bckffinished[1], "", "", "", ""); #endif - } else if (backflushState == 10) { + } + else if (backflushState == 10) { #if OLED_DISPLAY != 0 displayMessage(langstring_bckfactivated[0], langstring_bckfactivated[1], "", "", "", ""); #endif - } else if (backflushState > 10) { + } + else if (backflushState > 10) { #if OLED_DISPLAY != 0 displayMessage(langstring_bckfrunning[0], String(flushCycles), langstring_bckfrunning[1], String(maxflushCycles), "", ""); #endif @@ -323,7 +299,6 @@ void Displaymachinestate() { u8g2.print("PID STOPPED"); } - displayIcons(); u8g2.sendBuffer(); } @@ -339,4 +314,5 @@ void Displaymachinestate() { displayMessage("EEPROM Error, please set Values", "", "", "", "", ""); } } + #endif