浏览代码

Fixed max/min temperature bug

Erik van der Zalm 13 年前
父节点
当前提交
6841a10446
共有 1 个文件被更改,包括 7 次插入7 次删除
  1. 7
    7
      Marlin/temperature.cpp

+ 7
- 7
Marlin/temperature.cpp 查看文件

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

正在加载...
取消
保存