Browse Source

Move Cooldown above Preheat

Scott Lahteine 8 years ago
parent
commit
0c55095c5e
1 changed files with 13 additions and 10 deletions
  1. 13
    10
      Marlin/ultralcd.cpp

+ 13
- 10
Marlin/ultralcd.cpp View File

@@ -1374,6 +1374,19 @@ KeepDrawing:
1374 1374
     //
1375 1375
     #if TEMP_SENSOR_0 != 0
1376 1376
 
1377
+      //
1378
+      // Cooldown
1379
+      //
1380
+      bool has_heat = false;
1381
+      HOTEND_LOOP() if (thermalManager.target_temperature[HOTEND_INDEX]) { has_heat = true; break; }
1382
+      #if HAS_TEMP_BED
1383
+        if (thermalManager.target_temperature_bed) has_heat = true;
1384
+      #endif
1385
+      if (has_heat) MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
1386
+
1387
+      //
1388
+      // Preheat for Material 1 and 2
1389
+      //
1377 1390
       #if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_BED != 0
1378 1391
         MENU_ITEM(submenu, MSG_PREHEAT_1, lcd_preheat_material1_menu);
1379 1392
         MENU_ITEM(submenu, MSG_PREHEAT_2, lcd_preheat_material2_menu);
@@ -1393,16 +1406,6 @@ KeepDrawing:
1393 1406
     #endif // TEMP_SENSOR_0 != 0
1394 1407
 
1395 1408
     //
1396
-    // Cooldown
1397
-    //
1398
-    bool has_heat = false;
1399
-    HOTEND_LOOP() if (thermalManager.target_temperature[HOTEND_INDEX]) { has_heat = true; break; }
1400
-    #if HAS_TEMP_BED
1401
-      if (thermalManager.target_temperature_bed) has_heat = true;
1402
-    #endif
1403
-    if (has_heat) MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
1404
-
1405
-    //
1406 1409
     // BLTouch Self-Test and Reset
1407 1410
     //
1408 1411
     #if ENABLED(BLTOUCH)

Loading…
Cancel
Save