Skip to content

Commit 19a907f

Browse files
dotdash32thinkyhead
authored and
Darred
committed
🎨 Use largest default ST9720 delays (MarlinFirmware#22713)
Co-authored-by: Scott Lahteine <[email protected]>
1 parent b509c58 commit 19a907f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+231
-242
lines changed

‎Marlin/src/HAL/AVR/HAL.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
// Default graphical display delays
4444
//
4545
#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
4949
#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
5353
#endif
5454

5555
#ifndef pgm_read_ptr

‎Marlin/src/HAL/LINUX/HAL.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ uint8_t _getc();
6363
extern MSerialT usb_serial;
6464
#define MYSERIAL1 usb_serial
6565

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
6969

7070
//
7171
// Interrupts

‎Marlin/src/HAL/LPC1768/HAL.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ extern "C" volatile uint32_t _millis;
5050
//
5151
// Default graphical display delays
5252
//
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
5656

5757
typedef ForwardSerial1Class< decltype(UsbSerial) > DefaultSerial1;
5858
extern DefaultSerial1 USBSerial;

‎Marlin/src/HAL/NATIVE_SIM/HAL.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ extern MSerialT serial_stream_3;
9999
#endif
100100

101101

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
105105

106106
//
107107
// Interrupts

‎Marlin/src/HAL/STM32/HAL.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
//
4141
// Default graphical display delays
4242
//
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
4646

4747
//
4848
// Serial Ports

‎Marlin/src/HAL/STM32F1/HAL.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
//
5555
// Default graphical display delays
5656
//
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
6060

6161
#ifndef STM32_FLASH_SIZE
6262
#if ANY(MCU_STM32F103RE, MCU_STM32F103VE, MCU_STM32F103ZE)

‎Marlin/src/HAL/TEENSY31_32/HAL.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636

3737
#include <stdint.h>
3838

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
4242

4343
//#undef MOTHERBOARD
4444
//#define MOTHERBOARD BOARD_TEENSY31_32

‎Marlin/src/HAL/TEENSY35_36/HAL.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
#include <stdint.h>
3838
#include <util/atomic.h>
3939

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
4343

4444
// ------------------------
4545
// Defines

‎Marlin/src/HAL/TEENSY40_41/HAL.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
#include "../../feature/ethernet.h"
4242
#endif
4343

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
4747

4848
// ------------------------
4949
// Defines

‎Marlin/src/inc/Conditionals_LCD.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -237,16 +237,16 @@
237237
#elif ENABLED(CR10_STOCKDISPLAY)
238238

239239
#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
243243

244244
#elif ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
245245

246246
#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
250250

251251
#elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, BQ_LCD_SMART_CONTROLLER, K3D_FULL_GRAPHIC_SMART_CONTROLLER)
252252

‎Marlin/src/lcd/dogm/ultralcd_st7920_u8glib_rrd_AVR.cpp

+50
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,61 @@
3636
// Optimize this code with -O3
3737
#pragma GCC optimize (3)
3838

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+
3988
#ifdef ARDUINO_ARCH_STM32F1
4089
#define ST7920_DAT(V) !!((V) & 0x80)
4190
#else
4291
#define ST7920_DAT(V) ((V) & 0x80)
4392
#endif
93+
4494
#define ST7920_SND_BIT do{ \
4595
WRITE(ST7920_CLK_PIN, LOW); ST7920_DELAY_1; \
4696
WRITE(ST7920_DAT_PIN, ST7920_DAT(val)); ST7920_DELAY_2; \

‎Marlin/src/pins/mega/pins_SILVER_GATE.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@
8686
#define KILL_PIN 21
8787
#define HOME_PIN 28
8888
#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
9292
#endif
9393
#endif
9494

‎Marlin/src/pins/pins_postprocess.h

+1-29
Original file line numberDiff line numberDiff line change
@@ -1221,35 +1221,7 @@
12211221
//
12221222
// Default DOGLCD SPI delays
12231223
//
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)
12531225
#undef ST7920_DELAY_1
12541226
#undef ST7920_DELAY_2
12551227
#undef ST7920_DELAY_3

‎Marlin/src/pins/rambo/pins_EINSY_RAMBO.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,9 @@
206206
#endif // HAS_WIRED_LCD
207207

208208
#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
212212
#endif
213213

214214
#undef MK3_FAN_PINS

‎Marlin/src/pins/rambo/pins_EINSY_RETRO.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202

203203
// Alter timing for graphical display
204204
#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
208208
#endif

‎Marlin/src/pins/rambo/pins_MINIRAMBO.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
#endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
195195

196196
#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
200200
#endif

‎Marlin/src/pins/rambo/pins_RAMBO.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@
271271

272272
// Alter timing for graphical display
273273
#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
277277
#endif

‎Marlin/src/pins/ramps/pins_3DRAG.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@
109109
#endif // IS_ULTRA_LCD && IS_NEWPANEL
110110

111111
#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
115115
#endif
116116

117117
/**

‎Marlin/src/pins/ramps/pins_BQ_ZUM_MEGA_3D.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126

127127
// Alter timing for graphical display
128128
#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
132132
#endif

‎Marlin/src/pins/ramps/pins_DAGOMA_F5.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141

4242
// Alter timing for graphical display
4343
#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
4747
#endif
4848

4949
//

‎Marlin/src/pins/ramps/pins_FORMBOT_TREX2PLUS.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200

201201
// Alter timing for graphical display
202202
#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
206206
#endif

‎Marlin/src/pins/sanguino/pins_ANET_10.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@
195195
#define BTN_EN1 28
196196
#define BTN_EN2 10
197197
#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
201201
#else
202202
#define SERVO0_PIN 29 // free for BLTouch/3D-Touch
203203
#define BEEPER_PIN 17
@@ -207,9 +207,9 @@
207207
#define BTN_EN1 11
208208
#define BTN_EN2 10
209209
#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
213213
#endif
214214

215215
#endif

‎Marlin/src/pins/sanguino/pins_MELZI.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
// Alter timing for graphical display
3535
#if ENABLED(U8GLIB_ST7920)
3636
#ifndef BOARD_ST7920_DELAY_1
37-
#define BOARD_ST7920_DELAY_1 DELAY_NS( 0)
37+
#define BOARD_ST7920_DELAY_1 0
3838
#endif
3939
#ifndef BOARD_ST7920_DELAY_2
40-
#define BOARD_ST7920_DELAY_2 DELAY_NS(188)
40+
#define BOARD_ST7920_DELAY_2 188
4141
#endif
4242
#ifndef BOARD_ST7920_DELAY_3
43-
#define BOARD_ST7920_DELAY_3 DELAY_NS( 0)
43+
#define BOARD_ST7920_DELAY_3 0
4444
#endif
4545
#endif
4646

0 commit comments

Comments
 (0)