bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

LCD conditionals in configurations

Browse Source
This commit is contained in:
Scott Lahteine 2018-10-25 08:59:28 -05:00
parent 2bf18950ab
commit 182b1405d9
59 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/default/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Anet/A2/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Anet/A2plus/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Anet/A6/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Anet/A8/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/ArmEd/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/BIBO/TouchX/default/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Cartesio/Configuration_adv.h
View File

@ -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

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

@ -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

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

@ -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

2
Marlin/src/config/examples/Creality/CR-10mini/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Creality/CR-8/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Creality/Ender-2/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Creality/Ender-3/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Creality/Ender-4/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Einstart-S/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Felix/Configuration_adv.h
View File

@ -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

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

@ -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

2
Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Geeetech/MeCreator2/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration_adv.h
View File

@ -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

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

@ -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

2
Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/MakerParts/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/RigidBot/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/SCARA/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/TheBorg/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Tronxy/X3A/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/delta/Anycubic/Kossel/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/delta/generic/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
View File

@ -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

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

@ -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

2
Marlin/src/config/examples/makibox/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
View File

@ -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

2
Marlin/src/config/examples/wt150/Configuration_adv.h
View File

@ -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

8
Marlin/src/inc/SanityCheck.h
View File

@ -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