qtdragon/hd -utilize an error return function for touchplate touchoff

Author: c-morley

share/qtvcp/screens/qtdragon/qtdragon_handler.py

@@ -1150,14 +1150,18 @@ def touchoff(self, selector):
                 search_vel, probe_vel, max_probe, 
                 z_offset, retract, safe_z))
         rtn = ACTION.TOUCHPLATE_TOUCHOFF(search_vel, probe_vel, max_probe, 
-                z_offset, retract, safe_z, self.touchoff_return)
+                z_offset, retract, safe_z, self.touchoff_return,self.touchoff_error)
         if rtn == 0:
             self.add_status("Touchoff routine is already running", CRITICAL)
 
     def touchoff_return(self, data):
         self.add_status("Touchplate touchoff routine returned successfully")
         self.add_status("Touchplate returned: "+data, CRITICAL)
 
+    def touchoff_error(self, data):
+        ACTION.SET_ERROR_MESSAGE(data)
+        self.add_status(data, CRITICAL)
+
     def kb_jog(self, state, joint, direction, fast = False, linear = True):
         ACTION.SET_MANUAL_MODE()
         if not STATUS.is_man_mode() or not STATUS.machine_is_on():

share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py

@@ -1204,14 +1204,18 @@ def touchoff(self, selector):
         retract = self.w.lineEdit_retract_distance.text()
         safe_z = self.w.lineEdit_z_safe_travel.text()
         rtn = ACTION.TOUCHPLATE_TOUCHOFF(search_vel, probe_vel, max_probe, 
-                z_offset, retract, safe_z, self.touchoff_return)
+                z_offset, retract, safe_z, self.touchoff_return, self.touchoff_error)
         if rtn == 0:
             self.add_status("Touchoff routine is already running", WARNING)
 
     def touchoff_return(self, data):
         self.add_status("Touchplate touchoff routine returned successfully")
         self.add_status("Touchplate returned:"+data, CRITICAL)
 
+    def touchoff_error(self, data):
+        ACTION.SET_ERROR_MESSAGE(data)
+        self.add_status(data, CRITICAL)
+
     def kb_jog(self, state, joint, direction, fast = False, linear = True):
         ACTION.SET_MANUAL_MODE()
         if not STATUS.is_man_mode() or not STATUS.machine_is_on():