Merge pull request #13 from arekm/master

Rewrite a little and support SILENT mode.

octoprint_PrusaETAOverride/__init__.py

@@ -1,38 +1,82 @@
 # coding=utf-8
 from __future__ import absolute_import, unicode_literals
-import octoprint.plugin
+
+import logging
 import re
 import time
+
+import octoprint.plugin
 from octoprint.printer.estimation import PrintTimeEstimator
-from octoprint.events import eventManager, Events
-
-eta = 0
-oldZ = 0.0
-
-ts = int(time.time())
-r = re.compile(
-    r'NORMAL MODE: Percent done: \d+; print time remaining in mins: (\d+)')
-p = re.compile(
-    r'^X:\d+\.\d+ Y:\d+\.\d+ Z:(\d+\.\d+) ')
-
-
-def pETAeveryLine(comm, line, *args, **kwargs):
-    global eta, r, ts, oldZ
-    m = r.search(line)
-    if m:
-        eta = int(m.group(1)) * 60
-        ts = int(time.time())
-        comm._sendCommand("M114")
-    z = p.search(line)
-    if z:
-        newZ = float(z.group(1))
-        if newZ != oldZ:
-            eventManager().fire(Events.Z_CHANGE, {"new": newZ, "old": oldZ})
-            oldZ = newZ
-    return line
+
+class PrusaETAPrintTimeEstimator(PrintTimeEstimator):
+    def __init__(self, job_type):
+        super(PrusaETAPrintTimeEstimator, self).__init__(job_type)
+        self._logger = logging.getLogger("octoprint.plugins.PrusaETAOverride")
+        self.last_update = time.time()
+        self.estimated_time = -1
+
+    def estimate(self, *args, **kwargs):
+        if self.estimated_time < 0:
+            self._logger.debug("self.estimated_time < 0: {}, calling default PrintTimeEstimator".format(self.estimated_time))
+            return PrintTimeEstimator.estimate(self, *args, **kwargs)
+        eta = self.estimated_time - (int(time.time() - self.last_update)), "estimate"
+        self._logger.debug("New eta calculated: {} (self.estimated_time: {}, self.last_update: {}".format(eta, self.estimated_time, self.last_update))
+        return eta
 
 
 class PrusaetaoverridePlugin(octoprint.plugin.OctoPrintPlugin):
+    def __init__(self):
+        self._logger = logging.getLogger("octoprint.plugins.PrusaETAOverride")
+
+        self._estimator = None
+        self.m73_mode = None
+
+        # do not match lines with negative progress ("... Percent done: -1; ...")
+        self.m73_pattern = re.compile(
+                r'(?P<mode>\w+) MODE: Percent done: (?P<progress>\d+); print time remaining in mins: (?P<eta>\d+)(?:; Change in mins: (?P<eta_change>-?\d+))?')
+        self.m114_pattern = re.compile(
+                r'^X:\d+\.\d+ Y:\d+\.\d+ Z:(?P<z>\d+\.\d+) ')
+
+
+    def parse_line(self, comm, line, *args, **kwargs):
+        m = self.m73_pattern.search(line)
+        if m:
+
+            mode = m.group('mode')
+
+            # lock into first MODE we will see
+            if self.m73_mode is None:
+                self.m73_mode = mode
+
+            # but switch to NORMAL if we see it. SILENT will be properly choosen once fixed
+            # in prusa firmware: https://github.com/prusa3d/Prusa-Firmware/pull/2735
+            if self.m73_mode != mode and mode == "NORMAL":
+                self._logger.debug("Switching from mode {} to mode NORMAL".format(self.m73_mode))
+                self.m73_mode = "NORMAL"
+
+            if mode != self.m73_mode:
+                return line
+
+            self._estimator.estimated_time = int(m.group('eta')) * 60
+            self._estimator.last_update = int(time.time())
+            self._logger.debug("Parsed time update for mode {}: {}".format(mode, self._estimator.estimated_time))
+            comm._sendCommand("M114")
+            return line
+
+        z = self.m114_pattern.search(line)
+        if z:
+            newZ = float(z.group('z'))
+            comm._callback.on_comm_z_change(newZ)
+            self._logger.debug("Parsed Z update: {}".format(newZ))
+            return line
+
+        return line
+
+    def estimator_factory(self, *args, **kwargs):
+        def factory(*args, **kwargs):
+            self._estimator = PrusaETAPrintTimeEstimator(*args, **kwargs)
+            return self._estimator
+        return factory
 
     def get_update_information(self):
         return dict(
@@ -51,19 +95,6 @@ def get_update_information(self):
             )
         )
 
-
-class pETAPrintTimeEstimator(PrintTimeEstimator):
-    def __init__(self, job_type):
-        super(pETAPrintTimeEstimator, self).__init__(job_type)
-
-    def estimate(self, progress, printTime, cleanedPrintTime, statisticalTotalPrintTime, statisticalTotalPrintTimeType):
-        return eta - (int(time.time()) - ts), "estimate"
-
-
-def pETAfactory(*args, **kwargs):
-    return pETAPrintTimeEstimator
-
-
 __plugin_name__ = "Prusa ETA override Plugin"
 __plugin_pythoncompat__ = ">=2.7,<4"
 
@@ -75,6 +106,6 @@ def __plugin_load__():
     global __plugin_hooks__
     __plugin_hooks__ = {
         "octoprint.plugin.softwareupdate.check_config": __plugin_implementation__.get_update_information,
-        "octoprint.comm.protocol.gcode.received": pETAeveryLine,
-        "octoprint.printer.estimation.factory": pETAfactory
+        "octoprint.comm.protocol.gcode.received": __plugin_implementation__.parse_line,
+        "octoprint.printer.estimation.factory": __plugin_implementation__.estimator_factory
     }