Skip to content

Commit

Permalink
🔧 Allow float Z_PROBE_LOW_POINT (#26711)
Browse files Browse the repository at this point in the history
  • Loading branch information
petaflot authored and thinkyhead committed Jan 25, 2024
1 parent ffbf4a6 commit 3856037
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 1 addition & 3 deletions Marlin/src/inc/SanityCheck.h
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.");

#if ENABLED(PROBE_ACTIVATION_SWITCH)
#ifndef PROBE_ACTIVATION_SWITCH_STATE
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/module/probe.cpp
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.
stow();
LCD_MESSAGE(MSG_LCD_PROBING_FAILED);
#if DISABLED(G29_RETRY_AND_RECOVER)
Expand Down

0 comments on commit 3856037

Please sign in to comment.