SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1825 from shaggythesheep/bugfix_no_heaters

Browse source 
Bugfix: Temperature checks when no heaters in use
This commit is contained in:
Scott Lahteine 2015-04-06 21:25:22 -07:00
commit d05efa008d
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Marlin/temperature.cpp
View file

@ -1525,15 +1525,17 @@ ISR(TIMER0_COMPB_vect) {
for (int i = 0; i < 4; i++) raw_temp_value[i] = 0; for (int i = 0; i < 4; i++) raw_temp_value[i] = 0;
raw_temp_bed_value = 0; raw_temp_bed_value = 0;
#ifndef HEATER_0_USES_MAX6675 #if HAS_TEMP_0
#if HEATER_0_RAW_LO_TEMP > HEATER_0_RAW_HI_TEMP #ifndef HEATER_0_USES_MAX6675
#define GE0 <= #if HEATER_0_RAW_LO_TEMP > HEATER_0_RAW_HI_TEMP
#else #define GE0 <=
#define GE0 >= #else
#endif #define GE0 >=
if (current_temperature_raw[0] GE0 maxttemp_raw[0]) max_temp_error(0); #endif
if (minttemp_raw[0] GE0 current_temperature_raw[0]) min_temp_error(0); if (current_temperature_raw[0] GE0 maxttemp_raw[0]) max_temp_error(0);
#endif if (minttemp_raw[0] GE0 current_temperature_raw[0]) min_temp_error(0);
#endif
#endif
#if HAS_TEMP_1 #if HAS_TEMP_1
#if HEATER_1_RAW_LO_TEMP > HEATER_1_RAW_HI_TEMP #if HEATER_1_RAW_LO_TEMP > HEATER_1_RAW_HI_TEMP