v1.7.0

j7126 · Sep 30, 2019 · 37aa544 · 37aa544
1 parent ff783ec
commit 37aa544
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -13,7 +13,7 @@
     </div>
     <div class="control-group">
         <div >
-            <label class="checkbox">{{ _('Use theme colors for full screen') }}
+            <label class="checkbox">{{ _('Use theme colors in fullscreen mode') }}
                 <input type="checkbox" data-bind="checked: settings.plugins.dashboard.fullscreenUseThemeColors">
             </label>
         </div>

diff --git 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