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

Deploy & Stow in G29 for Delta + Z Servo Endstop

Browse Source
This commit is contained in:
Scott Lahteine 2016-03-30 16:41:16 -07:00
parent 33a9d32800
commit 82ef101ed5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Conditionals.h
View File

@ -339,7 +339,7 @@
#define MAX_PROBE_Y (min(Y_MAX_POS, Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER)) #define MAX_PROBE_Y (min(Y_MAX_POS, Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
#endif #endif
#define SERVO_LEVELING (defined(AUTO_BED_LEVELING_FEATURE) && defined(Z_ENDSTOP_SERVO_NR)) #define SERVO_LEVELING (ENABLED(AUTO_BED_LEVELING_FEATURE) && defined(Z_ENDSTOP_SERVO_NR) && Z_ENDSTOP_SERVO_NR >= 0)
/** /**
* Sled Options * Sled Options

4
Marlin/Marlin_main.cpp
View File

@ -3074,7 +3074,7 @@ inline void gcode_G28() {
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)
dock_sled(false); // engage (un-dock) the Z probe dock_sled(false); // engage (un-dock) the Z probe
#elif ENABLED(Z_PROBE_ALLEN_KEY) //|| SERVO_LEVELING #elif ENABLED(Z_PROBE_ALLEN_KEY) || (ENABLED(DELTA) && SERVO_LEVELING)
deploy_z_probe(); deploy_z_probe();
#endif #endif
@ -3342,7 +3342,7 @@ inline void gcode_G28() {
#if ENABLED(DELTA) #if ENABLED(DELTA)
// Allen Key Probe for Delta // Allen Key Probe for Delta
#if ENABLED(Z_PROBE_ALLEN_KEY) #if ENABLED(Z_PROBE_ALLEN_KEY) || SERVO_LEVELING
stow_z_probe(); stow_z_probe();
#elif Z_RAISE_AFTER_PROBING > 0 #elif Z_RAISE_AFTER_PROBING > 0
raise_z_after_probing(); // ??? raise_z_after_probing(); // ???