From 182b1405d92bb157571783dc48f57450034b8779 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 25 Oct 2018 08:59:28 -0500 Subject: [PATCH] LCD conditionals in configurations --- Marlin/Configuration_adv.h | 2 +- Marlin/src/config/default/Configuration_adv.h | 2 +- .../config/examples/AlephObjects/TAZ4/Configuration_adv.h | 2 +- Marlin/src/config/examples/Anet/A2/Configuration_adv.h | 2 +- .../src/config/examples/Anet/A2plus/Configuration_adv.h | 2 +- Marlin/src/config/examples/Anet/A6/Configuration_adv.h | 2 +- Marlin/src/config/examples/Anet/A8/Configuration_adv.h | 2 +- Marlin/src/config/examples/ArmEd/Configuration_adv.h | 2 +- .../examples/BIBO/TouchX/cyclops/Configuration_adv.h | 2 +- .../examples/BIBO/TouchX/default/Configuration_adv.h | 2 +- .../src/config/examples/BQ/Hephestos/Configuration_adv.h | 2 +- .../config/examples/BQ/Hephestos_2/Configuration_adv.h | 2 +- Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h | 2 +- Marlin/src/config/examples/Cartesio/Configuration_adv.h | 2 +- .../config/examples/Creality/CR-10/Configuration_adv.h | 2 +- .../config/examples/Creality/CR-10S/Configuration_adv.h | 2 +- .../examples/Creality/CR-10mini/Configuration_adv.h | 2 +- .../src/config/examples/Creality/CR-8/Configuration_adv.h | 2 +- .../config/examples/Creality/Ender-2/Configuration_adv.h | 2 +- .../config/examples/Creality/Ender-3/Configuration_adv.h | 2 +- .../config/examples/Creality/Ender-4/Configuration_adv.h | 2 +- Marlin/src/config/examples/Einstart-S/Configuration_adv.h | 2 +- Marlin/src/config/examples/Felix/Configuration_adv.h | 2 +- .../examples/FolgerTech/i3-2020/Configuration_adv.h | 2 +- .../config/examples/Formbot/Raptor/Configuration_adv.h | 2 +- .../config/examples/Formbot/T_Rex_2+/Configuration_adv.h | 2 +- .../config/examples/Formbot/T_Rex_3/Configuration_adv.h | 2 +- .../examples/Geeetech/MeCreator2/Configuration_adv.h | 2 +- .../examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h | 2 +- .../examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h | 2 +- .../config/examples/Infitary/i3-M508/Configuration_adv.h | 2 +- .../src/config/examples/JGAurora/A5/Configuration_adv.h | 2 +- Marlin/src/config/examples/MakerParts/Configuration_adv.h | 2 +- .../src/config/examples/Malyan/M150/Configuration_adv.h | 2 +- .../src/config/examples/Malyan/M200/Configuration_adv.h | 2 +- .../examples/Micromake/C1/enhanced/Configuration_adv.h | 2 +- Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h | 2 +- Marlin/src/config/examples/RigidBot/Configuration_adv.h | 2 +- Marlin/src/config/examples/SCARA/Configuration_adv.h | 2 +- .../src/config/examples/Sanguinololu/Configuration_adv.h | 2 +- Marlin/src/config/examples/TheBorg/Configuration_adv.h | 2 +- Marlin/src/config/examples/TinyBoy2/Configuration_adv.h | 2 +- Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h | 2 +- .../examples/UltiMachine/Archim2/Configuration_adv.h | 2 +- .../config/examples/Velleman/K8200/Configuration_adv.h | 2 +- .../config/examples/Velleman/K8400/Configuration_adv.h | 2 +- .../examples/Wanhao/Duplicator 6/Configuration_adv.h | 2 +- .../examples/delta/Anycubic/Kossel/Configuration_adv.h | 2 +- .../delta/FLSUN/auto_calibrate/Configuration_adv.h | 2 +- .../examples/delta/FLSUN/kossel/Configuration_adv.h | 2 +- .../examples/delta/FLSUN/kossel_mini/Configuration_adv.h | 2 +- .../src/config/examples/delta/generic/Configuration_adv.h | 2 +- .../config/examples/delta/kossel_mini/Configuration_adv.h | 2 +- .../config/examples/delta/kossel_xl/Configuration_adv.h | 2 +- .../config/examples/gCreate/gMax1.5+/Configuration_adv.h | 2 +- Marlin/src/config/examples/makibox/Configuration_adv.h | 2 +- .../src/config/examples/tvrrug/Round2/Configuration_adv.h | 2 +- Marlin/src/config/examples/wt150/Configuration_adv.h | 2 +- Marlin/src/inc/SanityCheck.h | 8 ++++---- 59 files changed, 62 insertions(+), 62 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index e36b83ed1..149b59453 100644 --- 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 diff --git a/Marlin/src/config/default/Configuration_adv.h b/Marlin/src/config/default/Configuration_adv.h index e36b83ed1..149b59453 100755 --- 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 diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h index bc4ae0539..9d03e8954 100644 --- 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 diff --git a/Marlin/src/config/examples/Anet/A2/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2/Configuration_adv.h index 34e82f154..e27d9c014 100644 --- 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 diff --git a/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h b/Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h index 34e82f154..e27d9c014 100644 --- 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 diff --git a/Marlin/src/config/examples/Anet/A6/Configuration_adv.h b/Marlin/src/config/examples/Anet/A6/Configuration_adv.h index 0c19e5cdd..1a224cfa7 100644 --- 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 diff --git a/Marlin/src/config/examples/Anet/A8/Configuration_adv.h b/Marlin/src/config/examples/Anet/A8/Configuration_adv.h index d0f7ea485..0f97e54d5 100644 --- 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 diff --git a/Marlin/src/config/examples/ArmEd/Configuration_adv.h b/Marlin/src/config/examples/ArmEd/Configuration_adv.h index 9d7b64da9..174f82542 100644 --- 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 diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h index ab614c3b3..2634bc865 100644 --- 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 diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h index d9a1d756c..334fe1c3b 100644 --- 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 diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h index bc54eceff..afbeb9eb4 100644 --- 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 diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h index b77aa1277..f013ccf4c 100644 --- 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 diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h index bc54eceff..afbeb9eb4 100644 --- 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 diff --git a/Marlin/src/config/examples/Cartesio/Configuration_adv.h b/Marlin/src/config/examples/Cartesio/Configuration_adv.h index c7610cd77..eddd117c1 100644 --- 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 diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h index 0457785b4..fa2eaad48 100755 --- 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 diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration_adv.h index c40de27fd..f2a642b81 100644 --- 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 diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h index c6490233e..2eb7baad9 100644 --- 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 diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h b/Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h index 24bdcef69..e6ef7567c 100644 --- 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 diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h index 308e7c878..a25649821 100644 --- 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 diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h index be3912f18..3690c8f04 100644 --- 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 diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h index 077b58503..15bb2fd15 100644 --- 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 diff --git a/Marlin/src/config/examples/Einstart-S/Configuration_adv.h b/Marlin/src/config/examples/Einstart-S/Configuration_adv.h index 875c83255..39a2a4880 100644 --- 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 diff --git a/Marlin/src/config/examples/Felix/Configuration_adv.h b/Marlin/src/config/examples/Felix/Configuration_adv.h index d9e94c383..414f0c52f 100644 --- 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 diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h index 80392c84a..c0b69d6ac 100644 --- 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 diff --git a/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h b/Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h index a2775ff88..0161e4739 100644 --- 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 diff --git a/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h index eeb653ae5..7131368f4 100644 --- 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 diff --git a/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h b/Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h index e4283edd5..159cce83d 100644 --- 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 diff --git a/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h index ca2d42f92..c58aaf028 100644 --- 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 diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h index 80a7ffefe..f86b428c0 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/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 diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h index 80a7ffefe..f86b428c0 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/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 diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h index 06c9c1d66..ec9248761 100644 --- 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 diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h b/Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h index 47b3f6516..8258cb449 100644 --- 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 diff --git a/Marlin/src/config/examples/MakerParts/Configuration_adv.h b/Marlin/src/config/examples/MakerParts/Configuration_adv.h index 3a6b8067c..d3d46efed 100644 --- 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 diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M150/Configuration_adv.h index ea1b3fd69..ed75f9530 100644 --- 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 diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h b/Marlin/src/config/examples/Malyan/M200/Configuration_adv.h index 607f085a3..43c59b905 100644 --- 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 diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h index 4cfb2a556..5fd51f776 100644 --- 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 diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h b/Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h index 200fbbe4a..a983d1f7f 100644 --- 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 diff --git a/Marlin/src/config/examples/RigidBot/Configuration_adv.h b/Marlin/src/config/examples/RigidBot/Configuration_adv.h index 2a117cb31..8d86f88dd 100644 --- 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 diff --git a/Marlin/src/config/examples/SCARA/Configuration_adv.h b/Marlin/src/config/examples/SCARA/Configuration_adv.h index cfe8b6c0e..41eeb218e 100644 --- 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 diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h b/Marlin/src/config/examples/Sanguinololu/Configuration_adv.h index 4e54c8bfc..b348823c0 100644 --- 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 diff --git a/Marlin/src/config/examples/TheBorg/Configuration_adv.h b/Marlin/src/config/examples/TheBorg/Configuration_adv.h index 681f935bc..ec225d495 100644 --- 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 diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h b/Marlin/src/config/examples/TinyBoy2/Configuration_adv.h index 2f81e3578..273f8aec8 100644 --- 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 diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h index 88fddbc4f..940dd9657 100644 --- 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 diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h index 5a9967a18..f608bce3c 100644 --- 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 diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h index c2e0fd686..c90e75e90 100644 --- 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 diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h b/Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h index 03bb73a4e..f5c4445d6 100644 --- 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 diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h index 618a9906b..276ff73bc 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/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 diff --git a/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h index 992f3e021..c1f5c6242 100644 --- 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 diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h index 707fc6cba..edba6cedc 100644 --- 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 diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h index 707fc6cba..edba6cedc 100644 --- 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 diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h index 417e6bfeb..aa7f0ff2d 100644 --- 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 diff --git a/Marlin/src/config/examples/delta/generic/Configuration_adv.h b/Marlin/src/config/examples/delta/generic/Configuration_adv.h index 417e6bfeb..aa7f0ff2d 100644 --- 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 diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h index 417e6bfeb..aa7f0ff2d 100644 --- 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 diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h index db745753d..0f8f9bb22 100644 --- 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 diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h index 8a9447617..e438ac509 100644 --- 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 diff --git a/Marlin/src/config/examples/makibox/Configuration_adv.h b/Marlin/src/config/examples/makibox/Configuration_adv.h index c4bfabb69..5ceea6a7e 100644 --- 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 diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h index 44c36b850..7a6ce41ba 100644 --- 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 diff --git a/Marlin/src/config/examples/wt150/Configuration_adv.h b/Marlin/src/config/examples/wt150/Configuration_adv.h index 4994ee17e..3195fe78b 100644 --- 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 diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index b173cb7a3..709c8b288 100644 --- 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