瀏覽代碼

Fix chamber temperature measurement (#13350)

MoellerDi 6 年之前
父節點
當前提交
c36989c39e
共有 1 個文件被更改,包括 9 次插入5 次删除
  1. 9
    5
      Marlin/src/module/temperature.cpp

+ 9
- 5
Marlin/src/module/temperature.cpp 查看文件

@@ -219,6 +219,7 @@ hotend_info_t Temperature::temp_hotend[HOTENDS]; // = { 0 }
219 219
 #endif // HAS_HEATED_BED
220 220
 
221 221
 #if HAS_TEMP_CHAMBER
222
+  chamber_info_t Temperature::temp_chamber; // = { 0 }
222 223
   #if HAS_HEATED_CHAMBER
223 224
     #ifdef CHAMBER_MINTEMP
224 225
       int16_t Temperature::mintemp_raw_CHAMBER = HEATER_CHAMBER_RAW_LO_TEMP;
@@ -226,7 +227,6 @@ hotend_info_t Temperature::temp_hotend[HOTENDS]; // = { 0 }
226 227
     #ifdef CHAMBER_MAXTEMP
227 228
       int16_t Temperature::maxtemp_raw_CHAMBER = HEATER_CHAMBER_RAW_HI_TEMP;
228 229
     #endif
229
-    chamber_info_t temp_chamber; // = { 0 }
230 230
     #if WATCH_CHAMBER
231 231
       heater_watch_t Temperature::watch_chamber = { 0 };
232 232
       millis_t Temperature::next_chamber_check_ms;
@@ -1993,7 +1993,7 @@ void Temperature::disable_all_heaters() {
1993 1993
     #endif
1994 1994
   #endif
1995 1995
 
1996
-  #if HAS_TEMP_CHAMBER
1996
+  #if HAS_HEATED_CHAMBER
1997 1997
     temp_chamber.target = 0;
1998 1998
     temp_chamber.soft_pwm_amount = 0;
1999 1999
     #if HAS_HEATED_CHAMBER
@@ -2264,13 +2264,17 @@ void Temperature::readings_ready() {
2264 2264
     if (bed_on && BEDCMP(mintemp_raw_BED, temp_bed.raw)) min_temp_error(-1);
2265 2265
   #endif
2266 2266
 
2267
-  #if HAS_TEMP_CHAMBER
2268
-    #if TEMPDIR(BED) < 0
2267
+  #if HAS_HEATED_CHAMBER
2268
+    #if TEMPDIR(CHAMBER) < 0
2269 2269
       #define CHAMBERCMP(A,B) ((A)<=(B))
2270 2270
     #else
2271 2271
       #define CHAMBERCMP(A,B) ((A)>=(B))
2272 2272
     #endif
2273
-    const bool chamber_on = (temp_chamber.target > 0) || (temp_chamber.soft_pwm_amount > 0);
2273
+    const bool chamber_on = (temp_chamber.target > 0) 
2274
+      #if ENABLED(PIDTEMPCHAMBER)
2275
+        || (temp_chamber.soft_pwm_amount > 0)
2276
+      #endif
2277
+    ;
2274 2278
     if (CHAMBERCMP(temp_chamber.raw, maxtemp_raw_CHAMBER)) max_temp_error(-2);
2275 2279
     if (chamber_on && CHAMBERCMP(mintemp_raw_CHAMBER, temp_chamber.raw)) min_temp_error(-2);
2276 2280
   #endif

Loading…
取消
儲存