diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 5984425ce..5ece72fa6 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -2481,7 +2481,7 @@ #define FILAMENT_UNLOAD_PURGE_FEEDRATE 20 // (mm/s) feedrate to purge before unload #define FILAMENT_UNLOAD_FAST_LENGTH 15 // (mm) An unretract is done, then this length is purged. #define FILAMENT_UNLOAD_FAST_FEEDRATE 25 // (mm/s) feedrate to purge before unload - #define FILAMENT_UNLOAD_DELAY 2000 // (ms) Delay for the filament to cool after retract. + #define LULZBOT_FILAMENT_UNLOAD_DELAY 2000 // (ms) Delay for the filament to cool after retract. #define PAUSE_PARK_NOZZLE_TIMEOUT 180 // (seconds) Time limit before the nozzle is turned off for safety. #define FILAMENT_CHANGE_ALERT_BEEPS 2 // Number of alert beeps to play when a response is needed. diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp index 3f35e9422..27826c71a 100644 --- a/Marlin/src/feature/pause.cpp +++ b/Marlin/src/feature/pause.cpp @@ -344,7 +344,7 @@ bool unload_filament(const_float_t unload_length, const bool show_lcd/*=false*/, unscaled_e_move(unload_length * mix_multiplier, (FILAMENT_CHANGE_UNLOAD_FEEDRATE) * mix_multiplier); - safe_delay(FILAMENT_UNLOAD_DELAY); // pausing to allow filament to stiffen up + safe_delay(LULZBOT_FILAMENT_UNLOAD_DELAY); // pausing to allow filament to stiffen up unscaled_e_move((-FILAMENT_UNLOAD_FAST_LENGTH) * mix_multiplier, // Doing a fast unload to keep filament from deforming by hobbed gear (FILAMENT_UNLOAD_FAST_FEEDRATE) * mix_multiplier); diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index e9ba8f2fd..47914c246 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -488,6 +488,8 @@ #error "PS_DEFAULT_OFF is now PSU_DEFAULT_OFF." #elif defined(FILAMENT_UNLOAD_RETRACT_LENGTH) #error "FILAMENT_UNLOAD_RETRACT_LENGTH is now FILAMENT_UNLOAD_PURGE_RETRACT." +#elif defined(FILAMENT_UNLOAD_DELAY) + #error "FILAMENT_UNLOAD_DELAY is now FILAMENT_UNLOAD_PURGE_DELAY." #elif defined(HOME_USING_SPREADCYCLE) #error "HOME_USING_SPREADCYCLE is now obsolete. Please remove it." #elif defined(DGUS_LCD)