zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Revert "Testloop cleanup"

Browse source 
This reverts commit 6361404b91.
This commit is contained in:
AnHardt 2015-04-04 18:33:36 +02:00
parent 6361404b91
commit 418d22d7b3
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/dogm_lcd_implementation.h
View file

@ -318,9 +318,9 @@ static void lcd_implementation_status_screen() {
lcd_setFont(FONT_STATUSMENU); lcd_setFont(FONT_STATUSMENU);
#ifdef USE_SMALL_INFOFONT #ifdef USE_SMALL_INFOFONT
u8g.drawBox(0,30,128,10); u8g.drawBox(0,30,127,10);
#else #else
u8g.drawBox(0,30,128,9); u8g.drawBox(0,30,127,9);
#endif #endif
u8g.setColorIndex(0); // white on black u8g.setColorIndex(0); // white on black
u8g.setPrintPos(2,XYZ_BASELINE); u8g.setPrintPos(2,XYZ_BASELINE);

9
Marlin/ultralcd.cpp
View file

@ -1299,6 +1299,8 @@ void lcd_update() {
} }
#endif//CARDINSERTED #endif//CARDINSERTED
static uint8_t dotcounter = 63;
uint32_t ms = millis(); uint32_t ms = millis();
if (ms > lcd_next_update_millis) { if (ms > lcd_next_update_millis) {
@ -1364,11 +1366,12 @@ void lcd_update() {
(*currentMenu)(); (*currentMenu)();
if (lcdDrawUpdate) { if (lcdDrawUpdate) {
do { do {
if (!dotcounter) dotcounter = 63;
lcd_setFont(FONT_MENU); lcd_setFont(FONT_MENU);
u8g.setPrintPos(125, 0); u8g.setPrintPos(125, 0);
if (blink % 2) u8g.setColorIndex(1); else u8g.setColorIndex(0); // Set color for the alive dot // if (blink % 2) u8g.setColorIndex(1); else u8g.setColorIndex(0); // Set color for the alive dot
u8g.drawPixel(127, 63); // draw alive dot u8g.drawPixel(127, dotcounter--); // draw alive dot
u8g.setColorIndex(1); // black on white // u8g.setColorIndex(1); // black on white
(*currentMenu)(); (*currentMenu)();
} while( u8g.nextPage() ); } while( u8g.nextPage() );
} }