From b02ca18c93c4fbf0e9387cffd8b0e943d276b0b4 Mon Sep 17 00:00:00 2001 From: MRprusa3d Date: Mon, 4 Mar 2019 12:52:35 +0100 Subject: [PATCH] better autoLoad autoLoad inhibit if Support::ExtruderInfo-menu is selected --- Firmware/Marlin_main.cpp | 2 +- Firmware/ultralcd.cpp | 4 ++-- Firmware/ultralcd.h | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index b0f1e633..612b1795 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -7483,7 +7483,7 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s if (mmu_enabled == false) { //-// if (mcode_in_progress != 600) //M600 not in progress - if ((mcode_in_progress != 600) && (eFilamentAction != e_FILAMENT_ACTION_autoLoad)) //M600 not in progress, preHeat @ autoLoad menu not active + if ((mcode_in_progress != 600) && (eFilamentAction != e_FILAMENT_ACTION_autoLoad) && (menu_menu!=lcd_menu_extruder_info)) //M600 not in progress, preHeat @ autoLoad menu not active, Support::ExtruderInfo menu not active { if (!moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL) && !wizard_active) { diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 5a04796f..c6e1d8e2 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -133,7 +133,7 @@ static void prusa_stat_farm_number(); static void prusa_stat_temperatures(); static void prusa_stat_printinfo(); static void lcd_farm_no(); -static void lcd_menu_extruder_info(); +void lcd_menu_extruder_info(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") static void lcd_menu_xyz_y_min(); static void lcd_menu_xyz_skew(); static void lcd_menu_xyz_offset(); @@ -1899,7 +1899,7 @@ void lcd_cooldown() } -static void lcd_menu_extruder_info() +void lcd_menu_extruder_info() // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") { //|01234567890123456789| //|Nozzle FAN: RPM| diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index c407bbed..affd7b0b 100644 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -45,6 +45,8 @@ extern bool lcd_selftest(); void lcd_menu_statistics(); +void lcd_menu_extruder_info(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") + extern const char* lcd_display_message_fullscreen_P(const char *msg, uint8_t &nlines); extern const char* lcd_display_message_fullscreen_P(const char *msg);