Selaa lähdekoodia

Move some menu items (#14118)

InsanityAutomation 6 vuotta sitten
vanhempi
commit
9f69fbe5ee
2 muutettua tiedostoa jossa 15 lisäystä ja 15 poistoa
  1. 1
    1
      Marlin/src/lcd/menu/menu_main.cpp
  2. 14
    14
      Marlin/src/lcd/menu/menu_temperature.cpp

+ 1
- 1
Marlin/src/lcd/menu/menu_main.cpp Näytä tiedosto

265
 
265
 
266
     if (card_detected) {
266
     if (card_detected) {
267
       if (!card_open) {
267
       if (!card_open) {
268
-        MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
269
         MENU_ITEM(gcode,
268
         MENU_ITEM(gcode,
270
           #if PIN_EXISTS(SD_DETECT)
269
           #if PIN_EXISTS(SD_DETECT)
271
             MSG_CHANGE_SDCARD, PSTR("M21")
270
             MSG_CHANGE_SDCARD, PSTR("M21")
273
             MSG_RELEASE_SDCARD, PSTR("M22")
272
             MSG_RELEASE_SDCARD, PSTR("M22")
274
           #endif
273
           #endif
275
         );
274
         );
275
+        MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
276
       }
276
       }
277
     }
277
     }
278
     else {
278
     else {

+ 14
- 14
Marlin/src/lcd/menu/menu_temperature.cpp Näytä tiedosto

414
     #endif
414
     #endif
415
   #endif // FAN_COUNT > 0
415
   #endif // FAN_COUNT > 0
416
 
416
 
417
+  #if ENABLED(SPINDLE_LASER_ENABLE)
418
+    MENU_ITEM(submenu, MSG_LASER_MENU, menu_spindle_laser);
419
+  #endif
420
+  
417
   #if HAS_TEMP_HOTEND
421
   #if HAS_TEMP_HOTEND
418
 
422
 
419
     //
423
     //
420
-    // Cooldown
421
-    //
422
-    bool has_heat = false;
423
-    HOTEND_LOOP() if (thermalManager.temp_hotend[HOTEND_INDEX].target) { has_heat = true; break; }
424
-    #if HAS_TEMP_BED
425
-      if (thermalManager.temp_bed.target) has_heat = true;
426
-    #endif
427
-    if (has_heat) MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
428
-
429
-    //
430
     // Preheat for Material 1 and 2
424
     // Preheat for Material 1 and 2
431
     //
425
     //
432
     #if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_4 != 0 || TEMP_SENSOR_5 != 0 || HAS_HEATED_BED
426
     #if TEMP_SENSOR_1 != 0 || TEMP_SENSOR_2 != 0 || TEMP_SENSOR_3 != 0 || TEMP_SENSOR_4 != 0 || TEMP_SENSOR_5 != 0 || HAS_HEATED_BED
437
       MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_m2_e0_only);
431
       MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_m2_e0_only);
438
     #endif
432
     #endif
439
 
433
 
440
-  #endif // HAS_TEMP_HOTEND
434
+    //
435
+    // Cooldown
436
+    //
437
+    bool has_heat = false;
438
+    HOTEND_LOOP() if (thermalManager.temp_hotend[HOTEND_INDEX].target) { has_heat = true; break; }
439
+    #if HAS_TEMP_BED
440
+      if (thermalManager.temp_bed.target) has_heat = true;
441
+    #endif
442
+    if (has_heat) MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
441
 
443
 
442
-  #if ENABLED(SPINDLE_LASER_ENABLE)
443
-    MENU_ITEM(submenu, MSG_LASER_MENU, menu_spindle_laser);
444
-  #endif
444
+  #endif // HAS_TEMP_HOTEND
445
 
445
 
446
   END_MENU();
446
   END_MENU();
447
 }
447
 }

Loading…
Peruuta
Tallenna