Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #19579, Z_AFTER_HOMING ignored with no probe #19607

Merged
merged 3 commits into from
Oct 4, 2020
Merged

fixes #19579, Z_AFTER_HOMING ignored with no probe #19607

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a955bb8
fix Z_AFTER_HOMING with no probe
Oct 4, 2020
927740e
add Homing Options banner
Oct 4, 2020
819c295
Belay that order
thinkyhead Oct 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions Marlin/src/module/probe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,13 @@ class Probe {
do_z_clearance(Z_AFTER_PROBING, true, true, true); // Move down still permitted
#endif
}
static inline void move_z_after_homing() {
#ifdef Z_AFTER_HOMING
do_z_clearance(Z_AFTER_HOMING, true, true, true);
#elif defined(Z_AFTER_PROBING)
move_z_after_probing();
#endif
}
static float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true, const bool sanity_check=true);
static inline float probe_at_point(const xy_pos_t &pos, const ProbePtRaise raise_after=PROBE_PT_NONE, const uint8_t verbose_level=0, const bool probe_relative=true, const bool sanity_check=true) {
return probe_at_point(pos.x, pos.y, raise_after, verbose_level, probe_relative, sanity_check);
}

#else

FORCE_INLINE static void move_z_after_homing() {}

static constexpr xyz_pos_t offset = xyz_pos_t({ 0, 0, 0 }); // See #16767

static bool set_deployed(const bool) { return false; }
Expand All @@ -108,6 +99,14 @@ class Probe {

#endif

static inline void move_z_after_homing() {
#ifdef Z_AFTER_HOMING
do_z_clearance(Z_AFTER_HOMING, true, true, true);
#elif BOTH(Z_AFTER_PROBING,HAS_BED_PROBE)
move_z_after_probing();
#endif
}

FORCE_INLINE static bool can_reach(const xy_pos_t &pos) { return can_reach(pos.x, pos.y); }

FORCE_INLINE static bool good_bounds(const xy_pos_t &lf, const xy_pos_t &rb) {
Expand Down