3DPrinting/Marlin-Tevo-Tarantula
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for Fwretract bugfix1.1.x (#9872)

Browse source
This commit is contained in:
Studiodyne 2018-03-01 09:59:42 +01:00 committed by Scott Lahteine
parent 951b65c2de
commit d25f0a5a21
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/Configuration_adv.h
View file

@ -856,7 +856,8 @@
* With auto-retract enabled, all G1 E moves within the set range * With auto-retract enabled, all G1 E moves within the set range
* will be converted to firmware-based retract/recover moves. * will be converted to firmware-based retract/recover moves.
* *
* Be sure to turn off auto-retract during filament change. * Note: Be sure to turn off auto-retract during filament change.
* Note: Current status (Retract / Swap / Zlift) isn't reset by G28.
* *
* Note that M207 / M208 / M209 settings are saved to EEPROM. * Note that M207 / M208 / M209 settings are saved to EEPROM.
* *

7
Marlin/Marlin_main.cpp
View file

@ -3122,12 +3122,6 @@ static void homeaxis(const AxisEnum axis) {
if (axis == Z_AXIS && STOW_PROBE()) return; if (axis == Z_AXIS && STOW_PROBE()) return;
#endif #endif
// Clear retracted status if homing the Z axis
#if ENABLED(FWRETRACT)
if (axis == Z_AXIS)
for (uint8_t i = 0; i < EXTRUDERS; i++) fwretract.retracted[i] = false;
#endif
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("<<< homeaxis(", axis_codes[axis]); SERIAL_ECHOPAIR("<<< homeaxis(", axis_codes[axis]);
@ -3475,7 +3469,6 @@ inline void gcode_G4() {
inline void gcode_G10() { inline void gcode_G10() {
#if EXTRUDERS > 1 #if EXTRUDERS > 1
const bool rs = parser.boolval('S'); const bool rs = parser.boolval('S');
fwretract.retracted_swap[active_extruder] = rs; // Use 'S' for swap, default to false
#endif #endif
fwretract.retract(true fwretract.retract(true
#if EXTRUDERS > 1 #if EXTRUDERS > 1