Browse Source

Merge pull request #1591 from MRprusa3d/PFW-795c

better autoLoad
PavelSindler 5 years ago
parent
commit
9dde8c4732
3 changed files with 5 additions and 3 deletions
  1. 1 1
      Firmware/Marlin_main.cpp
  2. 2 2
      Firmware/ultralcd.cpp
  3. 2 0
      Firmware/ultralcd.h

+ 1 - 1
Firmware/Marlin_main.cpp

@@ -7499,7 +7499,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)
 			{

+ 2 - 2
Firmware/ultralcd.cpp

@@ -131,7 +131,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();
@@ -1901,7 +1901,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|

+ 2 - 0
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);