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

Remove dead code.

This commit is contained in:
Marek Bel 2019-09-12 18:33:02 +02:00
parent e83b2ebe1f
commit 0cdfa7a5e8
2 changed files with 16 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Firmware/mmu.cpp
View File

@ -1077,13 +1077,6 @@ void mmu_filament_ramming()
//-// //-//
void extr_unload_() void extr_unload_()
{ {
//if(bFilamentAction)
if(0)
{
bFilamentAction=false;
extr_unload();
}
else {
eFilamentAction = FilamentAction::MmuUnLoad; eFilamentAction = FilamentAction::MmuUnLoad;
bFilamentFirstRun = false; bFilamentFirstRun = false;
if (target_temperature[0] >= EXTRUDE_MINTEMP) if (target_temperature[0] >= EXTRUDE_MINTEMP)
@ -1091,10 +1084,8 @@ else {
bFilamentPreheatState = true; bFilamentPreheatState = true;
mFilamentItem(target_temperature[0], target_temperature_bed); mFilamentItem(target_temperature[0], target_temperature_bed);
} }
// else menu_submenu(mFilamentMenu);
else lcd_generic_preheat_menu(); 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()

21
Firmware/ultralcd.cpp
View File

@ -2363,13 +2363,6 @@ mFilamentItem(target_temperature[0],target_temperature_bed);
void lcd_unLoadFilament() void lcd_unLoadFilament()
{ {
//./if((degHotend0()>EXTRUDE_MINTEMP)&&bFilamentFirstRun)
if(0)
{
menu_back();
enquecommand_P(PSTR("M702")); // unload filament
}
else {
eFilamentAction=FilamentAction::UnLoad; eFilamentAction=FilamentAction::UnLoad;
bFilamentFirstRun=false; bFilamentFirstRun=false;
if(target_temperature[0]>=EXTRUDE_MINTEMP) if(target_temperature[0]>=EXTRUDE_MINTEMP)
@ -2379,7 +2372,6 @@ else {
} }
else lcd_generic_preheat_menu(); else lcd_generic_preheat_menu();
} }
}
void lcd_wait_interact() { void lcd_wait_interact() {
@ -2595,18 +2587,6 @@ static void lcd_menu_AutoLoadFilament()
#endif //FILAMENT_SENSOR #endif //FILAMENT_SENSOR
static void lcd_LoadFilament() static void lcd_LoadFilament()
{
//-// if (degHotend0() > EXTRUDE_MINTEMP)
if(0)
{
// menu_back(); // not necessary (see "lcd_return_to_status()" below)
custom_message_type = CustomMsg::FilamentLoading;
loading_flag = true;
enquecommand_P(PSTR("M701")); //load filament
SERIAL_ECHOLN("Loading filament");
lcd_return_to_status();
}
else
{ {
eFilamentAction = FilamentAction::Load; eFilamentAction = FilamentAction::Load;
bFilamentFirstRun = false; bFilamentFirstRun = false;
@ -2617,7 +2597,6 @@ if(0)
} }
else lcd_generic_preheat_menu(); else lcd_generic_preheat_menu();
} }
}
//! @brief Show filament used a print time //! @brief Show filament used a print time