Merge pull request MarlinFirmware#5 from InsanityAutomation/bugfix-1.1.x

Catch up 20180509
trouch · May 9, 2018 · 0d2b313 · 0d2b313
2 parents b120adf + 1cb2de3
commit 0d2b313
Show file tree

Hide file tree

Showing 161 changed files with 26,887 additions and 10,511 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -118,7 +118,7 @@ script:
   # Add a Sled Z Probe, use UBL Cartesian moves, use Japanese language
   #
   - opt_set LANGUAGE kana_utf8
-  - opt_enable Z_PROBE_SLED SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE
+  - opt_enable Z_PROBE_SLED SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE BEZIER_JERK_CONTROL
   - opt_disable SEGMENT_LEVELED_MOVES
   - opt_enable_adv BABYSTEP_ZPROBE_OFFSET DOUBLECLICK_FOR_Z_BABYSTEPPING
   - build_marlin
@@ -143,7 +143,7 @@ script:
   #      PROBE_MANUALLY feature, with LCD support,
   #      ULTIMAKERCONTROLLER, FILAMENT_LCD_DISPLAY, FILAMENT_WIDTH_SENSOR,
   #      PRINTCOUNTER, NOZZLE_PARK_FEATURE, NOZZLE_CLEAN_FEATURE, PCA9632,
-  #      Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS, BEZIER_CURVE_SUPPORT, EXPERIMENTAL_I2CBUS,
+  #      Z_DUAL_ENDSTOPS, BEZIER_CURVE_SUPPORT, EXPERIMENTAL_I2CBUS,
   #      ADVANCED_PAUSE_FEATURE, ADVANCED_PAUSE_CONTINUOUS_PURGE, PARK_HEAD_ON_PAUSE, LCD_INFO_MENU, M114_DETAIL
   #      EEPROM_SETTINGS, EEPROM_CHITCHAT, M100_FREE_MEMORY_WATCHER,
   #      INCH_MODE_SUPPORT, TEMPERATURE_UNITS_SUPPORT
@@ -153,7 +153,7 @@ script:
   - opt_enable PROBE_MANUALLY AUTO_BED_LEVELING_BILINEAR G26_MESH_EDITING LCD_BED_LEVELING ULTIMAKERCONTROLLER
   - opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT M100_FREE_MEMORY_WATCHER M100_FREE_MEMORY_DUMPER M100_FREE_MEMORY_CORRUPTOR INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT
   - opt_enable ULTIMAKERCONTROLLER SDSUPPORT
-  - opt_enable PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE PCA9632 USE_XMAX_PLUG
+  - opt_enable PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE PCA9632
   - opt_enable_adv BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS
   - opt_enable_adv ADVANCED_PAUSE_FEATURE ADVANCED_PAUSE_CONTINUOUS_PURGE FILAMENT_LOAD_UNLOAD_GCODES PARK_HEAD_ON_PAUSE LCD_INFO_MENU M114_DETAIL
   - opt_set_adv PWM_MOTOR_CURRENT {1300,1300,1250}

diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h
@@ -367,14 +367,19 @@
     #endif
   #endif
 
+  #if ENABLED(NO_LCD_MENUS)
+    #undef ULTIPANEL
+    #undef NEWPANEL
+  #endif
+
   // Boot screens
   #if DISABLED(ULTRA_LCD)
     #undef SHOW_BOOTSCREEN
   #elif !defined(BOOTSCREEN_TIMEOUT)
     #define BOOTSCREEN_TIMEOUT 2500
   #endif
 
-  #define HAS_DEBUG_MENU ENABLED(LCD_PROGRESS_BAR_TEST)
+  #define HAS_DEBUG_MENU (ENABLED(ULTIPANEL) && ENABLED(LCD_PROGRESS_BAR_TEST))
 
   // MK2 Multiplexer forces SINGLENOZZLE and kills DISABLE_INACTIVE_EXTRUDER
   #if ENABLED(MK2_MULTIPLEXER)
