Skip to content

Commit a2e6c34

Browse files
committed
qtdragon/hd -add logging for spindle pause and auto raise
1 parent 2b680be commit a2e6c34

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

share/qtvcp/screens/qtdragon/qtdragon_handler.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,7 @@ def dialog_return(self, w, message):
495495
elif wait_code and name == 'MESSAGE':
496496
self.h['eoffset-spindle-count'] = 0
497497
self.h['eoffset-clear'] = True
498+
self.add_status('Spindle lowered')
498499
elif unhome_code and name == 'MESSAGE' and rtn is True:
499500
ACTION.SET_MACHINE_UNHOMED(-1)
500501
elif overwrite and name == 'MESSAGE':
@@ -683,8 +684,10 @@ def disable_pause_buttons(self, state):
683684
fval = float(self.w.lineEdit_eoffset_count.text())
684685
self.h['eoffset-spindle-count'] = int(fval)
685686
self.h['spindle-inhibit'] = True
687+
self.add_status("Spindle stopped and raised {}".format(fval))
686688
else:
687689
self.h['spindle-inhibit'] = False
690+
self.add_status('Spindle re-started')
688691
# instantiate warning box
689692
info = "Wait for spindle at speed signal before resuming"
690693
mess = {'NAME':'MESSAGE', 'ICON':'WARNING', 'ID':'_wait_resume_', 'MESSAGE':'CAUTION', 'MORE':info, 'TYPE':'OK'}

share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,7 @@ def dialog_return(self, w, message):
530530
self.h['eoffset-clear'] = True
531531
self.h['eoffset-spindle-count'] = 0
532532
self.w.spindle_eoffset_value.setText('0')
533+
self.add_status('Spindle lowered')
533534
elif unhome_code and name == 'MESSAGE' and rtn is True:
534535
ACTION.SET_MACHINE_UNHOMED(-1)
535536
elif overwrite and name == 'MESSAGE':
@@ -689,12 +690,14 @@ def btn_pause_spindle_clicked(self, state):
689690
self.h['eoffset-spindle-count'] = int(fval)
690691
self.w.spindle_eoffset_value.setText(self.w.lineEdit_eoffset_count.text())
691692
self.h['spindle-inhibit'] = True
693+
self.add_status("Spindle stopped and raised {}".format(fval))
692694
if not QHAL.hal.component_exists("z_level_compensation"):
693695
self.add_status("Z level compensation HAL component not loaded", CRITICAL)
694696
return
695697
else:
696698
# turn spindle back on
697699
self.h['spindle-inhibit'] = False
700+
self.add_status('Spindle re-started')
698701
# wait for dialog to close before lowering spindle
699702
if STATUS.is_auto_running():
700703
info = "Wait for spindle at speed signal before resuming"

0 commit comments

Comments
 (0)