Skip to content

Commit 93547c9

Browse files
committed
qtplasmac: fix framing and missed interlock
Previously, self.framing was not set False before resetting the button states at the end of a frame job, the laser pin was not turned off, and the path was not cleared. Adds previously missed probe_test to the ohmic test button interlock
1 parent 582ac39 commit 93547c9

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

lib/python/qtvcp/lib/qtplasmac/interlock_rules.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@
374374
'previewstack_is_offsets': False,
375375
'previewstack_is_open': False,
376376
'previewstack_is_user_manual': False,
377+
'probe_test': False,
377378
'single_cut_dialog': False
378379
},
379380
'any': {

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '016.083'
1+
VERSION = '016.084'
22
LCNCVER = '2.10'
33

44
'''
@@ -1482,6 +1482,10 @@ def interp_idle(self, obj):
14821482
self.laserOnPin.set(0)
14831483
hal.set_p('plasmac.dry-run', '0')
14841484
self.w.gcodegraphics.logger.clear()
1485+
if self.framing:
1486+
self.framing = False
1487+
self.laserOnPin.set(0)
1488+
self.w.gcodegraphics.logger.clear()
14851489
if self.w.preview_stack.currentIndex() != self.PREVIEW:
14861490
self.preview_stack_changed()
14871491
if self.jobRunning and obj:

share/qtvcp/screens/qtplasmac/versions.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ <h2>QtPlasmaC Version History - LinuxCNC 2.10</h2>
2626
</table>
2727
<br>
2828
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
29+
<br><b><u>016.084 2026 Mar 12</u></b>
30+
<ul style="margin:0;">
31+
<li>fix framing and missed interlock</li>
32+
</ul>
33+
2934
<br><b><u>016.083 2026 Feb 20</u></b>
3035
<br><b>QtPlasmaC GUI</b>
3136
<ul style="margin:0;">

0 commit comments

Comments
 (0)