From 0c55095c5e1134779d9aeb1bf9d5ce7851677c6a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 5 Mar 2017 22:06:44 -0600 Subject: [PATCH] Move Cooldown above Preheat --- Marlin/ultralcd.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index ac7fc6b36..a769923ef 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1374,6 +1374,19 @@ KeepDrawing: // #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 MENU_ITEM(submenu, MSG_PREHEAT_1, lcd_preheat_material1_menu); MENU_ITEM(submenu, MSG_PREHEAT_2, lcd_preheat_material2_menu); @@ -1392,16 +1405,6 @@ KeepDrawing: #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 //