Implement registration to M commands response

octoprint_CalibrationTools/api.py

@@ -1,20 +1,16 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, division, print_function, unicode_literals
 
+from threading import Event
 import octoprint.plugin
 import flask
-
+import re
 
 CMD_TEST = "TEST"
 CMD_LOAD_STEPS = "loadSteps"
 CMD_START_EXTRUSION = "startExtrusion"
 CMD_SAVE_E_STEPS = "saveESteps"
 
-
-def someTestFunc(self, temps):
-    self._logger.debug("a ajuns %s", temps)
-
-
 class API(octoprint.plugin.SimpleApiPlugin):
     @staticmethod
     def get_api_commands():
@@ -43,8 +39,14 @@ class API(octoprint.plugin.SimpleApiPlugin):
                     "msg": "Printer not ready, operation canceled"
                 })
 
+            # Register listener waiting response for M92 command
+            m92Event = Event()
+            self.registerGCodeWaiter("M92", self.m92GCodeResponse, m92Event)
+
+            # Issue M92 command
             self._printer.commands("M92")
 
+            m92Event.wait()
             return flask.jsonify({
                 "data": self.data["steps"]
             })
@@ -69,14 +71,33 @@ class API(octoprint.plugin.SimpleApiPlugin):
             return
 
         if command == CMD_TEST:
-            # self.registerEventTemp("T0", 100, someTestFunc)
-            return flask.abort(503, {
-                "msg": "Printer not ready, operation canceled"
-            })
+            self.registerGCodeWaiter("M92", self.someTestFunc)
+            return
 
+############## HANDLERS ##############
     @staticmethod
     def startExtrusion(self, temps, *args):
         self._logger.debug("Temperature achieved, extrusion started %s, %s", temps, args)
 
         # Extrude
         self._printer.extrude(amount=120, speed=50)
+
+    @staticmethod
+    def m92GCodeResponse(self, line, event):
+        reg = re.compile("echo:\s*(?P<command>(?P<gCode>M\d{1,3}) X(?P<xVal>\d{1,3}.\d{1,3}) Y(?P<yVal>\d{1,3}.\d{1,3}) Z(?P<zVal>\d{1,3}.\d{1,3}) E(?P<eVal>\d{1,3}.\d{1,3}))")
+        isM92command = reg.match(line)
+        if isM92command:
+            command = isM92command.group("command")
+            if isM92command.group("gCode") == "M92":
+                self.data["steps"]["X"] = float(isM92command.group("xVal"))
+                self.data["steps"]["Y"] = float(isM92command.group("yVal"))
+                self.data["steps"]["Z"] = float(isM92command.group("zVal"))
+                self.data["steps"]["E"] = float(isM92command.group("eVal"))
+
+                # Send the new data to the UI to be reloaded
+                self._logger.debug("gCode: %s", command)
+                self._logger.debug("X: %s, Y:%s, Z:%s, E:%s", self.data["steps"]["X"], self.data["steps"]["Y"], self.data["steps"]["Z"], self.data["steps"]["E"])
+                self._logger.debug("Finished data collection")
+                self.collectCommand = False
+        if event:
+            event.set()