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

Allow Z_AFTER_PROBING to be 0

Browse source
This commit is contained in:
Scott Lahteine 2018-04-30 03:25:47 -05:00
parent 63e4afc910
commit 59fda986ea
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View file

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

2
Marlin/src/gcode/bedlevel/abl/G29.cpp
View file

@ -965,7 +965,7 @@ void GcodeSuite::G29() {
if (planner.leveling_active)
SYNC_PLAN_POSITION_KINEMATIC();
#if HAS_BED_PROBE && Z_AFTER_PROBING
#if HAS_BED_PROBE && defined(Z_AFTER_PROBING)
move_z_after_probing();
#endif

2
Marlin/src/gcode/calibrate/G28.cpp
View file

@ -312,7 +312,7 @@ void GcodeSuite::G28(const bool always_home_all) {
HOMEAXIS(Z);
#endif
#if HOMING_Z_WITH_PROBE && Z_AFTER_PROBING
#if HOMING_Z_WITH_PROBE && defined(Z_AFTER_PROBING)
move_z_after_probing();
#endif

2
Marlin/src/gcode/probe/G30.cpp
View file

@ -62,7 +62,7 @@ void GcodeSuite::G30() {
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();
#endif

2
Marlin/src/gcode/probe/M401_M402.cpp
View file

@ -41,7 +41,7 @@ void GcodeSuite::M401() {
*/
void GcodeSuite::M402() {
STOW_PROBE();
#if Z_AFTER_PROBING
#ifdef Z_AFTER_PROBING
move_z_after_probing();
#endif
report_current_position();

2
Marlin/src/module/probe.cpp
View file

@ -465,7 +465,7 @@ bool set_probe_deployed(const bool deploy) {
return false;
}
#if Z_AFTER_PROBING
#ifdef Z_AFTER_PROBING
// After probing move to a preferred Z position
void move_z_after_probing() {
if (current_position[Z_AXIS] != Z_AFTER_PROBING) {

2
Marlin/src/module/probe.h
View file

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