Fix extruder calculation with G2/G3 (#67)

* Fix extruder calculation with G2/G3 * Update odometer.py
OllisGit · Jun 4, 2021 · 4e271a3 · 4e271a3
1 parent 42a3f69
commit 4e271a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/octoprint_filamentmanager/newodometer.py b/octoprint_filamentmanager/newodometer.py
@@ -43,7 +43,7 @@ def processGCodeLine(self, line):
         T = self._getCodeInt(line, "T")
 
         if G is not None:
-            if G == 0 or G == 1:  # Move
+            if G >= 0 and G <= 3:  # Move G0/G1/G2/G3
                 x = self._getCodeFloat(line, "X")
                 y = self._getCodeFloat(line, "Y")
                 z = self._getCodeFloat(line, "Z")

diff --git a/octoprint_filamentmanager/odometer.py b/octoprint_filamentmanager/odometer.py
@@ -36,7 +36,7 @@ def parse(self, gcode, cmd):
         if gcode is None:
             return
 
-        if gcode == "G1" or gcode == "G0":  # move
+        if gcode in ("G0", "G1", "G2", "G3"):  # move
             e = self._get_float(cmd, self.regexE)
             if e is not None:
                 if self.relativeMode or self.relativeExtrusion: