start fixing tests

Author: AndyEveritt

examples/custom_m_codes.py

@@ -30,6 +30,20 @@ def start_intercept():
 
             # Check for the type of the code
             if cde.type == CodeType.MCode and cde.majorNumber == 1234:
+                # --------------- BEGIN FLUSH ---------------------
+                # Flushing is only necessary if the action below needs to be in sync with the machine
+                # at this point in the GCode stream. Otherwise, it can and should be skipped
+
+                # Flush the code's channel to be sure we are being in sync with the machine
+                success = intercept_connection.flush(cde.channel).success
+
+                # Flushing failed so we need to cancel our code
+                if not success:
+                    print("Flush failed")
+                    intercept_connection.cancel_code()
+                    continue
+                # -------------- END FLUSH ------------------------
+
                 # Do whatever needs to be done if this is the right code
                 print(cde, cde.flags)
 

setup.py

@@ -6,7 +6,7 @@
 
 setuptools.setup(
     name="dsf-python",
-    version="3.6.0",
+    version="3.6.0-b2",
     description="Python interface to access DuetSoftwareFramework",
     long_description=long_description,
     long_description_content_type="text/markdown",

src/dsf/commands/code.py

@@ -134,7 +134,7 @@ def short_str(self):
         if self.type == CodeType.Comment:
             return "(comment)"
 
-        prefix = "G53 " if self.flags & CodeFlags.EnforceAbsolutePosition != 0 else ""
+        prefix = "G53 " if self.is_flag_set(CodeFlags.EnforceAbsolutePosition) else ""
         if self.majorNumber is not None:
             if self.minorNumber is not None:
                 return f"{prefix}{self.type}{self.majorNumber}.{self.minorNumber}"
@@ -158,3 +158,6 @@ def keyword_to_str(self):
             KeywordType.Echo: "echo",
             KeywordType.Global: "global",
         }.get(self.keyword)
+
+    def is_flag_set(self, flag: CodeFlags):
+        return self.flags & flag != 0

tests/test_custom_m_codes.py

@@ -27,18 +27,18 @@ def mock_dcs():
         server.listen(1)
         conn, _ = server.accept()
         print("send all")
-        conn.sendall(b'{"version":11, "id":"foobar"}')
+        conn.sendall(b'{"version":12, "id":"foobar"}')
         assert (
             conn.recv(1024) == b"{"
-            b'"mode":"Intercept","version":11,"InterceptionMode":"Pre","Channels":["HTTP","Telnet",'
-            b'"File","USB","Aux","Trigger","Queue","LCD","SBC","Daemon","Aux2","AutoPause","Unknown"],'
-            b'"Filters":null,"PriorityCodes":false'
+            b'"mode":"Intercept","version":12,"interceptionMode":"Pre","channels":["HTTP","Telnet",'
+            b'"File","USB","Aux","Trigger","Queue","LCD","SBC","Daemon","Aux2","Autopause","Unknown"],'
+            b'"filters":null,"priorityCodes":false'
             b"}"
         )
         conn.sendall(b'{"success":true}')
         conn.sendall(
             b"{"
-            b'"connection":{"id":12,"apiVersion":10,"isConnected":true},"sourceConnection":12,'
+            b'"connection":{"id":12,"apiVersion":12,"isConnected":true},"sourceConnection":12,'
             b'"result":null,"type":"M","channel":"HTTP","lineNumber":null,"indent":0,"keyword":0,'
             b'"keywordArgument":null,"majorNumber":1234,"minorNumber":null,"flags":2048,"comment":null,'
             b'"filePosition":null,"length":6,"parameters":[],"command":"Code"'
@@ -49,7 +49,7 @@ def mock_dcs():
         assert conn.recv(1024) == b'{"command":"Resolve","Type":0,"Content":null}'
         conn.sendall(
             b"{"
-            b'"connection":{"id":12,"apiVersion":10,"isConnected":true},"sourceConnection":12,'
+            b'"connection":{"id":12,"apiVersion":12,"isConnected":true},"sourceConnection":12,'
             b'"result":null,"type":"M","channel":"HTTP","lineNumber":null,"indent":0,"keyword":0,'
             b'"keywordArgument":null,"majorNumber":5678,"minorNumber":null,"flags":2048,"comment":null,'
             b'"filePosition":null,"length":6,"parameters":[],"command":"Code"'