Skip to content

Commit

Permalink
Use RTD for MAX31865 reading (MarlinFirmware#20188)
Browse files Browse the repository at this point in the history
  • Loading branch information
GadgetAngel authored and FhlostonParadise committed Nov 21, 2020
1 parent a7084d1 commit 4b54d13
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Marlin/src/module/temperature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2248,10 +2248,7 @@ void Temperature::disable_all_heaters() {

#if HAS_MAX31865
Adafruit_MAX31865 &maxref = MAX6675_SEL(max31865_0, max31865_1);
max6675_temp = int(maxref.temperature(
MAX6675_SEL(MAX31865_SENSOR_OHMS_0, MAX31865_SENSOR_OHMS_1),
MAX6675_SEL(MAX31865_CALIBRATION_OHMS_0, MAX31865_CALIBRATION_OHMS_1)
));
const uint16_t max31865_ohms = (uint32_t(maxref.readRTD()) * MAX6675_SEL(MAX31865_CALIBRATION_OHMS_0, MAX31865_CALIBRATION_OHMS_1)) >> 16;
#endif

//
Expand Down Expand Up @@ -2325,6 +2322,9 @@ void Temperature::disable_all_heaters() {
if (max6675_temp & 0x00002000) max6675_temp |= 0xFFFFC000; // Support negative temperature
#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;

return int(max6675_temp);
Expand Down

0 comments on commit 4b54d13

Please sign in to comment.