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

Jump to bottom

fixes #19575 Cant compile with PRUSA_MMU2_S_MODE disabled #19584

Merged
merged 2 commits into from
Oct 2, 2020
Merged

fixes #19575 Cant compile with PRUSA_MMU2_S_MODE disabled #19584

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b24053
fixes #19575
Oct 2, 2020
bf19290
Update mmu2.cpp
thinkyhead Oct 2, 2020
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
8 changes: 4 additions & 4 deletions Marlin/src/feature/mmu2/mmu2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,17 +340,17 @@ void MMU2::mmu_loop() {
#endif

if (rx_ok()) {
// response to C0 mmu command in PRUSA_MMU2_S_MODE
// Response to C0 mmu command in PRUSA_MMU2_S_MODE
bool can_reset = true;
if (ENABLED(PRUSA_MMU2_S_MODE) && last_cmd == MMU_CMD_C0) {
if (!mmu2s_triggered) {
#if ENABLED(PRUSA_MMU2_S_MODE)
if (!mmu2s_triggered && last_cmd == MMU_CMD_C0) {
can_reset = false;
// MMU ok received but filament sensor not triggered, retrying...
DEBUG_ECHOLNPGM("MMU => 'ok' (filament not present in gears)");
DEBUG_ECHOLNPGM("MMU <= 'C0' (keep trying)");
MMU2_COMMAND("C0");
}
}
#endif
if (can_reset) {
DEBUG_ECHOLNPGM("MMU => 'ok'");
ready = true;
Expand Down