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

Consistently replace loading_flag with eFilamentAction 

Remove loading_flag and check for eFilamentAction instead which already
flags both load/unload (in addition to mmu actions).

Correctly transition from AutoLoad to Load as soon as the operation
cannot be cancelled anymore as opposed to resetting it.
This commit is contained in:
Yuri D'Elia 2022-12-13 13:35:45 +01:00 committed by Guðni Már Gilbert
parent 05b536947b
commit 074b5d380f
4 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/Marlin.h
View File

@ -278,7 +278,6 @@ extern uint32_t start_pause_print; // milliseconds
extern ShortTimer usb_timer;
extern bool processing_tcode;
extern bool homing_flag;
extern bool loading_flag;
extern uint32_t total_filament_used; // mm/100 or 10um
/// @brief Save print statistics to EEPROM

4
Firmware/Marlin_main.cpp
View File

@ -179,7 +179,6 @@ bool mesh_bed_leveling_flag = false;
uint32_t total_filament_used;
HeatingStatus heating_status;
bool loading_flag = false;
int fan_edge_counter[2];
int fan_speed[2];
@ -3579,13 +3578,12 @@ void gcode_M701(float fastLoadLength, uint8_t mmuSlotIndex){
Sound_MakeCustom(50, 500, false);
if (!farm_mode && loading_flag) {
if (!farm_mode && (eFilamentAction != FilamentAction::None)) {
lcd_load_filament_color_check();
}
lcd_update_enable(true);
lcd_update(2);
lcd_setstatuspgm(MSG_WELCOME);
loading_flag = false;
custom_message_type = CustomMsg::Status;
}

6
Firmware/Prusa_farm.cpp
View File

@ -242,7 +242,7 @@ void prusa_statistics(uint8_t _message) {
else if (isPrintPaused) {
prusa_statistics_case0(14);
}
else if (IS_SD_PRINTING || loading_flag) {
else if (IS_SD_PRINTING || (eFilamentAction != FilamentAction::None)) {
prusa_statistics_case0(4);
}
else {
@ -270,7 +270,7 @@ void prusa_statistics(uint8_t _message) {
status_number = 3;
farm_timer = 1;
if (IS_SD_PRINTING || loading_flag) {
if (IS_SD_PRINTING || (eFilamentAction != FilamentAction::None)) {
SERIAL_ECHO('{');
prusa_stat_printerstatus(4);
prusa_stat_farm_number();
@ -374,7 +374,7 @@ void prusa_statistics_update_from_status_screen() {
switch (farm_timer) {
case 8:
prusa_statistics(21);
if(loading_flag)
if(eFilamentAction != FilamentAction::None)
prusa_statistics(22);
break;
case 5:

52
Firmware/ultralcd.cpp
View File

@ -1796,10 +1796,10 @@ switch(eFilamentAction)
switch(eFilamentAction)
{
case FilamentAction::AutoLoad:
eFilamentAction=FilamentAction::None; // i.e. non-autoLoad
// loading no longer cancellable
eFilamentAction = FilamentAction::Load;
// FALLTHRU
case FilamentAction::Load:
loading_flag=true;
enquecommand_P(MSG_M701); // load filament
break;
case FilamentAction::UnLoad:
@ -1818,6 +1818,17 @@ switch(eFilamentAction)
}
}
void mFilamentBack()
{
if (eFilamentAction == FilamentAction::AutoLoad ||
eFilamentAction == FilamentAction::Preheat ||
eFilamentAction == FilamentAction::Lay1Cal)
{
// filament action has been cancelled
eFilamentAction = FilamentAction::None;
}
}
void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
{
uint8_t nLevel;
@ -1860,17 +1871,16 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
{
nLevel = bFilamentPreheatState ? 1 : 2;
menu_back(nLevel);
if ((eFilamentAction == FilamentAction::Load) || (eFilamentAction == FilamentAction::AutoLoad))
{
loading_flag = true;
if (eFilamentAction == FilamentAction::AutoLoad) {
// loading no longer cancellable
eFilamentAction = FilamentAction::Load;
}
if (eFilamentAction == FilamentAction::Load)
enquecommand_P(MSG_M701); // load filament
if (eFilamentAction == FilamentAction::AutoLoad) eFilamentAction = FilamentAction::None; // i.e. non-autoLoad
}
if (eFilamentAction == FilamentAction::UnLoad)
{
loading_flag = true;
else if (eFilamentAction == FilamentAction::UnLoad)
enquecommand_P(MSG_M702); // unload filament
}
}
break;
case FilamentAction::MmuLoad:
@ -1971,7 +1981,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
menu_back();
}
menu_back();
if (eFilamentAction == FilamentAction::AutoLoad) eFilamentAction = FilamentAction::None; // i.e. non-autoLoad
mFilamentBack();
}
}
}
@ -2047,16 +2057,6 @@ static void mFilamentItem_PVB()
mFilamentItem(PVB_PREHEAT_HOTEND_TEMP, PVB_PREHEAT_HPB_TEMP);
}
void mFilamentBack()
{
if (eFilamentAction == FilamentAction::AutoLoad ||
eFilamentAction == FilamentAction::Preheat ||
eFilamentAction == FilamentAction::Lay1Cal)
{
eFilamentAction = FilamentAction::None; // i.e. non-autoLoad
}
}
void lcd_generic_preheat_menu()
{
MENU_BEGIN();
@ -3681,13 +3681,14 @@ static void lcd_wizard_load() {
// NOTE: a full screen message showing which filament is being inserted
// is performed by M701. For this reason MSG_LOADING_FILAMENT is not
// used here when a MMU is used.
eFilamentAction = FilamentAction::MmuLoad;
} else {
lcd_show_fullscreen_message_and_wait_P(
_i("Please insert filament into the extruder, then press the knob to load it.")); ////MSG_WIZARD_LOAD_FILAMENT c=20 r=6
lcd_update_enable(false);
lcd_clear();
lcd_puts_at_P(0, 2, _T(MSG_LOADING_FILAMENT));
loading_flag = true;
eFilamentAction = FilamentAction::Load;
}
// When MMU is disabled P parameter is ignored
@ -4889,7 +4890,6 @@ void unload_filament(float unloadLength)
lcd_setstatuspgm(MSG_WELCOME);
custom_message_type = CustomMsg::Status;
eFilamentAction = FilamentAction::None;
loading_flag = false;
}
/// @brief Set print fan speed
@ -5212,7 +5212,7 @@ static void lcd_main_menu()
}
}
if ( ! ( printJobOngoing() || (lcd_commands_type != LcdCommands::Idle) || loading_flag || Stopped ) ) {
if ( ! ( printJobOngoing() || (lcd_commands_type != LcdCommands::Idle) || (eFilamentAction != FilamentAction::None) || Stopped ) ) {
if (MMU2::mmu2.Enabled()) {
if(!MMU2::mmu2.FindaDetectsFilament() && !fsensor.getFilamentPresent()) {
// The MMU 'Load filament' state machine will reject the command if any
@ -6917,7 +6917,7 @@ static bool check_file(const char* filename) {
static void menu_action_sdfile(const char* filename)
{
if(loading_flag) return;
if(eFilamentAction != FilamentAction::None) return;
char cmd[30];
char* c;