From 799a31cd30297c5436bc11724b2a04ba216f85d7 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 14 Jul 2016 22:56:44 -0700 Subject: [PATCH 1/9] Include the position_shift when splitting mesh lines --- Marlin/Marlin_main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index ad163d77d..a1f454df6 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -7863,7 +7863,7 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c } float nx, ny, nz, ne, normalized_dist; if (cx > pcx && TEST(x_splits, cx)) { - nx = mbl.get_probe_x(cx) + home_offset[X_AXIS]; + nx = mbl.get_probe_x(cx) + home_offset[X_AXIS] + position_shift[X_AXIS]; normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]); ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist; nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist; @@ -7871,7 +7871,7 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c CBI(x_splits, cx); } else if (cx < pcx && TEST(x_splits, pcx)) { - nx = mbl.get_probe_x(pcx) + home_offset[X_AXIS]; + nx = mbl.get_probe_x(pcx) + home_offset[X_AXIS] + position_shift[X_AXIS]; normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]); ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist; nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist; @@ -7879,7 +7879,7 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c CBI(x_splits, pcx); } else if (cy > pcy && TEST(y_splits, cy)) { - ny = mbl.get_probe_y(cy) + home_offset[Y_AXIS]; + ny = mbl.get_probe_y(cy) + home_offset[Y_AXIS] + position_shift[Y_AXIS]; normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]); nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist; nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist; @@ -7887,7 +7887,7 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c CBI(y_splits, cy); } else if (cy < pcy && TEST(y_splits, pcy)) { - ny = mbl.get_probe_y(pcy) + home_offset[Y_AXIS]; + ny = mbl.get_probe_y(pcy) + home_offset[Y_AXIS] + position_shift[Y_AXIS]; normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]); nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist; nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist; From f4a69281fc17835558755ae76ab8cfedcb52da5d Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 14 Jul 2016 23:40:48 -0700 Subject: [PATCH 2/9] Only call mesh_buffer_line when MBL is active --- Marlin/Marlin_main.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index a1f454df6..389818c58 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -7842,11 +7842,6 @@ void clamp_to_software_endstops(float target[3]) { // This function is used to split lines on mesh borders so each segment is only part of one mesh area void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, const uint8_t& extruder, uint8_t x_splits = 0xff, uint8_t y_splits = 0xff) { - if (!mbl.active()) { - planner.buffer_line(x, y, z, e, fr_mm_s, extruder); - set_current_to_destination(); - return; - } int pcx = mbl.cell_index_x(RAW_CURRENT_POSITION(X_AXIS)), pcy = mbl.cell_index_y(RAW_CURRENT_POSITION(Y_AXIS)), cx = mbl.cell_index_x(RAW_POSITION(x, X_AXIS)), @@ -8007,11 +8002,13 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c } else { #if ENABLED(MESH_BED_LEVELING) - mesh_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], MMM_TO_MMS_SCALED(feedrate_mm_m), active_extruder); - return false; - #else - line_to_destination(MMM_SCALED(feedrate_mm_m)); + if (mbl.active()) { + mesh_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], MMM_TO_MMS_SCALED(feedrate_mm_m), active_extruder); + return false; + } + else #endif + line_to_destination(MMM_SCALED(feedrate_mm_m)); } return true; } From 103d312f6dbd4904cc06b6133fe7b8266b7872db Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 14 Jul 2016 23:44:55 -0700 Subject: [PATCH 3/9] MBL can actually do up to 9 x 9 --- Marlin/SanityCheck.h | 4 ++-- Marlin/configuration_store.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 086634491..a8f238810 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -238,8 +238,8 @@ #error "MESH_BED_LEVELING does not yet support DELTA printers." #elif ENABLED(AUTO_BED_LEVELING_FEATURE) #error "Select AUTO_BED_LEVELING_FEATURE or MESH_BED_LEVELING, not both." - #elif MESH_NUM_X_POINTS > 7 || MESH_NUM_Y_POINTS > 7 - #error "MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS need to be less than 8." + #elif MESH_NUM_X_POINTS > 9 || MESH_NUM_Y_POINTS > 9 + #error "MESH_NUM_X_POINTS and MESH_NUM_Y_POINTS must be less than 10." #endif #elif ENABLED(MANUAL_BED_LEVELING) #error "MESH_BED_LEVELING is required for MANUAL_BED_LEVELING." diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp index ab5af8064..b203bbb62 100644 --- a/Marlin/configuration_store.cpp +++ b/Marlin/configuration_store.cpp @@ -67,7 +67,7 @@ * 203 z_offset (float) * 207 mesh_num_x (uint8 as set in firmware) * 208 mesh_num_y (uint8 as set in firmware) - * 209 G29 S3 XYZ z_values[][] (float x9, by default) + * 209 G29 S3 XYZ z_values[][] (float x9, by default, up to float x 81) * * AUTO BED LEVELING * 245 M851 zprobe_zoffset (float) From 697373b071191d4faa4a3acb44fbabfb5bd7b1af Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 16 Jul 2016 19:08:54 -0700 Subject: [PATCH 4/9] Reduce code size of mesh_buffer_line --- Marlin/Marlin_main.cpp | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 389818c58..67d42c310 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -7848,46 +7848,33 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c cy = mbl.cell_index_y(RAW_POSITION(y, Y_AXIS)); NOMORE(pcx, MESH_NUM_X_POINTS - 2); NOMORE(pcy, MESH_NUM_Y_POINTS - 2); - NOMORE(cx, MESH_NUM_X_POINTS - 2); - NOMORE(cy, MESH_NUM_Y_POINTS - 2); + NOMORE(cx, MESH_NUM_X_POINTS - 2); + NOMORE(cy, MESH_NUM_Y_POINTS - 2); + if (pcx == cx && pcy == cy) { // Start and end on same mesh square planner.buffer_line(x, y, z, e, fr_mm_s, extruder); set_current_to_destination(); return; } + float nx, ny, nz, ne, normalized_dist; - if (cx > pcx && TEST(x_splits, cx)) { - nx = mbl.get_probe_x(cx) + home_offset[X_AXIS] + position_shift[X_AXIS]; + int8_t gcx = max(pcx, cx), gcy = max(pcy, cy); + if (cx != pcx && TEST(x_splits, gcx)) { + nx = mbl.get_probe_x(gcx) + home_offset[X_AXIS] + position_shift[X_AXIS]; normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]); ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist; nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist; ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist; - CBI(x_splits, cx); + CBI(x_splits, gcx); } - else if (cx < pcx && TEST(x_splits, pcx)) { - nx = mbl.get_probe_x(pcx) + home_offset[X_AXIS] + position_shift[X_AXIS]; - normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]); - ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist; - nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist; - ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist; - CBI(x_splits, pcx); - } - else if (cy > pcy && TEST(y_splits, cy)) { - ny = mbl.get_probe_y(cy) + home_offset[Y_AXIS] + position_shift[Y_AXIS]; + else if (cy != pcy && TEST(y_splits, gcy)) { + ny = mbl.get_probe_y(gcy) + home_offset[Y_AXIS] + position_shift[Y_AXIS]; normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]); nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist; nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist; ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist; - CBI(y_splits, cy); - } - else if (cy < pcy && TEST(y_splits, pcy)) { - ny = mbl.get_probe_y(pcy) + home_offset[Y_AXIS] + position_shift[Y_AXIS]; - normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]); - nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist; - nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist; - ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist; - CBI(y_splits, pcy); + CBI(y_splits, gcy); } else { // Already split on a border From d0009e013bd35f16ffdaf8f8c124ce999efa0074 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 16 Jul 2016 19:11:56 -0700 Subject: [PATCH 5/9] Rename cell index vars --- Marlin/Marlin_main.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 67d42c310..5fe4462e6 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -7842,16 +7842,16 @@ void clamp_to_software_endstops(float target[3]) { // This function is used to split lines on mesh borders so each segment is only part of one mesh area void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, const uint8_t& extruder, uint8_t x_splits = 0xff, uint8_t y_splits = 0xff) { - int pcx = mbl.cell_index_x(RAW_CURRENT_POSITION(X_AXIS)), - pcy = mbl.cell_index_y(RAW_CURRENT_POSITION(Y_AXIS)), - cx = mbl.cell_index_x(RAW_POSITION(x, X_AXIS)), - cy = mbl.cell_index_y(RAW_POSITION(y, Y_AXIS)); - NOMORE(pcx, MESH_NUM_X_POINTS - 2); - NOMORE(pcy, MESH_NUM_Y_POINTS - 2); - NOMORE(cx, MESH_NUM_X_POINTS - 2); - NOMORE(cy, MESH_NUM_Y_POINTS - 2); + int cx1 = mbl.cell_index_x(RAW_CURRENT_POSITION(X_AXIS)), + cy1 = mbl.cell_index_y(RAW_CURRENT_POSITION(Y_AXIS)), + cx2 = mbl.cell_index_x(RAW_POSITION(x, X_AXIS)), + cy2 = mbl.cell_index_y(RAW_POSITION(y, Y_AXIS)); + NOMORE(cx1, MESH_NUM_X_POINTS - 2); + NOMORE(cy1, MESH_NUM_Y_POINTS - 2); + NOMORE(cx2, MESH_NUM_X_POINTS - 2); + NOMORE(cy2, MESH_NUM_Y_POINTS - 2); - if (pcx == cx && pcy == cy) { + if (cx1 == cx2 && cy1 == cy2) { // Start and end on same mesh square planner.buffer_line(x, y, z, e, fr_mm_s, extruder); set_current_to_destination(); @@ -7859,8 +7859,8 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c } float nx, ny, nz, ne, normalized_dist; - int8_t gcx = max(pcx, cx), gcy = max(pcy, cy); - if (cx != pcx && TEST(x_splits, gcx)) { + int8_t gcx = max(cx1, cx2), gcy = max(cy1, cy2); + if (cx2 != cx1 && TEST(x_splits, gcx)) { nx = mbl.get_probe_x(gcx) + home_offset[X_AXIS] + position_shift[X_AXIS]; normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]); ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist; @@ -7868,7 +7868,7 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist; CBI(x_splits, gcx); } - else if (cy != pcy && TEST(y_splits, gcy)) { + else if (cy2 != cy1 && TEST(y_splits, gcy)) { ny = mbl.get_probe_y(gcy) + home_offset[Y_AXIS] + position_shift[Y_AXIS]; normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]); nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist; From f6a3a1da09146cd3339647ea86582f64cf4927a2 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 16 Jul 2016 19:16:12 -0700 Subject: [PATCH 6/9] nz and ne are always set, so drop them down --- Marlin/Marlin_main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 5fe4462e6..72bba0b44 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -7864,16 +7864,12 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c nx = mbl.get_probe_x(gcx) + home_offset[X_AXIS] + position_shift[X_AXIS]; normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]); ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist; - nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist; - ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist; CBI(x_splits, gcx); } else if (cy2 != cy1 && TEST(y_splits, gcy)) { ny = mbl.get_probe_y(gcy) + home_offset[Y_AXIS] + position_shift[Y_AXIS]; normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]); nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist; - nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist; - ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist; CBI(y_splits, gcy); } else { @@ -7882,6 +7878,10 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c set_current_to_destination(); return; } + + nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist; + ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist; + // Do the split and look for more borders destination[X_AXIS] = nx; destination[Y_AXIS] = ny; From 04a5b7b25728b73fb869d898b84c55b34b448c45 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 16 Jul 2016 19:20:16 -0700 Subject: [PATCH 7/9] A macro to normalize positions --- Marlin/Marlin_main.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 72bba0b44..d069253c2 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -7858,18 +7858,20 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c return; } + #define MBL_SEGMENT_END(axis,AXIS) (current_position[AXIS ##_AXIS] + (axis - current_position[AXIS ##_AXIS]) * normalized_dist) + float nx, ny, nz, ne, normalized_dist; int8_t gcx = max(cx1, cx2), gcy = max(cy1, cy2); if (cx2 != cx1 && TEST(x_splits, gcx)) { nx = mbl.get_probe_x(gcx) + home_offset[X_AXIS] + position_shift[X_AXIS]; normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]); - ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist; + ny = MBL_SEGMENT_END(y, Y); CBI(x_splits, gcx); } else if (cy2 != cy1 && TEST(y_splits, gcy)) { ny = mbl.get_probe_y(gcy) + home_offset[Y_AXIS] + position_shift[Y_AXIS]; normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]); - nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist; + nx = MBL_SEGMENT_END(x, X); CBI(y_splits, gcy); } else { @@ -7879,8 +7881,8 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c return; } - nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist; - ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist; + nz = MBL_SEGMENT_END(z, Z); + ne = MBL_SEGMENT_END(e, E); // Do the split and look for more borders destination[X_AXIS] = nx; From 07a735ad22384a337e815bfdd2729bbf589e35b1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 16 Jul 2016 19:28:13 -0700 Subject: [PATCH 8/9] We always use `destination` so modify mesh_buffer_line --- Marlin/Marlin_main.cpp | 47 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index d069253c2..9bcedbe91 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -7841,11 +7841,11 @@ void clamp_to_software_endstops(float target[3]) { #if ENABLED(MESH_BED_LEVELING) // This function is used to split lines on mesh borders so each segment is only part of one mesh area -void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, const uint8_t& extruder, uint8_t x_splits = 0xff, uint8_t y_splits = 0xff) { +void mesh_line_to_destination(float fr_mm_m, uint8_t x_splits = 0xff, uint8_t y_splits = 0xff) { int cx1 = mbl.cell_index_x(RAW_CURRENT_POSITION(X_AXIS)), cy1 = mbl.cell_index_y(RAW_CURRENT_POSITION(Y_AXIS)), - cx2 = mbl.cell_index_x(RAW_POSITION(x, X_AXIS)), - cy2 = mbl.cell_index_y(RAW_POSITION(y, Y_AXIS)); + cx2 = mbl.cell_index_x(RAW_POSITION(destination[X_AXIS], X_AXIS)), + cy2 = mbl.cell_index_y(RAW_POSITION(destination[Y_AXIS], Y_AXIS)); NOMORE(cx1, MESH_NUM_X_POINTS - 2); NOMORE(cy1, MESH_NUM_Y_POINTS - 2); NOMORE(cx2, MESH_NUM_X_POINTS - 2); @@ -7853,48 +7853,49 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c if (cx1 == cx2 && cy1 == cy2) { // Start and end on same mesh square - planner.buffer_line(x, y, z, e, fr_mm_s, extruder); + line_to_destination(fr_mm_m); set_current_to_destination(); return; } - #define MBL_SEGMENT_END(axis,AXIS) (current_position[AXIS ##_AXIS] + (axis - current_position[AXIS ##_AXIS]) * normalized_dist) + #define MBL_SEGMENT_END(A) (current_position[A ##_AXIS] + (destination[A ##_AXIS] - current_position[A ##_AXIS]) * normalized_dist) - float nx, ny, nz, ne, normalized_dist; + float nx, ny, normalized_dist; int8_t gcx = max(cx1, cx2), gcy = max(cy1, cy2); if (cx2 != cx1 && TEST(x_splits, gcx)) { nx = mbl.get_probe_x(gcx) + home_offset[X_AXIS] + position_shift[X_AXIS]; - normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]); - ny = MBL_SEGMENT_END(y, Y); + normalized_dist = (nx - current_position[X_AXIS]) / (destination[X_AXIS] - current_position[X_AXIS]); + ny = MBL_SEGMENT_END(Y); CBI(x_splits, gcx); } else if (cy2 != cy1 && TEST(y_splits, gcy)) { ny = mbl.get_probe_y(gcy) + home_offset[Y_AXIS] + position_shift[Y_AXIS]; - normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]); - nx = MBL_SEGMENT_END(x, X); + normalized_dist = (ny - current_position[Y_AXIS]) / (destination[Y_AXIS] - current_position[Y_AXIS]); + nx = MBL_SEGMENT_END(X); CBI(y_splits, gcy); } else { // Already split on a border - planner.buffer_line(x, y, z, e, fr_mm_s, extruder); + line_to_destination(fr_mm_m); set_current_to_destination(); return; } - nz = MBL_SEGMENT_END(z, Z); - ne = MBL_SEGMENT_END(e, E); + // Save given destination for after recursion + float end[NUM_AXIS]; + memcpy(end, destination, sizeof(end)); - // Do the split and look for more borders destination[X_AXIS] = nx; destination[Y_AXIS] = ny; - destination[Z_AXIS] = nz; - destination[E_AXIS] = ne; - mesh_buffer_line(nx, ny, nz, ne, fr_mm_s, extruder, x_splits, y_splits); - destination[X_AXIS] = x; - destination[Y_AXIS] = y; - destination[Z_AXIS] = z; - destination[E_AXIS] = e; - mesh_buffer_line(x, y, z, e, fr_mm_s, extruder, x_splits, y_splits); + destination[Z_AXIS] = MBL_SEGMENT_END(Z); + destination[E_AXIS] = MBL_SEGMENT_END(E); + + // Do the split and look for more borders + mesh_line_to_destination(fr_mm_m, x_splits, y_splits); + + // Restore destination from stack + memcpy(destination, end, sizeof(end)); + mesh_line_to_destination(fr_mm_m, x_splits, y_splits); } #endif // MESH_BED_LEVELING @@ -7992,7 +7993,7 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c else { #if ENABLED(MESH_BED_LEVELING) if (mbl.active()) { - mesh_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], MMM_TO_MMS_SCALED(feedrate_mm_m), active_extruder); + mesh_line_to_destination(MMM_SCALED(feedrate_mm_m)); return false; } else From 493d30cd976f0432c7d8bafda9ed36958a1706aa Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 17 Jul 2016 12:21:28 -0700 Subject: [PATCH 9/9] Drop intermediate nx, ny, and set destination directly --- Marlin/Marlin_main.cpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 9bcedbe91..74ec068a0 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -7860,18 +7860,22 @@ void mesh_line_to_destination(float fr_mm_m, uint8_t x_splits = 0xff, uint8_t y_ #define MBL_SEGMENT_END(A) (current_position[A ##_AXIS] + (destination[A ##_AXIS] - current_position[A ##_AXIS]) * normalized_dist) - float nx, ny, normalized_dist; + float normalized_dist, end[NUM_AXIS]; + + // Split at the left/front border of the right/top square int8_t gcx = max(cx1, cx2), gcy = max(cy1, cy2); if (cx2 != cx1 && TEST(x_splits, gcx)) { - nx = mbl.get_probe_x(gcx) + home_offset[X_AXIS] + position_shift[X_AXIS]; - normalized_dist = (nx - current_position[X_AXIS]) / (destination[X_AXIS] - current_position[X_AXIS]); - ny = MBL_SEGMENT_END(Y); + memcpy(end, destination, sizeof(end)); + destination[X_AXIS] = mbl.get_probe_x(gcx) + home_offset[X_AXIS] + position_shift[X_AXIS]; + normalized_dist = (destination[X_AXIS] - current_position[X_AXIS]) / (end[X_AXIS] - current_position[X_AXIS]); + destination[Y_AXIS] = MBL_SEGMENT_END(Y); CBI(x_splits, gcx); } else if (cy2 != cy1 && TEST(y_splits, gcy)) { - ny = mbl.get_probe_y(gcy) + home_offset[Y_AXIS] + position_shift[Y_AXIS]; - normalized_dist = (ny - current_position[Y_AXIS]) / (destination[Y_AXIS] - current_position[Y_AXIS]); - nx = MBL_SEGMENT_END(X); + memcpy(end, destination, sizeof(end)); + destination[Y_AXIS] = mbl.get_probe_y(gcy) + home_offset[Y_AXIS] + position_shift[Y_AXIS]; + normalized_dist = (destination[Y_AXIS] - current_position[Y_AXIS]) / (end[Y_AXIS] - current_position[Y_AXIS]); + destination[X_AXIS] = MBL_SEGMENT_END(X); CBI(y_splits, gcy); } else { @@ -7881,12 +7885,6 @@ void mesh_line_to_destination(float fr_mm_m, uint8_t x_splits = 0xff, uint8_t y_ return; } - // Save given destination for after recursion - float end[NUM_AXIS]; - memcpy(end, destination, sizeof(end)); - - destination[X_AXIS] = nx; - destination[Y_AXIS] = ny; destination[Z_AXIS] = MBL_SEGMENT_END(Z); destination[E_AXIS] = MBL_SEGMENT_END(E);