🎨 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
				
			@@ -203,9 +203,9 @@
 | 
			
		||||
 | 
			
		||||
    // Alter timing for graphical display
 | 
			
		||||
    #if ENABLED(U8GLIB_ST7920)
 | 
			
		||||
      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
 | 
			
		||||
      #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
 | 
			
		||||
      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
 | 
			
		||||
      #define BOARD_ST7920_DELAY_1           125
 | 
			
		||||
      #define BOARD_ST7920_DELAY_2           125
 | 
			
		||||
      #define BOARD_ST7920_DELAY_3           125
 | 
			
		||||
    #endif
 | 
			
		||||
 | 
			
		||||
  #endif
 | 
			
		||||
 
 | 
			
		||||
@@ -156,9 +156,9 @@
 | 
			
		||||
 | 
			
		||||
// Alter timing for graphical display
 | 
			
		||||
#if ENABLED(U8GLIB_ST7920)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_1               125
 | 
			
		||||
  #define BOARD_ST7920_DELAY_2               125
 | 
			
		||||
  #define BOARD_ST7920_DELAY_3               125
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
//
 | 
			
		||||
 
 | 
			
		||||
@@ -180,9 +180,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(715)
 | 
			
		||||
    #define BOARD_ST7920_DELAY_1              96
 | 
			
		||||
    #define BOARD_ST7920_DELAY_2              48
 | 
			
		||||
    #define BOARD_ST7920_DELAY_3             715
 | 
			
		||||
  #endif
 | 
			
		||||
 | 
			
		||||
#endif // HAS_WIRED_LCD
 | 
			
		||||
 
 | 
			
		||||
@@ -159,9 +159,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(715)
 | 
			
		||||
    #define BOARD_ST7920_DELAY_1              96
 | 
			
		||||
    #define BOARD_ST7920_DELAY_2              48
 | 
			
		||||
    #define BOARD_ST7920_DELAY_3             715
 | 
			
		||||
  #endif
 | 
			
		||||
 | 
			
		||||
#endif // HAS_WIRED_LCD
 | 
			
		||||
 
 | 
			
		||||
@@ -167,9 +167,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(715)
 | 
			
		||||
    #define BOARD_ST7920_DELAY_1              96
 | 
			
		||||
    #define BOARD_ST7920_DELAY_2              48
 | 
			
		||||
    #define BOARD_ST7920_DELAY_3             715
 | 
			
		||||
  #endif
 | 
			
		||||
 | 
			
		||||
#endif // HAS_WIRED_LCD
 | 
			
		||||
 
 | 
			
		||||
@@ -164,9 +164,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(715)
 | 
			
		||||
    #define BOARD_ST7920_DELAY_1              96
 | 
			
		||||
    #define BOARD_ST7920_DELAY_2              48
 | 
			
		||||
    #define BOARD_ST7920_DELAY_3             715
 | 
			
		||||
  #endif
 | 
			
		||||
 | 
			
		||||
#endif // HAS_WIRED_LCD
 | 
			
		||||
 
 | 
			
		||||
@@ -169,9 +169,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(715)
 | 
			
		||||
    #define BOARD_ST7920_DELAY_1              96
 | 
			
		||||
    #define BOARD_ST7920_DELAY_2              48
 | 
			
		||||
    #define BOARD_ST7920_DELAY_3             715
 | 
			
		||||
  #endif
 | 
			
		||||
 | 
			
		||||
#endif // HAS_WIRED_LCD
 | 
			
		||||
 
 | 
			
		||||
@@ -342,9 +342,9 @@
 | 
			
		||||
 | 
			
		||||
    #endif
 | 
			
		||||
 | 
			
		||||
    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
 | 
			
		||||
    #define BOARD_ST7920_DELAY_2   DELAY_NS(125)
 | 
			
		||||
    #define BOARD_ST7920_DELAY_3   DELAY_NS(125)
 | 
			
		||||
    #define BOARD_ST7920_DELAY_1             125
 | 
			
		||||
    #define BOARD_ST7920_DELAY_2             125
 | 
			
		||||
    #define BOARD_ST7920_DELAY_3             125
 | 
			
		||||
 | 
			
		||||
  #endif // !MKS_MINI_12864
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -223,13 +223,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(125)
 | 
			
		||||
    #define BOARD_ST7920_DELAY_2             125
 | 
			
		||||
  #endif
 | 
			
		||||
  #ifndef BOARD_ST7920_DELAY_3
 | 
			
		||||
    #define BOARD_ST7920_DELAY_3   DELAY_NS(125)
 | 
			
		||||
    #define BOARD_ST7920_DELAY_3             125
 | 
			
		||||
  #endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -114,9 +114,9 @@
 | 
			
		||||
 | 
			
		||||
  // Alter timing for graphical display
 | 
			
		||||
  #if ENABLED(U8GLIB_ST7920)
 | 
			
		||||
    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
 | 
			
		||||
    #define BOARD_ST7920_DELAY_2   DELAY_NS(125)
 | 
			
		||||
    #define BOARD_ST7920_DELAY_3   DELAY_NS(125)
 | 
			
		||||
    #define BOARD_ST7920_DELAY_1             125
 | 
			
		||||
    #define BOARD_ST7920_DELAY_2             125
 | 
			
		||||
    #define BOARD_ST7920_DELAY_3             125
 | 
			
		||||
  #endif
 | 
			
		||||
 | 
			
		||||
