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

Extract common code to function preheat_or_continue(). Saves 138B of FLASH memory.

This commit is contained in:
Marek Bel 2019-09-12 18:53:24 +02:00
parent d80b8280a0
commit 770e470fd5
1 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Firmware/ultralcd.cpp
View File

@ -131,6 +131,8 @@ static void lcd_menu_fails_stats_mmu_total();
static void mmu_unload_filament(); static void mmu_unload_filament();
static void mmu_fil_eject_menu(); static void mmu_fil_eject_menu();
static void mmu_load_to_nozzle_menu(); static void mmu_load_to_nozzle_menu();
static void preheat_or_continue();
#ifdef MMU_HAS_CUTTER #ifdef MMU_HAS_CUTTER
static void mmu_cut_filament_menu(); static void mmu_cut_filament_menu();
#endif //MMU_HAS_CUTTER #endif //MMU_HAS_CUTTER
@ -2362,25 +2364,13 @@ mFilamentItem(target_temperature[0],target_temperature_bed);
void lcd_unLoadFilament() void lcd_unLoadFilament()
{ {
eFilamentAction=FilamentAction::UnLoad; eFilamentAction=FilamentAction::UnLoad;
bFilamentFirstRun=false; preheat_or_continue();
if(target_temperature[0]>=EXTRUDE_MINTEMP)
{
bFilamentPreheatState=true;
mFilamentItem(target_temperature[0],target_temperature_bed);
}
else lcd_generic_preheat_menu();
} }
static void mmu_unload_filament() static void mmu_unload_filament()
{ {
eFilamentAction = FilamentAction::MmuUnLoad; eFilamentAction = FilamentAction::MmuUnLoad;
bFilamentFirstRun = false; preheat_or_continue();
if (target_temperature[0] >= EXTRUDE_MINTEMP)
{
bFilamentPreheatState = true;
mFilamentItem(target_temperature[0], target_temperature_bed);
}
else lcd_generic_preheat_menu();
} }
@ -2596,9 +2586,8 @@ static void lcd_menu_AutoLoadFilament()
} }
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
static void lcd_LoadFilament() static void preheat_or_continue()
{ {
eFilamentAction = FilamentAction::Load;
bFilamentFirstRun = false; bFilamentFirstRun = false;
if (target_temperature[0] >= EXTRUDE_MINTEMP) if (target_temperature[0] >= EXTRUDE_MINTEMP)
{ {
@ -2608,6 +2597,12 @@ static void lcd_LoadFilament()
else lcd_generic_preheat_menu(); else lcd_generic_preheat_menu();
} }
static void lcd_LoadFilament()
{
eFilamentAction = FilamentAction::Load;
preheat_or_continue();
}
//! @brief Show filament used a print time //! @brief Show filament used a print time
//! //!
@ -5937,13 +5932,7 @@ static void mmu_load_to_nozzle_menu()
else else
{ {
eFilamentAction = FilamentAction::MmuLoad; eFilamentAction = FilamentAction::MmuLoad;
bFilamentFirstRun = false; preheat_or_continue();
if (target_temperature[0] >= EXTRUDE_MINTEMP)
{
bFilamentPreheatState = true;
mFilamentItem(target_temperature[0], target_temperature_bed);
}
else lcd_generic_preheat_menu();
} }
} }
@ -5969,13 +5958,7 @@ static void mmu_fil_eject_menu()
else else
{ {
eFilamentAction = FilamentAction::MmuEject; eFilamentAction = FilamentAction::MmuEject;
bFilamentFirstRun = false; preheat_or_continue();
if (target_temperature[0] >= EXTRUDE_MINTEMP)
{
bFilamentPreheatState = true;
mFilamentItem(target_temperature[0], target_temperature_bed);
}
else lcd_generic_preheat_menu();
} }
} }