bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Changed the type of variable to bool, the name to "cancel_heatup", flags implementation and added this fix to M190 gcode too.

Browse Source
This commit is contained in:
Pablo Clemente
2014-06-30 15:12:13 +02:00
parent cd3220d055
commit d86c3cf43c
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/ultralcd.cpp
View File

@ -19,7 +19,7 @@ int absPreheatHotendTemp;
int absPreheatHPBTemp;
int absPreheatFanSpeed;
boolean forced_heating_stop = false ;
bool cancel_heatup = false ;
#ifdef ULTIPANEL
static float manual_feedrate[] = MANUAL_FEEDRATE;
@ -195,7 +195,7 @@ static void lcd_status_screen()
currentMenu = lcd_main_menu;
encoderPosition = 0;
lcd_quick_feedback();
lcd_implementation_init(); // to maybe revive the LCD if static electricity killed it.
lcd_implementation_init(); // to maybe revive the LCD if static electricity killed it.
}
#ifdef ULTIPANEL_FEEDMULTIPLY
@ -258,7 +258,7 @@ static void lcd_sdcard_stop()
}
autotempShutdown();
forced_heating_stop = true;
cancel_heatup = true;
}
/* Menu implementation */