From 88696502f517eb648bde3c1aa6ca64bcd133d024 Mon Sep 17 00:00:00 2001 From: Jason Smith Date: Thu, 29 Oct 2020 18:35:02 -0700 Subject: [PATCH] Disable extraneous generic LCD options (#289) --- config/examples/3DFabXYZ/Migbot/Configuration.h | 2 +- config/examples/Anet/E10/Configuration.h | 8 ++++---- config/examples/BQ/WITBOX/Configuration.h | 2 +- config/examples/Creality/Ender-5 Plus/Configuration.h | 10 +++++----- .../EXP3D/Imprimante multifonction/Configuration.h | 2 +- config/examples/Geeetech/A10D/Configuration.h | 4 ++-- config/examples/Geeetech/A30/Configuration.h | 2 +- config/examples/Geeetech/D200/Configuration.h | 2 +- config/examples/Geeetech/E180/Configuration.h | 2 +- config/examples/Geeetech/M201/Configuration.h | 2 +- config/examples/Geeetech/PI3A PRO/Configuration.h | 2 +- .../Geeetech/Prusa i3 Pro B/bltouch/Configuration.h | 2 +- .../Geeetech/Prusa i3 Pro B/noprobe/Configuration.h | 2 +- .../examples/Velleman/K8400/Dual-head/Configuration.h | 2 +- config/examples/delta/Geeetech/G2/Configuration.h | 2 +- config/examples/delta/Geeetech/G2Pro/Configuration.h | 2 +- config/examples/delta/Geeetech/G2S/Configuration.h | 2 +- config/examples/delta/Geeetech/G2SPro/Configuration.h | 2 +- config/examples/delta/kossel_clear/Configuration.h | 2 +- 19 files changed, 27 insertions(+), 27 deletions(-) diff --git a/config/examples/3DFabXYZ/Migbot/Configuration.h b/config/examples/3DFabXYZ/Migbot/Configuration.h index 0bc0a8c50c..6bf9d70c24 100644 --- a/config/examples/3DFabXYZ/Migbot/Configuration.h +++ b/config/examples/3DFabXYZ/Migbot/Configuration.h @@ -1922,7 +1922,7 @@ // // Generic 16x2, 16x4, 20x2, or 20x4 character-based LCD. // -#define ULTRA_LCD +//#define ULTRA_LCD //============================================================================= //======================== LCD / Controller Selection ========================= diff --git a/config/examples/Anet/E10/Configuration.h b/config/examples/Anet/E10/Configuration.h index 436bbff86a..fecabfe6fc 100644 --- a/config/examples/Anet/E10/Configuration.h +++ b/config/examples/Anet/E10/Configuration.h @@ -1989,10 +1989,7 @@ // RepRapDiscount FULL GRAPHIC Smart Controller // https://reprap.org/wiki/RepRapDiscount_Full_Graphic_Smart_Controller // -#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER -#define ST7920_DELAY_1 DELAY_NS(250) -#define ST7920_DELAY_2 DELAY_NS(250) -#define ST7920_DELAY_3 DELAY_NS(250) +//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER // // ReprapWorld Graphical LCD @@ -2093,6 +2090,9 @@ // different pins/wiring (see pins_ANET_10.h). // #define ANET_FULL_GRAPHICS_LCD +#define ST7920_DELAY_1 DELAY_NS(250) +#define ST7920_DELAY_2 DELAY_NS(250) +#define ST7920_DELAY_3 DELAY_NS(250) // // AZSMZ 12864 LCD with SD diff --git a/config/examples/BQ/WITBOX/Configuration.h b/config/examples/BQ/WITBOX/Configuration.h index 61edae3d50..3d10fbd8c5 100644 --- a/config/examples/BQ/WITBOX/Configuration.h +++ b/config/examples/BQ/WITBOX/Configuration.h @@ -1895,7 +1895,7 @@ // // Generic 16x2, 16x4, 20x2, or 20x4 character-based LCD. // -#define ULTRA_LCD +//#define ULTRA_LCD //============================================================================= //======================== LCD / Controller Selection ========================= diff --git a/config/examples/Creality/Ender-5 Plus/Configuration.h b/config/examples/Creality/Ender-5 Plus/Configuration.h index 20c17c76ac..1c70549a72 100644 --- a/config/examples/Creality/Ender-5 Plus/Configuration.h +++ b/config/examples/Creality/Ender-5 Plus/Configuration.h @@ -2174,11 +2174,11 @@ // DGUS Touch Display with DWIN OS. (Choose one.) // // Flash display with DGUS Displays for Marlin: -// 1. Format the SD card to FAT32 with a allocation size of 4k. -// 2. Download https://github.com/coldtobi/Marlin_DGUS_Resources -// 3. Copy the downloaded DWIN_SET folder to the SD card. -// 4. Plug the microSD card into the back of the display. -// 4. Boot the display and wait for the update to complete. +// - Format the SD card to FAT32 with a allocation size of 4k. +// - Download https://github.com/coldtobi/Marlin_DGUS_Resources +// - Copy the downloaded DWIN_SET folder to the SD card. +// - Plug the microSD card into the back of the display. +// - Boot the display and wait for the update to complete. // #define DGUS_LCD_UI_ORIGIN //#define DGUS_LCD_UI_FYSETC diff --git a/config/examples/EXP3D/Imprimante multifonction/Configuration.h b/config/examples/EXP3D/Imprimante multifonction/Configuration.h index f70229645b..61e2fc4e67 100644 --- a/config/examples/EXP3D/Imprimante multifonction/Configuration.h +++ b/config/examples/EXP3D/Imprimante multifonction/Configuration.h @@ -1855,7 +1855,7 @@ // // ULTIPANEL as seen on Thingiverse. // -#define ULTIPANEL +//#define ULTIPANEL // // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) diff --git a/config/examples/Geeetech/A10D/Configuration.h b/config/examples/Geeetech/A10D/Configuration.h index 079e2a2eac..e76d4abe6b 100644 --- a/config/examples/Geeetech/A10D/Configuration.h +++ b/config/examples/Geeetech/A10D/Configuration.h @@ -1856,8 +1856,8 @@ // // ULTIPANEL as seen on Thingiverse. // -#define ULTIPANEL -// +//#define ULTIPANEL + // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) // https://reprap.org/wiki/PanelOne // diff --git a/config/examples/Geeetech/A30/Configuration.h b/config/examples/Geeetech/A30/Configuration.h index ac19b5b528..489dc60120 100644 --- a/config/examples/Geeetech/A30/Configuration.h +++ b/config/examples/Geeetech/A30/Configuration.h @@ -1855,7 +1855,7 @@ // // ULTIPANEL as seen on Thingiverse. // -#define ULTIPANEL +//#define ULTIPANEL // // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) diff --git a/config/examples/Geeetech/D200/Configuration.h b/config/examples/Geeetech/D200/Configuration.h index d91a68702c..4477bd26b1 100644 --- a/config/examples/Geeetech/D200/Configuration.h +++ b/config/examples/Geeetech/D200/Configuration.h @@ -1855,7 +1855,7 @@ // // ULTIPANEL as seen on Thingiverse. // -#define ULTIPANEL +//#define ULTIPANEL // // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) diff --git a/config/examples/Geeetech/E180/Configuration.h b/config/examples/Geeetech/E180/Configuration.h index 25e9e72aea..fc36c89a38 100644 --- a/config/examples/Geeetech/E180/Configuration.h +++ b/config/examples/Geeetech/E180/Configuration.h @@ -1856,7 +1856,7 @@ // // ULTIPANEL as seen on Thingiverse. // -#define ULTIPANEL +//#define ULTIPANEL // // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) diff --git a/config/examples/Geeetech/M201/Configuration.h b/config/examples/Geeetech/M201/Configuration.h index 0a53291339..2323fd9816 100644 --- a/config/examples/Geeetech/M201/Configuration.h +++ b/config/examples/Geeetech/M201/Configuration.h @@ -1855,7 +1855,7 @@ // // ULTIPANEL as seen on Thingiverse. // -#define ULTIPANEL +//#define ULTIPANEL // // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) diff --git a/config/examples/Geeetech/PI3A PRO/Configuration.h b/config/examples/Geeetech/PI3A PRO/Configuration.h index dff72d9fef..6cba66ac16 100644 --- a/config/examples/Geeetech/PI3A PRO/Configuration.h +++ b/config/examples/Geeetech/PI3A PRO/Configuration.h @@ -1865,7 +1865,7 @@ // // ULTIPANEL as seen on Thingiverse. // -#define ULTIPANEL +//#define ULTIPANEL // // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) diff --git a/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h b/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h index 3df2ae4d81..2b997127e3 100644 --- a/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h +++ b/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h @@ -1905,7 +1905,7 @@ // // Generic 16x2, 16x4, 20x2, or 20x4 character-based LCD. // -#define ULTRA_LCD +//#define ULTRA_LCD //============================================================================= //======================== LCD / Controller Selection ========================= diff --git a/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h b/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h index ce8d2ca781..5b4a2bec3c 100644 --- a/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h +++ b/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h @@ -1904,7 +1904,7 @@ // // Generic 16x2, 16x4, 20x2, or 20x4 character-based LCD. // -#define ULTRA_LCD +//#define ULTRA_LCD //============================================================================= //======================== LCD / Controller Selection ========================= diff --git a/config/examples/Velleman/K8400/Dual-head/Configuration.h b/config/examples/Velleman/K8400/Dual-head/Configuration.h index 4757ecc294..9bf04a9470 100644 --- a/config/examples/Velleman/K8400/Dual-head/Configuration.h +++ b/config/examples/Velleman/K8400/Dual-head/Configuration.h @@ -1895,7 +1895,7 @@ // // Generic 16x2, 16x4, 20x2, or 20x4 character-based LCD. // -#define ULTRA_LCD +//#define ULTRA_LCD //============================================================================= //======================== LCD / Controller Selection ========================= diff --git a/config/examples/delta/Geeetech/G2/Configuration.h b/config/examples/delta/Geeetech/G2/Configuration.h index 63e5a881ac..25f0b4490f 100644 --- a/config/examples/delta/Geeetech/G2/Configuration.h +++ b/config/examples/delta/Geeetech/G2/Configuration.h @@ -1952,7 +1952,7 @@ // // ULTIPANEL as seen on Thingiverse. // -#define ULTIPANEL +//#define ULTIPANEL // // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) diff --git a/config/examples/delta/Geeetech/G2Pro/Configuration.h b/config/examples/delta/Geeetech/G2Pro/Configuration.h index b98a063d90..7ccf36993f 100644 --- a/config/examples/delta/Geeetech/G2Pro/Configuration.h +++ b/config/examples/delta/Geeetech/G2Pro/Configuration.h @@ -1952,7 +1952,7 @@ // // ULTIPANEL as seen on Thingiverse. // -#define ULTIPANEL +//#define ULTIPANEL // // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) diff --git a/config/examples/delta/Geeetech/G2S/Configuration.h b/config/examples/delta/Geeetech/G2S/Configuration.h index 632d7d50cf..b72aea6b75 100644 --- a/config/examples/delta/Geeetech/G2S/Configuration.h +++ b/config/examples/delta/Geeetech/G2S/Configuration.h @@ -1952,7 +1952,7 @@ // // ULTIPANEL as seen on Thingiverse. // -#define ULTIPANEL +//#define ULTIPANEL // // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) diff --git a/config/examples/delta/Geeetech/G2SPro/Configuration.h b/config/examples/delta/Geeetech/G2SPro/Configuration.h index dbee6881c0..533361f7fb 100644 --- a/config/examples/delta/Geeetech/G2SPro/Configuration.h +++ b/config/examples/delta/Geeetech/G2SPro/Configuration.h @@ -1952,7 +1952,7 @@ // // ULTIPANEL as seen on Thingiverse. // -#define ULTIPANEL +//#define ULTIPANEL // // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3) diff --git a/config/examples/delta/kossel_clear/Configuration.h b/config/examples/delta/kossel_clear/Configuration.h index e8c2a2e4cb..355eec8f16 100644 --- a/config/examples/delta/kossel_clear/Configuration.h +++ b/config/examples/delta/kossel_clear/Configuration.h @@ -1953,7 +1953,7 @@ // // ULTIPANEL as seen on Thingiverse. // -#define ULTIPANEL +//#define ULTIPANEL // // PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)