|
@@ -586,6 +586,9 @@ static void lcd_language_menu();
|
|
|
void stop_and_save_print_to_ram(float z_move, float e_move);
|
|
|
void restore_print_from_ram_and_continue(float e_move);
|
|
|
|
|
|
+bool fans_check_enabled = true;
|
|
|
+bool filament_autoload_enabled = true;
|
|
|
+
|
|
|
extern int8_t CrashDetectMenu;
|
|
|
|
|
|
void crashdet_enable()
|
|
@@ -936,6 +939,8 @@ void setup()
|
|
|
puts_P(PSTR("DISABLED\n"));
|
|
|
fsensor_disable();
|
|
|
}
|
|
|
+ filament_autoload_enabled = (eeprom_read_byte((uint8_t*)EEPROM_FSENS_AUTOLOAD_ENABLED) > 0);
|
|
|
+
|
|
|
|
|
|
#endif //PAT9125
|
|
|
|
|
@@ -5585,14 +5590,14 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
|
|
|
//load_filament_time = millis();
|
|
|
KEEPALIVE_STATE(PAUSED_FOR_USER);
|
|
|
#ifdef PAT9125
|
|
|
- if (fsensor_M600) fsensor_autoload_check_start();
|
|
|
+ if (filament_autoload_enabled && fsensor_M600) fsensor_autoload_check_start();
|
|
|
#endif //PAT9125
|
|
|
while(!lcd_clicked())
|
|
|
{
|
|
|
manage_heater();
|
|
|
manage_inactivity(true);
|
|
|
#ifdef PAT9125
|
|
|
- if (fsensor_M600 && fsensor_check_autoload())
|
|
|
+ if (filament_autoload_enabled && fsensor_M600 && fsensor_check_autoload())
|
|
|
break;
|
|
|
#endif //PAT9125
|
|
|
/*#ifdef SNMM
|
|
@@ -5603,7 +5608,7 @@ case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or disp
|
|
|
|
|
|
}
|
|
|
#ifdef PAT9125
|
|
|
- if (fsensor_M600) fsensor_autoload_check_stop();
|
|
|
+ if (filament_autoload_enabled && fsensor_M600) fsensor_autoload_check_stop();
|
|
|
#endif //PAT9125
|
|
|
//WRITE(BEEPER, LOW);
|
|
|
KEEPALIVE_STATE(IN_HANDLER);
|
|
@@ -6378,7 +6383,7 @@ void handle_status_leds(void) {
|
|
|
|
|
|
void manage_inactivity(bool ignore_stepper_queue/*=false*/) //default argument set in Marlin.h
|
|
|
{
|
|
|
- if (fsensor_enabled && !fsensor_M600 && !moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL) && (current_temperature[0] > EXTRUDE_MINTEMP))
|
|
|
+ if (fsensor_enabled && filament_autoload_enabled && !fsensor_M600 && !moves_planned() && !IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL) && (current_temperature[0] > EXTRUDE_MINTEMP))
|
|
|
{
|
|
|
if (fsensor_autoload_enabled)
|
|
|
{
|