diff --git a/octoprint_dashboard/__init__.py b/octoprint_dashboard/__init__.py index 9d3bbf0..89dda99 100644 --- a/octoprint_dashboard/__init__.py +++ b/octoprint_dashboard/__init__.py @@ -116,12 +116,15 @@ def process_gcode(self, comm_instance, phase, cmd, cmd_type, gcode, *args, **kwa #return if not gcode: return - if gcode in ("G0", "G1"): + elif gcode in ("G0", "G1"): CmdDict = dict ((x,float(y)) for d,x,y in (re.split('([A-Z])', i) for i in cmd.upper().split())) if "E" in CmdDict: e = float(CmdDict["E"]) / 1000 #in meters self.extruded_filament = round(e,2) return + else: + return + diff --git a/octoprint_dashboard/templates/dashboard_settings.jinja2 b/octoprint_dashboard/templates/dashboard_settings.jinja2 index b2b0041..6ac96e1 100644 --- a/octoprint_dashboard/templates/dashboard_settings.jinja2 +++ b/octoprint_dashboard/templates/dashboard_settings.jinja2 @@ -13,7 +13,7 @@