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

Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji

Browse Source 
Conflicts:
	Marlin/language.h
Conflict cleaned
This commit is contained in:
AnHardt
2015-03-16 17:13:49 +01:00
parent cbe4496123 e38dd5f030
commit 00b162a993
44 changed files with 2446 additions and 1215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/ultralcd.cpp
View File

@ -1309,7 +1309,7 @@ void lcd_update() {
blink++; // Variable for fan animation and alive dot
u8g.firstPage();
do {
u8g.setFont(FONT_MENU);
lcd_setFont(FONT_MENU);
u8g.setPrintPos(125, 0);
if (blink % 2) u8g.setColorIndex(1); else u8g.setColorIndex(0); // Set color for the alive dot
u8g.drawPixel(127, 63); // draw alive dot