|
@@ -2344,6 +2344,8 @@ switch(eFilamentAction)
|
|
lcd_puts_P(_i("to unload filament"));
|
|
lcd_puts_P(_i("to unload filament"));
|
|
break;
|
|
break;
|
|
case e_FILAMENT_ACTION_mmuEject:
|
|
case e_FILAMENT_ACTION_mmuEject:
|
|
|
|
+ case e_FILAMENT_ACTION_mmuCut:
|
|
|
|
+ case e_FILAMENT_ACTION_none:
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
if(lcd_clicked())
|
|
if(lcd_clicked())
|
|
@@ -2357,38 +2359,23 @@ if(lcd_clicked())
|
|
menu_back(nLevel);
|
|
menu_back(nLevel);
|
|
switch(eFilamentAction)
|
|
switch(eFilamentAction)
|
|
{
|
|
{
|
|
- case e_FILAMENT_ACTION_Load:
|
|
|
|
case e_FILAMENT_ACTION_autoLoad:
|
|
case e_FILAMENT_ACTION_autoLoad:
|
|
|
|
+ eFilamentAction=e_FILAMENT_ACTION_none;
|
|
|
|
+
|
|
|
|
+ case e_FILAMENT_ACTION_Load:
|
|
loading_flag=true;
|
|
loading_flag=true;
|
|
enquecommand_P(PSTR("M701"));
|
|
enquecommand_P(PSTR("M701"));
|
|
break;
|
|
break;
|
|
case e_FILAMENT_ACTION_unLoad:
|
|
case e_FILAMENT_ACTION_unLoad:
|
|
enquecommand_P(PSTR("M702"));
|
|
enquecommand_P(PSTR("M702"));
|
|
break;
|
|
break;
|
|
-
|
|
|
|
case e_FILAMENT_ACTION_mmuLoad:
|
|
case e_FILAMENT_ACTION_mmuLoad:
|
|
-
|
|
|
|
- bFilamentAction=true;
|
|
|
|
- menu_submenu(mmu_load_to_nozzle_menu);
|
|
|
|
- break;
|
|
|
|
-*/
|
|
|
|
-
|
|
|
|
case e_FILAMENT_ACTION_mmuUnLoad:
|
|
case e_FILAMENT_ACTION_mmuUnLoad:
|
|
-
|
|
|
|
- bFilamentAction=true;
|
|
|
|
- extr_unload();
|
|
|
|
- break;
|
|
|
|
-*/
|
|
|
|
-
|
|
|
|
case e_FILAMENT_ACTION_mmuEject:
|
|
case e_FILAMENT_ACTION_mmuEject:
|
|
- MYSERIAL.println("mFilamentPrompt - mmuEject");
|
|
+ case e_FILAMENT_ACTION_mmuCut:
|
|
- bFilamentAction=true;
|
|
+ case e_FILAMENT_ACTION_none:
|
|
-
|
|
|
|
break;
|
|
break;
|
|
-*/
|
|
|
|
}
|
|
}
|
|
- if(eFilamentAction==e_FILAMENT_ACTION_autoLoad)
|
|
|
|
- eFilamentAction=e_FILAMENT_ACTION_none;
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|