Browse Source

Suppress warning

esenapaj 8 years ago
parent
commit
1749a7fae3
2 changed files with 5 additions and 8 deletions
  1. 4
    7
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/temperature.cpp

+ 4
- 7
Marlin/Marlin_main.cpp View File

@@ -8487,13 +8487,10 @@ void prepare_move_to_destination() {
8487 8487
   void handle_status_leds(void) {
8488 8488
     if (ELAPSED(millis(), next_status_led_update_ms)) {
8489 8489
       next_status_led_update_ms += 500; // Update every 0.5s
8490
-      float max_temp =
8491
-        #if HAS_TEMP_BED
8492
-          MAX3(max_temp, thermalManager.degTargetBed(), thermalManager.degBed())
8493
-        #else
8494
-          0.0
8495
-        #endif
8496
-      ;
8490
+      float max_temp = 0.0;
8491
+      #if HAS_TEMP_BED
8492
+        max_temp = MAX3(max_temp, thermalManager.degTargetBed(), thermalManager.degBed());
8493
+      #endif
8497 8494
       HOTEND_LOOP() {
8498 8495
         max_temp = MAX3(max_temp, thermalManager.degHotend(e), thermalManager.degTargetHotend(e));
8499 8496
       }

+ 1
- 1
Marlin/temperature.cpp View File

@@ -479,7 +479,7 @@ int Temperature::getHeaterPower(int heater) {
479 479
     }
480 480
  
481 481
     uint8_t fanDone = 0;
482
-    for (int8_t f = 0; f < COUNT(fanPin); f++) {
482
+    for (uint8_t f = 0; f < COUNT(fanPin); f++) {
483 483
       int8_t pin = fanPin[f];
484 484
       if (pin >= 0 && !TEST(fanDone, fanBit[f])) {
485 485
         unsigned char newFanSpeed = TEST(fanState, fanBit[f]) ? EXTRUDER_AUTO_FAN_SPEED : 0;

Loading…
Cancel
Save