Skip to content

Commit 253f917

Browse files
dotdash32thinkyhead
dotdash32
and
thinkyhead
committed
🎨 Use largest default ST9720 delays (#22713)
Co-authored-by: Scott Lahteine <[email protected]>
1 parent 4c7f869 commit 253f917

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

Lines changed: 6 additions & 6 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 6 additions & 6 deletions
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

0 commit comments

Comments
 (0)