CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move Cooldown above Preheat

Browse Source
This commit is contained in:
Scott Lahteine 2017-03-05 22:06:44 -06:00
parent c15c65f18a
commit 0c55095c5e
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Marlin/ultralcd.cpp
View File

@ -1374,6 +1374,19 @@ KeepDrawing:
// //
#if TEMP_SENSOR_0 != 0 #if TEMP_SENSOR_0 != 0
//
// Cooldown
//
bool has_heat = false;
HOTEND_LOOP() if (thermalManager.target_temperature[HOTEND_INDEX]) { has_heat = true; break; }
#if HAS_TEMP_BED
if (thermalManager.target_temperature_bed) has_heat = true;
#endif
if (has_heat) MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
//
// Preheat for Material 1 and 2
//
#if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0 #if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0
MENU_ITEM(submenu, MSG_PREHEAT_1, lcd_preheat_material1_menu); MENU_ITEM(submenu, MSG_PREHEAT_1, lcd_preheat_material1_menu);
MENU_ITEM(submenu, MSG_PREHEAT_2, lcd_preheat_material2_menu); MENU_ITEM(submenu, MSG_PREHEAT_2, lcd_preheat_material2_menu);
@ -1392,16 +1405,6 @@ KeepDrawing:
#endif // TEMP_SENSOR_0 != 0 #endif // TEMP_SENSOR_0 != 0
//
// Cooldown
//
bool has_heat = false;
HOTEND_LOOP() if (thermalManager.target_temperature[HOTEND_INDEX]) { has_heat = true; break; }
#if HAS_TEMP_BED
if (thermalManager.target_temperature_bed) has_heat = true;
#endif
if (has_heat) MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
// //
// BLTouch Self-Test and Reset // BLTouch Self-Test and Reset
// //