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

Take FilamentAction as parameter 

Change in memory:
Flash: -28 bytes
SRAM: 0 bytes
This commit is contained in:
Guðni Már Gilbert 2023-01-29 14:14:43 +00:00 committed by DRracer
parent 210bbe9764
commit 68d902c4e1
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Firmware/ultralcd.cpp
View File

@ -124,7 +124,7 @@ static void lcd_v2_calibration();
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 mmu_loading_test_menu(); static void mmu_loading_test_menu();
static void preheat_or_continue(); static void preheat_or_continue(FilamentAction action);
#ifdef MMU_HAS_CUTTER #ifdef MMU_HAS_CUTTER
static void mmu_cut_filament_menu(); static void mmu_cut_filament_menu();
@ -2129,16 +2129,14 @@ void lcd_generic_preheat_menu()
MENU_END(); MENU_END();
} }
void lcd_unLoadFilament() static void lcd_unLoadFilament()
{ {
eFilamentAction=FilamentAction::UnLoad; preheat_or_continue(FilamentAction::UnLoad);
preheat_or_continue();
} }
static void mmu_unload_filament() static void mmu_unload_filament()
{ {
eFilamentAction = FilamentAction::MmuUnLoad; preheat_or_continue(FilamentAction::MmuUnLoad);
preheat_or_continue();
} }
@ -2281,7 +2279,8 @@ static void lcd_menu_AutoLoadFilament()
} }
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
static void preheat_or_continue() { static void preheat_or_continue(FilamentAction action) {
eFilamentAction = action;
if (target_temperature[0] >= extrude_min_temp) { if (target_temperature[0] >= extrude_min_temp) {
bFilamentPreheatState = true; bFilamentPreheatState = true;
mFilamentItem(target_temperature[0], target_temperature_bed); mFilamentItem(target_temperature[0], target_temperature_bed);
@ -2292,13 +2291,11 @@ static void preheat_or_continue() {
static void lcd_LoadFilament() static void lcd_LoadFilament()
{ {
eFilamentAction = FilamentAction::Load; preheat_or_continue(FilamentAction::Load);
preheat_or_continue();
} }
void lcd_AutoLoadFilament() { void lcd_AutoLoadFilament() {
eFilamentAction = FilamentAction::AutoLoad; preheat_or_continue(FilamentAction::AutoLoad);
preheat_or_continue();
} }
@ -4901,8 +4898,7 @@ static void mmu_load_to_nozzle_menu() {
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', lcd_mmu_load_to_nozzle_wrapper, i); ////MSG_LOAD_FILAMENT c=16 MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', lcd_mmu_load_to_nozzle_wrapper, i); ////MSG_LOAD_FILAMENT c=16
MENU_END(); MENU_END();
} else { } else {
eFilamentAction = FilamentAction::MmuLoad; preheat_or_continue(FilamentAction::MmuLoad);
preheat_or_continue();
} }
} }
@ -4919,8 +4915,7 @@ static void mmu_fil_eject_menu() {
MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FROM_MMU), i + '1', mmu_eject_filament, i); ////MSG_EJECT_FROM_MMU c=16 MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FROM_MMU), i + '1', mmu_eject_filament, i); ////MSG_EJECT_FROM_MMU c=16
MENU_END(); MENU_END();
} else { } else {
eFilamentAction = FilamentAction::MmuEject; preheat_or_continue(FilamentAction::MmuEject);
preheat_or_continue();
} }
} }
@ -4937,8 +4932,7 @@ static void mmu_cut_filament_menu() {
MENU_ITEM_FUNCTION_NR_P(_T(MSG_CUT_FILAMENT), i + '1', mmu_cut_filament_wrapper, i); ////MSG_CUT_FILAMENT c=16 MENU_ITEM_FUNCTION_NR_P(_T(MSG_CUT_FILAMENT), i + '1', mmu_cut_filament_wrapper, i); ////MSG_CUT_FILAMENT c=16
MENU_END(); MENU_END();
} else { } else {
eFilamentAction=FilamentAction::MmuCut; preheat_or_continue(FilamentAction::MmuCut);
preheat_or_continue();
} }
} }
#endif //MMU_HAS_CUTTER #endif //MMU_HAS_CUTTER
@ -4962,8 +4956,7 @@ static void mmu_loading_test_menu() {
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', loading_test_wrapper, i); ////MSG_LOAD_FILAMENT c=16 MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', loading_test_wrapper, i); ////MSG_LOAD_FILAMENT c=16
MENU_END(); MENU_END();
} else { } else {
eFilamentAction = FilamentAction::MmuLoadingTest; preheat_or_continue(FilamentAction::MmuLoadingTest);
preheat_or_continue();
} }
} }