|
@@ -2240,8 +2240,11 @@
|
|
|
#if HOTENDS > 7 && HAS_ADC_TEST(7)
|
|
|
#define HAS_TEMP_ADC_7 1
|
|
|
#endif
|
|
|
-#if HAS_ADC_TEST(BED)
|
|
|
- #define HAS_TEMP_ADC_BED 1
|
|
|
+#if TEMP_SENSOR_BED
|
|
|
+ #define HAS_HEATED_BED 1
|
|
|
+ #if HAS_ADC_TEST(BED)
|
|
|
+ #define HAS_TEMP_ADC_BED 1
|
|
|
+ #endif
|
|
|
#endif
|
|
|
#if HAS_ADC_TEST(PROBE)
|
|
|
#define HAS_TEMP_ADC_PROBE 1
|
|
@@ -2262,7 +2265,7 @@
|
|
|
#define HAS_TEMP_ADC_REDUNDANT 1
|
|
|
#endif
|
|
|
|
|
|
-#define HAS_TEMP(N) (TEMP_SENSOR_IS_MAX_TC(N) || EITHER(HAS_TEMP_ADC_##N, TEMP_SENSOR_##N##_IS_DUMMY))
|
|
|
+#define HAS_TEMP(N) (TEMP_SENSOR_IS_MAX_TC(N) || HAS_TEMP_ADC_##N || TEMP_SENSOR_##N##_IS_DUMMY)
|
|
|
#if HAS_HOTEND && HAS_TEMP(0)
|
|
|
#define HAS_TEMP_HOTEND 1
|
|
|
#endif
|
|
@@ -2331,10 +2334,12 @@
|
|
|
#if PIN_EXISTS(HEATER_BED)
|
|
|
#define HAS_HEATER_BED 1
|
|
|
#endif
|
|
|
+#if PIN_EXISTS(HEATER_CHAMBER)
|
|
|
+ #define HAS_HEATER_CHAMBER 1
|
|
|
+#endif
|
|
|
|
|
|
// Shorthand for common combinations
|
|
|
-#if HAS_TEMP_BED && HAS_HEATER_BED
|
|
|
- #define HAS_HEATED_BED 1
|
|
|
+#if HAS_HEATED_BED
|
|
|
#ifndef BED_OVERSHOOT
|
|
|
#define BED_OVERSHOOT 10
|
|
|
#endif
|
|
@@ -2361,7 +2366,7 @@
|
|
|
#define HAS_TEMP_SENSOR 1
|
|
|
#endif
|
|
|
|
|
|
-#if HAS_TEMP_CHAMBER && PIN_EXISTS(HEATER_CHAMBER)
|
|
|
+#if HAS_TEMP_CHAMBER && HAS_HEATER_CHAMBER
|
|
|
#define HAS_HEATED_CHAMBER 1
|
|
|
#ifndef CHAMBER_OVERSHOOT
|
|
|
#define CHAMBER_OVERSHOOT 10
|
|
@@ -2388,6 +2393,7 @@
|
|
|
// Thermal protection
|
|
|
#if !HAS_HEATED_BED
|
|
|
#undef THERMAL_PROTECTION_BED
|
|
|
+ #undef THERMAL_PROTECTION_BED_PERIOD
|
|
|
#endif
|
|
|
#if ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0
|
|
|
#define WATCH_HOTENDS 1
|