瀏覽代碼

Remove dead code.

Marek Bel 5 年之前
父節點
當前提交
0cdfa7a5e8
共有 2 個文件被更改,包括 16 次插入46 次删除
  1. 8 17
      Firmware/mmu.cpp
  2. 8 29
      Firmware/ultralcd.cpp

+ 8 - 17
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

+ 8 - 29
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();
 }