3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename extr_unload_() to mmu_unload_filament() and move it to ultralcd.cpp as it is menu.

Browse source
This commit is contained in:
Marek Bel 2019-09-12 18:40:02 +02:00
parent 0cdfa7a5e8
commit 3a541488b2
3 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Firmware/mmu.cpp
View file

@ -1074,18 +1074,6 @@ void mmu_filament_ramming()
} }
} }
//-//
void extr_unload_()
{
eFilamentAction = FilamentAction::MmuUnLoad;
bFilamentFirstRun = false;
if (target_temperature[0] >= EXTRUDE_MINTEMP)
{
bFilamentPreheatState = true;
mFilamentItem(target_temperature[0], target_temperature_bed);
}
else lcd_generic_preheat_menu();
}
//! @brief show which filament is currently unloaded //! @brief show which filament is currently unloaded
void extr_unload_view() void extr_unload_view()

3
Firmware/mmu.h
View file

@ -105,8 +105,7 @@ extern int get_ext_nr();
extern void display_loading(); extern void display_loading();
extern void extr_adj(uint8_t extruder); extern void extr_adj(uint8_t extruder);
extern void extr_unload(); extern void extr_unload();
//-//
extern void extr_unload_();
extern void extr_adj_0(); extern void extr_adj_0();
extern void extr_adj_1(); extern void extr_adj_1();
extern void extr_adj_2(); extern void extr_adj_2();

16
Firmware/ultralcd.cpp
View file

@ -131,6 +131,8 @@ static void lcd_menu_fails_stats_mmu_print();
static void lcd_menu_fails_stats_mmu_total(); static void lcd_menu_fails_stats_mmu_total();
//static void lcd_menu_show_sensors_state(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()") //static void lcd_menu_show_sensors_state(); // NOT static due to using inside "Marlin_main" module ("manage_inactivity()")
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();
#ifdef MMU_HAS_CUTTER #ifdef MMU_HAS_CUTTER
@ -2373,6 +2375,18 @@ void lcd_unLoadFilament()
else lcd_generic_preheat_menu(); else lcd_generic_preheat_menu();
} }
static void mmu_unload_filament()
{
eFilamentAction = FilamentAction::MmuUnLoad;
bFilamentFirstRun = false;
if (target_temperature[0] >= EXTRUDE_MINTEMP)
{
bFilamentPreheatState = true;
mFilamentItem(target_temperature[0], target_temperature_bed);
}
else lcd_generic_preheat_menu();
}
void lcd_wait_interact() { void lcd_wait_interact() {
@ -6543,7 +6557,7 @@ static void lcd_main_menu()
MENU_ITEM_SUBMENU_P(_i("Load to nozzle"), mmu_load_to_nozzle_menu); MENU_ITEM_SUBMENU_P(_i("Load to nozzle"), mmu_load_to_nozzle_menu);
//-// MENU_ITEM_FUNCTION_P(_T(MSG_UNLOAD_FILAMENT), extr_unload); //-// MENU_ITEM_FUNCTION_P(_T(MSG_UNLOAD_FILAMENT), extr_unload);
//bFilamentFirstRun=true; //bFilamentFirstRun=true;
MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), extr_unload_); MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), mmu_unload_filament);
MENU_ITEM_SUBMENU_P(_i("Eject filament"), mmu_fil_eject_menu); MENU_ITEM_SUBMENU_P(_i("Eject filament"), mmu_fil_eject_menu);
#ifdef MMU_HAS_CUTTER #ifdef MMU_HAS_CUTTER
MENU_ITEM_SUBMENU_P(_i("Cut filament"), mmu_cut_filament_menu); MENU_ITEM_SUBMENU_P(_i("Cut filament"), mmu_cut_filament_menu);