From acc0cfe77316c56b83b0d1e3961f2c96655f5fd8 Mon Sep 17 00:00:00 2001 From: nasimovy Date: Tue, 15 Apr 2025 16:45:44 +0000 Subject: [PATCH] added SPI Speed to constructor+ cleaned up variant.h --- src/graphics/Screen.cpp | 6 +++--- variants/tbeam_TFT/platformio.ini | 2 +- variants/tbeam_TFT/variant.h | 5 +---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index 01ff06218..44c7a97bd 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -1546,7 +1546,7 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O #elif defined(USE_ST7796) #ifdef ESP_PLATFORM 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 dispdev = new ST7796Spi(&SPI3, ST7796_RESET, ST7796_RS, ST7796_NSS, GEOMETRY_RAWMODE, TFT_WIDTH, TFT_HEIGHT); #endif @@ -1687,13 +1687,13 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver) #ifdef USE_ST7796 SPI3.end(); #if defined(ARCH_ESP32) - pinMode(VTFT_LEDA, ANALOG); + pinMode(VTFT_LEDA, OUTPUT); + digitalWrite(VTFT_LEDA, LOW); pinMode(ST7796_RESET, ANALOG); pinMode(ST7796_RS, ANALOG); pinMode(ST7796_NSS, ANALOG); #else nrf_gpio_cfg_default(VTFT_LEDA); - nrf_gpio_cfg_default(VTFT_CTRL); nrf_gpio_cfg_default(ST7796_RESET); nrf_gpio_cfg_default(ST7796_RS); nrf_gpio_cfg_default(ST7796_NSS); diff --git a/variants/tbeam_TFT/platformio.ini b/variants/tbeam_TFT/platformio.ini index 0c25c1706..47f44ea26 100644 --- a/variants/tbeam_TFT/platformio.ini +++ b/variants/tbeam_TFT/platformio.ini @@ -4,7 +4,7 @@ extends = esp32_base board = ttgo-t-beam board_check = true 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} -DTBEAM_V10 -Ivariants/tbeam_TFT diff --git a/variants/tbeam_TFT/variant.h b/variants/tbeam_TFT/variant.h index a58a8f296..2fd659754 100644 --- a/variants/tbeam_TFT/variant.h +++ b/variants/tbeam_TFT/variant.h @@ -13,10 +13,7 @@ #define ST7796_MISO -1 #define ST7796_BUSY -1 #define VTFT_LEDA 4 -#define TFT_BACKLIGHT_ON HIGH -#define ST7796_SPI_HOST VSPI_HOST -#define SPI_FREQUENCY 10000000 -#define SPI_READ_FREQUENCY 4000000 +#define TFT_SPI_FREQUENCY 1000000 #define TFT_HEIGHT 222 #define TFT_WIDTH 480 #define BRIGHTNESS_DEFAULT 100 // Medium Low Brightnes