From ce39c5133a149a4509a81663138a90e61202f451 Mon Sep 17 00:00:00 2001
From: mverch67 <manuel.verch@gmx.de>
Date: Mon, 26 Feb 2024 17:11:40 +0100
Subject: [PATCH] fix TFT initialization

---
 src/main.cpp                      | 16 +++++++---------
 variants/portduino/platformio.ini |  1 -
 variants/t-deck/platformio.ini    |  1 -
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 3f3686374..a0a39ec0e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -89,14 +89,12 @@ NRF52Bluetooth *nrf52Bluetooth;
 AudioThread *audioThread;
 #endif
 
-#ifdef USE_PACKET_API
+#ifdef HAS_TFT
+#include "DeviceScreen.h"
 #include "sharedMem/MeshPacketServer.h"
 #include "sharedMem/PacketClient.h"
-#endif
 
-#ifdef LGFX_TDECK
-#include "DeviceScreen.h"
-DeviceScreen *screen = nullptr;
+DeviceScreen *deviceScreen = nullptr;
 #endif
 
 using namespace concurrency;
@@ -364,10 +362,10 @@ void setup()
     // There needs to be a delay after power on, give LILYGO-KEYBOARD some startup time
     // otherwise keyboard and touch screen will not work
     delay(200);
-#ifdef LGFX_TDECK
-    screen = &DeviceScreen::create();
-    screen->init();
 #endif
+#ifdef HAS_TFT
+    deviceScreen = &DeviceScreen::create();
+    deviceScreen->init();
 #endif
 
     // Currently only the tbeam has a PMU
@@ -874,7 +872,7 @@ void setup()
     initApiServer(TCPPort);
 #endif
 
-#ifdef USE_PACKET_API
+#ifdef HAS_TFT
     MeshPacketServer::init();
     PacketClient::init();
 #endif
diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini
index 9e2e10233..c7ebe2b74 100644
--- a/variants/portduino/platformio.ini
+++ b/variants/portduino/platformio.ini
@@ -16,7 +16,6 @@ build_flags = ${portduino_base.build_flags} -O0 -lX11
   -D USE_X11=1
   -D HAS_TFT=1
   -D HAS_SCREEN=0
-  -D USE_PACKET_API
   -D VIEW_320x240
   -D VIEW_CLASS=TFTView_320x240
   -D VIEW_CLASS_INC=\"TFTView_320x240.h\"
diff --git a/variants/t-deck/platformio.ini b/variants/t-deck/platformio.ini
index f97675ff1..b727b29d4 100644
--- a/variants/t-deck/platformio.ini
+++ b/variants/t-deck/platformio.ini
@@ -19,7 +19,6 @@ build_flags = ${esp32_base.build_flags}
   -D VIEW_CLASS=TFTView_320x240
   -D VIEW_CLASS_INC=\"TFTView_320x240.h\"
 	-D USE_DOUBLE_BUFFER
-  -D USE_PACKET_API
 	-I lib/device-ui/generated/ui_320x240
 	-I variants/t-deck
 build_src_filter = ${esp32_base.build_src_filter} +<mesh/sharedMem/>