SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't deploy probe on Z Axis homing if Z_PROBE_AND_ENDSTOP is enabled,

Browse source 
unless Z_SAFE_HOMING is.
This commit is contained in:
Chris Roadfeldt 2015-03-29 03:55:41 -05:00
parent 666fad3494
commit 62834a1c43
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Marlin/Marlin_main.cpp
View file

@ -1493,20 +1493,18 @@ static void homeaxis(int axis) {
#ifndef Z_PROBE_SLED
// Engage Servo endstop if enabled and we are not using Z_PROBE_AND_ENDSTOP
#ifndef Z_PROBE_AND_ENDSTOP
#ifdef SERVO_ENDSTOPS
#if SERVO_LEVELING
// Engage Servo endstop if enabled and we are not using Z_PROBE_AND_ENDSTOP unless we are using Z_SAFE_HOMING
#ifdef SERVO_ENDSTOPS && (defined (Z_SAFE_HOMING) || ! defined (Z_PROBE_AND_ENDSTOP))
#if SERVO_LEVELING
if (axis==Z_AXIS) {
engage_z_probe();
}
else
#endif
#endif
if (servo_endstops[axis] > -1) {
servos[servo_endstops[axis]].write(servo_endstop_angles[axis * 2]);
}
#endif
#endif // Z_PROBE_AND_ENDSTOP
#endif
#endif // Z_PROBE_SLED
#ifdef Z_DUAL_ENDSTOPS
if (axis==Z_AXIS) In_Homing_Process(true);