CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak how homeaxis deploys and stows

Browse Source
This commit is contained in:
Scott Lahteine 2015-04-28 19:17:48 -07:00
parent a235dca79c
commit ce3caf447b
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Marlin/Marlin_main.cpp
View File

@ -1528,14 +1528,19 @@ static void homeaxis(AxisEnum axis) {
#if SERVO_LEVELING && !defined(Z_PROBE_SLED) #if SERVO_LEVELING && !defined(Z_PROBE_SLED)
// Deploy a probe if there is one, and homing towards the bed // Deploy a probe if there is one, and homing towards the bed
if (axis == Z_AXIS && axis_home_dir < 0) deploy_z_probe(); if (axis == Z_AXIS) {
if (axis_home_dir < 0) deploy_z_probe();
}
else
#elif defined(SERVO_ENDSTOPS) #endif
#ifdef SERVO_ENDSTOPS
{
// Engage Servo endstop if enabled // Engage Servo endstop if enabled
if (servo_endstops[axis] > -1) if (servo_endstops[axis] > -1)
servo[servo_endstops[axis]].write(servo_endstop_angles[axis * 2]); servo[servo_endstops[axis]].write(servo_endstop_angles[axis * 2]);
}
#endif #endif
// Set a flag for Z motor locking // Set a flag for Z motor locking
@ -1618,15 +1623,20 @@ static void homeaxis(AxisEnum axis) {
#if SERVO_LEVELING && !defined(Z_PROBE_SLED) #if SERVO_LEVELING && !defined(Z_PROBE_SLED)
// Stow the Z probe if it had been deployed // Deploy a probe if there is one, and homing towards the bed
if (axis == Z_AXIS && axis_home_dir < 0) stow_z_probe(); if (axis == Z_AXIS) {
if (axis_home_dir < 0) stow_z_probe();
}
else
#elif defined(SERVO_ENDSTOPS) #endif
#ifdef SERVO_ENDSTOPS
{
// Retract Servo endstop if enabled // Retract Servo endstop if enabled
if (servo_endstops[axis] > -1) if (servo_endstops[axis] > -1)
servo[servo_endstops[axis]].write(servo_endstop_angles[axis * 2 + 1]); servo[servo_endstops[axis]].write(servo_endstop_angles[axis * 2 + 1]);
}
#endif #endif
} }