|
@ -1800,13 +1800,13 @@ void Temperature::init() { |
|
|
#if HAS_HOTEND |
|
|
#if HAS_HOTEND |
|
|
|
|
|
|
|
|
#define _TEMP_MIN_E(NR) do{ \ |
|
|
#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; \ |
|
|
temp_range[NR].mintemp = tmin; \ |
|
|
while (analog_to_celsius_hotend(temp_range[NR].raw_min, NR) < tmin) \ |
|
|
while (analog_to_celsius_hotend(temp_range[NR].raw_min, NR) < tmin) \ |
|
|
temp_range[NR].raw_min += TEMPDIR(NR) * (OVERSAMPLENR); \ |
|
|
temp_range[NR].raw_min += TEMPDIR(NR) * (OVERSAMPLENR); \ |
|
|
}while(0) |
|
|
}while(0) |
|
|
#define _TEMP_MAX_E(NR) do{ \ |
|
|
#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; \ |
|
|
temp_range[NR].maxtemp = tmax; \ |
|
|
while (analog_to_celsius_hotend(temp_range[NR].raw_max, NR) > tmax) \ |
|
|
while (analog_to_celsius_hotend(temp_range[NR].raw_max, NR) > tmax) \ |
|
|
temp_range[NR].raw_max -= TEMPDIR(NR) * (OVERSAMPLENR); \ |
|
|
temp_range[NR].raw_max -= TEMPDIR(NR) * (OVERSAMPLENR); \ |
|
|