Michal
/
printer-monitor
mirror of https://github.com/Qrome/printer-monitor
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #74 from easytarget/bed-display-fix 

Discard bed temp if none reported
pull/75/head
Qrome 2019-02-18 19:20:41 -07:00 committed by GitHub
parent 9d51257d04 a0186e8272
commit 7f3d445260
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
printermonitor/printermonitor.ino
View File

@ -739,7 +739,9 @@ void displayPrinterStatus() {
}
html += "Tool Temperature: " + printerClient.getTempToolActual() + "&#176; C<br>";
html += "Bed Temperature: " + printerClient.getTempBedActual() + "&#176; C<br>";
if ( printerClient.getTempBedActual() != 0 ) {
html += "Bed Temperature: " + printerClient.getTempBedActual() + "&#176; C<br>";
}
int val = printerClient.getProgressPrintTimeLeft().toInt();
int hours = numberOfHours(val);
@ -826,15 +828,25 @@ void flashLED(int number, int delayTime) {
}
void drawScreen1(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
display->setTextAlignment(TEXT_ALIGN_CENTER);
display->setFont(ArialMT_Plain_16);
display->drawString(64 + x, 0 + y, "Bed / Tool Temp");
display->setTextAlignment(TEXT_ALIGN_LEFT);
display->setFont(ArialMT_Plain_24);
String bed = printerClient.getValueRounded(printerClient.getTempBedActual());
String tool = printerClient.getValueRounded(printerClient.getTempToolActual());
display->drawString(2 + x, 14 + y, bed + "°");
display->drawString(64 + x, 14 + y, tool + "°");
display->setTextAlignment(TEXT_ALIGN_CENTER);
display->setFont(ArialMT_Plain_16);
if (bed != "0") {
display->drawString(64 + x, 0 + y, "Bed / Tool Temp");
} else {
display->drawString(64 + x, 0 + y, "Tool Temp");
}
display->setTextAlignment(TEXT_ALIGN_LEFT);
display->setFont(ArialMT_Plain_24);
if (bed != "0") {
display->setTextAlignment(TEXT_ALIGN_LEFT);
display->drawString(2 + x, 14 + y, bed + "°");
display->drawString(64 + x, 14 + y, tool + "°");
} else {
display->setTextAlignment(TEXT_ALIGN_CENTER);
display->drawString(64 + x, 14 + y, tool + "°");
}
}
void drawScreen2(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {