zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Move some menu items (#14118)

Browse source
This commit is contained in:
InsanityAutomation 2019-05-25 16:16:00 -04:00 committed by Scott Lahteine
parent fc52c43a26
commit 9f69fbe5ee
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/lcd/menu/menu_main.cpp
View file

@ -265,7 +265,6 @@ void menu_main() {
if (card_detected) { if (card_detected) {
if (!card_open) { if (!card_open) {
MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
MENU_ITEM(gcode, MENU_ITEM(gcode,
#if PIN_EXISTS(SD_DETECT) #if PIN_EXISTS(SD_DETECT)
MSG_CHANGE_SDCARD, PSTR("M21") MSG_CHANGE_SDCARD, PSTR("M21")
@ -273,6 +272,7 @@ void menu_main() {
MSG_RELEASE_SDCARD, PSTR("M22") MSG_RELEASE_SDCARD, PSTR("M22")
#endif #endif
); );
MENU_ITEM(submenu, MSG_CARD_MENU, menu_sdcard);
} }
} }
else { else {

28
Marlin/src/lcd/menu/menu_temperature.cpp
View file

@ -414,17 +414,11 @@ void menu_temperature() {
#endif #endif
#endif // FAN_COUNT > 0 #endif // FAN_COUNT > 0
#if HAS_TEMP_HOTEND #if ENABLED(SPINDLE_LASER_ENABLE)
MENU_ITEM(submenu, MSG_LASER_MENU, menu_spindle_laser);
#endif
// #if HAS_TEMP_HOTEND
// Cooldown
//
bool has_heat = false;
HOTEND_LOOP() if (thermalManager.temp_hotend[HOTEND_INDEX].target) { has_heat = true; break; }
#if HAS_TEMP_BED
if (thermalManager.temp_bed.target) has_heat = true;
#endif
if (has_heat) MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
// //
// Preheat for Material 1 and 2 // Preheat for Material 1 and 2
@ -437,11 +431,17 @@ void menu_temperature() {
MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_m2_e0_only); MENU_ITEM(function, MSG_PREHEAT_2, lcd_preheat_m2_e0_only);
#endif #endif
#endif // HAS_TEMP_HOTEND //
// Cooldown
//
bool has_heat = false;
HOTEND_LOOP() if (thermalManager.temp_hotend[HOTEND_INDEX].target) { has_heat = true; break; }
#if HAS_TEMP_BED
if (thermalManager.temp_bed.target) has_heat = true;
#endif
if (has_heat) MENU_ITEM(function, MSG_COOLDOWN, lcd_cooldown);
#if ENABLED(SPINDLE_LASER_ENABLE) #endif // HAS_TEMP_HOTEND
MENU_ITEM(submenu, MSG_LASER_MENU, menu_spindle_laser);
#endif
END_MENU(); END_MENU();
} }