MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A macro to normalize positions

Browse Source
This commit is contained in:
Scott Lahteine 2016-07-16 19:20:16 -07:00
parent f6a3a1da09
commit 04a5b7b257
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/Marlin_main.cpp
View File

@ -7858,18 +7858,20 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c
return; 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; float nx, ny, nz, ne, normalized_dist;
int8_t gcx = max(cx1, cx2), gcy = max(cy1, cy2); int8_t gcx = max(cx1, cx2), gcy = max(cy1, cy2);
if (cx2 != cx1 && TEST(x_splits, gcx)) { if (cx2 != cx1 && TEST(x_splits, gcx)) {
nx = mbl.get_probe_x(gcx) + home_offset[X_AXIS] + position_shift[X_AXIS]; 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]); 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); CBI(x_splits, gcx);
} }
else if (cy2 != cy1 && 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]; 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]); 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); CBI(y_splits, gcy);
} }
else { else {
@ -7879,8 +7881,8 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c
return; return;
} }
nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist; nz = MBL_SEGMENT_END(z, Z);
ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist; ne = MBL_SEGMENT_END(e, E);
// Do the split and look for more borders // Do the split and look for more borders
destination[X_AXIS] = nx; destination[X_AXIS] = nx;