0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'Marlin_v1' of https://github.com/whosawhatsis/Marlin into Marlin_v1

Browse source
This commit is contained in:
whosawhatsis 2014-02-11 19:06:03 -08:00
parent 78e7654601 3f6d44d40b
commit b5ba5c1465
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/Marlin_main.cpp
View file

@ -1113,11 +1113,13 @@ void process_commands()
destination[X_AXIS]=current_position[X_AXIS]; destination[X_AXIS]=current_position[X_AXIS];
destination[Y_AXIS]=current_position[Y_AXIS]; destination[Y_AXIS]=current_position[Y_AXIS];
destination[Z_AXIS]=current_position[Z_AXIS]; destination[Z_AXIS]=current_position[Z_AXIS];
current_position[Z_AXIS]+=-retract_zlift; current_position[Z_AXIS]-=retract_zlift;
destination[E_AXIS]=current_position[E_AXIS]-retract_length; destination[E_AXIS]=current_position[E_AXIS]-retract_length/volumetric_multiplier[active_extruder];
float oldFeedrate = feedrate;
feedrate=retract_feedrate; feedrate=retract_feedrate;
retracted=true; retracted=true;
prepare_move(); prepare_move();
feedrate = oldFeedrate;
} }
break; break;