Skip to content

Fix for Fwretract bugfix1.1.x #9872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 4 commits into from Mar 1, 2018
Merged

Fix for Fwretract bugfix1.1.x #9872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7b7759
Update Marlin_main.cpp
studiodyne Mar 1, 2018
98d02f1
Update Marlin_main.cpp
studiodyne Mar 1, 2018
def4fb2
Update Configuration_adv.h
studiodyne Mar 1, 2018
10247c9
Update Configuration_adv.h
thinkyhead Mar 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Marlin/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,8 @@
* With auto-retract enabled, all G1 E moves within the set range
* 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.
*
Expand Down
9 changes: 1 addition & 8 deletions Marlin/Marlin_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3096,12 +3096,6 @@ static void homeaxis(const AxisEnum axis) {
if (axis == Z_AXIS && STOW_PROBE()) return;
#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 (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("<<< homeaxis(", axis_codes[axis]);
Expand Down Expand Up @@ -3448,8 +3442,7 @@ inline void gcode_G4() {
*/
inline void gcode_G10() {
#if EXTRUDERS > 1
const bool rs = parser.boolval('S');
fwretract.retracted_swap[active_extruder] = rs; // Use 'S' for swap, default to false
const bool rs = parser.boolval('S');
#endif
fwretract.retract(true
#if EXTRUDERS > 1
Expand Down