MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow Z_AFTER_PROBING to be 0

Browse Source
This commit is contained in:
Scott Lahteine 2018-04-30 02:59:11 -05:00
parent 99cbeb3806
commit 3e53754ccf
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Marlin.h
View File

@ -388,7 +388,7 @@ void report_current_position();
#if HAS_BED_PROBE #if HAS_BED_PROBE
extern float zprobe_zoffset; extern float zprobe_zoffset;
bool set_probe_deployed(const bool deploy); bool set_probe_deployed(const bool deploy);
#if Z_AFTER_PROBING #ifdef Z_AFTER_PROBING
void move_z_after_probing(); void move_z_after_probing();
#endif #endif
enum ProbePtRaise : unsigned char { enum ProbePtRaise : unsigned char {

12
Marlin/Marlin_main.cpp
View File

@ -3936,7 +3936,7 @@ inline void gcode_G4() {
#endif // DELTA #endif // DELTA
#if Z_AFTER_PROBING #ifdef Z_AFTER_PROBING
void move_z_after_probing() { void move_z_after_probing() {
if (current_position[Z_AXIS] != Z_AFTER_PROBING) { if (current_position[Z_AXIS] != Z_AFTER_PROBING) {
do_blocking_move_to_z(Z_AFTER_PROBING); do_blocking_move_to_z(Z_AFTER_PROBING);
@ -4180,7 +4180,7 @@ inline void gcode_G28(const bool always_home_all) {
HOMEAXIS(Z); HOMEAXIS(Z);
#endif #endif
#if HOMING_Z_WITH_PROBE && Z_AFTER_PROBING #if HOMING_Z_WITH_PROBE && defined(Z_AFTER_PROBING)
move_z_after_probing(); move_z_after_probing();
#endif #endif
@ -5356,7 +5356,7 @@ void home_all_axes() { gcode_G28(true); }
if (planner.leveling_active) if (planner.leveling_active)
SYNC_PLAN_POSITION_KINEMATIC(); SYNC_PLAN_POSITION_KINEMATIC();
#if HAS_BED_PROBE && Z_AFTER_PROBING #if HAS_BED_PROBE && defined(Z_AFTER_PROBING)
move_z_after_probing(); move_z_after_probing();
#endif #endif
@ -5400,7 +5400,7 @@ void home_all_axes() { gcode_G28(true); }
clean_up_after_endstop_or_probe_move(); clean_up_after_endstop_or_probe_move();
#if Z_AFTER_PROBING #ifdef Z_AFTER_PROBING
if (raise_after == PROBE_PT_STOW) move_z_after_probing(); if (raise_after == PROBE_PT_STOW) move_z_after_probing();
#endif #endif
@ -7781,7 +7781,7 @@ inline void gcode_M42() {
set_bed_leveling_enabled(was_enabled); set_bed_leveling_enabled(was_enabled);
#endif #endif
#if Z_AFTER_PROBING #ifdef Z_AFTER_PROBING
move_z_after_probing(); move_z_after_probing();
#endif #endif
@ -9917,7 +9917,7 @@ inline void gcode_M400() { stepper.synchronize(); }
*/ */
inline void gcode_M402() { inline void gcode_M402() {
STOW_PROBE(); STOW_PROBE();
#if Z_AFTER_PROBING #ifdef Z_AFTER_PROBING
move_z_after_probing(); move_z_after_probing();
#endif #endif
report_current_position(); report_current_position();

2
Marlin/ubl_G29.cpp
View File

@ -751,7 +751,7 @@
STOW_PROBE(); STOW_PROBE();
#if Z_AFTER_PROBING #ifdef Z_AFTER_PROBING
move_z_after_probing(); move_z_after_probing();
#endif #endif