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

Patch do_blocking_move_to so 'destination' can be used

Browse Source
This commit is contained in:
Scott Lahteine 2018-03-12 08:05:54 -05:00
parent 656c3c3b2a
commit 8c7e98627f
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/Marlin.h
View File

@ -468,10 +468,10 @@ void prepare_move_to_destination();
/**
* Blocking movement and shorthand functions
*/
void do_blocking_move_to(const float &x, const float &y, const float &z, const float &fr_mm_s=0.0);
void do_blocking_move_to_x(const float &x, const float &fr_mm_s=0.0);
void do_blocking_move_to_z(const float &z, const float &fr_mm_s=0.0);
void do_blocking_move_to_xy(const float &x, const float &y, const float &fr_mm_s=0.0);
void do_blocking_move_to(const float rx, const float ry, const float rz, const float &fr_mm_s=0.0);
void do_blocking_move_to_x(const float &rx, const float &fr_mm_s=0.0);
void do_blocking_move_to_z(const float &rz, const float &fr_mm_s=0.0);
void do_blocking_move_to_xy(const float &rx, const float &ry, const float &fr_mm_s=0.0);
#define HAS_AXIS_UNHOMED_ERR ( \
ENABLED(Z_PROBE_ALLEN_KEY) \

7
Marlin/Marlin_main.cpp
View File

@ -1557,10 +1557,11 @@ inline void buffer_line_to_destination(const float &fr_mm_s) {
#endif // IS_KINEMATIC
/**
* Plan a move to (X, Y, Z) and set the current_position
* The final current_position may not be the one that was requested
* Plan a move to (X, Y, Z) and set the current_position.
* The final current_position may not be the one that was requested
* Caution: 'destination' is modified by this function.
*/
void do_blocking_move_to(const float &rx, const float &ry, const float &rz, const float &fr_mm_s/*=0.0*/) {
void do_blocking_move_to(const float rx, const float ry, const float rz, const float &fr_mm_s/*=0.0*/) {
const float old_feedrate_mm_s = feedrate_mm_s;
#if ENABLED(DEBUG_LEVELING_FEATURE)