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

Merge pull request #474 from xifle/Marlin_v1

Browse source 
Fixed "Cooldown" Selection not reseting bed temp
This commit is contained in:
ErikZalm 2013-05-14 14:58:53 -07:00
commit c9cf2174dd
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Marlin/ultralcd.cpp
View file

@ -252,6 +252,7 @@ void lcd_preheat_pla()
setTargetBed(plaPreheatHPBTemp); setTargetBed(plaPreheatHPBTemp);
fanSpeed = plaPreheatFanSpeed; fanSpeed = plaPreheatFanSpeed;
lcd_return_to_status(); lcd_return_to_status();
setWatch(); // heater sanity check timer
} }
void lcd_preheat_abs() void lcd_preheat_abs()
@ -262,6 +263,16 @@ void lcd_preheat_abs()
setTargetBed(absPreheatHPBTemp); setTargetBed(absPreheatHPBTemp);
fanSpeed = absPreheatFanSpeed; fanSpeed = absPreheatFanSpeed;
lcd_return_to_status(); lcd_return_to_status();
setWatch(); // heater sanity check timer
}
static void lcd_cooldown()
{
setTargetHotend0(0);
setTargetHotend1(0);
setTargetHotend2(0);
setTargetBed(0);
lcd_return_to_status();
} }
static void lcd_tune_menu() static void lcd_tune_menu()
@ -299,7 +310,7 @@ static void lcd_prepare_menu()
//MENU_ITEM(gcode, MSG_SET_ORIGIN, PSTR("G92 X0 Y0 Z0")); //MENU_ITEM(gcode, MSG_SET_ORIGIN, PSTR("G92 X0 Y0 Z0"));
MENU_ITEM(function, MSG_PREHEAT_PLA, lcd_preheat_pla); MENU_ITEM(function, MSG_PREHEAT_PLA, lcd_preheat_pla);
MENU_ITEM(function, MSG_PREHEAT_ABS, lcd_preheat_abs); MENU_ITEM(function, MSG_PREHEAT_ABS, lcd_preheat_abs);
MENU_ITEM(gcode, MSG_COOLDOWN, PSTR("M104 S0\nM140 S0")); MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
MENU_ITEM(submenu, MSG_MOVE_AXIS, lcd_move_menu); MENU_ITEM(submenu, MSG_MOVE_AXIS, lcd_move_menu);
END_MENU(); END_MENU();
} }