Browse Source

Fixed max/min temperature bug

Erik van der Zalm 13 years ago
parent
commit
6841a10446
1 changed files with 7 additions and 7 deletions
  1. 7
    7
      Marlin/temperature.cpp

+ 7
- 7
Marlin/temperature.cpp View File

99
 #endif //MINTEMP
99
 #endif //MINTEMP
100
 #ifdef HEATER_0_MAXTEMP
100
 #ifdef HEATER_0_MAXTEMP
101
   #ifdef HEATER_0_USES_AD595
101
   #ifdef HEATER_0_USES_AD595
102
-    static int maxttemp_0 = 0;
103
-  #else
104
     static int maxttemp_0 = 16383;
102
     static int maxttemp_0 = 16383;
103
+  #else
104
+    static int maxttemp_0 = 0;
105
   #endif
105
   #endif
106
 #endif //MAXTEMP
106
 #endif //MAXTEMP
107
 
107
 
114
 #endif //MINTEMP
114
 #endif //MINTEMP
115
 #ifdef HEATER_1_MAXTEMP
115
 #ifdef HEATER_1_MAXTEMP
116
   #ifdef HEATER_1_USES_AD595
116
   #ifdef HEATER_1_USES_AD595
117
-    static int maxttemp_1 = 0;
118
-  #else
119
     static int maxttemp_1 = 16383;
117
     static int maxttemp_1 = 16383;
118
+  #else
119
+    static int maxttemp_1 = 0;
120
   #endif
120
   #endif
121
 #endif //MAXTEMP
121
 #endif //MAXTEMP
122
 
122
 
129
 #endif //BED_MINTEMP
129
 #endif //BED_MINTEMP
130
 #ifdef BED_MAXTEMP
130
 #ifdef BED_MAXTEMP
131
   #ifdef BED_USES_AD595
131
   #ifdef BED_USES_AD595
132
-    static int bed_maxttemp = 0;
133
-  #else
134
     static int bed_maxttemp = 16383;
132
     static int bed_maxttemp = 16383;
133
+  #else
134
+    static int bed_maxttemp = 0;
135
   #endif
135
   #endif
136
 #endif //BED_MAXTEMP
136
 #endif //BED_MAXTEMP
137
 
137
 
377
   TIMSK0 |= (1<<OCIE0B);  
377
   TIMSK0 |= (1<<OCIE0B);  
378
   
378
   
379
   // Wait for temperature measurement to settle
379
   // Wait for temperature measurement to settle
380
-  delay(500);
380
+  delay(200);
381
 
381
 
382
 #ifdef HEATER_0_MINTEMP
382
 #ifdef HEATER_0_MINTEMP
383
   minttemp_0 = temp2analog(HEATER_0_MINTEMP);
383
   minttemp_0 = temp2analog(HEATER_0_MINTEMP);

Loading…
Cancel
Save