3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

Browse source
This commit is contained in:
Neil Darlow 2014-10-05 12:54:54 +01:00
commit 6c5a460e65
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Marlin/Marlin_main.cpp
View file

@ -1202,7 +1202,9 @@ static void homeaxis(int axis) {
}
#endif
#if defined (ENABLE_AUTO_BED_LEVELING) && (PROBE_SERVO_DEACTIVATION_DELAY > 0)
// if (axis==Z_AXIS) retract_z_probe();
#ifndef Z_PROBE_SLED
if (axis==Z_AXIS) retract_z_probe();
#endif
#endif
}
@ -1268,7 +1270,7 @@ void refresh_cmd_timeout(void)
} //retract
#endif //FWRETRACT
#ifdef ENABLE_AUTO_BED_LEVELING
#ifdef Z_PROBE_SLED
//
// Method to dock/undock a sled designed by Charles Bell.
//