qtdragon/hd -use spindle at speed if available to lower spindle

id spindle.0.at-speed is connected to a writting pin, then er should
use it to decide when to lower the spindle. Otherwise use the dialog.

Author: c-morley

share/qtvcp/screens/qtdragon/qtdragon_handler.py

@@ -70,6 +70,7 @@ def __init__(self, halcomp, widgets, paths):
         KEYBIND.add_call('Key_Less','on_keycall_angular_jograte',0)
 
         # some global variables
+        self._spindle_wait = False
         self.probe = None
         self.default_setup = os.path.join(PATH.CONFIGPATH, "default_setup.html")
         self.docs = os.path.join(PATH.SCREENDIR, PATH.BASEPATH,'docs/getting_started.html')
@@ -117,7 +118,7 @@ def __init__(self, halcomp, widgets, paths):
         STATUS.connect('file-loaded', self.file_loaded)
         STATUS.connect('all-homed', self.all_homed)
         STATUS.connect('not-all-homed', self.not_all_homed)
-        STATUS.connect('periodic', lambda w: self.update_runtimer())
+        STATUS.connect('periodic', lambda w: self.periodic_update())
         STATUS.connect('command-stopped', lambda w: self.stop_timer())
         STATUS.connect('progress', lambda w,p,t: self.updateProgress(p,t))
         STATUS.connect('override-limits-changed', lambda w, state, data: self._check_override_limits(state, data))
@@ -692,10 +693,16 @@ def disable_pause_buttons(self, state):
         else:
             self.h['spindle-inhibit'] = False
             self.add_status('Spindle re-started')
-        # instantiate warning box
-            info = "Wait for spindle at speed signal before resuming"
-            mess = {'NAME':'MESSAGE', 'ICON':'WARNING', 'ID':'_wait_resume_', 'MESSAGE':'CAUTION', 'MORE':info, 'TYPE':'OK'}
-            ACTION.CALL_DIALOG(mess)
+            # If spindle at speed is connected use it lower spindle
+            if self.h.hal.pin_has_writer('spindle.0.at-speed'):
+                self._spindle_wait=True
+                return
+            else:
+            # or wait for dialog to close before lowering spindle
+            # instantiate warning box
+                info = "Wait for spindle at speed signal before resuming"
+                mess = {'NAME':'MESSAGE', 'ICON':'WARNING', 'ID':'_wait_resume_', 'MESSAGE':'CAUTION', 'MORE':info, 'TYPE':'OK'}
+                ACTION.CALL_DIALOG(mess)
 
     # override frame
     def slow_button_clicked(self, state):
@@ -1142,6 +1149,18 @@ def update_rpm(self, speed):
             self.w.lbl_spindle_set.style().unpolish(self.w.lbl_spindle_set)
             self.w.lbl_spindle_set.style().polish(self.w.lbl_spindle_set)
 
+    def periodic_update(self):
+        # if waiting and up to speed, lower spindle
+        if self._spindle_wait:
+            if bool(self.h.hal.get_value('spindle.0.at-speed')):
+                self.h['eoffset-spindle-count'] = 0
+                self.h['eoffset-clear'] = True
+                self.add_status('Spindle lowered')
+                self.h['eoffset-clear'] = False
+                self._spindle_wait = False
+
+        self.update_runtimer()
+
     def update_runtimer(self):
         if not self.timer_on or STATUS.is_auto_paused():
             return
@@ -1155,6 +1174,7 @@ def update_runtimer(self):
         minutes, seconds = divmod(remainder, 60)
         self.w.lbl_runtime.setText("{:02d}:{:02d}:{:02d}".format(hours, minutes, seconds))
 
+
     def start_timer(self):
         self.run_time = 0
         self.timer_on = True

share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py

@@ -73,6 +73,7 @@ def __init__(self, halcomp, widgets, paths):
 
         # some global variables
         self.factor = 1.0
+        self._spindle_wait = False
         self.probe = None
         self.default_setup = os.path.join(PATH.CONFIGPATH, "default_setup.html")
         self.docs = os.path.join(PATH.SCREENDIR, PATH.BASEPATH,'docs/getting_started.html')
@@ -115,7 +116,7 @@ def __init__(self, halcomp, widgets, paths):
         STATUS.connect('file-loaded', self.file_loaded)
         STATUS.connect('all-homed', self.all_homed)
         STATUS.connect('not-all-homed', self.not_all_homed)
-        STATUS.connect('periodic', lambda w: self.update_runtimer())
+        STATUS.connect('periodic', lambda w: self.periodic_update())
         STATUS.connect('interp-idle', lambda w: self.stop_timer())
         STATUS.connect('actual-spindle-speed-changed',self.update_spindle)
         STATUS.connect('requested-spindle-speed-changed',self.update_spindle_requested)
@@ -703,13 +704,19 @@ def btn_pause_spindle_clicked(self, state):
             # turn spindle back on
             self.h['spindle-inhibit'] = False
             self.add_status('Spindle re-started')
-            # wait for dialog to close before lowering spindle
-            if STATUS.is_auto_running():
-                info = "Wait for spindle at speed signal before resuming"
-                mess = {'NAME':'MESSAGE', 'ICON':'WARNING',
-                        'ID':'_wait_resume_', 'MESSAGE':'CAUTION',
-                        'NONBLOCKING':'True', 'MORE':info, 'TYPE':'OK'}
-                ACTION.CALL_DIALOG(mess)
+
+            # If spindle at speed is connected use it lower spindle
+            if self.h.hal.pin_has_writer('spindle.0.at-speed'):
+                self._spindle_wait=True
+                return
+            else:
+                # or wait for dialog to close before lowering spindle
+                if STATUS.is_auto_running():
+                    info = "Wait for spindle at speed signal before resuming"
+                    mess = {'NAME':'MESSAGE', 'ICON':'WARNING',
+                            'ID':'_wait_resume_', 'MESSAGE':'CAUTION',
+                            'NONBLOCKING':'True', 'MORE':info, 'TYPE':'OK'}
+                    ACTION.CALL_DIALOG(mess)
 
     def btn_enable_comp_clicked(self, state):
         if state:
@@ -1193,6 +1200,18 @@ def do_file_copy(self):
         except Exception as e:
             self.add_status("Unable to copy file. %s" %e, WARNING)
 
+    def periodic_update(self):
+        # if waiting and up to speed, lower spindle
+        if self._spindle_wait:
+            if bool(self.h.hal.get_value('spindle.0.at-speed')):
+                self.h['eoffset-spindle-count'] = 0
+                self.h['eoffset-clear'] = True
+                self.add_status('Spindle lowered')
+                self.h['eoffset-clear'] = False
+                self._spindle_wait = False
+
+        self.update_runtimer()
+
     def update_runtimer(self):
         if not self.timer_on or STATUS.is_auto_paused():
             return