bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

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

Browse Source
This commit is contained in:
Sergey Taranenko
2012-10-22 10:59:27 +04:00
parent 8178dec4c3 58bca87c72
commit 205304ddee
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/ultralcd.pde
View File

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