CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow FWRETRACT with UBL Enabled

Browse Source 
The retraction flag in UBL's G26 was conflicting with the FWRETRACT option.

All fixed!
This commit is contained in:
Roxy-3D 2017-03-19 15:43:12 -06:00 committed by GitHub
parent c377c59d47
commit 76c270fdf2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/G26_Mesh_Validation_Tool.cpp
View File

@ -146,7 +146,7 @@
Random_Deviation = 0.0,
Layer_Height = LAYER_HEIGHT;
bool retracted = false; // We keep track of the state of the nozzle to know if it
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.
@ -673,8 +673,8 @@
}
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.");
@ -682,9 +682,9 @@
}
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.");
}
}