3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

change to better (more clear) names (#8049)

Browse source 
set_destination_to_current() changed to set_destination_from_current()

set_current_to_destination() changed to set_current_from_destination()
This commit is contained in:
Roxy-3D 2017-10-21 10:58:17 -05:00 • committed by GitHub
parent fa44130734
commit e9bc9a2ab4
4 changed files with 53 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Marlin/ubl_motion.cpp
View file

@ -33,9 +33,9 @@
extern float destination[XYZE];
#if AVR_AT90USB1286_FAMILY // Teensyduino & Printrboard IDE extensions have compile errors without this
inline void set_current_to_destination() { COPY(current_position, destination); }
inline void set_current_from_destination() { COPY(current_position, destination); }
#else
extern void set_current_to_destination();
extern void set_current_from_destination();
#endif
#if ENABLED(DELTA)
@ -154,7 +154,7 @@
// a reasonable correction would be.
planner._buffer_line(end[X_AXIS], end[Y_AXIS], end[Z_AXIS], end[E_AXIS], feed_rate, extruder);
set_current_to_destination();
set_current_from_destination();
if (g26_debug_flag)
debug_current_and_destination(PSTR("out of bounds in ubl.line_to_destination()"));
@ -202,7 +202,7 @@
if (g26_debug_flag)
debug_current_and_destination(PSTR("FINAL_MOVE in ubl.line_to_destination()"));
set_current_to_destination();
set_current_from_destination();
return;
}
@ -314,7 +314,7 @@
if (current_position[X_AXIS] != end[X_AXIS] || current_position[Y_AXIS] != end[Y_AXIS])
goto FINAL_MOVE;
set_current_to_destination();
set_current_from_destination();
return;
}
@ -375,7 +375,7 @@
if (current_position[X_AXIS] != end[X_AXIS] || current_position[Y_AXIS] != end[Y_AXIS])
goto FINAL_MOVE;
set_current_to_destination();
set_current_from_destination();
return;
}
@ -469,7 +469,7 @@
if (current_position[X_AXIS] != end[X_AXIS] || current_position[Y_AXIS] != end[Y_AXIS])
goto FINAL_MOVE;
set_current_to_destination();
set_current_from_destination();
}
#if UBL_DELTA
@ -619,7 +619,7 @@
} while (segments);
return false; // moved but did not set_current_to_destination();
return false; // moved but did not set_current_from_destination();
}
// Otherwise perform per-segment leveling
@ -700,7 +700,7 @@
ubl_buffer_segment_raw( seg_rx, seg_ry, seg_rz + z_cxcy, seg_le, feedrate );
if (segments == 0 ) // done with last segment
return false; // did not set_current_to_destination()
return false; // did not set_current_from_destination()
seg_rx += seg_dx;
seg_ry += seg_dy;