🎨 Use largest default ST9720 delays (#22713)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
committed by
Scott Lahteine
parent
4c7f8696ab
commit
253f91765d
@@ -286,9 +286,9 @@
|
||||
|
||||
// Alter timing for graphical display
|
||||
#if ENABLED(U8GLIB_ST7920)
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
||||
#define BOARD_ST7920_DELAY_1 96
|
||||
#define BOARD_ST7920_DELAY_2 48
|
||||
#define BOARD_ST7920_DELAY_3 600
|
||||
#endif
|
||||
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
@@ -207,11 +207,6 @@
|
||||
#define LCD_PINS_ENABLE PE11
|
||||
#define LCD_PINS_D4 PE10
|
||||
|
||||
// CR10_STOCKDISPLAY default timing is too fast
|
||||
#undef BOARD_ST7920_DELAY_1
|
||||
#undef BOARD_ST7920_DELAY_2
|
||||
#undef BOARD_ST7920_DELAY_3
|
||||
|
||||
#elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
|
||||
|
||||
#error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. Comment out this line to continue."
|
||||
@@ -283,9 +278,9 @@
|
||||
|
||||
// Alter timing for graphical display
|
||||
#if ENABLED(U8GLIB_ST7920)
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
||||
#define BOARD_ST7920_DELAY_1 96
|
||||
#define BOARD_ST7920_DELAY_2 48
|
||||
#define BOARD_ST7920_DELAY_3 600
|
||||
#endif
|
||||
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
@@ -425,11 +425,6 @@
|
||||
#define LCD_PINS_ENABLE EXP1_03_PIN
|
||||
#define LCD_PINS_D4 EXP1_05_PIN
|
||||
|
||||
// CR10_STOCKDISPLAY default timing is too fast
|
||||
#undef BOARD_ST7920_DELAY_1
|
||||
#undef BOARD_ST7920_DELAY_2
|
||||
#undef BOARD_ST7920_DELAY_3
|
||||
|
||||
#elif ENABLED(MKS_MINI_12864)
|
||||
#define DOGLCD_A0 EXP1_04_PIN
|
||||
#define DOGLCD_CS EXP1_05_PIN
|
||||
@@ -489,9 +484,9 @@
|
||||
|
||||
// Alter timing for graphical display
|
||||
#if ENABLED(U8GLIB_ST7920)
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
||||
#define BOARD_ST7920_DELAY_1 96
|
||||
#define BOARD_ST7920_DELAY_2 48
|
||||
#define BOARD_ST7920_DELAY_3 600
|
||||
#endif
|
||||
|
||||
#endif // HAS_WIRED_LCD
|
||||
|
@@ -433,11 +433,6 @@
|
||||
#define LCD_PINS_ENABLE EXP1_03_PIN
|
||||
#define LCD_PINS_D4 EXP1_05_PIN
|
||||
|
||||
// CR10_STOCKDISPLAY default timing is too fast
|
||||
#undef BOARD_ST7920_DELAY_1
|
||||
#undef BOARD_ST7920_DELAY_2
|
||||
#undef BOARD_ST7920_DELAY_3
|
||||
|
||||
#else
|
||||
|
||||
#define LCD_PINS_RS EXP1_07_PIN
|
||||
@@ -484,9 +479,9 @@
|
||||
|
||||
// Alter timing for graphical display
|
||||
#if ENABLED(U8GLIB_ST7920)
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(120)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 80)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(580)
|
||||
#define BOARD_ST7920_DELAY_1 120
|
||||
#define BOARD_ST7920_DELAY_2 80
|
||||
#define BOARD_ST7920_DELAY_3 580
|
||||
#endif
|
||||
|
||||
#if HAS_SPI_TFT
|
||||
|
@@ -446,11 +446,6 @@
|
||||
#define LCD_PINS_ENABLE EXP1_03_PIN
|
||||
#define LCD_PINS_D4 EXP1_05_PIN
|
||||
|
||||
// CR10_STOCKDISPLAY default timing is too fast
|
||||
#undef BOARD_ST7920_DELAY_1
|
||||
#undef BOARD_ST7920_DELAY_2
|
||||
#undef BOARD_ST7920_DELAY_3
|
||||
|
||||
#elif ENABLED(MKS_MINI_12864)
|
||||
|
||||
#define DOGLCD_A0 EXP1_04_PIN
|
||||
@@ -506,13 +501,13 @@
|
||||
// Alter timing for graphical display
|
||||
#if ENABLED(U8GLIB_ST7920)
|
||||
#ifndef BOARD_ST7920_DELAY_1
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
||||
#define BOARD_ST7920_DELAY_1 125
|
||||
#endif
|
||||
#ifndef BOARD_ST7920_DELAY_2
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 90)
|
||||
#define BOARD_ST7920_DELAY_2 90
|
||||
#endif
|
||||
#ifndef BOARD_ST7920_DELAY_3
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
||||
#define BOARD_ST7920_DELAY_3 600
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
@@ -430,11 +430,6 @@
|
||||
#define LCD_PINS_ENABLE EXP1_03_PIN
|
||||
#define LCD_PINS_D4 EXP1_05_PIN
|
||||
|
||||
// CR10_STOCKDISPLAY default timing is too fast
|
||||
#undef BOARD_ST7920_DELAY_1
|
||||
#undef BOARD_ST7920_DELAY_2
|
||||
#undef BOARD_ST7920_DELAY_3
|
||||
|
||||
#elif ENABLED(MKS_MINI_12864)
|
||||
|
||||
#define DOGLCD_A0 EXP1_04_PIN
|
||||
@@ -490,13 +485,13 @@
|
||||
// Alter timing for graphical display
|
||||
#if ENABLED(U8GLIB_ST7920)
|
||||
#ifndef BOARD_ST7920_DELAY_1
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(120)
|
||||
#define BOARD_ST7920_DELAY_1 120
|
||||
#endif
|
||||
#ifndef BOARD_ST7920_DELAY_2
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 80)
|
||||
#define BOARD_ST7920_DELAY_2 80
|
||||
#endif
|
||||
#ifndef BOARD_ST7920_DELAY_3
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(580)
|
||||
#define BOARD_ST7920_DELAY_3 580
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
@@ -306,7 +306,7 @@
|
||||
|
||||
// Alter timing for graphical display
|
||||
#if ENABLED(U8GLIB_ST7920)
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(715)
|
||||
#define BOARD_ST7920_DELAY_1 96
|
||||
#define BOARD_ST7920_DELAY_2 48
|
||||
#define BOARD_ST7920_DELAY_3 715
|
||||
#endif
|
||||
|
@@ -192,11 +192,6 @@
|
||||
#define LCD_PINS_ENABLE EXP1_08_PIN
|
||||
#define LCD_PINS_D4 EXP1_06_PIN
|
||||
|
||||
// CR10_STOCKDISPLAY default timing is too fast
|
||||
#undef BOARD_ST7920_DELAY_1
|
||||
#undef BOARD_ST7920_DELAY_2
|
||||
#undef BOARD_ST7920_DELAY_3
|
||||
|
||||
#elif ENABLED(MKS_MINI_12864)
|
||||
|
||||
#define DOGLCD_A0 EXP1_04_PIN
|
||||
@@ -251,9 +246,9 @@
|
||||
|
||||
// Alter timing for graphical display
|
||||
#if ENABLED(U8GLIB_ST7920)
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
||||
#define BOARD_ST7920_DELAY_1 96
|
||||
#define BOARD_ST7920_DELAY_2 48
|
||||
#define BOARD_ST7920_DELAY_3 600
|
||||
#endif
|
||||
|
||||
#if ENABLED(TOUCH_UI_FTDI_EVE)
|
||||
|
@@ -315,9 +315,9 @@
|
||||
|
||||
// Alter timing for graphical display
|
||||
#if ENABLED(U8GLIB_ST7920)
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(640)
|
||||
#define BOARD_ST7920_DELAY_1 96
|
||||
#define BOARD_ST7920_DELAY_2 48
|
||||
#define BOARD_ST7920_DELAY_3 640
|
||||
#endif
|
||||
|
||||
#ifndef RGB_LED_R_PIN
|
||||
|
@@ -369,9 +369,9 @@
|
||||
#define LCD_PINS_D7 EXP1_03_PIN
|
||||
#endif
|
||||
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(48)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
||||
#define BOARD_ST7920_DELAY_1 96
|
||||
#define BOARD_ST7920_DELAY_2 48
|
||||
#define BOARD_ST7920_DELAY_3 600
|
||||
|
||||
#endif // !MKS_MINI_12864
|
||||
|
||||
|
@@ -413,9 +413,9 @@
|
||||
#define LCD_PINS_D7 EXP1_03_PIN
|
||||
#endif
|
||||
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(48)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
||||
#define BOARD_ST7920_DELAY_1 96
|
||||
#define BOARD_ST7920_DELAY_2 48
|
||||
#define BOARD_ST7920_DELAY_3 600
|
||||
|
||||
#endif // !MKS_MINI_12864
|
||||
|
||||
|
@@ -371,9 +371,9 @@
|
||||
#define LCD_PINS_D7 EXP1_03_PIN
|
||||
#endif
|
||||
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
||||
#define BOARD_ST7920_DELAY_1 96
|
||||
#define BOARD_ST7920_DELAY_2 48
|
||||
#define BOARD_ST7920_DELAY_3 600
|
||||
|
||||
#endif // !MKS_MINI_12864
|
||||
|
||||
|
@@ -173,7 +173,7 @@
|
||||
|
||||
// Alter timing for graphical display
|
||||
#if ENABLED(U8GLIB_ST7920)
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(640)
|
||||
#define BOARD_ST7920_DELAY_1 96
|
||||
#define BOARD_ST7920_DELAY_2 48
|
||||
#define BOARD_ST7920_DELAY_3 640
|
||||
#endif
|
||||
|
@@ -225,12 +225,9 @@
|
||||
#define LCD_PINS_D4 EXP1_05_PIN
|
||||
//#define KILL_PIN -1
|
||||
|
||||
#undef BOARD_ST7920_DELAY_1
|
||||
#undef BOARD_ST7920_DELAY_2
|
||||
#undef BOARD_ST7920_DELAY_3
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(600)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(750)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(750)
|
||||
#define BOARD_ST7920_DELAY_1 600
|
||||
#define BOARD_ST7920_DELAY_2 750
|
||||
#define BOARD_ST7920_DELAY_3 750
|
||||
|
||||
#elif ENABLED(MKS_MINI_12864)
|
||||
/** ______
|
||||
|
@@ -184,7 +184,7 @@
|
||||
|
||||
// Alter timing for graphical display
|
||||
#if ENABLED(U8GLIB_ST7920)
|
||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(715)
|
||||
#define BOARD_ST7920_DELAY_1 96
|
||||
#define BOARD_ST7920_DELAY_2 48
|
||||
#define BOARD_ST7920_DELAY_3 715
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user