- refactor axis inversion (#74 & #61)

- reorganized Plugin Settings

Author: synman

octoprint_bettergrblsupport/__init__.py

@@ -131,7 +131,7 @@ def __init__(self):
         self.invertZ = 1
 
         self.settingsVersion = 5
-        self.wizardVersion = 5
+        self.wizardVersion = 6
 
         # load up our item/value pairs for errors, warnings, and settings
         _bgs.load_grbl_descriptions(self)
@@ -190,7 +190,10 @@ def get_settings_defaults(self):
             autoSleep = False,
             autoSleepInterval = 20,
             zProbeConfirmActions = True,
-            wizard_version = 1
+            wizard_version = 1,
+            invertX = False,
+            invertY = False,
+            invertZ = False
         )
 
 
@@ -263,6 +266,11 @@ def on_after_startup(self):
         self.autoSleep = self._settings.get_boolean(["autoSleep"])
         self.autoSleepInterval = round(float(self._settings.get(["autoSleepInterval"])))
 
+        self.invertX = -1 if self._settings.get_boolean(["invertX"]) else 1
+        self.invertY = -1 if self._settings.get_boolean(["invertY"]) else 1
+        self.invertZ = -1 if self._settings.get_boolean(["invertZ"]) else 1
+
+        self._logger.debug("axis inversion X=[{}] Y=[{}] Z=[{}]".format(self.invertX, self.invertY, self.invertZ))
 
         if self.neverSendChecksum:
             self._settings.global_set(["serial", "checksumRequiringCommands"], [])
@@ -1124,12 +1132,6 @@ def hook_gcode_received(self, comm_instance, line, *args, **kwargs):
                         distance = float(min([self.xLimit, self.yLimit]))
                     self._settings.set(["control_distance"], distance)
 
-                    # direction mask -- need to account for it when Jogging
-                    self.invertX = -1 if 1 & int(float(self.grblSettings.get(3)[0])) > 0 else 1
-                    self.invertY = -1 if 2 & int(float(self.grblSettings.get(3)[0])) > 1 else 1
-                    self.invertZ = -1 if int(float(self.grblSettings.get(3)[0])) > 3 else 1
-                    self._logger.debug("axis invert mask x=[%d] y=[%d] z=[%d]", self.invertX, self.invertY, self.invertZ)
-
                     self._settings.save()
 
                 return line

octoprint_bettergrblsupport/templates/bettergrblsupport_settings.jinja2

@@ -113,6 +113,18 @@
 
 		<br>
 
+		<div class="controls">
+				<input type="checkbox" data-bind="checked: settings.plugins.bettergrblsupport.invertX"> Invert X Axis (jogging / framing / probing)
+		</div>
+		<div class="controls">
+				<input type="checkbox" data-bind="checked: settings.plugins.bettergrblsupport.invertY"> Invert Y Axis (jogging / framing / probing)
+		</div>
+		<div class="controls">
+				<input type="checkbox" data-bind="checked: settings.plugins.bettergrblsupport.invertZ"> Invert Z Axis (jogging / probing)
+		</div>
+
+		<br>
+
 		<div class="controls">
   			<input type="checkbox" data-bind="checked: settings.plugins.bettergrblsupport.autoSleep"> Sleep automatically
 		</div>

octoprint_bettergrblsupport/templates/bettergrblsupport_wizard.jinja2

@@ -9,10 +9,12 @@
   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>Release Notes (2.2.0 RC1)</h3>
+  <h3>Release Notes (2.2.0 RC2)</h3>
   <ul>
-    <li>X/Y Probing and the settings necessary to run it in Plugin Properties
-    <li>Chained XYZ Probing when axis selector is "ALL"
+    <li>X/Y Probing and the settings necessary to run it in Plugin Properties</li>
+    <li>Chained XYZ Probing when axis selector is "ALL"</li>
+    <li>Invert X/Y/Z via Invert Axis Jog Setting in Plugin Settings</li>
+    <li>Rearranged / better organized Plugin Settings</li>
   </ul>
   <br>
   <h3>In Need of Help?</h3>

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.2.0rc1"
+plugin_version = "2.2.0rc2"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module