Skip to content

🔧 Allow float Z_PROBE_LOW_POINT #26711

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

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 all commits
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
4 changes: 1 addition & 3 deletions Marlin/src/inc/SanityCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1508,9 +1508,7 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i
#endif
#endif

#if Z_PROBE_LOW_POINT > 0
#error "Z_PROBE_LOW_POINT must be less than or equal to 0."
#endif
static_assert(Z_PROBE_LOW_POINT <= 0, "Z_PROBE_LOW_POINT must be less than or equal to 0.");
Copy link
Member

@thinkyhead thinkyhead Jan 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing the sanity check to use static_assert allows the setting to include a decimal point.


#if ENABLED(PROBE_ACTIVATION_SWITCH)
#ifndef PROBE_ACTIVATION_SWITCH_STATE
Expand Down
4 changes: 4 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,10 @@ 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 (unless G29_RETRY_AND_RECOVER or G29_HALT_ON_FAILURE are set).
// Something definitely went wrong at this point, so it might be a good idea to release the steppers.
// The user may want to quickly move the carriage or bed by hand to avoid bed damage from the (hot) nozzle.
// This would also benefit from the contemplated "Audio Alerts" feature.
Copy link
Member

@thinkyhead thinkyhead Jan 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An additional Z raise after a failed probe would be even better because the user cannot always quickly intervene.

stow();
LCD_MESSAGE(MSG_LCD_PROBING_FAILED);
#if DISABLED(G29_RETRY_AND_RECOVER)
Expand Down