Proposed changes to ST7920 lightweight status screen

.travis.yml

@@ -236,7 +236,7 @@ script:
   #
   - restore_configs
   - opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT
-  - opt_enable_adv SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES
+  - opt_enable_adv SDCARD_SORT_ALPHA STATUS_MESSAGE_SCROLLING SCROLL_LONG_FILENAMES LIGHTWEIGHT_UI
   - build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
   #
   # REPRAPWORLD_KEYPAD

Marlin/Configuration.h

@@ -1513,18 +1513,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/default/Configuration.h

@@ -1513,18 +1513,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/default/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/AliExpress/CL-260/Configuration.h

@@ -1513,18 +1513,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/Anet/A6/Configuration.h

@@ -1661,18 +1661,9 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
+// Note: Details on connecting to the Anet V1.0 controller are in the file pins_ANET_10.h
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
 //
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/Anet/A6/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Anet/A8/Configuration.h

@@ -1516,7 +1516,6 @@
 //
 //#define G3D_PANEL
 
-
 //
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
@@ -1525,18 +1524,6 @@
 //
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
 
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
-
 //
 // MakerLab Mini Panel with graphic
 // controller and SD support - http://reprap.org/wiki/Mini_panel

Marlin/src/config/examples/Anet/A8/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h

@@ -646,6 +646,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/BIBO/TouchX/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h

@@ -1513,18 +1513,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h

@@ -1513,18 +1513,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Cartesio/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Creality/Ender/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Felix/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h

@@ -1519,18 +1519,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Infitary/i3-M508/Configuration.h

@@ -1517,18 +1517,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/JGAurora/A5/Configuration.h

@@ -1524,18 +1524,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/MakerParts/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Malyan/M150/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Malyan/M200/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h

@@ -653,6 +653,22 @@
     #define DOGLCD_MOSI MOSI_PIN
   #endif
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/RigidBot/Configuration.h

@@ -1515,18 +1515,6 @@
 //
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
 
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
-
 //
 // MakerLab Mini Panel with graphic
 // controller and SD support - http://reprap.org/wiki/Mini_panel

Marlin/src/config/examples/RigidBot/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/SCARA/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/STM32F10/Configuration.h

@@ -1516,18 +1516,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/Sanguinololu/Configuration.h

@@ -1544,18 +1544,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/Sanguinololu/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/TheBorg/Configuration_adv.h

@@ -642,6 +642,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/TinyBoy2/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Tronxy/X1/Configuration.h

@@ -1498,18 +1498,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/Tronxy/X5S/Configuration.h

@@ -1513,18 +1513,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Velleman/K8200/Configuration.h

@@ -1546,18 +1546,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h

@@ -658,6 +658,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Velleman/K8400/Configuration.h

@@ -1513,18 +1513,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h

@@ -1507,18 +1507,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h

@@ -647,6 +647,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h

@@ -647,6 +647,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h

@@ -647,6 +647,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h

@@ -647,6 +647,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/delta/generic/Configuration_adv.h

@@ -647,6 +647,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/delta/kossel_mini/Configuration.h

@@ -1637,18 +1637,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h

@@ -647,6 +647,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h

@@ -652,6 +652,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h

@@ -647,6 +647,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h

@@ -1527,18 +1527,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 #define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/makibox/Configuration.h

@@ -1516,18 +1516,7 @@
 // RepRapDiscount FULL GRAPHIC Smart Controller
 // http://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller
 //
-// If USE_ST7920_LIGHTWEIGHT_UI is uncommented, then an alternative
-// light-weight status screen will be used that takes advantage of
-// the ST7920 character-generator to conserve MCU resources.
-//
-// Since the lightweight status screen can only show a status
-// message or the position, but not both, set DELAY_TO_SHOW_POSITION
-// to the number of seconds until the position is revealed after a new
-// status message is drawn.
-
 //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
-//#define USE_ST7920_LIGHTWEIGHT_UI
-//#define DELAY_TO_SHOW_POSITION 20
 
 //
 // MakerLab Mini Panel with graphic

Marlin/src/config/examples/makibox/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h

@@ -645,6 +645,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/config/examples/wt150/Configuration_adv.h

@@ -646,6 +646,22 @@
   // Swap the CW/CCW indicators in the graphics overlay
   //#define OVERLAY_GFX_REVERSE
 
+  #if ENABLED(U8GLIB_ST7920)
+    /**
+     * ST7920-based LCDs can emulate a 16 x 4 character display using
+     * the ST7920 character-generator for very fast screen updates.
+     * Enable LIGHTWEIGHT_UI to use this special display mode.
+     *
+     * Since LIGHTWEIGHT_UI has limited space, the position and status
+     * message occupy the same line. Set STATUS_EXPIRE_SECONDS to the
+     * length of time to display the status message before clearing.
+     */
+    //#define LIGHTWEIGHT_UI
+    #if ENABLED(LIGHTWEIGHT_UI)
+      #define STATUS_EXPIRE_SECONDS 20
+    #endif
+  #endif
+
 #endif // DOGLCD
 
 // @section safety

Marlin/src/lcd/dogm/status_screen_DOGM.h

