qtplasmac: update to make use of new motion.jog-stop pin

Author: snowgoer540

lib/hallib/plasmac.tcl

@@ -52,7 +52,7 @@ if {[hal list pin db_float.out] != {}} {
 net plasmac:adaptive-feed       plasmac.adaptive-feed       =>  motion.adaptive-feed
 net plasmac:cutting-stop        halui.spindle.0.stop        =>  plasmac.cutting-stop
 net plasmac:feed-hold           plasmac.feed-hold           =>  motion.feed-hold
-net plasmac:jog-inhibit         plasmac.jog-inhibit         =>  motion.jog-inhibit
+net plasmac:jog-inhibit         plasmac.jog-inhibit         =>  motion.jog-inhibit motion.jog-stop
 net plasmac:offset-scale        plasmac.offset-scale        =>  axis.x.eoffset-scale axis.y.eoffset-scale axis.z.eoffset-scale
 net plasmac:program-pause       plasmac.program-pause       =>  halui.program.pause
 net plasmac:program-resume      plasmac.program-resume      =>  halui.program.resume

lib/hallib/qtplasmac_comp.hal

@@ -37,7 +37,7 @@ net plasmac:z-offset-current     axis.z.eoffset              =>  plasmac.z-offse
 # ---PLASMAC COMPONENT OUTPUTS---
 net plasmac:adaptive-feed        plasmac.adaptive-feed       =>  motion.adaptive-feed
 net plasmac:feed-hold            plasmac.feed-hold           =>  motion.feed-hold
-net plasmac:jog-inhibit          plasmac.jog-inhibit         =>  motion.jog-inhibit
+net plasmac:jog-inhibit          plasmac.jog-inhibit         =>  motion.jog-inhibit motion.jog-stop
 net plasmac:offset-scale         plasmac.offset-scale        =>  axis.x.eoffset-scale axis.y.eoffset-scale axis.z.eoffset-scale
 net plasmac:program-pause        plasmac.program-pause       =>  halui.program.pause
 net plasmac:program-resume       plasmac.program-resume      =>  halui.program.resume

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

@@ -1,4 +1,4 @@
-VERSION = '1.227.214'
+VERSION = '1.227.215'
 
 '''
 qtplasmac_handler.py
@@ -601,6 +601,14 @@ def new_process_error(self, w, kind, text):
                 elif self.w.led_breakaway_switch.hal_pin.get():
                     text = _translate('HandlerClass', 'Breakaway Switch has disabled jogging')
                 N.update(O.notify_critical, title='Operator Error:', message=text, msgs=O.notify_max_msgs)
+            elif 'jog-stop' in text or 'jog-stop-immediate' in text:
+                if self.w.led_float_switch.hal_pin.get():
+                    text = _translate('HandlerClass', 'Float Switch has aborted active jogging')
+                elif self.w.led_ohmic_probe.hal_pin.get():
+                    text = _translate('HandlerClass', 'Ohmic Probe has aborted active jogging')
+                elif self.w.led_breakaway_switch.hal_pin.get():
+                    text = _translate('HandlerClass', 'Breakaway Switch has aborted active jogging')
+                N.update(O.notify_critical, title='Operator Error:', message=text, msgs=O.notify_max_msgs)
             elif kind == linuxcnc.OPERATOR_ERROR:
                 N.update(O.notify_critical, title='Operator Error:', message=text, msgs=O.notify_max_msgs)
             elif kind == linuxcnc.OPERATOR_TEXT:
@@ -1540,6 +1548,7 @@ def hard_limit_tripped(self, obj, tripped, list_of_tripped):
     def jog_inhibited_changed(self, state):
         if state:
             self.w.chk_override_jog.setEnabled(state)
+            self.w.releaseKeyboard()
         else:
            if not self.w.led_float_switch.hal_pin.get() and not self.w.led_ohmic_probe.hal_pin.get() and \
                                                             not self.w.led_breakaway_switch.hal_pin.get():

share/qtvcp/screens/qtplasmac/versions.html

@@ -30,6 +30,12 @@ <h2>QtPlasmaC Version History</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
+<br><b><u>v1.227.215 2022 July 08</u></b>
+<ul style="margin:0;">
+  <li>update to make use of new motion.jog-stop pin</li>
+</ul>
+<i>Changes submitted by snowgoer540 (Greg Carl)</i><br>
+
 <br><b><u>v1.227.214 2022 July 05</u></b>
 <ul style="margin:0;">
   <li>fix rfl selection behavior</li>