[Merge] Refactor LCD menus / screens (#12199)

6 years ago · d632e44c8c
136 changed files with 6588 additions and 5873 deletions
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/default/Configuration_adv.h
+++ b/Marlin/src/config/default/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
+++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h
+++ b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/ArmEd/Configuration_adv.h
+++ b/Marlin/src/config/examples/ArmEd/Configuration_adv.h
@ -731,7 +731,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
+++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
+++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
+++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
+++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
@ -746,7 +746,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
+++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Cartesio/Configuration_adv.h
+++ b/Marlin/src/config/examples/Cartesio/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  #define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
+++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h
+++ b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Felix/Configuration_adv.h
+++ b/Marlin/src/config/examples/Felix/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
+++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
+++ b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  #define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h
+++ b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h
@ -742,7 +742,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h
+++ b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h
@ -743,7 +743,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h
+++ b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Geeetech/Prusa
+++ b/Marlin/src/config/examples/Geeetech/Prusa
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Geeetech/Prusa
+++ b/Marlin/src/config/examples/Geeetech/Prusa
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
+++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
+++ b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/MakerParts/Configuration_adv.h
+++ b/Marlin/src/config/examples/MakerParts/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
+++ b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
+++ b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
+++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
+++ b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
@ -739,7 +739,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/RigidBot/Configuration_adv.h
+++ b/Marlin/src/config/examples/RigidBot/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/SCARA/Configuration_adv.h
+++ b/Marlin/src/config/examples/SCARA/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
+++ b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/TheBorg/Configuration_adv.h
+++ b/Marlin/src/config/examples/TheBorg/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
+++ b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h
+++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
+++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
+++ b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
@ -751,7 +751,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
+++ b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/Wanhao/Duplicator
+++ b/Marlin/src/config/examples/Wanhao/Duplicator
@ -740,7 +740,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
@ -740,7 +740,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
@ -740,7 +740,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
@ -740,7 +740,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
@ -740,7 +740,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/delta/generic/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/generic/Configuration_adv.h
@ -740,7 +740,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
@ -740,7 +740,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
+++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
@ -740,7 +740,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
+++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/makibox/Configuration_adv.h
+++ b/Marlin/src/config/examples/makibox/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
+++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
@ -738,7 +738,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/config/examples/wt150/Configuration_adv.h
+++ b/Marlin/src/config/examples/wt150/Configuration_adv.h
@ -739,7 +739,7 @@
 * controller events, as there is a trade-off between reliable
 * printing performance versus fast display updates.
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD
  // Show SD percentage next to the progress bar
  //#define DOGM_SD_PERCENT

--- a/Marlin/src/core/language.h
+++ b/Marlin/src/core/language.h
@ -264,7 +264,7 @@

 // LCD Menu Messages

-#define LANGUAGE_DATA_INCL_(M) STRINGIFY_(../lcd/dogm/language_data_##M.h)
+#define LANGUAGE_DATA_INCL_(M) STRINGIFY_(fontdata/language_data_##M.h)
 #define LANGUAGE_DATA_INCL(M) LANGUAGE_DATA_INCL_(M)
 #define INCLUDE_LANGUAGE_DATA LANGUAGE_DATA_INCL(LCD_LANGUAGE)

--- a/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
+++ b/Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
@ -628,7 +628,7 @@

    LEAVE:

-    #if ENABLED(NEWPANEL)
+    #if ENABLED(ULTIPANEL)
      lcd_reset_alert_level();
      lcd_quick_feedback(true);
      lcd_reset_status();
--- a/Marlin/src/feature/power_loss_recovery.h
+++ b/Marlin/src/feature/power_loss_recovery.h
@ -19,14 +19,12 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
+#pragma once

 /**
 * power_loss_recovery.h - Resume an SD print after power-loss
 */

-#ifndef _POWER_LOSS_RECOVERY_H_
-#define _POWER_LOSS_RECOVERY_H_
-
 #include "../sd/cardreader.h"
 #include "../core/millis_t.h"
 #include "../inc/MarlinConfigPre.h"
@ -99,5 +97,3 @@ extern uint8_t job_recovery_commands_count;

 void check_print_job_recovery();
 void save_job_recovery_info();
-
-#endif // _POWER_LOSS_RECOVERY_H_
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@ -210,7 +210,6 @@ void GcodeSuite::G28(const bool always_home_all) {

    // Cancel the active G29 session
    #if ENABLED(PROBE_MANUALLY)
-      extern bool g29_in_progress;
      g29_in_progress = false;
    #endif

--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@ -298,7 +298,13 @@
  #define ULTIPANEL
 #endif

-#if ENABLED(DOGLCD) // Change number of lines to match the DOG graphic display
+#if ENABLED(NO_LCD_MENUS)
+  #undef ULTIPANEL
+#endif
+
+#define HAS_GRAPHICAL_LCD ENABLED(DOGLCD)
+
+#if HAS_GRAPHICAL_LCD
  #ifndef LCD_WIDTH
    #ifdef LCD_WIDTH_OVERRIDE
      #define LCD_WIDTH LCD_WIDTH_OVERRIDE
@ -311,10 +317,6 @@
  #endif
 #endif

-#if ENABLED(NO_LCD_MENUS)
-  #undef ULTIPANEL
-#endif
-
 #if ENABLED(ULTIPANEL)
  #define NEWPANEL  // Disable this if you actually have no click-encoder panel
  #define ULTRA_LCD
@ -333,7 +335,14 @@
  #endif
 #endif

-#if ENABLED(DOGLCD)
+// Aliases for LCD features
+#define HAS_SPI_LCD          ENABLED(ULTRA_LCD)
+#define HAS_CHARACTER_LCD   (ENABLED(ULTRA_LCD) && DISABLED(DOGLCD))
+#define HAS_DIGITAL_ENCODER (HAS_SPI_LCD && ENABLED(NEWPANEL))
+#define HAS_LCD_MENU         ENABLED(ULTIPANEL)
+#define HAS_DEBUG_MENU      (HAS_LCD_MENU && ENABLED(LCD_PROGRESS_BAR_TEST))
+
+#if HAS_GRAPHICAL_LCD
  /* Custom characters defined in font Marlin_symbols.fon which was merged to ISO10646-0-3.bdf */
  // \x00 intentionally skipped to avoid problems in strings
  #define LCD_STR_REFRESH     "\x01"
@ -369,7 +378,7 @@
 /**
 * Default LCD contrast for dogm-like LCD displays
 */
-#if ENABLED(DOGLCD)
+#if HAS_GRAPHICAL_LCD

  #define HAS_LCD_CONTRAST ( \
      ENABLED(MAKRPANEL) \
@ -394,14 +403,12 @@
 #endif

 // Boot screens
-#if DISABLED(ULTRA_LCD)
+#if !HAS_SPI_LCD
  #undef SHOW_BOOTSCREEN
 #elif !defined(BOOTSCREEN_TIMEOUT)
  #define BOOTSCREEN_TIMEOUT 2500
 #endif

-#define HAS_DEBUG_MENU (ENABLED(ULTIPANEL) && ENABLED(LCD_PROGRESS_BAR_TEST))
-
 /**
 * Extruders have some combination of stepper motors and hotends
 * so we separate these concepts into the defines:
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@ -458,7 +458,7 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
 * LCD Info Screen Style
 */
 #if LCD_INFO_SCREEN_STYLE > 0
-  #if ENABLED(DOGLCD) || LCD_WIDTH < 20 || LCD_HEIGHT < 4
+  #if HAS_GRAPHICAL_LCD || LCD_WIDTH < 20 || LCD_HEIGHT < 4
    #error "Alternative LCD_INFO_SCREEN_STYLE requires 20x4 Character LCD."
  #elif LCD_INFO_SCREEN_STYLE > 1
    #error "LCD_INFO_SCREEN_STYLE only has options 0 and 1 at this time."
@ -471,14 +471,14 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
 #if ENABLED(LCD_PROGRESS_BAR)
  #if DISABLED(SDSUPPORT) && DISABLED(LCD_SET_PROGRESS_MANUALLY)
    #error "LCD_PROGRESS_BAR requires SDSUPPORT or LCD_SET_PROGRESS_MANUALLY."
-  #elif DISABLED(ULTRA_LCD)
+  #elif !HAS_CHARACTER_LCD
    #error "LCD_PROGRESS_BAR requires a character LCD."
-  #elif ENABLED(DOGLCD)
+  #elif HAS_GRAPHICAL_LCD
    #error "LCD_PROGRESS_BAR does not apply to graphical displays."
  #elif ENABLED(FILAMENT_LCD_DISPLAY)
    #error "LCD_PROGRESS_BAR and FILAMENT_LCD_DISPLAY are not fully compatible. Comment out this line to use both."
  #endif
-#elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && DISABLED(DOGLCD)
+#elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && !HAS_GRAPHICAL_LCD
  #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR or Graphical LCD."
 #endif

--- a/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
+++ b/Marlin/src/lcd/HD44780/lcdprint_hd44780.cpp
@ -12,17 +12,16 @@
 *   Western(English), Cyrillic(Russian), Kana(Japanese) charsets.
 */

-#include "../inc/MarlinConfigPre.h"
-#include "../inc/MarlinConfig.h"
+#include "../../inc/MarlinConfigPre.h"

-#if ENABLED(ULTRA_LCD)
-#include "ultralcd.h"
-#include "../Marlin.h"
+#if ENABLED(ULTRA_LCD) && DISABLED(DOGLCD)
+
+#include "../ultralcd.h"
+#include "../../Marlin.h"

-#if DISABLED(DOGLCD)
 #include <string.h>
-#include "fontutils.h"
-#include "lcdprint.h"
+#include "../fontutils.h"
+#include "../lcdprint.h"

 #include "ultralcd_common_HD44780.h"
 #ifndef LCD_CLASS
@ -1040,5 +1039,4 @@ int lcd_put_u8str_max_P(PGM_P utf8_str_P, pixel_len_t max_length) {
  return lcd_put_u8str_max_cb(utf8_str_P, read_byte_rom, max_length);
 }

-#endif // DOGLCD
-#endif // ULTRA_LCD
+#endif // ULTRA_LCD && !DOGLCD
--- a/Marlin/src/lcd/HD44780/ultralcd_common_HD44780.h
+++ b/Marlin/src/lcd/HD44780/ultralcd_common_HD44780.h
@ -19,23 +19,21 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-
-#ifndef ULTRALCD_COMMON_HD44780_H
-#define ULTRALCD_COMMON_HD44780_H
+#pragma once

 /**
 * Implementation of the LCD display routines for a Hitachi HD44780 display.
 * These are the most common LCD character displays.
 */

-#include "../inc/MarlinConfig.h"
+#include "../../inc/MarlinConfig.h"

 #if LCD_HEIGHT > 3
-  #include "../libs/duration_t.h"
+  #include "../../libs/duration_t.h"
 #endif

 #if ENABLED(AUTO_BED_LEVELING_UBL)
-  #include "../feature/bedlevel/ubl/ubl.h"
+  #include "../../feature/bedlevel/ubl/ubl.h"

  #if ENABLED(ULTIPANEL)
    #define ULTRA_X_PIXELS_PER_CHAR    5
@ -52,8 +50,6 @@
  #endif
 #endif

-extern volatile uint8_t buttons;  //an extended version of the last checked buttons in a bit array.
-
 ////////////////////////////////////
 // Setup button and encode mappings for each panel (into 'buttons' variable
 //
@ -63,6 +59,8 @@ extern volatile uint8_t buttons;  //an extended version of the last checked butt

 #if ENABLED(ULTIPANEL)

+  extern volatile uint8_t buttons;
+
  //
  // Setup other button mappings of each panel
  //
@ -183,17 +181,9 @@ extern volatile uint8_t buttons;  //an extended version of the last checked butt

 #endif

-#include "fontutils.h"
-#include "lcdprint.h"
+#include "../fontutils.h"
+#include "../lcdprint.h"

 #if ENABLED(LCD_PROGRESS_BAR)
  #define LCD_STR_PROGRESS  "\x03\x04\x05"
 #endif
-
-enum HD44780CharSet : char {
-  CHARSET_MENU,
-  CHARSET_INFO,
-  CHARSET_BOOT
-};
-
-#endif // ULTRALCD_COMMON_HD44780_H
--- a/Marlin/src/lcd/HD44780/ultralcd_impl_HD44780.cpp
+++ b/Marlin/src/lcd/HD44780/ultralcd_impl_HD44780.cpp
@ -20,15 +20,25 @@
 *
 */

-#ifndef ULTRALCD_IMPL_HD44780_H
-#define ULTRALCD_IMPL_HD44780_H
+#include "../../inc/MarlinConfigPre.h"
+
+#if ENABLED(ULTRA_LCD) && DISABLED(DOGLCD)

 /**
+ * ultralcd_impl_HD44780.cpp
+ *
 * Implementation of the LCD display routines for a Hitachi HD44780 display.
 * These are the most common LCD character displays.
 */

 #include "ultralcd_common_HD44780.h"
+#include "../ultralcd.h"
+
+#include "../../sd/cardreader.h"
+#include "../../module/temperature.h"
+#include "../../module/printcounter.h"
+#include "../../module/planner.h"
+#include "../../module/motion.h"

 ////////////////////////////////////
 // Create LCD class instance and chipset-specific information
@ -69,8 +79,8 @@
  LCD_CLASS lcd(LCD_PINS_RS, LCD_PINS_ENABLE, LCD_PINS_D4, LCD_PINS_D5, LCD_PINS_D6, LCD_PINS_D7); //RS,Enable,D4,D5,D6,D7
 #endif

-#include "fontutils.h"
-#include "lcdprint.h"
+#include "../fontutils.h"
+#include "../lcdprint.h"

 #if ENABLED(LCD_PROGRESS_BAR)
  static millis_t progress_bar_ms = 0;     // Start millis of the current progress bar cycle
@ -90,7 +100,7 @@ static void createChar_P(const char c, const byte * const ptr) {
  lcd.createChar(c, temp);
 }

-static void lcd_set_custom_characters(
+void lcd_set_custom_characters(
  #if ENABLED(LCD_PROGRESS_BAR) || ENABLED(SHOW_BOOTSCREEN)
    const uint8_t screen_charset=CHARSET_INFO
  #endif
@ -308,7 +318,7 @@ static void lcd_set_custom_characters(

 }

-static void lcd_implementation_init(
+void lcd_implementation_init(
  #if ENABLED(LCD_PROGRESS_BAR)
    const uint8_t screen_charset=CHARSET_INFO
  #endif
@ -744,7 +754,7 @@ FORCE_INLINE void _draw_status_message(const bool blink) {
   *         |01234567890123456789|
   */

-  static void lcd_impl_status_screen_0() {
+  void lcd_impl_status_screen_0() {
    const bool blink = lcd_blink();

    // ========== Line 1 ==========
@ -969,7 +979,7 @@ FORCE_INLINE void _draw_status_message(const bool blink) {

  #if ENABLED(ADVANCED_PAUSE_FEATURE)

-    static void lcd_implementation_hotend_status(const uint8_t row, const uint8_t extruder=active_extruder) {
+    void lcd_implementation_hotend_status(const uint8_t row, const uint8_t extruder) {
      if (row < LCD_HEIGHT) {
        lcd_moveto(LCD_WIDTH - 9, row);
        _draw_heater_status(extruder, LCD_STR_THERMOMETER[0], lcd_blink());
@ -978,7 +988,7 @@ FORCE_INLINE void _draw_status_message(const bool blink) {

  #endif // ADVANCED_PAUSE_FEATURE

-  static void lcd_implementation_drawmenu_static(const uint8_t row, PGM_P pstr, const bool center=true, const bool invert=false, const char *valstr=NULL) {
+  void lcd_implementation_drawmenu_static(const uint8_t row, PGM_P pstr, const bool center/*=true*/, const bool invert/*=false*/, const char *valstr/*=NULL*/) {
    UNUSED(invert);
    int8_t n = LCD_WIDTH;
    lcd_moveto(0, row);
@ -991,7 +1001,7 @@ FORCE_INLINE void _draw_status_message(const bool blink) {
    for (; n > 0; --n) lcd_put_wchar(' ');
  }

-  static void lcd_implementation_drawmenu_generic(const bool sel, const uint8_t row, PGM_P pstr, const char pre_char, const char post_char) {
+  void lcd_implementation_drawmenu_generic(const bool sel, const uint8_t row, PGM_P pstr, const char pre_char, const char post_char) {
    uint8_t n = LCD_WIDTH - 2;
    lcd_moveto(0, row);
    lcd_put_wchar(sel ? pre_char : ' ');
@ -1000,7 +1010,7 @@ FORCE_INLINE void _draw_status_message(const bool blink) {
    lcd_put_wchar(post_char);
  }

-  static void lcd_implementation_drawmenu_setting_edit_generic(const bool sel, const uint8_t row, PGM_P pstr, const char pre_char, const char* const data) {
+  void lcd_implementation_drawmenu_setting_edit_generic(const bool sel, const uint8_t row, PGM_P pstr, const char pre_char, const char* const data) {
    uint8_t n = LCD_WIDTH - 2 - utf8_strlen(data);
    lcd_moveto(0, row);
    lcd_put_wchar(sel ? pre_char : ' ');
@ -1009,7 +1019,7 @@ FORCE_INLINE void _draw_status_message(const bool blink) {
    while (n--) lcd_put_wchar(' ');
    lcd_put_u8str(data);
  }
-  static void lcd_implementation_drawmenu_setting_edit_generic_P(const bool sel, const uint8_t row, PGM_P pstr, const char pre_char, const char* const data) {
+  void lcd_implementation_drawmenu_setting_edit_generic_P(const bool sel, const uint8_t row, PGM_P pstr, const char pre_char, const char* const data) {
    uint8_t n = LCD_WIDTH - 2 - utf8_strlen_P(data);
    lcd_moveto(0, row);
    lcd_put_wchar(sel ? pre_char : ' ');
@ -1019,10 +1029,7 @@ FORCE_INLINE void _draw_status_message(const bool blink) {
    lcd_put_u8str_P(data);
  }

-  #define DRAWMENU_SETTING_EDIT_GENERIC(_src) lcd_implementation_drawmenu_setting_edit_generic(sel, row, pstr, '>', _src)
-  #define DRAW_BOOL_SETTING(sel, row, pstr, data) lcd_implementation_drawmenu_setting_edit_generic_P(sel, row, pstr, '>', (*(data))?PSTR(MSG_ON):PSTR(MSG_OFF))
-
-  void lcd_implementation_drawedit(PGM_P pstr, const char* const value=NULL) {
+  void lcd_implementation_drawedit(PGM_P pstr, const char* const value/*=NULL*/) {
    lcd_moveto(1, 1);
    lcd_put_u8str_P(pstr);
    if (value != NULL) {
@ -1046,6 +1053,7 @@ FORCE_INLINE void _draw_status_message(const bool blink) {
      const char *outstr = theCard.longest_filename();
      if (theCard.longFilename[0]) {
        #if ENABLED(SCROLL_LONG_FILENAMES)
+          static uint8_t filename_scroll_hash;
          if (sel) {
            uint8_t name_hash = row;
            for (uint8_t l = FILENAME_LENGTH; l--;)
@ -1071,21 +1079,16 @@ FORCE_INLINE void _draw_status_message(const bool blink) {
      lcd_put_wchar(post_char);
    }

-    static void lcd_implementation_drawmenu_sdfile(const bool sel, const uint8_t row, PGM_P pstr, CardReader &theCard) {
+    void lcd_implementation_drawmenu_sdfile(const bool sel, const uint8_t row, PGM_P pstr, CardReader &theCard) {
      lcd_implementation_drawmenu_sd(sel, row, pstr, theCard, 2, ' ');
    }

-    static void lcd_implementation_drawmenu_sddirectory(const bool sel, const uint8_t row, PGM_P pstr, CardReader &theCard) {
+    void lcd_implementation_drawmenu_sddirectory(const bool sel, const uint8_t row, PGM_P pstr, CardReader &theCard) {
      lcd_implementation_drawmenu_sd(sel, row, pstr, theCard, 2, LCD_STR_FOLDER[0]);
    }

  #endif // SDSUPPORT

-  #define lcd_implementation_drawmenu_back(sel, row, pstr, dummy) lcd_implementation_drawmenu_generic(sel, row, pstr, LCD_UPLEVEL_CHAR, LCD_UPLEVEL_CHAR)
-  #define lcd_implementation_drawmenu_submenu(sel, row, pstr, data) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', LCD_STR_ARROW_RIGHT[0])
-  #define lcd_implementation_drawmenu_gcode(sel, row, pstr, gcode) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', ' ')
-  #define lcd_implementation_drawmenu_function(sel, row, pstr, data) lcd_implementation_drawmenu_generic(sel, row, pstr, '>', ' ')
-
  #if ENABLED(LCD_HAS_SLOW_BUTTONS)

    extern millis_t next_button_update_ms;
@ -1580,4 +1583,4 @@ FORCE_INLINE void _draw_status_message(const bool blink) {

 #endif // ULTIPANEL

-#endif // ULTRALCD_IMPL_HD44780_H
+#endif // ULTRA_LCD && !DOGLCD
--- a/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h
+++ b/Marlin/src/lcd/dogm/HAL_LCD_class_defines.h
@ -19,7 +19,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-
+#pragma once

 // use this file to create the public interface for device drivers that are NOT in the U8G library

@ -36,7 +36,6 @@ class U8GLIB_64128N_2X_HAL : public U8GLIB
      { }
 };

-
 extern u8g_dev_t u8g_dev_st7920_128x64_HAL_4x_sw_spi;
 extern u8g_dev_t u8g_dev_st7920_128x64_HAL_4x_hw_spi;
 class U8GLIB_ST7920_128X64_4X_HAL : public U8GLIB
@ -50,7 +49,6 @@ class U8GLIB_ST7920_128X64_4X_HAL : public U8GLIB
      { }
 };

-
 // AVR version uses ultralcd_st7920_u8glib_rrd_AVR.cpp, HAL version uses u8g_dev_st7920_128x64_HAL.cpp
 extern u8g_dev_t u8g_dev_st7920_128x64_rrd_sw_spi;
 class U8GLIB_ST7920_128X64_RRD : public U8GLIB
@ -61,7 +59,6 @@ class U8GLIB_ST7920_128X64_RRD : public U8GLIB
      { }
 };

-
 extern u8g_dev_t u8g_dev_sh1106_128x64_2x_i2c_2_wire;
 class U8GLIB_SH1106_128X64_2X_I2C_2_WIRE : public U8GLIB {
  public:
@ -70,8 +67,6 @@ class U8GLIB_SH1106_128X64_2X_I2C_2_WIRE : public U8GLIB {
    {  }
 };

-
-
 extern u8g_dev_t u8g_dev_ssd1306_128x64_2x_i2c_2_wire;
 class U8GLIB_SSD1306_128X64_2X_I2C_2_WIRE : public U8GLIB {
  public:
--- a/Marlin/src/lcd/dogm/dogm_Bootscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Bootscreen.h
@ -0,0 +1,137 @@
+/**
+ * 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/>.
+ *
+ */
+
+/**
+ * Standard Marlin Boot Screen bitmaps
+ *
+ * Use the Marlin Bitmap Converter to make your own:
+ * http://marlinfw.org/tools/u8glib/converter.html
+ */
+
+#include <binary.h>
+
+#include "../../inc/MarlinConfig.h"
+
+#if ENABLED(SHOW_BOOTSCREEN)
+
+  //#define START_BMPHIGH // Costs 399 bytes more flash
+
+  #if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
+
+    #include "../../../_Bootscreen.h"
+
+    #ifndef CUSTOM_BOOTSCREEN_TIMEOUT
+      #define CUSTOM_BOOTSCREEN_TIMEOUT 2500
+    #endif
+
+  #endif
+
+  #if ENABLED(START_BMPHIGH)
+
+    #define START_BMPWIDTH      112
+
+    const unsigned char start_bmp[] PROGMEM = {
+      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
+      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
+      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,B11111111,
+      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,B11111111,
+      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,B11111111,
+      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,
+      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B11111111,
+      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00111111,B11111111,
+      B11000000,B00001111,B11000000,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00011000,B00000000,B00011111,B11111111,
+      B11000000,B00111111,B11100001,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00111100,B00000000,B00001111,B11111111,
+      B11000000,B01111111,B11110011,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00111100,B00000000,B00000111,B11111111,
+      B11000000,B11111111,B11111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00111100,B00000000,B00000011,B11111111,
+      B11000001,B11111000,B01111111,B10000111,B11100000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000001,B11111111,
+      B11000001,B11110000,B00111111,B00000011,B11100000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000000,B11111111,
+      B11000001,B11100000,B00011110,B00000001,B11100000,B00011111,B00000000,B00000011,B11100000,B01111000,B00111100,B00000011,B11110000,B01111111,
+      B11000001,B11100000,B00011110,B00000001,B11100000,B01111111,B11000000,B00001111,B11111000,B01111000,B00111100,B00000111,B11111100,B00111111,
+      B11000001,B11100000,B00011110,B00000001,B11100001,B11111111,B11100000,B00011111,B11111100,B01111000,B00111100,B00001111,B11111110,B00011111,
+      B11000001,B11100000,B00011110,B00000001,B11100011,B11111111,B11110000,B00111111,B11111110,B01111000,B00111100,B00011111,B11111110,B00001111,
+      B11000001,B11100000,B00011110,B00000001,B11100011,B11110011,B11111000,B00111111,B00111110,B01111000,B00111100,B00111111,B00111111,B00000111,
+      B11000001,B11100000,B00011110,B00000001,B11100111,B11100000,B11111100,B01111100,B00011111,B01111000,B00111100,B00111110,B00011111,B00000111,
+      B11000001,B11100000,B00011110,B00000001,B11100111,B11000000,B01111100,B01111100,B00001111,B01111000,B00111100,B00111100,B00001111,B00000011,
+      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B01111100,B01111000,B00001111,B01111000,B00111100,B00111100,B00001111,B00000011,
+      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00111100,B00001111,B00000011,
+      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00111100,B00001111,B00000011,
+      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00111100,B00001111,B00000011,
+      B11000001,B11100000,B00011110,B00000001,B11100111,B11000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00111100,B00001111,B00000011,
+      B11000001,B11100000,B00011110,B00000001,B11100011,B11100000,B00111100,B01111000,B00000000,B01111100,B00111100,B00111100,B00001111,B00000011,
+      B11000001,B11100000,B00011110,B00000001,B11100011,B11111111,B00111111,B11111000,B00000000,B01111111,B10111100,B00111100,B00001111,B00000011,
+      B11000001,B11100000,B00011110,B00000001,B11100001,B11111111,B00111111,B11111000,B00000000,B00111111,B10111111,B11111100,B00001111,B00000011,
+      B11000001,B11100000,B00011110,B00000001,B11100000,B11111111,B00111111,B11111000,B00000000,B00011111,B10111111,B11111100,B00001111,B00000011,
+      B11000001,B11100000,B00011110,B00000001,B11100000,B01111111,B00111111,B11111000,B00000000,B00001111,B10111111,B11111100,B00001111,B00000011,
+      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,
+      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000110,
+      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001110,
+      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011100,
+      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
+      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11110000,
+      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B10000000
+    };
+
+  #else
+
+    #define START_BMPWIDTH      56
+
+    const unsigned char start_bmp[] PROGMEM = {
+      B00011111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
+      B01100000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,
+      B01000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,
+      B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,
+      B10000011,B11001111,B00000000,B00000000,B00001100,B00110000,B00111111,
+      B10000111,B11111111,B10000000,B00000000,B00001100,B00110000,B00011111,
+      B10000110,B01111001,B10000000,B00000000,B00001100,B00000000,B00001111,
+      B10001100,B00110000,B11000111,B10000011,B10001100,B00110000,B11100111,
+      B10001100,B00110000,B11001111,B11000111,B11001100,B00110001,B11110011,
+      B10001100,B00110000,B11011100,B11101100,B11101100,B00110011,B10111001,
+      B10001100,B00110000,B11011000,B01101100,B01101100,B00110011,B00011001,
+      B10001100,B00110000,B11010000,B01101100,B00001100,B00110011,B00011001,
+      B10001100,B00110000,B11011000,B01101100,B00001100,B00110011,B00011001,
+      B10001100,B00110000,B11011100,B01101100,B00001110,B00111011,B00011001,
+      B10001100,B00110000,B11001111,B01111100,B00000111,B10011111,B00011001,
+      B10001100,B00110000,B11000111,B01111100,B00000011,B10001111,B00011001,
+      B01000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000010,
+      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000110,
+      B00011111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111000
+    };
+
+  #endif
+
+  #ifndef START_BMP_BYTEWIDTH
+    #define START_BMP_BYTEWIDTH ((START_BMPWIDTH + 7) / 8)
+  #endif
+  #ifndef START_BMPHEIGHT
+    #define START_BMPHEIGHT (sizeof(start_bmp) / (START_BMP_BYTEWIDTH))
+  #endif
+
+  static_assert(sizeof(start_bmp) == (START_BMP_BYTEWIDTH) * (START_BMPHEIGHT), "Bootscreen (start_bmp) dimensions don't match data.");
+
+#endif
+
+#ifndef CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH
+  #define CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH ((CUSTOM_BOOTSCREEN_BMPWIDTH + 7) / 8)
+#endif
+#ifndef CUSTOM_BOOTSCREEN_BMPHEIGHT
+  #define CUSTOM_BOOTSCREEN_BMPHEIGHT (sizeof(custom_start_bmp) / (CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH))
+#endif
--- a/Marlin/src/lcd/dogm/dogm_Statusscreen.h
+++ b/Marlin/src/lcd/dogm/dogm_Statusscreen.h
@ -21,7 +21,7 @@
 */

 /**
- * Standard Marlin Boot and Status Screen bitmaps
+ * Standard Marlin Status Screen bitmaps
 *
 * Use the Marlin Bitmap Converter to make your own:
 * http://marlinfw.org/tools/u8glib/converter.html
@ -31,109 +31,18 @@

 #include "../../inc/MarlinConfig.h"

-#if ENABLED(SHOW_BOOTSCREEN)
-
-  //#define START_BMPHIGH // Costs 399 bytes more flash
-
-  #if ENABLED(SHOW_CUSTOM_BOOTSCREEN)
-
-    #include "../../../_Bootscreen.h"
-
-    #ifndef CUSTOM_BOOTSCREEN_TIMEOUT
-      #define CUSTOM_BOOTSCREEN_TIMEOUT 2500
-    #endif
-
-  #endif
-
-  #if ENABLED(START_BMPHIGH)
-
-    #define START_BMPWIDTH      112
-
-    const unsigned char start_bmp[] PROGMEM = {
-      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,B11111111,B11111111,
-      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000011,B11111111,B11111111,
-      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,B11111111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,B11111111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,B11111111,
-      B11000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00111111,B11111111,
-      B11000000,B00001111,B11000000,B11111100,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00011000,B00000000,B00011111,B11111111,
-      B11000000,B00111111,B11100001,B11111111,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00111100,B00000000,B00001111,B11111111,
-      B11000000,B01111111,B11110011,B11111111,B10000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00111100,B00000000,B00000111,B11111111,
-      B11000000,B11111111,B11111111,B11111111,B11000000,B00000000,B00000000,B00000000,B00000000,B01111000,B00111100,B00000000,B00000011,B11111111,
-      B11000001,B11111000,B01111111,B10000111,B11100000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000001,B11111111,
-      B11000001,B11110000,B00111111,B00000011,B11100000,B00000000,B00000000,B00000000,B00000000,B01111000,B00000000,B00000000,B00000000,B11111111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B00011111,B00000000,B00000011,B11100000,B01111000,B00111100,B00000011,B11110000,B01111111,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B01111111,B11000000,B00001111,B11111000,B01111000,B00111100,B00000111,B11111100,B00111111,
-      B11000001,B11100000,B00011110,B00000001,B11100001,B11111111,B11100000,B00011111,B11111100,B01111000,B00111100,B00001111,B11111110,B00011111,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11111111,B11110000,B00111111,B11111110,B01111000,B00111100,B00011111,B11111110,B00001111,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11110011,B11111000,B00111111,B00111110,B01111000,B00111100,B00111111,B00111111,B00000111,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B11100000,B11111100,B01111100,B00011111,B01111000,B00111100,B00111110,B00011111,B00000111,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B11000000,B01111100,B01111100,B00001111,B01111000,B00111100,B00111100,B00001111,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B01111100,B01111000,B00001111,B01111000,B00111100,B00111100,B00001111,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00111100,B00001111,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00111100,B00001111,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B10000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00111100,B00001111,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100111,B11000000,B00111100,B01111000,B00000000,B01111000,B00111100,B00111100,B00001111,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11100000,B00111100,B01111000,B00000000,B01111100,B00111100,B00111100,B00001111,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100011,B11111111,B00111111,B11111000,B00000000,B01111111,B10111100,B00111100,B00001111,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100001,B11111111,B00111111,B11111000,B00000000,B00111111,B10111111,B11111100,B00001111,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B11111111,B00111111,B11111000,B00000000,B00011111,B10111111,B11111100,B00001111,B00000011,
-      B11000001,B11100000,B00011110,B00000001,B11100000,B01111111,B00111111,B11111000,B00000000,B00001111,B10111111,B11111100,B00001111,B00000011,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000110,
-      B01110000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00001110,
-      B00111000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00011100,
-      B00011110,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111000,
-      B00001111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11110000,
-      B00000001,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,B10000000
-    };
-
-  #else
-
-    #define START_BMPWIDTH      56
-
-    const unsigned char start_bmp[] PROGMEM = {
-      B00011111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111111,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000001,B11111111,
-      B01000000,B00000000,B00000000,B00000000,B00000000,B00000000,B11111111,
-      B10000000,B00000000,B00000000,B00000000,B00000000,B00000000,B01111111,
-      B10000011,B11001111,B00000000,B00000000,B00001100,B00110000,B00111111,
-      B10000111,B11111111,B10000000,B00000000,B00001100,B00110000,B00011111,
-      B10000110,B01111001,B10000000,B00000000,B00001100,B00000000,B00001111,
-      B10001100,B00110000,B11000111,B10000011,B10001100,B00110000,B11100111,
-      B10001100,B00110000,B11001111,B11000111,B11001100,B00110001,B11110011,
-      B10001100,B00110000,B11011100,B11101100,B11101100,B00110011,B10111001,
-      B10001100,B00110000,B11011000,B01101100,B01101100,B00110011,B00011001,
-      B10001100,B00110000,B11010000,B01101100,B00001100,B00110011,B00011001,
-      B10001100,B00110000,B11011000,B01101100,B00001100,B00110011,B00011001,
-      B10001100,B00110000,B11011100,B01101100,B00001110,B00111011,B00011001,
-      B10001100,B00110000,B11001111,B01111100,B00000111,B10011111,B00011001,
-      B10001100,B00110000,B11000111,B01111100,B00000011,B10001111,B00011001,
-      B01000000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000010,
-      B01100000,B00000000,B00000000,B00000000,B00000000,B00000000,B00000110,
-      B00011111,B11111111,B11111111,B11111111,B11111111,B11111111,B11111000
-    };
-
-  #endif
-
-  #ifndef START_BMP_BYTEWIDTH
-    #define START_BMP_BYTEWIDTH ((START_BMPWIDTH + 7) / 8)
-  #endif
-  #ifndef START_BMPHEIGHT
-    #define START_BMPHEIGHT (sizeof(start_bmp) / (START_BMP_BYTEWIDTH))
-  #endif
-
-  static_assert(sizeof(start_bmp) == (START_BMP_BYTEWIDTH) * (START_BMPHEIGHT), "Bootscreen (start_bmp) dimensions don't match data.");
-
-#endif
-
 #if ENABLED(CUSTOM_STATUS_SCREEN_IMAGE)

-  // This file must define STATUS_SCREENWIDTH and status_screen[012]_bmp.
-  // It can also define STATUS_SCREEN_X, STATUS_SCREEN_{BED,FAN}_TEXT_X and
-  // STATUS_SCREEN_HOTEND_TEXT_X(i) to modify draw locations.
+  /**
+   * Custom _Statusscreen.h files must define STATUS_SCREENWIDTH and status_screen[012]_bmp.
+   * There's no need to define STATUS_SCREENHEIGHT since it's calculated automatically.
+   * You can also define these to modify drawing and animation:
+   *
+   *  - STATUS_SCREEN_X
+   *  - STATUS_SCREEN_{BED,FAN}_TEXT_X
+   *  - STATUS_SCREEN_HOTEND_TEXT_X(i)
+   *  - FAN_ANIM_FRAMES
+   */
  #include "../../../_Statusscreen.h"

 #else // !CUSTOM_STATUS_SCREEN_IMAGE
@ -1161,106 +1070,6 @@

 #endif // !CUSTOM_STATUS_SCREEN_IMAGE

-#if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) || ENABLED(MESH_EDIT_GFX_OVERLAY)
-
-  const unsigned char cw_bmp[] PROGMEM = {
-    B00000011,B11111000,B00000000,
-    B00001111,B11111110,B00000000,
-    B00011110,B00001111,B00000000,
-    B00111000,B00000111,B00000000,
-    B00111000,B00000011,B10000000,
-    B01110000,B00000011,B10000000,
-    B01110000,B00001111,B11100000,
-    B01110000,B00000111,B11000000,
-    B01110000,B00000011,B10000000,
-    B01110000,B00000001,B00000000,
-    B01110000,B00000000,B00000000,
-    B00111000,B00000000,B00000000,
-    B00111000,B00000111,B00000000,
-    B00011110,B00001111,B00000000,
-    B00001111,B11111110,B00000000,
-    B00000011,B11111000,B00000000
-  };
-
-  const unsigned char ccw_bmp[] PROGMEM = {
-    B00000000,B11111110,B00000000,
-    B00000011,B11111111,B10000000,
-    B00000111,B10000011,B11000000,
-    B00001110,B00000001,B11000000,
-    B00001110,B00000000,B11100000,
-    B00011100,B00000000,B11100000,
-    B01111111,B00000000,B11100000,
-    B00111110,B00000000,B11100000,
-    B00011100,B00000000,B11100000,
-    B00001000,B00000000,B11100000,
-    B00000000,B00000000,B11100000,
-    B00000000,B00000001,B11000000,
-    B00001110,B00000001,B11000000,
-    B00001111,B00000111,B10000000,
-    B00000111,B11111111,B00000000,
-    B00000001,B11111100,B00000000
-  };
-
-  const unsigned char up_arrow_bmp[] PROGMEM = {
-    B00000100,B00000000,
-    B00001110,B00000000,
-    B00011111,B00000000,
-    B00111111,B10000000,
-    B01111111,B11000000,
-    B00001110,B00000000,
-    B00001110,B00000000,
-    B00001110,B00000000,
-    B00001110,B00000000,
-    B00001110,B00000000,
-    B00001110,B00000000,
-    B00001110,B00000000,
-    B00001110,B00000000
-  };
-
-  const unsigned char down_arrow_bmp[] PROGMEM = {
-    B00001110,B00000000,
-    B00001110,B00000000,
-    B00001110,B00000000,
-    B00001110,B00000000,
-    B00001110,B00000000,
-    B00001110,B00000000,
-    B00001110,B00000000,
-    B00001110,B00000000,
-    B01111111,B11000000,
-    B00111111,B10000000,
-    B00011111,B00000000,
-    B00001110,B00000000,
-    B00000100,B00000000
-  };
-
-  const unsigned char offset_bedline_bmp[] PROGMEM = {
-    B11111111,B11111111,B11111111
-  };
-
-  const unsigned char nozzle_bmp[] PROGMEM = {
-    B01111111,B10000000,
-    B11111111,B11000000,
-    B11111111,B11000000,
-    B11111111,B11000000,
-    B01111111,B10000000,
-    B01111111,B10000000,
-    B11111111,B11000000,
-    B11111111,B11000000,
-    B11111111,B11000000,
-    B00111111,B00000000,
-    B00011110,B00000000,
-    B00001100,B00000000
-  };
-
-#endif // BABYSTEP_ZPROBE_GFX_OVERLAY || MESH_EDIT_GFX_OVERLAY
-
-#ifndef CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH
-  #define CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH ((CUSTOM_BOOTSCREEN_BMPWIDTH + 7) / 8)
-#endif
-#ifndef CUSTOM_BOOTSCREEN_BMPHEIGHT
-  #define CUSTOM_BOOTSCREEN_BMPHEIGHT (sizeof(custom_start_bmp) / (CUSTOM_BOOTSCREEN_BMP_BYTEWIDTH))
-#endif
-
 #ifndef FAN_ANIM_FRAMES
  #define FAN_ANIM_FRAMES 2
 #elif FAN_ANIM_FRAMES > 3
--- a/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
+++ b/Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
--- a/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
+++ b/Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_an.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_an.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_bg.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_bg.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_ca.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_ca.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_cz.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_cz.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_da.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_da.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_de.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_de.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_el-gr.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_el-gr.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_el.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_el.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_en.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_en.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_es.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_es.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_eu.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_eu.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_fi.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_fi.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_fr.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_fr.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_gl.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_gl.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_hr.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_hr.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_it.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_it.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_jp-kana.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_jp-kana.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_ko_KR.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_ko_KR.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_nl.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_nl.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_pl.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_pl.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_pt-br.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_pt-br.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_pt.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_pt.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_ru.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_ru.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_sk.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_sk.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_test.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_test.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_tr.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_tr.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_uk.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_uk.h
--- a/Marlin/src/lcd/dogm/fontdata/language_data_zh_CN.h
+++ b/Marlin/src/lcd/dogm/fontdata/language_data_zh_CN.h