@@ -0,0 +1,442 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * status_screen_DOGM.h
+ *
+ * Standard Status Screen for Graphical Display
+ */
+
+#ifndef ULTRALCD_IMPL_STATUS_SCREEN_DOGM_H
+#define ULTRALCD_IMPL_STATUS_SCREEN_DOGM_H
+
+FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t x, const uint8_t y) {
+  const char * const str = itostr3(temp);
+  u8g.setPrintPos(x - (str[0] != ' ' ? 0 : str[1] != ' ' ? 1 : 2) * DOG_CHAR_WIDTH / 2, y);
+  lcd_print(str);
+  lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
+}
+
+#ifndef HEAT_INDICATOR_X
+  #define HEAT_INDICATOR_X 8
+#endif
+
+FORCE_INLINE void _draw_heater_status(const uint8_t x, const int8_t heater, const bool blink) {
+  #if !HEATER_IDLE_HANDLER
+    UNUSED(blink);
+  #endif
+
+  #if HAS_TEMP_BED
+    const bool isBed = heater < 0;
+  #else
+    constexpr bool isBed = false;
+  #endif
+
+  if (PAGE_UNDER(7)) {
+    #if HEATER_IDLE_HANDLER
+      const bool is_idle = (!isBed ? thermalManager.is_heater_idle(heater) :
+        #if HAS_TEMP_BED
+          thermalManager.is_bed_idle()
+        #else
+          false
+        #endif
+      );
+
+      if (blink || !is_idle)
+    #endif
+    _draw_centered_temp((isBed ? thermalManager.degTargetBed() : thermalManager.degTargetHotend(heater)) + 0.5, x, 7); }
+
+  if (PAGE_CONTAINS(21, 28))
+    _draw_centered_temp((isBed ? thermalManager.degBed() : thermalManager.degHotend(heater)) + 0.5, x, 28);
+
+  if (PAGE_CONTAINS(17, 20)) {
+    const uint8_t h = isBed ? 7 : HEAT_INDICATOR_X,
+                  y = isBed ? 18 : 17;
+    if (isBed ? thermalManager.isHeatingBed() : thermalManager.isHeatingHotend(heater)) {
+      u8g.setColorIndex(0); // white on black
+      u8g.drawBox(x + h, y, 2, 2);
+      u8g.setColorIndex(1); // black on white
+    }
+    else {
+      u8g.drawBox(x + h, y, 2, 2);
+    }
+  }
+}
+
+FORCE_INLINE void _draw_axis_label(const AxisEnum axis, const char* const pstr, const bool blink) {
+  if (blink)
+    lcd_printPGM(pstr);
+  else {
+    if (!axis_homed[axis])
+      u8g.print('?');
+    else {
+      #if DISABLED(HOME_AFTER_DEACTIVATE) && DISABLED(DISABLE_REDUCED_ACCURACY_WARNING)
+        if (!axis_known_position[axis])
+          u8g.print(' ');
+        else
+      #endif
+          lcd_printPGM(pstr);
+    }
+  }
+}
+
+inline void lcd_implementation_status_message(const bool blink) {
+  #if ENABLED(STATUS_MESSAGE_SCROLLING)
+    static bool last_blink = false;
+    const uint8_t slen = lcd_strlen(lcd_status_message);
+    const char *stat = lcd_status_message + status_scroll_pos;
+    if (slen <= LCD_WIDTH)
+      lcd_print_utf(stat);                                      // The string isn't scrolling
+    else {
+      if (status_scroll_pos <= slen - LCD_WIDTH)
+        lcd_print_utf(stat);                                    // The string fills the screen
+      else {
+        uint8_t chars = LCD_WIDTH;
+        if (status_scroll_pos < slen) {                         // First string still visible
+          lcd_print_utf(stat);                                  // The string leaves space
+          chars -= slen - status_scroll_pos;                    // Amount of space left
+        }
+        u8g.print('.');                                         // Always at 1+ spaces left, draw a dot
+        if (--chars) {
+          if (status_scroll_pos < slen + 1)                     // Draw a second dot if there's space
+            --chars, u8g.print('.');
+          if (chars) lcd_print_utf(lcd_status_message, chars);  // Print a second copy of the message
+        }
+      }
+      if (last_blink != blink) {
+        last_blink = blink;
+        // Skip any non-printing bytes
+        if (status_scroll_pos < slen) while (!PRINTABLE(lcd_status_message[status_scroll_pos])) status_scroll_pos++;
+        if (++status_scroll_pos >= slen + 2) status_scroll_pos = 0;
+      }
+    }
+  #else
+    UNUSED(blink);
+    lcd_print_utf(lcd_status_message);
+  #endif
+}
+
+static void lcd_implementation_status_screen() {
+
+  const bool blink = lcd_blink();
+
+  #if FAN_ANIM_FRAMES > 2
+    static bool old_blink;
+    static uint8_t fan_frame;
+    if (old_blink != blink) {
+      old_blink = blink;
+      if (!fanSpeeds[0] || ++fan_frame >= FAN_ANIM_FRAMES) fan_frame = 0;
+    }
+  #endif
+
+  // Status Menu Font
+  lcd_setFont(FONT_STATUSMENU);
+
+  //
+  // Fan Animation
+  //
+  // Draws the whole heading image as a B/W bitmap rather than
+  // drawing the elements separately.
+  // This was done as an optimization, as it was slower to draw
+  // multiple parts compared to a single bitmap.
+  //
+  // The bitmap:
+  // - May be offset in X
+  // - Includes all nozzle(s), bed(s), and the fan.
+  //
+  // TODO:
+  //
+  // - Only draw the whole header on the first
+  //   entry to the status screen. Nozzle, bed, and
+  //   fan outline bits don't change.
+  //
+  if (PAGE_UNDER(STATUS_SCREENHEIGHT + 1)) {
+
+    u8g.drawBitmapP(
+      STATUS_SCREEN_X, STATUS_SCREEN_Y,
+      (STATUS_SCREENWIDTH + 7) / 8, STATUS_SCREENHEIGHT,
+      #if HAS_FAN0
+        #if FAN_ANIM_FRAMES > 2
+          fan_frame == 1 ? status_screen1_bmp :
+          fan_frame == 2 ? status_screen2_bmp :
+          #if FAN_ANIM_FRAMES > 3
+            fan_frame == 3 ? status_screen3_bmp :
+          #endif
+        #else
+          blink && fanSpeeds[0] ? status_screen1_bmp :
+        #endif
+      #endif
+      status_screen0_bmp
+    );
+
+  }
+
+  //
+  // Temperature Graphics and Info
+  //
+
+  if (PAGE_UNDER(28)) {
+    // Extruders
+    HOTEND_LOOP() _draw_heater_status(STATUS_SCREEN_HOTEND_TEXT_X(e), e, blink);
+
+    // Heated bed
+    #if HOTENDS < 4 && HAS_TEMP_BED
+      _draw_heater_status(STATUS_SCREEN_BED_TEXT_X, -1, blink);
+    #endif
+
+    #if HAS_FAN0
+      if (PAGE_CONTAINS(20, 27)) {
+        // Fan
+        const int16_t per = ((fanSpeeds[0] + 1) * 100) / 256;
+        if (per) {
+          u8g.setPrintPos(STATUS_SCREEN_FAN_TEXT_X, STATUS_SCREEN_FAN_TEXT_Y);
+          lcd_print(itostr3(per));
+          u8g.print('%');
+        }
+      }
+    #endif
+  }
+
+  #if ENABLED(SDSUPPORT)
+    //
+    // SD Card Symbol
+    //
+    if (card.isFileOpen() && PAGE_CONTAINS(42 - (TALL_FONT_CORRECTION), 51 - (TALL_FONT_CORRECTION))) {
+      // Upper box
+      u8g.drawBox(42, 42 - (TALL_FONT_CORRECTION), 8, 7);     // 42-48 (or 41-47)
+      // Right edge
+      u8g.drawBox(50, 44 - (TALL_FONT_CORRECTION), 2, 5);     // 44-48 (or 43-47)
+      // Bottom hollow box
+      u8g.drawFrame(42, 49 - (TALL_FONT_CORRECTION), 10, 4);  // 49-52 (or 48-51)
+      // Corner pixel
+      u8g.drawPixel(50, 43 - (TALL_FONT_CORRECTION));         // 43 (or 42)
+    }
+  #endif // SDSUPPORT
+
+  #if ENABLED(SDSUPPORT) || ENABLED(LCD_SET_PROGRESS_MANUALLY)
+    //
+    // Progress bar frame
+    //
+    #define PROGRESS_BAR_X 54
+    #define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X)
+
+    if (PAGE_CONTAINS(49, 52 - (TALL_FONT_CORRECTION)))       // 49-52 (or 49-51)
+      u8g.drawFrame(
+        PROGRESS_BAR_X, 49,
+        PROGRESS_BAR_WIDTH, 4 - (TALL_FONT_CORRECTION)
+      );
+
+    #if DISABLED(LCD_SET_PROGRESS_MANUALLY)
+      const uint8_t progress_bar_percent = card.percentDone();
+    #endif
+
+    if (progress_bar_percent > 1) {
+
+      //
+      // Progress bar solid part
+      //
+
+      if (PAGE_CONTAINS(50, 51 - (TALL_FONT_CORRECTION)))     // 50-51 (or just 50)
+        u8g.drawBox(
+          PROGRESS_BAR_X + 1, 50,
+          (uint16_t)((PROGRESS_BAR_WIDTH - 2) * progress_bar_percent * 0.01), 2 - (TALL_FONT_CORRECTION)
+        );
+
+      //
+      // SD Percent Complete
+      //
+
+      #if ENABLED(DOGM_SD_PERCENT)
+        if (PAGE_CONTAINS(41, 48)) {
+          // Percent complete
+          u8g.setPrintPos(55, 48);
+          u8g.print(itostr3(progress_bar_percent));
+          u8g.print('%');
+        }
+      #endif
+    }
+
+    //
+    // Elapsed Time
+    //
+
+    #if DISABLED(DOGM_SD_PERCENT)
+      #define SD_DURATION_X (PROGRESS_BAR_X + (PROGRESS_BAR_WIDTH / 2) - len * (DOG_CHAR_WIDTH / 2))
+    #else
+      #define SD_DURATION_X (LCD_PIXEL_WIDTH - len * DOG_CHAR_WIDTH)
+    #endif
+
+    if (PAGE_CONTAINS(41, 48)) {
+      char buffer[10];
+      duration_t elapsed = print_job_timer.duration();
+      bool has_days = (elapsed.value >= 60*60*24L);
+      uint8_t len = elapsed.toDigital(buffer, has_days);
+      u8g.setPrintPos(SD_DURATION_X, 48);
+      lcd_print(buffer);
+    }
+
+  #endif // SDSUPPORT || LCD_SET_PROGRESS_MANUALLY
+
+  //
+  // XYZ Coordinates
+  //
+
+  #if ENABLED(USE_SMALL_INFOFONT)
+    #define INFO_FONT_HEIGHT 7
+  #else
+    #define INFO_FONT_HEIGHT 8
+  #endif
+
+  #define XYZ_BASELINE (30 + INFO_FONT_HEIGHT)
+
+  #define X_LABEL_POS  3
+  #define X_VALUE_POS 11
+  #define XYZ_SPACING 40
+
+  #if ENABLED(XYZ_HOLLOW_FRAME)
+    #define XYZ_FRAME_TOP 29
+    #define XYZ_FRAME_HEIGHT INFO_FONT_HEIGHT + 3
+  #else
+    #define XYZ_FRAME_TOP 30
+    #define XYZ_FRAME_HEIGHT INFO_FONT_HEIGHT + 1
+  #endif
+
+  // Before homing the axis letters are blinking 'X' <-> '?'.
+  // When axis is homed but axis_known_position is false the axis letters are blinking 'X' <-> ' '.
+  // When everything is ok you see a constant 'X'.
+
+  static char xstring[5], ystring[5], zstring[7];
+  #if ENABLED(FILAMENT_LCD_DISPLAY)
+    static char wstring[5], mstring[4];
+  #endif
+
+  // At the first page, regenerate the XYZ strings
+  if (page.page == 0) {
+    strcpy(xstring, ftostr4sign(LOGICAL_X_POSITION(current_position[X_AXIS])));
+    strcpy(ystring, ftostr4sign(LOGICAL_Y_POSITION(current_position[Y_AXIS])));
+    strcpy(zstring, ftostr52sp(FIXFLOAT(LOGICAL_Z_POSITION(current_position[Z_AXIS]))));
+    #if ENABLED(FILAMENT_LCD_DISPLAY)
+      strcpy(wstring, ftostr12ns(filament_width_meas));
+      strcpy(mstring, itostr3(100.0 * (
+          parser.volumetric_enabled
+            ? planner.volumetric_area_nominal / planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]
+            : planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]
+        )
+      ));
+    #endif
+  }
+
+  if (PAGE_CONTAINS(XYZ_FRAME_TOP, XYZ_FRAME_TOP + XYZ_FRAME_HEIGHT - 1)) {
+
+    #if ENABLED(XYZ_HOLLOW_FRAME)
+      u8g.drawFrame(0, XYZ_FRAME_TOP, LCD_PIXEL_WIDTH, XYZ_FRAME_HEIGHT); // 8: 29-40  7: 29-39
+    #else
+      u8g.drawBox(0, XYZ_FRAME_TOP, LCD_PIXEL_WIDTH, XYZ_FRAME_HEIGHT);   // 8: 30-39  7: 30-37
+    #endif
+
+    if (PAGE_CONTAINS(XYZ_BASELINE - (INFO_FONT_HEIGHT - 1), XYZ_BASELINE)) {
+
+      #if DISABLED(XYZ_HOLLOW_FRAME)
+        u8g.setColorIndex(0); // white on black
+      #endif
+
+      u8g.setPrintPos(0 * XYZ_SPACING + X_LABEL_POS, XYZ_BASELINE);
+      _draw_axis_label(X_AXIS, PSTR(MSG_X), blink);
+      u8g.setPrintPos(0 * XYZ_SPACING + X_VALUE_POS, XYZ_BASELINE);
+      lcd_print(xstring);
+
+      u8g.setPrintPos(1 * XYZ_SPACING + X_LABEL_POS, XYZ_BASELINE);
+      _draw_axis_label(Y_AXIS, PSTR(MSG_Y), blink);
+      u8g.setPrintPos(1 * XYZ_SPACING + X_VALUE_POS, XYZ_BASELINE);
+      lcd_print(ystring);
+
+      u8g.setPrintPos(2 * XYZ_SPACING + X_LABEL_POS, XYZ_BASELINE);
+      _draw_axis_label(Z_AXIS, PSTR(MSG_Z), blink);
+      u8g.setPrintPos(2 * XYZ_SPACING + X_VALUE_POS, XYZ_BASELINE);
+      lcd_print(zstring);
+
+      #if DISABLED(XYZ_HOLLOW_FRAME)
+        u8g.setColorIndex(1); // black on white
+      #endif
+    }
+  }
+
+  //
+  // Feedrate
+  //
+
+  if (PAGE_CONTAINS(51 - INFO_FONT_HEIGHT, 49)) {
+    lcd_setFont(FONT_MENU);
+    u8g.setPrintPos(3, 50);
+    lcd_print(LCD_STR_FEEDRATE[0]);
+
+    lcd_setFont(FONT_STATUSMENU);
+    u8g.setPrintPos(12, 50);
+    lcd_print(itostr3(feedrate_percentage));
+    u8g.print('%');
+
+    //
+    // Filament sensor display if SD is disabled
+    //
+    #if ENABLED(FILAMENT_LCD_DISPLAY) && DISABLED(SDSUPPORT)
+      u8g.setPrintPos(56, 50);
+      lcd_print(wstring);
+      u8g.setPrintPos(102, 50);
+      lcd_print(mstring);
+      u8g.print('%');
+      lcd_setFont(FONT_MENU);
+      u8g.setPrintPos(47, 50);
+      lcd_print(LCD_STR_FILAM_DIA);
+      u8g.setPrintPos(93, 50);
+      lcd_print(LCD_STR_FILAM_MUL);
+    #endif
+  }
+
+  //
+  // Status line
+  //
+
+  #define STATUS_BASELINE (55 + INFO_FONT_HEIGHT)
+
+  if (PAGE_CONTAINS(STATUS_BASELINE - (INFO_FONT_HEIGHT - 1), STATUS_BASELINE)) {
+    u8g.setPrintPos(0, STATUS_BASELINE);
+
+    #if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
+      if (PENDING(millis(), previous_lcd_status_ms + 5000UL)) {  //Display both Status message line and Filament display on the last line
+        lcd_implementation_status_message(blink);
+      }
+      else {
+        lcd_printPGM(PSTR(LCD_STR_FILAM_DIA));
+        u8g.print(':');
+        lcd_print(wstring);
+        lcd_printPGM(PSTR("  " LCD_STR_FILAM_MUL));
+        u8g.print(':');
+        lcd_print(mstring);
+        u8g.print('%');
+      }
+    #else
+      lcd_implementation_status_message(blink);
+    #endif
+  }
+}
+
+#endif // ULTRALCD_IMPL_STATUS_SCREEN_DOGM_H