#endif // HAS_WIRED_LCD
 | 
			
		||||
 
 | 
			
		||||
@@ -138,9 +138,9 @@
 | 
			
		||||
 | 
			
		||||
  #endif // !MKS_MINI_12864
 | 
			
		||||
 | 
			
		||||
  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_1               125
 | 
			
		||||
  #define BOARD_ST7920_DELAY_2               125
 | 
			
		||||
  #define BOARD_ST7920_DELAY_3               125
 | 
			
		||||
 | 
			
		||||
#endif // HAS_WIRED_LCD
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -379,9 +379,9 @@
 | 
			
		||||
    #endif
 | 
			
		||||
 | 
			
		||||
    #if ENABLED(U8GLIB_ST7920)
 | 
			
		||||
      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
 | 
			
		||||
      #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
 | 
			
		||||
      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
 | 
			
		||||
      #define BOARD_ST7920_DELAY_1           125
 | 
			
		||||
      #define BOARD_ST7920_DELAY_2           125
 | 
			
		||||
      #define BOARD_ST7920_DELAY_3           125
 | 
			
		||||
    #endif
 | 
			
		||||
 | 
			
		||||
  #endif // !MKS_MINI_12864
 | 
			
		||||
 
 | 
			
		||||
@@ -301,9 +301,9 @@
 | 
			
		||||
 | 
			
		||||
// Alter timing for graphical display
 | 
			
		||||
#if ENABLED(U8GLIB_ST7920)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_1               125
 | 
			
		||||
  #define BOARD_ST7920_DELAY_2               125
 | 
			
		||||
  #define BOARD_ST7920_DELAY_3               125
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#define HAS_SPI_FLASH                          1
 | 
			
		||||
 
 | 
			
		||||
@@ -201,9 +201,9 @@
 | 
			
		||||
  #define BTN_EN1                    EXP1_03_PIN
 | 
			
		||||
  #define BTN_EN2                    EXP1_06_PIN
 | 
			
		||||
  #define BTN_ENC                    EXP1_04_PIN
 | 
			
		||||
  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_2     DELAY_NS(200)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_1               125
 | 
			
		||||
  #define BOARD_ST7920_DELAY_2               200
 | 
			
		||||
  #define BOARD_ST7920_DELAY_3               125
 | 
			
		||||
 | 
			
		||||
#elif EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -333,9 +333,9 @@
 | 
			
		||||
 | 
			
		||||
// Alter timing for graphical display
 | 
			
		||||
#if ENABLED(U8GLIB_ST7920)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_1               125
 | 
			
		||||
  #define BOARD_ST7920_DELAY_2               250
 | 
			
		||||
  #define BOARD_ST7920_DELAY_3               125
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
// Remap SERVO0 PIN for BLTouch
 | 
			
		||||
 
 | 
			
		||||
@@ -306,9 +306,9 @@
 | 
			
		||||
 | 
			
		||||
// Alter timing for graphical display
 | 
			
		||||
#if ENABLED(U8GLIB_ST7920)
 | 
			
		||||
  #define BOARD_ST7920_DELAY_1     DELAY_NS(200)  // Tclk_fall <200ns
 | 
			
		||||
  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)  // Tdata_width >200ns
 | 
			
		||||
  #define BOARD_ST7920_DELAY_3     DELAY_NS(200)  // Tclk_rise <200ns
 | 
			
		||||
  #define BOARD_ST7920_DELAY_1               200  // Tclk_fall <200ns
 | 
			
		||||
  #define BOARD_ST7920_DELAY_2               250  // Tdata_width >200ns
 | 
			
		||||
  #define BOARD_ST7920_DELAY_3               200  // Tclk_rise <200ns
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
// Remap SERVO0 PIN for BLTouch
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user