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

Use sync_plan_position_e function elsewhere

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

8
Marlin/Marlin_main.cpp
View File

@ -2321,7 +2321,7 @@ static void homeaxis(AxisEnum axis) {
feedrate = retract_feedrate * 60;
current_position[E_AXIS] += (swapping ? retract_length_swap : retract_length) / volumetric_multiplier[active_extruder];
plan_set_e_position(current_position[E_AXIS]);
sync_plan_position_e();
prepare_move();
if (retract_zlift > 0.01) {
@ -2349,7 +2349,7 @@ static void homeaxis(AxisEnum axis) {
feedrate = retract_recover_feedrate * 60;
float move_e = swapping ? retract_length_swap + retract_recover_length_swap : retract_length + retract_recover_length;
current_position[E_AXIS] -= move_e / volumetric_multiplier[active_extruder];
plan_set_e_position(current_position[E_AXIS]);
sync_plan_position_e();
prepare_move();
}
@ -2440,7 +2440,7 @@ inline void gcode_G0_G1() {
// Is this move an attempt to retract or recover?
if ((echange < -MIN_RETRACT && !retracted[active_extruder]) || (echange > MIN_RETRACT && retracted[active_extruder])) {
current_position[E_AXIS] = destination[E_AXIS]; // hide the slicer-generated retract/recover from calculations
plan_set_e_position(current_position[E_AXIS]); // AND from the planner
sync_plan_position_e(); // AND from the planner
retract(!retracted[active_extruder]);
return;
}
@ -6108,7 +6108,7 @@ inline void gcode_M503() {
#endif
current_position[E_AXIS] = destination[E_AXIS]; //the long retract of L is compensated by manual filament feeding
plan_set_e_position(current_position[E_AXIS]);
sync_plan_position_e();
RUNPLAN; //should do nothing