Marlin/src/lcd/dogm/status_screen_lite_ST7920.h

@@ -1,4 +1,4 @@
-/*
+/**
  * Lightweight Status Screen for the RepRapDiscount Full
  * Graphics Smart Controller (ST7920-based 128x64 LCD)
  *
@@ -14,19 +14,20 @@
  *
  */
 
- /* This is an implementation of a status screen for the RepRapDiscount
+/**
-  * Full Graphics Smart Controller using native ST7920 commands rather
+ * Implementation of a Status Screen for the RepRapDiscount
-  * than using U8Glib.
+ * Full Graphics Smart Controller using native ST7920 commands
+ * instead of U8Glib.
  *
-  * This alternative status screen makes use of the built-in character
+ * This alternative Status Screen makes use of the built-in character
-  * generation capabilities of the ST7920 to update the status screen
+ * generation capabilities of the ST7920 to update the Status Screen
  * with less SPI traffic and CPU use. In particular:
  *
  *  - The fan and bed animations are handled using custom characters
  *    that are stored in CGRAM. This allows for the animation to be
  *    updated by writing a single character to the text-buffer (DDRAM).
  *
-  *    - All the information in the status screen is text that is written
+ *  - All the information in the Status Screen is text that is written
  *    to DDRAM, so the work of generating the bitmaps is offloaded to
  *    the ST7920 rather than being render by U8Glib on the MCU.
  *
@@ -35,12 +36,10 @@
  *    bar, so updates are sporadic.
  */
 
+#include "status_screen_lite_ST7920_class.h"
+
 #include "../../libs/duration_t.h"
 
-typedef const __FlashStringHelper *progmem_str;
-
-#include "ultralcd_impl_st7920_lite_status_screen.h"
-
 #define BUFFER_WIDTH   256
 #define BUFFER_HEIGHT  32
 
@@ -51,7 +50,7 @@ typedef const __FlashStringHelper *progmem_str;
 
 ST7920_Lite_Status_Screen::st7920_state_t ST7920_Lite_Status_Screen::current_bits;
 
