Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🚧 filament runout: only allowed if E-axis is active #4325

Closed
wants to merge 1 commit into from
Closed

🚧 filament runout: only allowed if E-axis is active #4325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Firmware/Filament_sensor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void Filament_sensor::triggerFilamentRemoved() {
if (runoutEnabled
&& (eFilamentAction == FilamentAction::None)
&& (
moves_planned() != 0
e_active()
|| printJobOngoing()
Comment on lines +131 to 132
Copy link
Collaborator Author

@gudnimg gudnimg Aug 16, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking back at this... shouldn't this be e_active() && printJobOngoing()? I don't know of any situation where we can recover from filament runout except when printing.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is first layer calibration a printJobOngoing()?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No it's only true if card.sdprinting = true, which happens only when a gcode file is printing. Or when usb_timer.running() is true, which only happens if the user is sending commands via Serial

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Filament runout during First Layer Calibration is ignored explicitly. Similar to how we disable it when MMU is enabled.
image

)
&& !(
Expand Down