thomas
/
marlin
關註 1
收藏 0
複製 0
程式碼 問題管理 0 合併請求 0 版本發佈 0 Wiki Activity
瀏覽代碼

🎨 Use largest default ST9720 delays (#22713) 

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
dotdash32 3 年之前
父節點
51c66881c2
當前提交
c881fab128
No account linked to committer's email address
共有 59 個文件被更改，包括 231 次插入 和 242 次删除
統一視圖 顯示文件統計
  1. 6
    6
      Marlin/src/HAL/AVR/HAL.h
  2. 3
    3
      Marlin/src/HAL/LINUX/HAL.h
  3. 3
    3
      Marlin/src/HAL/LPC1768/HAL.h
  4. 3
    3
      Marlin/src/HAL/NATIVE_SIM/HAL.h
  5. 3
    3
      Marlin/src/HAL/STM32/HAL.h
  6. 3
    3
      Marlin/src/HAL/STM32F1/HAL.h
  7. 3
    3
      Marlin/src/HAL/TEENSY31_32/HAL.h
  8. 3
    3
      Marlin/src/HAL/TEENSY35_36/HAL.h
  9. 3
    3
      Marlin/src/HAL/TEENSY40_41/HAL.h
  10. 6
    6
      Marlin/src/inc/Conditionals_LCD.h
  11. 50
    0
      Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp
  12. 3
    3
      Marlin/src/pins/mega/pins_SILVER_GATE.h
  13. 1
    29
      Marlin/src/pins/pins_postprocess.h
  14. 3
    3
      Marlin/src/pins/rambo/pins_EINSY_RAMBO.h
  15. 3
    3
      Marlin/src/pins/rambo/pins_EINSY_RETRO.h
  16. 3
    3
      Marlin/src/pins/rambo/pins_MINIRAMBO.h
  17. 3
    3
      Marlin/src/pins/rambo/pins_RAMBO.h
  18. 3
    3
      Marlin/src/pins/ramps/pins_3DRAG.h
  19. 3
    3
      Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h
  20. 3
    3
      Marlin/src/pins/ramps/pins_DAGOMA_F5.h
  21. 3
    3
      Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h
  22. 6
    6
      Marlin/src/pins/sanguino/pins_ANET_10.h
  23. 3
    3
      Marlin/src/pins/sanguino/pins_MELZI.h
  24. 3
    3
      Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
  25. 3
    3
      Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h
  26. 3
    3
      Marlin/src/pins/sanguino/pins_MELZI_V2.h
  27. 3
    3
      Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
  28. 3
    3
      Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
  29. 3
    3
      Marlin/src/pins/stm32f1/pins_FLY_MINI.h
  30. 3
    3
      Marlin/src/pins/stm32f1/pins_GTM32_MINI.h
  31. 3
    3
      Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h
  32. 3
    3
      Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h
  33. 3
    3
      Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h
  34. 3
    3
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
  35. 3
    3
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
  36. 3
    3
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
  37. 3
    3
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h
  38. 3
    3
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
  39. 3
    3
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
  40. 3
    3
      Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
  41. 3
    3
      Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
  42. 3
    3
      Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
  43. 3
    3
      Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
  44. 3
    8
      Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
  45. 3
    8
      Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
  46. 3
    8
      Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
  47. 3
    8
      Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
  48. 3
    8
      Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
  49. 3
    3
      Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
  50. 3
    8
      Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
  51. 3
    3
      Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
  52. 3
    3
      Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
  53. 3
    3
      Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
  54. 3
    3
      Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
  55. 3
    3
      Marlin/src/pins/stm32f4/pins_RUMBA32_common.h
  56. 3
    6
      Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h
  57. 3
    3
      Marlin/src/pins/stm32f4/pins_VAKE403D.h
  58. 3
    3
      Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h
  59. 3
    3
      Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h

+ 6
- 6
Marlin/src/HAL/AVR/HAL.h 查看文件

43 
 // Default graphical display delays
 43 
 // Default graphical display delays
44 
 //
 44 
 //
45 
 #if F_CPU >= 20000000
 45 
 #if F_CPU >= 20000000
46 
-  #define CPU_ST7920_DELAY_1 DELAY_NS(150)
47 
-  #define CPU_ST7920_DELAY_2 DELAY_NS(  0)
48 
-  #define CPU_ST7920_DELAY_3 DELAY_NS(150)
46 
+  #define CPU_ST7920_DELAY_1 150
47 
+  #define CPU_ST7920_DELAY_2   0
48 
+  #define CPU_ST7920_DELAY_3 150
49 
 #elif F_CPU == 16000000
 49 
 #elif F_CPU == 16000000
50 
-  #define CPU_ST7920_DELAY_1 DELAY_NS(125)
51 
-  #define CPU_ST7920_DELAY_2 DELAY_NS(  0)
52 
-  #define CPU_ST7920_DELAY_3 DELAY_NS(188)
50 
+  #define CPU_ST7920_DELAY_1 125
51 
+  #define CPU_ST7920_DELAY_2   0
52 
+  #define CPU_ST7920_DELAY_3 188
53 
 #endif
 53 
 #endif
54
54
55 
 #ifndef pgm_read_ptr
 55 
 #ifndef pgm_read_ptr

+ 3
- 3
Marlin/src/HAL/LINUX/HAL.h 查看文件

63 
 extern MSerialT usb_serial;
 63 
 extern MSerialT usb_serial;
64 
 #define MYSERIAL1 usb_serial
 64 
 #define MYSERIAL1 usb_serial
65
65
66 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
67 
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
68 
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
66 
+#define CPU_ST7920_DELAY_1 600
67 
+#define CPU_ST7920_DELAY_2 750
68 
+#define CPU_ST7920_DELAY_3 750
69
69
70 
 //
 70 
 //
71 
 // Interrupts
 71 
 // Interrupts

+ 3
- 3
Marlin/src/HAL/LPC1768/HAL.h 查看文件

50 
 //
 50 
 //
51 
 // Default graphical display delays
 51 
 // Default graphical display delays
52 
 //
 52 
 //
53 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
54 
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
55 
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
53 
+#define CPU_ST7920_DELAY_1 600
54 
+#define CPU_ST7920_DELAY_2 750
55 
+#define CPU_ST7920_DELAY_3 750
56
56
57 
 typedef ForwardSerial1Class< decltype(UsbSerial) > DefaultSerial1;
 57 
 typedef ForwardSerial1Class< decltype(UsbSerial) > DefaultSerial1;
58 
 extern DefaultSerial1 USBSerial;
 58 
 extern DefaultSerial1 USBSerial;

+ 3
- 3
Marlin/src/HAL/NATIVE_SIM/HAL.h 查看文件

99 
 #endif
 99 
 #endif
100
100
101
101
102 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
103 
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
104 
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
102 
+#define CPU_ST7920_DELAY_1 600
103 
+#define CPU_ST7920_DELAY_2 750
104 
+#define CPU_ST7920_DELAY_3 750
105
105
106 
 //
 106 
 //
107 
 // Interrupts
 107 
 // Interrupts

+ 3
- 3
Marlin/src/HAL/STM32/HAL.h 查看文件

40 
 //
 40 
 //
41 
 // Default graphical display delays
 41 
 // Default graphical display delays
42 
 //
 42 
 //
43 
-#define CPU_ST7920_DELAY_1 DELAY_NS(300)
44 
-#define CPU_ST7920_DELAY_2 DELAY_NS( 40)
45 
-#define CPU_ST7920_DELAY_3 DELAY_NS(340)
43 
+#define CPU_ST7920_DELAY_1 300
44 
+#define CPU_ST7920_DELAY_2  40
45 
+#define CPU_ST7920_DELAY_3 340
46
46
47 
 //
 47 
 //
48 
 // Serial Ports
 48 
 // Serial Ports

+ 3
- 3
Marlin/src/HAL/STM32F1/HAL.h 查看文件

54 
 //
 54 
 //
55 
 // Default graphical display delays
 55 
 // Default graphical display delays
56 
 //
 56 
 //
57 
-#define CPU_ST7920_DELAY_1 DELAY_NS(300)
58 
-#define CPU_ST7920_DELAY_2 DELAY_NS( 40)
59 
-#define CPU_ST7920_DELAY_3 DELAY_NS(340)
57 
+#define CPU_ST7920_DELAY_1 300
58 
+#define CPU_ST7920_DELAY_2  40
59 
+#define CPU_ST7920_DELAY_3 340
60
60
61 
 #ifndef STM32_FLASH_SIZE
 61 
 #ifndef STM32_FLASH_SIZE
62 
   #if ANY(MCU_STM32F103RE, MCU_STM32F103VE, MCU_STM32F103ZE)
 62 
   #if ANY(MCU_STM32F103RE, MCU_STM32F103VE, MCU_STM32F103ZE)

+ 3
- 3
Marlin/src/HAL/TEENSY31_32/HAL.h 查看文件

36
36
37 
 #include <stdint.h>
 37 
 #include <stdint.h>
38
38
39 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
40 
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
41 
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
39 
+#define CPU_ST7920_DELAY_1 600
40 
+#define CPU_ST7920_DELAY_2 750
41 
+#define CPU_ST7920_DELAY_3 750
42
42
43 
 //#undef MOTHERBOARD
 43 
 //#undef MOTHERBOARD
44 
 //#define MOTHERBOARD BOARD_TEENSY31_32
 44 
 //#define MOTHERBOARD BOARD_TEENSY31_32

+ 3
- 3
Marlin/src/HAL/TEENSY35_36/HAL.h 查看文件

37 
 #include <stdint.h>
 37 
 #include <stdint.h>
38 
 #include <util/atomic.h>
 38 
 #include <util/atomic.h>
39
39
40 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
41 
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
42 
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
40 
+#define CPU_ST7920_DELAY_1 600
41 
+#define CPU_ST7920_DELAY_2 750
42 
+#define CPU_ST7920_DELAY_3 750
43
43
44 
 // ------------------------
 44 
 // ------------------------
45 
 // Defines
 45 
 // Defines

+ 3
- 3
Marlin/src/HAL/TEENSY40_41/HAL.h 查看文件

41 
   #include "../../feature/ethernet.h"
 41 
   #include "../../feature/ethernet.h"
42 
 #endif
 42 
 #endif
43
43
44 
-#define CPU_ST7920_DELAY_1 DELAY_NS(600)
45 
-#define CPU_ST7920_DELAY_2 DELAY_NS(750)
46 
-#define CPU_ST7920_DELAY_3 DELAY_NS(750)
44 
+#define CPU_ST7920_DELAY_1 600
45 
+#define CPU_ST7920_DELAY_2 750
46 
+#define CPU_ST7920_DELAY_3 750
47
47
48 
 // ------------------------
 48 
 // ------------------------
49 
 // Defines
 49 
 // Defines

+ 6
- 6
Marlin/src/inc/Conditionals_LCD.h 查看文件

237 
 #elif ENABLED(CR10_STOCKDISPLAY)
 237 
 #elif ENABLED(CR10_STOCKDISPLAY)
238
238
239 
   #define IS_RRD_FG_SC 1
 239 
   #define IS_RRD_FG_SC 1
240 
-  #define LCD_ST7920_DELAY_1 DELAY_NS(125)
241 
-  #define LCD_ST7920_DELAY_2 DELAY_NS(125)
242 
-  #define LCD_ST7920_DELAY_3 DELAY_NS(125)
240 
+  #define LCD_ST7920_DELAY_1           125
241 
+  #define LCD_ST7920_DELAY_2           125
242 
+  #define LCD_ST7920_DELAY_3           125
243
243
244 
 #elif ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
 244 
 #elif ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
245
245
246 
   #define IS_RRD_FG_SC 1
 246 
   #define IS_RRD_FG_SC 1
247 
-  #define LCD_ST7920_DELAY_1 DELAY_NS(150)
248 
-  #define LCD_ST7920_DELAY_2 DELAY_NS(150)
249 
-  #define LCD_ST7920_DELAY_3 DELAY_NS(150)
247 
+  #define LCD_ST7920_DELAY_1           150
248 
+  #define LCD_ST7920_DELAY_2           150
249 
+  #define LCD_ST7920_DELAY_3           150
250
250
251 
 #elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, BQ_LCD_SMART_CONTROLLER, K3D_FULL_GRAPHIC_SMART_CONTROLLER)
 251 
 #elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, BQ_LCD_SMART_CONTROLLER, K3D_FULL_GRAPHIC_SMART_CONTROLLER)
252
252

+ 50
- 0
Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp 查看文件

36 
 // Optimize this code with -O3
 36 
 // Optimize this code with -O3
37 
 #pragma GCC optimize (3)
 37 
 #pragma GCC optimize (3)
38
38
39 
+#ifndef ST7920_DELAY_1
40 
+  #ifndef LCD_ST7920_DELAY_1
41 
+    #define LCD_ST7920_DELAY_1 0
42 
+  #endif
43 
+  #ifndef BOARD_ST7920_DELAY_1
44 
+    #define BOARD_ST7920_DELAY_1 0
45 
+  #endif
46 
+  #ifndef CPU_ST7920_DELAY_1
47 
+    #define CPU_ST7920_DELAY_1 0
48 
+  #endif
49 
+  #if LCD_ST7920_DELAY_1 || BOARD_ST7920_DELAY_1 || CPU_ST7920_DELAY_1
50 
+    #define ST7920_DELAY_1 DELAY_NS(_MAX(LCD_ST7920_DELAY_1, BOARD_ST7920_DELAY_1, CPU_ST7920_DELAY_1))
51 
+  #else
52 
+    #define ST7920_DELAY_1
53 
+  #endif
54 
+#endif
55 
+#ifndef ST7920_DELAY_2
56 
+  #ifndef LCD_ST7920_DELAY_2
57 
+    #define LCD_ST7920_DELAY_2 0
58 
+  #endif
59 
+  #ifndef BOARD_ST7920_DELAY_2
60 
+    #define BOARD_ST7920_DELAY_2 0
61 
+  #endif
62 
+  #ifndef CPU_ST7920_DELAY_2
63 
+    #define CPU_ST7920_DELAY_2 0
64 
+  #endif
65 
+  #if LCD_ST7920_DELAY_2 || BOARD_ST7920_DELAY_2 || CPU_ST7920_DELAY_2
66 
+    #define ST7920_DELAY_2 DELAY_NS(_MAX(LCD_ST7920_DELAY_2, BOARD_ST7920_DELAY_2, CPU_ST7920_DELAY_2))
67 
+  #else
68 
+    #define ST7920_DELAY_2
69 
+  #endif
70 
+#endif
71 
+#ifndef ST7920_DELAY_3
72 
+  #ifndef LCD_ST7920_DELAY_3
73 
+    #define LCD_ST7920_DELAY_3 0
74 
+  #endif
75 
+  #ifndef BOARD_ST7920_DELAY_3
76 
+    #define BOARD_ST7920_DELAY_3 0
77 
+  #endif
78 
+  #ifndef CPU_ST7920_DELAY_3
79 
+    #define CPU_ST7920_DELAY_3 0
80 
+  #endif
81 
+  #if LCD_ST7920_DELAY_3 || BOARD_ST7920_DELAY_3 || CPU_ST7920_DELAY_3
82 
+    #define ST7920_DELAY_3 DELAY_NS(_MAX(LCD_ST7920_DELAY_3, BOARD_ST7920_DELAY_3, CPU_ST7920_DELAY_3))
83 
+  #else
84 
+    #define ST7920_DELAY_3
85 
+  #endif
86 
+#endif
87 
+
39 
 #ifdef ARDUINO_ARCH_STM32F1
 88 
 #ifdef ARDUINO_ARCH_STM32F1
40 
   #define ST7920_DAT(V) !!((V) & 0x80)
 89 
   #define ST7920_DAT(V) !!((V) & 0x80)
41 
 #else
 90 
 #else
42 
   #define ST7920_DAT(V) ((V) & 0x80)
 91 
   #define ST7920_DAT(V) ((V) & 0x80)
43 
 #endif
 92 
 #endif
93 
+
44 
 #define ST7920_SND_BIT do{ \
 94 
 #define ST7920_SND_BIT do{ \
45 
   WRITE(ST7920_CLK_PIN, LOW);             ST7920_DELAY_1; \
 95 
   WRITE(ST7920_CLK_PIN, LOW);             ST7920_DELAY_1; \
46 
   WRITE(ST7920_DAT_PIN, ST7920_DAT(val)); ST7920_DELAY_2; \
 96 
   WRITE(ST7920_DAT_PIN, ST7920_DAT(val)); ST7920_DELAY_2; \

+ 3
- 3
Marlin/src/pins/mega/pins_SILVER_GATE.h 查看文件

86 
       #define KILL_PIN                        21
 86 
       #define KILL_PIN                        21
87 
       #define HOME_PIN                        28
 87 
       #define HOME_PIN                        28
88 
     #endif
 88 
     #endif
89 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(  0)
90 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS(250)
91 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(  0)
89 
+    #define BOARD_ST7920_DELAY_1               0
90 
+    #define BOARD_ST7920_DELAY_2             250
91 
+    #define BOARD_ST7920_DELAY_3               0
92 
   #endif
 92 
   #endif
93 
 #endif
 93 
 #endif
94
94

+ 1
- 29
Marlin/src/pins/pins_postprocess.h 查看文件

1221 
 //
 1221 
 //
1222 
 // Default DOGLCD SPI delays
 1222 
 // Default DOGLCD SPI delays
1223 
 //
 1223 
 //
1224 
-#if ENABLED(U8GLIB_ST7920)
1225 
-  #ifndef ST7920_DELAY_1
1226 
-    #ifdef LCD_ST7920_DELAY_1
1227 
-      #define ST7920_DELAY_1 LCD_ST7920_DELAY_1
1228 
-    #elif defined(BOARD_ST7920_DELAY_1)
1229 
-      #define ST7920_DELAY_1 BOARD_ST7920_DELAY_1
1230 
-    #elif defined(CPU_ST7920_DELAY_1)
1231 
-      #define ST7920_DELAY_1 CPU_ST7920_DELAY_1
1232 
-    #endif
1233 
-  #endif
1234 
-  #ifndef ST7920_DELAY_2
1235 
-    #ifdef LCD_ST7920_DELAY_2
1236 
-      #define ST7920_DELAY_2 LCD_ST7920_DELAY_2
1237 
-    #elif defined(BOARD_ST7920_DELAY_2)
1238 
-      #define ST7920_DELAY_2 BOARD_ST7920_DELAY_2
1239 
-    #elif defined(CPU_ST7920_DELAY_2)
1240 
-      #define ST7920_DELAY_2 CPU_ST7920_DELAY_2
1241 
-    #endif
1242 
-  #endif
1243 
-  #ifndef ST7920_DELAY_3
1244 
-    #ifdef LCD_ST7920_DELAY_3
1245 
-      #define ST7920_DELAY_3 LCD_ST7920_DELAY_3
1246 
-    #elif defined(BOARD_ST7920_DELAY_3)
1247 
-      #define ST7920_DELAY_3 BOARD_ST7920_DELAY_3
1248 
-    #elif defined(CPU_ST7920_DELAY_3)
1249 
-      #define ST7920_DELAY_3 CPU_ST7920_DELAY_3
1250 
-    #endif
1251 
-  #endif
1252 
-#else
1224 
+#if DISABLED(U8GLIB_ST7920)
1253 
   #undef ST7920_DELAY_1
 1225 
   #undef ST7920_DELAY_1
1254 
   #undef ST7920_DELAY_2
 1226 
   #undef ST7920_DELAY_2
1255 
   #undef ST7920_DELAY_3
 1227 
   #undef ST7920_DELAY_3

+ 3
- 3
Marlin/src/pins/rambo/pins_EINSY_RAMBO.h 查看文件

206 
 #endif // HAS_WIRED_LCD
 206 
 #endif // HAS_WIRED_LCD
207
207
208 
 #if ENABLED(U8GLIB_ST7920)
 208 
 #if ENABLED(U8GLIB_ST7920)
209 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
210 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
211 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
209 
+  #define BOARD_ST7920_DELAY_1                 0
210 
+  #define BOARD_ST7920_DELAY_2               250
211 
+  #define BOARD_ST7920_DELAY_3                 0
212 
 #endif
 212 
 #endif
213
213
214 
 #undef MK3_FAN_PINS
 214 
 #undef MK3_FAN_PINS

+ 3
- 3
Marlin/src/pins/rambo/pins_EINSY_RETRO.h 查看文件

202
202
203 
 // Alter timing for graphical display
 203 
 // Alter timing for graphical display
204 
 #if ENABLED(U8GLIB_ST7920)
 204 
 #if ENABLED(U8GLIB_ST7920)
205 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
206 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
207 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
205 
+  #define BOARD_ST7920_DELAY_1                 0
206 
+  #define BOARD_ST7920_DELAY_2               250
207 
+  #define BOARD_ST7920_DELAY_3                 0
208 
 #endif
 208 
 #endif

+ 3
- 3
Marlin/src/pins/rambo/pins_MINIRAMBO.h 查看文件

194 
 #endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
 194 
 #endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
195
195
196 
 #if ENABLED(U8GLIB_ST7920)
 196 
 #if ENABLED(U8GLIB_ST7920)
197 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
198 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
199 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
197 
+  #define BOARD_ST7920_DELAY_1                 0
198 
+  #define BOARD_ST7920_DELAY_2               250
199 
+  #define BOARD_ST7920_DELAY_3                 0
200 
 #endif
 200 
 #endif

+ 3
- 3
Marlin/src/pins/rambo/pins_RAMBO.h 查看文件

271
271
272 
 // Alter timing for graphical display
 272 
 // Alter timing for graphical display
273 
 #if ENABLED(U8GLIB_ST7920)
 273 
 #if ENABLED(U8GLIB_ST7920)
274 
-  #define BOARD_ST7920_DELAY_1       DELAY_NS(0)
275 
-  #define BOARD_ST7920_DELAY_2       DELAY_NS(0)
276 
-  #define BOARD_ST7920_DELAY_3       DELAY_NS(0)
274 
+  #define BOARD_ST7920_DELAY_1                 0
275 
+  #define BOARD_ST7920_DELAY_2                 0
276 
+  #define BOARD_ST7920_DELAY_3                 0
277 
 #endif
 277 
 #endif

+ 3
- 3
Marlin/src/pins/ramps/pins_3DRAG.h 查看文件

109 
 #endif // IS_ULTRA_LCD && IS_NEWPANEL
 109 
 #endif // IS_ULTRA_LCD && IS_NEWPANEL
110
110
111 
 #if ENABLED(U8GLIB_ST7920)
 111 
 #if ENABLED(U8GLIB_ST7920)
112 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
113 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(188)
114 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
112 
+  #define BOARD_ST7920_DELAY_1                 0
113 
+  #define BOARD_ST7920_DELAY_2               188
114 
+  #define BOARD_ST7920_DELAY_3                 0
115 
 #endif
 115 
 #endif
116
116
117 
 /**
 117 
 /**

+ 3
- 3
Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h 查看文件

126
126
127 
 // Alter timing for graphical display
 127 
 // Alter timing for graphical display
128 
 #if ENABLED(U8GLIB_ST7920)
 128 
 #if ENABLED(U8GLIB_ST7920)
129 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
130 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(  0)
131 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(189)
129 
+  #define BOARD_ST7920_DELAY_1                 0
130 
+  #define BOARD_ST7920_DELAY_2                 0
131 
+  #define BOARD_ST7920_DELAY_3               189
132 
 #endif
 132 
 #endif

+ 3
- 3
Marlin/src/pins/ramps/pins_DAGOMA_F5.h 查看文件

41
41
42 
 // Alter timing for graphical display
 42 
 // Alter timing for graphical display
43 
 #if ENABLED(U8GLIB_ST7920)
 43 
 #if ENABLED(U8GLIB_ST7920)
44 
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(0)
45 
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
46 
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(250)
44 
+  #define BOARD_ST7920_DELAY_1                 0
45 
+  #define BOARD_ST7920_DELAY_2               250
46 
+  #define BOARD_ST7920_DELAY_3               250
47 
 #endif
 47 
 #endif
48
48
49 
 //
 49 
 //

+ 3
- 3
Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h 查看文件

200
200
201 
 // Alter timing for graphical display
 201 
 // Alter timing for graphical display
202 
 #if ENABLED(U8GLIB_ST7920)
 202 
 #if ENABLED(U8GLIB_ST7920)
203 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(200)
204 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(200)
205 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(200)
203 
+  #define BOARD_ST7920_DELAY_1               200
204 
+  #define BOARD_ST7920_DELAY_2               200
205 
+  #define BOARD_ST7920_DELAY_3               200
206 
 #endif
 206 
 #endif

+ 6
- 6
Marlin/src/pins/sanguino/pins_ANET_10.h 查看文件

195 
       #define BTN_EN1                         28
 195 
       #define BTN_EN1                         28
196 
       #define BTN_EN2                         10
 196 
       #define BTN_EN2                         10
197 
       #define BTN_ENC                         17
 197 
       #define BTN_ENC                         17
198 
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(250)
199 
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(250)
200 
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(250)
198 
+      #define BOARD_ST7920_DELAY_1           250
199 
+      #define BOARD_ST7920_DELAY_2           250
200 
+      #define BOARD_ST7920_DELAY_3           250
201 
     #else
 201 
     #else
202 
       #define SERVO0_PIN                      29  // free for BLTouch/3D-Touch
 202 
       #define SERVO0_PIN                      29  // free for BLTouch/3D-Touch
203 
       #define BEEPER_PIN                      17
 203 
       #define BEEPER_PIN                      17
207 
       #define BTN_EN1                         11
 207 
       #define BTN_EN1                         11
208 
       #define BTN_EN2                         10
 208 
       #define BTN_EN2                         10
209 
       #define BTN_ENC                         16
 209 
       #define BTN_ENC                         16
210 
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
211 
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(63)
212 
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
210 
+      #define BOARD_ST7920_DELAY_1           125
211 
+      #define BOARD_ST7920_DELAY_2            63
212 
+      #define BOARD_ST7920_DELAY_3           125
213 
     #endif
 213 
     #endif
214
214
215 
   #endif
 215 
   #endif

+ 3
- 3
Marlin/src/pins/sanguino/pins_MELZI.h 查看文件

34 
 // Alter timing for graphical display
 34 
 // Alter timing for graphical display
35 
 #if ENABLED(U8GLIB_ST7920)
 35 
 #if ENABLED(U8GLIB_ST7920)
36 
   #ifndef BOARD_ST7920_DELAY_1
 36 
   #ifndef BOARD_ST7920_DELAY_1
37 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(  0)
37 
+    #define BOARD_ST7920_DELAY_1               0
38 
   #endif
 38 
   #endif
39 
   #ifndef BOARD_ST7920_DELAY_2
 39 
   #ifndef BOARD_ST7920_DELAY_2
40 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS(188)
40 
+    #define BOARD_ST7920_DELAY_2             188
41 
   #endif
 41 
   #endif
42 
   #ifndef BOARD_ST7920_DELAY_3
 42 
   #ifndef BOARD_ST7920_DELAY_3
43 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(  0)
43 
+    #define BOARD_ST7920_DELAY_3               0
44 
   #endif
 44 
   #endif
45 
 #endif
 45 
 #endif
46
46

+ 3
- 3
Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h 查看文件

37
37
38 
 // Alter timing for graphical display
 38 
 // Alter timing for graphical display
39 
 #if ENABLED(U8GLIB_ST7920)
 39 
 #if ENABLED(U8GLIB_ST7920)
40 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
41 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
42 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
40 
+  #define BOARD_ST7920_DELAY_1               125
41 
+  #define BOARD_ST7920_DELAY_2               125
42 
+  #define BOARD_ST7920_DELAY_3               125
43 
 #endif
 43 
 #endif
44
44
45 
 #include "pins_MELZI.h"
 45 
 #include "pins_MELZI.h"

+ 3
- 3
Marlin/src/pins/sanguino/pins_MELZI_TRONXY.h 查看文件

29
29
30 
 // Alter timing for graphical display
 30 
 // Alter timing for graphical display
31 
 #if ENABLED(U8GLIB_ST7920)
 31 
 #if ENABLED(U8GLIB_ST7920)
32 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
33 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
34 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
32 
+  #define BOARD_ST7920_DELAY_1                 0
33 
+  #define BOARD_ST7920_DELAY_2               125
34 
+  #define BOARD_ST7920_DELAY_3                 0
35 
 #endif
 35 
 #endif
36
36
37 
 #include "pins_MELZI.h"
 37 
 #include "pins_MELZI.h"

+ 3
- 3
Marlin/src/pins/sanguino/pins_MELZI_V2.h 查看文件

26
26
27 
 // Alter timing for graphical display
 27 
 // Alter timing for graphical display
28 
 #if ENABLED(U8GLIB_ST7920)
 28 
 #if ENABLED(U8GLIB_ST7920)
29 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(  0)
30 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(400)
31 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(  0)
29 
+  #define BOARD_ST7920_DELAY_1                 0
30 
+  #define BOARD_ST7920_DELAY_2               400
31 
+  #define BOARD_ST7920_DELAY_3                 0
32 
 #endif
 32 
 #endif
33
33
34 
 #include "pins_MELZI.h"
 34 
 #include "pins_MELZI.h"

+ 3
- 3
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h 查看文件

203
203
204 
     // Alter timing for graphical display
 204 
     // Alter timing for graphical display
205 
     #if ENABLED(U8GLIB_ST7920)
 205 
     #if ENABLED(U8GLIB_ST7920)
206 
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
207 
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
208 
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
206 
+      #define BOARD_ST7920_DELAY_1           125
207 
+      #define BOARD_ST7920_DELAY_2           125
208 
+      #define BOARD_ST7920_DELAY_3           125
209 
     #endif
 209 
     #endif
210
210
211 
   #endif
 211 
   #endif

+ 3
- 3
Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h 查看文件

156
156
157 
 // Alter timing for graphical display
 157 
 // Alter timing for graphical display
158 
 #if ENABLED(U8GLIB_ST7920)
 158 
 #if ENABLED(U8GLIB_ST7920)
159 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
160 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
161 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
159 
+  #define BOARD_ST7920_DELAY_1               125
160 
+  #define BOARD_ST7920_DELAY_2               125
161 
+  #define BOARD_ST7920_DELAY_3               125
162 
 #endif
 162 
 #endif
163
163
164 
 //
 164 
 //

+ 3
- 3
Marlin/src/pins/stm32f1/pins_FLY_MINI.h 查看文件

180
180
181 
   // Alter timing for graphical display
 181 
   // Alter timing for graphical display
182 
   #if ENABLED(U8GLIB_ST7920)
 182 
   #if ENABLED(U8GLIB_ST7920)
183 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
184 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
185 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
183 
+    #define BOARD_ST7920_DELAY_1              96
184 
+    #define BOARD_ST7920_DELAY_2              48
185 
+    #define BOARD_ST7920_DELAY_3             715
186 
   #endif
 186 
   #endif
187
187
188 
 #endif // HAS_WIRED_LCD
 188 
 #endif // HAS_WIRED_LCD

+ 3
- 3
Marlin/src/pins/stm32f1/pins_GTM32_MINI.h 查看文件

159
159
160 
   // Alter timing for graphical display
 160 
   // Alter timing for graphical display
161 
   #if ENABLED(U8GLIB_ST7920)
 161 
   #if ENABLED(U8GLIB_ST7920)
162 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
163 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
164 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
162 
+    #define BOARD_ST7920_DELAY_1              96
163 
+    #define BOARD_ST7920_DELAY_2              48
164 
+    #define BOARD_ST7920_DELAY_3             715
165 
   #endif
 165 
   #endif
166
166
167 
 #endif // HAS_WIRED_LCD
 167 
 #endif // HAS_WIRED_LCD

+ 3
- 3
Marlin/src/pins/stm32f1/pins_GTM32_MINI_A30.h 查看文件

167
167
168 
   // Alter timing for graphical display
 168 
   // Alter timing for graphical display
169 
   #if ENABLED(U8GLIB_ST7920)
 169 
   #if ENABLED(U8GLIB_ST7920)
170 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
171 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
172 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
170 
+    #define BOARD_ST7920_DELAY_1              96
171 
+    #define BOARD_ST7920_DELAY_2              48
172 
+    #define BOARD_ST7920_DELAY_3             715
173 
   #endif
 173 
   #endif
174
174
175 
 #endif // HAS_WIRED_LCD
 175 
 #endif // HAS_WIRED_LCD

+ 3
- 3
Marlin/src/pins/stm32f1/pins_GTM32_PRO_VB.h 查看文件

164
164
165 
   // Alter timing for graphical display
 165 
   // Alter timing for graphical display
166 
   #if ENABLED(U8GLIB_ST7920)
 166 
   #if ENABLED(U8GLIB_ST7920)
167 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
168 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
169 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
167 
+    #define BOARD_ST7920_DELAY_1              96
168 
+    #define BOARD_ST7920_DELAY_2              48
169 
+    #define BOARD_ST7920_DELAY_3             715
170 
   #endif
 170 
   #endif
171
171
172 
 #endif // HAS_WIRED_LCD
 172 
 #endif // HAS_WIRED_LCD

+ 3
- 3
Marlin/src/pins/stm32f1/pins_GTM32_REV_B.h 查看文件

169
169
170 
   // Alter timing for graphical display
 170 
   // Alter timing for graphical display
171 
   #if ENABLED(U8GLIB_ST7920)
 171 
   #if ENABLED(U8GLIB_ST7920)
172 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
173 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
174 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(715)
172 
+    #define BOARD_ST7920_DELAY_1              96
173 
+    #define BOARD_ST7920_DELAY_2              48
174 
+    #define BOARD_ST7920_DELAY_3             715
175 
   #endif
 175 
   #endif
176
176
177 
 #endif // HAS_WIRED_LCD
 177 
 #endif // HAS_WIRED_LCD

+ 3
- 3
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h 查看文件

342
342
343 
     #endif
 343 
     #endif
344
344
345 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
346 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS(125)
347 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(125)
345 
+    #define BOARD_ST7920_DELAY_1             125
346 
+    #define BOARD_ST7920_DELAY_2             125
347 
+    #define BOARD_ST7920_DELAY_3             125
348
348
349 
   #endif // !MKS_MINI_12864
 349 
   #endif // !MKS_MINI_12864
350
350

+ 3
- 3
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h 查看文件

223 
 // Alter timing for graphical display
 223 
 // Alter timing for graphical display
224 
 #if ENABLED(U8GLIB_ST7920)
 224 
 #if ENABLED(U8GLIB_ST7920)
225 
   #ifndef BOARD_ST7920_DELAY_1
 225 
   #ifndef BOARD_ST7920_DELAY_1
226 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
226 
+    #define BOARD_ST7920_DELAY_1             125
227 
   #endif
 227 
   #endif
228 
   #ifndef BOARD_ST7920_DELAY_2
 228 
   #ifndef BOARD_ST7920_DELAY_2
229 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS(125)
229 
+    #define BOARD_ST7920_DELAY_2             125
230 
   #endif
 230 
   #endif
231 
   #ifndef BOARD_ST7920_DELAY_3
 231 
   #ifndef BOARD_ST7920_DELAY_3
232 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(125)
232 
+    #define BOARD_ST7920_DELAY_3             125
233 
   #endif
 233 
   #endif
234 
 #endif
 234 
 #endif
235
235

+ 3
- 3
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h 查看文件

114
114
115 
   // Alter timing for graphical display
 115 
   // Alter timing for graphical display
116 
   #if ENABLED(U8GLIB_ST7920)
 116 
   #if ENABLED(U8GLIB_ST7920)
117 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
118 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS(125)
119 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(125)
117 
+    #define BOARD_ST7920_DELAY_1             125
118 
+    #define BOARD_ST7920_DELAY_2             125
119 
+    #define BOARD_ST7920_DELAY_3             125
120 
   #endif
 120 
   #endif
121
121
122 
 #endif // HAS_WIRED_LCD
 122 
 #endif // HAS_WIRED_LCD

+ 3
- 3
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE3.h 查看文件

138
138
139 
   #endif // !MKS_MINI_12864
 139 
   #endif // !MKS_MINI_12864
140
140
141 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
142 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
143 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
141 
+  #define BOARD_ST7920_DELAY_1               125
142 
+  #define BOARD_ST7920_DELAY_2               125
143 
+  #define BOARD_ST7920_DELAY_3               125
144
144
145 
 #endif // HAS_WIRED_LCD
 145 
 #endif // HAS_WIRED_LCD
146
146

+ 3
- 3
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h 查看文件

366 
     #endif
 366 
     #endif
367
367
368 
     #if ENABLED(U8GLIB_ST7920)
 368 
     #if ENABLED(U8GLIB_ST7920)
369 
-      #define BOARD_ST7920_DELAY_1 DELAY_NS(125)
370 
-      #define BOARD_ST7920_DELAY_2 DELAY_NS(125)
371 
-      #define BOARD_ST7920_DELAY_3 DELAY_NS(125)
369 
+      #define BOARD_ST7920_DELAY_1           125
370 
+      #define BOARD_ST7920_DELAY_2           125
371 
+      #define BOARD_ST7920_DELAY_3           125
372 
     #endif
 372 
     #endif
373
373
374 
   #endif // !MKS_MINI_12864
 374 
   #endif // !MKS_MINI_12864

+ 3
- 3
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h 查看文件

301
301
302 
 // Alter timing for graphical display
 302 
 // Alter timing for graphical display
303 
 #if ENABLED(U8GLIB_ST7920)
 303 
 #if ENABLED(U8GLIB_ST7920)
304 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
305 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(125)
306 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
304 
+  #define BOARD_ST7920_DELAY_1               125
305 
+  #define BOARD_ST7920_DELAY_2               125
306 
+  #define BOARD_ST7920_DELAY_3               125
307 
 #endif
 307 
 #endif
308
308
309 
 #define HAS_SPI_FLASH                          1
 309 
 #define HAS_SPI_FLASH                          1

+ 3
- 3
Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h 查看文件

201 
   #define BTN_EN1                    EXP1_03_PIN
 201 
   #define BTN_EN1                    EXP1_03_PIN
202 
   #define BTN_EN2                    EXP1_06_PIN
 202 
   #define BTN_EN2                    EXP1_06_PIN
203 
   #define BTN_ENC                    EXP1_04_PIN
 203 
   #define BTN_ENC                    EXP1_04_PIN
204 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
205 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(200)
206 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
204 
+  #define BOARD_ST7920_DELAY_1               125
205 
+  #define BOARD_ST7920_DELAY_2               200
206 
+  #define BOARD_ST7920_DELAY_3               125
207
207
208 
 #elif EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
 208 
 #elif EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
209
209

+ 3
- 3
Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h 查看文件

333
333
334 
 // Alter timing for graphical display
 334 
 // Alter timing for graphical display
335 
 #if ENABLED(U8GLIB_ST7920)
 335 
 #if ENABLED(U8GLIB_ST7920)
336 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(125)
337 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)
338 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(125)
336 
+  #define BOARD_ST7920_DELAY_1               125
337 
+  #define BOARD_ST7920_DELAY_2               250
338 
+  #define BOARD_ST7920_DELAY_3               125
339 
 #endif
 339 
 #endif
340
340
341 
 // Remap SERVO0 PIN for BLTouch
 341 
 // Remap SERVO0 PIN for BLTouch

+ 3
- 3
Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h 查看文件

306
306
307 
 // Alter timing for graphical display
 307 
 // Alter timing for graphical display
308 
 #if ENABLED(U8GLIB_ST7920)
 308 
 #if ENABLED(U8GLIB_ST7920)
309 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(200)  // Tclk_fall <200ns
310 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS(250)  // Tdata_width >200ns
311 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(200)  // Tclk_rise <200ns
309 
+  #define BOARD_ST7920_DELAY_1               200  // Tclk_fall <200ns
310 
+  #define BOARD_ST7920_DELAY_2               250  // Tdata_width >200ns
311 
+  #define BOARD_ST7920_DELAY_3               200  // Tclk_rise <200ns
312 
 #endif
 312 
 #endif
313
313
314 
 // Remap SERVO0 PIN for BLTouch
 314 
 // Remap SERVO0 PIN for BLTouch

+ 3
- 3
Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h 查看文件

286
286
287 
   // Alter timing for graphical display
 287 
   // Alter timing for graphical display
288 
   #if ENABLED(U8GLIB_ST7920)
 288 
   #if ENABLED(U8GLIB_ST7920)
289 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
290 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
291 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
289 
+    #define BOARD_ST7920_DELAY_1              96
290 
+    #define BOARD_ST7920_DELAY_2              48
291 
+    #define BOARD_ST7920_DELAY_3             600
292 
   #endif
 292 
   #endif
293
293
294 
 #endif // HAS_WIRED_LCD
 294 
 #endif // HAS_WIRED_LCD

+ 3
- 8
Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h 查看文件

207 
     #define LCD_PINS_ENABLE                 PE11
 207 
     #define LCD_PINS_ENABLE                 PE11
208 
     #define LCD_PINS_D4                     PE10
 208 
     #define LCD_PINS_D4                     PE10
209
209
210 
-    // CR10_STOCKDISPLAY default timing is too fast
211 
-    #undef BOARD_ST7920_DELAY_1
212 
-    #undef BOARD_ST7920_DELAY_2
213 
-    #undef BOARD_ST7920_DELAY_3
214 
-
215 
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
 210 
   #elif ENABLED(ZONESTAR_LCD)                     // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
216
211
217 
     #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. Comment out this line to continue."
 212 
     #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. Comment out this line to continue."
283
278
284 
   // Alter timing for graphical display
 279 
   // Alter timing for graphical display
285 
   #if ENABLED(U8GLIB_ST7920)
 280 
   #if ENABLED(U8GLIB_ST7920)
286 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
287 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
288 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
281 
+    #define BOARD_ST7920_DELAY_1              96
282 
+    #define BOARD_ST7920_DELAY_2              48
283 
+    #define BOARD_ST7920_DELAY_3             600
289 
   #endif
 284 
   #endif
290
285
291 
 #endif // HAS_WIRED_LCD
 286 
 #endif // HAS_WIRED_LCD

+ 3
- 8
Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h 查看文件

425 
     #define LCD_PINS_ENABLE          EXP1_03_PIN
 425 
     #define LCD_PINS_ENABLE          EXP1_03_PIN
426 
     #define LCD_PINS_D4              EXP1_05_PIN
 426 
     #define LCD_PINS_D4              EXP1_05_PIN
427
427
428 
-    // CR10_STOCKDISPLAY default timing is too fast
429 
-    #undef BOARD_ST7920_DELAY_1
430 
-    #undef BOARD_ST7920_DELAY_2
431 
-    #undef BOARD_ST7920_DELAY_3
432 
-
433 
   #elif ENABLED(MKS_MINI_12864)
 428 
   #elif ENABLED(MKS_MINI_12864)
434 
     #define DOGLCD_A0                EXP1_04_PIN
 429 
     #define DOGLCD_A0                EXP1_04_PIN
435 
     #define DOGLCD_CS                EXP1_05_PIN
 430 
     #define DOGLCD_CS                EXP1_05_PIN
489
484
490 
   // Alter timing for graphical display
 485 
   // Alter timing for graphical display
491 
   #if ENABLED(U8GLIB_ST7920)
 486 
   #if ENABLED(U8GLIB_ST7920)
492 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
493 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
494 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
487 
+    #define BOARD_ST7920_DELAY_1              96
488 
+    #define BOARD_ST7920_DELAY_2              48
489 
+    #define BOARD_ST7920_DELAY_3             600
495 
   #endif
 490 
   #endif
496
491
497 
 #endif // HAS_WIRED_LCD
 492 
 #endif // HAS_WIRED_LCD

+ 3
- 8
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h 查看文件

433 
     #define LCD_PINS_ENABLE          EXP1_03_PIN
 433 
     #define LCD_PINS_ENABLE          EXP1_03_PIN
434 
     #define LCD_PINS_D4              EXP1_05_PIN
 434 
     #define LCD_PINS_D4              EXP1_05_PIN
435
435
436 
-    // CR10_STOCKDISPLAY default timing is too fast
437 
-    #undef BOARD_ST7920_DELAY_1
438 
-    #undef BOARD_ST7920_DELAY_2
439 
-    #undef BOARD_ST7920_DELAY_3
440 
-
441 
   #else
 436 
   #else
442
437
443 
     #define LCD_PINS_RS              EXP1_07_PIN
 438 
     #define LCD_PINS_RS              EXP1_07_PIN
484
479
485 
 // Alter timing for graphical display
 480 
 // Alter timing for graphical display
486 
 #if ENABLED(U8GLIB_ST7920)
 481 
 #if ENABLED(U8GLIB_ST7920)
487 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS(120)
488 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS( 80)
489 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(580)
482 
+  #define BOARD_ST7920_DELAY_1               120
483 
+  #define BOARD_ST7920_DELAY_2                80
484 
+  #define BOARD_ST7920_DELAY_3               580
490 
 #endif
 485 
 #endif
491
486
492 
 #if HAS_SPI_TFT
 487 
 #if HAS_SPI_TFT

+ 3
- 8
Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h 查看文件

446 
     #define LCD_PINS_ENABLE          EXP1_03_PIN
 446 
     #define LCD_PINS_ENABLE          EXP1_03_PIN
447 
     #define LCD_PINS_D4              EXP1_05_PIN
 447 
     #define LCD_PINS_D4              EXP1_05_PIN
448
448
449 
-    // CR10_STOCKDISPLAY default timing is too fast
450 
-    #undef BOARD_ST7920_DELAY_1
451 
-    #undef BOARD_ST7920_DELAY_2
452 
-    #undef BOARD_ST7920_DELAY_3
453 
-
454 
   #elif ENABLED(MKS_MINI_12864)
 449 
   #elif ENABLED(MKS_MINI_12864)
455
450
456 
     #define DOGLCD_A0                EXP1_04_PIN
 451 
     #define DOGLCD_A0                EXP1_04_PIN
506 
 // Alter timing for graphical display
 501 
 // Alter timing for graphical display
507 
 #if ENABLED(U8GLIB_ST7920)
 502 
 #if ENABLED(U8GLIB_ST7920)
508 
   #ifndef BOARD_ST7920_DELAY_1
 503 
   #ifndef BOARD_ST7920_DELAY_1
509 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(125)
504 
+    #define BOARD_ST7920_DELAY_1             125
510 
   #endif
 505 
   #endif
511 
   #ifndef BOARD_ST7920_DELAY_2
 506 
   #ifndef BOARD_ST7920_DELAY_2
512 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 90)
507 
+    #define BOARD_ST7920_DELAY_2              90
513 
   #endif
 508 
   #endif
514 
   #ifndef BOARD_ST7920_DELAY_3
 509 
   #ifndef BOARD_ST7920_DELAY_3
515 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
510 
+    #define BOARD_ST7920_DELAY_3             600
516 
   #endif
 511 
   #endif
517 
 #endif
 512 
 #endif
518
513

+ 3
- 8
Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h 查看文件

430 
     #define LCD_PINS_ENABLE          EXP1_03_PIN
 430 
     #define LCD_PINS_ENABLE          EXP1_03_PIN
431 
     #define LCD_PINS_D4              EXP1_05_PIN
 431 
     #define LCD_PINS_D4              EXP1_05_PIN
432
432
433 
-    // CR10_STOCKDISPLAY default timing is too fast
434 
-    #undef BOARD_ST7920_DELAY_1
435 
-    #undef BOARD_ST7920_DELAY_2
436 
-    #undef BOARD_ST7920_DELAY_3
437 
-
438 
   #elif ENABLED(MKS_MINI_12864)
 433 
   #elif ENABLED(MKS_MINI_12864)
439
434
440 
     #define DOGLCD_A0                EXP1_04_PIN
 435 
     #define DOGLCD_A0                EXP1_04_PIN
490 
 // Alter timing for graphical display
 485 
 // Alter timing for graphical display
491 
 #if ENABLED(U8GLIB_ST7920)
 486 
 #if ENABLED(U8GLIB_ST7920)
492 
   #ifndef BOARD_ST7920_DELAY_1
 487 
   #ifndef BOARD_ST7920_DELAY_1
493 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS(120)
488 
+    #define BOARD_ST7920_DELAY_1             120
494 
   #endif
 489 
   #endif
495 
   #ifndef BOARD_ST7920_DELAY_2
 490 
   #ifndef BOARD_ST7920_DELAY_2
496 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 80)
491 
+    #define BOARD_ST7920_DELAY_2              80
497 
   #endif
 492 
   #endif
498 
   #ifndef BOARD_ST7920_DELAY_3
 493 
   #ifndef BOARD_ST7920_DELAY_3
499 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(580)
494 
+    #define BOARD_ST7920_DELAY_3             580
500 
   #endif
 495 
   #endif
501 
 #endif
 496 
 #endif
502
497

+ 3
- 3
Marlin/src/pins/stm32f4/pins_FLYF407ZG.h 查看文件

306
306
307 
 // Alter timing for graphical display
 307 
 // Alter timing for graphical display
308 
 #if ENABLED(U8GLIB_ST7920)
 308 
 #if ENABLED(U8GLIB_ST7920)
309 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS( 96)
310 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS( 48)
311 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(715)
309 
+  #define BOARD_ST7920_DELAY_1                96
310 
+  #define BOARD_ST7920_DELAY_2                48
311 
+  #define BOARD_ST7920_DELAY_3               715
312 
 #endif
 312 
 #endif

+ 3
- 8
Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h 查看文件

192 
     #define LCD_PINS_ENABLE          EXP1_08_PIN
 192 
     #define LCD_PINS_ENABLE          EXP1_08_PIN
193 
     #define LCD_PINS_D4              EXP1_06_PIN
 193 
     #define LCD_PINS_D4              EXP1_06_PIN
194
194
195 
-    // CR10_STOCKDISPLAY default timing is too fast
196 
-    #undef BOARD_ST7920_DELAY_1
197 
-    #undef BOARD_ST7920_DELAY_2
198 
-    #undef BOARD_ST7920_DELAY_3
199 
-
200 
   #elif ENABLED(MKS_MINI_12864)
 195 
   #elif ENABLED(MKS_MINI_12864)
201
196
202 
     #define DOGLCD_A0                EXP1_04_PIN
 197 
     #define DOGLCD_A0                EXP1_04_PIN
251
246
252 
 // Alter timing for graphical display
 247 
 // Alter timing for graphical display
253 
 #if ENABLED(U8GLIB_ST7920)
 248 
 #if ENABLED(U8GLIB_ST7920)
254 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS( 96)
255 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS( 48)
256 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(600)
249 
+  #define BOARD_ST7920_DELAY_1                96
250 
+  #define BOARD_ST7920_DELAY_2                48
251 
+  #define BOARD_ST7920_DELAY_3               600
257 
 #endif
 252 
 #endif
258
253
259 
 #if ENABLED(TOUCH_UI_FTDI_EVE)
 254 
 #if ENABLED(TOUCH_UI_FTDI_EVE)

+ 3
- 3
Marlin/src/pins/stm32f4/pins_FYSETC_S6.h 查看文件

315
315
316 
 // Alter timing for graphical display
 316 
 // Alter timing for graphical display
317 
 #if ENABLED(U8GLIB_ST7920)
 317 
 #if ENABLED(U8GLIB_ST7920)
318 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS( 96)
319 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS( 48)
320 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(640)
318 
+  #define BOARD_ST7920_DELAY_1                96
319 
+  #define BOARD_ST7920_DELAY_2                48
320 
+  #define BOARD_ST7920_DELAY_3               640
321 
 #endif
 321 
 #endif
322
322
323 
 #ifndef RGB_LED_R_PIN
 323 
 #ifndef RGB_LED_R_PIN

+ 3
- 3
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h 查看文件

369 
       #define LCD_PINS_D7            EXP1_03_PIN
 369 
       #define LCD_PINS_D7            EXP1_03_PIN
370 
     #endif
 370 
     #endif
371
371
372 
-    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
373 
-    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
374 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
372 
+    #define BOARD_ST7920_DELAY_1              96
373 
+    #define BOARD_ST7920_DELAY_2              48
374 
+    #define BOARD_ST7920_DELAY_3             600
375
375
376 
   #endif // !MKS_MINI_12864
 376 
   #endif // !MKS_MINI_12864
377
377

+ 3
- 3
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h 查看文件

400 
       #define LCD_PINS_D7            EXP1_03_PIN
 400 
       #define LCD_PINS_D7            EXP1_03_PIN
401 
     #endif
 401 
     #endif
402
402
403 
-    #define BOARD_ST7920_DELAY_1    DELAY_NS(96)
404 
-    #define BOARD_ST7920_DELAY_2    DELAY_NS(48)
405 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
403 
+    #define BOARD_ST7920_DELAY_1              96
404 
+    #define BOARD_ST7920_DELAY_2              48
405 
+    #define BOARD_ST7920_DELAY_3             600
406
406
407 
   #endif // !MKS_MINI_12864
 407 
   #endif // !MKS_MINI_12864
408
408

+ 3
- 3
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h 查看文件

371 
       #define LCD_PINS_D7            EXP1_03_PIN
 371 
       #define LCD_PINS_D7            EXP1_03_PIN
372 
     #endif
 372 
     #endif
373
373
374 
-    #define BOARD_ST7920_DELAY_1   DELAY_NS( 96)
375 
-    #define BOARD_ST7920_DELAY_2   DELAY_NS( 48)
376 
-    #define BOARD_ST7920_DELAY_3   DELAY_NS(600)
374 
+    #define BOARD_ST7920_DELAY_1              96
375 
+    #define BOARD_ST7920_DELAY_2              48
376 
+    #define BOARD_ST7920_DELAY_3             600
377
377
378 
   #endif // !MKS_MINI_12864
 378 
   #endif // !MKS_MINI_12864
379
379

+ 3
- 3
Marlin/src/pins/stm32f4/pins_RUMBA32_common.h 查看文件

173
173
174 
 // Alter timing for graphical display
 174 
 // Alter timing for graphical display
175 
 #if ENABLED(U8GLIB_ST7920)
 175 
 #if ENABLED(U8GLIB_ST7920)
176 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS( 96)
177 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS( 48)
178 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(640)
176 
+  #define BOARD_ST7920_DELAY_1                96
177 
+  #define BOARD_ST7920_DELAY_2                48
178 
+  #define BOARD_ST7920_DELAY_3               640
179 
 #endif
 179 
 #endif

+ 3
- 6
Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_LITE_V2.h 查看文件

225 
   #define LCD_PINS_D4                EXP1_05_PIN
 225 
   #define LCD_PINS_D4                EXP1_05_PIN
226 
   //#define KILL_PIN                        -1
 226 
   //#define KILL_PIN                        -1
227
227
228 
-  #undef BOARD_ST7920_DELAY_1
229 
-  #undef BOARD_ST7920_DELAY_2
230 
-  #undef BOARD_ST7920_DELAY_3
231 
-  #define BOARD_ST7920_DELAY_1 DELAY_NS(600)
232 
-  #define BOARD_ST7920_DELAY_2 DELAY_NS(750)
233 
-  #define BOARD_ST7920_DELAY_3 DELAY_NS(750)
228 
+  #define BOARD_ST7920_DELAY_1           600
229 
+  #define BOARD_ST7920_DELAY_2           750
230 
+  #define BOARD_ST7920_DELAY_3           750
234
231
235 
 #elif ENABLED(MKS_MINI_12864)
 232 
 #elif ENABLED(MKS_MINI_12864)
236 
   /**          ______
 233 
   /**          ______

+ 3
- 3
Marlin/src/pins/stm32f4/pins_VAKE403D.h 查看文件

184
184
185 
 // Alter timing for graphical display
 185 
 // Alter timing for graphical display
186 
 #if ENABLED(U8GLIB_ST7920)
 186 
 #if ENABLED(U8GLIB_ST7920)
187 
-  #define BOARD_ST7920_DELAY_1     DELAY_NS( 96)
188 
-  #define BOARD_ST7920_DELAY_2     DELAY_NS( 48)
189 
-  #define BOARD_ST7920_DELAY_3     DELAY_NS(715)
187 
+  #define BOARD_ST7920_DELAY_1                96
188 
+  #define BOARD_ST7920_DELAY_2                48
189 
+  #define BOARD_ST7920_DELAY_3               715
190 
 #endif
 190 
 #endif

+ 3
- 3
Marlin/src/pins/stm32f7/pins_NUCLEO_F767ZI.h 查看文件

191 
   #define BTN_EN1                           PF13  // BTN_EN1
 191 
   #define BTN_EN1                           PF13  // BTN_EN1
192 
   #define BTN_EN2                           PE9   // BTN_EN2
 192 
   #define BTN_EN2                           PE9   // BTN_EN2
193
193
194 
-  #define BOARD_ST7920_DELAY_1  DELAY_NS(125)
195 
-  #define BOARD_ST7920_DELAY_2  DELAY_NS(63)
196 
-  #define BOARD_ST7920_DELAY_3  DELAY_NS(780)
194 
+  #define BOARD_ST7920_DELAY_1               125
195 
+  #define BOARD_ST7920_DELAY_2                63
196 
+  #define BOARD_ST7920_DELAY_3               780
197 
 #endif
 197 
 #endif

+ 3
- 3
Marlin/src/pins/teensy2/pins_PRINTRBOARD_REVF.h 查看文件

245 
     //#define MISO                            23  //         13               B3                ICSP-06             EXP2-05
 245 
     //#define MISO                            23  //         13               B3                ICSP-06             EXP2-05
246
246
247 
     // Alter timing for graphical display
 247 
     // Alter timing for graphical display
248 
-    #define BOARD_ST7920_DELAY_1 DELAY_NS(313)
249 
-    #define BOARD_ST7920_DELAY_2 DELAY_NS(313)
250 
-    #define BOARD_ST7920_DELAY_3 DELAY_NS(313)
248 
+    #define BOARD_ST7920_DELAY_1           313
249 
+    #define BOARD_ST7920_DELAY_2           313
250 
+    #define BOARD_ST7920_DELAY_3           313
251
251
252 
   #else
 252 
   #else
253
253

Write Preview
Loading…
取消
儲存