-void ST7920_Lite_Status_Screen::cmd(uint8_t cmd) {
+void ST7920_Lite_Status_Screen::cmd(const uint8_t cmd) {
   if (!current_bits.synced || !current_bits.cmd) {
     current_bits.synced = true;
     current_bits.cmd    = true;
@@ -69,37 +68,24 @@ void ST7920_Lite_Status_Screen::begin_data() {
   }
 }
 
-void ST7920_Lite_Status_Screen::write_word(uint16_t w) {
-  write_byte((w >> 8) & 0xFF);
-  write_byte((w >> 0) & 0xFF);
-}
-
 void ST7920_Lite_Status_Screen::write_str(const char *str) {
-  while(*str) {
+  while (*str) write_byte(*str++);
-     write_byte(*str++);
-  }
 }
 
 void ST7920_Lite_Status_Screen::write_str(const char *str, uint8_t len) {
-  while(*str && len--) {
+  while (*str && len--) write_byte(*str++);
-     write_byte(*str++);
-  }
 }
 
-void ST7920_Lite_Status_Screen::write_str_P(const char *str) {
+void ST7920_Lite_Status_Screen::write_str_P(const char * const str) {
   const char *p_str = (const char *)str;
-  char c = pgm_read_byte_near(p_str++);
+  while (char c = pgm_read_byte_near(p_str++)) write_byte(c);
-  while(c) {
-     write_byte(c);
-     c = pgm_read_byte_near(p_str++);
-  }
 }
 
 void ST7920_Lite_Status_Screen::write_str(progmem_str str) {
   write_str_P((const char*)str);
 }
 
-void ST7920_Lite_Status_Screen::write_number(uint8_t value, uint8_t digits) {
+void ST7920_Lite_Status_Screen::write_number(const uint8_t value, const uint8_t digits/*=3*/) {
   char str[7];
   const char *fmt;
   switch (digits) {
@@ -114,7 +100,7 @@ void ST7920_Lite_Status_Screen::write_number(uint8_t value, uint8_t digits) {
   write_str(str);
 }
 
-void ST7920_Lite_Status_Screen::display_status(bool display_on, bool cursor_on, bool blink_on) {
+void ST7920_Lite_Status_Screen::display_status(const bool display_on, const bool cursor_on, const bool blink_on) {
   extended_function_set(false);
   cmd(0b00001000 |
     (display_on ? 0b0100 : 0) |
@@ -126,7 +112,7 @@ void ST7920_Lite_Status_Screen::display_status(bool display_on, bool cursor_on,
 // Sets the extended and graphics bits simultaneously, regardless of
 // the current state. This is a helper function for extended_function_set()
 // and graphics()
-void ST7920_Lite_Status_Screen::_extended_function_set(bool extended, bool graphics) {
+void ST7920_Lite_Status_Screen::_extended_function_set(const bool extended, const bool graphics) {
   cmd(  0b00100000 |
     (extended   ? 0b00000100 : 0) |
     (graphics   ? 0b00000010 : 0)
@@ -135,19 +121,17 @@ void ST7920_Lite_Status_Screen::_extended_function_set(bool extended, bool graph
   current_bits.graphics = graphics;
 }
 
-void ST7920_Lite_Status_Screen::extended_function_set(bool extended) {
+void ST7920_Lite_Status_Screen::extended_function_set(const bool extended) {
-  if(extended != current_bits.extended) {
+  if (extended != current_bits.extended)
     _extended_function_set(extended, current_bits.graphics);
 }
-}
 
-void ST7920_Lite_Status_Screen::graphics(bool graphics) {
+void ST7920_Lite_Status_Screen::graphics(const bool graphics) {
-  if(graphics != current_bits.graphics) {
+  if (graphics != current_bits.graphics)
     _extended_function_set(current_bits.extended, graphics);
 }
-}
 
-void ST7920_Lite_Status_Screen::entry_mode_select(bool ac_increase, bool shift) {
+void ST7920_Lite_Status_Screen::entry_mode_select(const bool ac_increase, const bool shift) {
   extended_function_set(false);
   cmd(0b00000100 |
     (ac_increase ? 0b00000010 : 0) |
@@ -157,7 +141,7 @@ void ST7920_Lite_Status_Screen::entry_mode_select(bool ac_increase, bool shift)
 
 // Sets the sa bit regardless of the current state. This is a helper
 // function for scroll_or_addr_select()
-void ST7920_Lite_Status_Screen::_scroll_or_addr_select(bool sa) {
+void ST7920_Lite_Status_Screen::_scroll_or_addr_select(const bool sa) {
   extended_function_set(true);
   cmd(0b00100010 |
     (sa   ? 0b000001 : 0)
@@ -165,23 +149,22 @@ void ST7920_Lite_Status_Screen::_scroll_or_addr_select(bool sa) {
   current_bits.sa = sa;
 }
 
-void ST7920_Lite_Status_Screen::scroll_or_addr_select(bool sa) {
+void ST7920_Lite_Status_Screen::scroll_or_addr_select(const bool sa) {
-  if(sa != current_bits.sa) {
+  if (sa != current_bits.sa)
     _scroll_or_addr_select(sa);
 }
-}
 
-void ST7920_Lite_Status_Screen::set_ddram_address(uint8_t addr) {
+void ST7920_Lite_Status_Screen::set_ddram_address(const uint8_t addr) {
   extended_function_set(false);
   cmd(0b10000000 | (addr & 0b00111111));
 }
 
-void ST7920_Lite_Status_Screen::set_cgram_address(uint8_t addr) {
+void ST7920_Lite_Status_Screen::set_cgram_address(const uint8_t addr) {
   extended_function_set(false);
   cmd(0b01000000 | (addr & 0b00111111));
 }
 
-void ST7920_Lite_Status_Screen::set_gdram_address(uint8_t x, uint8_t y) {
+void ST7920_Lite_Status_Screen::set_gdram_address(const uint8_t x, const uint8_t y) {
   extended_function_set(true);
   cmd(0b10000000 | (y & 0b01111111));
   cmd(0b10000000 | (x & 0b00001111));
@@ -199,60 +182,193 @@ void ST7920_Lite_Status_Screen::home() {
 }
 
 /* This fills the entire text buffer with spaces */
-void ST7920_Lite_Status_Screen::clear_ddram()
+void ST7920_Lite_Status_Screen::clear_ddram() {
-{
   set_ddram_address(DDRAM_LINE_1);
   begin_data();
-  for(int i=0; i < 64;i++) {
+  for (uint8_t i = 64; i--;) write_byte(' ');
-    write_byte(' ');
-  }
 }
 
 /* This fills the entire graphics buffer with zeros */
-void ST7920_Lite_Status_Screen::clear_gdram()
+void ST7920_Lite_Status_Screen::clear_gdram() {
-{
+  for (uint8_t y = 0; y < BUFFER_HEIGHT; y++) {
-  for(int y = 0; y < BUFFER_HEIGHT; y++) {
     set_gdram_address(0, y);
     begin_data();
-    for(int i = 0; i < (BUFFER_WIDTH / 16); i++) {
+    for (uint8_t i = (BUFFER_WIDTH) / 16; i--;) write_word(0);
-      write_byte(0);
-      write_byte(0);
-    }
   }
 }
 
-void ST7920_Lite_Status_Screen::load_cgram_icon(uint16_t addr, const void *data) {
+void ST7920_Lite_Status_Screen::load_cgram_icon(const uint16_t addr, const void *data) {
   const uint16_t *p_word = (const uint16_t *)data;
   set_cgram_address(addr);
   begin_data();
-  for(int i = 0; i < 16; i++) {
+  for (uint8_t i = 16; i--;)
-    uint16_t word = pgm_read_word_near(p_word++);
+    write_word(pgm_read_word_near(p_word++));
-    write_byte((word & 0xFF00) >> 8);
-    write_byte((word & 0x00FF) >> 0);
-  }
 }
 
-/* Draws an icon in GDRAM. The position is specified in
+/**
-   as if they were DDRAM coordinates, i.e. the x position
+ * Draw an icon in GDRAM. Position specified in DDRAM
-   is [1-8], while the y position is [1-4] */
+ * coordinates. i.e., X from 1 to 8, Y from 1 to 4.
+ */
 void ST7920_Lite_Status_Screen::draw_gdram_icon(uint8_t x, uint8_t y, const void *data) {
   const uint16_t *p_word = (const uint16_t *)data;
-  if(y > 2) {
+  if (y > 2) { // Handle display folding
-    // Handle display folding
     y -= 2;
     x += 8;
   }
-  x -= 1;
+  --x;
-  y -= 1;
+  --y;
   for (int i = 0; i < 16; i++) {
-    uint16_t word = pgm_read_word_near(p_word++);
     set_gdram_address(x, i + y * 16);
     begin_data();
-    write_byte((word & 0xFF00) >> 8);
+    write_word(pgm_read_word_near(p_word++));
-    write_byte((word & 0x00FF) >> 0);
   }
 }
 
+/************************** ICON DEFINITIONS *************************************/
+
+#define CGRAM_ICON_1_ADDR 0x00
+#define CGRAM_ICON_2_ADDR 0x10
+#define CGRAM_ICON_3_ADDR 0x20
+#define CGRAM_ICON_4_ADDR 0x30
+
+#define CGRAM_ICON_1_WORD 0x00
+#define CGRAM_ICON_2_WORD 0x02
+#define CGRAM_ICON_3_WORD 0x04
+#define CGRAM_ICON_4_WORD 0x06
+
+const uint16_t nozzle_icon[] PROGMEM = {
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000111111110000,
+  0b0001111111111000,
+  0b0001111111111000,
+  0b0001111111111000,
+  0b0000111111110000,
+  0b0000111111110000,
+  0b0001111111111000,
+  0b0001111111111000,
+  0b0001111111111000,
+  0b0000011111100000,
+  0b0000001111000000,
+  0b0000000110000000,
+  0b0000000000000000,
+  0b0000000000000000
+};
+
+const uint16_t bed_icon[] PROGMEM = {
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0111111111111110,
+  0b0111111111111110,
+  0b0000000000000000,
+  0b0000000000000000
+};
+
+const uint16_t heat1_icon[] PROGMEM = {
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0010001000100000,
+  0b0001000100010000,
+  0b0000100010001000,
+  0b0000100010001000,
+  0b0001000100010000,
+  0b0010001000100000,
+  0b0010001000100000,
+  0b0001000100010000,
+  0b0000100010001000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000
+};
+
+const uint16_t heat2_icon[] PROGMEM = {
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000100010001000,
+  0b0000100010001000,
+  0b0001000100010000,
+  0b0010001000100000,
+  0b0010001000100000,
+  0b0001000100010000,
+  0b0000100010001000,
+  0b0000100010001000,
+  0b0001000100010000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000,
+  0b0000000000000000
+};
+
+const uint16_t fan1_icon[] PROGMEM = {
+  0b0000000000000000,
+  0b0111111111111110,
+  0b0111000000001110,
+  0b0110001111000110,
+  0b0100001111000010,
+  0b0100000110000010,
+  0b0101100000011010,
+  0b0101110110111010,
+  0b0101100000011010,
+  0b0100000110000010,
+  0b0100001111000010,
+  0b0110001111000110,
+  0b0111000000001110,
+  0b0111111111111110,
+  0b0000000000000000,
+  0b0000000000000000
+};
+
+const uint16_t fan2_icon[] PROGMEM = {
+  0b0000000000000000,
+  0b0111111111111110,
+  0b0111000000001110,
+  0b0110010000100110,
+  0b0100111001110010,
+  0b0101111001111010,
+  0b0100110000110010,
+  0b0100000110000010,
+  0b0100110000110010,
+  0b0101111001111010,
+  0b0100111001110010,
+  0b0110010000100110,
+  0b0111000000001110,
+  0b0111111111111110,
+  0b0000000000000000,
+  0b0000000000000000
+};
+
+const uint16_t feedrate_icon[] PROGMEM = {
+  0b0000000000000000,
+  0b0111111000000000,
+  0b0100000000000000,
+  0b0100000000000000,
+  0b0100000000000000,
+  0b0111111011111000,
+  0b0100000010000100,
+  0b0100000010000100,
+  0b0100000010000100,
+  0b0100000011111000,
+  0b0000000010001000,
+  0b0000000010000100,
+  0b0000000010000100,
+  0b0000000010000010,
+  0b0000000000000000,
+  0b0000000000000000
+};
+
 /************************** MAIN SCREEN *************************************/
 
 void ST7920_Lite_Status_Screen::draw_static_elements() {
@@ -276,91 +392,89 @@ void ST7920_Lite_Status_Screen::draw_static_elements() {
   draw_fan_icon(false);
 }
 
-/* Although this is undocumented, the ST7920 allows the character
+/**
+ * Although this is undocumented, the ST7920 allows the character
  * data buffer (DDRAM) to be used in conjunction with the graphics
  * bitmap buffer (CGRAM). The contents of the graphics buffer is
  * XORed with the data from the character generator. This allows
  * us to make the progess bar out of graphical data (the bar) and
  * text data (the percentage).
  */
-void ST7920_Lite_Status_Screen::draw_progress_bar(uint8_t value) {
+void ST7920_Lite_Status_Screen::draw_progress_bar(const uint8_t value) {
   #if EXTRUDERS == 1
     // If we have only one extruder, draw a long progress bar on the third line
-    const int top        = 1;         // Top in pixels
+    const uint8_t top     = 1,         // Top in pixels
-    const int bottom     = 13;        // Bottom in pixels
+                  bottom  = 13,        // Bottom in pixels
-    const int left       = 8;         // Left edge, in 16-bit words
+                  left    = 8,         // Left edge, in 16-bit words
-    const int width      = 5;         // Width of progress bar, in 16-bit words
+                  width   = 5;         // Width of progress bar, in 16-bit words
   #else
-    const int top        = 16 + 1;    // Top in pixels
+    const uint8_t top     = 16 + 1,    // Top in pixels
-    const int bottom     = 16 + 13;   // Bottom in pixels
+                  bottom  = 16 + 13,   // Bottom in pixels
-    const int left       = 5;         // Left edge, in 16-bit words
+                  left    = 5,         // Left edge, in 16-bit words
-    const int width      = 3;         // Width of progress bar, in 16-bit words
+                  width   = 3;         // Width of progress bar, in 16-bit words
   #endif
-  const int char_pcnt  = 100/width; // How many percent does each 16-bit word represent?
+  const uint8_t char_pcnt  = 100 / width; // How many percent does each 16-bit word represent?
 
   // Draw the progress bar as a bitmap in CGRAM
-
+  for (uint8_t y = top; y <= bottom; y++) {
-  for(int y = top; y <= bottom; y++) {
     set_gdram_address(left, y);
     begin_data();
-    for(int x = 0; x < width; x++) {
+    for (uint8_t x = 0; x < width; x++) {
       uint16_t gfx_word = 0x0000;
-      if((x+1)*char_pcnt <= value) {
+      if ((x + 1) * char_pcnt <= value)
-        // Draw completely filled bytes
+        gfx_word = 0xFFFF;                                              // Draw completely filled bytes
-        gfx_word = 0xFFFF;
+      else if ((x * char_pcnt) < value)
-      } else if((x*char_pcnt) < value) {
+        gfx_word = int(0x8000) >> (value % char_pcnt) * 16 / char_pcnt; // Draw partially filled bytes
-        // Draw partially filled bytes
+
-        gfx_word = int(0x8000) >> (value % char_pcnt)*16/char_pcnt;
-      }
       // Draw the frame around the progress bar
-      if(y == top || y == bottom) {
+      if (y == top || y == bottom)
-        // Draw top/bottom border
+        gfx_word = 0xFFFF;        // Draw top/bottom border
-        gfx_word = 0xFFFF;
+      else if (x == width - 1)
-      } else if (x == (width-1)) {
+        gfx_word |= 0x0001;       // Draw right border
-        // Draw right border
+      else if (x == 0)
-        gfx_word |= 0x0001;
+        gfx_word |= 0x8000;       // Draw left border
-      } else if (x == 0) {
-        // Draw left border
-        gfx_word |= 0x8000;
-      }
       write_word(gfx_word);
     }
   }
 
   // Draw the percentage as text in DDRAM
-
+  set_ddram_address(
     #if EXTRUDERS == 1
-    set_ddram_address(DDRAM_LINE_3 + 1);
+      DDRAM_LINE_3 + 1
     #else
-    set_ddram_address(DDRAM_LINE_2 + left);
+      DDRAM_LINE_2 + left
     #endif
+  );
 
   begin_data();
   if (value > 9) {
     write_number(value, 4);
     write_str(F("% "));
-  } else {
+  }
+  else {
     write_number(value, 3);
     write_str(F("%  "));
   }
 }
 
-void ST7920_Lite_Status_Screen::draw_fan_icon(bool whichIcon) {
+void ST7920_Lite_Status_Screen::draw_fan_icon(const bool whichIcon) {
   set_ddram_address(DDRAM_LINE_1 + 5);
   begin_data();
   write_word(whichIcon ? CGRAM_ICON_3_WORD : CGRAM_ICON_4_WORD);
 }
 
-void ST7920_Lite_Status_Screen::draw_heat_icon(bool whichIcon, bool heating) {
+void ST7920_Lite_Status_Screen::draw_heat_icon(const bool whichIcon, const bool heating) {
+  set_ddram_address(
     #if EXTRUDERS == 1
-    set_ddram_address(DDRAM_LINE_2);
+      DDRAM_LINE_2
     #else
-    set_ddram_address(DDRAM_LINE_3);
+      DDRAM_LINE_3
     #endif
+  );
   begin_data();
-  if(heating) {
+  if (heating)
     write_word(whichIcon ? CGRAM_ICON_1_WORD : CGRAM_ICON_2_WORD);
-  } else {
+  else {
     write_byte(' ');
     write_byte(' ');
   }
@@ -368,55 +482,57 @@ void ST7920_Lite_Status_Screen::draw_heat_icon(bool whichIcon, bool heating) {
 
 #define FAR(a,b) (((a > b) ? (a-b) : (b-a)) > 1)
 
-void ST7920_Lite_Status_Screen::draw_extruder_1_temp(uint8_t temp, uint8_t target) {
+void ST7920_Lite_Status_Screen::draw_extruder_1_temp(const uint8_t temp, const uint8_t target) {
   set_ddram_address(DDRAM_LINE_1 + 1);
   begin_data();
   write_number(temp);
   if (target && FAR(temp, target)) {
     write_str(F("\x1A"));
     write_number(target);
-  } else {
+  }
+  else
     write_str(F("    "));
 }
-}
 
-void ST7920_Lite_Status_Screen::draw_extruder_2_temp(uint8_t temp, uint8_t target) {
+void ST7920_Lite_Status_Screen::draw_extruder_2_temp(const uint8_t temp, const uint8_t target) {
   set_ddram_address(DDRAM_LINE_2 + 1);
   begin_data();
   write_number(temp);
   if (target && FAR(temp, target)) {
     write_str(F("\x1A"));
     write_number(target);
-  } else {
+  }
+  else
     write_str(F("    "));
 }
-}
 
-void ST7920_Lite_Status_Screen::draw_bed_temp(uint8_t temp, uint8_t target) {
+void ST7920_Lite_Status_Screen::draw_bed_temp(const uint8_t temp, const uint8_t target) {
+  set_ddram_address(
     #if EXTRUDERS == 1
-  set_ddram_address(DDRAM_LINE_2+1);
+      DDRAM_LINE_2 + 1
     #else
-  set_ddram_address(DDRAM_LINE_3+1);
+      DDRAM_LINE_3 + 1
     #endif
+  );
   begin_data();
   write_number(temp);
   if (target && FAR(temp, target)) {
     write_str(F("\x1A"));
     write_number(target);
-  } else {
+  }
+  else
     write_str(F("    "));
 }
-}
 
-void ST7920_Lite_Status_Screen::draw_fan_speed(uint8_t value) {
+void ST7920_Lite_Status_Screen::draw_fan_speed(const uint8_t value) {
   set_ddram_address(DDRAM_LINE_1 + 6);
   begin_data();
   write_number(value, 4);
 }
 
-void ST7920_Lite_Status_Screen::draw_print_time(uint32_t elapsed) {
+void ST7920_Lite_Status_Screen::draw_print_time(const uint32_t elapsed) {
-  const uint8_t hrs = elapsed/3600;
+  const uint8_t hrs = elapsed / 3600,
-  const uint8_t min = (elapsed/60)%60;
+                min = (elapsed / 60) % 60;
   char str[7];
   sprintf_P(str, hrs > 99 ? PSTR("%03d:%02d") : PSTR(" %02d:%02d"), hrs, min);
 
@@ -425,7 +541,7 @@ void ST7920_Lite_Status_Screen::draw_print_time(uint32_t elapsed) {
   write_str(str);
 }
 
-void ST7920_Lite_Status_Screen::draw_feedrate_percentage(uint8_t percentage) {
+void ST7920_Lite_Status_Screen::draw_feedrate_percentage(const uint8_t percentage) {
   // We only have enough room for the feedrate when
   // we have one extruder
   #if EXTRUDERS == 1
@@ -445,14 +561,13 @@ void ST7920_Lite_Status_Screen::draw_status_message(const char *str) {
 
     // Trim whitespace at the end of the str, as for some reason
     // messages like "Card Inserted" are padded with many spaces
-    while(str_len > 0 && str[str_len-1] == ' ') {
+    while (str_len > 0 && str[str_len - 1] == ' ') str_len--;
-      str_len--;
-    }
 
     if (str_len <= lcd_len) {
       // It all fits on the LCD without scrolling
       write_str(str);
-    } else {
+    }
+    else {
       // Print the message repeatedly until covering the LCD
       uint8_t c = status_scroll_pos;
       for (uint8_t n = 0; n < lcd_len; n++) {
@@ -462,12 +577,11 @@ void ST7920_Lite_Status_Screen::draw_status_message(const char *str) {
       }
 
       // Scroll the message
-      if(status_scroll_pos == str_len + padding) {
+      if (status_scroll_pos == str_len + padding)
         status_scroll_pos = 0;
-      } else {
+      else
         status_scroll_pos++;
     }
-    }
   #else
     write_str(str, 16);
   #endif
@@ -519,15 +633,13 @@ bool ST7920_Lite_Status_Screen::indicators_changed() {
     #endif
     uint8_t(bed_target);
 
-  if(last_checksum == checksum) {
+  if (last_checksum == checksum) return false;
-    return false;
+
-  } else {
   last_checksum = checksum;
   return true;
 }
-}
 
-void ST7920_Lite_Status_Screen::update_indicators(bool forceUpdate) {
+void ST7920_Lite_Status_Screen::update_indicators(const bool forceUpdate) {
   if (forceUpdate || indicators_changed()) {
     const bool       blink             = lcd_blink();
     const duration_t elapsed           = print_job_timer.duration();
@@ -553,63 +665,49 @@ void ST7920_Lite_Status_Screen::update_indicators(bool forceUpdate) {
     draw_feedrate_percentage(feedrate_perc);
 
     // Update the fan and bed animations
-    if(fan_speed > 0) {
+    if (fan_speed > 0) draw_fan_icon(blink);
-      draw_fan_icon(blink);
+    if (bed_target > 0)
-    }
-    if(bed_target > 0) {
       draw_heat_icon(blink, true);
-    } else {
+    else
       draw_heat_icon(false, false);
   }
 }
-}
 
 bool ST7920_Lite_Status_Screen::position_changed() {
-  const float x_pos = current_position[X_AXIS];
+  const float x_pos = current_position[X_AXIS],
-  const float y_pos = current_position[Y_AXIS];
+              y_pos = current_position[Y_AXIS],
-  const float z_pos = current_position[Z_AXIS];
+              z_pos = current_position[Z_AXIS];
   const uint8_t checksum = uint8_t(x_pos) ^ uint8_t(y_pos) ^ uint8_t(z_pos);
 
   static uint8_t last_checksum = 0;
-  if(last_checksum == checksum) {
+  if (last_checksum == checksum) return false;
-    return false;
-  } else {
   last_checksum = checksum;
   return true;
 }
-}
 
 bool ST7920_Lite_Status_Screen::status_changed() {
   uint8_t checksum = 0;
-  for(const char *p = lcd_status_message; *p; p++) {
+  for (const char *p = lcd_status_message; *p; p++) checksum ^= *p;
-    checksum ^= *p;
-  }
 
   static uint8_t last_checksum = 0;
-  if(last_checksum == checksum) {
+  if (last_checksum == checksum) return false;
-    return false;
-  } else {
   last_checksum = checksum;
   return true;
 }
-}
 
 bool ST7920_Lite_Status_Screen::blink_changed() {
   static uint8_t last_blink = 0;
-
   const bool blink = lcd_blink();
-  if(last_blink == blink) {
+  if (last_blink == blink) return false;
-    return false;
-  } else {
   last_blink = blink;
   return true;
 }
-}
 
 void ST7920_Lite_Status_Screen::update_status_or_position(bool forceUpdate) {
   static uint8_t countdown = 0;
 
-  /* There is only enough room in the display for either the
+  /**
+   * There is only enough room in the display for either the
    * status message or the position, not both, so we choose
    * one or another. Whenever the status message changes,
    * we show it for a number of consecutive seconds, but
@@ -624,11 +722,10 @@ void ST7920_Lite_Status_Screen::update_status_or_position(bool forceUpdate) {
     #if ENABLED(STATUS_MESSAGE_SCROLLING)
       status_scroll_pos = 0;
     #endif
-    if(lcd_strlen(lcd_status_message)) {
+    #ifndef STATUS_EXPIRE_SECONDS
-      countdown = DELAY_TO_SHOW_POSITION;
+      #define STATUS_EXPIRE_SECONDS 20
-    } else {
+    #endif
-      countdown = 0;
+    countdown = lcd_strlen(lcd_status_message) ? STATUS_EXPIRE_SECONDS : 0;
-    }
     draw_status_message(lcd_status_message);
     blink_changed(); // Clear changed flag
   }
@@ -667,26 +764,27 @@ void ST7920_Lite_Status_Screen::update_status_or_position(bool forceUpdate) {
   }
 }
 
-void ST7920_Lite_Status_Screen::update_progress(bool forceUpdate) {
+void ST7920_Lite_Status_Screen::update_progress(const bool forceUpdate) {
+  const uint8_t percent_done =
     #if ENABLED(SDSUPPORT)
-    const uint8_t percent_done = card.percentDone();
+      card.percentDone()
     #else
-    const uint8_t percent_done = 0;
+      0
     #endif
+  ;
 
   // Since the progress bar involves writing
   // quite a few bytes to GDRAM, only do this
   // when an update is actually necessary.
 
   static uint8_t last_progress = 0;
-  if(!forceUpdate && last_progress == percent_done)
+  if (!forceUpdate && last_progress == percent_done) return;
-    return;
   last_progress = percent_done;
 
   draw_progress_bar(percent_done);
 }
 
-void ST7920_Lite_Status_Screen::update(bool forceUpdate) {
+void ST7920_Lite_Status_Screen::update(const bool forceUpdate) {
   cs();
   update_indicators(forceUpdate);
   update_status_or_position(forceUpdate);
@@ -732,26 +830,23 @@ static void lcd_implementation_status_screen() {
   ST7920_Lite_Status_Screen::update(false);
 }
 
-/* In order to properly update the lite status screen,
+/**
+ * In order to properly update the lite Status Screen,
  * we must know when we have entered and left the
- * status screen. Since the ultralcd code is not
+ * Status Screen. Since the ultralcd code is not
  * set up for doing this, we call this function before
  * each update indicating whether the current screen
- * is the status screen.
+ * is the Status Screen.
  *
  * This function keeps track of whether we have left or
- * entered the status screen and calls the on_entry()
+ * entered the Status Screen and calls the on_entry()
  * and on_exit() methods for cleanup.
  */
-
+static void lcd_in_status(const bool inStatus) {
-static void lcd_in_status(bool inStatus) {
   static bool lastInStatus = false;
-  if(!lastInStatus && inStatus) {
+  if (lastInStatus == inStatus) return;
+  if ((lastInStatus = inStatus))
     ST7920_Lite_Status_Screen::on_entry();
-    lastInStatus = true;
+  else
-  }
-  if(lastInStatus && !inStatus) {
     ST7920_Lite_Status_Screen::on_exit();
-    lastInStatus = false;
-  }
 }

Marlin/src/lcd/dogm/status_screen_lite_ST7920_class.h

@@ -0,0 +1,108 @@
+/**
+ * Lightweight Status Screen for the RepRapDiscount Full
+ * Graphics Smart Controller (ST7920-based 128x64 LCD)
+ *
+ * (c) 2017 Aleph Objects, Inc.
+ *
+ * The code in this page is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GNU GPL) as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option)
+ * any later version.  The code is distributed WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+ *
+ */
+
+#ifndef STATUS_SCREEN_LITE_ST7920_CLASS_H
+#define STATUS_SCREEN_LITE_ST7920_CLASS_H
+
+#include "../../core/macros.h"
+
+typedef const __FlashStringHelper *progmem_str;
+
+class ST7920_Lite_Status_Screen {
+  private:
+    static struct st7920_state_t {
+      uint8_t synced   : 1; // Whether a sync has been sent
+      uint8_t cmd      : 1; // Whether the sync was cmd or data
+      uint8_t extended : 1;
+      uint8_t graphics : 1;
+      uint8_t sa       : 1;
+    } current_bits;
+
+    static void cs();
+    static void ncs();
+    static void sync_cmd();
+    static void sync_dat();
+    static void write_byte(const uint8_t w);
+
+    FORCE_INLINE static void write_word(const uint16_t w) {
+      write_byte((w >> 8) & 0xFF);
+      write_byte((w >> 0) & 0xFF);
+    }
+
+    static void cmd(const uint8_t cmd);
+    static void begin_data();
+
+    static void write_str(const char *str);
+    static void write_str(const char *str, const uint8_t len);
+    static void write_str_P(const char * const str);
+    static void write_str(progmem_str str);
+    static void write_number(const uint8_t value, const uint8_t digits=3);
+
+    static void _extended_function_set(const bool extended, const bool graphics);
+    static void _scroll_or_addr_select(const bool sa);
+    static void reset_state_from_unknown();
+
+    static void home();
+    static void display_status(const bool display_on, const bool cursor_on, const bool blink_on);
+    static void extended_function_set(const bool extended);
+    static void graphics(const bool graphics);
+    static void entry_mode_select(const bool ac_increase, const bool shift);
+    static void scroll_or_addr_select(const bool sa);
+    static void set_ddram_address(const uint8_t addr);
+    static void set_cgram_address(const uint8_t addr);
+    static void set_gdram_address(const uint8_t x, const uint8_t y);
+
+    static void clear();
+    static void clear_ddram();
+    static void clear_gdram();
+
+    static void load_cgram_icon(const uint16_t addr, const void *data);
+    static void draw_gdram_icon(uint8_t x, uint8_t y, const void *data);
+
+    static uint8_t string_checksum(const char *str);
+
+  protected:
+    static void draw_static_elements();
+    static void draw_progress_bar(const uint8_t value);
+    static void draw_fan_icon(const bool whichIcon);
+    static void draw_heat_icon(const bool whichIcon, const bool heating);
+    static void draw_extruder_1_temp(const uint8_t temp, const uint8_t target);
+    static void draw_extruder_2_temp(const uint8_t temp, const uint8_t target);
+    static void draw_bed_temp(const uint8_t temp, const uint8_t target);
+    static void draw_fan_speed(const uint8_t value);
+    static void draw_print_time(const uint32_t elapsed);
+    static void draw_feedrate_percentage(const uint8_t percentage);
+    static void draw_status_message(const char *str);
+    static void draw_position(const float x, const float y, const float z, bool position_known = true);
+
+    static bool indicators_changed();
+    static bool position_changed();
+    static bool blink_changed();
+    static bool status_changed();
+
+    static void update_indicators(const bool forceUpdate);
+    static void update_position(const bool forceUpdate, bool resetChecksum);
+    static void update_status_or_position(bool forceUpdate);
+    static void update_progress(const bool forceUpdate);
+
+  public:
+    static void update(const bool forceUpdate);
+    static void on_entry();
+    static void on_exit();
+    static void clear_text_buffer();
+};
+
+#endif // STATUS_SCREEN_LITE_ST7920_CLASS_H

Marlin/src/lcd/dogm/status_screen_lite_ST7920_spi.h

@@ -1,4 +1,4 @@
-/*
+/**
  * Lightweight Status Screen for the RepRapDiscount Full
  * Graphics Smart Controller (ST7920-based 128x64 LCD)
  *
@@ -14,7 +14,7 @@
  *
  */
 
-#include "ultralcd_impl_st7920_lite_status_screen.h"
+#include "status_screen_lite_ST7920_class.h"
 
 void ST7920_Lite_Status_Screen::cs() {
   ST7920_CS();
@@ -34,6 +34,6 @@ void ST7920_Lite_Status_Screen::sync_dat() {
   ST7920_SET_DAT();
 }
 
-void ST7920_Lite_Status_Screen::write_byte(uint8_t data) {
+void ST7920_Lite_Status_Screen::write_byte(const uint8_t data) {
-  ST7920_WRITE_NIBBLES(data);
+  ST7920_WRITE_BYTE(data);
 }

Marlin/src/lcd/dogm/ultralcd_impl_st7920_lite_status_screen.h

@@ -1,247 +0,0 @@
-/*
- * Lightweight Status Screen for the RepRapDiscount Full
- * Graphics Smart Controller (ST7920-based 128x64 LCD)
- *
- * (c) 2017 Aleph Objects, Inc.
- *
- * The code in this page is free software: you can
- * redistribute it and/or modify it under the terms of the GNU
- * General Public License (GNU GPL) as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option)
- * any later version.  The code is distributed WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
- *
- */
-
-#ifndef ULTRALCD_ST7920_LITE_STATUS_H
-#define ULTRALCD_ST7920_LITE_STATUS_H
-
-class ST7920_Lite_Status_Screen {
-  private:
-    static struct st7920_state_t {
-      uint8_t synced   : 1; // Whether a sync has been sent
-      uint8_t cmd      : 1; // Whether the sync was cmd or data
-      uint8_t extended : 1;
-      uint8_t graphics : 1;
-      uint8_t sa       : 1;
-    } current_bits;
-
-    static void cs();
-    static void ncs();
-    static void sync_cmd();
-    static void sync_dat();
-    static void write_byte(uint8_t w);
-
-    static void cmd(uint8_t cmd);
-    static void begin_data();
-    static void write_word(uint16_t w);
-    static void write_str(const char *str);
-    static void write_str(const char *str, uint8_t len);
-    static void write_str_P(const char *str);
-    static void write_str(progmem_str str);
-    static void write_number(uint8_t value, uint8_t digits=3);
-
-    static void _extended_function_set(bool extended, bool graphics);
-    static void _scroll_or_addr_select(bool sa);
-    static void reset_state_from_unknown();
-
-    static void home();
-    static void display_status(bool display_on, bool cursor_on, bool blink_on);
-    static void extended_function_set(bool extended);
-    static void graphics(bool graphics);
-    static void entry_mode_select(bool ac_increase, bool shift);
-    static void scroll_or_addr_select(bool sa);
-    static void set_ddram_address(uint8_t addr);
-    static void set_cgram_address(uint8_t addr);
-    static void set_gdram_address(uint8_t x, uint8_t y);
-
-    static void clear();
-    static void clear_ddram();
-    static void clear_gdram();
-
-    static void load_cgram_icon(uint16_t addr, const void *data);
-    static void draw_gdram_icon(uint8_t x, uint8_t y, const void *data);
-
-    static uint8_t string_checksum(const char *str);
-
-  protected:
-    static void draw_static_elements();
-    static void draw_progress_bar(uint8_t value);
-    static void draw_fan_icon(bool whichIcon);
-    static void draw_heat_icon(bool whichIcon, bool heating);
-    static void draw_extruder_1_temp(uint8_t temp, uint8_t target);
-    static void draw_extruder_2_temp(uint8_t temp, uint8_t target);
-    static void draw_bed_temp(uint8_t temp, uint8_t target);
-    static void draw_fan_speed(uint8_t value);
-    static void draw_print_time(uint32_t elapsed);
-    static void draw_feedrate_percentage(uint8_t percentage);
-    static void draw_status_message(const char *str);
-    static void draw_position(const float x, const float y, const float z, bool position_known = true);
-
-    static bool indicators_changed();
-    static bool position_changed();
-    static bool blink_changed();
-    static bool status_changed();
-
-    static void update_indicators(bool forceUpdate);
-    static void update_position(bool forceUpdate, bool resetChecksum);
-    static void update_status_or_position(bool forceUpdate);
-    static void update_progress(bool forceUpdate);
-
-  public:
-    static void update(bool forceUpdate);
-    static void on_entry();
-    static void on_exit();
-    static void clear_text_buffer();
-};
-
-/************************** ICON DEFINITIONS *************************************/
-
-#define CGRAM_ICON_1_ADDR 0x00
-#define CGRAM_ICON_2_ADDR 0x10
-#define CGRAM_ICON_3_ADDR 0x20
-#define CGRAM_ICON_4_ADDR 0x30
-
-#define CGRAM_ICON_1_WORD 0x00
-#define CGRAM_ICON_2_WORD 0x02
-#define CGRAM_ICON_3_WORD 0x04
-#define CGRAM_ICON_4_WORD 0x06
-
-PROGMEM const uint16_t nozzle_icon[] = {
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000111111110000,
-  0b0001111111111000,
-  0b0001111111111000,
-  0b0001111111111000,
-  0b0000111111110000,
-  0b0000111111110000,
-  0b0001111111111000,
-  0b0001111111111000,
-  0b0001111111111000,
-  0b0000011111100000,
-  0b0000001111000000,
-  0b0000000110000000,
-  0b0000000000000000,
-  0b0000000000000000
-};
-
-PROGMEM const uint16_t bed_icon[] = {
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0111111111111110,
-  0b0111111111111110,
-  0b0000000000000000,
-  0b0000000000000000
-};
-
-PROGMEM const uint16_t heat1_icon[] = {
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0010001000100000,
-  0b0001000100010000,
-  0b0000100010001000,
-  0b0000100010001000,
-  0b0001000100010000,
-  0b0010001000100000,
-  0b0010001000100000,
-  0b0001000100010000,
-  0b0000100010001000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000
-};
-
-PROGMEM const uint16_t heat2_icon[] = {
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000100010001000,
-  0b0000100010001000,
-  0b0001000100010000,
-  0b0010001000100000,
-  0b0010001000100000,
-  0b0001000100010000,
-  0b0000100010001000,
-  0b0000100010001000,
-  0b0001000100010000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000,
-  0b0000000000000000
-};
-
-PROGMEM const uint16_t fan1_icon[] = {
-  0b0000000000000000,
-  0b0111111111111110,
-  0b0111000000001110,
-  0b0110001111000110,
-  0b0100001111000010,
-  0b0100000110000010,
-  0b0101100000011010,
-  0b0101110110111010,
-  0b0101100000011010,
-  0b0100000110000010,
-  0b0100001111000010,
-  0b0110001111000110,
-  0b0111000000001110,
-  0b0111111111111110,
-  0b0000000000000000,
-  0b0000000000000000
-};
-
-PROGMEM const uint16_t fan2_icon[] = {
-  0b0000000000000000,
-  0b0111111111111110,
-  0b0111000000001110,
-  0b0110010000100110,
-  0b0100111001110010,
-  0b0101111001111010,
-  0b0100110000110010,
-  0b0100000110000010,
-  0b0100110000110010,
-  0b0101111001111010,
-  0b0100111001110010,
-  0b0110010000100110,
-  0b0111000000001110,
-  0b0111111111111110,
-  0b0000000000000000,
-  0b0000000000000000
-};
-
-PROGMEM const uint16_t feedrate_icon[] = {
-  0b0000000000000000,
-  0b0111111000000000,
-  0b0100000000000000,
-  0b0100000000000000,
-  0b0100000000000000,
-  0b0111111011111000,
-  0b0100000010000100,
-  0b0100000010000100,
-  0b0100000010000100,
-  0b0100000011111000,
-  0b0000000010001000,
-  0b0000000010000100,
-  0b0000000010000100,
-  0b0000000010000010,
-  0b0000000000000000,
-  0b0000000000000000
-};
-
-static void lcd_implementation_status_screen();
-static void lcd_in_status(bool inStatus);
-
-#endif // ULTRALCD_ST7920_LITE_STATUS_H

Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp

@@ -183,12 +183,10 @@ uint8_t   u8g_dev_st7920_128x64_rrd_buf[(LCD_PIXEL_WIDTH) * (PAGE_HEIGHT) / 8] U
 u8g_pb_t  u8g_dev_st7920_128x64_rrd_pb = {{PAGE_HEIGHT, LCD_PIXEL_HEIGHT, 0, 0, 0}, LCD_PIXEL_WIDTH, u8g_dev_st7920_128x64_rrd_buf};
 u8g_dev_t u8g_dev_st7920_128x64_rrd_sw_spi = {u8g_dev_rrd_st7920_128x64_fn, &u8g_dev_st7920_128x64_rrd_pb, &u8g_com_null_fn};
 
-#if ENABLED(USE_ST7920_LIGHTWEIGHT_UI)
+#if ENABLED(LIGHTWEIGHT_UI)
-  typedef const __FlashStringHelper *progmem_str;
-
   // We have to include the code for the lightweight UI here
   // as it relies on macros that are only defined in this file.
-  #include "ultralcd_impl_st7920_lite_status_screen_impl_spi.h"
+  #include "status_screen_lite_ST7920_spi.h"
 #endif
 
 #pragma GCC reset_options

Marlin/src/lcd/ultralcd.cpp

@@ -5116,23 +5116,19 @@ void lcd_update() {
       #endif
 
       #if ENABLED(DOGLCD)
-        #if defined(USE_ST7920_LIGHTWEIGHT_UI)
+        #if ENABLED(LIGHTWEIGHT_UI)
           #if ENABLED(ULTIPANEL)
-            bool do_U8G_loop = true;
+            const bool in_status = currentScreen == lcd_status_screen;
-            lcd_in_status(currentScreen == lcd_status_screen);
-            if(currentScreen == lcd_status_screen) {
-              lcd_status_screen();
-              do_U8G_loop = false;
-            }
           #else
-            const bool do_U8G_loop = false;
+            constexpr bool in_status = true;
-            lcd_in_status(true);
-            lcd_status_screen();
           #endif
+          const bool do_u8g_loop = !in_status;
+          lcd_in_status(in_status);
+          if (in_status) lcd_status_screen();
         #else
-          const bool do_U8G_loop = true;
+          constexpr bool do_u8g_loop = true;
         #endif
-        if(do_U8G_loop) {
+        if (do_u8g_loop) {
           if (!drawing_screen) {                        // If not already drawing pages
             u8g.firstPage();                            // Start the first page
             drawing_screen = 1;                         // Flag as drawing pages

Marlin/src/lcd/ultralcd_impl_DOGM.h

@@ -54,11 +54,6 @@
 
 #include "dogm/dogm_bitmaps.h"
 
-#if ENABLED(USE_ST7920_LIGHTWEIGHT_UI)
-  typedef const __FlashStringHelper *progmem_str;
-  #include "dogm/ultralcd_impl_st7920_lite_status_screen_impl.h"
-#endif
-
 #if ENABLED(SDSUPPORT)
   #include "../libs/duration_t.h"
 #endif
@@ -348,6 +343,12 @@ void lcd_printPGM_utf(const char *str, uint8_t n=LCD_WIDTH) {
 
 #endif // SHOW_BOOTSCREEN
 
+#if ENABLED(LIGHTWEIGHT_UI)
+  #include "dogm/status_screen_lite_ST7920.h"
+#else
+  #include "dogm/status_screen_DOGM.h"
+#endif
+
 // Initialize or re-initialize the LCD
 static void lcd_implementation_init() {
 
@@ -378,7 +379,7 @@ static void lcd_implementation_init() {
 
 // The kill screen is displayed for unrecoverable conditions
 void lcd_kill_screen() {
-  #if ENABLED(USE_ST7920_LIGHTWEIGHT_UI)
+  #if ENABLED(LIGHTWEIGHT_UI)
     ST7920_Lite_Status_Screen::clear_text_buffer();
   #endif
   const uint8_t h4 = u8g.getHeight() / 4;
@@ -396,422 +397,6 @@ void lcd_kill_screen() {
 
 void lcd_implementation_clear() { } // Automatically cleared by Picture Loop
 
-//
-// Status Screen
-//
-
-FORCE_INLINE void _draw_centered_temp(const int16_t temp, const uint8_t x, const uint8_t y) {
-  const char * const str = itostr3(temp);
-  u8g.setPrintPos(x - (str[0] != ' ' ? 0 : str[1] != ' ' ? 1 : 2) * DOG_CHAR_WIDTH / 2, y);
-  lcd_print(str);
-  lcd_printPGM(PSTR(LCD_STR_DEGREE " "));
-}
-
-#ifndef HEAT_INDICATOR_X
-  #define HEAT_INDICATOR_X 8
-#endif
-
-FORCE_INLINE void _draw_heater_status(const uint8_t x, const int8_t heater, const bool blink) {
-  #if !HEATER_IDLE_HANDLER
-    UNUSED(blink);
-  #endif
-
-  #if HAS_TEMP_BED
-    const bool isBed = heater < 0;
-  #else
-    constexpr bool isBed = false;
-  #endif
-
-  if (PAGE_UNDER(7)) {
-    #if HEATER_IDLE_HANDLER
-      const bool is_idle = (!isBed ? thermalManager.is_heater_idle(heater) :
-        #if HAS_TEMP_BED
-          thermalManager.is_bed_idle()
-        #else
-          false
-        #endif
-      );
-
-      if (blink || !is_idle)
-    #endif
-    _draw_centered_temp((isBed ? thermalManager.degTargetBed() : thermalManager.degTargetHotend(heater)) + 0.5, x, 7); }
-
-  if (PAGE_CONTAINS(21, 28))
-    _draw_centered_temp((isBed ? thermalManager.degBed() : thermalManager.degHotend(heater)) + 0.5, x, 28);
-
-  if (PAGE_CONTAINS(17, 20)) {
-    const uint8_t h = isBed ? 7 : HEAT_INDICATOR_X,
-                  y = isBed ? 18 : 17;
-    if (isBed ? thermalManager.isHeatingBed() : thermalManager.isHeatingHotend(heater)) {
-      u8g.setColorIndex(0); // white on black
-      u8g.drawBox(x + h, y, 2, 2);
-      u8g.setColorIndex(1); // black on white
-    }
-    else {
-      u8g.drawBox(x + h, y, 2, 2);
-    }
-  }
-}
-
-FORCE_INLINE void _draw_axis_label(const AxisEnum axis, const char* const pstr, const bool blink) {
-  if (blink)
-    lcd_printPGM(pstr);
-  else {
-    if (!axis_homed[axis])
-      u8g.print('?');
-    else {
-      #if DISABLED(HOME_AFTER_DEACTIVATE) && DISABLED(DISABLE_REDUCED_ACCURACY_WARNING)
-        if (!axis_known_position[axis])
-          u8g.print(' ');
-        else
-      #endif
-          lcd_printPGM(pstr);
-    }
-  }
-}
-
-inline void lcd_implementation_status_message(const bool blink) {
-  #if ENABLED(STATUS_MESSAGE_SCROLLING)
-    static bool last_blink = false;
-    const uint8_t slen = lcd_strlen(lcd_status_message);
-    const char *stat = lcd_status_message + status_scroll_pos;
-    if (slen <= LCD_WIDTH)
-      lcd_print_utf(stat);                                      // The string isn't scrolling
-    else {
-      if (status_scroll_pos <= slen - LCD_WIDTH)
-        lcd_print_utf(stat);                                    // The string fills the screen
-      else {
-        uint8_t chars = LCD_WIDTH;
-        if (status_scroll_pos < slen) {                         // First string still visible
-          lcd_print_utf(stat);                                  // The string leaves space
-          chars -= slen - status_scroll_pos;                    // Amount of space left
-        }
-        u8g.print('.');                                         // Always at 1+ spaces left, draw a dot
-        if (--chars) {
-          if (status_scroll_pos < slen + 1)                     // Draw a second dot if there's space
-            --chars, u8g.print('.');
-          if (chars) lcd_print_utf(lcd_status_message, chars);  // Print a second copy of the message
-        }
-      }
-      if (last_blink != blink) {
-        last_blink = blink;
-        // Skip any non-printing bytes
-        if (status_scroll_pos < slen) while (!PRINTABLE(lcd_status_message[status_scroll_pos])) status_scroll_pos++;
-        if (++status_scroll_pos >= slen + 2) status_scroll_pos = 0;
-      }
-    }
-  #else
-    UNUSED(blink);
-    lcd_print_utf(lcd_status_message);
-  #endif
-}
-
-#if !ENABLED(USE_ST7920_LIGHTWEIGHT_UI)
-static void lcd_implementation_status_screen() {
-
-  const bool blink = lcd_blink();
-
-  #if FAN_ANIM_FRAMES > 2
-    static bool old_blink;
-    static uint8_t fan_frame;
-    if (old_blink != blink) {
-      old_blink = blink;
-      if (!fanSpeeds[0] || ++fan_frame >= FAN_ANIM_FRAMES) fan_frame = 0;
-    }
-  #endif
-
-  // Status Menu Font
-  lcd_setFont(FONT_STATUSMENU);
-
-  //
-  // Fan Animation
-  //
-  // Draws the whole heading image as a B/W bitmap rather than
-  // drawing the elements separately.
-  // This was done as an optimization, as it was slower to draw
-  // multiple parts compared to a single bitmap.
-  //
-  // The bitmap:
-  // - May be offset in X
-  // - Includes all nozzle(s), bed(s), and the fan.
-  //
-  // TODO:
-  //
-  // - Only draw the whole header on the first
-  //   entry to the status screen. Nozzle, bed, and
-  //   fan outline bits don't change.
-  //
-  if (PAGE_UNDER(STATUS_SCREENHEIGHT + 1)) {
-
-    u8g.drawBitmapP(
-      STATUS_SCREEN_X, STATUS_SCREEN_Y,
-      (STATUS_SCREENWIDTH + 7) / 8, STATUS_SCREENHEIGHT,
-      #if HAS_FAN0
-        #if FAN_ANIM_FRAMES > 2
-          fan_frame == 1 ? status_screen1_bmp :
-          fan_frame == 2 ? status_screen2_bmp :
-          #if FAN_ANIM_FRAMES > 3
-            fan_frame == 3 ? status_screen3_bmp :
-          #endif
-        #else
-          blink && fanSpeeds[0] ? status_screen1_bmp :
-        #endif
-      #endif
-      status_screen0_bmp
-    );
-
-  }
-
-  //
-  // Temperature Graphics and Info
-  //
-
-  if (PAGE_UNDER(28)) {
-    // Extruders
-    HOTEND_LOOP() _draw_heater_status(STATUS_SCREEN_HOTEND_TEXT_X(e), e, blink);
-
-    // Heated bed
-    #if HOTENDS < 4 && HAS_TEMP_BED
-      _draw_heater_status(STATUS_SCREEN_BED_TEXT_X, -1, blink);
-    #endif
-
-    #if HAS_FAN0
-      if (PAGE_CONTAINS(20, 27)) {
-        // Fan
-        const int16_t per = ((fanSpeeds[0] + 1) * 100) / 256;
-        if (per) {
-          u8g.setPrintPos(STATUS_SCREEN_FAN_TEXT_X, STATUS_SCREEN_FAN_TEXT_Y);
-          lcd_print(itostr3(per));
-          u8g.print('%');
-        }
-      }
-    #endif
-  }
-
-  #if ENABLED(SDSUPPORT)
-    //
-    // SD Card Symbol
-    //
-    if (card.isFileOpen() && PAGE_CONTAINS(42 - (TALL_FONT_CORRECTION), 51 - (TALL_FONT_CORRECTION))) {
-      // Upper box
-      u8g.drawBox(42, 42 - (TALL_FONT_CORRECTION), 8, 7);     // 42-48 (or 41-47)
-      // Right edge
-      u8g.drawBox(50, 44 - (TALL_FONT_CORRECTION), 2, 5);     // 44-48 (or 43-47)
-      // Bottom hollow box
-      u8g.drawFrame(42, 49 - (TALL_FONT_CORRECTION), 10, 4);  // 49-52 (or 48-51)
-      // Corner pixel
-      u8g.drawPixel(50, 43 - (TALL_FONT_CORRECTION));         // 43 (or 42)
-    }
-  #endif // SDSUPPORT
-
-  #if ENABLED(SDSUPPORT) || ENABLED(LCD_SET_PROGRESS_MANUALLY)
-    //
-    // Progress bar frame
-    //
-    #define PROGRESS_BAR_X 54
-    #define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X)
-
-    if (PAGE_CONTAINS(49, 52 - (TALL_FONT_CORRECTION)))       // 49-52 (or 49-51)
-      u8g.drawFrame(
-        PROGRESS_BAR_X, 49,
-        PROGRESS_BAR_WIDTH, 4 - (TALL_FONT_CORRECTION)
-      );
-
-    #if DISABLED(LCD_SET_PROGRESS_MANUALLY)
-      const uint8_t progress_bar_percent = card.percentDone();
-    #endif
-
-    if (progress_bar_percent > 1) {
-
-      //
-      // Progress bar solid part
-      //
-
-      if (PAGE_CONTAINS(50, 51 - (TALL_FONT_CORRECTION)))     // 50-51 (or just 50)
-        u8g.drawBox(
-          PROGRESS_BAR_X + 1, 50,
-          (uint16_t)((PROGRESS_BAR_WIDTH - 2) * progress_bar_percent * 0.01), 2 - (TALL_FONT_CORRECTION)
-        );
-
-      //
-      // SD Percent Complete
-      //
-
-      #if ENABLED(DOGM_SD_PERCENT)
-        if (PAGE_CONTAINS(41, 48)) {
-          // Percent complete
-          u8g.setPrintPos(55, 48);
-          u8g.print(itostr3(progress_bar_percent));
-          u8g.print('%');
-        }
-      #endif
-    }
-
-    //
-    // Elapsed Time
-    //
-
-    #if DISABLED(DOGM_SD_PERCENT)
-      #define SD_DURATION_X (PROGRESS_BAR_X + (PROGRESS_BAR_WIDTH / 2) - len * (DOG_CHAR_WIDTH / 2))
-    #else
-      #define SD_DURATION_X (LCD_PIXEL_WIDTH - len * DOG_CHAR_WIDTH)
-    #endif
-
-    if (PAGE_CONTAINS(41, 48)) {
-      char buffer[10];
-      duration_t elapsed = print_job_timer.duration();
-      bool has_days = (elapsed.value >= 60*60*24L);
-      uint8_t len = elapsed.toDigital(buffer, has_days);
-      u8g.setPrintPos(SD_DURATION_X, 48);
-      lcd_print(buffer);
-    }
-
-  #endif // SDSUPPORT || LCD_SET_PROGRESS_MANUALLY
-
-  //
-  // XYZ Coordinates
-  //
-
-  #if ENABLED(USE_SMALL_INFOFONT)
-    #define INFO_FONT_HEIGHT 7
-  #else
-    #define INFO_FONT_HEIGHT 8
-  #endif
-
-  #define XYZ_BASELINE (30 + INFO_FONT_HEIGHT)
-
-  #define X_LABEL_POS  3
-  #define X_VALUE_POS 11
-  #define XYZ_SPACING 40
-
-  #if ENABLED(XYZ_HOLLOW_FRAME)
-    #define XYZ_FRAME_TOP 29
-    #define XYZ_FRAME_HEIGHT INFO_FONT_HEIGHT + 3
-  #else
-    #define XYZ_FRAME_TOP 30
-    #define XYZ_FRAME_HEIGHT INFO_FONT_HEIGHT + 1
-  #endif
-
-  // Before homing the axis letters are blinking 'X' <-> '?'.
-  // When axis is homed but axis_known_position is false the axis letters are blinking 'X' <-> ' '.
-  // When everything is ok you see a constant 'X'.
-
-  static char xstring[5], ystring[5], zstring[7];
-  #if ENABLED(FILAMENT_LCD_DISPLAY)
-    static char wstring[5], mstring[4];
-  #endif
-
-  // At the first page, regenerate the XYZ strings
-  if (page.page == 0) {
-    strcpy(xstring, ftostr4sign(LOGICAL_X_POSITION(current_position[X_AXIS])));
-    strcpy(ystring, ftostr4sign(LOGICAL_Y_POSITION(current_position[Y_AXIS])));
-    strcpy(zstring, ftostr52sp(FIXFLOAT(LOGICAL_Z_POSITION(current_position[Z_AXIS]))));
-    #if ENABLED(FILAMENT_LCD_DISPLAY)
-      strcpy(wstring, ftostr12ns(filament_width_meas));
-      strcpy(mstring, itostr3(100.0 * (
-          parser.volumetric_enabled
-            ? planner.volumetric_area_nominal / planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]
-            : planner.volumetric_multiplier[FILAMENT_SENSOR_EXTRUDER_NUM]
-        )
-      ));
-    #endif
-  }
-
-  if (PAGE_CONTAINS(XYZ_FRAME_TOP, XYZ_FRAME_TOP + XYZ_FRAME_HEIGHT - 1)) {
-
-    #if ENABLED(XYZ_HOLLOW_FRAME)
-      u8g.drawFrame(0, XYZ_FRAME_TOP, LCD_PIXEL_WIDTH, XYZ_FRAME_HEIGHT); // 8: 29-40  7: 29-39
-    #else
-      u8g.drawBox(0, XYZ_FRAME_TOP, LCD_PIXEL_WIDTH, XYZ_FRAME_HEIGHT);   // 8: 30-39  7: 30-37
-    #endif
-
-    if (PAGE_CONTAINS(XYZ_BASELINE - (INFO_FONT_HEIGHT - 1), XYZ_BASELINE)) {
-
-      #if DISABLED(XYZ_HOLLOW_FRAME)
-        u8g.setColorIndex(0); // white on black
-      #endif
-
-      u8g.setPrintPos(0 * XYZ_SPACING + X_LABEL_POS, XYZ_BASELINE);
-      _draw_axis_label(X_AXIS, PSTR(MSG_X), blink);
-      u8g.setPrintPos(0 * XYZ_SPACING + X_VALUE_POS, XYZ_BASELINE);
-      lcd_print(xstring);
-
-      u8g.setPrintPos(1 * XYZ_SPACING + X_LABEL_POS, XYZ_BASELINE);
-      _draw_axis_label(Y_AXIS, PSTR(MSG_Y), blink);
-      u8g.setPrintPos(1 * XYZ_SPACING + X_VALUE_POS, XYZ_BASELINE);
-      lcd_print(ystring);
-
-      u8g.setPrintPos(2 * XYZ_SPACING + X_LABEL_POS, XYZ_BASELINE);
-      _draw_axis_label(Z_AXIS, PSTR(MSG_Z), blink);
-      u8g.setPrintPos(2 * XYZ_SPACING + X_VALUE_POS, XYZ_BASELINE);
-      lcd_print(zstring);
-
-      #if DISABLED(XYZ_HOLLOW_FRAME)
-        u8g.setColorIndex(1); // black on white
-      #endif
-    }
-  }
-
-  //
-  // Feedrate
-  //
-
-  if (PAGE_CONTAINS(51 - INFO_FONT_HEIGHT, 49)) {
-    lcd_setFont(FONT_MENU);
-    u8g.setPrintPos(3, 50);
-    lcd_print(LCD_STR_FEEDRATE[0]);
-
-    lcd_setFont(FONT_STATUSMENU);
-    u8g.setPrintPos(12, 50);
-    lcd_print(itostr3(feedrate_percentage));
-    u8g.print('%');
-
-    //
-    // Filament sensor display if SD is disabled
-    //
-    #if ENABLED(FILAMENT_LCD_DISPLAY) && DISABLED(SDSUPPORT)
-      u8g.setPrintPos(56, 50);
-      lcd_print(wstring);
-      u8g.setPrintPos(102, 50);
-      lcd_print(mstring);
-      u8g.print('%');
-      lcd_setFont(FONT_MENU);
-      u8g.setPrintPos(47, 50);
-      lcd_print(LCD_STR_FILAM_DIA);
-      u8g.setPrintPos(93, 50);
-      lcd_print(LCD_STR_FILAM_MUL);
-    #endif
-  }
-
-  //
-  // Status line
-  //
-
-  #define STATUS_BASELINE (55 + INFO_FONT_HEIGHT)
-
-  if (PAGE_CONTAINS(STATUS_BASELINE - (INFO_FONT_HEIGHT - 1), STATUS_BASELINE)) {
-    u8g.setPrintPos(0, STATUS_BASELINE);
-
-    #if ENABLED(FILAMENT_LCD_DISPLAY) && ENABLED(SDSUPPORT)
-      if (PENDING(millis(), previous_lcd_status_ms + 5000UL)) {  //Display both Status message line and Filament display on the last line
-        lcd_implementation_status_message(blink);
-      }
-      else {
-        lcd_printPGM(PSTR(LCD_STR_FILAM_DIA));
-        u8g.print(':');
-        lcd_print(wstring);
-        lcd_printPGM(PSTR("  " LCD_STR_FILAM_MUL));
-        u8g.print(':');
-        lcd_print(mstring);
-        u8g.print('%');
-      }
-    #else
-      lcd_implementation_status_message(blink);
-    #endif
-  }
-}
-#endif
-
 #if ENABLED(ULTIPANEL)
 
   uint8_t row_y1, row_y2;