Merge git://github.com/ErikZalm/Marlin into Marlin_v1

This commit is contained in:
Sergey Taranenko 2012-10-22 10:59:27 +04:00
commit 205304ddee

View File

@ -177,7 +177,6 @@ void lcd_init()
lcd.createChar(3,uplevel);
lcd.createChar(4,refresh);
lcd.createChar(5,folder);
setTargetHotend0(0);setTargetHotend1(0);setTargetHotend2(0);setTargetBed(0);
LCD_MESSAGEPGM(WELCOME_MSG);
}
@ -367,11 +366,11 @@ void MainMenu::showStatus()
{
encoderpos=feedmultiply;
clear();
lcd.setCursor(0,0);lcdprintPGM("\002---/---\001 ");
lcd.setCursor(0,0);lcdprintPGM("\002000/000\001 ");
#if defined BED_USES_THERMISTOR || defined BED_USES_AD595
lcd.setCursor(10,0);lcdprintPGM("B---/---\001 ");
lcd.setCursor(10,0);lcdprintPGM("B000/000\001 ");
#elif EXTRUDERS > 1
lcd.setCursor(10,0);lcdprintPGM("\002---/---\001 ");
lcd.setCursor(10,0);lcdprintPGM("\002000/000\001 ");
#endif
}