add printing progress

error23 · Jul 22, 2021 · efb5731 · efb5731
1 parent 0ca37c3
commit efb5731
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/include/feature/PrinterFeature.hpp b/include/feature/PrinterFeature.hpp
@@ -56,6 +56,9 @@ namespace CrowOs {
 			/** Printer bed temperature */
 			int temperatureBed;
 
+			/** Printer progress while printing */
+			double printingProgress;
+
 			Printer()
 				: id(-1)
 				, machineName()
@@ -70,7 +73,8 @@ namespace CrowOs {
 				, maxZ(-1)
 				, temperatureExtruderLeft(-1)
 				, temperatureExtruderRight(-1)
-				, temperatureBed(-1) {
+				, temperatureBed(-1)
+				, printingProgress(-1) {
 			}
 		};
 

diff --git a/src/feature/PrinterFeature.cpp b/src/feature/PrinterFeature.cpp
@@ -173,6 +173,7 @@ namespace CrowOs {
 				printers[printerIndex].temperatureExtruderLeft = printerDto["temperatureExtruderLeft"];
 				printers[printerIndex].temperatureExtruderRight = printerDto["temperatureExtruderRight"];
 				printers[printerIndex].temperatureBed = printerDto["temperatureBed"];
+				printers[printerIndex].printingProgress = printerDto["printingProgress"];
 
 				lastPrinterFetch = millis();
 				shouldRedrawScreen = true;
@@ -249,9 +250,17 @@ namespace CrowOs {
 				screen->clearText(screen->getMaxXCharacters(), 5, screen->getMinY() + 12);
 				screen->printText(buff, 5, screen->getMinY() + 12, foregroundColor);
 
-				sprintf(buff, "LED : %s", printers[printerIndex].ledColor);
-				screen->clearText(screen->getMaxXCharacters(), 5, screen->getMinY() + 22);
-				screen->printText(buff, 5, screen->getMinY() + 22, foregroundColor);
+				if(printers[printerIndex].printingProgress == -1 || printers[printerIndex].printingProgress == 100) {
+					sprintf(buff, "LED : %s", printers[printerIndex].ledColor);
+					screen->clearText(screen->getMaxXCharacters(), 5, screen->getMinY() + 22);
+					screen->printText(buff, 5, screen->getMinY() + 22, foregroundColor);
+				}
+				else {
+
+					sprintf(buff, "Progress : %.2f%%", printers[printerIndex].printingProgress);
+					screen->clearText(screen->getMaxXCharacters(), 5, screen->getMinY() + 22);
+					screen->printText(buff, 5, screen->getMinY() + 22, foregroundColor);
+				}
 
 				M5.Lcd.drawLine(5, screen->getMinY() + 31, screen->getMaxX() - 5, screen->getMinY() + 31, foregroundColor);