|
@@ -381,15 +381,15 @@ volatile bool Temperature::raw_temps_ready = false;
|
381
|
381
|
#define ONHEATINGSTART() printerEventLEDs.onHotendHeatingStart()
|
382
|
382
|
#define ONHEATING(S,C,T) printerEventLEDs.onHotendHeating(S,C,T)
|
383
|
383
|
#endif
|
|
384
|
+ #define WATCH_PID BOTH(WATCH_BED, PIDTEMPBED) || BOTH(WATCH_HOTENDS, PIDTEMP)
|
384
|
385
|
|
385
|
|
- #if WATCH_BED || WATCH_HOTENDS
|
386
|
|
- #define HAS_TP_BED BOTH(THERMAL_PROTECTION_BED, PIDTEMPBED)
|
387
|
|
- #if HAS_TP_BED && BOTH(THERMAL_PROTECTION_HOTENDS, PIDTEMP)
|
|
386
|
+ #if WATCH_PID
|
|
387
|
+ #if ALL(THERMAL_PROTECTION_HOTENDS, PIDTEMP, THERMAL_PROTECTION_BED, PIDTEMPBED)
|
388
|
388
|
#define GTV(B,H) (isbed ? (B) : (H))
|
389
|
|
- #elif HAS_TP_BED
|
390
|
|
- #define GTV(B,H) (B)
|
391
|
|
- #else
|
|
389
|
+ #elif BOTH(THERMAL_PROTECTION_HOTENDS, PIDTEMP)
|
392
|
390
|
#define GTV(B,H) (H)
|
|
391
|
+ #else
|
|
392
|
+ #define GTV(B,H) (B)
|
393
|
393
|
#endif
|
394
|
394
|
const uint16_t watch_temp_period = GTV(WATCH_BED_TEMP_PERIOD, WATCH_TEMP_PERIOD);
|
395
|
395
|
const uint8_t watch_temp_increase = GTV(WATCH_BED_TEMP_INCREASE, WATCH_TEMP_INCREASE);
|
|
@@ -528,7 +528,7 @@ volatile bool Temperature::raw_temps_ready = false;
|
528
|
528
|
next_temp_ms = ms + 2000UL;
|
529
|
529
|
|
530
|
530
|
// Make sure heating is actually working
|
531
|
|
- #if WATCH_BED || WATCH_HOTENDS
|
|
531
|
+ #if WATCH_PID
|
532
|
532
|
if (BOTH(WATCH_BED, WATCH_HOTENDS) || isbed == DISABLED(WATCH_HOTENDS)) {
|
533
|
533
|
if (!heated) { // If not yet reached target...
|
534
|
534
|
if (current_temp > next_watch_temp) { // Over the watch temp?
|