✨ Add TEMP_SENSOR_BOARD (MarlinFirmware#22279, MarlinFirmware#22342, M…

…arlinFirmware#22343, MarlinFirmware#22344, MarlinFirmware#22350)
AlexColello · Jan 14, 2022 · dbfb81d · dbfb81d
1 parent fd58b82
commit dbfb81d
Show file tree

Hide file tree

Showing 17 changed files with 799 additions and 507 deletions.
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
@@ -1218,10 +1218,10 @@ void setup() {
  SETUP_RUN(HAL_init());
 
  // Init and disable SPI thermocouples; this is still needed
- #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 0)
+ #if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E0))
  OUT_WRITE(TEMP_0_CS_PIN, HIGH); // Disable
  #endif
- #if TEMP_SENSOR_1_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1)
+ #if TEMP_SENSOR_1_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1))
  OUT_WRITE(TEMP_1_CS_PIN, HIGH);
  #endif
 

diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
@@ -231,6 +231,9 @@
 #define STR_HEATER_BED "bed"
 #define STR_HEATER_CHAMBER "chamber"
 #define STR_COOLER "cooler"
+#define STR_MOTHERBOARD "motherboard"
+#define STR_PROBE "probe"
+#define STR_REDUNDANT "redundant "
 #define STR_LASER_TEMP "laser temperature"
 
 #define STR_STOPPED_HEATER ", system stopped! Heater_ID: "

diff --git a/Marlin/src/feature/controllerfan.cpp b/Marlin/src/feature/controllerfan.cpp
@@ -76,9 +76,14 @@ void ControllerFan::update() {
  )
  );
 
- // If any of the drivers or the heated bed are enabled...
- if (motor_on || TERN0(HAS_HEATED_BED, thermalManager.temp_bed.soft_pwm_amount > 0))
- lastMotorOn = ms; //... set time to NOW so the fan will turn on
+ // If any triggers for the controller fan are true...
+ // - At least one stepper driver is enabled
+ // - The heated bed is enabled
+ // - TEMP_SENSOR_BOARD is reporting >= CONTROLLER_FAN_MIN_BOARD_TEMP
+ if ( motor_on
+ || TERN0(HAS_HEATED_BED, thermalManager.temp_bed.soft_pwm_amount > 0)
+ || TERN0(HAS_CONTROLLER_FAN_MIN_BOARD_TEMP, thermalManager.wholeDegBoard() >= CONTROLLER_FAN_MIN_BOARD_TEMP)
+ ) lastMotorOn = ms; //... set time to NOW so the fan will turn on
 
  // Fan Settings. Set fan > 0:
  // - If AutoMode is on and steppers have been enabled for CONTROLLERFAN_IDLE_TIME seconds.