|
@@ -5920,43 +5920,43 @@ static void lcd_disable_farm_mode()
|
|
|
|
|
|
static void fil_load_menu()
|
|
static void fil_load_menu()
|
|
{
|
|
{
|
|
- MENU_BEGIN();
|
|
|
|
- MENU_ITEM_BACK_P(_T(MSG_MAIN));
|
|
|
|
|
|
+ MENU_BEGIN();
|
|
|
|
+ MENU_ITEM_BACK_P(_T(MSG_MAIN));
|
|
MENU_ITEM_FUNCTION_P(_i("Load all"), load_all);////MSG_LOAD_ALL c=17
|
|
MENU_ITEM_FUNCTION_P(_i("Load all"), load_all);////MSG_LOAD_ALL c=17
|
|
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0);////MSG_LOAD_FILAMENT_1 c=16
|
|
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0);////MSG_LOAD_FILAMENT_1 c=16
|
|
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '2', extr_adj, 1);////MSG_LOAD_FILAMENT_2 c=17
|
|
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '2', extr_adj, 1);////MSG_LOAD_FILAMENT_2 c=17
|
|
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '3', extr_adj, 2);////MSG_LOAD_FILAMENT_3 c=17
|
|
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '3', extr_adj, 2);////MSG_LOAD_FILAMENT_3 c=17
|
|
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '4', extr_adj, 3);////MSG_LOAD_FILAMENT_4 c=17
|
|
MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '4', extr_adj, 3);////MSG_LOAD_FILAMENT_4 c=17
|
|
|
|
|
|
- if (mmu_enabled)
|
|
|
|
- MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', extr_adj, 3);
|
|
|
|
|
|
+ if (mmu_enabled)
|
|
|
|
+ MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', extr_adj, 3);
|
|
|
|
|
|
- MENU_END();
|
|
|
|
|
|
+ MENU_END();
|
|
}
|
|
}
|
|
|
|
|
|
static void mmu_load_to_nozzle_menu()
|
|
static void mmu_load_to_nozzle_menu()
|
|
{
|
|
{
|
|
if(bFilamentAction)
|
|
if(bFilamentAction)
|
|
{
|
|
{
|
|
- MENU_BEGIN();
|
|
|
|
- MENU_ITEM_BACK_P(_T(MSG_MAIN));
|
|
|
|
- MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', lcd_mmu_load_to_nozzle, 0);
|
|
|
|
- MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '2', lcd_mmu_load_to_nozzle, 1);
|
|
|
|
- MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '3', lcd_mmu_load_to_nozzle, 2);
|
|
|
|
- MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '4', lcd_mmu_load_to_nozzle, 3);
|
|
|
|
- MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', lcd_mmu_load_to_nozzle, 4);
|
|
|
|
- MENU_END();
|
|
|
|
|
|
+ MENU_BEGIN();
|
|
|
|
+ MENU_ITEM_BACK_P(_T(MSG_MAIN));
|
|
|
|
+ MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', lcd_mmu_load_to_nozzle, 0);
|
|
|
|
+ MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '2', lcd_mmu_load_to_nozzle, 1);
|
|
|
|
+ MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '3', lcd_mmu_load_to_nozzle, 2);
|
|
|
|
+ MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '4', lcd_mmu_load_to_nozzle, 3);
|
|
|
|
+ MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '5', lcd_mmu_load_to_nozzle, 4);
|
|
|
|
+ MENU_END();
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
eFilamentAction=e_FILAMENT_ACTION_mmuLoad;
|
|
eFilamentAction=e_FILAMENT_ACTION_mmuLoad;
|
|
bFilamentFirstRun=false;
|
|
bFilamentFirstRun=false;
|
|
if(target_temperature[0]>=EXTRUDE_MINTEMP)
|
|
if(target_temperature[0]>=EXTRUDE_MINTEMP)
|
|
- {
|
|
|
|
|
|
+ {
|
|
bFilamentPreheatState=true;
|
|
bFilamentPreheatState=true;
|
|
mFilamentItem(target_temperature[0],target_temperature_bed);
|
|
mFilamentItem(target_temperature[0],target_temperature_bed);
|
|
- }
|
|
|
|
- else mFilamentMenu();
|
|
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
|
+ else mFilamentMenu();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
static void mmu_eject_filament(uint8_t filament)
|
|
static void mmu_eject_filament(uint8_t filament)
|
|
@@ -5997,25 +5997,25 @@ static void mmu_cut_filament_menu()
|
|
{
|
|
{
|
|
if(bFilamentAction)
|
|
if(bFilamentAction)
|
|
{
|
|
{
|
|
- MENU_BEGIN();
|
|
|
|
- MENU_ITEM_BACK_P(_T(MSG_MAIN));
|
|
|
|
- MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), 1, mmu_cut_filament, 0);
|
|
|
|
- MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), 2, mmu_cut_filament, 1);
|
|
|
|
- MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), 3, mmu_cut_filament, 2);
|
|
|
|
- MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), 4, mmu_cut_filament, 3);
|
|
|
|
- MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), 5, mmu_cut_filament, 4);
|
|
|
|
- MENU_END();
|
|
|
|
|
|
+ MENU_BEGIN();
|
|
|
|
+ MENU_ITEM_BACK_P(_T(MSG_MAIN));
|
|
|
|
+ MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '1', mmu_cut_filament, 0);
|
|
|
|
+ MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '2', mmu_cut_filament, 1);
|
|
|
|
+ MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '3', mmu_cut_filament, 2);
|
|
|
|
+ MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '4', mmu_cut_filament, 3);
|
|
|
|
+ MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), '5', mmu_cut_filament, 4);
|
|
|
|
+ MENU_END();
|
|
}
|
|
}
|
|
else {
|
|
else {
|
|
- eFilamentAction=e_FILAMENT_ACTION_mmuCut;
|
|
|
|
- bFilamentFirstRun=false;
|
|
|
|
- if(target_temperature[0]>=EXTRUDE_MINTEMP)
|
|
|
|
- {
|
|
|
|
- bFilamentPreheatState=true;
|
|
|
|
- mFilamentItem(target_temperature[0],target_temperature_bed);
|
|
|
|
- }
|
|
|
|
- else mFilamentMenu();
|
|
|
|
- }
|
|
|
|
|
|
+ eFilamentAction=e_FILAMENT_ACTION_mmuCut;
|
|
|
|
+ bFilamentFirstRun=false;
|
|
|
|
+ if(target_temperature[0]>=EXTRUDE_MINTEMP)
|
|
|
|
+ {
|
|
|
|
+ bFilamentPreheatState=true;
|
|
|
|
+ mFilamentItem(target_temperature[0],target_temperature_bed);
|
|
|
|
+ }
|
|
|
|
+ else mFilamentMenu();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
#endif //MMU_HAS_CUTTER
|
|
#endif //MMU_HAS_CUTTER
|
|
|
|
|