🎨 Use largest default ST9720 delays (#22713)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>

Marlin/src/HAL/AVR/HAL.h

@@ -43,13 +43,13 @@
 // Default graphical display delays
 //
 #if F_CPU >= 20000000
-  #define CPU_ST7920_DELAY_1 DELAY_NS(150)
-  #define CPU_ST7920_DELAY_2 DELAY_NS(  0)
-  #define CPU_ST7920_DELAY_3 DELAY_NS(150)
+  #define CPU_ST7920_DELAY_1 150
+  #define CPU_ST7920_DELAY_2   0
+  #define CPU_ST7920_DELAY_3 150
 #elif F_CPU == 16000000
-  #define CPU_ST7920_DELAY_1 DELAY_NS(125)
-  #define CPU_ST7920_DELAY_2 DELAY_NS(  0)
-  #define CPU_ST7920_DELAY_3 DELAY_NS(188)
+  #define CPU_ST7920_DELAY_1 125
+  #define CPU_ST7920_DELAY_2   0
+  #define CPU_ST7920_DELAY_3 188
 #endif
 
 #ifndef pgm_read_ptr

Marlin/src/HAL/LINUX/HAL.h

@@ -63,9 +63,9 @@ uint8_t _getc();
 extern MSerialT usb_serial;
 #define MYSERIAL1 usb_serial
 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
 
 //
 // Interrupts

Marlin/src/HAL/LPC1768/HAL.h

@@ -50,9 +50,9 @@ extern "C" volatile uint32_t _millis;
 //
 // Default graphical display delays
 //
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
 
 typedef ForwardSerial1Class< decltype(UsbSerial) > DefaultSerial1;
 extern DefaultSerial1 USBSerial;

Marlin/src/HAL/NATIVE_SIM/HAL.h

@@ -99,9 +99,9 @@ extern MSerialT serial_stream_3;
 #endif
 
 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
 
 //
 // Interrupts

Marlin/src/HAL/STM32/HAL.h

@@ -40,9 +40,9 @@
 //
 // Default graphical display delays
 //
-#define CPU_ST7920_DELAY_1 DELAY_NS(300)
-#define CPU_ST7920_DELAY_2 DELAY_NS( 40)
-#define CPU_ST7920_DELAY_3 DELAY_NS(340)
+#define CPU_ST7920_DELAY_1 300
+#define CPU_ST7920_DELAY_2  40
+#define CPU_ST7920_DELAY_3 340
 
 //
 // Serial Ports

Marlin/src/HAL/STM32F1/HAL.h

@@ -54,9 +54,9 @@
 //
 // Default graphical display delays
 //
-#define CPU_ST7920_DELAY_1 DELAY_NS(300)
-#define CPU_ST7920_DELAY_2 DELAY_NS( 40)
-#define CPU_ST7920_DELAY_3 DELAY_NS(340)
+#define CPU_ST7920_DELAY_1 300
+#define CPU_ST7920_DELAY_2  40
+#define CPU_ST7920_DELAY_3 340
 
 #ifndef STM32_FLASH_SIZE
   #if ANY(MCU_STM32F103RE, MCU_STM32F103VE, MCU_STM32F103ZE)

Marlin/src/HAL/TEENSY31_32/HAL.h

@@ -36,9 +36,9 @@
 
 #include <stdint.h>
 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
 
 //#undef MOTHERBOARD
 //#define MOTHERBOARD BOARD_TEENSY31_32

Marlin/src/HAL/TEENSY35_36/HAL.h

@@ -37,9 +37,9 @@
 #include <stdint.h>
 #include <util/atomic.h>
 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
 
 // ------------------------
 // Defines

Marlin/src/HAL/TEENSY40_41/HAL.h

@@ -41,9 +41,9 @@
   #include "../../feature/ethernet.h"
 #endif
 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
+#define CPU_ST7920_DELAY_1 600
+#define CPU_ST7920_DELAY_2 750
+#define CPU_ST7920_DELAY_3 750
 
 // ------------------------
 // Defines

Marlin/src/inc/Conditionals_LCD.h

@@ -237,16 +237,16 @@
 #elif ENABLED(CR10_STOCKDISPLAY)
 
   #define IS_RRD_FG_SC 1
-  #define LCD_ST7920_DELAY_1 DELAY_NS(125)
-  #define LCD_ST7920_DELAY_2 DELAY_NS(125)
-  #define LCD_ST7920_DELAY_3 DELAY_NS(125)
+  #define LCD_ST7920_DELAY_1           125
+  #define LCD_ST7920_DELAY_2           125
+  #define LCD_ST7920_DELAY_3           125
 
 #elif ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
 
   #define IS_RRD_FG_SC 1
-  #define LCD_ST7920_DELAY_1 DELAY_NS(150)
-  #define LCD_ST7920_DELAY_2 DELAY_NS(150)
-  #define LCD_ST7920_DELAY_3 DELAY_NS(150)
+  #define LCD_ST7920_DELAY_1           150
+  #define LCD_ST7920_DELAY_2           150
+  #define LCD_ST7920_DELAY_3           150
 
 #elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, BQ_LCD_SMART_CONTROLLER, K3D_FULL_GRAPHIC_SMART_CONTROLLER)
 

Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp

@@ -36,11 +36,61 @@
 // Optimize this code with -O3
 #pragma GCC optimize (3)
 
+#ifndef ST7920_DELAY_1
+  #ifndef LCD_ST7920_DELAY_1
+    #define LCD_ST7920_DELAY_1 0
+  #endif
+  #ifndef BOARD_ST7920_DELAY_1
+    #define BOARD_ST7920_DELAY_1 0
+  #endif
+  #ifndef CPU_ST7920_DELAY_1
+    #define CPU_ST7920_DELAY_1 0
+  #endif
+  #if LCD_ST7920_DELAY_1 || BOARD_ST7920_DELAY_1 || CPU_ST7920_DELAY_1
+    #define ST7920_DELAY_1 DELAY_NS(_MAX(LCD_ST7920_DELAY_1, BOARD_ST7920_DELAY_1, CPU_ST7920_DELAY_1))
+  #else
+    #define ST7920_DELAY_1
+  #endif
+#endif
+#ifndef ST7920_DELAY_2
+  #ifndef LCD_ST7920_DELAY_2
+    #define LCD_ST7920_DELAY_2 0
+  #endif
+  #ifndef BOARD_ST7920_DELAY_2
+    #define BOARD_ST7920_DELAY_2 0
+  #endif
+  #ifndef CPU_ST7920_DELAY_2
+    #define CPU_ST7920_DELAY_2 0
+  #endif
+  #if LCD_ST7920_DELAY_2 || BOARD_ST7920_DELAY_2 || CPU_ST7920_DELAY_2
+    #define ST7920_DELAY_2 DELAY_NS(_MAX(LCD_ST7920_DELAY_2, BOARD_ST7920_DELAY_2, CPU_ST7920_DELAY_2))
+  #else
+    #define ST7920_DELAY_2
+  #endif
+#endif
+#ifndef ST7920_DELAY_3
+  #ifndef LCD_ST7920_DELAY_3
+    #define LCD_ST7920_DELAY_3 0
+  #endif
+  #ifndef BOARD_ST7920_DELAY_3
+    #define BOARD_ST7920_DELAY_3 0
+  #endif
+  #ifndef CPU_ST7920_DELAY_3
+    #define CPU_ST7920_DELAY_3 0
+  #endif
+  #if LCD_ST7920_DELAY_3 || BOARD_ST7920_DELAY_3 || CPU_ST7920_DELAY_3
+    #define ST7920_DELAY_3 DELAY_NS(_MAX(LCD_ST7920_DELAY_3, BOARD_ST7920_DELAY_3, CPU_ST7920_DELAY_3))
+  #else
+    #define ST7920_DELAY_3
+  #endif
+#endif
+
 #ifdef ARDUINO_ARCH_STM32F1
   #define ST7920_DAT(V) !!((V) & 0x80)
 #else
   #define ST7920_DAT(V) ((V) & 0x80)
 #endif
+
 #define ST7920_SND_BIT do{ \
   WRITE(ST7920_CLK_PIN, LOW);             ST7920_DELAY_1; \
   WRITE(ST7920_DAT_PIN, ST7920_DAT(val)); ST7920_DELAY_2; \

Marlin/src/pins/mega/pins_SILVER_GATE.h

@@ -86,9 +86,9 @@
       #define KILL_PIN                        21
       #define HOME_PIN                        28
     #endif
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(  0)
-    #define BOARD_ST7920_DELAY_2   DELAY_NS(250)
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(  0)
+    #define BOARD_ST7920_DELAY_1               0
+    #define BOARD_ST7920_DELAY_2             250
+    #define BOARD_ST7920_DELAY_3               0
   #endif
 #endif
 

Marlin/src/pins/pins_postprocess.h

@@ -1221,35 +1221,7 @@
 //
 // Default DOGLCD SPI delays
 //
-#if ENABLED(U8GLIB_ST7920)
-  #ifndef ST7920_DELAY_1
-    #ifdef LCD_ST7920_DELAY_1
-      #define ST7920_DELAY_1 LCD_ST7920_DELAY_1
-    #elif defined(BOARD_ST7920_DELAY_1)
-      #define ST7920_DELAY_1 BOARD_ST7920_DELAY_1
-    #elif defined(CPU_ST7920_DELAY_1)
-      #define ST7920_DELAY_1 CPU_ST7920_DELAY_1
-    #endif
-  #endif
-  #ifndef ST7920_DELAY_2
-    #ifdef LCD_ST7920_DELAY_2
-      #define ST7920_DELAY_2 LCD_ST7920_DELAY_2
-    #elif defined(BOARD_ST7920_DELAY_2)
-      #define ST7920_DELAY_2 BOARD_ST7920_DELAY_2
-    #elif defined(CPU_ST7920_DELAY_2)
-      #define ST7920_DELAY_2 CPU_ST7920_DELAY_2
-    #endif
-  #endif
-  #ifndef ST7920_DELAY_3
-    #ifdef LCD_ST7920_DELAY_3
-      #define ST7920_DELAY_3 LCD_ST7920_DELAY_3
-    #elif defined(BOARD_ST7920_DELAY_3)
-      #define ST7920_DELAY_3 BOARD_ST7920_DELAY_3
-    #elif defined(CPU_ST7920_DELAY_3)
-      #define ST7920_DELAY_3 CPU_ST7920_DELAY_3
-    #endif
-  #endif
-#else
+#if DISABLED(U8GLIB_ST7920)
   #undef ST7920_DELAY_1
   #undef ST7920_DELAY_2
   #undef ST7920_DELAY_3

Marlin/src/pins/rambo/pins_EINSY_RAMBO.h

@@ -206,9 +206,9 @@
 #endif // HAS_WIRED_LCD
 
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2               250
+  #define BOARD_ST7920_DELAY_3                 0
 #endif
 
 #undef MK3_FAN_PINS

Marlin/src/pins/rambo/pins_EINSY_RETRO.h

@@ -202,7 +202,7 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2               250
+  #define BOARD_ST7920_DELAY_3                 0
 #endif

Marlin/src/pins/rambo/pins_MINIRAMBO.h

@@ -194,7 +194,7 @@
 #endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
 
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2               250
+  #define BOARD_ST7920_DELAY_3                 0
 #endif

Marlin/src/pins/rambo/pins_RAMBO.h

@@ -271,7 +271,7 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1       DELAY_NS(0)
-  #define BOARD_ST7920_DELAY_2       DELAY_NS(0)
-  #define BOARD_ST7920_DELAY_3       DELAY_NS(0)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2                 0
+  #define BOARD_ST7920_DELAY_3                 0
 #endif

Marlin/src/pins/ramps/pins_3DRAG.h

@@ -109,9 +109,9 @@
 #endif // IS_ULTRA_LCD && IS_NEWPANEL
 
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(188)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2               188
+  #define BOARD_ST7920_DELAY_3                 0
 #endif
 
 /**

Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h

@@ -126,7 +126,7 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(189)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2                 0
+  #define BOARD_ST7920_DELAY_3               189
 #endif

Marlin/src/pins/ramps/pins_DAGOMA_F5.h

@@ -41,9 +41,9 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(250)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2               250
+  #define BOARD_ST7920_DELAY_3               250
 #endif
 
 //

Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h

@@ -200,7 +200,7 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(200)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(200)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(200)
+  #define BOARD_ST7920_DELAY_1               200
+  #define BOARD_ST7920_DELAY_2               200
+  #define BOARD_ST7920_DELAY_3               200
 #endif

Marlin/src/pins/sanguino/pins_ANET_10.h

@@ -195,9 +195,9 @@
       #define BTN_EN1                         28
       #define BTN_EN2                         10
       #define BTN_ENC                         17
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(250)
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(250)
+      #define BOARD_ST7920_DELAY_1           250
+      #define BOARD_ST7920_DELAY_2           250
+      #define BOARD_ST7920_DELAY_3           250
     #else
       #define SERVO0_PIN                      29  // free for BLTouch/3D-Touch
       #define BEEPER_PIN                      17
@@ -207,9 +207,9 @@
       #define BTN_EN1                         11
       #define BTN_EN2                         10
       #define BTN_ENC                         16
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(63)
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
+      #define BOARD_ST7920_DELAY_1           125
+      #define BOARD_ST7920_DELAY_2            63
+      #define BOARD_ST7920_DELAY_3           125
     #endif
 
   #endif

Marlin/src/pins/sanguino/pins_MELZI.h

@@ -34,13 +34,13 @@
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
   #ifndef BOARD_ST7920_DELAY_1
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(  0)
+    #define BOARD_ST7920_DELAY_1               0
   #endif
   #ifndef BOARD_ST7920_DELAY_2
-    #define BOARD_ST7920_DELAY_2   DELAY_NS(188)
+    #define BOARD_ST7920_DELAY_2             188
   #endif
   #ifndef BOARD_ST7920_DELAY_3
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(  0)
+    #define BOARD_ST7920_DELAY_3               0
   #endif
 #endif
 

Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h

@@ -37,9 +37,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
 
 #include "pins_MELZI.h"

Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h

@@ -29,9 +29,9 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2               125
+  #define BOARD_ST7920_DELAY_3                 0
 #endif
 
 #include "pins_MELZI.h"

Marlin/src/pins/sanguino/pins_MELZI_V2.h

@@ -26,9 +26,9 @@
 
 // Alter timing for graphical display
 #if ENABLED(U8GLIB_ST7920)
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(400)
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
+  #define BOARD_ST7920_DELAY_1                 0
+  #define BOARD_ST7920_DELAY_2               400
+  #define BOARD_ST7920_DELAY_3                 0
 #endif
 
 #include "pins_MELZI.h"

Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h

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

Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h

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

Marlin/src/pins/stm32f1/pins_FLY_MINI.h

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

Marlin/src/pins/stm32f1/pins_GTM32_MINI.h

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

Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h

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

Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h

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

Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h

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

Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h

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

Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h

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

Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h

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

Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h

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

Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h

@@ -366,9 +366,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

Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h

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

Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h

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

Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h

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

Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h

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

Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h

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

Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h

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

Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h

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

Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h

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

Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h

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

Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h

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

Marlin/src/pins/stm32f4/pins_FLYF407ZG.h

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

Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h

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

Marlin/src/pins/stm32f4/pins_FYSETC_S6.h

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

Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h

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

Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h

@@ -400,9 +400,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
 

Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h

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

Marlin/src/pins/stm32f4/pins_RUMBA32_common.h

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

Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h

@@ -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)
   /**          ______

Marlin/src/pins/stm32f4/pins_VAKE403D.h

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

Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h

@@ -191,7 +191,7 @@
   #define BTN_EN1                           PF13  // BTN_EN1
   #define BTN_EN2                           PE9   // BTN_EN2
 
-  #define BOARD_ST7920_DELAY_1  DELAY_NS(125)
-  #define BOARD_ST7920_DELAY_2  DELAY_NS(63)
-  #define BOARD_ST7920_DELAY_3  DELAY_NS(780)
+  #define BOARD_ST7920_DELAY_1               125
+  #define BOARD_ST7920_DELAY_2                63
+  #define BOARD_ST7920_DELAY_3               780
 #endif

Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h

@@ -245,9 +245,9 @@
     //#define MISO                            23  //         13               B3                ICSP-06             EXP2-05
 
     // Alter timing for graphical display
-    #define BOARD_ST7920_DELAY_1 DELAY_NS(313)
-    #define BOARD_ST7920_DELAY_2 DELAY_NS(313)
-    #define BOARD_ST7920_DELAY_3 DELAY_NS(313)
+    #define BOARD_ST7920_DELAY_1           313
+    #define BOARD_ST7920_DELAY_2           313
+    #define BOARD_ST7920_DELAY_3           313
 
   #else