Skip to content
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

Jump to bottom

Allow FWRETRACT with UBL Enabled #6071

Merged
merged 1 commit into from
Mar 19, 2017
Merged

Allow FWRETRACT with UBL Enabled #6071

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions Marlin/G26_Mesh_Validation_Tool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,10 @@
Random_Deviation = 0.0,
Layer_Height = LAYER_HEIGHT;

bool retracted = false; // We keep track of the state of the nozzle to know if it
// is currently retracted or not. This allows us to be
// less careful because mis-matched retractions and un-retractions
// won't leave us in a bad state.
bool G26_retracted = false; // We keep track of the state of the nozzle to know if it
// is currently retracted or not. This allows us to be
// less careful because mis-matched retractions and un-retractions
// won't leave us in a bad state.
#if ENABLED(ULTRA_LCD)
void lcd_setstatus(const char* message, bool persist);
#endif
Expand Down Expand Up @@ -673,18 +673,18 @@
}

void retract_filament() {
if (!retracted) { // Only retract if we are not already retracted!
retracted = true;
if (!G26_retracted) { // Only retract if we are not already retracted!
G26_retracted = true;
if (G26_Debug_flag) SERIAL_ECHOLNPGM(" Decided to do retract.");
move_to(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], -1.0 * Retraction_Multiplier);
if (G26_Debug_flag) SERIAL_ECHOLNPGM(" Retraction done.");
}
}

void un_retract_filament() {
if (retracted) { // Only un-retract if we are retracted.
if (G26_retracted) { // Only un-retract if we are retracted.
move_to(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], 1.2 * Retraction_Multiplier);
retracted = false;
G26_retracted = false;
if (G26_Debug_flag) SERIAL_ECHOLNPGM(" unretract done.");
}
}
Expand Down