qtplasmac: add preference to allow Z+ to override jog inhibit

Author: snowgoer540

docs/src/plasma/qtplasmac.adoc

@@ -3581,6 +3581,16 @@ setp qtplasmac.tabs_always_enabled 1
 
 WARNING: It is the responsibility of the operator to ensure that the machine is equipped with a suitable, working hardware ESTOP. If using only a touchscreen to navigate the QtPlasmaC GUI, there is no way to stop automated machine motion on any tab but the MAIN tab.
 
+=== Override Jog Inhibit Via Z+ Jog
+
+It is possible to override the jog inhibit by using the GUI or keyboard to jog in the Z+ direction rather than checking the Override Jog box on the <<qt_parameters-tab, PARAMETERS Tab>>.
+
+This is done by changing the following preference to *True* in the *[GUI_OPTIONS]* of the <machine_name>.prefs file in the <machine_name> folder:
+
+----
+Override jog inhibit via Z+
+----
+
 === QtPlasmaC State Outputs
 
 The plasmac HAL component has a HAL pin named *plasmac.state-out* which can be used to interface with user-coded components to provide the current state of the component.

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

@@ -1,4 +1,4 @@
-VERSION = '1.225.209'
+VERSION = '1.225.210'
 
 '''
 qtplasmac_handler.py
@@ -834,6 +834,7 @@ def init_preferences(self):
         self.w.cone_size.setValue(self.PREFS.getpref('Preview cone size', 0.5, float, 'GUI_OPTIONS'))
         self.w.grid_size.setValue(self.PREFS.getpref('Preview grid size', 0, float, 'GUI_OPTIONS'))
         self.w.table_zoom_scale.setValue(self.PREFS.getpref('T view zoom scale', 1, float, 'GUI_OPTIONS'))
+        self.zPlusOverrideJog = self.PREFS.getpref('Override jog inhibit via Z+', False, bool, 'GUI_OPTIONS')
         self.w.color_foregrnd.setStyleSheet('background-color: {}'.format(self.PREFS.getpref('Foreground', '#ffee06', str, 'COLOR_OPTIONS')))
         self.w.color_foregalt.setStyleSheet('background-color: {}'.format(self.PREFS.getpref('Highlight', '#ffee06', str, 'COLOR_OPTIONS')))
         self.w.color_led.setStyleSheet('background-color: {}'.format(self.PREFS.getpref('LED', '#ffee06', str, 'COLOR_OPTIONS')))
@@ -1098,6 +1099,7 @@ def closing_cleanup__(self):
         self.PREFS.putpref('Preview cone size', self.w.cone_size.value(), float, 'GUI_OPTIONS')
         self.PREFS.putpref('Preview grid size', self.w.grid_size.value(), float, 'GUI_OPTIONS')
         self.PREFS.putpref('T view zoom scale', self.w.table_zoom_scale.value(), float, 'GUI_OPTIONS')
+        self.PREFS.putpref('Override jog inhibit via Z+', self.zPlusOverrideJog, bool, 'GUI_OPTIONS')
         self.PREFS.putpref('THC enable', self.w.thc_enable.isChecked(), bool, 'ENABLE_OPTIONS')
         self.PREFS.putpref('Corner lock enable', self.w.cornerlock_enable.isChecked(), bool, 'ENABLE_OPTIONS')
         self.PREFS.putpref('Kerf cross enable', self.w.kerfcross_enable.isChecked(), bool, 'ENABLE_OPTIONS')
@@ -1860,6 +1862,8 @@ def jogs_label_pressed(self):
 
     def gui_button_jog(self, state, joint, direction):
         shift = False
+        if state and joint == 'z' and direction == 1 and self.zPlusOverrideJog and self.w.chk_override_jog.isEnabled():
+                self.w.chk_override_jog.setChecked(True)
         if STATUS.is_joint_mode():
             self.kb_jog(state, self.coordinates.index(joint), direction, shift)
         else:
@@ -5657,6 +5661,8 @@ def on_keycall_YNEG(self, event, state, shift, cntrl):
 
     def on_keycall_ZPOS(self, event, state, shift, cntrl):
         if self.jog_is_valid('z_plus', event):
+            if self.zPlusOverrideJog and self.w.chk_override_jog.isEnabled():
+                self.w.chk_override_jog.setChecked(True)
             if STATUS.is_joint_mode():
                 self.kb_jog(state, self.coordinates.index('z'), 1, shift)
             else:

share/qtvcp/screens/qtplasmac/versions.html

@@ -30,6 +30,13 @@ <h2>QtPlasmaC Version History</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
+<br><b><u>v1.225.210 2022 July 01</u></b>
+<ul style="margin:0;">
+  <li>fix "show last five" and "clear all" for error messages</li>
+  <li>add preference to allow Z+ to override jog inhibit</li>
+</ul>
+<i>Changes submitted by snowgoer540 (Greg Carl)</i><br>
+
 <br><b><u>v1.225.209 2022 June 30</u></b>
 <ul style="margin:0;">
   <li>fix missing files from /bin</li>