🎨 Use largest default ST9720 delays (#22713)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
		
				
					committed by
					
						
						Scott Lahteine
					
				
			
			
				
	
			
			
			
						parent
						
							4c7f8696ab
						
					
				
				
					commit
					253f91765d
				
			@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user