Skip to content

Commit d94aa29

Browse files
committed
qtplasmac: allow Z DRO to display torch height in manual cut
1 parent 6096bfe commit d94aa29

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '237.304'
1+
VERSION = '237.305'
22
LCNCVER = '2.9'
33
DOCSVER = LCNCVER
44

@@ -106,6 +106,7 @@ def eventFilter(self, obj, event):
106106
# the main handler
107107
class HandlerClass:
108108
from qtvcp.lib.qtplasmac import conversational as CONV
109+
109110
# when self.w.button_frame changes size
110111
def eventFilter(self, object, event):
111112
if (event.type() == QtCore.QEvent.Resize):
@@ -2271,7 +2272,7 @@ def consumable_change_changed(self, value):
22712272
STATUS.emit('update-machine-log', log, 'TIME')
22722273

22732274
def plasmac_state_changed(self, state):
2274-
if ((state > self.PROBE_UP and not STATUS.is_interp_idle()) or state == self.PROBE_TEST) and hal.get_value('axis.z.eoffset-counts'):
2275+
if (state > self.PROBE_UP or state == self.PROBE_TEST) and hal.get_value('axis.z.eoffset-counts'):
22752276
# set z dro to offset mode
22762277
self.w.dro_z.setProperty('Qreference_type', 10)
22772278
if state == self.IDLE:

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.9</h2>
2626
</table>
2727
<br>
2828
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
29+
<br><b><u>237.305 2024 Feb 24</u></b>
30+
<ul style="margin:0;">
31+
<li>allow Z DRO to display torch height in manual cut</li>
32+
</ul>
33+
2934
<br><b><u>237.304 2024 Feb 22</u></b>
3035
<ul style="margin:0;">
3136
<li>manual cut: fix abort state</li>

0 commit comments

Comments
 (0)