3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-27 05:48:43 +00:00
Code Issues Releases Wiki Activity

Remove hidden dependency from plan_arc() and plan_cubic_move() (#10690)

Browse Source
This commit is contained in:
ManuelMcLure 2018-05-10 22:34:33 -07:00 committed by Scott Lahteine
parent 0b8af93d1e
commit bbd584bc14
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Marlin/Marlin_main.cpp
View File

@ -751,7 +751,7 @@ void set_current_from_steppers_for_axis(const AxisEnum axis);
#endif
#if ENABLED(BEZIER_CURVE_SUPPORT)
void plan_cubic_move(const float (&offset)[4]);
void plan_cubic_move(const float (&cart)[XYZE], const float (&offset)[4]);
#endif
void tool_change(const uint8_t tmp_extruder, const float fr_mm_s=0.0, bool no_move=false);
@ -3520,7 +3520,7 @@ inline void gcode_G4() {
parser.linearval('Q')
};
plan_cubic_move(offset);
plan_cubic_move(destination, offset);
}
}
@ -13693,23 +13693,16 @@ void prepare_move_to_destination() {
planner.buffer_line_kinematic(cart, fr_mm_s, active_extruder);
#endif
// As far as the parser is concerned, the position is now == target. In reality the
// motion control system might still be processing the action and the real tool position
// in any intermediate location.
set_current_from_destination();
COPY(current_position, cart);
} // plan_arc
#endif // ARC_SUPPORT
#if ENABLED(BEZIER_CURVE_SUPPORT)
void plan_cubic_move(const float (&offset)[4]) {
cubic_b_spline(current_position, destination, offset, MMS_SCALED(feedrate_mm_s), active_extruder);
// As far as the parser is concerned, the position is now == destination. In reality the
// motion control system might still be processing the action and the real tool position
// in any intermediate location.
set_current_from_destination();
void plan_cubic_move(const float (&cart)[XYZE], const float (&offset)[4]) {
cubic_b_spline(current_position, cart, offset, MMS_SCALED(feedrate_mm_s), active_extruder);
COPY(current_position, cart);
}
#endif // BEZIER_CURVE_SUPPORT