Bläddra i källkod

Fix current_temperature_chamber compile error

Fix #10505
Scott Lahteine 7 år sedan
förälder
incheckning
9789c1c719
2 ändrade filer med 7 tillägg och 8 borttagningar
  1. 5
    2
      Marlin/src/module/temperature.cpp
  2. 2
    6
      Marlin/src/module/temperature.h

+ 5
- 2
Marlin/src/module/temperature.cpp Visa fil

@@ -566,8 +566,11 @@ int Temperature::getHeaterPower(const int heater) {
566 566
     HOTEND_LOOP()
567 567
       if (current_temperature[e] > EXTRUDER_AUTO_FAN_TEMPERATURE)
568 568
         SBI(fanState, pgm_read_byte(&fanBit[e]));
569
-    if (current_temperature_chamber > EXTRUDER_AUTO_FAN_TEMPERATURE)
570
-      SBI(fanState, pgm_read_byte(&fanBit[5]));
569
+
570
+    #if HAS_TEMP_CHAMBER
571
+      if (current_temperature_chamber > EXTRUDER_AUTO_FAN_TEMPERATURE)
572
+        SBI(fanState, pgm_read_byte(&fanBit[5]));
573
+    #endif
571 574
 
572 575
     uint8_t fanDone = 0;
573 576
     for (uint8_t f = 0; f < COUNT(fanPin); f++) {

+ 2
- 6
Marlin/src/module/temperature.h Visa fil

@@ -159,11 +159,6 @@ class Temperature {
159 159
       #endif
160 160
     #endif
161 161
 
162
-    #if HAS_TEMP_CHAMBER
163
-      static float current_temperature_chamber;
164
-      static int16_t current_temperature_chamber_raw;
165
-    #endif
166
-
167 162
     #if ENABLED(BABYSTEPPING)
168 163
       static volatile int babystepsTodo[3];
169 164
     #endif
@@ -265,9 +260,10 @@ class Temperature {
265 260
 
266 261
     #if HAS_TEMP_CHAMBER
267 262
       static uint16_t raw_temp_chamber_value;
263
+      static float current_temperature_chamber;
264
+      static int16_t current_temperature_chamber_raw;
268 265
     #endif
269 266
 
270
-
271 267
     #ifdef MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED
272 268
       static uint8_t consecutive_low_temperature_error[HOTENDS];
273 269
     #endif

Laddar…
Avbryt
Spara