SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed compile errors in ultralcd when no ultra_lcd is selected.

Browse source
This commit is contained in:
Erik van der Zalm 2012-03-15 22:29:31 +01:00
parent 2e749d60c3
commit b985e4a134
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Marlin/ultralcd.pde
View file

@ -414,7 +414,7 @@ void MainMenu::showStatus()
lcd.print(" "); lcd.print(" ");
messagetext[0]='\0'; messagetext[0]='\0';
} }
#ifdef SDSUPPORT
static uint8_t oldpercent=101; static uint8_t oldpercent=101;
uint8_t percent=card.percentDone(); uint8_t percent=card.percentDone();
if(oldpercent!=percent ||force_lcd_update) if(oldpercent!=percent ||force_lcd_update)
@ -423,7 +423,7 @@ void MainMenu::showStatus()
lcd.print(itostr3((int)percent)); lcd.print(itostr3((int)percent));
lcdprintPGM("%SD"); lcdprintPGM("%SD");
} }
#endif
#else //smaller LCDS---------------------------------- #else //smaller LCDS----------------------------------
static int olddegHotEnd0=-1; static int olddegHotEnd0=-1;
static int oldtargetHotEnd0=-1; static int oldtargetHotEnd0=-1;
@ -478,6 +478,7 @@ enum {ItemP_exit, ItemP_autostart,ItemP_disstep,ItemP_home, ItemP_origin, ItemP_
void MainMenu::showPrepare() void MainMenu::showPrepare()
{ {
#ifdef ULTIPANEL
uint8_t line=0; uint8_t line=0;
clearIfNecessary(); clearIfNecessary();
for(int8_t i=lineoffset;i<lineoffset+LCD_HEIGHT;i++) for(int8_t i=lineoffset;i<lineoffset+LCD_HEIGHT;i++)
@ -533,6 +534,7 @@ void MainMenu::showPrepare()
line++; line++;
} }
updateActiveLines(ItemP_move,encoderpos); updateActiveLines(ItemP_move,encoderpos);
#endif
} }
enum { enum {
@ -1981,6 +1983,7 @@ void MainMenu::showSD()
#endif #endif
} }
enum {ItemM_watch, ItemM_prepare, ItemM_control, ItemM_file }; enum {ItemM_watch, ItemM_prepare, ItemM_control, ItemM_file };
void MainMenu::showMainMenu() void MainMenu::showMainMenu()
{ {