From 132322e4d94cf776ea3d42af68406bf7b012120a Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 14 Aug 2016 00:29:46 -0700
Subject: [PATCH] Fix #4614: currentScreen only defined with ULTIPANEL
---
Marlin/ultralcd.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 7bb1d08042..2398ee7273 100755
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -2686,6 +2686,12 @@ void lcd_update() {
break;
}
+ #if ENABLED(ULTIPANEL)
+ #define CURRENTSCREEN() (*currentScreen)()
+ #else
+ #define CURRENTSCREEN() lcd_status_screen()
+ #endif
+
#if ENABLED(DOGLCD) // Changes due to different driver architecture of the DOGM display
static int8_t dot_color = 0;
dot_color = 1 - dot_color;
@@ -2696,12 +2702,10 @@ void lcd_update() {
u8g.setColorIndex(dot_color); // Set color for the alive dot
u8g.drawPixel(127, 63); // draw alive dot
u8g.setColorIndex(1); // black on white
- (*currentScreen)();
+ CURRENTSCREEN();
} while (u8g.nextPage());
- #elif ENABLED(ULTIPANEL)
- (*currentScreen)();
#else
- lcd_status_screen();
+ CURRENTSCREEN();
#endif
}
--
GitLab