@@ -482,18 +487,22 @@
   #define HAS_Z_SERVO_PROBE (defined(Z_PROBE_SERVO_NR) && Z_PROBE_SERVO_NR >= 0)
 
   /**
-   * Set a flag for any enabled probe
+   * Set flags for enabled probes
    */
-  #define PROBE_SELECTED (ENABLED(PROBE_MANUALLY) || ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_PROBE || ENABLED(Z_PROBE_SLED) || ENABLED(SOLENOID_PROBE))
+  #define HAS_BED_PROBE (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_PROBE || ENABLED(Z_PROBE_SLED) || ENABLED(SOLENOID_PROBE))
+  #define PROBE_SELECTED (HAS_BED_PROBE || ENABLED(PROBE_MANUALLY))
 
-  /**
-   * Clear probe pin settings when no probe is selected
-   */
-  #if !PROBE_SELECTED || ENABLED(PROBE_MANUALLY)
+  #if !HAS_BED_PROBE
+    // Clear probe pin settings when no probe is selected
     #undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
     #undef Z_MIN_PROBE_ENDSTOP
+  #elif ENABLED(Z_PROBE_ALLEN_KEY)
+    // Extra test for Allen Key Probe
+    #define PROBE_IS_TRIGGERED_WHEN_STOWED_TEST
   #endif
 
+  #define HOMING_Z_WITH_PROBE (HAS_BED_PROBE && Z_HOME_DIR < 0 && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN))
+
   #define HAS_SOFTWARE_ENDSTOPS (ENABLED(MIN_SOFTWARE_ENDSTOPS) || ENABLED(MAX_SOFTWARE_ENDSTOPS))
   #define HAS_RESUME_CONTINUE (ENABLED(NEWPANEL) || ENABLED(EMERGENCY_PARSER))
   #define HAS_COLOR_LEDS (ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED) || ENABLED(PCA9632) || ENABLED(NEOPIXEL_LED))

diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h
@@ -159,11 +159,6 @@
     #define DELTA_HEIGHT Z_HOME_POS
   #endif
 
-  /**
-   * Auto Bed Leveling and Z Probe Repeatability Test
-   */
-  #define HOMING_Z_WITH_PROBE (HAS_BED_PROBE && Z_HOME_DIR < 0 && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN))
-
   /**
    * Z Sled Probe requires Z_SAFE_HOMING
    */
@@ -270,7 +265,9 @@
   /**
    * Temp Sensor defines
    */
-  #if TEMP_SENSOR_0 == -3
+  #if TEMP_SENSOR_0 == -4
+    #define HEATER_0_USES_AD8495
+  #elif TEMP_SENSOR_0 == -3
     #define HEATER_0_USES_MAX6675
     #define MAX6675_IS_MAX31855
     #define MAX6675_TMIN -270
@@ -289,8 +286,12 @@
     #define HEATER_0_USES_THERMISTOR
   #endif
 
-  #if TEMP_SENSOR_1 <= -2
-    #error "MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_1"
+  #if TEMP_SENSOR_1 == -4
+    #define HEATER_1_USES_AD8495
+  #elif TEMP_SENSOR_1 == -3
+    #error "MAX31855 Thermocouples not supported for TEMP_SENSOR_1"
+  #elif TEMP_SENSOR_1 == -2
+    #error "MAX6675 Thermocouples not supported for TEMP_SENSOR_1"
   #elif TEMP_SENSOR_1 == -1
     #define HEATER_1_USES_AD595
   #elif TEMP_SENSOR_1 == 0
@@ -301,8 +302,12 @@
     #define HEATER_1_USES_THERMISTOR
   #endif
 
-  #if TEMP_SENSOR_2 <= -2
-    #error "MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_2"
+  #if TEMP_SENSOR_2 == -4
+    #define HEATER_2_USES_AD8495
+  #elif TEMP_SENSOR_2 == -3
+    #error "MAX31855 Thermocouples not supported for TEMP_SENSOR_2"
+  #elif TEMP_SENSOR_2 == -2
+    #error "MAX6675 Thermocouples not supported for TEMP_SENSOR_2"
   #elif TEMP_SENSOR_2 == -1
     #define HEATER_2_USES_AD595
   #elif TEMP_SENSOR_2 == 0
