Merge pull request #770 from CptanPanic/touch-zero

Added option to setting plunge depth of Zaxis touch probe.
MaslowCNC · Sep 5, 2018 · a42d628 · a42d628
2 parents 405c576 + 95b12a5
commit a42d628
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Settings/maslowSettings.py b/Settings/maslowSettings.py
@@ -173,6 +173,13 @@
         ],
     "Advanced Settings":
         [
+            {
+                "type": "string",
+                "title": "Max touch Z-axis plunge",
+                "desc": "Max depth the z axis should plunge in order to find the touch probe",
+                "key": "maxTouchProbePlungeDistance",
+                "default": 0.0,
+	    },
             {
                 "type": "string",
                 "title": "Encoder Steps per Revolution",

diff --git a/UIElements/zAxisPopupContent.py b/UIElements/zAxisPopupContent.py
@@ -139,10 +139,12 @@ def touchZero(self):
         Probe for Zero Z
         '''
         self.setMachineUnits()
+	plungeDepth = self.data.config.get('Advanced Settings', 'maxTouchProbePlungeDistance')
+
         if self.data.units == "INCHES":
-            self.data.gcode_queue.put("G38.2 Z-.2 F2")    #Only go down 0.2 inches...
+            self.data.gcode_queue.put("G20 G90 G38.2 Z-" + plungeDepth + " F1 G20 G90 M02")   
         else:
-            self.data.gcode_queue.put("G38.2 Z-5 F50")  #Or 5mm.
+            self.data.gcode_queue.put("G21 G90 G38.2 Z-" + plungeDepth + " F1 G21 G90 M02")  
         self.resetMachineUnits()
 
 

diff --git a/groundcontrol.kv b/groundcontrol.kv
@@ -643,7 +643,7 @@
                     size_hint_y: 0.2
                     text: "Touch Zero"
                     on_release: root.touchZero()
-                    disabled: True
+                    disabled: False
             Button:
                 text: "Lower"
                 on_release: root.zIn()