Skip to content

Use RTD for MAX31865 reading #20188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 8 commits into from
Nov 19, 2020
Merged

Use RTD for MAX31865 reading #20188

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d152a89
Fix MAX31865 to show RTD resistance values
GadgetAngel Nov 18, 2020
42e0e4f
Merge branch 'bugfix-2.0.x' into Marlin-Fix-MAX31865-Show-Values
GadgetAngel Nov 18, 2020
4d99ca6
Took out the call statement made 1 line calc.
GadgetAngel Nov 18, 2020
6d877d0
fix error
GadgetAngel Nov 18, 2020
0429f5c
Merge branch 'bugfix-2.0.x' into Marlin-Fix-MAX31865-Show-Values
GadgetAngel Nov 18, 2020
f97d42a
Update temperature.cpp
thinkyhead Nov 19, 2020
2beb040
Update temperature.cpp
thinkyhead Nov 19, 2020
f858153
int maths
thinkyhead Nov 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Marlin/src/module/temperature.cpp
View file
Open in desktop
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