diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index a153d9519..01ff06218 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -1643,8 +1643,6 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver) #endif #endif #ifdef USE_ST7796 - pinMode(VTFT_CTRL, OUTPUT); - digitalWrite(VTFT_CTRL, LOW); ui->init(); #ifdef ESP_PLATFORM analogWrite(VTFT_LEDA, BRIGHTNESS_DEFAULT); @@ -1690,7 +1688,6 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver) SPI3.end(); #if defined(ARCH_ESP32) pinMode(VTFT_LEDA, ANALOG); - pinMode(VTFT_CTRL, ANALOG); pinMode(ST7796_RESET, ANALOG); pinMode(ST7796_RS, ANALOG); pinMode(ST7796_NSS, ANALOG); @@ -1796,7 +1793,7 @@ void Screen::setup() #elif defined(USE_ST7789) static_cast(dispdev)->flipScreenVertically(); #elif defined(USE_ST7796) - static_cast(dispdev)->flipScreenVertically(); + static_cast(dispdev)->mirrorScreen(); #else dispdev->flipScreenVertically(); #endif diff --git a/variants/tbeam/platformio.ini b/variants/tbeam/platformio.ini index a8b95d91b..294eea61f 100644 --- a/variants/tbeam/platformio.ini +++ b/variants/tbeam/platformio.ini @@ -5,7 +5,7 @@ board = ttgo-t-beam board_check = true lib_deps = ${esp32_base.lib_deps} lewisxhe/SensorLib@0.2.0 ; touchscreen addon - https://github.com/Nasimovy/st7796/archive/refs/tags/1.0.1.zip ; display addon + https://github.com/Nasimovy/st7796/archive/refs/tags/1.0.4.zip ; display addon build_flags = ${esp32_base.build_flags} -DTBEAM_V10 -Ivariants/tbeam diff --git a/variants/tbeam/variant.h b/variants/tbeam/variant.h index 07056f5cf..78a1d8115 100644 --- a/variants/tbeam/variant.h +++ b/variants/tbeam/variant.h @@ -45,7 +45,10 @@ // #define GPS_DEBUG // Display addon +#define HAS_TOUCHSCREEN 1 +#define USE_VIRTUAL_KEYBOARD 1 #define HAS_CST226SE +#define SCREEN_TOUCH_INT 35 #define USE_ST7796 #define ST7796_NSS 25 #define ST7796_RS 13 // DC @@ -54,17 +57,11 @@ #define ST7796_RESET 2 #define ST7796_MISO -1 #define ST7796_BUSY -1 -#define VTFT_CTRL 7 #define VTFT_LEDA 4 #define TFT_BACKLIGHT_ON HIGH #define ST7796_SPI_HOST VSPI_HOST -#define SPI_FREQUENCY 10000000 -#define SPI_READ_FREQUENCY 10000000 +#define SPI_FREQUENCY 40000000 +#define SPI_READ_FREQUENCY 16000000 #define TFT_HEIGHT 222 #define TFT_WIDTH 480 -#define TFT_OFFSET_X 0 -#define TFT_OFFSET_Y 0 -// #define TFT_OFFSET_ROTATION 0 -// #define SCREEN_ROTATE -// #define SCREEN_TRANSITION_FRAMERATE 5 #define BRIGHTNESS_DEFAULT 100 // Medium Low Brightnes \ No newline at end of file