@@ -313,8 +318,12 @@
     #define HEATER_2_USES_THERMISTOR
   #endif
 
-  #if TEMP_SENSOR_3 <= -2
-    #error "MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_3"
+  #if TEMP_SENSOR_3 == -4
+    #define HEATER_3_USES_AD8495
+  #elif TEMP_SENSOR_3 == -3
+    #error "MAX31855 Thermocouples not supported for TEMP_SENSOR_3"
+  #elif TEMP_SENSOR_3 == -2
+    #error "MAX6675 Thermocouples not supported for TEMP_SENSOR_3"
   #elif TEMP_SENSOR_3 == -1
     #define HEATER_3_USES_AD595
   #elif TEMP_SENSOR_3 == 0
@@ -325,8 +334,12 @@
     #define HEATER_3_USES_THERMISTOR
   #endif
 
-  #if TEMP_SENSOR_4 <= -2
-    #error "MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_4"
+  #if TEMP_SENSOR_4 == -4
+    #define HEATER_4_USES_AD8495
+  #elif TEMP_SENSOR_4 == -3
+    #error "MAX31855 Thermocouples not supported for TEMP_SENSOR_4"
+  #elif TEMP_SENSOR_4 == -2
+    #error "MAX6675 Thermocouples not supported for TEMP_SENSOR_4"
   #elif TEMP_SENSOR_4 == -1
     #define HEATER_4_USES_AD595
   #elif TEMP_SENSOR_4 == 0
@@ -337,8 +350,12 @@
     #define HEATER_4_USES_THERMISTOR
   #endif
 
-  #if TEMP_SENSOR_BED <= -2
-    #error "MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_BED"
+  #if TEMP_SENSOR_BED == -4
+    #define BED_USES_AD8495
+  #elif TEMP_SENSOR_BED == -3
+    #error "MAX31855 Thermocouples not supported for TEMP_SENSOR_BED"
+  #elif TEMP_SENSOR_BED == -2
+    #error "MAX6675 Thermocouples not supported for TEMP_SENSOR_BED"
   #elif TEMP_SENSOR_BED == -1
     #define BED_USES_AD595
   #elif TEMP_SENSOR_BED == 0
@@ -349,20 +366,21 @@
     #define BED_USES_THERMISTOR
   #endif
 
-  #if TEMP_SENSOR_CHAMBER <= -2
-    #error "MAX6675 / MAX31855 Thermocouples not supported for TEMP_SENSOR_CHAMBER"
+  #if TEMP_SENSOR_CHAMBER == -4
+    #define CHAMBER_USES_AD8495
+  #elif TEMP_SENSOR_CHAMBER == -3
+    #error "MAX31855 Thermocouples not supported for TEMP_SENSOR_CHAMBER"
+  #elif TEMP_SENSOR_CHAMBER == -2
+    #error "MAX6675 Thermocouples not supported for TEMP_SENSOR_CHAMBER"
   #elif TEMP_SENSOR_CHAMBER == -1
     #define CHAMBER_USES_AD595
   #elif TEMP_SENSOR_CHAMBER > 0
     #define THERMISTORCHAMBER TEMP_SENSOR_CHAMBER
     #define CHAMBER_USES_THERMISTOR
   #endif
 
