MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Use RTD for MAX31865 reading (#20188)

Browse Source
This commit is contained in:
JoAnn Manges 2020-11-18 21:12:03 -08:00 committed by Scott Lahteine
parent 29d45b1144
commit 11f08804d1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/module/temperature.cpp
View File

@ -2248,10 +2248,7 @@ void Temperature::disable_all_heaters() {
#if HAS_MAX31865 #if HAS_MAX31865
Adafruit_MAX31865 &maxref = MAX6675_SEL(max31865_0, max31865_1); Adafruit_MAX31865 &maxref = MAX6675_SEL(max31865_0, max31865_1);
max6675_temp = int(maxref.temperature( const uint16_t max31865_ohms = (uint32_t(maxref.readRTD()) * MAX6675_SEL(MAX31865_CALIBRATION_OHMS_0, MAX31865_CALIBRATION_OHMS_1)) >> 16;
MAX6675_SEL(MAX31865_SENSOR_OHMS_0, MAX31865_SENSOR_OHMS_1),
MAX6675_SEL(MAX31865_CALIBRATION_OHMS_0, MAX31865_CALIBRATION_OHMS_1)
));
#endif #endif
// //
@ -2325,6 +2322,9 @@ void Temperature::disable_all_heaters() {
if (max6675_temp & 0x00002000) max6675_temp |= 0xFFFFC000; // Support negative temperature if (max6675_temp & 0x00002000) max6675_temp |= 0xFFFFC000; // Support negative temperature
#endif #endif
// Return the RTD resistance for MAX31865 for display in SHOW_TEMP_ADC_VALUES
TERN_(HAS_MAX31865, max6675_temp = max31865_ohms);
MAX6675_TEMP(hindex) = max6675_temp; MAX6675_TEMP(hindex) = max6675_temp;
return int(max6675_temp); return int(max6675_temp);