From 6361404b91dcf8ba657b1f1e16d9717a8e280ae6 Mon Sep 17 00:00:00 2001
From: AnHardt <github@kitelab.de>
Date: Sat, 4 Apr 2015 17:56:13 +0200
Subject: [PATCH] Testloop cleanup
Shifted condition should still be in.
---
Marlin/dogm_lcd_implementation.h | 4 ++--
Marlin/ultralcd.cpp | 9 +++------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h
index 81234c0f01..c057e56425 100644
--- a/Marlin/dogm_lcd_implementation.h
+++ b/Marlin/dogm_lcd_implementation.h
@@ -318,9 +318,9 @@ static void lcd_implementation_status_screen() {
lcd_setFont(FONT_STATUSMENU);
#ifdef USE_SMALL_INFOFONT
- u8g.drawBox(0,30,127,10);
+ u8g.drawBox(0,30,128,10);
#else
- u8g.drawBox(0,30,127,9);
+ u8g.drawBox(0,30,128,9);
#endif
u8g.setColorIndex(0); // white on black
u8g.setPrintPos(2,XYZ_BASELINE);
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 1c124a0062..a3413bfbef 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -1299,8 +1299,6 @@ void lcd_update() {
}
#endif//CARDINSERTED
- static uint8_t dotcounter = 63;
-
uint32_t ms = millis();
if (ms > lcd_next_update_millis) {
@@ -1366,12 +1364,11 @@ void lcd_update() {
(*currentMenu)();
if (lcdDrawUpdate) {
do {
- if (!dotcounter) dotcounter = 63;
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, dotcounter--); // draw alive dot
- // u8g.setColorIndex(1); // black on white
+ if (blink % 2) u8g.setColorIndex(1); else u8g.setColorIndex(0); // Set color for the alive dot
+ u8g.drawPixel(127, 63); // draw alive dot
+ u8g.setColorIndex(1); // black on white
(*currentMenu)();
} while( u8g.nextPage() );
}
--
GitLab