✨ Add TEMP_SENSOR_BOARD (#22279)
This commit is contained in:
Katelyn Schiesser
committed by
GitHub
GitHub
parent
4b63578a10
commit
2f6c8e1176
@@ -532,84 +532,84 @@
|
||||
// Usurp a sensor to do redundant readings
|
||||
#if TEMP_SENSOR_REDUNDANT
|
||||
#ifndef TEMP_SENSOR_REDUNDANT_SOURCE
|
||||
#define TEMP_SENSOR_REDUNDANT_SOURCE 1
|
||||
#define TEMP_SENSOR_REDUNDANT_SOURCE E1
|
||||
#endif
|
||||
#ifndef TEMP_SENSOR_REDUNDANT_TARGET
|
||||
#define TEMP_SENSOR_REDUNDANT_TARGET 0
|
||||
#define TEMP_SENSOR_REDUNDANT_TARGET E0
|
||||
#endif
|
||||
#if !PIN_EXISTS(TEMP_REDUNDANT)
|
||||
#ifndef TEMP_SENSOR_REDUNDANT_MAX_DIFF
|
||||
#define TEMP_SENSOR_REDUNDANT_MAX_DIFF 10
|
||||
#endif
|
||||
#if TEMP_SENSOR_REDUNDANT_SOURCE == -5
|
||||
#if REDUNDANT_TEMP_MATCH(SOURCE, COOLER)
|
||||
#if !PIN_EXISTS(TEMP_COOLER)
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to COOLER requires TEMP_COOLER_PIN."
|
||||
#else
|
||||
#define TEMP_REDUNDANT_PIN TEMP_COOLER_PIN
|
||||
#endif
|
||||
#elif TEMP_SENSOR_REDUNDANT_SOURCE == -4
|
||||
#elif REDUNDANT_TEMP_MATCH(SOURCE, PROBE)
|
||||
#if !PIN_EXISTS(TEMP_PROBE)
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to PROBE requires TEMP_PROBE_PIN."
|
||||
#else
|
||||
#define TEMP_REDUNDANT_PIN TEMP_PROBE_PIN
|
||||
#endif
|
||||
#elif TEMP_SENSOR_REDUNDANT_SOURCE == -2
|
||||
#elif REDUNDANT_TEMP_MATCH(SOURCE, CHAMBER)
|
||||
#if !PIN_EXISTS(TEMP_CHAMBER)
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to CHAMBER requires TEMP_CHAMBER_PIN."
|
||||
#else
|
||||
#define TEMP_REDUNDANT_PIN TEMP_CHAMBER_PIN
|
||||
#endif
|
||||
#elif TEMP_SENSOR_REDUNDANT_SOURCE == -1
|
||||
#elif REDUNDANT_TEMP_MATCH(SOURCE, BED)
|
||||
#if !PIN_EXISTS(TEMP_BED)
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to BED requires TEMP_BED_PIN."
|
||||
#else
|
||||
#define TEMP_REDUNDANT_PIN TEMP_BED_PIN
|
||||
#endif
|
||||
#elif TEMP_SENSOR_REDUNDANT_SOURCE == 0
|
||||
#elif REDUNDANT_TEMP_MATCH(SOURCE, E0)
|
||||
#if !PIN_EXISTS(TEMP_0)
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to 0 requires TEMP_0_PIN."
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to E0 requires TEMP_0_PIN."
|
||||
#else
|
||||
#define TEMP_REDUNDANT_PIN TEMP_0_PIN
|
||||
#endif
|
||||
#elif TEMP_SENSOR_REDUNDANT_SOURCE == 1
|
||||
#elif REDUNDANT_TEMP_MATCH(SOURCE, E1)
|
||||
#if !PIN_EXISTS(TEMP_1)
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to 1 requires TEMP_1_PIN."
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to E1 requires TEMP_1_PIN."
|
||||
#else
|
||||
#define TEMP_REDUNDANT_PIN TEMP_1_PIN
|
||||
#endif
|
||||
#elif TEMP_SENSOR_REDUNDANT_SOURCE == 2
|
||||
#elif REDUNDANT_TEMP_MATCH(SOURCE, E2)
|
||||
#if !PIN_EXISTS(TEMP_2)
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to 2 requires TEMP_2_PIN."
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to E2 requires TEMP_2_PIN."
|
||||
#else
|
||||
#define TEMP_REDUNDANT_PIN TEMP_2_PIN
|
||||
#endif
|
||||
#elif TEMP_SENSOR_REDUNDANT_SOURCE == 3
|
||||
#elif REDUNDANT_TEMP_MATCH(SOURCE, E3)
|
||||
#if !PIN_EXISTS(TEMP_3)
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to 3 requires TEMP_3_PIN."
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to E3 requires TEMP_3_PIN."
|
||||
#else
|
||||
#define TEMP_REDUNDANT_PIN TEMP_3_PIN
|
||||
#endif
|
||||
#elif TEMP_SENSOR_REDUNDANT_SOURCE == 4
|
||||
#elif REDUNDANT_TEMP_MATCH(SOURCE, E4)
|
||||
#if !PIN_EXISTS(TEMP_4)
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to 4 requires TEMP_4_PIN."
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to E4 requires TEMP_4_PIN."
|
||||
#else
|
||||
#define TEMP_REDUNDANT_PIN TEMP_4_PIN
|
||||
#endif
|
||||
#elif TEMP_SENSOR_REDUNDANT_SOURCE == 5
|
||||
#elif REDUNDANT_TEMP_MATCH(SOURCE, E5)
|
||||
#if !PIN_EXISTS(TEMP_5)
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to 5 requires TEMP_5_PIN."
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to E5 requires TEMP_5_PIN."
|
||||
#else
|
||||
#define TEMP_REDUNDANT_PIN TEMP_5_PIN
|
||||
#endif
|
||||
#elif TEMP_SENSOR_REDUNDANT_SOURCE == 6
|
||||
#elif REDUNDANT_TEMP_MATCH(SOURCE, E6)
|
||||
#if !PIN_EXISTS(TEMP_6)
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to 6 requires TEMP_6_PIN."
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to E6 requires TEMP_6_PIN."
|
||||
#else
|
||||
#define TEMP_REDUNDANT_PIN TEMP_6_PIN
|
||||
#endif
|
||||
#elif TEMP_SENSOR_REDUNDANT_SOURCE == 7
|
||||
#elif REDUNDANT_TEMP_MATCH(SOURCE, E7)
|
||||
#if !PIN_EXISTS(TEMP_7)
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to 7 requires TEMP_7_PIN."
|
||||
#error "TEMP_SENSOR_REDUNDANT_SOURCE set to E7 requires TEMP_7_PIN."
|
||||
#else
|
||||
#define TEMP_REDUNDANT_PIN TEMP_7_PIN
|
||||
#endif
|
||||
@@ -699,7 +699,7 @@
|
||||
#define TEMP_SENSOR_REDUNDANT_IS_MAX_TC 1
|
||||
|
||||
#if TEMP_SENSOR_REDUNDANT == -5
|
||||
#if TEMP_SENSOR_REDUNDANT_SOURCE != 0 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
|
||||
#if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
|
||||
#error "MAX31865 Thermocouples (-5) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
|
||||
#endif
|
||||
|
||||
@@ -707,7 +707,7 @@
|
||||
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN 0
|
||||
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
|
||||
#elif TEMP_SENSOR_REDUNDANT == -3
|
||||
#if TEMP_SENSOR_REDUNDANT_SOURCE != 0 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
|
||||
#if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
|
||||
#error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
|
||||
#endif
|
||||
|
||||
@@ -715,7 +715,7 @@
|
||||
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN -270
|
||||
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1800
|
||||
#elif TEMP_SENSOR_REDUNDANT == -2
|
||||
#if TEMP_SENSOR_REDUNDANT_SOURCE != 0 && TEMP_SENSOR_REDUNDANT_SOURCE != 1
|
||||
#if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1)
|
||||
#error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1 (0/1)."
|
||||
#endif
|
||||
|
||||
@@ -725,13 +725,13 @@
|
||||
#endif
|
||||
|
||||
// mimic setting up the source TEMP_SENSOR
|
||||
#if TEMP_SENSOR_REDUNDANT_SOURCE == 0
|
||||
#if REDUNDANT_TEMP_MATCH(SOURCE, E0)
|
||||
#define TEMP_SENSOR_0_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
|
||||
#define TEMP_SENSOR_0_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
|
||||
#ifndef MAX31865_SENSOR_WIRES_0
|
||||
#define MAX31865_SENSOR_WIRES_0 2
|
||||
#endif
|
||||
#elif TEMP_SENSOR_REDUNDANT_SOURCE == 1
|
||||
#elif REDUNDANT_TEMP_MATCH(SOURCE, E1)
|
||||
#define TEMP_SENSOR_1_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
|
||||
#define TEMP_SENSOR_1_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
|
||||
#ifndef MAX31865_SENSOR_WIRES_1
|
||||
@@ -780,7 +780,7 @@
|
||||
#if HAS_MAX_TC
|
||||
|
||||
// Translate old _SS, _CS, _SCK, _DO, _DI, _MISO, and _MOSI PIN defines.
|
||||
#if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && TEMP_SENSOR_REDUNDANT_SOURCE == 1)
|
||||
#if TEMP_SENSOR_0_IS_MAX_TC || (TEMP_SENSOR_REDUNDANT_IS_MAX_TC && REDUNDANT_TEMP_MATCH(SOURCE, E1))
|
||||
|
||||
#if !PIN_EXISTS(TEMP_0_CS) // SS, CS
|
||||
#if PIN_EXISTS(MAX6675_SS)
|
||||
@@ -849,7 +849,7 @@
|
||||
|
||||
#endif // TEMP_SENSOR_0_IS_MAX_TC
|
||||
|
||||
#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))
|
||||
|
||||
#if !PIN_EXISTS(TEMP_1_CS) // SS2, CS2
|
||||
#if PIN_EXISTS(MAX6675_SS2)
|
||||
@@ -2584,6 +2584,9 @@
|
||||
#if HAS_ADC_TEST(COOLER)
|
||||
#define HAS_TEMP_ADC_COOLER 1
|
||||
#endif
|
||||
#if HAS_ADC_TEST(BOARD)
|
||||
#define HAS_TEMP_ADC_BOARD 1
|
||||
#endif
|
||||
#if HAS_ADC_TEST(REDUNDANT)
|
||||
#define HAS_TEMP_ADC_REDUNDANT 1
|
||||
#endif
|
||||
@@ -2604,6 +2607,9 @@
|
||||
#if HAS_TEMP(COOLER)
|
||||
#define HAS_TEMP_COOLER 1
|
||||
#endif
|
||||
#if HAS_TEMP(BOARD)
|
||||
#define HAS_TEMP_BOARD 1
|
||||
#endif
|
||||
#if HAS_TEMP(REDUNDANT)
|
||||
#define HAS_TEMP_REDUNDANT 1
|
||||
#endif
|
||||
@@ -2675,7 +2681,8 @@
|
||||
#if HAS_HEATED_BED || HAS_TEMP_CHAMBER
|
||||
#define BED_OR_CHAMBER 1
|
||||
#endif
|
||||
#if HAS_TEMP_HOTEND || BED_OR_CHAMBER || HAS_TEMP_PROBE || HAS_TEMP_COOLER
|
||||
|
||||
#if HAS_TEMP_HOTEND || BED_OR_CHAMBER || HAS_TEMP_PROBE || HAS_TEMP_COOLER || HAS_TEMP_BOARD
|
||||
#define HAS_TEMP_SENSOR 1
|
||||
#endif
|
||||
|
||||
@@ -2813,9 +2820,6 @@
|
||||
#endif
|
||||
#undef _NOT_E_AUTO
|
||||
#undef _HAS_FAN
|
||||
#if PIN_EXISTS(CONTROLLER_FAN)
|
||||
#define HAS_CONTROLLER_FAN 1
|
||||
#endif
|
||||
|
||||
#if BED_OR_CHAMBER || HAS_FAN0
|
||||
#define BED_OR_CHAMBER_OR_FAN 1
|
||||
@@ -2892,6 +2896,27 @@
|
||||
#define FAST_PWM_FAN_FREQUENCY ((F_CPU) / (2 * 255 * 1)) // Fan frequency default
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Controller Fan Settings
|
||||
*/
|
||||
#if PIN_EXISTS(CONTROLLER_FAN)
|
||||
#define HAS_CONTROLLER_FAN 1
|
||||
#if CONTROLLER_FAN_MIN_BOARD_TEMP
|
||||
#define HAS_CONTROLLER_FAN_MIN_BOARD_TEMP 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if HAS_CONTROLLER_FAN
|
||||
#if ENABLED(CONTROLLER_FAN_USE_BOARD_TEMP)
|
||||
#define HAS_CONTROLLER_FAN_BOARD_TEMP_TRIGGER 1
|
||||
#ifndef CONTROLLER_FAN_TRIGGER_TEMP
|
||||
#define CONTROLLER_FAN_TRIGGER_TEMP 30
|
||||
#endif
|
||||
#else
|
||||
#undef CONTROLLER_FAN_TRIGGER_TEMP
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// Servos
|
||||
#if PIN_EXISTS(SERVO0) && NUM_SERVOS > 0
|
||||
#define HAS_SERVO_0 1
|
||||
|
||||
Reference in New Issue
Block a user