qtvcp -probe routines: lower tool 2x Z clearance when probing tool diameter

before this, did not lower tool enough to probe diameter.

Author: c-morley

lib/python/qtvcp/widgets/probe_routines.py

@@ -42,6 +42,22 @@ def z_clearance_down(self):
         G90""".format(self.data_rapid_vel, self.data_z_clearance + self.data_extra_depth)        
         return self.CALL_MDI_WAIT(s, self.timeout)
 
+    # when probing tool diameter
+    def raise_tool_depth(self):
+        # move Z+
+        s = """G91
+        G1 F{} Z{}
+        G90""".format(self.data_rapid_vel, self.data_z_clearance)        
+        return self.CALL_MDI_WAIT(s, self.timeout)
+
+    # when probing tool diameter
+    def lower_tool_depth(self):
+        # move Z-
+        s = """G91
+        G1 F{} Z-{}
+        G90""".format(self.data_rapid_vel, self.data_z_clearance)        
+        return self.CALL_MDI_WAIT(s, self.timeout)
+
     def length_x(self):
         if self.status_xp is None: self.status_xp = 0
         if self.status_xm is None: self.status_xm = 0
@@ -335,17 +351,22 @@ def probe_tool_z_diam(self):
             return 'cannot offset enough in - Y for tool radius offset + toolsetter radius'
 
 
-        # move X - edge_length- xy_clearance
+        # move X-  (1/2 tool diameter + xy_clearance)
         s="""G91
         G1 F%s X-%f
         G90""" % (self.data_rapid_vel, 0.5 * self.data_ts_diam + self.data_xy_clearance)
         rtn = self.CALL_MDI_WAIT(s, self.timeout) 
         if rtn != 1:
             return 'failed: {}'.format(rtn)
+
         rtn = self.z_clearance_down()
         if rtn != 1:
             return 'failed: {}'.format(rtn)
 
+        rtn = self.lower_tool_depth()
+        if rtn != 1:
+            return 'lower tool depth failed: {}'.format(rtn)
+
         # Start xplus
         rtn = self.probe('xplus')
         if rtn != 1:
@@ -355,6 +376,10 @@ def probe_tool_z_diam(self):
         a = STATUS.get_probed_position_with_offsets()
         xpres=float(a[0])+0.5*self.data_probe_diam
 
+        rtn = self.raise_tool_depth()
+        if rtn != 1:
+            return 'raise tool depth failed: {}'.format(rtn)
+
         # move Z to start point up
         rtn = self.z_clearance_up()
         if rtn != 1:
@@ -366,7 +391,7 @@ def probe_tool_z_diam(self):
         if rtn != 1:
             return 'failed: {}'.format(rtn)
 
-        # move X + data_ts_diam +  xy_clearance
+        # move X+ (data_ts_diam +  xy_clearance)
         aa=self.data_ts_diam+self.data_xy_clearance
         s="""G91
         G1 X%f
@@ -379,6 +404,10 @@ def probe_tool_z_diam(self):
         if rtn != 1:
             return 'failed: {}'.format(rtn)
 
+        rtn = self.lower_tool_depth()
+        if rtn != 1:
+            return 'lower tool depth failed: {}'.format(rtn)
+
         # Start xminus
         rtn = self.probe('xminus')
         if rtn != 1:
@@ -391,6 +420,10 @@ def probe_tool_z_diam(self):
         xcres=0.5*(xpres+xmres)
         self.status_xc = xcres
 
+        rtn = self.raise_tool_depth()
+        if rtn != 1:
+            return 'raise tool depth failed: {}'.format(rtn)
+
         # move Z to start point up
         rtn = self.z_clearance_up()
         if rtn != 1:
@@ -415,6 +448,10 @@ def probe_tool_z_diam(self):
         if rtn != 1:
             return 'failed: {}'.format(rtn)
 
+        rtn = self.lower_tool_depth()
+        if rtn != 1:
+            return 'lower tool depth failed: {}'.format(rtn)
+
         # Start yplus
         rtn = self.probe('yplus')
         if rtn != 1:
@@ -423,6 +460,11 @@ def probe_tool_z_diam(self):
         # show Y result
         a = STATUS.get_probed_position_with_offsets()
         ypres=float(a[1])+0.5*self.data_probe_diam
+
+        rtn = self.raise_tool_depth()
+        if rtn != 1:
+            return 'raise tool depth failed: {}'.format(rtn)
+
         # move Z to start point up
         if self.z_clearance_up() == -1:
             return
@@ -441,10 +483,15 @@ def probe_tool_z_diam(self):
         rtn = self.CALL_MDI_WAIT(s, self.timeout) 
         if rtn != 1:
             return 'failed: {}'.format(rtn)
+
         rtn = self.z_clearance_down()
         if rtn != 1:
             return 'failed: {}'.format(rtn)
 
+        rtn = self.lower_tool_depth()
+        if rtn != 1:
+            return 'lower tool depth failed: {}'.format(rtn)
+
         # Start yminus
         rtn = self.probe('yminus')
         if rtn != 1:
@@ -460,10 +507,15 @@ def probe_tool_z_diam(self):
         diam=self.data_probe_diam + (ymres-ypres-self.data_ts_diam)
         self.status_d = diam
 
+        rtn = self.raise_tool_depth()
+        if rtn != 1:
+            return 'raise tool depth failed: {}'.format(rtn)
+
         # move Z to start point up
         rtn = self.z_clearance_up()
         if rtn != 1:
             return 'failed: {}'.format(rtn)
+
         tmpz=STATUS.stat.position[2] - self.data_z_clearance
         self.status_z=tmpz
         self.add_history('Tool diameter',"XcYcZD",0,xcres,0,0,0,ycres,0,0,tmpz,diam,0)
@@ -477,42 +529,6 @@ def probe_tool_z_diam(self):
       except Exception as e:
         return '{}'.format(e)
 
-
-    ########################
-    # material
-    ########################
-    def probe_material_z(self):
-
-        try:
-            # basic sanity checks
-            if self.data_ts_max is None:
-                return'Missing toolsetter setting: data_ts_max'
-
-            cmdList = []
-            cmdList.append('G49')
-            cmdList.append('G92.1')
-            cmdList.append('G10 L20 P0  Z[#<_abs_z>]')
-            cmdList.append('G91')
-            cmdList.append('F {}'.format(self.data_search_vel))
-            cmdList.append('G38.2 Z-{}'.format(self.data_ts_max))
-            cmdList.append('G1 Z{} F{}'.format(self.data_latch_return_dist, self.data_rapid_vel))
-            cmdList.append('F{}'.format(self.data_probe_vel))
-            cmdList.append('G38.2 Z-{}'.format(self.data_latch_return_dist*1.2))
-            cmdList.append('G1 Z{} F{}'.format(self.data_z_clearance, self.data_rapid_vel))
-            cmdList.append('G90')
-
-            # call each command - if fail report the error and gcode command
-            rtn = self.CALL_MDI_LIST(cmdList)
-            if rtn != 1:
-                return rtn
-            h=STATUS.get_probed_position()[2]
-            self.status_bh  = h
-            self.add_history('Probe Material Top',"Z",0,0,0,0,0,0,0,0,h,0,0)
-            # report success
-            return 1
-        except Exception as e:
-            return '{}'.format(e)
-
     ####################
     # Z rotation probing
     ####################