diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index 44c7a97bd..a7c43dce0 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -1526,7 +1526,7 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_ #if defined(ESP_PLATFORM) && defined(USE_ST7789) SPIClass SPI1(HSPI); #elif defined(ESP_PLATFORM) && defined(USE_ST7796) -SPIClass SPI3(VSPI); +SPIClass SPI3(HSPI); #endif Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_OledType screenType, OLEDDISPLAY_GEOMETRY geometry) diff --git a/src/main.cpp b/src/main.cpp index 4881e27a6..f372a26ad 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -840,11 +840,7 @@ void setup() // ESP32 SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS); LOG_DEBUG("SPI.begin(SCK=%d, MISO=%d, MOSI=%d, NSS=%d)", LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS); -#if defined(TBEAM_V10) && defined(USE_ST7796) - SPI.setFrequency(LORA_SPI_FREQUENCY); -#else SPI.setFrequency(4000000); -#endif #endif // Initialize the screen first so we can show the logo while we start up everything else. diff --git a/variants/tbeam/variant.h b/variants/tbeam/variant.h index 4e16e5c70..6a775e97b 100644 --- a/variants/tbeam/variant.h +++ b/variants/tbeam/variant.h @@ -46,7 +46,6 @@ // Used when the diplay shield is chosen #ifdef USE_ST7796 -#define LORA_SPI_FREQUENCY 1000000 #undef EXT_NOTIFY_OUT #undef LED_STATE_ON @@ -60,7 +59,7 @@ #define ST7796_MISO -1 #define ST7796_BUSY -1 #define VTFT_LEDA 4 -#define TFT_SPI_FREQUENCY 500000 +#define TFT_SPI_FREQUENCY 4000000 #define TFT_HEIGHT 222 #define TFT_WIDTH 480 #define BRIGHTNESS_DEFAULT 100 // Medium Low Brightnes