-  /**
-   * Flags for PID handling
-   */
-  #define HAS_PID_HEATING (ENABLED(PIDTEMP) || ENABLED(PIDTEMPBED))
-  #define HAS_PID_FOR_BOTH (ENABLED(PIDTEMP) && ENABLED(PIDTEMPBED))
+  #define HEATER_USES_AD8495 (ENABLED(HEATER_0_USES_AD8495) || ENABLED(HEATER_1_USES_AD8495) || ENABLED(HEATER_2_USES_AD8495) || ENABLED(HEATER_3_USES_AD8495) || ENABLED(HEATER_4_USES_AD8495))
+  #define HEATER_USES_AD595 (ENABLED(HEATER_0_USES_AD595) || ENABLED(HEATER_1_USES_AD595) || ENABLED(HEATER_2_USES_AD595) || ENABLED(HEATER_3_USES_AD595) || ENABLED(HEATER_4_USES_AD595))
 
   /**
    * Default hotend offsets, if not defined
@@ -662,23 +680,24 @@
   #define E3_IS_TRINAMIC (ENABLED(E3_IS_TMC2130) || ENABLED(E3_IS_TMC2208))
   #define E4_IS_TRINAMIC (ENABLED(E4_IS_TMC2130) || ENABLED(E4_IS_TMC2208))
 
-  // Disable Z axis sensorless homing if a probe is used to home the Z axis
   #if ENABLED(SENSORLESS_HOMING)
-    #define X_SENSORLESS (ENABLED(X_IS_TMC2130) && defined(X_HOMING_SENSITIVITY))
-    #define Y_SENSORLESS (ENABLED(Y_IS_TMC2130) && defined(Y_HOMING_SENSITIVITY))
-    #define Z_SENSORLESS (ENABLED(Z_IS_TMC2130) && defined(Z_HOMING_SENSITIVITY))
+    // Disable Z axis sensorless homing if a probe is used to home the Z axis
     #if HOMING_Z_WITH_PROBE
       #undef Z_HOMING_SENSITIVITY
     #endif
+    #define X_SENSORLESS (ENABLED(X_IS_TMC2130) && defined(X_HOMING_SENSITIVITY))
+    #define Y_SENSORLESS (ENABLED(Y_IS_TMC2130) && defined(Y_HOMING_SENSITIVITY))
+    #define Z_SENSORLESS (ENABLED(Z_IS_TMC2130) && defined(Z_HOMING_SENSITIVITY))
   #endif
 
   // Endstops and bed probe
-  #define HAS_X_MIN (PIN_EXISTS(X_MIN) && !IS_X2_ENDSTOP(X,MIN) && !IS_Y2_ENDSTOP(X,MIN) && !IS_Z2_OR_PROBE(X,MIN))
-  #define HAS_X_MAX (PIN_EXISTS(X_MAX) && !IS_X2_ENDSTOP(X,MAX) && !IS_Y2_ENDSTOP(X,MAX) && !IS_Z2_OR_PROBE(X,MAX))
-  #define HAS_Y_MIN (PIN_EXISTS(Y_MIN) && !IS_X2_ENDSTOP(Y,MIN) && !IS_Y2_ENDSTOP(Y,MIN) && !IS_Z2_OR_PROBE(Y,MIN))
-  #define HAS_Y_MAX (PIN_EXISTS(Y_MAX) && !IS_X2_ENDSTOP(Y,MAX) && !IS_Y2_ENDSTOP(Y,MAX) && !IS_Z2_OR_PROBE(Y,MAX))
-  #define HAS_Z_MIN (PIN_EXISTS(Z_MIN) && !IS_X2_ENDSTOP(Z,MIN) && !IS_Y2_ENDSTOP(Z,MIN) && !IS_Z2_OR_PROBE(Z,MIN))
-  #define HAS_Z_MAX (PIN_EXISTS(Z_MAX) && !IS_X2_ENDSTOP(Z,MAX) && !IS_Y2_ENDSTOP(Z,MAX) && !IS_Z2_OR_PROBE(Z,MAX))
+  #define HAS_STOP_TEST(A,M) (PIN_EXISTS(A##_##M) && !IS_X2_ENDSTOP(A,M) && !IS_Y2_ENDSTOP(A,M) && !IS_Z2_OR_PROBE(A,M))
+  #define HAS_X_MIN HAS_STOP_TEST(X,MIN)
+  #define HAS_X_MAX HAS_STOP_TEST(X,MAX)
+  #define HAS_Y_MIN HAS_STOP_TEST(Y,MIN)
+  #define HAS_Y_MAX HAS_STOP_TEST(Y,MAX)
+  #define HAS_Z_MIN HAS_STOP_TEST(Z,MIN)
+  #define HAS_Z_MAX HAS_STOP_TEST(Z,MAX)
   #define HAS_X2_MIN (PIN_EXISTS(X2_MIN))
   #define HAS_X2_MAX (PIN_EXISTS(X2_MAX))
   #define HAS_Y2_MIN (PIN_EXISTS(Y2_MIN))
@@ -687,15 +706,19 @@
   #define HAS_Z2_MAX (PIN_EXISTS(Z2_MAX))
   #define HAS_Z_MIN_PROBE_PIN (PIN_EXISTS(Z_MIN_PROBE))
 
-  // Thermistors
-  #define HAS_TEMP_0 (PIN_EXISTS(TEMP_0) && TEMP_SENSOR_0 != 0 && TEMP_SENSOR_0 > -2)
-  #define HAS_TEMP_1 (PIN_EXISTS(TEMP_1) && TEMP_SENSOR_1 != 0 && TEMP_SENSOR_1 > -2)
-  #define HAS_TEMP_2 (PIN_EXISTS(TEMP_2) && TEMP_SENSOR_2 != 0 && TEMP_SENSOR_2 > -2)
-  #define HAS_TEMP_3 (PIN_EXISTS(TEMP_3) && TEMP_SENSOR_3 != 0 && TEMP_SENSOR_3 > -2)
-  #define HAS_TEMP_4 (PIN_EXISTS(TEMP_4) && TEMP_SENSOR_4 != 0 && TEMP_SENSOR_4 > -2)
-  #define HAS_TEMP_HOTEND (HAS_TEMP_0 || ENABLED(HEATER_0_USES_MAX6675))
-  #define HAS_TEMP_BED (PIN_EXISTS(TEMP_BED) && TEMP_SENSOR_BED != 0 && TEMP_SENSOR_BED > -2)
-  #define HAS_TEMP_CHAMBER (PIN_EXISTS(TEMP_CHAMBER) && TEMP_SENSOR_CHAMBER != 0 && TEMP_SENSOR_CHAMBER > -2)
+  // ADC Temp Sensors (Thermistor or Thermocouple with amplifier ADC interface)
+  #define HAS_ADC_TEST(P) (PIN_EXISTS(TEMP_##P) && TEMP_SENSOR_##P != 0 && TEMP_SENSOR_##P > -2)
+  #define HAS_TEMP_ADC_0 (HAS_ADC_TEST(0) && DISABLED(HEATER_0_USES_MAX6675))
+  #define HAS_TEMP_ADC_1 HAS_ADC_TEST(1)
+  #define HAS_TEMP_ADC_2 HAS_ADC_TEST(2)
+  #define HAS_TEMP_ADC_3 HAS_ADC_TEST(3)
+  #define HAS_TEMP_ADC_4 HAS_ADC_TEST(4)
+  #define HAS_TEMP_ADC_BED HAS_ADC_TEST(BED)
+  #define HAS_TEMP_ADC_CHAMBER HAS_ADC_TEST(CHAMBER)
+
+  #define HAS_TEMP_HOTEND (HAS_TEMP_ADC_0 || ENABLED(HEATER_0_USES_MAX6675))
+  #define HAS_TEMP_BED HAS_TEMP_ADC_BED
+  #define HAS_TEMP_CHAMBER HAS_TEMP_ADC_CHAMBER
 
   // Heaters
   #define HAS_HEATER_0 (PIN_EXISTS(HEATER_0))
@@ -705,9 +728,17 @@
   #define HAS_HEATER_4 (PIN_EXISTS(HEATER_4))
   #define HAS_HEATER_BED (PIN_EXISTS(HEATER_BED))
 
+  // Shorthand for common combinations
   #define HAS_HEATED_BED (HAS_TEMP_BED && HAS_HEATER_BED)
   #define HAS_TEMP_SENSOR (HAS_TEMP_HOTEND || HAS_HEATED_BED || HAS_TEMP_CHAMBER)
 
+  // PID heating
+  #if !HAS_HEATED_BED
+    #undef PIDTEMPBED
+  #endif
+  #define HAS_PID_HEATING (ENABLED(PIDTEMP) || ENABLED(PIDTEMPBED))
+  #define HAS_PID_FOR_BOTH (ENABLED(PIDTEMP) && ENABLED(PIDTEMPBED))
+
   // Thermal protection
   #define HAS_THERMALLY_PROTECTED_BED (HAS_HEATED_BED && ENABLED(THERMAL_PROTECTION_BED))
   #define WATCH_HOTENDS (ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0)
@@ -744,11 +775,15 @@
   #define HAS_CONTROLLER_FAN (PIN_EXISTS(CONTROLLER_FAN))
 
   // Servos
-  #define HAS_SERVOS (defined(NUM_SERVOS) && NUM_SERVOS > 0)
   #define HAS_SERVO_0 (PIN_EXISTS(SERVO0))
   #define HAS_SERVO_1 (PIN_EXISTS(SERVO1))
   #define HAS_SERVO_2 (PIN_EXISTS(SERVO2))
   #define HAS_SERVO_3 (PIN_EXISTS(SERVO3))
+  #define HAS_SERVOS (defined(NUM_SERVOS) && NUM_SERVOS > 0 && (HAS_SERVO_0 || HAS_SERVO_1 || HAS_SERVO_2 || HAS_SERVO_3))
+
+  #if HAS_SERVOS && !defined(Z_PROBE_SERVO_NR)
+    #define Z_PROBE_SERVO_NR -1
+  #endif
 
   // Sensors
   #define HAS_FILAMENT_WIDTH_SENSOR (PIN_EXISTS(FILWIDTH))
@@ -846,22 +881,6 @@
    */
   #define HAS_FANMUX PIN_EXISTS(FANMUX0)
 
