Browse Source

Suppress warning

pull/1/head
esenapaj 8 years ago
parent
commit
1749a7fae3
  1. 11
      Marlin/Marlin_main.cpp
  2. 2
      Marlin/temperature.cpp

11
Marlin/Marlin_main.cpp

@ -8487,13 +8487,10 @@ void prepare_move_to_destination() {
void handle_status_leds(void) {
if (ELAPSED(millis(), next_status_led_update_ms)) {
next_status_led_update_ms += 500; // Update every 0.5s
float max_temp =
#if HAS_TEMP_BED
MAX3(max_temp, thermalManager.degTargetBed(), thermalManager.degBed())
#else
0.0
#endif
;
float max_temp = 0.0;
#if HAS_TEMP_BED
max_temp = MAX3(max_temp, thermalManager.degTargetBed(), thermalManager.degBed());
#endif
HOTEND_LOOP() {
max_temp = MAX3(max_temp, thermalManager.degHotend(e), thermalManager.degTargetHotend(e));
}

2
Marlin/temperature.cpp

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

Loading…
Cancel
Save