One fewer option

MarlinFirmware · Dec 19, 2020 · e820d0f · e820d0f
1 parent 63c540a
commit e820d0f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -1673,12 +1673,9 @@
   // For a purge/clean station mounted on the X axis
   //#define NOZZLE_CLEAN_NO_Y
 
-  //#define NOZZLE_CLEAN_MIN_TEMP
-  #if ENABLED(NOZZLE_CLEAN_MIN_TEMP)
-    #define NOZZLE_CLEAN_TEMP  170
-    // Heat nozzle if temperature is too low. Default behavior is to skip cleaning.
-    //#define NOZZLE_CLEAN_HEAT_LOWTEMP
-  #endif
+  // Require a minimum hotend temperature for cleaning
+  #define NOZZLE_CLEAN_MIN_TEMP 170
+  //#define NOZZLE_CLEAN_HEATUP       // Heat up the nozzle instead of skipping wipe
 
   // Explicit wipe G-code script applies to a G12 with no arguments.
   //#define WIPE_SEQUENCE_COMMANDS "G1 X-17 Y25 Z10 F4000\nG1 Z1\nM114\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 Z15\nM400\nG0 X-10.0 Y-9.0"

diff --git a/Marlin/src/libs/nozzle.cpp b/Marlin/src/libs/nozzle.cpp
@@ -31,7 +31,7 @@ Nozzle nozzle;
 #include "../MarlinCore.h"
 #include "../module/motion.h"
 
-#if ENABLED(NOZZLE_CLEAN_MIN_TEMP)
+#if NOZZLE_CLEAN_MIN_TEMP > 20
   #include "../module/temperature.h"
 #endif
 
@@ -157,14 +157,14 @@ Nozzle nozzle;
 
     const uint8_t arrPos = ANY(SINGLENOZZLE, MIXING_EXTRUDER) ? 0 : active_extruder;
 
-    #if ENABLED(NOZZLE_CLEAN_MIN_TEMP) && NOZZLE_CLEAN_TEMP > 0
-      if(thermalManager.degTargetHotend(arrPos) < NOZZLE_CLEAN_TEMP) {
-        #if ENABLED(NOZZLE_CLEAN_HEAT_LOWTEMP)
+    #if NOZZLE_CLEAN_MIN_TEMP > 20
+      if (thermalManager.degTargetHotend(arrPos) < NOZZLE_CLEAN_MIN_TEMP) {
+        #if ENABLED(NOZZLE_CLEAN_HEATUP)
           SERIAL_ECHOLNPGM("Nozzle too Cold - Heating");
-          thermalManager.setTargetHotend(NOZZLE_CLEAN_TEMP, arrPos);
+          thermalManager.setTargetHotend(NOZZLE_CLEAN_MIN_TEMP, arrPos);
           thermalManager.wait_for_hotend(arrPos);
         #else
-          SERIAL_ECHOLNPGM("Nozzle too cold - Skipping Wipe");
+          SERIAL_ECHOLNPGM("Nozzle too cold - Skipping wipe");
           return;
         #endif
       }

diff --git a/buildroot/tests/LPC1768-tests b/buildroot/tests/LPC1768-tests
@@ -42,12 +42,12 @@ opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT ADAPTIVE_FAN_
            NOZZLE_AS_PROBE AUTO_BED_LEVELING_BILINEAR PREHEAT_BEFORE_LEVELING 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 NOZZLE_CLEAN_MIN_TEMP \
+           Z_SAFE_HOMING ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE \
            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 NOZZLE_CLEAN_TEMP  170
+opt_set NOZZLE_CLEAN_MIN_TEMP 170
 exec_test $1 $2 "Re-ARM with NOZZLE_AS_PROBE and many features." "$3"
 
 # clean up