josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fsensor runout conditions 

And also reorder autoload and runout conditions
This commit is contained in:
Alex Voinea 2023-03-29 09:41:14 +02:00 committed by DRracer
parent dfe6ea6470
commit 373fab883d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/Filament_sensor.cpp
View File

@ -109,9 +109,9 @@ bool Filament_sensor::checkFilamentEvents() {
void Filament_sensor::triggerFilamentInserted() { void Filament_sensor::triggerFilamentInserted() {
if (autoLoadEnabled if (autoLoadEnabled
&& (eFilamentAction == FilamentAction::None) && (eFilamentAction == FilamentAction::None)
&& (! MMU2::mmu2.Enabled() ) // quick and dirty hack to prevent spurious runouts while the MMU is in charge
&& !( && !(
moves_planned() != 0 MMU2::mmu2.Enabled() // quick and dirty hack to prevent spurious runouts while the MMU is in charge
|| moves_planned() != 0
|| printJobOngoing() || printJobOngoing()
|| (lcd_commands_type == LcdCommands::Layer1Cal) || (lcd_commands_type == LcdCommands::Layer1Cal)
|| eeprom_read_byte((uint8_t *)EEPROM_WIZARD_ACTIVE) || eeprom_read_byte((uint8_t *)EEPROM_WIZARD_ACTIVE)
@ -124,12 +124,14 @@ void Filament_sensor::triggerFilamentInserted() {
void Filament_sensor::triggerFilamentRemoved() { void Filament_sensor::triggerFilamentRemoved() {
// SERIAL_ECHOLNPGM("triggerFilamentRemoved"); // SERIAL_ECHOLNPGM("triggerFilamentRemoved");
if (runoutEnabled if (runoutEnabled
&& (! MMU2::mmu2.Enabled() ) // quick and dirty hack to prevent spurious runouts just before the toolchange
&& (eFilamentAction == FilamentAction::None) && (eFilamentAction == FilamentAction::None)
&& !saved_printing
&& ( && (
moves_planned() != 0 moves_planned() != 0
|| printJobOngoing() || printJobOngoing()
)
&& !(
saved_printing
|| MMU2::mmu2.Enabled() // quick and dirty hack to prevent spurious runouts just before the toolchange
|| (lcd_commands_type == LcdCommands::Layer1Cal) || (lcd_commands_type == LcdCommands::Layer1Cal)
|| eeprom_read_byte((uint8_t *)EEPROM_WIZARD_ACTIVE) || eeprom_read_byte((uint8_t *)EEPROM_WIZARD_ACTIVE)
) )