mirror of
https://github.com/meshtastic/firmware.git
synced 2025-06-08 22:22:05 +00:00
added SPI Speed to constructor+ cleaned up variant.h
This commit is contained in:
parent
f5e3acb8c2
commit
acc0cfe773
@ -1546,7 +1546,7 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
|
|||||||
#elif defined(USE_ST7796)
|
#elif defined(USE_ST7796)
|
||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
dispdev = new ST7796Spi(&SPI3, ST7796_RESET, ST7796_RS, ST7796_NSS, GEOMETRY_RAWMODE, TFT_WIDTH, TFT_HEIGHT, ST7796_SDA,
|
dispdev = new ST7796Spi(&SPI3, ST7796_RESET, ST7796_RS, ST7796_NSS, GEOMETRY_RAWMODE, TFT_WIDTH, TFT_HEIGHT, ST7796_SDA,
|
||||||
ST7796_MISO, ST7796_SCK);
|
ST7796_MISO, ST7796_SCK, TFT_SPI_FREQUENCY);
|
||||||
#else
|
#else
|
||||||
dispdev = new ST7796Spi(&SPI3, ST7796_RESET, ST7796_RS, ST7796_NSS, GEOMETRY_RAWMODE, TFT_WIDTH, TFT_HEIGHT);
|
dispdev = new ST7796Spi(&SPI3, ST7796_RESET, ST7796_RS, ST7796_NSS, GEOMETRY_RAWMODE, TFT_WIDTH, TFT_HEIGHT);
|
||||||
#endif
|
#endif
|
||||||
@ -1687,13 +1687,13 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
|
|||||||
#ifdef USE_ST7796
|
#ifdef USE_ST7796
|
||||||
SPI3.end();
|
SPI3.end();
|
||||||
#if defined(ARCH_ESP32)
|
#if defined(ARCH_ESP32)
|
||||||
pinMode(VTFT_LEDA, ANALOG);
|
pinMode(VTFT_LEDA, OUTPUT);
|
||||||
|
digitalWrite(VTFT_LEDA, LOW);
|
||||||
pinMode(ST7796_RESET, ANALOG);
|
pinMode(ST7796_RESET, ANALOG);
|
||||||
pinMode(ST7796_RS, ANALOG);
|
pinMode(ST7796_RS, ANALOG);
|
||||||
pinMode(ST7796_NSS, ANALOG);
|
pinMode(ST7796_NSS, ANALOG);
|
||||||
#else
|
#else
|
||||||
nrf_gpio_cfg_default(VTFT_LEDA);
|
nrf_gpio_cfg_default(VTFT_LEDA);
|
||||||
nrf_gpio_cfg_default(VTFT_CTRL);
|
|
||||||
nrf_gpio_cfg_default(ST7796_RESET);
|
nrf_gpio_cfg_default(ST7796_RESET);
|
||||||
nrf_gpio_cfg_default(ST7796_RS);
|
nrf_gpio_cfg_default(ST7796_RS);
|
||||||
nrf_gpio_cfg_default(ST7796_NSS);
|
nrf_gpio_cfg_default(ST7796_NSS);
|
||||||
|
@ -4,7 +4,7 @@ extends = esp32_base
|
|||||||
board = ttgo-t-beam
|
board = ttgo-t-beam
|
||||||
board_check = true
|
board_check = true
|
||||||
lib_deps = ${esp32_base.lib_deps}
|
lib_deps = ${esp32_base.lib_deps}
|
||||||
https://github.com/Nasimovy/st7796/archive/refs/tags/1.0.4.zip ; display addon
|
https://github.com/Nasimovy/st7796/archive/refs/tags/1.0.5.zip ; display addon
|
||||||
build_flags = ${esp32_base.build_flags}
|
build_flags = ${esp32_base.build_flags}
|
||||||
-DTBEAM_V10
|
-DTBEAM_V10
|
||||||
-Ivariants/tbeam_TFT
|
-Ivariants/tbeam_TFT
|
||||||
|
@ -13,10 +13,7 @@
|
|||||||
#define ST7796_MISO -1
|
#define ST7796_MISO -1
|
||||||
#define ST7796_BUSY -1
|
#define ST7796_BUSY -1
|
||||||
#define VTFT_LEDA 4
|
#define VTFT_LEDA 4
|
||||||
#define TFT_BACKLIGHT_ON HIGH
|
#define TFT_SPI_FREQUENCY 1000000
|
||||||
#define ST7796_SPI_HOST VSPI_HOST
|
|
||||||
#define SPI_FREQUENCY 10000000
|
|
||||||
#define SPI_READ_FREQUENCY 4000000
|
|
||||||
#define TFT_HEIGHT 222
|
#define TFT_HEIGHT 222
|
||||||
#define TFT_WIDTH 480
|
#define TFT_WIDTH 480
|
||||||
#define BRIGHTNESS_DEFAULT 100 // Medium Low Brightnes
|
#define BRIGHTNESS_DEFAULT 100 // Medium Low Brightnes
|
||||||
|
Loading…
Reference in New Issue
Block a user