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

Added Total Layers 

Added in Total Layers and changed the size of the font of the number of layers to a smaller size.
pull/136/head
victor7376 2021-03-13 13:00:15 +00:00
parent 045605b9f2
commit 1109ef250f
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
printermonitor/OctoPrintClient.cpp
View File

@ -266,7 +266,7 @@ void OctoPrintClient::getPrinterJobResults() {
printerData.estimatedEndTime = (const char*)root3["print"]["estimatedEndTime"]; printerData.estimatedEndTime = (const char*)root3["print"]["estimatedEndTime"];
printerData.currentLayer = (const char*)root3["layer"]["current"]; printerData.currentLayer = (const char*)root3["layer"]["current"];
printerData.totalLayers = (const char*)root3["layer"]["total"];
if (isPrinting()) { if (isPrinting()) {
Serial.println("Status: " + printerData.state + " " + printerData.fileName + "(" + printerData.progressCompletion + "%)"); Serial.println("Status: " + printerData.state + " " + printerData.fileName + "(" + printerData.progressCompletion + "%)");
@ -330,6 +330,7 @@ void OctoPrintClient::resetPrintData() {
printerData.isPSUoff = false; printerData.isPSUoff = false;
printerData.error = ""; printerData.error = "";
printerData.currentLayer = ""; printerData.currentLayer = "";
printerData.totalLayers = "";
printerData.estimatedEndTime = ""; printerData.estimatedEndTime = "";
} }
@ -337,6 +338,10 @@ String OctoPrintClient::getCurrentLayer(){
return printerData.currentLayer; return printerData.currentLayer;
} }
String OctoPrintClient::getTotalLayers(){
return printerData.totalLayers;
}
String OctoPrintClient::getEstimatedEndTime(){ String OctoPrintClient::getEstimatedEndTime(){
return printerData.estimatedEndTime; return printerData.estimatedEndTime;
} }

2
printermonitor/OctoPrintClient.h
View File

@ -60,6 +60,7 @@ private:
String toolTemp; String toolTemp;
String toolTargetTemp; String toolTargetTemp;
String currentLayer; String currentLayer;
String totalLayers;
String estimatedEndTime; String estimatedEndTime;
String filamentLength; String filamentLength;
String bedTemp; String bedTemp;
@ -99,6 +100,7 @@ public:
String getFilamentLength(); String getFilamentLength();
String getEstimatedEndTime(); String getEstimatedEndTime();
String getCurrentLayer(); String getCurrentLayer();
String getTotalLayers();
String getValueRounded(String value); String getValueRounded(String value);
String getError(); String getError();
String getPrinterType(); String getPrinterType();

5
printermonitor/printermonitor.ino
View File

@ -970,14 +970,15 @@ void drawScreen3(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int
void drawScreen4(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) { void drawScreen4(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
String layer = printerClient.getCurrentLayer(); String layer = printerClient.getCurrentLayer();
String totalLayers = printerClient.getTotalLayers();
display->setTextAlignment(TEXT_ALIGN_CENTER); display->setTextAlignment(TEXT_ALIGN_CENTER);
display->setFont(ArialMT_Plain_16); display->setFont(ArialMT_Plain_16);
display->drawString(64 + x, 0 + y, "Layer"); display->drawString(64 + x, 0 + y, "Layer");
//display->setTextAlignment(TEXT_ALIGN_LEFT); //display->setTextAlignment(TEXT_ALIGN_LEFT);
display->setFont(ArialMT_Plain_24); display->setFont(ArialMT_Plain_16);
display->drawString(64 + x, 14 + y, layer); display->drawString(64 + x, 14 + y, layer+ " / " + totalLayers);
} }