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

25
Firmware/mmu.cpp
View File

@ -1077,23 +1077,14 @@ void mmu_filament_ramming()
//-// //-//
void extr_unload_() void extr_unload_()
{ {
//if(bFilamentAction) eFilamentAction = FilamentAction::MmuUnLoad;
if(0) bFilamentFirstRun = false;
{ if (target_temperature[0] >= EXTRUDE_MINTEMP)
bFilamentAction=false; {
extr_unload(); bFilamentPreheatState = true;
} mFilamentItem(target_temperature[0], target_temperature_bed);
else { }
eFilamentAction=FilamentAction::MmuUnLoad; else lcd_generic_preheat_menu();
bFilamentFirstRun=false;
if(target_temperature[0]>=EXTRUDE_MINTEMP)
{
bFilamentPreheatState=true;
mFilamentItem(target_temperature[0],target_temperature_bed);
}
// else menu_submenu(mFilamentMenu);
else lcd_generic_preheat_menu();
}
} }
//! @brief show which filament is currently unloaded //! @brief show which filament is currently unloaded

37
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)
@ -2378,7 +2371,6 @@ else {
mFilamentItem(target_temperature[0],target_temperature_bed); mFilamentItem(target_temperature[0],target_temperature_bed);
} }
else lcd_generic_preheat_menu(); else lcd_generic_preheat_menu();
}
} }
@ -2596,27 +2588,14 @@ static void lcd_menu_AutoLoadFilament()
static void lcd_LoadFilament() static void lcd_LoadFilament()
{ {
//-// if (degHotend0() > EXTRUDE_MINTEMP) eFilamentAction = FilamentAction::Load;
if(0) bFilamentFirstRun = false;
{ if (target_temperature[0] >= EXTRUDE_MINTEMP)
// menu_back(); // not necessary (see "lcd_return_to_status()" below) {
custom_message_type = CustomMsg::FilamentLoading; bFilamentPreheatState = true;
loading_flag = true; mFilamentItem(target_temperature[0], target_temperature_bed);
enquecommand_P(PSTR("M701")); //load filament }
SERIAL_ECHOLN("Loading filament"); else lcd_generic_preheat_menu();
lcd_return_to_status();
}
else
{
eFilamentAction=FilamentAction::Load;
bFilamentFirstRun=false;
if(target_temperature[0]>=EXTRUDE_MINTEMP)
{
bFilamentPreheatState=true;
mFilamentItem(target_temperature[0],target_temperature_bed);
}
else lcd_generic_preheat_menu();
}
} }