From cb02b6ec608c357d790531d485e27eeff8d89dd5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 26 Apr 2018 01:34:06 -0500
Subject: [PATCH] =?UTF-8?q?Disable=20PIDTEMPBED=20with=20no=20bed=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…and move FILAMENT_CHANGE_SLOW_LOAD_LENGTH default to post-conditionals.
---
 Marlin/Conditionals_post.h | 18 ++++++++++++------
 Marlin/Marlin_main.cpp     |  4 ----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h
index 2bef5300b..fa87a0d00 100644
--- a/Marlin/Conditionals_post.h
+++ b/Marlin/Conditionals_post.h
@@ -358,12 +358,6 @@
     #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))
-
   /**
    * Default hotend offsets, if not defined
    */
@@ -705,9 +699,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)
@@ -961,6 +963,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
    */
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index d7185ea32..2058372a0 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -10458,10 +10458,6 @@ inline void gcode_M502() {
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
 
-  #ifndef FILAMENT_CHANGE_SLOW_LOAD_LENGTH
-    #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH 0
-  #endif
-
   /**
    * M600: Pause for filament change
    *