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

Qrome - added reset to printer Data on failed connection

pull/14/head
Chrome Legion 2018-05-30 07:41:24 -07:00
parent efc8ee24c5
commit f02c3de3b7
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
printermonitor/OctoPrintClient.cpp
View File

@ -64,16 +64,16 @@ WiFiClient OctoPrintClient::getSubmitRequest(String apiGetData) {
if (printClient.println() == 0) { if (printClient.println() == 0) {
Serial.println("Connection to " + String(myServer) + ":" + String(myPort) + " failed."); Serial.println("Connection to " + String(myServer) + ":" + String(myPort) + " failed.");
Serial.println(); Serial.println();
resetPrintData();
printerData.error = "Connection to " + String(myServer) + ":" + String(myPort) + " failed."; printerData.error = "Connection to " + String(myServer) + ":" + String(myPort) + " failed.";
printerData.state = "";
return printClient; return printClient;
} }
} }
else { else {
Serial.println("Connection to OctoPrint failed: " + String(myServer) + ":" + String(myPort)); //error message if no client connect Serial.println("Connection to OctoPrint failed: " + String(myServer) + ":" + String(myPort)); //error message if no client connect
Serial.println(); Serial.println();
resetPrintData();
printerData.error = "Connection to OctoPrint failed: " + String(myServer) + ":" + String(myPort); printerData.error = "Connection to OctoPrint failed: " + String(myServer) + ":" + String(myPort);
printerData.state = "";
return printClient; return printClient;
} }
@ -177,6 +177,27 @@ void OctoPrintClient::getPrinterJobResults() {
printClient.stop(); //stop client printClient.stop(); //stop client
} }
// Reset all PrinterData
void OctoPrintClient::resetPrintData() {
printerData.averagePrintTime = "";
printerData.estimatedPrintTime = "";
printerData.fileName = "";
printerData.fileSize = "";
printerData.lastPrintTime = "";
printerData.progressCompletion = "";
printerData.progressFilepos = "";
printerData.progressPrintTime = "";
printerData.progressPrintTimeLeft = "";
printerData.state = "";
printerData.toolTemp = "";
printerData.toolTargetTemp = "";
printerData.filamentLength = "";
printerData.bedTemp = "";
printerData.bedTargetTemp = "";
printerData.isPrinting = false;
printerData.error = "";
}
String OctoPrintClient::getAveragePrintTime(){ String OctoPrintClient::getAveragePrintTime(){
return printerData.averagePrintTime; return printerData.averagePrintTime;
} }

1
printermonitor/OctoPrintClient.h
View File

@ -32,6 +32,7 @@ private:
int myPort = 80; int myPort = 80;
String myApiKey = ""; String myApiKey = "";
void resetPrintData();
boolean validate(); boolean validate();
WiFiClient getSubmitRequest(String apiGetData); WiFiClient getSubmitRequest(String apiGetData);