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

Rename mFilamentMenu to lcd_generic_preheat_menu to match naming convention for global function and be more descriptive.

This commit is contained in:
Marek Bel 2019-09-12 18:15:15 +02:00
parent c26d7e50f7
commit e83b2ebe1f
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin_main.cpp
View File

@ -8526,7 +8526,7 @@ if(0)
} }
else else
{ {
menu_submenu(mFilamentMenu); menu_submenu(lcd_generic_preheat_menu);
lcd_timeoutToStatus.start(); lcd_timeoutToStatus.start();
} }
} }

2
Firmware/mmu.cpp
View File

@ -1092,7 +1092,7 @@ else {
mFilamentItem(target_temperature[0],target_temperature_bed); mFilamentItem(target_temperature[0],target_temperature_bed);
} }
// else menu_submenu(mFilamentMenu); // else menu_submenu(mFilamentMenu);
else mFilamentMenu(); else lcd_generic_preheat_menu();
} }
} }

16
Firmware/ultralcd.cpp
View File

@ -1915,7 +1915,7 @@ static void lcd_menu_test_restore()
static void lcd_preheat_menu() static void lcd_preheat_menu()
{ {
eFilamentAction = FilamentAction::Preheat; eFilamentAction = FilamentAction::Preheat;
mFilamentMenu(); lcd_generic_preheat_menu();
} }
static void lcd_support_menu() static void lcd_support_menu()
@ -2322,7 +2322,7 @@ void mFilamentBack()
} }
} }
void mFilamentMenu() void lcd_generic_preheat_menu()
{ {
MENU_BEGIN(); MENU_BEGIN();
if (!wizard_active) if (!wizard_active)
@ -2377,7 +2377,7 @@ else {
bFilamentPreheatState=true; bFilamentPreheatState=true;
mFilamentItem(target_temperature[0],target_temperature_bed); mFilamentItem(target_temperature[0],target_temperature_bed);
} }
else mFilamentMenu(); else lcd_generic_preheat_menu();
} }
} }
@ -2615,7 +2615,7 @@ if(0)
bFilamentPreheatState=true; bFilamentPreheatState=true;
mFilamentItem(target_temperature[0],target_temperature_bed); mFilamentItem(target_temperature[0],target_temperature_bed);
} }
else mFilamentMenu(); else lcd_generic_preheat_menu();
} }
} }
@ -4554,7 +4554,7 @@ void lcd_v2_calibration()
} }
eFilamentAction = FilamentAction::Lay1Cal; eFilamentAction = FilamentAction::Lay1Cal;
menu_goto(mFilamentMenu, 0, true, true); menu_goto(lcd_generic_preheat_menu, 0, true, true);
lcd_update_enable(true); lcd_update_enable(true);
} }
@ -5954,7 +5954,7 @@ static void mmu_load_to_nozzle_menu()
bFilamentPreheatState = true; bFilamentPreheatState = true;
mFilamentItem(target_temperature[0], target_temperature_bed); mFilamentItem(target_temperature[0], target_temperature_bed);
} }
else mFilamentMenu(); else lcd_generic_preheat_menu();
} }
} }
@ -5986,7 +5986,7 @@ static void mmu_fil_eject_menu()
bFilamentPreheatState = true; bFilamentPreheatState = true;
mFilamentItem(target_temperature[0], target_temperature_bed); mFilamentItem(target_temperature[0], target_temperature_bed);
} }
else mFilamentMenu(); else lcd_generic_preheat_menu();
} }
} }
@ -6014,7 +6014,7 @@ static void mmu_cut_filament_menu()
bFilamentPreheatState=true; bFilamentPreheatState=true;
mFilamentItem(target_temperature[0],target_temperature_bed); mFilamentItem(target_temperature[0],target_temperature_bed);
} }
else mFilamentMenu(); else lcd_generic_preheat_menu();
} }
} }
#endif //MMU_HAS_CUTTER #endif //MMU_HAS_CUTTER

2
Firmware/ultralcd.h
View File

@ -177,7 +177,7 @@ extern bool bFilamentPreheatState;
extern bool bFilamentAction; extern bool bFilamentAction;
void mFilamentItem(uint16_t nTemp,uint16_t nTempBed); void mFilamentItem(uint16_t nTemp,uint16_t nTempBed);
void mFilamentItemForce(); void mFilamentItemForce();
void mFilamentMenu(); void lcd_generic_preheat_menu();
void unload_filament(); void unload_filament();
void stack_error(); void stack_error();