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

Merge aa3bba84a0 into 028e80766e

pull/106/merge
Daniel Franke 2020-06-07 00:22:39 +02:00 committed by GitHub
parent 028e80766e aa3bba84a0
commit 437af217e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
printermonitor/OctoPrintClient.cpp
View File

@ -209,6 +209,8 @@ void OctoPrintClient::getPrinterJobResults() {
if (isOperational()) {
Serial.println("Status: " + printerData.state);
} else if (isIdle()) {
Serial.println("Printer Is Idle");
} else {
Serial.println("Printer Not Operational");
}
@ -353,6 +355,10 @@ boolean OctoPrintClient::isPrinting() {
return printerData.isPrinting;
}
boolean OctoPrintClient::isIdle() {
return isOperational() && !isPrinting();
}
boolean OctoPrintClient::isPSUoff() {
return printerData.isPSUoff;
}

1
printermonitor/OctoPrintClient.h
View File

@ -87,6 +87,7 @@ public:
String getState();
boolean isPrinting();
boolean isOperational();
boolean isIdle();
boolean isPSUoff();
String getTempBedActual();
String getTempBedTarget();

10
printermonitor/printermonitor.ino
View File

@ -358,7 +358,7 @@ void findMDNS() {
}
//************************************************************
// Main Looop
// Main Loop
//************************************************************
void loop() {
@ -981,12 +981,16 @@ void drawClockHeaderOverlay(OLEDDisplay *display, OLEDDisplayUiState* state) {
display->setTextAlignment(TEXT_ALIGN_CENTER);
if (printerClient.isPSUoff()) {
display->drawString(64, 47, "psu off");
} else if (printerClient.isIdle()) {
display->drawString(64, 47, "idle");
} else {
display->drawString(64, 47, "offline");
}
} else {
if (printerClient.isPSUoff()) {
display->drawString(0, 47, "psu off");
} else if (printerClient.isIdle()) {
display->drawString(0, 47, "idle");
} else {
display->drawString(0, 47, "offline");
}
@ -1218,7 +1222,7 @@ void checkDisplay() {
return;
}
} else if (DISPLAYCLOCK) {
if ((!printerClient.isOperational() || printerClient.isPSUoff()) && !isClockOn) {
if ((!printerClient.isOperational() || printerClient.isIdle() || printerClient.isPSUoff()) && !isClockOn) {
Serial.println("Clock Mode is turned on.");
if (!DISPLAYWEATHER) {
ui.disableAutoTransition();
@ -1232,7 +1236,7 @@ void checkDisplay() {
}
ui.setOverlays(clockOverlay, numberOfOverlays);
isClockOn = true;
} else if (printerClient.isOperational() && !printerClient.isPSUoff() && isClockOn) {
} else if (printerClient.isOperational() && !printerClient.isIdle() && !printerClient.isPSUoff() && isClockOn) {
Serial.println("Printer Monitor is active.");
ui.setFrames(frames, numberOfFrames);
ui.setOverlays(overlays, numberOfOverlays);