Fixed #10

malnvenshorn · Aug 28, 2017 · b6b8b02 · b6b8b02
1 parent fe432c1
commit b6b8b02
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/octoprint_filamentmanager/__init__.py b/octoprint_filamentmanager/__init__.py
@@ -28,7 +28,7 @@ class FilamentManagerPlugin(octoprint.plugin.StartupPlugin,
 
     def __init__(self):
         self.filamentManager = None
-        self.filamentOdometer = FilamentOdometer()
+        self.filamentOdometer = None
         self.odometerEnabled = False
 
     # StartupPlugin
@@ -38,6 +38,7 @@ def on_startup(self, host, port):
         self.filamentManager = FilamentManager(db_path, self._logger)
         self.filamentManager.init_database()
         self.migrate_db_scheme()
+        self.filamentOdometer = FilamentOdometer(self._logger)
 
     def migrate_db_scheme(self):
         current_version = self._settings.get(["_db_version"])

diff --git a/octoprint_filamentmanager/odometer.py b/octoprint_filamentmanager/odometer.py
@@ -11,7 +11,8 @@ class FilamentOdometer(object):
     regexE = re.compile(r'.*E(-?\d+(\.\d+)?)')
     regexT = re.compile(r'^T(\d+)')
 
-    def __init__(self):
+    def __init__(self, logger):
+        self._logger = logger
         self.reset()
 
     def reset(self):
@@ -50,9 +51,9 @@ def parse(self, gcode, cmd):
             if e is not None:
                 self.lastExtrusion[self.currentTool] = e
         elif gcode == "M82":  # set extruder to absolute mode
-            relativeExtrusion = False
+            self.relativeExtrusion = False
         elif gcode == "M83":  # set extruder to relative mode
-            relativeExtrusion = True
+            self.relativeExtrusion = True
         elif gcode.startswith("T"):  # select tool
             t = self._get_int(cmd, self.regexT)
             if t is not None: