🎨 Use largest default ST9720 delays (#22713)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
parent
4c7f8696ab
commit
253f91765d
@ -43,13 +43,13 @@
|
|||||||
// Default graphical display delays
|
// Default graphical display delays
|
||||||
//
|
//
|
||||||
#if F_CPU >= 20000000
|
#if F_CPU >= 20000000
|
||||||
#define CPU_ST7920_DELAY_1 DELAY_NS(150)
|
#define CPU_ST7920_DELAY_1 150
|
||||||
#define CPU_ST7920_DELAY_2 DELAY_NS( 0)
|
#define CPU_ST7920_DELAY_2 0
|
||||||
#define CPU_ST7920_DELAY_3 DELAY_NS(150)
|
#define CPU_ST7920_DELAY_3 150
|
||||||
#elif F_CPU == 16000000
|
#elif F_CPU == 16000000
|
||||||
#define CPU_ST7920_DELAY_1 DELAY_NS(125)
|
#define CPU_ST7920_DELAY_1 125
|
||||||
#define CPU_ST7920_DELAY_2 DELAY_NS( 0)
|
#define CPU_ST7920_DELAY_2 0
|
||||||
#define CPU_ST7920_DELAY_3 DELAY_NS(188)
|
#define CPU_ST7920_DELAY_3 188
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef pgm_read_ptr
|
#ifndef pgm_read_ptr
|
||||||
|
@ -63,9 +63,9 @@ uint8_t _getc();
|
|||||||
extern MSerialT usb_serial;
|
extern MSerialT usb_serial;
|
||||||
#define MYSERIAL1 usb_serial
|
#define MYSERIAL1 usb_serial
|
||||||
|
|
||||||
#define CPU_ST7920_DELAY_1 DELAY_NS(600)
|
#define CPU_ST7920_DELAY_1 600
|
||||||
#define CPU_ST7920_DELAY_2 DELAY_NS(750)
|
#define CPU_ST7920_DELAY_2 750
|
||||||
#define CPU_ST7920_DELAY_3 DELAY_NS(750)
|
#define CPU_ST7920_DELAY_3 750
|
||||||
|
|
||||||
//
|
//
|
||||||
// Interrupts
|
// Interrupts
|
||||||
|
@ -50,9 +50,9 @@ extern "C" volatile uint32_t _millis;
|
|||||||
//
|
//
|
||||||
// Default graphical display delays
|
// Default graphical display delays
|
||||||
//
|
//
|
||||||
#define CPU_ST7920_DELAY_1 DELAY_NS(600)
|
#define CPU_ST7920_DELAY_1 600
|
||||||
#define CPU_ST7920_DELAY_2 DELAY_NS(750)
|
#define CPU_ST7920_DELAY_2 750
|
||||||
#define CPU_ST7920_DELAY_3 DELAY_NS(750)
|
#define CPU_ST7920_DELAY_3 750
|
||||||
|
|
||||||
typedef ForwardSerial1Class< decltype(UsbSerial) > DefaultSerial1;
|
typedef ForwardSerial1Class< decltype(UsbSerial) > DefaultSerial1;
|
||||||
extern DefaultSerial1 USBSerial;
|
extern DefaultSerial1 USBSerial;
|
||||||
|
@ -99,9 +99,9 @@ extern MSerialT serial_stream_3;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#define CPU_ST7920_DELAY_1 DELAY_NS(600)
|
#define CPU_ST7920_DELAY_1 600
|
||||||
#define CPU_ST7920_DELAY_2 DELAY_NS(750)
|
#define CPU_ST7920_DELAY_2 750
|
||||||
#define CPU_ST7920_DELAY_3 DELAY_NS(750)
|
#define CPU_ST7920_DELAY_3 750
|
||||||
|
|
||||||
//
|
//
|
||||||
// Interrupts
|
// Interrupts
|
||||||
|
@ -40,9 +40,9 @@
|
|||||||
//
|
//
|
||||||
// Default graphical display delays
|
// Default graphical display delays
|
||||||
//
|
//
|
||||||
#define CPU_ST7920_DELAY_1 DELAY_NS(300)
|
#define CPU_ST7920_DELAY_1 300
|
||||||
#define CPU_ST7920_DELAY_2 DELAY_NS( 40)
|
#define CPU_ST7920_DELAY_2 40
|
||||||
#define CPU_ST7920_DELAY_3 DELAY_NS(340)
|
#define CPU_ST7920_DELAY_3 340
|
||||||
|
|
||||||
//
|
//
|
||||||
// Serial Ports
|
// Serial Ports
|
||||||
|
@ -54,9 +54,9 @@
|
|||||||
//
|
//
|
||||||
// Default graphical display delays
|
// Default graphical display delays
|
||||||
//
|
//
|
||||||
#define CPU_ST7920_DELAY_1 DELAY_NS(300)
|
#define CPU_ST7920_DELAY_1 300
|
||||||
#define CPU_ST7920_DELAY_2 DELAY_NS( 40)
|
#define CPU_ST7920_DELAY_2 40
|
||||||
#define CPU_ST7920_DELAY_3 DELAY_NS(340)
|
#define CPU_ST7920_DELAY_3 340
|
||||||
|
|
||||||
#ifndef STM32_FLASH_SIZE
|
#ifndef STM32_FLASH_SIZE
|
||||||
#if ANY(MCU_STM32F103RE, MCU_STM32F103VE, MCU_STM32F103ZE)
|
#if ANY(MCU_STM32F103RE, MCU_STM32F103VE, MCU_STM32F103ZE)
|
||||||
|
@ -36,9 +36,9 @@
|
|||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#define CPU_ST7920_DELAY_1 DELAY_NS(600)
|
#define CPU_ST7920_DELAY_1 600
|
||||||
#define CPU_ST7920_DELAY_2 DELAY_NS(750)
|
#define CPU_ST7920_DELAY_2 750
|
||||||
#define CPU_ST7920_DELAY_3 DELAY_NS(750)
|
#define CPU_ST7920_DELAY_3 750
|
||||||
|
|
||||||
//#undef MOTHERBOARD
|
//#undef MOTHERBOARD
|
||||||
//#define MOTHERBOARD BOARD_TEENSY31_32
|
//#define MOTHERBOARD BOARD_TEENSY31_32
|
||||||
|
@ -37,9 +37,9 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <util/atomic.h>
|
#include <util/atomic.h>
|
||||||
|
|
||||||
#define CPU_ST7920_DELAY_1 DELAY_NS(600)
|
#define CPU_ST7920_DELAY_1 600
|
||||||
#define CPU_ST7920_DELAY_2 DELAY_NS(750)
|
#define CPU_ST7920_DELAY_2 750
|
||||||
#define CPU_ST7920_DELAY_3 DELAY_NS(750)
|
#define CPU_ST7920_DELAY_3 750
|
||||||
|
|
||||||
// ------------------------
|
// ------------------------
|
||||||
// Defines
|
// Defines
|
||||||
|
@ -41,9 +41,9 @@
|
|||||||
#include "../../feature/ethernet.h"
|
#include "../../feature/ethernet.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CPU_ST7920_DELAY_1 DELAY_NS(600)
|
#define CPU_ST7920_DELAY_1 600
|
||||||
#define CPU_ST7920_DELAY_2 DELAY_NS(750)
|
#define CPU_ST7920_DELAY_2 750
|
||||||
#define CPU_ST7920_DELAY_3 DELAY_NS(750)
|
#define CPU_ST7920_DELAY_3 750
|
||||||
|
|
||||||
// ------------------------
|
// ------------------------
|
||||||
// Defines
|
// Defines
|
||||||
|
@ -237,16 +237,16 @@
|
|||||||
#elif ENABLED(CR10_STOCKDISPLAY)
|
#elif ENABLED(CR10_STOCKDISPLAY)
|
||||||
|
|
||||||
#define IS_RRD_FG_SC 1
|
#define IS_RRD_FG_SC 1
|
||||||
#define LCD_ST7920_DELAY_1 DELAY_NS(125)
|
#define LCD_ST7920_DELAY_1 125
|
||||||
#define LCD_ST7920_DELAY_2 DELAY_NS(125)
|
#define LCD_ST7920_DELAY_2 125
|
||||||
#define LCD_ST7920_DELAY_3 DELAY_NS(125)
|
#define LCD_ST7920_DELAY_3 125
|
||||||
|
|
||||||
#elif ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
|
#elif ENABLED(ANET_FULL_GRAPHICS_LCD, ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
|
||||||
|
|
||||||
#define IS_RRD_FG_SC 1
|
#define IS_RRD_FG_SC 1
|
||||||
#define LCD_ST7920_DELAY_1 DELAY_NS(150)
|
#define LCD_ST7920_DELAY_1 150
|
||||||
#define LCD_ST7920_DELAY_2 DELAY_NS(150)
|
#define LCD_ST7920_DELAY_2 150
|
||||||
#define LCD_ST7920_DELAY_3 DELAY_NS(150)
|
#define LCD_ST7920_DELAY_3 150
|
||||||
|
|
||||||
#elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, BQ_LCD_SMART_CONTROLLER, K3D_FULL_GRAPHIC_SMART_CONTROLLER)
|
#elif ANY(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER, BQ_LCD_SMART_CONTROLLER, K3D_FULL_GRAPHIC_SMART_CONTROLLER)
|
||||||
|
|
||||||
|
@ -36,11 +36,61 @@
|
|||||||
// Optimize this code with -O3
|
// Optimize this code with -O3
|
||||||
#pragma GCC optimize (3)
|
#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
|
#ifdef ARDUINO_ARCH_STM32F1
|
||||||
#define ST7920_DAT(V) !!((V) & 0x80)
|
#define ST7920_DAT(V) !!((V) & 0x80)
|
||||||
#else
|
#else
|
||||||
#define ST7920_DAT(V) ((V) & 0x80)
|
#define ST7920_DAT(V) ((V) & 0x80)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define ST7920_SND_BIT do{ \
|
#define ST7920_SND_BIT do{ \
|
||||||
WRITE(ST7920_CLK_PIN, LOW); ST7920_DELAY_1; \
|
WRITE(ST7920_CLK_PIN, LOW); ST7920_DELAY_1; \
|
||||||
WRITE(ST7920_DAT_PIN, ST7920_DAT(val)); ST7920_DELAY_2; \
|
WRITE(ST7920_DAT_PIN, ST7920_DAT(val)); ST7920_DELAY_2; \
|
||||||
|
@ -86,9 +86,9 @@
|
|||||||
#define KILL_PIN 21
|
#define KILL_PIN 21
|
||||||
#define HOME_PIN 28
|
#define HOME_PIN 28
|
||||||
#endif
|
#endif
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_1 0
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(250)
|
#define BOARD_ST7920_DELAY_2 250
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_3 0
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1221,35 +1221,7 @@
|
|||||||
//
|
//
|
||||||
// Default DOGLCD SPI delays
|
// Default DOGLCD SPI delays
|
||||||
//
|
//
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if DISABLED(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
|
|
||||||
#undef ST7920_DELAY_1
|
#undef ST7920_DELAY_1
|
||||||
#undef ST7920_DELAY_2
|
#undef ST7920_DELAY_2
|
||||||
#undef ST7920_DELAY_3
|
#undef ST7920_DELAY_3
|
||||||
|
@ -206,9 +206,9 @@
|
|||||||
#endif // HAS_WIRED_LCD
|
#endif // HAS_WIRED_LCD
|
||||||
|
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_1 0
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(250)
|
#define BOARD_ST7920_DELAY_2 250
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_3 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#undef MK3_FAN_PINS
|
#undef MK3_FAN_PINS
|
||||||
|
@ -202,7 +202,7 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_1 0
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(250)
|
#define BOARD_ST7920_DELAY_2 250
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_3 0
|
||||||
#endif
|
#endif
|
||||||
|
@ -194,7 +194,7 @@
|
|||||||
#endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
|
#endif // HAS_WIRED_LCD || TOUCH_UI_ULTIPANEL
|
||||||
|
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_1 0
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(250)
|
#define BOARD_ST7920_DELAY_2 250
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_3 0
|
||||||
#endif
|
#endif
|
||||||
|
@ -271,7 +271,7 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(0)
|
#define BOARD_ST7920_DELAY_1 0
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(0)
|
#define BOARD_ST7920_DELAY_2 0
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(0)
|
#define BOARD_ST7920_DELAY_3 0
|
||||||
#endif
|
#endif
|
||||||
|
@ -109,9 +109,9 @@
|
|||||||
#endif // IS_ULTRA_LCD && IS_NEWPANEL
|
#endif // IS_ULTRA_LCD && IS_NEWPANEL
|
||||||
|
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_1 0
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(188)
|
#define BOARD_ST7920_DELAY_2 188
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_3 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -126,7 +126,7 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_1 0
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_2 0
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(189)
|
#define BOARD_ST7920_DELAY_3 189
|
||||||
#endif
|
#endif
|
||||||
|
@ -41,9 +41,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(0)
|
#define BOARD_ST7920_DELAY_1 0
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(250)
|
#define BOARD_ST7920_DELAY_2 250
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(250)
|
#define BOARD_ST7920_DELAY_3 250
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -200,7 +200,7 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(200)
|
#define BOARD_ST7920_DELAY_1 200
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(200)
|
#define BOARD_ST7920_DELAY_2 200
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(200)
|
#define BOARD_ST7920_DELAY_3 200
|
||||||
#endif
|
#endif
|
||||||
|
@ -195,9 +195,9 @@
|
|||||||
#define BTN_EN1 28
|
#define BTN_EN1 28
|
||||||
#define BTN_EN2 10
|
#define BTN_EN2 10
|
||||||
#define BTN_ENC 17
|
#define BTN_ENC 17
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(250)
|
#define BOARD_ST7920_DELAY_1 250
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(250)
|
#define BOARD_ST7920_DELAY_2 250
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(250)
|
#define BOARD_ST7920_DELAY_3 250
|
||||||
#else
|
#else
|
||||||
#define SERVO0_PIN 29 // free for BLTouch/3D-Touch
|
#define SERVO0_PIN 29 // free for BLTouch/3D-Touch
|
||||||
#define BEEPER_PIN 17
|
#define BEEPER_PIN 17
|
||||||
@ -207,9 +207,9 @@
|
|||||||
#define BTN_EN1 11
|
#define BTN_EN1 11
|
||||||
#define BTN_EN2 10
|
#define BTN_EN2 10
|
||||||
#define BTN_ENC 16
|
#define BTN_ENC 16
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_1 125
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(63)
|
#define BOARD_ST7920_DELAY_2 63
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_3 125
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -34,13 +34,13 @@
|
|||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#ifndef BOARD_ST7920_DELAY_1
|
#ifndef BOARD_ST7920_DELAY_1
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_1 0
|
||||||
#endif
|
#endif
|
||||||
#ifndef BOARD_ST7920_DELAY_2
|
#ifndef BOARD_ST7920_DELAY_2
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(188)
|
#define BOARD_ST7920_DELAY_2 188
|
||||||
#endif
|
#endif
|
||||||
#ifndef BOARD_ST7920_DELAY_3
|
#ifndef BOARD_ST7920_DELAY_3
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_3 0
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -37,9 +37,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_1 125
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_2 125
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_3 125
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "pins_MELZI.h"
|
#include "pins_MELZI.h"
|
||||||
|
@ -29,9 +29,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_1 0
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_2 125
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_3 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "pins_MELZI.h"
|
#include "pins_MELZI.h"
|
||||||
|
@ -26,9 +26,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_1 0
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(400)
|
#define BOARD_ST7920_DELAY_2 400
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS( 0)
|
#define BOARD_ST7920_DELAY_3 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "pins_MELZI.h"
|
#include "pins_MELZI.h"
|
||||||
|
@ -203,9 +203,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_1 125
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_2 125
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_3 125
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -156,9 +156,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_1 125
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_2 125
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_3 125
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -180,9 +180,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(715)
|
#define BOARD_ST7920_DELAY_3 715
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // HAS_WIRED_LCD
|
#endif // HAS_WIRED_LCD
|
||||||
|
@ -159,9 +159,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(715)
|
#define BOARD_ST7920_DELAY_3 715
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // HAS_WIRED_LCD
|
#endif // HAS_WIRED_LCD
|
||||||
|
@ -167,9 +167,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(715)
|
#define BOARD_ST7920_DELAY_3 715
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // HAS_WIRED_LCD
|
#endif // HAS_WIRED_LCD
|
||||||
|
@ -164,9 +164,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(715)
|
#define BOARD_ST7920_DELAY_3 715
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // HAS_WIRED_LCD
|
#endif // HAS_WIRED_LCD
|
||||||
|
@ -169,9 +169,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(715)
|
#define BOARD_ST7920_DELAY_3 715
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // HAS_WIRED_LCD
|
#endif // HAS_WIRED_LCD
|
||||||
|
@ -342,9 +342,9 @@
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_1 125
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_2 125
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_3 125
|
||||||
|
|
||||||
#endif // !MKS_MINI_12864
|
#endif // !MKS_MINI_12864
|
||||||
|
|
||||||
|
@ -223,13 +223,13 @@
|
|||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#ifndef BOARD_ST7920_DELAY_1
|
#ifndef BOARD_ST7920_DELAY_1
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_1 125
|
||||||
#endif
|
#endif
|
||||||
#ifndef BOARD_ST7920_DELAY_2
|
#ifndef BOARD_ST7920_DELAY_2
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_2 125
|
||||||
#endif
|
#endif
|
||||||
#ifndef BOARD_ST7920_DELAY_3
|
#ifndef BOARD_ST7920_DELAY_3
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_3 125
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -114,9 +114,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_1 125
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_2 125
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_3 125
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // HAS_WIRED_LCD
|
#endif // HAS_WIRED_LCD
|
||||||
|
@ -138,9 +138,9 @@
|
|||||||
|
|
||||||
#endif // !MKS_MINI_12864
|
#endif // !MKS_MINI_12864
|
||||||
|
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_1 125
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_2 125
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_3 125
|
||||||
|
|
||||||
#endif // HAS_WIRED_LCD
|
#endif // HAS_WIRED_LCD
|
||||||
|
|
||||||
|
@ -379,9 +379,9 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_1 125
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_2 125
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_3 125
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // !MKS_MINI_12864
|
#endif // !MKS_MINI_12864
|
||||||
|
@ -301,9 +301,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_1 125
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_2 125
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_3 125
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define HAS_SPI_FLASH 1
|
#define HAS_SPI_FLASH 1
|
||||||
|
@ -201,9 +201,9 @@
|
|||||||
#define BTN_EN1 EXP1_03_PIN
|
#define BTN_EN1 EXP1_03_PIN
|
||||||
#define BTN_EN2 EXP1_06_PIN
|
#define BTN_EN2 EXP1_06_PIN
|
||||||
#define BTN_ENC EXP1_04_PIN
|
#define BTN_ENC EXP1_04_PIN
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_1 125
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(200)
|
#define BOARD_ST7920_DELAY_2 200
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_3 125
|
||||||
|
|
||||||
#elif EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
|
#elif EITHER(ZONESTAR_12864OLED, ZONESTAR_12864OLED_SSD1306)
|
||||||
|
|
||||||
|
@ -333,9 +333,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_1 125
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(250)
|
#define BOARD_ST7920_DELAY_2 250
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_3 125
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Remap SERVO0 PIN for BLTouch
|
// Remap SERVO0 PIN for BLTouch
|
||||||
|
@ -306,9 +306,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(200) // Tclk_fall <200ns
|
#define BOARD_ST7920_DELAY_1 200 // Tclk_fall <200ns
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(250) // Tdata_width >200ns
|
#define BOARD_ST7920_DELAY_2 250 // Tdata_width >200ns
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(200) // Tclk_rise <200ns
|
#define BOARD_ST7920_DELAY_3 200 // Tclk_rise <200ns
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Remap SERVO0 PIN for BLTouch
|
// Remap SERVO0 PIN for BLTouch
|
||||||
|
@ -286,9 +286,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
#define BOARD_ST7920_DELAY_3 600
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // HAS_WIRED_LCD
|
#endif // HAS_WIRED_LCD
|
||||||
|
@ -207,11 +207,6 @@
|
|||||||
#define LCD_PINS_ENABLE PE11
|
#define LCD_PINS_ENABLE PE11
|
||||||
#define LCD_PINS_D4 PE10
|
#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!
|
#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."
|
#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
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
#define BOARD_ST7920_DELAY_3 600
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // HAS_WIRED_LCD
|
#endif // HAS_WIRED_LCD
|
||||||
|
@ -425,11 +425,6 @@
|
|||||||
#define LCD_PINS_ENABLE EXP1_03_PIN
|
#define LCD_PINS_ENABLE EXP1_03_PIN
|
||||||
#define LCD_PINS_D4 EXP1_05_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)
|
#elif ENABLED(MKS_MINI_12864)
|
||||||
#define DOGLCD_A0 EXP1_04_PIN
|
#define DOGLCD_A0 EXP1_04_PIN
|
||||||
#define DOGLCD_CS EXP1_05_PIN
|
#define DOGLCD_CS EXP1_05_PIN
|
||||||
@ -489,9 +484,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
#define BOARD_ST7920_DELAY_3 600
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // HAS_WIRED_LCD
|
#endif // HAS_WIRED_LCD
|
||||||
|
@ -433,11 +433,6 @@
|
|||||||
#define LCD_PINS_ENABLE EXP1_03_PIN
|
#define LCD_PINS_ENABLE EXP1_03_PIN
|
||||||
#define LCD_PINS_D4 EXP1_05_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
|
#else
|
||||||
|
|
||||||
#define LCD_PINS_RS EXP1_07_PIN
|
#define LCD_PINS_RS EXP1_07_PIN
|
||||||
@ -484,9 +479,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(120)
|
#define BOARD_ST7920_DELAY_1 120
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 80)
|
#define BOARD_ST7920_DELAY_2 80
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(580)
|
#define BOARD_ST7920_DELAY_3 580
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAS_SPI_TFT
|
#if HAS_SPI_TFT
|
||||||
|
@ -446,11 +446,6 @@
|
|||||||
#define LCD_PINS_ENABLE EXP1_03_PIN
|
#define LCD_PINS_ENABLE EXP1_03_PIN
|
||||||
#define LCD_PINS_D4 EXP1_05_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)
|
#elif ENABLED(MKS_MINI_12864)
|
||||||
|
|
||||||
#define DOGLCD_A0 EXP1_04_PIN
|
#define DOGLCD_A0 EXP1_04_PIN
|
||||||
@ -506,13 +501,13 @@
|
|||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#ifndef BOARD_ST7920_DELAY_1
|
#ifndef BOARD_ST7920_DELAY_1
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_1 125
|
||||||
#endif
|
#endif
|
||||||
#ifndef BOARD_ST7920_DELAY_2
|
#ifndef BOARD_ST7920_DELAY_2
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 90)
|
#define BOARD_ST7920_DELAY_2 90
|
||||||
#endif
|
#endif
|
||||||
#ifndef BOARD_ST7920_DELAY_3
|
#ifndef BOARD_ST7920_DELAY_3
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
#define BOARD_ST7920_DELAY_3 600
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -430,11 +430,6 @@
|
|||||||
#define LCD_PINS_ENABLE EXP1_03_PIN
|
#define LCD_PINS_ENABLE EXP1_03_PIN
|
||||||
#define LCD_PINS_D4 EXP1_05_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)
|
#elif ENABLED(MKS_MINI_12864)
|
||||||
|
|
||||||
#define DOGLCD_A0 EXP1_04_PIN
|
#define DOGLCD_A0 EXP1_04_PIN
|
||||||
@ -490,13 +485,13 @@
|
|||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#ifndef BOARD_ST7920_DELAY_1
|
#ifndef BOARD_ST7920_DELAY_1
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(120)
|
#define BOARD_ST7920_DELAY_1 120
|
||||||
#endif
|
#endif
|
||||||
#ifndef BOARD_ST7920_DELAY_2
|
#ifndef BOARD_ST7920_DELAY_2
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 80)
|
#define BOARD_ST7920_DELAY_2 80
|
||||||
#endif
|
#endif
|
||||||
#ifndef BOARD_ST7920_DELAY_3
|
#ifndef BOARD_ST7920_DELAY_3
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(580)
|
#define BOARD_ST7920_DELAY_3 580
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -306,7 +306,7 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(715)
|
#define BOARD_ST7920_DELAY_3 715
|
||||||
#endif
|
#endif
|
||||||
|
@ -192,11 +192,6 @@
|
|||||||
#define LCD_PINS_ENABLE EXP1_08_PIN
|
#define LCD_PINS_ENABLE EXP1_08_PIN
|
||||||
#define LCD_PINS_D4 EXP1_06_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)
|
#elif ENABLED(MKS_MINI_12864)
|
||||||
|
|
||||||
#define DOGLCD_A0 EXP1_04_PIN
|
#define DOGLCD_A0 EXP1_04_PIN
|
||||||
@ -251,9 +246,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
#define BOARD_ST7920_DELAY_3 600
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(TOUCH_UI_FTDI_EVE)
|
#if ENABLED(TOUCH_UI_FTDI_EVE)
|
||||||
|
@ -315,9 +315,9 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(640)
|
#define BOARD_ST7920_DELAY_3 640
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef RGB_LED_R_PIN
|
#ifndef RGB_LED_R_PIN
|
||||||
|
@ -369,9 +369,9 @@
|
|||||||
#define LCD_PINS_D7 EXP1_03_PIN
|
#define LCD_PINS_D7 EXP1_03_PIN
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
#define BOARD_ST7920_DELAY_3 600
|
||||||
|
|
||||||
#endif // !MKS_MINI_12864
|
#endif // !MKS_MINI_12864
|
||||||
|
|
||||||
|
@ -413,9 +413,9 @@
|
|||||||
#define LCD_PINS_D7 EXP1_03_PIN
|
#define LCD_PINS_D7 EXP1_03_PIN
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
#define BOARD_ST7920_DELAY_3 600
|
||||||
|
|
||||||
#endif // !MKS_MINI_12864
|
#endif // !MKS_MINI_12864
|
||||||
|
|
||||||
|
@ -371,9 +371,9 @@
|
|||||||
#define LCD_PINS_D7 EXP1_03_PIN
|
#define LCD_PINS_D7 EXP1_03_PIN
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
|
#define BOARD_ST7920_DELAY_3 600
|
||||||
|
|
||||||
#endif // !MKS_MINI_12864
|
#endif // !MKS_MINI_12864
|
||||||
|
|
||||||
|
@ -173,7 +173,7 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(640)
|
#define BOARD_ST7920_DELAY_3 640
|
||||||
#endif
|
#endif
|
||||||
|
@ -225,12 +225,9 @@
|
|||||||
#define LCD_PINS_D4 EXP1_05_PIN
|
#define LCD_PINS_D4 EXP1_05_PIN
|
||||||
//#define KILL_PIN -1
|
//#define KILL_PIN -1
|
||||||
|
|
||||||
#undef BOARD_ST7920_DELAY_1
|
#define BOARD_ST7920_DELAY_1 600
|
||||||
#undef BOARD_ST7920_DELAY_2
|
#define BOARD_ST7920_DELAY_2 750
|
||||||
#undef BOARD_ST7920_DELAY_3
|
#define BOARD_ST7920_DELAY_3 750
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(600)
|
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(750)
|
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(750)
|
|
||||||
|
|
||||||
#elif ENABLED(MKS_MINI_12864)
|
#elif ENABLED(MKS_MINI_12864)
|
||||||
/** ______
|
/** ______
|
||||||
|
@ -184,7 +184,7 @@
|
|||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#if ENABLED(U8GLIB_ST7920)
|
#if ENABLED(U8GLIB_ST7920)
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
|
#define BOARD_ST7920_DELAY_1 96
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
|
#define BOARD_ST7920_DELAY_2 48
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(715)
|
#define BOARD_ST7920_DELAY_3 715
|
||||||
#endif
|
#endif
|
||||||
|
@ -191,7 +191,7 @@
|
|||||||
#define BTN_EN1 PF13 // BTN_EN1
|
#define BTN_EN1 PF13 // BTN_EN1
|
||||||
#define BTN_EN2 PE9 // BTN_EN2
|
#define BTN_EN2 PE9 // BTN_EN2
|
||||||
|
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
|
#define BOARD_ST7920_DELAY_1 125
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(63)
|
#define BOARD_ST7920_DELAY_2 63
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(780)
|
#define BOARD_ST7920_DELAY_3 780
|
||||||
#endif
|
#endif
|
||||||
|
@ -245,9 +245,9 @@
|
|||||||
//#define MISO 23 // 13 B3 ICSP-06 EXP2-05
|
//#define MISO 23 // 13 B3 ICSP-06 EXP2-05
|
||||||
|
|
||||||
// Alter timing for graphical display
|
// Alter timing for graphical display
|
||||||
#define BOARD_ST7920_DELAY_1 DELAY_NS(313)
|
#define BOARD_ST7920_DELAY_1 313
|
||||||
#define BOARD_ST7920_DELAY_2 DELAY_NS(313)
|
#define BOARD_ST7920_DELAY_2 313
|
||||||
#define BOARD_ST7920_DELAY_3 DELAY_NS(313)
|
#define BOARD_ST7920_DELAY_3 313
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user