|
@@ -474,7 +474,10 @@ class Temperature {
|
474
|
474
|
#define FANS_LOOP(I) LOOP_L_N(I, FAN_COUNT)
|
475
|
475
|
|
476
|
476
|
static void set_fan_speed(const uint8_t target, const uint16_t speed);
|
477
|
|
- static void report_fan_speed(const uint8_t target);
|
|
477
|
+
|
|
478
|
+ #if ENABLED(REPORT_FAN_CHANGE)
|
|
479
|
+ static void report_fan_speed(const uint8_t target);
|
|
480
|
+ #endif
|
478
|
481
|
|
479
|
482
|
#if EITHER(PROBING_FANS_OFF, ADVANCED_PAUSE_FANS_PAUSE)
|
480
|
483
|
static bool fans_paused;
|
|
@@ -487,13 +490,7 @@ class Temperature {
|
487
|
490
|
|
488
|
491
|
static inline uint8_t scaledFanSpeed(const uint8_t target, const uint8_t fs) {
|
489
|
492
|
UNUSED(target); // Potentially unused!
|
490
|
|
- return (fs * uint16_t(
|
491
|
|
- #if ENABLED(ADAPTIVE_FAN_SLOWING)
|
492
|
|
- fan_speed_scaler[target]
|
493
|
|
- #else
|
494
|
|
- 128
|
495
|
|
- #endif
|
496
|
|
- )) >> 7;
|
|
493
|
+ return (fs * uint16_t(TERN(ADAPTIVE_FAN_SLOWING, fan_speed_scaler[target], 128))) >> 7;
|
497
|
494
|
}
|
498
|
495
|
|
499
|
496
|
static inline uint8_t scaledFanSpeed(const uint8_t target) {
|
|
@@ -629,7 +626,7 @@ class Temperature {
|
629
|
626
|
static void setTargetBed(const int16_t celsius) {
|
630
|
627
|
TERN_(AUTO_POWER_CONTROL, powerManager.power_on());
|
631
|
628
|
temp_bed.target =
|
632
|
|
- #ifdef BED_MAXTEMP
|
|
629
|
+ #ifdef BED_MAX_TARGET
|
633
|
630
|
_MIN(celsius, BED_MAX_TARGET)
|
634
|
631
|
#else
|
635
|
632
|
celsius
|
|
@@ -790,11 +787,7 @@ class Temperature {
|
790
|
787
|
|
791
|
788
|
#define HAS_MAX6675 EITHER(HEATER_0_USES_MAX6675, HEATER_1_USES_MAX6675)
|
792
|
789
|
#if HAS_MAX6675
|
793
|
|
- #if BOTH(HEATER_0_USES_MAX6675, HEATER_1_USES_MAX6675)
|
794
|
|
- #define COUNT_6675 2
|
795
|
|
- #else
|
796
|
|
- #define COUNT_6675 1
|
797
|
|
- #endif
|
|
790
|
+ #define COUNT_6675 1 + BOTH(HEATER_0_USES_MAX6675, HEATER_1_USES_MAX6675)
|
798
|
791
|
#if COUNT_6675 > 1
|
799
|
792
|
#define READ_MAX6675(N) read_max6675(N)
|
800
|
793
|
#else
|