From 76c270fdf20629cba7b4238cb64b9748461c9c7a Mon Sep 17 00:00:00 2001 From: Roxy-3D Date: Sun, 19 Mar 2017 15:43:12 -0600 Subject: [PATCH] Allow FWRETRACT with UBL Enabled The retraction flag in UBL's G26 was conflicting with the FWRETRACT option. All fixed! --- Marlin/G26_Mesh_Validation_Tool.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Marlin/G26_Mesh_Validation_Tool.cpp b/Marlin/G26_Mesh_Validation_Tool.cpp index 5cda27f0556..fe92a74c799 100644 --- a/Marlin/G26_Mesh_Validation_Tool.cpp +++ b/Marlin/G26_Mesh_Validation_Tool.cpp @@ -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 @@ -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."); } }