From 0cdfa7a5e8e75d210f8fcfab1bab6de5a5862bb8 Mon Sep 17 00:00:00 2001 From: Marek Bel Date: Thu, 12 Sep 2019 18:33:02 +0200 Subject: [PATCH] Remove dead code. --- Firmware/mmu.cpp | 25 ++++++++----------------- Firmware/ultralcd.cpp | 37 ++++++++----------------------------- 2 files changed, 16 insertions(+), 46 deletions(-) diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp index 89c76dd2..e08ddd32 100755 --- a/Firmware/mmu.cpp +++ b/Firmware/mmu.cpp @@ -1077,23 +1077,14 @@ void mmu_filament_ramming() //-// void extr_unload_() { -//if(bFilamentAction) -if(0) - { - bFilamentAction=false; - extr_unload(); - } -else { - eFilamentAction=FilamentAction::MmuUnLoad; - 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(); - } + 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 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6c80d213..c01991cb 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2363,13 +2363,6 @@ mFilamentItem(target_temperature[0],target_temperature_bed); void lcd_unLoadFilament() { -//./if((degHotend0()>EXTRUDE_MINTEMP)&&bFilamentFirstRun) -if(0) - { - menu_back(); - enquecommand_P(PSTR("M702")); // unload filament - } -else { eFilamentAction=FilamentAction::UnLoad; bFilamentFirstRun=false; if(target_temperature[0]>=EXTRUDE_MINTEMP) @@ -2378,7 +2371,6 @@ else { mFilamentItem(target_temperature[0],target_temperature_bed); } else lcd_generic_preheat_menu(); - } } @@ -2596,27 +2588,14 @@ static void lcd_menu_AutoLoadFilament() 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; - bFilamentFirstRun=false; - if(target_temperature[0]>=EXTRUDE_MINTEMP) - { - bFilamentPreheatState=true; - mFilamentItem(target_temperature[0],target_temperature_bed); - } - else lcd_generic_preheat_menu(); - } + 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(); }