SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Suppress warning

Browse source
This commit is contained in:
esenapaj 2016-08-17 01:19:51 +09:00
parent d07d85ac9f
commit 1749a7fae3
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Marlin/Marlin_main.cpp
View file

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

2
Marlin/temperature.cpp
View file

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