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

Jump to bottom

🔧 Allow float Z_PROBE_LOW_POINT #26711

Merged
merged 5 commits into from
Jan 25, 2024
Merged

🔧 Allow float Z_PROBE_LOW_POINT #26711

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e88f49
improved doc and suggestion for behaviour when probing fails
Jan 20, 2024
1a7a3dc
comments from thisiskeithb taken into account
Jan 21, 2024
e1b8e61
changes
thinkyhead Jan 25, 2024
2d5925a
<=
thinkyhead Jan 25, 2024
91c917a
Merge branch 'bugfix-2.1.x' into pr/26711
thinkyhead Jan 25, 2024
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
8 changes: 7 additions & 1 deletion Marlin/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1658,7 +1658,13 @@
#define Z_PROBE_ERROR_TOLERANCE 3 // (mm) Tolerance for early trigger (<= -probe.offset.z + ZPET)
//#define Z_AFTER_PROBING 5 // (mm) Z position after probing is done

#define Z_PROBE_LOW_POINT -2 // (mm) Farthest distance below the trigger-point to go before stopping
/*
* when probing for a mesh, homing must be performed ; this sets a reference triger point.
*
* If the bed is very uneven or if the probe fails to trigger, machine will stop moving
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
* and send "Error:Probing Failed" on serial
*/
#define Z_PROBE_LOW_POINT -2 // (mm) [int] Farthest distance below the trigger-point to go before stopping

// For M851 provide ranges for adjusting the X, Y, and Z probe offsets
//#define PROBE_OFFSET_XMIN -50 // (mm)
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/inc/SanityCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1464,7 +1464,7 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i
#endif

#if Z_PROBE_LOW_POINT > 0
#error "Z_PROBE_LOW_POINT must be less than or equal to 0."
#error "Z_PROBE_LOW_POINT must be less than or equal to 0 and must be an int."
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
#endif

#if ENABLED(PROBE_ACTIVATION_SWITCH)
Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/module/probe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,9 @@ float Probe::probe_at_point(const_float_t rx, const_float_t ry, const ProbePtRai

// If any error occurred stow the probe and set an alert
if (isnan(measured_z)) {
// TODO disable steppers ; something defintiely went wrong at this point, so we don't want to insist
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
// pushing against something and might want/need to quickly move the machine by hand to avoid damage
// (such as a hot nozzle melting the bed) ; playing a tone would be a wise thing too
stow();
LCD_MESSAGE(MSG_LCD_PROBING_FAILED);
#if DISABLED(G29_RETRY_AND_RECOVER)
Expand Down