- some tweaks to the wizard mixin

synman · Jan 17, 2022 · dc4d253 · dc4d253
1 parent 66629ed
commit dc4d253
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/octoprint_bettergrblsupport/__init__.py b/octoprint_bettergrblsupport/__init__.py
@@ -183,7 +183,8 @@ def get_settings_defaults(self):
             zprobeCalc = "MIN",
             autoSleep = False,
             autoSleepInterval = 20,
-            zProbeConfirmActions = True
+            zProbeConfirmActions = True,
+            wizard_version = 1
         )
 
 
@@ -1423,19 +1424,18 @@ def on_api_command(self, command, data):
     def on_wizard_finish(self, handled):
         self._logger.debug("__init__: on_wizard_finish handled=[{}]".format(handled))
         if handled:
-            self._settings.set(["wizard_version"], 1)
+            self._settings.set(["wizard_version"], 2)
             self._settings.save();
 
     def is_wizard_required(self):
-        requiredVersion = 1
+        requiredVersion = 2
         currentVersion = self._settings.get(["wizard_version"])
         self._logger.debug("__init__: is_wizard_required=[{}]".format(currentVersion is None or currentVersion != requiredVersion))
         return currentVersion is None or currentVersion != requiredVersion
 
     def get_wizard_version(self):
         self._logger.debug("__init__: get_wizard_version")
-        version = self._settings.get(["wizard_version"])
-        return 1 if version is None else version
+        return 2
 
     def get_wizard_details(self):
         self._logger.debug("__init__: get_wizard_details")

diff --git a/octoprint_bettergrblsupport/templates/bettergrblsupport_wizard.jinja2 b/octoprint_bettergrblsupport/templates/bettergrblsupport_wizard.jinja2
@@ -9,8 +9,9 @@
   Please visit the <a href="https://www.apache.org/licenses/LICENSE-2.0.txt" target="_blank">Apache Software Foundation</a> website for more details.
   <br>
   <br>
-  <h3>v2.1.0 Release Notes</h3>
+  <h3>v2.1.1 Release Notes (includes 2.1.0)</h3>
   <ul>
+    <li>Bug fix for Single Point Z-Probe (2.1.1)</li>
     <li>5 point (9 point for center selected) frame z-Probing (Enabled in Plugin Settings)</li>
     <li>Choose from Highest, Lowest, Mean, and Average positions (selectable in Plugin Settings)</li>
     <li>Framing now lives in the Sidebar and has been renamed to "Material Framing"</li>

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 plugin_name = "Better Grbl Support"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "2.1.1dev0"
+plugin_version = "2.1.1"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module