|
@@ -2205,110 +2205,6 @@ if(lcd_clicked())
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-/*
|
|
|
-void _mFilamentItem(uint16_t nTemp,uint16_t nTempBed)
|
|
|
-{
|
|
|
-static int nTargetOld,nTargetBedOld;
|
|
|
-uint8_t nLevel;
|
|
|
-static bool bBeep=false;
|
|
|
-
|
|
|
-//if(bPreheatState) // not necessary
|
|
|
- nTargetOld=target_temperature[0];
|
|
|
- nTargetBedOld=target_temperature_bed;
|
|
|
-setTargetHotend0((float)nTemp);
|
|
|
-setTargetBed((float)nTempBed);
|
|
|
-lcd_timeoutToStatus.stop();
|
|
|
-lcd_set_cursor(0,0);
|
|
|
-lcdui_print_temp(LCD_STR_THERMOMETER[0],(int)degHotend(0),(int)degTargetHotend(0));
|
|
|
-lcd_set_cursor(0,1);
|
|
|
-switch(eFilamentAction)
|
|
|
- {
|
|
|
- case eFILAMENT_ACTION::load:
|
|
|
- case eFILAMENT_ACTION::autoLoad:
|
|
|
- case eFILAMENT_ACTION::mmuLoad:
|
|
|
- lcd_puts_P(_i("Preheating to load")); ////MSG_ c=20 r=1
|
|
|
- break;
|
|
|
- case eFILAMENT_ACTION::unLoad:
|
|
|
- case eFILAMENT_ACTION::mmuUnLoad:
|
|
|
- lcd_puts_P(_i("Preheating to unload")); ////MSG_ c=20 r=1
|
|
|
- break;
|
|
|
- case eFILAMENT_ACTION::mmuEject:
|
|
|
- lcd_puts_P(_i("Preheating to eject")); ////MSG_ c=20 r=1
|
|
|
- break;
|
|
|
- case eFILAMENT_ACTION::mmuCut:
|
|
|
- lcd_puts_P(_i("Preheating to cut")); ////MSG_ c=20 r=1
|
|
|
- break;
|
|
|
- }
|
|
|
-lcd_set_cursor(0,3);
|
|
|
-lcd_puts_P(_i(">Cancel")); ////MSG_ c=20 r=1
|
|
|
-if(lcd_clicked())
|
|
|
- {
|
|
|
- if(!bFilamentPreheatState)
|
|
|
- {
|
|
|
- setTargetHotend0(0.0);
|
|
|
- setTargetBed(0.0);
|
|
|
- menu_back();
|
|
|
- }
|
|
|
- else {
|
|
|
- setTargetHotend0((float)nTargetOld);
|
|
|
- setTargetBed((float)nTargetBedOld);
|
|
|
- }
|
|
|
- menu_back();
|
|
|
- if(eFilamentAction==eFILAMENT_ACTION::autoLoad)
|
|
|
- eFilamentAction=eFILAMENT_ACTION::none; // i.e. non-autoLoad
|
|
|
- }
|
|
|
-else {
|
|
|
- if(current_temperature[0]>(target_temperature[0]*0.95))
|
|
|
- {
|
|
|
- switch(eFilamentAction)
|
|
|
- {
|
|
|
- case eFILAMENT_ACTION::load:
|
|
|
- case eFILAMENT_ACTION::autoLoad:
|
|
|
- case eFILAMENT_ACTION::unLoad:
|
|
|
- menu_submenu(mFilamentPrompt);
|
|
|
- break;
|
|
|
- case eFILAMENT_ACTION::mmuLoad:
|
|
|
- nLevel=1;
|
|
|
- if(!bFilamentPreheatState)
|
|
|
- nLevel++;
|
|
|
- bFilamentAction=true;
|
|
|
- menu_back(nLevel);
|
|
|
- menu_submenu(mmu_load_to_nozzle_menu);
|
|
|
- break;
|
|
|
- case eFILAMENT_ACTION::mmuUnLoad:
|
|
|
- nLevel=1;
|
|
|
- if(!bFilamentPreheatState)
|
|
|
- nLevel++;
|
|
|
- bFilamentAction=true;
|
|
|
- menu_back(nLevel);
|
|
|
- extr_unload();
|
|
|
- break;
|
|
|
- case eFILAMENT_ACTION::mmuEject:
|
|
|
- nLevel=1;
|
|
|
- if(!bFilamentPreheatState)
|
|
|
- nLevel++;
|
|
|
- bFilamentAction=true;
|
|
|
- menu_back(nLevel);
|
|
|
- menu_submenu(mmu_fil_eject_menu);
|
|
|
- break;
|
|
|
- case eFILAMENT_ACTION::mmuCut:
|
|
|
- nLevel=1;
|
|
|
- if(!bFilamentPreheatState)
|
|
|
- nLevel++;
|
|
|
- bFilamentAction=true;
|
|
|
- menu_back(nLevel);
|
|
|
- menu_submenu(mmu_cut_filament_menu);
|
|
|
- break;
|
|
|
- }
|
|
|
- if(bBeep)
|
|
|
- Sound_MakeSound(e_SOUND_TYPE_StandardPrompt);
|
|
|
- bBeep=false;
|
|
|
- }
|
|
|
- else bBeep=true;
|
|
|
- }
|
|
|
-}
|
|
|
-*/
|
|
|
-
|
|
|
void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
|
|
|
{
|
|
|
static int nTargetOld;
|