diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 2aa5055b667..dda4418f0ee 100755
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -64,6 +64,9 @@ void lcd_status_screen();
millis_t next_lcd_update_ms;
uint8_t lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; // Set when the LCD needs to draw, decrements after every draw. Set to 2 in LCD routines so the LCD gets at least 1 full redraw (first redraw is partial)
+#if ENABLED(DOGLCD)
+ bool drawing_screen = false;
+#endif
#if ENABLED(DAC_STEPPER_CURRENT)
#include "stepper_dac.h" //was dac_mcp4728.h MarlinMain uses stepper dac for the m-codes
@@ -413,6 +416,9 @@ uint8_t lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; // Set when the LCD needs to
#endif
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
screen_changed = true;
+ #if ENABLED(DOGLCD)
+ drawing_screen = false;
+ #endif
}
}
@@ -2832,6 +2838,9 @@ void lcd_update() {
encoderPosition += (encoderDiff * encoderMultiplier) / ENCODER_PULSES_PER_STEP;
encoderDiff = 0;
+ #if ENABLED(DOGLCD)
+ drawing_screen = false; // refresh the complete screen for a encoder change (different menu-item/value)
+ #endif
}
return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;
lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
@@ -2864,20 +2873,28 @@ void lcd_update() {
if (LCD_HANDLER_CONDITION) {
- if (lcdDrawUpdate) {
-
- switch (lcdDrawUpdate) {
- case LCDVIEW_CALL_NO_REDRAW:
- lcdDrawUpdate = LCDVIEW_NONE;
- break;
- case LCDVIEW_CLEAR_CALL_REDRAW: // set by handlers, then altered after (rarely occurs here)
- case LCDVIEW_CALL_REDRAW_NEXT: // set by handlers, then altered after (never occurs here?)
- lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
- case LCDVIEW_REDRAW_NOW: // set above, or by a handler through LCDVIEW_CALL_REDRAW_NEXT
- case LCDVIEW_NONE:
- break;
- } // switch
-
+ #if ENABLED(DOGLCD)
+ if (lcdDrawUpdate || drawing_screen)
+ #else
+ if (lcdDrawUpdate)
+ #endif
+ {
+ #if ENABLED(DOGLCD)
+ if (!drawing_screen)
+ #endif
+ {
+ switch (lcdDrawUpdate) {
+ case LCDVIEW_CALL_NO_REDRAW:
+ lcdDrawUpdate = LCDVIEW_NONE;
+ break;
+ case LCDVIEW_CLEAR_CALL_REDRAW: // set by handlers, then altered after (rarely occurs here)
+ case LCDVIEW_CALL_REDRAW_NEXT: // set by handlers, then altered after (never occurs here?)
+ lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
+ case LCDVIEW_REDRAW_NOW: // set above, or by a handler through LCDVIEW_CALL_REDRAW_NEXT
+ case LCDVIEW_NONE:
+ break;
+ } // switch
+ }
#if ENABLED(ULTIPANEL)
#define CURRENTSCREEN() (*currentScreen)(), lcd_clicked = false
#else
@@ -2885,17 +2902,13 @@ void lcd_update() {
#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;
- u8g.firstPage();
- do {
- lcd_setFont(FONT_MENU);
- u8g.setPrintPos(125, 0);
- u8g.setColorIndex(dot_color); // Set color for the alive dot
- u8g.drawPixel(127, 63); // draw alive dot
- u8g.setColorIndex(1); // black on white
- CURRENTSCREEN();
- } while (u8g.nextPage());
+ if (!drawing_screen) {
+ u8g.firstPage();
+ drawing_screen = 1;
+ }
+ lcd_setFont(FONT_MENU);
+ CURRENTSCREEN();
+ if (drawing_screen && (drawing_screen = u8g.nextPage())) return;
#else
CURRENTSCREEN();
#endif
@@ -2911,22 +2924,25 @@ void lcd_update() {
#endif // ULTIPANEL
- switch (lcdDrawUpdate) {
- case LCDVIEW_CLEAR_CALL_REDRAW:
- lcd_implementation_clear();
- case LCDVIEW_CALL_REDRAW_NEXT:
- lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
- break;
- case LCDVIEW_REDRAW_NOW:
- lcdDrawUpdate = LCDVIEW_NONE;
- break;
- case LCDVIEW_NONE:
- break;
- } // switch
-
+ #if ENABLED(DOGLCD)
+ if (!drawing_screen)
+ #endif
+ {
+ switch (lcdDrawUpdate) {
+ case LCDVIEW_CLEAR_CALL_REDRAW:
+ lcd_implementation_clear();
+ case LCDVIEW_CALL_REDRAW_NEXT:
+ lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
+ break;
+ case LCDVIEW_REDRAW_NOW:
+ lcdDrawUpdate = LCDVIEW_NONE;
+ break;
+ case LCDVIEW_NONE:
+ break;
+ } // switch
+ }
} // LCD_HANDLER_CONDITION
-
- }
+ } // ELAPSED(ms, next_lcd_update_ms)
}
void set_utf_strlen(char* s, uint8_t n) {
diff --git a/Marlin/ultralcd_impl_DOGM.h b/Marlin/ultralcd_impl_DOGM.h
index 46a5225618e..f8ffe749811 100644
--- a/Marlin/ultralcd_impl_DOGM.h
+++ b/Marlin/ultralcd_impl_DOGM.h
@@ -145,7 +145,7 @@
#elif ENABLED(U8GLIB_ST7920)
//U8GLIB_ST7920_128X64_4X u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS); // Original u8glib device. 2 stripes
// No 4 stripe device available from u8glib.
- //U8GLIB_ST7920_128X64 u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS); // Original u8glib device. 8 stripes
+ //U8GLIB_ST7920_128X64_1X u8g(LCD_PINS_D4, LCD_PINS_ENABLE, LCD_PINS_RS); // Original u8glib device. 8 stripes
U8GLIB_ST7920_128X64_RRD u8g(0); // Number of stripes can be adjusted in ultralcd_st7920_u8glib_rrd.h with PAGE_HEIGHT
#elif ENABLED(CARTESIO_UI)
// The CartesioUI display
diff --git a/Marlin/ultralcd_st7920_u8glib_rrd.h b/Marlin/ultralcd_st7920_u8glib_rrd.h
index 1dc39360f96..66e1f172249 100644
--- a/Marlin/ultralcd_st7920_u8glib_rrd.h
+++ b/Marlin/ultralcd_st7920_u8glib_rrd.h
@@ -32,8 +32,8 @@
#define ST7920_CS_PIN LCD_PINS_RS
//#define PAGE_HEIGHT 8 //128 byte framebuffer
-//#define PAGE_HEIGHT 16 //256 byte framebuffer
-#define PAGE_HEIGHT 32 //512 byte framebuffer
+#define PAGE_HEIGHT 16 //256 byte framebuffer
+//#define PAGE_HEIGHT 32 //512 byte framebuffer
#define LCD_PIXEL_WIDTH 128
#define LCD_PIXEL_HEIGHT 64