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

Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

Browse source
This commit is contained in:
Bernhard Kubicek 2011-11-19 17:09:43 +01:00
commit 953d830bba
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Marlin/temperature.cpp
View file

@ -99,9 +99,9 @@ static unsigned long previous_millis_heater, previous_millis_bed_heater;
#endif //MINTEMP #endif //MINTEMP
#ifdef HEATER_0_MAXTEMP #ifdef HEATER_0_MAXTEMP
#ifdef HEATER_0_USES_AD595 #ifdef HEATER_0_USES_AD595
static int maxttemp_0 = 0;
#else
static int maxttemp_0 = 16383; static int maxttemp_0 = 16383;
#else
static int maxttemp_0 = 0;
#endif #endif
#endif //MAXTEMP #endif //MAXTEMP
@ -114,9 +114,9 @@ static unsigned long previous_millis_heater, previous_millis_bed_heater;
#endif //MINTEMP #endif //MINTEMP
#ifdef HEATER_1_MAXTEMP #ifdef HEATER_1_MAXTEMP
#ifdef HEATER_1_USES_AD595 #ifdef HEATER_1_USES_AD595
static int maxttemp_1 = 0;
#else
static int maxttemp_1 = 16383; static int maxttemp_1 = 16383;
#else
static int maxttemp_1 = 0;
#endif #endif
#endif //MAXTEMP #endif //MAXTEMP
@ -129,9 +129,9 @@ static unsigned long previous_millis_heater, previous_millis_bed_heater;
#endif //BED_MINTEMP #endif //BED_MINTEMP
#ifdef BED_MAXTEMP #ifdef BED_MAXTEMP
#ifdef BED_USES_AD595 #ifdef BED_USES_AD595
static int bed_maxttemp = 0;
#else
static int bed_maxttemp = 16383; static int bed_maxttemp = 16383;
#else
static int bed_maxttemp = 0;
#endif #endif
#endif //BED_MAXTEMP #endif //BED_MAXTEMP
@ -377,7 +377,7 @@ void tp_init()
TIMSK0 |= (1<<OCIE0B); TIMSK0 |= (1<<OCIE0B);
// Wait for temperature measurement to settle // Wait for temperature measurement to settle
delay(500); delay(200);
#ifdef HEATER_0_MINTEMP #ifdef HEATER_0_MINTEMP
minttemp_0 = temp2analog(HEATER_0_MINTEMP); minttemp_0 = temp2analog(HEATER_0_MINTEMP);