|
@@ -7482,8 +7482,8 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s
|
|
|
#ifdef FILAMENT_SENSOR
|
|
|
if (mmu_enabled == false)
|
|
|
{
|
|
|
-//-// if ((mcode_in_progress != 600) && (eFilamentAction != e_FILAMENT_ACTION_autoLoad)) //M600 not in progress, preHeat @ autoLoad menu not active
|
|
|
- if (mcode_in_progress != 600) //M600 not in progress
|
|
|
+//-// 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 (!moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL) && !wizard_active)
|
|
|
{
|
|
@@ -7492,8 +7492,8 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s
|
|
|
#ifdef PAT9125
|
|
|
fsensor_autoload_check_stop();
|
|
|
#endif //PAT9125
|
|
|
-//-//
|
|
|
- if (degHotend0() > EXTRUDE_MINTEMP)
|
|
|
+//-// if (degHotend0() > EXTRUDE_MINTEMP)
|
|
|
+if(0)
|
|
|
{
|
|
|
if ((eSoundMode == e_SOUND_MODE_LOUD) || (eSoundMode == e_SOUND_MODE_ONCE))
|
|
|
_tone(BEEPER, 1000);
|
|
@@ -7504,23 +7504,24 @@ void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument s
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
+/*
|
|
|
lcd_update_enable(false);
|
|
|
show_preheat_nozzle_warning();
|
|
|
lcd_update_enable(true);
|
|
|
-/*
|
|
|
+*/
|
|
|
eFilamentAction=e_FILAMENT_ACTION_autoLoad;
|
|
|
bFilamentFirstRun=false;
|
|
|
if(target_temperature[0]>=EXTRUDE_MINTEMP)
|
|
|
{
|
|
|
bFilamentPreheatState=true;
|
|
|
- mFilamentItem(target_temperature[0],target_temperature_bed);
|
|
|
+// mFilamentItem(target_temperature[0],target_temperature_bed);
|
|
|
+ menu_submenu(mFilamentItemForce);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
menu_submenu(mFilamentMenu);
|
|
|
lcd_timeoutToStatus.start();
|
|
|
}
|
|
|
-*/
|
|
|
}
|
|
|
}
|
|
|
}
|