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

Fix 26132: UBL probe_entire_mesh could skip points #26141

Merged
merged 4 commits into from
Aug 7, 2023
Merged

Fix 26132: UBL probe_entire_mesh could skip points #26141

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0511bc
Fix 26132:
mriscoc Aug 1, 2023
9c1b927
Defines HUGE_VALF if it was not defined to avoid AVR (ATmega) error
mriscoc Aug 1, 2023
c81b5c2
cleanup
thinkyhead Aug 7, 2023
48cc56c
Merge branch 'bugfix-2.1.x' into pr/26141
thinkyhead Aug 7, 2023
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
10 changes: 8 additions & 2 deletions Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,14 +786,18 @@ void unified_bed_leveling::shift_mesh_height() {
}
#endif

best = do_furthest
#ifndef HUGE_VALF
#define HUGE_VALF (10e100F)
#endif

best = do_furthest // Points with valid data or HUGE_VALF are skipped
? find_furthest_invalid_mesh_point()
: find_closest_mesh_point_of_type(INVALID, nearby, true);

if (best.pos.x >= 0) { // mesh point found and is reachable by probe
TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(best.pos, ExtUI::G29_POINT_START));
const float measured_z = probe.probe_at_point(best.meshpos(), stow_probe ? PROBE_PT_STOW : PROBE_PT_RAISE, param.V_verbosity);
z_values[best.pos.x][best.pos.y] = measured_z;
z_values[best.pos.x][best.pos.y] = isnan(measured_z) ? HUGE_VALF : measured_z; // Mark invalid point already probed with HUGE_VALF to omit it in the next loop
#if ENABLED(EXTENSIBLE_UI)
ExtUI::onMeshUpdate(best.pos, ExtUI::G29_POINT_FINISH);
ExtUI::onMeshUpdate(best.pos, measured_z);
Expand All @@ -803,6 +807,8 @@ void unified_bed_leveling::shift_mesh_height() {

} while (best.pos.x >= 0 && --count);

GRID_LOOP(x, y) if (z_values[x][y] == HUGE_VALF) z_values[x][y] = NAN; // Restore NAN for HUGE_VALF marks

TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(best.pos, ExtUI::G29_FINISH));

// Release UI during stow to allow for PAUSE_BEFORE_DEPLOY_STOW
Expand Down
Loading