-  /**
-   * Servos and probes
-   */
-
-  #if HAS_SERVOS
-    #ifndef Z_PROBE_SERVO_NR
-      #define Z_PROBE_SERVO_NR -1
-    #endif
-  #endif
-
-  #define HAS_BED_PROBE (PROBE_SELECTED && DISABLED(PROBE_MANUALLY))
-
-  #if ENABLED(Z_PROBE_ALLEN_KEY)
-    #define PROBE_IS_TRIGGERED_WHEN_STOWED_TEST
-  #endif
-
   /**
    * Bed Probe dependencies
    */
@@ -947,6 +966,7 @@
   #define HAS_MESH       (ENABLED(AUTO_BED_LEVELING_BILINEAR) || ENABLED(AUTO_BED_LEVELING_UBL) || ENABLED(MESH_BED_LEVELING))
   #define PLANNER_LEVELING      (OLDSCHOOL_ABL || ENABLED(MESH_BED_LEVELING) || UBL_SEGMENTED || ENABLED(SKEW_CORRECTION))
   #define HAS_PROBING_PROCEDURE (HAS_ABL || ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST))
+  #define HAS_UBL_AND_CURVES (ENABLED(AUTO_BED_LEVELING_UBL) && !PLANNER_LEVELING && (ENABLED(ARC_SUPPORT) || ENABLED(BEZIER_CURVE_SUPPORT)))
 
   #if ENABLED(AUTO_BED_LEVELING_UBL)
     #undef LCD_BED_LEVELING
@@ -961,6 +981,10 @@
   #define QUIET_PROBING (HAS_BED_PROBE && (ENABLED(PROBING_HEATERS_OFF) || ENABLED(PROBING_FANS_OFF) || DELAY_BEFORE_PROBING > 0))
   #define HEATER_IDLE_HANDLER (ENABLED(ADVANCED_PAUSE_FEATURE) || ENABLED(PROBING_HEATERS_OFF))
 
+  #if ENABLED(ADVANCED_PAUSE_FEATURE) && !defined(FILAMENT_CHANGE_SLOW_LOAD_LENGTH)
+    #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 0
+  #endif
+
   /**
    * Only constrain Z on DELTA / SCARA machines
    */