Skip to content

Commit 8b6b465

Browse files
committed
qtplasmac: fix jog-inhibit error message
1 parent 2e60f9e commit 8b6b465

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '1.227.212'
1+
VERSION = '1.227.213'
22

33
'''
44
qtplasmac_handler.py
@@ -595,13 +595,11 @@ def new_process_error(self, w, kind, text):
595595
N.update(O.notify_hard_limits, title='Machine Error:', message=text, msgs=O.notify_max_msgs)
596596
elif 'jog-inhibit' in text:
597597
if self.w.led_float_switch.hal_pin.get():
598-
trigger = _translate('HandlerClass', 'Float Switch')
598+
text = _translate('HandlerClass', 'Float Switch has disabled jogging')
599599
elif self.w.led_ohmic_probe.hal_pin.get():
600-
trigger = _translate('HandlerClass', 'Ohmic Probe')
600+
text = _translate('HandlerClass', 'Ohmic Probe has disabled jogging')
601601
elif self.w.led_breakaway_switch.hal_pin.get():
602-
trigger = _translate('HandlerClass', 'Breakaway Switch')
603-
msg0 = _translate('HandlerClass', 'has disabled jogging')
604-
text = '{} {}\n'.format(trigger, msg0)
602+
text = _translate('HandlerClass', 'Breakaway Switch has disabled jogging')
605603
N.update(O.notify_critical, title='Operator Error:', message=text, msgs=O.notify_max_msgs)
606604
elif kind == linuxcnc.OPERATOR_ERROR:
607605
N.update(O.notify_critical, title='Operator Error:', message=text, msgs=O.notify_max_msgs)

share/qtvcp/screens/qtplasmac/versions.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ <h2>QtPlasmaC Version History</h2>
3030
</table>
3131
<br>
3232
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
33+
<br><b><u>v1.227.213 2022 July 05</u></b>
34+
<ul style="margin:0;">
35+
<li>fix jog-inhibit error message</li>
36+
</ul>
37+
<i>Changes submitted by snowgoer540 (Greg Carl)</i><br>
38+
3339
<br><b><u>v1.227.212 2022 July 02</u></b>
3440
<ul style="margin:0;">
3541
<li>add paused time to statistics</li>

0 commit comments

Comments
 (0)