josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix formatting.

This commit is contained in:
Marek Bel 2019-08-26 19:48:39 +02:00
parent 51d01ddd6f
commit b9b0d6049e
1 changed files with 109 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Firmware/ultralcd.cpp
View File

@ -2362,15 +2362,17 @@ else {
void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
{ {
static int nTargetOld,nTargetBedOld; static int nTargetOld;
static int nTargetBedOld;
uint8_t nLevel; uint8_t nLevel;
//if(bPreheatState) // not necessary
nTargetOld = target_temperature[0]; nTargetOld = target_temperature[0];
nTargetBedOld = target_temperature_bed; nTargetBedOld = target_temperature_bed;
setTargetHotend0((float )nTemp); setTargetHotend0((float )nTemp);
setTargetBed((float) nTempBed); setTargetBed((float) nTempBed);
lcd_timeoutToStatus.stop(); lcd_timeoutToStatus.stop();
if (current_temperature[0] > (target_temperature[0] * 0.95)) if (current_temperature[0] > (target_temperature[0] * 0.95))
{ {
switch (eFilamentAction) switch (eFilamentAction)
@ -2378,17 +2380,16 @@ if(current_temperature[0]>(target_temperature[0]*0.95))
case FilamentAction::Load: case FilamentAction::Load:
case FilamentAction::AutoLoad: case FilamentAction::AutoLoad:
case FilamentAction::UnLoad: case FilamentAction::UnLoad:
if(bFilamentWaitingFlag) if (bFilamentWaitingFlag) menu_submenu(mFilamentPrompt);
menu_submenu(mFilamentPrompt); else
else { {
nLevel = bFilamentPreheatState ? 1 : 2; nLevel = bFilamentPreheatState ? 1 : 2;
menu_back(nLevel); menu_back(nLevel);
if ((eFilamentAction == FilamentAction::Load) || (eFilamentAction == FilamentAction::AutoLoad)) if ((eFilamentAction == FilamentAction::Load) || (eFilamentAction == FilamentAction::AutoLoad))
{ {
loading_flag = true; loading_flag = true;
enquecommand_P(PSTR("M701")); // load filament enquecommand_P(PSTR("M701")); // load filament
if(eFilamentAction==FilamentAction::AutoLoad) if (eFilamentAction == FilamentAction::AutoLoad) eFilamentAction = FilamentAction::None; // i.e. non-autoLoad
eFilamentAction=FilamentAction::None; // i.e. non-autoLoad
} }
if (eFilamentAction == FilamentAction::UnLoad) if (eFilamentAction == FilamentAction::UnLoad)
enquecommand_P(PSTR("M702")); // unload filament enquecommand_P(PSTR("M702")); // unload filament
@ -2423,11 +2424,11 @@ if(current_temperature[0]>(target_temperature[0]*0.95))
case FilamentAction::None: case FilamentAction::None:
break; break;
} }
if(bFilamentWaitingFlag) if (bFilamentWaitingFlag) Sound_MakeSound(e_SOUND_TYPE_StandardPrompt);
Sound_MakeSound(e_SOUND_TYPE_StandardPrompt);
bFilamentWaitingFlag = false; bFilamentWaitingFlag = false;
} }
else { else
{
bFilamentWaitingFlag = true; bFilamentWaitingFlag = true;
lcd_set_cursor(0, 0); lcd_set_cursor(0, 0);
lcdui_print_temp(LCD_STR_THERMOMETER[0], (int) degHotend(0), (int) degTargetHotend(0)); lcdui_print_temp(LCD_STR_THERMOMETER[0], (int) degHotend(0), (int) degTargetHotend(0));
@ -2463,13 +2464,13 @@ else {
setTargetBed(0.0); setTargetBed(0.0);
menu_back(); menu_back();
} }
else { else
{
setTargetHotend0((float )nTargetOld); setTargetHotend0((float )nTargetOld);
setTargetBed((float) nTargetBedOld); setTargetBed((float) nTargetBedOld);
} }
menu_back(); menu_back();
if(eFilamentAction==FilamentAction::AutoLoad) if (eFilamentAction == FilamentAction::AutoLoad) eFilamentAction = FilamentAction::None; // i.e. non-autoLoad
eFilamentAction=FilamentAction::None; // i.e. non-autoLoad
} }
} }
} }