|
@@ -403,12 +403,6 @@
|
403
|
403
|
#endif
|
404
|
404
|
|
405
|
405
|
/**
|
406
|
|
- * Flags for PID handling
|
407
|
|
- */
|
408
|
|
-#define HAS_PID_HEATING (ENABLED(PIDTEMP) || ENABLED(PIDTEMPBED))
|
409
|
|
-#define HAS_PID_FOR_BOTH (ENABLED(PIDTEMP) && ENABLED(PIDTEMPBED))
|
410
|
|
-
|
411
|
|
-/**
|
412
|
406
|
* Default hotend offsets, if not defined
|
413
|
407
|
*/
|
414
|
408
|
#if HOTENDS > 1
|
|
@@ -773,9 +767,17 @@
|
773
|
767
|
#define HAS_HEATER_4 (PIN_EXISTS(HEATER_4))
|
774
|
768
|
#define HAS_HEATER_BED (PIN_EXISTS(HEATER_BED))
|
775
|
769
|
|
|
770
|
+// Shorthand for common combinations
|
776
|
771
|
#define HAS_HEATED_BED (HAS_TEMP_BED && HAS_HEATER_BED)
|
777
|
772
|
#define HAS_TEMP_SENSOR (HAS_TEMP_HOTEND || HAS_HEATED_BED || HAS_TEMP_CHAMBER)
|
778
|
773
|
|
|
774
|
+// PID heating
|
|
775
|
+#if !HAS_HEATED_BED
|
|
776
|
+ #undef PIDTEMPBED
|
|
777
|
+#endif
|
|
778
|
+#define HAS_PID_HEATING (ENABLED(PIDTEMP) || ENABLED(PIDTEMPBED))
|
|
779
|
+#define HAS_PID_FOR_BOTH (ENABLED(PIDTEMP) && ENABLED(PIDTEMPBED))
|
|
780
|
+
|
779
|
781
|
// Thermal protection
|
780
|
782
|
#define HAS_THERMALLY_PROTECTED_BED (HAS_HEATED_BED && ENABLED(THERMAL_PROTECTION_BED))
|
781
|
783
|
#define WATCH_HOTENDS (ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0)
|