Skip to content

Commit

Permalink
Remove calls to small water icon that aren't actually being shown
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas Tacke committed Jan 7, 2024
1 parent a0c4631 commit 7b29809
Show file tree
Hide file tree
Showing 5 changed files with 71 additions and 80 deletions.
20 changes: 10 additions & 10 deletions src/Displaytemplateminimal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -62,7 +63,8 @@ void printScreen() {

if (pidMode == 1) {
u8g2.print(char(74));
} else {
}
else {
u8g2.print(char(70));
}

Expand All @@ -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);
}

Expand All @@ -89,7 +88,8 @@ void printScreen() {

if (ONLYPID == 1) {
u8g2.print(brewtimesoftware, 0);
} else {
}
else {
u8g2.print(totalBrewTime / 1000, 0);
}

Expand All @@ -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();
}
}
Expand Down
25 changes: 16 additions & 9 deletions src/Displaytemplatescale.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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
}
Expand All @@ -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);
}

Expand Down Expand Up @@ -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: ");
Expand All @@ -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();
}
}
19 changes: 12 additions & 7 deletions src/Displaytemplatestandard.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -88,7 +90,8 @@ void printScreen()

if (pidOutput < 99) {
u8g2.print(pidOutput / 10, 1);
} else {
}
else {
u8g2.print(pidOutput / 10, 0);
}

Expand All @@ -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;
Expand Down Expand Up @@ -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: ");
Expand All @@ -155,12 +160,12 @@ void printScreen()
u8g2.print("");
}
}
} else {
}
else {
u8g2.setCursor(40, 1);
u8g2.print(langstring_offlinemode);
}

displayIcons();
u8g2.sendBuffer();
}
}
17 changes: 10 additions & 7 deletions src/Displaytemplatetemponly.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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);
Expand All @@ -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();
}
}
Loading

0 comments on commit 7b29809

Please sign in to comment.