diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 9c1f255fd1..9e6635ff32 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1653,7 +1653,7 @@ // For a purge/clean station mounted on the X axis //#define NOZZLE_CLEAN_NO_Y - #define NOZZLE_CLEAN_MIN_TEMP + //#define NOZZLE_CLEAN_MIN_TEMP #if ENABLED(NOZZLE_CLEAN_MIN_TEMP) #define NOZZE_CLEAN_TEMP 170 // Default behavior is to skip nozzles that are too cold. The allows you to force them to heat instead diff --git a/Marlin/src/libs/nozzle.cpp b/Marlin/src/libs/nozzle.cpp index 0fb382dc27..dd29caf517 100644 --- a/Marlin/src/libs/nozzle.cpp +++ b/Marlin/src/libs/nozzle.cpp @@ -31,6 +31,10 @@ Nozzle nozzle; #include "../MarlinCore.h" #include "../module/motion.h" +#if ENABLED(NOZZLE_CLEAN_MIN_TEMP) + #include "../module/temperature.h" +#endif + #if ENABLED(NOZZLE_CLEAN_FEATURE) /** @@ -154,7 +158,7 @@ Nozzle nozzle; const uint8_t arrPos = ANY(SINGLENOZZLE, MIXING_EXTRUDER) ? 0 : active_extruder; #if ENABLED(NOZZLE_CLEAN_MIN_TEMP) && NOZZE_CLEAN_TEMP > 0 - if(thermalManager.degTargetHotend(arrPos)) < NOZZE_CLEAN_TEMP) { + if(thermalManager.degTargetHotend(arrPos) < NOZZE_CLEAN_TEMP) { #if ENABLED(NOZLE_CLEAN_HEAT_LOWTEMP) SERIAL_ECHOLNPGM("Nozzle too Cold - Heating"); thermalManager.setTargetHotend(NOZZE_CLEAN_TEMP, arrPos); diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index c3fa8ac934..de8d03ac31 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -352,7 +352,6 @@ bool Probe::set_deployed(const bool deploy) { bool setting_hotend = false; #if defined(PROBE_REQUIRES_MINTEMP_NOZZLE) && PROBE_REQUIRES_MINTEMP_NOZZLE < 0 && HAS_TEMP_HOTEND if (thermalManager.degTargetHotend(0) < PROBE_REQUIRES_MINTEMP_NOZZLE) { - bool setting_hotend = false; uint16_t hotendTemperature = AUTOLEVEL_PREHEAT_NOZZLE_TEMP; SERIAL_ECHOLNPAIR("Preheating hot-end to ", hotendTemperature); thermalManager.setTargetHotend(hotendTemperature, 0); diff --git a/buildroot/tests/LPC1768-tests b/buildroot/tests/LPC1768-tests index b8d0730314..0877e08bdf 100755 --- a/buildroot/tests/LPC1768-tests +++ b/buildroot/tests/LPC1768-tests @@ -42,11 +42,12 @@ opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT ADAPTIVE_FAN_ NOZZLE_AS_PROBE AUTO_BED_LEVELING_BILINEAR G29_RETRY_AND_RECOVER Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \ BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \ PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT \ - Z_SAFE_HOMING ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE \ + Z_SAFE_HOMING ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE NOZZLE_CLEAN_MIN_TEMP \ HOST_KEEPALIVE_FEATURE HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT \ LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES SDCARD_SORT_ALPHA EMERGENCY_PARSER opt_set GRID_MAX_POINTS_X 16 opt_set NOZZLE_TO_PROBE_OFFSET "{ 0, 0, 0 }" +opt_set NOZZE_CLEAN_TEMP 170 exec_test $1 $2 "Re-ARM with NOZZLE_AS_PROBE and many features." "$3" # clean up diff --git a/buildroot/tests/rambo-tests b/buildroot/tests/rambo-tests index 6d2ef4f58a..1c276b79c4 100644 --- a/buildroot/tests/rambo-tests +++ b/buildroot/tests/rambo-tests @@ -22,6 +22,8 @@ opt_add TEMP_CHAMBER_PIN 3 opt_add HEATER_CHAMBER_PIN 45 opt_set GRID_MAX_POINTS_X 16 opt_set FANMUX0_PIN 53 +opt_set PROBE_REQUIRES_MINTEMP_NOZZLE 150 +opt_set PROBE_REQUIRES_MINTEMP_BED 50 opt_disable USE_WATCHDOG opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \ FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING PIDTEMPBED PROBE_TEMP_COMPENSATION \