From 37aa544b8c16e10999056ae70ff2bd2f06ba2f52 Mon Sep 17 00:00:00 2001 From: Stefan Cohen Date: Mon, 30 Sep 2019 10:33:01 +0200 Subject: [PATCH] v1.7.0 --- octoprint_dashboard/__init__.py | 5 ++++- octoprint_dashboard/templates/dashboard_settings.jinja2 | 2 +- setup.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) 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 @@
-
diff --git a/setup.py b/setup.py index ffcfbd8..f5d903d 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ plugin_name = "OctoPrint-Dashboard" # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module -plugin_version = "1.6.1" +plugin_version = "1.7.0" # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin # module