From b8da82f29ce515a14def652fef4f4fc75a2f730e Mon Sep 17 00:00:00 2001
From: David Buezas <david.buezas@gmail.com>
Date: Sat, 18 Nov 2023 17:02:39 +0100
Subject: [PATCH 1/7] Add max31865 support for heated bed
---
Marlin/Configuration.h | 6 +-
Marlin/src/MarlinCore.cpp | 3 +
Marlin/src/inc/Conditionals_adv.h | 34 ++++--
Marlin/src/inc/Conditionals_post.h | 9 ++
Marlin/src/module/temperature.cpp | 174 +++++++++++++++++++++++++++++
Marlin/src/module/temperature.h | 3 +
6 files changed, 217 insertions(+), 12 deletions(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index c5a73982364a..45f2c71136ab 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -513,10 +513,10 @@
* ================================================================
* SPI RTD/Thermocouple Boards
* ================================================================
- * -5 : MAX31865 with Pt100/Pt1000, 2, 3, or 4-wire (only for sensors 0-1)
+ * -5 : MAX31865 with Pt100/Pt1000, 2, 3, or 4-wire (only for sensors 0-1 and bed)
* NOTE: You must uncomment/set the MAX31865_*_OHMS_n defines below.
- * -3 : MAX31855 with Thermocouple, -200°C to +700°C (only for sensors 0-1)
- * -2 : MAX6675 with Thermocouple, 0°C to +700°C (only for sensors 0-1)
+ * -3 : MAX31855 with Thermocouple, -200°C to +700°C (only for sensors 0-1 and bed)
+ * -2 : MAX6675 with Thermocouple, 0°C to +700°C (only for sensors 0-1 and bed)
*
* NOTE: Ensure TEMP_n_CS_PIN is set in your pins file for each TEMP_SENSOR_n using an SPI Thermocouple. By default,
* Hardware SPI on the default serial bus is used. If you have also set TEMP_n_SCK_PIN and TEMP_n_MISO_PIN,
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 312e6c2cee92..b755df190351 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1219,6 +1219,9 @@ void setup() {
#if TEMP_SENSOR_IS_MAX_TC(1) || (TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E1))
OUT_WRITE(TEMP_1_CS_PIN, HIGH);
#endif
+ #if TEMP_SENSOR_IS_MAX_TC(BED)
+ OUT_WRITE(TEMP_BED_CS_PIN, HIGH);
+ #endif
#if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
OUT_WRITE(SMART_EFFECTOR_MOD_PIN, LOW); // Put Smart Effector into NORMAL mode
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index baba95267ecf..a350194266e4 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -576,16 +576,16 @@
#endif
#endif
-#if TEMP_SENSOR_IS_MAX_TC(0) || TEMP_SENSOR_IS_MAX_TC(1) || TEMP_SENSOR_IS_MAX_TC(2) || TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
+#if TEMP_SENSOR_IS_MAX_TC(0) || TEMP_SENSOR_IS_MAX_TC(1) || TEMP_SENSOR_IS_MAX_TC(2) || TEMP_SENSOR_IS_MAX_TC(BED) || TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
#define HAS_MAX_TC 1
#endif
-#if TEMP_SENSOR_0_IS_MAX6675 || TEMP_SENSOR_1_IS_MAX6675 || TEMP_SENSOR_2_IS_MAX6675 || TEMP_SENSOR_REDUNDANT_IS_MAX6675
+#if TEMP_SENSOR_0_IS_MAX6675 || TEMP_SENSOR_1_IS_MAX6675 || TEMP_SENSOR_2_IS_MAX6675 || TEMP_SENSOR_BED_IS_MAX6675 || TEMP_SENSOR_REDUNDANT_IS_MAX6675
#define HAS_MAX6675 1
#endif
-#if TEMP_SENSOR_0_IS_MAX31855 || TEMP_SENSOR_1_IS_MAX31855 || TEMP_SENSOR_2_IS_MAX31855 || TEMP_SENSOR_REDUNDANT_IS_MAX31855
+#if TEMP_SENSOR_0_IS_MAX31855 || TEMP_SENSOR_1_IS_MAX31855 || TEMP_SENSOR_2_IS_MAX31855 || TEMP_SENSOR_BED_IS_MAX31855 || TEMP_SENSOR_REDUNDANT_IS_MAX31855
#define HAS_MAX31855 1
#endif
-#if TEMP_SENSOR_0_IS_MAX31865 || TEMP_SENSOR_1_IS_MAX31865 || TEMP_SENSOR_2_IS_MAX31865 || TEMP_SENSOR_REDUNDANT_IS_MAX31865
+#if TEMP_SENSOR_0_IS_MAX31865 || TEMP_SENSOR_1_IS_MAX31865 || TEMP_SENSOR_2_IS_MAX31865 || TEMP_SENSOR_BED_IS_MAX31865 || TEMP_SENSOR_REDUNDANT_IS_MAX31865
#define HAS_MAX31865 1
#endif
@@ -674,12 +674,28 @@
#endif
#endif
-#if TEMP_SENSOR_BED == -4
+#if TEMP_SENSOR_IS_MAX_TC(BED)
+ #if TEMP_SENSOR_BED == -5
+ #define TEMP_SENSOR_BED_IS_MAX31865 1
+ #define TEMP_SENSOR_BED_MAX_TC_TMIN 0
+ #define TEMP_SENSOR_BED_MAX_TC_TMAX 1024
+ #ifndef MAX31865_SENSOR_WIRES_BED
+ #define MAX31865_SENSOR_WIRES_BED 2
+ #endif
+ #ifndef MAX31865_WIRE_OHMS_BED
+ #define MAX31865_WIRE_OHMS_BED 0.0f
+ #endif
+ #elif TEMP_SENSOR_BED == -3
+ #define TEMP_SENSOR_BED_IS_MAX31855 1
+ #define TEMP_SENSOR_BED_MAX_TC_TMIN -270
+ #define TEMP_SENSOR_BED_MAX_TC_TMAX 1800
+ #elif TEMP_SENSOR_BED == -2
+ #define TEMP_SENSOR_BED_IS_MAX6675 1
+ #define TEMP_SENSOR_BED_MAX_TC_TMIN 0
+ #define TEMP_SENSOR_BED_MAX_TC_TMAX 1024
+ #endif
+#elif TEMP_SENSOR_BED == -4
#define TEMP_SENSOR_BED_IS_AD8495 1
-#elif TEMP_SENSOR_BED == -3
- #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_BED."
-#elif TEMP_SENSOR_BED == -2
- #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_BED."
#elif TEMP_SENSOR_BED == -1
#define TEMP_SENSOR_BED_IS_AD595 1
#elif TEMP_SENSOR_BED > 0
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index d172f6d858d9..1adee3646d39 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -725,6 +725,15 @@
#endif
#endif
+ #if (TEMP_SENSOR_IS_MAX_TC(BED)) \
+ && PIN_EXISTS(TEMP_BED_MISO) && PIN_EXISTS(TEMP_BED_SCK) && DISABLED(TEMP_SENSOR_BED_FORCE_HW_SPI)
+ #if TEMP_SENSOR_BED_IS_MAX31865 && !PIN_EXISTS(TEMP_BED_MOSI)
+ #error "TEMP_SENSOR_2 MAX31865 requires TEMP_2_MOSI_PIN defined for Software SPI. To use Hardware SPI instead, undefine MISO/SCK or enable TEMP_SENSOR_2_FORCE_HW_SPI."
+ #else
+ #define TEMP_SENSOR_BED_HAS_SPI_PINS 1
+ #endif
+ #endif
+
//
// User-defined thermocouple libraries
//
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 2f8761ec39f3..628849fa381c 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -121,6 +121,9 @@
#if TEMP_SENSOR_IS_ANY_MAX_TC(2) && TEMP_SENSOR_2_HAS_SPI_PINS && DISABLED(TEMP_SENSOR_FORCE_HW_SPI)
#define TEMP_SENSOR_2_USES_SW_SPI 1
#endif
+#if TEMP_SENSOR_IS_ANY_MAX_TC(BED) && TEMP_SENSOR_0_HAS_SPI_PINS && DISABLED(TEMP_SENSOR_FORCE_HW_SPI)
+ #define TEMP_SENSOR_BED_USES_SW_SPI 1
+#endif
#if (TEMP_SENSOR_0_USES_SW_SPI || TEMP_SENSOR_1_USES_SW_SPI || TEMP_SENSOR_2_USES_SW_SPI) && !HAS_MAXTC_LIBRARIES
#include "../libs/private_spi.h"
@@ -259,6 +262,7 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
#define _MAX31865_0_SW TEMP_SENSOR_0_USES_SW_SPI
#define _MAX31865_1_SW TEMP_SENSOR_1_USES_SW_SPI
#define _MAX31865_2_SW TEMP_SENSOR_2_USES_SW_SPI
+ #define _MAX31865_BED_SW TEMP_SENSOR_BED_USES_SW_SPI
#if TEMP_SENSOR_IS_MAX(0, 31865)
MAXTC_INIT(0, 31865);
@@ -269,10 +273,14 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
#if TEMP_SENSOR_IS_MAX(2, 31865)
MAXTC_INIT(2, 31865);
#endif
+ #if TEMP_SENSOR_IS_MAX(BED, 31865)
+ MAXTC_INIT(BED, 31865);
+ #endif
#undef _MAX31865_0_SW
#undef _MAX31865_1_SW
#undef _MAX31865_2_SW
+ #undef _MAX31865_BED_SW
#endif
#undef MAXTC_INIT
@@ -2114,6 +2122,13 @@ void Temperature::task() {
if (deg < TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN + .01) MINTEMP_ERROR(H_REDUNDANT, deg);
}
#endif
+ #if TEMP_SENSOR_IS_MAX_TC(BED)
+ {
+ const auto deg = degBed();
+ if (deg > BED_MAXTEMP - 1.0) MAXTEMP_ERROR(H_REDUNDANT, deg);
+ if (deg < BED_MINTEMP + .01) MINTEMP_ERROR(H_REDUNDANT, deg);
+ }
+ #endif
#else
#warning "Safety Alert! Disable IGNORE_THERMOCOUPLE_ERRORS for the final build!"
#endif
@@ -2444,6 +2459,15 @@ void Temperature::task() {
celsius_float_t Temperature::analog_to_celsius_bed(const raw_adc_t raw) {
#if TEMP_SENSOR_BED_IS_CUSTOM
return user_thermistor_to_deg_c(CTI_BED, raw);
+ #elif TEMP_SENSOR_IS_MAX_TC(BED)
+ #if TEMP_SENSOR_BED_IS_MAX31865
+ return TERN(LIB_INTERNAL_MAX31865,
+ max31865_BED.temperature(raw),
+ max31865_BED.temperature(MAX31865_SENSOR_OHMS_BED, MAX31865_CALIBRATION_OHMS_BED)
+ );
+ #else
+ return (int16_t)raw * 0.25;
+ #endif
#elif TEMP_SENSOR_BED_IS_THERMISTOR
SCAN_THERMISTOR_TABLE(TEMPTABLE_BED, TEMPTABLE_BED_LEN);
#elif TEMP_SENSOR_BED_IS_AD595
@@ -2595,6 +2619,9 @@ void Temperature::updateTemperaturesFromRawValues() {
#if TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
temp_redundant.setraw(READ_MAX_TC(HEATER_ID(TEMP_SENSOR_REDUNDANT_SOURCE)));
#endif
+ #if TEMP_SENSOR_IS_MAX_TC(BED)
+ temp_bed.setraw(read_max_tc_bed());
+ #endif
#if HAS_HOTEND
HOTEND_LOOP() temp_hotend[e].celsius = analog_to_celsius_hotend(temp_hotend[e].getraw(), e);
@@ -2762,6 +2789,17 @@ void Temperature::init() {
OPTARG(LIB_INTERNAL_MAX31865, MAX31865_SENSOR_OHMS_2, MAX31865_CALIBRATION_OHMS_2, MAX31865_WIRE_OHMS_2)
);
#endif
+
+ #if TEMP_SENSOR_IS_MAX(BED, 6675) && HAS_MAX6675_LIBRARY
+ max6675_bed.begin();
+ #elif TEMP_SENSOR_IS_MAX(BED, 31855) && HAS_MAX31855_LIBRARY
+ max31855_bed.begin();
+ #elif TEMP_SENSOR_IS_MAX(BED, 31865)
+ max31865_BED.begin(
+ MAX31865_WIRES(MAX31865_SENSOR_WIRES_BED) // MAX31865_BEDWIRE, MAX31865_3WIRE, MAX31865_4WIRE
+ OPTARG(LIB_INTERNAL_MAX31865, MAX31865_SENSOR_OHMS_BED, MAX31865_CALIBRATION_OHMS_BED, MAX31865_WIRE_OHMS_BED)
+ );
+ #endif
#undef MAX31865_WIRES
#undef _MAX31865_WIRES
@@ -3493,6 +3531,142 @@ void Temperature::disable_all_heaters() {
#endif // HAS_MAX_TC
+#if TEMP_SENSOR_IS_MAX_TC(BED)
+ /**
+ * @brief Read MAX Thermocouple temperature.
+ *
+ * Reads the thermocouple board via HW or SW SPI, using a library (LIB_USR_x) or raw SPI reads.
+ * Doesn't strictly return a temperature; returns an "ADC Value" (i.e. raw register content).
+ *
+ * @return integer representing the board's buffer, to be converted later if needed
+ */
+ raw_adc_t Temperature::read_max_tc_bed() {
+ #define MAXTC_HEAT_INTERVAL 250UL
+
+ #if HAS_MAX31855
+ #define MAX_TC_ERROR_MASK 7 // D2-0: SCV, SCG, OC
+ #define MAX_TC_DISCARD_BITS 18 // Data D31-18; sign bit D31
+ #define MAX_TC_SPEED_BITS 3 // ~1MHz
+ #elif HAS_MAX31865
+ #define MAX_TC_ERROR_MASK 1 // D0 Bit on fault only
+ #define MAX_TC_DISCARD_BITS 1 // Data is in D15-D1
+ #define MAX_TC_SPEED_BITS 3 // ~1MHz
+ #else // MAX6675
+ #define MAX_TC_ERROR_MASK 3 // D2 only; 1 = open circuit
+ #define MAX_TC_DISCARD_BITS 3 // Data D15-D1
+ #define MAX_TC_SPEED_BITS 2 // ~2MHz
+ #endif
+
+
+ static TERN(HAS_MAX31855, uint32_t, uint16_t) max_tc_temp = TEMP_SENSOR_BED_MAX_TC_TMAX;
+
+
+ static uint8_t max_tc_errors = 0;
+ static millis_t next_max_tc_ms = 0;
+
+ // Return last-read value between readings
+ const millis_t ms = millis();
+ if (PENDING(ms, next_max_tc_ms))
+ return max_tc_temp;
+
+ next_max_tc_ms = ms + MAXTC_HEAT_INTERVAL;
+
+ #if !HAS_MAXTC_LIBRARIES
+ max_tc_temp = 0;
+
+ #if !HAS_MAXTC_SW_SPI
+ // Initialize SPI using the default Hardware SPI bus.
+ // FIXME: spiBegin, spiRec and spiInit doesn't work when soft spi is used.
+ spiBegin();
+ spiInit(MAX_TC_SPEED_BITS);
+ #endif
+
+ WRITE(TEMP_BED_CS_PIN, LOW); // Enable MAXTC
+ DELAY_NS(100); // Ensure 100ns delay
+
+ // Read a big-endian temperature value without using a library
+ for (uint8_t i = sizeof(max_tc_temp); i--;) {
+ max_tc_temp |= TERN(HAS_MAXTC_SW_SPI, max_tc_spi.receive(), spiRec());
+ if (i > 0) max_tc_temp <<= 8; // shift left if not the last byte
+ }
+
+ WRITE(TEMP_BED_CS_PIN, HIGH); // Disable MAXTC
+ #else
+ #if HAS_MAX6675_LIBRARY
+ MAX6675 &max6675ref = max6675_bed;
+ max_tc_temp = max6675ref.readRaw16();
+ #endif
+
+ #if HAS_MAX31855_LIBRARY
+ MAX31855 &max855ref = max31855_bed;
+ max_tc_temp = max855ref.readRaw32();
+ #endif
+
+ #if HAS_MAX31865
+ MAX31865 &max865ref = max31865_BED;
+ max_tc_temp = TERN(LIB_INTERNAL_MAX31865, max865ref.readRaw(), max865ref.readRTD_with_Fault());
+ #endif
+ #endif
+
+ // Handle an error. If there have been more than THERMOCOUPLE_MAX_ERRORS, send an error over serial.
+ // Either way, return the TMAX for the thermocouple to trigger a maxtemp_error()
+ if (max_tc_temp & MAX_TC_ERROR_MASK) {
+ max_tc_errors++;
+
+ if (max_tc_errors > THERMOCOUPLE_MAX_ERRORS) {
+ SERIAL_ERROR_START();
+ SERIAL_ECHOPGM("Bed temp measurement error! ");
+ #if HAS_MAX31855
+ SERIAL_ECHOPGM("MAX31855 Fault: (", max_tc_temp & 0x7, ") >> ");
+ if (max_tc_temp & 0x1)
+ SERIAL_ECHOLNPGM("Open Circuit");
+ else if (max_tc_temp & 0x2)
+ SERIAL_ECHOLNPGM("Short to GND");
+ else if (max_tc_temp & 0x4)
+ SERIAL_ECHOLNPGM("Short to VCC");
+ #elif HAS_MAX31865
+ const uint8_t fault_31865 = max865ref.readFault();
+ max865ref.clearFault();
+ if (fault_31865) {
+ SERIAL_EOL();
+ SERIAL_ECHOLNPGM("\nMAX31865 Fault: (", fault_31865, ") >>");
+ if (fault_31865 & MAX31865_FAULT_HIGHTHRESH)
+ SERIAL_ECHOLNPGM("RTD High Threshold");
+ if (fault_31865 & MAX31865_FAULT_LOWTHRESH)
+ SERIAL_ECHOLNPGM("RTD Low Threshold");
+ if (fault_31865 & MAX31865_FAULT_REFINLOW)
+ SERIAL_ECHOLNPGM("REFIN- > 0.85 x V bias");
+ if (fault_31865 & MAX31865_FAULT_REFINHIGH)
+ SERIAL_ECHOLNPGM("REFIN- < 0.85 x V bias (FORCE- open)");
+ if (fault_31865 & MAX31865_FAULT_RTDINLOW)
+ SERIAL_ECHOLNPGM("REFIN- < 0.85 x V bias (FORCE- open)");
+ if (fault_31865 & MAX31865_FAULT_OVUV)
+ SERIAL_ECHOLNPGM("Under/Over voltage");
+ }
+ #else // MAX6675
+ SERIAL_ECHOLNPGM("MAX6675 Fault: Open Circuit");
+ #endif
+
+ // Set thermocouple above max temperature (TMAX)
+ max_tc_temp = TEMP_SENSOR_BED_MAX_TC_TMAX << (MAX_TC_DISCARD_BITS + 1);
+ }
+ }
+ else {
+ max_tc_errors = 0; // No error bit, reset error count
+ }
+
+ max_tc_temp >>= MAX_TC_DISCARD_BITS;
+
+ #if HAS_MAX31855
+ // Support negative temperature for MAX38155
+ if (max_tc_temp & 0x00002000) max_tc_temp |= 0xFFFFC000;
+ #endif
+
+ return max_tc_temp;
+ }
+
+#endif // TEMP_SENSOR_IS_MAX_TC(BED)
+
/**
* Update raw temperatures
*
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index d5a27a8671c6..8b6336f6b6b4 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -1344,6 +1344,9 @@ class Temperature {
#endif
static raw_adc_t read_max_tc(TERN_(HAS_MULTI_MAX_TC, const uint8_t hindex=0));
#endif
+ #if TEMP_SENSOR_IS_MAX_TC(BED)
+ static raw_adc_t read_max_tc_bed();
+ #endif
#if HAS_AUTO_FAN
#if ENABLED(POWER_OFF_WAIT_FOR_COOLDOWN)
From 864c4fe40a9b4d45be1a9e798c4f26f44b8cd7ff Mon Sep 17 00:00:00 2001
From: David Buezas <david.buezas@gmail.com>
Date: Sun, 19 Nov 2023 12:45:17 +0100
Subject: [PATCH 2/7] Correct variable casing for max31855_BED and max6675_BED
---
Marlin/src/module/temperature.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 628849fa381c..7a70f907f35f 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2791,9 +2791,9 @@ void Temperature::init() {
#endif
#if TEMP_SENSOR_IS_MAX(BED, 6675) && HAS_MAX6675_LIBRARY
- max6675_bed.begin();
+ max6675_BED.begin();
#elif TEMP_SENSOR_IS_MAX(BED, 31855) && HAS_MAX31855_LIBRARY
- max31855_bed.begin();
+ max31855_BED.begin();
#elif TEMP_SENSOR_IS_MAX(BED, 31865)
max31865_BED.begin(
MAX31865_WIRES(MAX31865_SENSOR_WIRES_BED) // MAX31865_BEDWIRE, MAX31865_3WIRE, MAX31865_4WIRE
@@ -3593,12 +3593,12 @@ void Temperature::disable_all_heaters() {
WRITE(TEMP_BED_CS_PIN, HIGH); // Disable MAXTC
#else
#if HAS_MAX6675_LIBRARY
- MAX6675 &max6675ref = max6675_bed;
+ MAX6675 &max6675ref = max6675_BED;
max_tc_temp = max6675ref.readRaw16();
#endif
#if HAS_MAX31855_LIBRARY
- MAX31855 &max855ref = max31855_bed;
+ MAX31855 &max855ref = max31855_BED;
max_tc_temp = max855ref.readRaw32();
#endif
From 1b501241a393a2dd0c225d0450b61950bd0edfad Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 19 Nov 2023 16:33:28 -0600
Subject: [PATCH 3/7] fix error, clean up
---
Marlin/src/inc/Conditionals_post.h | 2 +-
Marlin/src/module/temperature.cpp | 32 ++++++++++++++----------------
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index 1adee3646d39..04f00ed4ba37 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -728,7 +728,7 @@
#if (TEMP_SENSOR_IS_MAX_TC(BED)) \
&& PIN_EXISTS(TEMP_BED_MISO) && PIN_EXISTS(TEMP_BED_SCK) && DISABLED(TEMP_SENSOR_BED_FORCE_HW_SPI)
#if TEMP_SENSOR_BED_IS_MAX31865 && !PIN_EXISTS(TEMP_BED_MOSI)
- #error "TEMP_SENSOR_2 MAX31865 requires TEMP_2_MOSI_PIN defined for Software SPI. To use Hardware SPI instead, undefine MISO/SCK or enable TEMP_SENSOR_2_FORCE_HW_SPI."
+ #error "TEMP_SENSOR_BED MAX31865 requires TEMP_BED_MOSI_PIN defined for Software SPI. To use Hardware SPI instead, undefine MISO/SCK or enable TEMP_SENSOR_BED_FORCE_HW_SPI."
#else
#define TEMP_SENSOR_BED_HAS_SPI_PINS 1
#endif
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 7a70f907f35f..1b136d9779d5 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2097,36 +2097,36 @@ void Temperature::task() {
#if TEMP_SENSOR_IS_MAX_TC(0)
{
const auto deg = degHotend(0);
- if (deg > _MIN(HEATER_0_MAXTEMP, TEMP_SENSOR_0_MAX_TC_TMAX - 1.0)) MAXTEMP_ERROR(H_E0, deg);
- if (deg < _MAX(HEATER_0_MINTEMP, TEMP_SENSOR_0_MAX_TC_TMIN + .01)) MINTEMP_ERROR(H_E0, deg);
+ if (deg > _MIN(HEATER_0_MAXTEMP, TEMP_SENSOR_0_MAX_TC_TMAX - 1.00f)) MAXTEMP_ERROR(H_E0, deg);
+ if (deg < _MAX(HEATER_0_MINTEMP, TEMP_SENSOR_0_MAX_TC_TMIN + 0.01f)) MINTEMP_ERROR(H_E0, deg);
}
#endif
#if TEMP_SENSOR_IS_MAX_TC(1)
{
const auto deg = degHotend(1);
- if (deg > _MIN(HEATER_1_MAXTEMP, TEMP_SENSOR_1_MAX_TC_TMAX - 1.0)) MAXTEMP_ERROR(H_E1, deg);
- if (deg < _MAX(HEATER_1_MINTEMP, TEMP_SENSOR_1_MAX_TC_TMIN + .01)) MINTEMP_ERROR(H_E1, deg);
+ if (deg > _MIN(HEATER_1_MAXTEMP, TEMP_SENSOR_1_MAX_TC_TMAX - 1.00f)) MAXTEMP_ERROR(H_E1, deg);
+ if (deg < _MAX(HEATER_1_MINTEMP, TEMP_SENSOR_1_MAX_TC_TMIN + 0.01f)) MINTEMP_ERROR(H_E1, deg);
}
#endif
#if TEMP_SENSOR_IS_MAX_TC(2)
{
const auto deg = degHotend(2);
- if (deg > _MIN(HEATER_2_MAXTEMP, TEMP_SENSOR_2_MAX_TC_TMAX - 1.0)) MAXTEMP_ERROR(H_E2, deg);
- if (deg < _MAX(HEATER_2_MINTEMP, TEMP_SENSOR_2_MAX_TC_TMIN + .01)) MINTEMP_ERROR(H_E2, deg);
+ if (deg > _MIN(HEATER_2_MAXTEMP, TEMP_SENSOR_2_MAX_TC_TMAX - 1.00f)) MAXTEMP_ERROR(H_E2, deg);
+ if (deg < _MAX(HEATER_2_MINTEMP, TEMP_SENSOR_2_MAX_TC_TMIN + 0.01f)) MINTEMP_ERROR(H_E2, deg);
}
#endif
#if TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
{
const auto deg = degRedundant();
- if (deg > TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX - 1.0) MAXTEMP_ERROR(H_REDUNDANT, deg);
- if (deg < TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN + .01) MINTEMP_ERROR(H_REDUNDANT, deg);
+ if (deg > TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX - 1.00f) MAXTEMP_ERROR(H_REDUNDANT, deg);
+ if (deg < TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN + 0.01f) MINTEMP_ERROR(H_REDUNDANT, deg);
}
#endif
#if TEMP_SENSOR_IS_MAX_TC(BED)
{
const auto deg = degBed();
- if (deg > BED_MAXTEMP - 1.0) MAXTEMP_ERROR(H_REDUNDANT, deg);
- if (deg < BED_MINTEMP + .01) MINTEMP_ERROR(H_REDUNDANT, deg);
+ if (deg > (BED_MAXTEMP) - 1.00f) MAXTEMP_ERROR(H_REDUNDANT, deg);
+ if (deg < (BED_MINTEMP) + 0.01f) MINTEMP_ERROR(H_REDUNDANT, deg);
}
#endif
#else
@@ -2789,7 +2789,7 @@ void Temperature::init() {
OPTARG(LIB_INTERNAL_MAX31865, MAX31865_SENSOR_OHMS_2, MAX31865_CALIBRATION_OHMS_2, MAX31865_WIRE_OHMS_2)
);
#endif
-
+
#if TEMP_SENSOR_IS_MAX(BED, 6675) && HAS_MAX6675_LIBRARY
max6675_BED.begin();
#elif TEMP_SENSOR_IS_MAX(BED, 31855) && HAS_MAX31855_LIBRARY
@@ -3359,6 +3359,8 @@ void Temperature::disable_all_heaters() {
#if HAS_MAX_TC
+ typedef TERN(HAS_MAX31855, uint32_t, uint16_t) max_tc_temp_t;
+
#ifndef THERMOCOUPLE_MAX_ERRORS
#define THERMOCOUPLE_MAX_ERRORS 15
#endif
@@ -3557,18 +3559,14 @@ void Temperature::disable_all_heaters() {
#define MAX_TC_SPEED_BITS 2 // ~2MHz
#endif
-
- static TERN(HAS_MAX31855, uint32_t, uint16_t) max_tc_temp = TEMP_SENSOR_BED_MAX_TC_TMAX;
-
+ static max_tc_temp_t max_tc_temp = TEMP_SENSOR_BED_MAX_TC_TMAX;
static uint8_t max_tc_errors = 0;
static millis_t next_max_tc_ms = 0;
// Return last-read value between readings
const millis_t ms = millis();
- if (PENDING(ms, next_max_tc_ms))
- return max_tc_temp;
-
+ if (PENDING(ms, next_max_tc_ms)) return max_tc_temp;
next_max_tc_ms = ms + MAXTC_HEAT_INTERVAL;
#if !HAS_MAXTC_LIBRARIES
From 5625d8bcb79cf27c7b7cd44826cca4cbe2fb1277 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 20 Nov 2023 02:34:30 -0600
Subject: [PATCH 4/7] bed specific
---
Marlin/src/module/temperature.cpp | 46 ++++++++++++++-----------------
1 file changed, 21 insertions(+), 25 deletions(-)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 1b136d9779d5..fb411128bbc6 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -3545,18 +3545,18 @@ void Temperature::disable_all_heaters() {
raw_adc_t Temperature::read_max_tc_bed() {
#define MAXTC_HEAT_INTERVAL 250UL
- #if HAS_MAX31855
- #define MAX_TC_ERROR_MASK 7 // D2-0: SCV, SCG, OC
- #define MAX_TC_DISCARD_BITS 18 // Data D31-18; sign bit D31
- #define MAX_TC_SPEED_BITS 3 // ~1MHz
- #elif HAS_MAX31865
- #define MAX_TC_ERROR_MASK 1 // D0 Bit on fault only
- #define MAX_TC_DISCARD_BITS 1 // Data is in D15-D1
- #define MAX_TC_SPEED_BITS 3 // ~1MHz
+ #if TEMP_SENSOR_BED_IS_MAX31855
+ #define BED_MAX_TC_ERROR_MASK 7 // D2-0: SCV, SCG, OC
+ #define BED_MAX_TC_DISCARD_BITS 18 // Data D31-18; sign bit D31
+ #define BED_MAX_TC_SPEED_BITS 3 // ~1MHz
+ #elif TEMP_SENSOR_BED_IS_MAX31865
+ #define BED_MAX_TC_ERROR_MASK 1 // D0 Bit on fault only
+ #define BED_MAX_TC_DISCARD_BITS 1 // Data is in D15-D1
+ #define BED_MAX_TC_SPEED_BITS 3 // ~1MHz
#else // MAX6675
- #define MAX_TC_ERROR_MASK 3 // D2 only; 1 = open circuit
- #define MAX_TC_DISCARD_BITS 3 // Data D15-D1
- #define MAX_TC_SPEED_BITS 2 // ~2MHz
+ #define BED_MAX_TC_ERROR_MASK 3 // D2 only; 1 = open circuit
+ #define BED_MAX_TC_DISCARD_BITS 3 // Data D15-D1
+ #define BED_MAX_TC_SPEED_BITS 2 // ~2MHz
#endif
static max_tc_temp_t max_tc_temp = TEMP_SENSOR_BED_MAX_TC_TMAX;
@@ -3576,7 +3576,7 @@ void Temperature::disable_all_heaters() {
// Initialize SPI using the default Hardware SPI bus.
// FIXME: spiBegin, spiRec and spiInit doesn't work when soft spi is used.
spiBegin();
- spiInit(MAX_TC_SPEED_BITS);
+ spiInit(BED_MAX_TC_SPEED_BITS);
#endif
WRITE(TEMP_BED_CS_PIN, LOW); // Enable MAXTC
@@ -3590,17 +3590,13 @@ void Temperature::disable_all_heaters() {
WRITE(TEMP_BED_CS_PIN, HIGH); // Disable MAXTC
#else
- #if HAS_MAX6675_LIBRARY
+ #if ALL(TEMP_SENSOR_BED_IS_MAX6675, HAS_MAX6675_LIBRARY)
MAX6675 &max6675ref = max6675_BED;
max_tc_temp = max6675ref.readRaw16();
- #endif
-
- #if HAS_MAX31855_LIBRARY
+ #elif ALL(TEMP_SENSOR_BED_IS_MAX31855, HAS_MAX31855_LIBRARY)
MAX31855 &max855ref = max31855_BED;
max_tc_temp = max855ref.readRaw32();
- #endif
-
- #if HAS_MAX31865
+ #elif TEMP_SENSOR_BED_IS_MAX31865
MAX31865 &max865ref = max31865_BED;
max_tc_temp = TERN(LIB_INTERNAL_MAX31865, max865ref.readRaw(), max865ref.readRTD_with_Fault());
#endif
@@ -3608,13 +3604,13 @@ void Temperature::disable_all_heaters() {
// Handle an error. If there have been more than THERMOCOUPLE_MAX_ERRORS, send an error over serial.
// Either way, return the TMAX for the thermocouple to trigger a maxtemp_error()
- if (max_tc_temp & MAX_TC_ERROR_MASK) {
+ if (max_tc_temp & BED_MAX_TC_ERROR_MASK) {
max_tc_errors++;
if (max_tc_errors > THERMOCOUPLE_MAX_ERRORS) {
SERIAL_ERROR_START();
SERIAL_ECHOPGM("Bed temp measurement error! ");
- #if HAS_MAX31855
+ #if TEMP_SENSOR_BED_IS_MAX31855
SERIAL_ECHOPGM("MAX31855 Fault: (", max_tc_temp & 0x7, ") >> ");
if (max_tc_temp & 0x1)
SERIAL_ECHOLNPGM("Open Circuit");
@@ -3622,7 +3618,7 @@ void Temperature::disable_all_heaters() {
SERIAL_ECHOLNPGM("Short to GND");
else if (max_tc_temp & 0x4)
SERIAL_ECHOLNPGM("Short to VCC");
- #elif HAS_MAX31865
+ #elif TEMP_SENSOR_BED_IS_MAX31865
const uint8_t fault_31865 = max865ref.readFault();
max865ref.clearFault();
if (fault_31865) {
@@ -3646,16 +3642,16 @@ void Temperature::disable_all_heaters() {
#endif
// Set thermocouple above max temperature (TMAX)
- max_tc_temp = TEMP_SENSOR_BED_MAX_TC_TMAX << (MAX_TC_DISCARD_BITS + 1);
+ max_tc_temp = TEMP_SENSOR_BED_MAX_TC_TMAX << (BED_MAX_TC_DISCARD_BITS + 1);
}
}
else {
max_tc_errors = 0; // No error bit, reset error count
}
- max_tc_temp >>= MAX_TC_DISCARD_BITS;
+ max_tc_temp >>= BED_MAX_TC_DISCARD_BITS;
- #if HAS_MAX31855
+ #if TEMP_SENSOR_BED_IS_MAX31855
// Support negative temperature for MAX38155
if (max_tc_temp & 0x00002000) max_tc_temp |= 0xFFFFC000;
#endif
From bc61a63349e50bb090333d67ea5f5e05d46d5fb2 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 20 Nov 2023 02:46:08 -0600
Subject: [PATCH 5/7] prettify
---
Marlin/Configuration.h | 6 +--
Marlin/src/module/temperature.cpp | 77 +++++++++++--------------------
2 files changed, 31 insertions(+), 52 deletions(-)
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index b657d6172449..07aa8969902f 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -513,10 +513,10 @@
* ================================================================
* SPI RTD/Thermocouple Boards
* ================================================================
- * -5 : MAX31865 with Pt100/Pt1000, 2, 3, or 4-wire (only for sensors 0-1 and bed)
+ * -5 : MAX31865 with Pt100/Pt1000, 2, 3, or 4-wire (only for sensors 0-2 and bed)
* NOTE: You must uncomment/set the MAX31865_*_OHMS_n defines below.
- * -3 : MAX31855 with Thermocouple, -200°C to +700°C (only for sensors 0-1 and bed)
- * -2 : MAX6675 with Thermocouple, 0°C to +700°C (only for sensors 0-1 and bed)
+ * -3 : MAX31855 with Thermocouple, -200°C to +700°C (only for sensors 0-2 and bed)
+ * -2 : MAX6675 with Thermocouple, 0°C to +700°C (only for sensors 0-2 and bed)
*
* NOTE: Ensure TEMP_n_CS_PIN is set in your pins file for each TEMP_SENSOR_n using an SPI Thermocouple. By default,
* Hardware SPI on the default serial bus is used. If you have also set TEMP_n_SCK_PIN and TEMP_n_MISO_PIN,
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index fb411128bbc6..b92615bac1c5 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -3460,12 +3460,10 @@ void Temperature::disable_all_heaters() {
MAX6675 &max6675ref = THERMO_SEL(max6675_0, max6675_1, max6675_2);
max_tc_temp = max6675ref.readRaw16();
#endif
-
#if HAS_MAX31855_LIBRARY
MAX31855 &max855ref = THERMO_SEL(max31855_0, max31855_1, max31855_2);
max_tc_temp = max855ref.readRaw32();
#endif
-
#if HAS_MAX31865
MAX31865 &max865ref = THERMO_SEL(max31865_0, max31865_1, max31865_2);
max_tc_temp = TERN(LIB_INTERNAL_MAX31865, max865ref.readRaw(), max865ref.readRTD_with_Fault());
@@ -3482,30 +3480,21 @@ void Temperature::disable_all_heaters() {
SERIAL_ECHOPGM("Temp measurement error! ");
#if HAS_MAX31855
SERIAL_ECHOPGM("MAX31855 Fault: (", max_tc_temp & 0x7, ") >> ");
- if (max_tc_temp & 0x1)
- SERIAL_ECHOLNPGM("Open Circuit");
- else if (max_tc_temp & 0x2)
- SERIAL_ECHOLNPGM("Short to GND");
- else if (max_tc_temp & 0x4)
- SERIAL_ECHOLNPGM("Short to VCC");
+ if (max_tc_temp & 0x1) SERIAL_ECHOLNPGM("Open Circuit");
+ else if (max_tc_temp & 0x2) SERIAL_ECHOLNPGM("Short to GND");
+ else if (max_tc_temp & 0x4) SERIAL_ECHOLNPGM("Short to VCC");
#elif HAS_MAX31865
const uint8_t fault_31865 = max865ref.readFault();
max865ref.clearFault();
if (fault_31865) {
SERIAL_EOL();
SERIAL_ECHOLNPGM("\nMAX31865 Fault: (", fault_31865, ") >>");
- if (fault_31865 & MAX31865_FAULT_HIGHTHRESH)
- SERIAL_ECHOLNPGM("RTD High Threshold");
- if (fault_31865 & MAX31865_FAULT_LOWTHRESH)
- SERIAL_ECHOLNPGM("RTD Low Threshold");
- if (fault_31865 & MAX31865_FAULT_REFINLOW)
- SERIAL_ECHOLNPGM("REFIN- > 0.85 x V bias");
- if (fault_31865 & MAX31865_FAULT_REFINHIGH)
- SERIAL_ECHOLNPGM("REFIN- < 0.85 x V bias (FORCE- open)");
- if (fault_31865 & MAX31865_FAULT_RTDINLOW)
- SERIAL_ECHOLNPGM("REFIN- < 0.85 x V bias (FORCE- open)");
- if (fault_31865 & MAX31865_FAULT_OVUV)
- SERIAL_ECHOLNPGM("Under/Over voltage");
+ if (fault_31865 & MAX31865_FAULT_HIGHTHRESH) SERIAL_ECHOLNPGM("RTD High Threshold");
+ if (fault_31865 & MAX31865_FAULT_LOWTHRESH) SERIAL_ECHOLNPGM("RTD Low Threshold");
+ if (fault_31865 & MAX31865_FAULT_REFINLOW) SERIAL_ECHOLNPGM("REFIN- > 0.85 x V bias");
+ if (fault_31865 & MAX31865_FAULT_REFINHIGH) SERIAL_ECHOLNPGM("REFIN- < 0.85 x V bias (FORCE- open)");
+ if (fault_31865 & MAX31865_FAULT_RTDINLOW) SERIAL_ECHOLNPGM("REFIN- < 0.85 x V bias (FORCE- open)");
+ if (fault_31865 & MAX31865_FAULT_OVUV) SERIAL_ECHOLNPGM("Under/Over voltage");
}
#else // MAX6675
SERIAL_ECHOLNPGM("MAX6675 Fault: Open Circuit");
@@ -3589,17 +3578,16 @@ void Temperature::disable_all_heaters() {
}
WRITE(TEMP_BED_CS_PIN, HIGH); // Disable MAXTC
- #else
- #if ALL(TEMP_SENSOR_BED_IS_MAX6675, HAS_MAX6675_LIBRARY)
- MAX6675 &max6675ref = max6675_BED;
- max_tc_temp = max6675ref.readRaw16();
- #elif ALL(TEMP_SENSOR_BED_IS_MAX31855, HAS_MAX31855_LIBRARY)
- MAX31855 &max855ref = max31855_BED;
- max_tc_temp = max855ref.readRaw32();
- #elif TEMP_SENSOR_BED_IS_MAX31865
- MAX31865 &max865ref = max31865_BED;
- max_tc_temp = TERN(LIB_INTERNAL_MAX31865, max865ref.readRaw(), max865ref.readRTD_with_Fault());
- #endif
+
+ #elif ALL(TEMP_SENSOR_BED_IS_MAX6675, HAS_MAX6675_LIBRARY)
+ MAX6675 &max6675ref = max6675_BED;
+ max_tc_temp = max6675ref.readRaw16();
+ #elif ALL(TEMP_SENSOR_BED_IS_MAX31855, HAS_MAX31855_LIBRARY)
+ MAX31855 &max855ref = max31855_BED;
+ max_tc_temp = max855ref.readRaw32();
+ #elif TEMP_SENSOR_BED_IS_MAX31865
+ MAX31865 &max865ref = max31865_BED;
+ max_tc_temp = TERN(LIB_INTERNAL_MAX31865, max865ref.readRaw(), max865ref.readRTD_with_Fault());
#endif
// Handle an error. If there have been more than THERMOCOUPLE_MAX_ERRORS, send an error over serial.
@@ -3612,30 +3600,21 @@ void Temperature::disable_all_heaters() {
SERIAL_ECHOPGM("Bed temp measurement error! ");
#if TEMP_SENSOR_BED_IS_MAX31855
SERIAL_ECHOPGM("MAX31855 Fault: (", max_tc_temp & 0x7, ") >> ");
- if (max_tc_temp & 0x1)
- SERIAL_ECHOLNPGM("Open Circuit");
- else if (max_tc_temp & 0x2)
- SERIAL_ECHOLNPGM("Short to GND");
- else if (max_tc_temp & 0x4)
- SERIAL_ECHOLNPGM("Short to VCC");
+ if (max_tc_temp & 0x1) SERIAL_ECHOLNPGM("Open Circuit");
+ else if (max_tc_temp & 0x2) SERIAL_ECHOLNPGM("Short to GND");
+ else if (max_tc_temp & 0x4) SERIAL_ECHOLNPGM("Short to VCC");
#elif TEMP_SENSOR_BED_IS_MAX31865
const uint8_t fault_31865 = max865ref.readFault();
max865ref.clearFault();
if (fault_31865) {
SERIAL_EOL();
SERIAL_ECHOLNPGM("\nMAX31865 Fault: (", fault_31865, ") >>");
- if (fault_31865 & MAX31865_FAULT_HIGHTHRESH)
- SERIAL_ECHOLNPGM("RTD High Threshold");
- if (fault_31865 & MAX31865_FAULT_LOWTHRESH)
- SERIAL_ECHOLNPGM("RTD Low Threshold");
- if (fault_31865 & MAX31865_FAULT_REFINLOW)
- SERIAL_ECHOLNPGM("REFIN- > 0.85 x V bias");
- if (fault_31865 & MAX31865_FAULT_REFINHIGH)
- SERIAL_ECHOLNPGM("REFIN- < 0.85 x V bias (FORCE- open)");
- if (fault_31865 & MAX31865_FAULT_RTDINLOW)
- SERIAL_ECHOLNPGM("REFIN- < 0.85 x V bias (FORCE- open)");
- if (fault_31865 & MAX31865_FAULT_OVUV)
- SERIAL_ECHOLNPGM("Under/Over voltage");
+ if (fault_31865 & MAX31865_FAULT_HIGHTHRESH) SERIAL_ECHOLNPGM("RTD High Threshold");
+ if (fault_31865 & MAX31865_FAULT_LOWTHRESH) SERIAL_ECHOLNPGM("RTD Low Threshold");
+ if (fault_31865 & MAX31865_FAULT_REFINLOW) SERIAL_ECHOLNPGM("REFIN- > 0.85 x V bias");
+ if (fault_31865 & MAX31865_FAULT_REFINHIGH) SERIAL_ECHOLNPGM("REFIN- < 0.85 x V bias (FORCE- open)");
+ if (fault_31865 & MAX31865_FAULT_RTDINLOW) SERIAL_ECHOLNPGM("REFIN- < 0.85 x V bias (FORCE- open)");
+ if (fault_31865 & MAX31865_FAULT_OVUV) SERIAL_ECHOLNPGM("Under/Over voltage");
}
#else // MAX6675
SERIAL_ECHOLNPGM("MAX6675 Fault: Open Circuit");
From d9f5f45eb7360be143288618b9eee50d8c10ffd1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 20 Nov 2023 21:23:55 -0600
Subject: [PATCH 6/7] third thermocouple
---
Marlin/src/MarlinCore.cpp | 3 +++
Marlin/src/inc/Conditionals_adv.h | 22 ++++++++++++----------
Marlin/src/inc/Conditionals_post.h | 15 +++++++--------
Marlin/src/inc/SanityCheck.h | 6 +++++-
Marlin/src/module/temperature.cpp | 1 -
Marlin/src/module/temperature.h | 6 ++----
6 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index b755df190351..1dcee50d12c9 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -1219,6 +1219,9 @@ void setup() {
#if TEMP_SENSOR_IS_MAX_TC(1) || (TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E1))
OUT_WRITE(TEMP_1_CS_PIN, HIGH);
#endif
+ #if TEMP_SENSOR_IS_MAX_TC(2) || (TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E2))
+ OUT_WRITE(TEMP_2_CS_PIN, HIGH);
+ #endif
#if TEMP_SENSOR_IS_MAX_TC(BED)
OUT_WRITE(TEMP_BED_CS_PIN, HIGH);
#endif
diff --git a/Marlin/src/inc/Conditionals_adv.h b/Marlin/src/inc/Conditionals_adv.h
index 40d4c07a1bb6..7fc6050f0db9 100644
--- a/Marlin/src/inc/Conditionals_adv.h
+++ b/Marlin/src/inc/Conditionals_adv.h
@@ -507,33 +507,35 @@
#endif
#if TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
+ #define _REDUNDANT_E (REDUNDANT_TEMP_MATCH(SOURCE, E0) || REDUNDANT_TEMP_MATCH(SOURCE, E1) || REDUNDANT_TEMP_MATCH(SOURCE, E2))
#if TEMP_SENSOR_REDUNDANT == -5
- #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1) && !REDUNDANT_TEMP_MATCH(SOURCE, E2)
- #error "MAX31865 Thermocouples (-5) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 (0/1/2)."
+ #if !_REDUNDANT_E
+ #error "MAX31865 Thermocouples (-5) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_[0-2]."
#endif
#define TEMP_SENSOR_REDUNDANT_IS_MAX31865 1
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN 0
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
#elif TEMP_SENSOR_REDUNDANT == -3
- #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1) && !REDUNDANT_TEMP_MATCH(SOURCE, E2)
- #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 (0/1/2)."
+ #if !_REDUNDANT_E
+ #error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_[0-2]."
#endif
#define TEMP_SENSOR_REDUNDANT_IS_MAX31855 1
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN -270
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1800
#elif TEMP_SENSOR_REDUNDANT == -2
- #if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1) && !REDUNDANT_TEMP_MATCH(SOURCE, E2)
- #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 (0/1/2)."
+ #if !_REDUNDANT_E
+ #error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_[0-2]."
#endif
#define TEMP_SENSOR_REDUNDANT_IS_MAX6675 1
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN 0
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
#endif
+ #undef _REDUNDANT_E
- // mimic setting up the source TEMP_SENSOR
+ // Mimic setting up the source TEMP_SENSOR
#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
@@ -556,11 +558,11 @@
#if (TEMP_SENSOR_IS_MAX_TC(0) && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_0) || (TEMP_SENSOR_IS_MAX_TC(1) && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_1) || (TEMP_SENSOR_IS_MAX_TC(2) && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_2)
#if TEMP_SENSOR_REDUNDANT == -5
- #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 then TEMP_SENSOR_REDUNDANT must match."
+ #error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_[0-2] then TEMP_SENSOR_REDUNDANT must match."
#elif TEMP_SENSOR_REDUNDANT == -3
- #error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 then TEMP_SENSOR_REDUNDANT must match."
+ #error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_[0-2] then TEMP_SENSOR_REDUNDANT must match."
#elif TEMP_SENSOR_REDUNDANT == -2
- #error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 then TEMP_SENSOR_REDUNDANT must match."
+ #error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_[0-2] then TEMP_SENSOR_REDUNDANT must match."
#endif
#endif
#elif TEMP_SENSOR_REDUNDANT == -4
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
index a116a6670ae1..af75532f9517 100644
--- a/Marlin/src/inc/Conditionals_post.h
+++ b/Marlin/src/inc/Conditionals_post.h
@@ -697,11 +697,13 @@
/**
* Compatibility layer for MAX (SPI) temp boards
*/
+
+#define TEMP_SENSOR_IS_ANY_MAX_TC(n) (TEMP_SENSOR_IS_MAX_TC(n) || (TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
+
#if HAS_MAX_TC
// Software SPI - enable if MISO/SCK are defined.
- #if (TEMP_SENSOR_IS_MAX_TC(0) || (TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E1))) \
- && PIN_EXISTS(TEMP_0_MISO) && PIN_EXISTS(TEMP_0_SCK) && DISABLED(TEMP_SENSOR_0_FORCE_HW_SPI)
+ #if TEMP_SENSOR_IS_ANY_MAX_TC(0) && DISABLED(TEMP_SENSOR_0_FORCE_HW_SPI) && PINS_EXIST(TEMP_0_MISO, TEMP_0_SCK)
#if TEMP_SENSOR_0_IS_MAX31865 && !PIN_EXISTS(TEMP_0_MOSI)
#error "TEMP_SENSOR_0 MAX31865 requires TEMP_0_MOSI_PIN defined for Software SPI. To use Hardware SPI instead, undefine MISO/SCK or enable TEMP_SENSOR_0_FORCE_HW_SPI."
#else
@@ -709,8 +711,7 @@
#endif
#endif
- #if (TEMP_SENSOR_IS_MAX_TC(1) || (TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E1))) \
- && PIN_EXISTS(TEMP_1_MISO) && PIN_EXISTS(TEMP_1_SCK) && DISABLED(TEMP_SENSOR_1_FORCE_HW_SPI)
+ #if TEMP_SENSOR_IS_ANY_MAX_TC(1) && DISABLED(TEMP_SENSOR_1_FORCE_HW_SPI) && PINS_EXIST(TEMP_1_MISO, TEMP_1_SCK)
#if TEMP_SENSOR_1_IS_MAX31865 && !PIN_EXISTS(TEMP_1_MOSI)
#error "TEMP_SENSOR_1 MAX31865 requires TEMP_1_MOSI_PIN defined for Software SPI. To use Hardware SPI instead, undefine MISO/SCK or enable TEMP_SENSOR_1_FORCE_HW_SPI."
#else
@@ -718,8 +719,7 @@
#endif
#endif
- #if (TEMP_SENSOR_IS_MAX_TC(2) || (TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E2))) \
- && PIN_EXISTS(TEMP_2_MISO) && PIN_EXISTS(TEMP_2_SCK) && DISABLED(TEMP_SENSOR_2_FORCE_HW_SPI)
+ #if TEMP_SENSOR_IS_ANY_MAX_TC(2) && DISABLED(TEMP_SENSOR_2_FORCE_HW_SPI) && PINS_EXIST(TEMP_2_MISO, TEMP_2_SCK)
#if TEMP_SENSOR_2_IS_MAX31865 && !PIN_EXISTS(TEMP_2_MOSI)
#error "TEMP_SENSOR_2 MAX31865 requires TEMP_2_MOSI_PIN defined for Software SPI. To use Hardware SPI instead, undefine MISO/SCK or enable TEMP_SENSOR_2_FORCE_HW_SPI."
#else
@@ -727,8 +727,7 @@
#endif
#endif
- #if (TEMP_SENSOR_IS_MAX_TC(BED)) \
- && PIN_EXISTS(TEMP_BED_MISO) && PIN_EXISTS(TEMP_BED_SCK) && DISABLED(TEMP_SENSOR_BED_FORCE_HW_SPI)
+ #if (TEMP_SENSOR_IS_MAX_TC(BED)) && DISABLED(TEMP_SENSOR_BED_FORCE_HW_SPI) && PINS_EXIST(TEMP_BED_MISO, TEMP_BED_SCK)
#if TEMP_SENSOR_BED_IS_MAX31865 && !PIN_EXISTS(TEMP_BED_MOSI)
#error "TEMP_SENSOR_BED MAX31865 requires TEMP_BED_MOSI_PIN defined for Software SPI. To use Hardware SPI instead, undefine MISO/SCK or enable TEMP_SENSOR_BED_FORCE_HW_SPI."
#else
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 8796ea224fdc..2eeff59ed38c 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -2057,6 +2057,8 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
#error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE E0 requires TEMP_0_CS_PIN."
#elif TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E1) && !PIN_EXISTS(TEMP_1_CS)
#error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE E1 requires TEMP_1_CS_PIN."
+ #elif TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E2) && !PIN_EXISTS(TEMP_2_CS)
+ #error "TEMP_SENSOR_REDUNDANT MAX Thermocouple with TEMP_SENSOR_REDUNDANT_SOURCE E2 requires TEMP_2_CS_PIN."
#endif
#endif
@@ -2089,7 +2091,9 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
#error "TEMP_1_PIN or TEMP_1_CS_PIN not defined for this board."
#endif
#if HOTENDS > 2
- #if TEMP_SENSOR_2 == 100
+ #if TEMP_SENSOR_IS_MAX_TC(2) && !PIN_EXISTS(TEMP_2_CS)
+ #error "TEMP_SENSOR_2 MAX thermocouple requires TEMP_2_CS_PIN."
+ #elif TEMP_SENSOR_2 == 100
#error "TEMP_SENSOR_2 can't use Soc temperature sensor."
#elif TEMP_SENSOR_2 == 0
#error "TEMP_SENSOR_2 is required with 3 or more HOTENDS."
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index b92615bac1c5..a4e911594e30 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -74,7 +74,6 @@
// MAX TC related macros
#define TEMP_SENSOR_IS_MAX(n, M) (ENABLED(TEMP_SENSOR_##n##_IS_MAX##M) || (ENABLED(TEMP_SENSOR_REDUNDANT_IS_MAX##M) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
-#define TEMP_SENSOR_IS_ANY_MAX_TC(n) (TEMP_SENSOR_IS_MAX_TC(n) || (TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E##n)))
// LIB_MAX6675 can be added to the build_flags in platformio.ini to use a user-defined library
// If LIB_MAX6675 is not on the build_flags then raw SPI reads will be used.
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
index 8b6336f6b6b4..d174bfd11dbd 100644
--- a/Marlin/src/module/temperature.h
+++ b/Marlin/src/module/temperature.h
@@ -1335,13 +1335,11 @@ class Temperature {
// MAX Thermocouples
#if HAS_MAX_TC
- #define MAX_TC_COUNT TEMP_SENSOR_IS_MAX_TC(0) + TEMP_SENSOR_IS_MAX_TC(1) + TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
+ #define MAX_TC_COUNT TEMP_SENSOR_IS_MAX_TC(0) + TEMP_SENSOR_IS_MAX_TC(1) + TEMP_SENSOR_IS_MAX_TC(2) + TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
#if MAX_TC_COUNT > 1
#define HAS_MULTI_MAX_TC 1
- #define READ_MAX_TC(N) read_max_tc(N)
- #else
- #define READ_MAX_TC(N) read_max_tc()
#endif
+ #define READ_MAX_TC(N) read_max_tc(TERN_(HAS_MULTI_MAX_TC, N))
static raw_adc_t read_max_tc(TERN_(HAS_MULTI_MAX_TC, const uint8_t hindex=0));
#endif
#if TEMP_SENSOR_IS_MAX_TC(BED)
From 879230f237a7c753d1eab866895412cb45186e0c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 20 Nov 2023 21:42:28 -0600
Subject: [PATCH 7/7] Fix bed ADC and runaway
---
Marlin/src/inc/Warnings.cpp | 3 +++
Marlin/src/module/temperature.cpp | 25 +++++++++++++------------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/Marlin/src/inc/Warnings.cpp b/Marlin/src/inc/Warnings.cpp
index a8820af179a7..26ecfbf533a5 100644
--- a/Marlin/src/inc/Warnings.cpp
+++ b/Marlin/src/inc/Warnings.cpp
@@ -59,6 +59,9 @@
#if HAS_COOLER && DISABLED(THERMAL_PROTECTION_COOLER)
#warning "Safety Alert! Enable THERMAL_PROTECTION_COOLER for the final build!"
#endif
+#if ENABLED(IGNORE_THERMOCOUPLE_ERRORS)
+ #warning "Safety Alert! Disable IGNORE_THERMOCOUPLE_ERRORS for the final build!"
+#endif
#if ANY_THERMISTOR_IS(998) || ANY_THERMISTOR_IS(999)
#warning "Warning! Don't use dummy thermistors (998/999) for final build!"
#endif
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index a4e911594e30..fc9e08fe7cac 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -2124,12 +2124,10 @@ void Temperature::task() {
#if TEMP_SENSOR_IS_MAX_TC(BED)
{
const auto deg = degBed();
- if (deg > (BED_MAXTEMP) - 1.00f) MAXTEMP_ERROR(H_REDUNDANT, deg);
- if (deg < (BED_MINTEMP) + 0.01f) MINTEMP_ERROR(H_REDUNDANT, deg);
+ if (deg > _MIN(BED_MAXTEMP, TEMP_SENSOR_BED_MAX_TC_TMAX - 1.00f)) MAXTEMP_ERROR(H_BED, deg);
+ if (deg < _MAX(BED_MINTEMP, TEMP_SENSOR_BED_MAX_TC_TMIN + 0.01f)) MINTEMP_ERROR(H_BED, deg);
}
#endif
- #else
- #warning "Safety Alert! Disable IGNORE_THERMOCOUPLE_ERRORS for the final build!"
#endif
const millis_t ms = millis();
@@ -2343,7 +2341,7 @@ void Temperature::task() {
max31865_0.temperature(MAX31865_SENSOR_OHMS_0, MAX31865_CALIBRATION_OHMS_0)
);
#else
- return (int16_t)raw * 0.25;
+ return (int16_t)raw * 0.25f;
#endif
#elif TEMP_SENSOR_0_IS_AD595
return TEMP_AD595(raw);
@@ -2362,7 +2360,7 @@ void Temperature::task() {
max31865_1.temperature(MAX31865_SENSOR_OHMS_1, MAX31865_CALIBRATION_OHMS_1)
);
#else
- return (int16_t)raw * 0.25;
+ return (int16_t)raw * 0.25f;
#endif
#elif TEMP_SENSOR_1_IS_AD595
return TEMP_AD595(raw);
@@ -2381,7 +2379,7 @@ void Temperature::task() {
max31865_2.temperature(MAX31865_SENSOR_OHMS_2, MAX31865_CALIBRATION_OHMS_2)
);
#else
- return (int16_t)raw * 0.25;
+ return (int16_t)raw * 0.25f;
#endif
#elif TEMP_SENSOR_2_IS_AD595
return TEMP_AD595(raw);
@@ -2465,7 +2463,7 @@ void Temperature::task() {
max31865_BED.temperature(MAX31865_SENSOR_OHMS_BED, MAX31865_CALIBRATION_OHMS_BED)
);
#else
- return (int16_t)raw * 0.25;
+ return (int16_t)raw * 0.25f;
#endif
#elif TEMP_SENSOR_BED_IS_THERMISTOR
SCAN_THERMISTOR_TABLE(TEMPTABLE_BED, TEMPTABLE_BED_LEN);
@@ -2572,11 +2570,11 @@ void Temperature::task() {
#if TEMP_SENSOR_REDUNDANT_IS_CUSTOM
return user_thermistor_to_deg_c(CTI_REDUNDANT, raw);
#elif TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E0)
- return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_0.temperature(raw), (int16_t)raw * 0.25);
+ return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_0.temperature(raw), (int16_t)raw * 0.25f);
#elif TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E1)
- return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_1.temperature(raw), (int16_t)raw * 0.25);
+ return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_1.temperature(raw), (int16_t)raw * 0.25f);
#elif TEMP_SENSOR_IS_MAX_TC(REDUNDANT) && REDUNDANT_TEMP_MATCH(SOURCE, E2)
- return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_2.temperature(raw), (int16_t)raw * 0.25);
+ return TERN(TEMP_SENSOR_REDUNDANT_IS_MAX31865, max31865_2.temperature(raw), (int16_t)raw * 0.25f);
#elif TEMP_SENSOR_REDUNDANT_IS_THERMISTOR
SCAN_THERMISTOR_TABLE(TEMPTABLE_REDUNDANT, TEMPTABLE_REDUNDANT_LEN);
#elif TEMP_SENSOR_REDUNDANT_IS_AD595
@@ -3664,13 +3662,16 @@ void Temperature::update_raw_temperatures() {
temp_redundant.update();
#endif
+ #if HAS_TEMP_ADC_BED && !TEMP_SENSOR_IS_MAX_TC(BED)
+ temp_bed.update();
+ #endif
+
TERN_(HAS_TEMP_ADC_2, temp_hotend[2].update());
TERN_(HAS_TEMP_ADC_3, temp_hotend[3].update());
TERN_(HAS_TEMP_ADC_4, temp_hotend[4].update());
TERN_(HAS_TEMP_ADC_5, temp_hotend[5].update());
TERN_(HAS_TEMP_ADC_6, temp_hotend[6].update());
TERN_(HAS_TEMP_ADC_7, temp_hotend[7].update());
- TERN_(HAS_TEMP_ADC_BED, temp_bed.update());
TERN_(HAS_TEMP_ADC_CHAMBER, temp_chamber.update());
TERN_(HAS_TEMP_ADC_PROBE, temp_probe.update());
TERN_(HAS_TEMP_ADC_COOLER, temp_cooler.update());