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

M600: Small optimisation in if statements 

Change in memory:
Flash: -4 bytes
SRAM: 0 bytes
This commit is contained in:
Guðni Már Gilbert 2022-09-03 12:28:51 +00:00 committed by D.R.racer
parent f297131792
commit 635ae2bf20
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Firmware/Marlin_main.cpp
View File

@ -3573,7 +3573,8 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
{ {
FSensorBlockRunout fsBlockRunout; FSensorBlockRunout fsBlockRunout;
if (!MMU2::mmu2.Enabled()) { if (!MMU2::mmu2.Enabled())
{
KEEPALIVE_STATE(PAUSED_FOR_USER); KEEPALIVE_STATE(PAUSED_FOR_USER);
uint8_t choice = uint8_t choice =
lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Was filament unload successful?"), false, LCD_LEFT_BUTTON_CHOICE); ////MSG_UNLOAD_SUCCESSFUL c=20 r=2 lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Was filament unload successful?"), false, LCD_LEFT_BUTTON_CHOICE); ////MSG_UNLOAD_SUCCESSFUL c=20 r=2
@ -3585,9 +3586,10 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
st_synchronize(); st_synchronize();
lcd_show_fullscreen_message_and_wait_P(_i("Please open idler and remove filament manually.")); ////MSG_CHECK_IDLER c=20 r=5 lcd_show_fullscreen_message_and_wait_P(_i("Please open idler and remove filament manually.")); ////MSG_CHECK_IDLER c=20 r=5
} }
M600_load_filament();
} }
else // MMU is enabled
if (MMU2::mmu2.Enabled()) { {
if (!automatic) { if (!automatic) {
if (saved_printing){ if (saved_printing){
// if M600 was invoked by filament senzor (FINDA) eject filament so user can easily remove it // if M600 was invoked by filament senzor (FINDA) eject filament so user can easily remove it
@ -3602,9 +3604,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
} }
} }
mmu_M600_load_filament(automatic, HotendTempBckp); mmu_M600_load_filament(automatic, HotendTempBckp);
} else }
M600_load_filament();
if (!automatic) if (!automatic)
M600_check_state(HotendTempBckp); M600_check_state(HotendTempBckp);