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

Qrome - updated code format and spelling

pull/99/head
Chrome Legion 2019-04-11 20:34:15 -07:00
parent ba1cc15b14
commit 2996572d86
1 changed files with 341 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
printermonitor/RepetierClient.cpp
View File

@ -85,7 +85,7 @@ WiFiClient RepetierClient::getSubmitRequest(String apiGetData) {
} }
} }
else { else {
Serial.println("Connection to Repeteir failed: " + String(myServer) + ":" + String(myPort)); //error message if no client connect Serial.println("Connection to Repetier failed: " + String(myServer) + ":" + String(myPort)); //error message if no client connect
Serial.println(); Serial.println();
resetPrintData(); resetPrintData();
printerData.error = "Connection to Repetier failed: " + String(myServer) + ":" + String(myPort); printerData.error = "Connection to Repetier failed: " + String(myServer) + ":" + String(myPort);
@ -157,27 +157,30 @@ void RepetierClient::getPrinterJobResults() {
long timeTot=0; long timeTot=0;
long timeElap=0; long timeElap=0;
long timeLeft=0; long timeLeft=0;
if (printerData.estimatedPrintTime != "" ) if (printerData.estimatedPrintTime != "" ) {
{timeTot = atol(pr["printTime"]);} timeTot = atol(pr["printTime"]);
if (printerData.progressPrintTime != "") }
{timeElap= atol(pr["printedTimeComp"]);} if (printerData.progressPrintTime != "") {
timeElap= atol(pr["printedTimeComp"]);
}
timeLeft = timeTot-timeElap; timeLeft = timeTot-timeElap;
printerData.progressPrintTimeLeft = String(timeLeft); printerData.progressPrintTimeLeft = String(timeLeft);
String printing = (const char*) pr["job"]; String printing = (const char*) pr["job"];
if (printing != "none") { if (printing != "none") {
printerData.isPrinting = true; printerData.isPrinting = true;
}else {printerData.isPrinting=false;} } else {
printerData.isPrinting=false;
}
Serial.println("PT: " + printerData.progressPrintTime); Serial.println("PT: " + printerData.progressPrintTime);
Serial.println("PTC: " + printerData.estimatedPrintTime); Serial.println("PTC: " + printerData.estimatedPrintTime);
Serial.println("ST: " + printerData.lastPrintTime); Serial.println("ST: " + printerData.lastPrintTime);
Serial.println("TimeLeft: " + printerData.progressPrintTimeLeft); Serial.println("TimeLeft: " + printerData.progressPrintTimeLeft);
if (printerData.isPrinting) if (printerData.isPrinting) {
{ Serial.println("I think I am printing");} Serial.println("I think I am printing");
}
if (isOperational()) { if (isOperational()) {
Serial.println("Status: " + printerData.state); Serial.println("Status: " + printerData.state);
@ -210,7 +213,6 @@ Serial.println("TimeLeft: "+printerData.progressPrintTimeLeft);
return; return;
} }
printerData.toolTemp = (const char*) pr2["extruder"][0]["tempRead"]; printerData.toolTemp = (const char*) pr2["extruder"][0]["tempRead"];
printerData.toolTargetTemp = (const char*) pr2["extruder"][0]["tempSet"]; printerData.toolTargetTemp = (const char*) pr2["extruder"][0]["tempSet"];
printerData.bedTemp = (const char*) pr2["heatedBeds"][0]["tempRead"]; printerData.bedTemp = (const char*) pr2["heatedBeds"][0]["tempRead"];