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

Fix bed mesh algorithm for 3 point bicubic algorightm #5296

Merged
merged 8 commits into from
May 9, 2024
Merged

Fix bed mesh algorithm for 3 point bicubic algorightm #5296

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3df8977
Fix bed mesh algorithm for 3 point bicubic algorightm
igiannakas May 7, 2024
3a22e3a
Merge branch 'main' into Bed-mesh-fixes-for-lagrange-interpolation
igiannakas May 8, 2024
642e241
Corrected + to *
igiannakas May 8, 2024
760b487
Amended algo to mirror KAMP
igiannakas May 8, 2024
1ce041e
Updated from feedbacl
igiannakas May 8, 2024
e286a59
Merge remote-tracking branch 'upstream/main' into Bed-mesh-fixes-for-…
igiannakas May 8, 2024
47d4758
Merge branch 'SoftFever:main' into Bed-mesh-fixes-for-lagrange-interp…
igiannakas May 8, 2024
9602f0c
Merge branch 'Bed-mesh-fixes-for-lagrange-interpolation' of https://g…
igiannakas May 8, 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
10 changes: 8 additions & 2 deletions src/libslic3r/GCode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2352,11 +2352,17 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
auto probe_dist_y = std::max(1., m_config.bed_mesh_probe_distance.value.y());
int probe_count_x = std::max(3, (int) std::ceil(mesh_bbox.size().x() / probe_dist_x));
int probe_count_y = std::max(3, (int) std::ceil(mesh_bbox.size().y() / probe_dist_y));
this->placeholder_parser().set("bed_mesh_probe_count", new ConfigOptionInts({probe_count_x, probe_count_y}));
auto bed_mesh_algo = "bicubic";
if (probe_count_x < 4 || probe_count_y < 4) {
if (probe_count_x * probe_count_y <= 6) { // lagrange needs up to a total of 6 mesh points
bed_mesh_algo = "lagrange";
}
else
if(print.config().gcode_flavor == gcfKlipper){
// bicubic needs 4 probe points per axis
probe_count_x = std::max(probe_count_x,4);
probe_count_y = std::max(probe_count_y,4);
}
this->placeholder_parser().set("bed_mesh_probe_count", new ConfigOptionInts({probe_count_x, probe_count_y}));
this->placeholder_parser().set("bed_mesh_algo", bed_mesh_algo);
// get center without wipe tower
BoundingBoxf bbox_wo_wt; // bounding box without wipe tower
Expand Down