Skip to content
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

Fix User Sensor 1000, reversed Pt100 / Pt1000 #18590

Merged
merged 4 commits into from
Jul 8, 2020
Merged

Fix User Sensor 1000, reversed Pt100 / Pt1000 #18590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f426ea0
Solves: #18559 set thermistor 110,147,1010 and 1047 as #define REVER…
Jul 8, 2020
1798a3f
Fix thermistor 1000
Jul 8, 2020
c7a8678
remove extra spaces
Jul 8, 2020
be5fbdd
Use HEATER_n_USER_THERMISTOR define
thinkyhead Jul 8, 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
4 changes: 2 additions & 2 deletions Marlin/src/module/temperature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1800,13 +1800,13 @@ void Temperature::init() {
#if HAS_HOTEND

#define _TEMP_MIN_E(NR) do{ \
const int16_t tmin = _MAX(HEATER_ ##NR## _MINTEMP, (int16_t)pgm_read_word(&HEATER_ ##NR## _TEMPTABLE[HEATER_ ##NR## _SENSOR_MINTEMP_IND].celsius)); \
const int16_t tmin = _MAX(HEATER_ ##NR## _MINTEMP, TERN(HEATER_##NR##_USER_THERMISTOR, 0, (int16_t)pgm_read_word(&HEATER_ ##NR## _TEMPTABLE[HEATER_ ##NR## _SENSOR_MINTEMP_IND].celsius))); \
temp_range[NR].mintemp = tmin; \
while (analog_to_celsius_hotend(temp_range[NR].raw_min, NR) < tmin) \
temp_range[NR].raw_min += TEMPDIR(NR) * (OVERSAMPLENR); \
}while(0)
#define _TEMP_MAX_E(NR) do{ \
const int16_t tmax = _MIN(HEATER_ ##NR## _MAXTEMP, (int16_t)pgm_read_word(&HEATER_ ##NR## _TEMPTABLE[HEATER_ ##NR## _SENSOR_MAXTEMP_IND].celsius) - 1); \
const int16_t tmax = _MIN(HEATER_ ##NR## _MAXTEMP, TERN(HEATER_##NR##_USER_THERMISTOR, 2000, (int16_t)pgm_read_word(&HEATER_ ##NR## _TEMPTABLE[HEATER_ ##NR## _SENSOR_MAXTEMP_IND].celsius) - 1)); \
temp_range[NR].maxtemp = tmax; \
while (analog_to_celsius_hotend(temp_range[NR].raw_max, NR) > tmax) \
temp_range[NR].raw_max -= TEMPDIR(NR) * (OVERSAMPLENR); \
Expand Down
2 changes: 2 additions & 0 deletions Marlin/src/module/thermistor/thermistor_1010.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
*/
#pragma once

#define REVERSE_TEMP_SENSOR_RANGE_1010 1

// Pt1000 with 1k0 pullup
const temp_entry_t temptable_1010[] PROGMEM = {
PtLine( 0, 1000, 1000),
Expand Down
2 changes: 2 additions & 0 deletions Marlin/src/module/thermistor/thermistor_1047.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
*/
#pragma once

#define REVERSE_TEMP_SENSOR_RANGE_1047 1

// Pt1000 with 4k7 pullup
const temp_entry_t temptable_1047[] PROGMEM = {
// only a few values are needed as the curve is very flat
Expand Down
2 changes: 2 additions & 0 deletions Marlin/src/module/thermistor/thermistor_110.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
*/
#pragma once

#define REVERSE_TEMP_SENSOR_RANGE_110 1

// Pt100 with 1k0 pullup
const temp_entry_t temptable_110[] PROGMEM = {
// only a few values are needed as the curve is very flat
Expand Down
2 changes: 2 additions & 0 deletions Marlin/src/module/thermistor/thermistor_147.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
*/
#pragma once

#define REVERSE_TEMP_SENSOR_RANGE_147 1

// Pt100 with 4k7 pullup
const temp_entry_t temptable_147[] PROGMEM = {
// only a few values are needed as the curve is very flat
Expand Down