JoAnn Manges
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
4 deletions
-
Marlin/src/module/temperature.cpp
|
|
|
@ -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 |
|
|
|
|
|
|
|
//
|
|
|
|
@ -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); |
|
|
|
|
