Quellcode durchsuchen

Merge pull request #1758 from wavexx/disable_filament_checks_in_extr_menu

Disable filament checks inside the Move -> Extruder menu
DRracer vor 3 Jahren
Ursprung
Commit
ef51652e39
3 geänderte Dateien mit 3 neuen und 2 gelöschten Zeilen
  1. 1 1
      Firmware/Marlin_main.cpp
  2. 1 1
      Firmware/ultralcd.cpp
  3. 1 0
      Firmware/ultralcd.h

+ 1 - 1
Firmware/Marlin_main.cpp

@@ -9574,7 +9574,7 @@ static uint16_t nFSCheckCount=0;
 		bInhibitFlag=bInhibitFlag||bMenuFSDetect; // Settings::HWsetup::FSdetect menu active
 #endif // IR_SENSOR_ANALOG
 #endif // IR_SENSOR
-		if ((mcode_in_progress != 600) && (eFilamentAction != FilamentAction::AutoLoad) && (!bInhibitFlag)) //M600 not in progress, preHeat @ autoLoad menu not active, Support::ExtruderInfo/SensorInfo menu not active
+		if ((mcode_in_progress != 600) && (eFilamentAction != FilamentAction::AutoLoad) && (!bInhibitFlag) && (menu_menu != lcd_move_e)) //M600 not in progress, preHeat @ autoLoad menu not active, Support::ExtruderInfo/SensorInfo menu not active
 		{
 			if (!moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal) && ! eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE))
 			{

+ 1 - 1
Firmware/ultralcd.cpp

@@ -2936,7 +2936,7 @@ static void _lcd_move(const char *name, int axis, int min, int max)
 }
 
 
-static void lcd_move_e()
+void lcd_move_e()
 {
 	if (degHotend0() > EXTRUDE_MINTEMP)
 	{

+ 1 - 0
Firmware/ultralcd.h

@@ -207,6 +207,7 @@ void lcd_farm_sdcard_menu_w();
 
 void lcd_wait_for_heater();
 void lcd_wait_for_cool_down();
+void lcd_move_e(); // NOT static due to usage in Marlin_main
 void lcd_extr_cal_reset();
 
 void lcd_temp_cal_show_result(bool result);