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

Merge pull request #3837 from gudnimg/PFW-1457 

PFW-1457 Do not unload at start of First Layer Cal
This commit is contained in:
Guðni Már Gilbert 2022-12-18 13:25:34 +00:00 committed by GitHub
parent ccf5d7c7e4 4c32e8b403
commit b66d6d354f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin.h
View File

@ -363,7 +363,7 @@ extern bool printer_active();
//! Instead, the fsensor uses another state variable :( , which is set to true, when the M600 command is enqued //! Instead, the fsensor uses another state variable :( , which is set to true, when the M600 command is enqued
//! and is reset to false when the fsensor returns into its filament runout finished handler //! and is reset to false when the fsensor returns into its filament runout finished handler
//! I'd normally change this macro, but who knows what would happen in the MMU :) //! I'd normally change this macro, but who knows what would happen in the MMU :)
#define CHECK_FSENSOR ((IS_SD_PRINTING || usb_timer.running()) && (mcode_in_progress != 600) && !saved_printing && e_active()) bool check_fsensor();
extern void calculate_extruder_multipliers(); extern void calculate_extruder_multipliers();

8
Firmware/Marlin_main.cpp
View File

@ -563,6 +563,14 @@ bool __attribute__((noinline)) printer_active() {
|| mesh_bed_leveling_flag; || mesh_bed_leveling_flag;
} }
// Currently only used in one place, allowed to be inlined
bool check_fsensor() {
return (IS_SD_PRINTING || usb_timer.running())
&& mcode_in_progress != 600
&& !saved_printing
&& e_active();
}
bool fans_check_enabled = true; bool fans_check_enabled = true;
#ifdef TMC2130 #ifdef TMC2130

7
Firmware/mmu2.cpp
View File

@ -14,7 +14,6 @@
#include "strlen_cx.h" #include "strlen_cx.h"
#include "temperature.h" #include "temperature.h"
#include "ultralcd.h" #include "ultralcd.h"
#include "cardreader.h" // for IS_SD_PRINTING
#include "SpoolJoin.h" #include "SpoolJoin.h"
// As of FW 3.12 we only support building the FW with only one extruder, all the multi-extruder infrastructure will be removed. // As of FW 3.12 we only support building the FW with only one extruder, all the multi-extruder infrastructure will be removed.
@ -246,7 +245,7 @@ void __attribute__((noinline)) MMU2::mmu_loop_inner(bool reportErrors) {
void MMU2::CheckFINDARunout() { void MMU2::CheckFINDARunout() {
// Check for FINDA filament runout // Check for FINDA filament runout
if (!FindaDetectsFilament() && CHECK_FSENSOR) { if (!FindaDetectsFilament() && check_fsensor()) {
SERIAL_ECHOLNPGM("FINDA filament runout!"); SERIAL_ECHOLNPGM("FINDA filament runout!");
stop_and_save_print_to_ram(0, 0); stop_and_save_print_to_ram(0, 0);
restore_print_from_ram_and_continue(0); restore_print_from_ram_and_continue(0);
@ -384,9 +383,9 @@ bool MMU2::tool_change(uint8_t slot) {
return false; return false;
if (slot != extruder) { if (slot != extruder) {
if (!IS_SD_PRINTING && !usb_timer.running()) { if (FindaDetectsFilament()) {
// If Tcodes are used manually through the serial // If Tcodes are used manually through the serial
// we need to unload manually as well // we need to unload manually as well -- but only if FINDA detects filament
unload(); unload();
} }