From 1d1995b7985a34fb55c0ca852492c61c1c0a1c62 Mon Sep 17 00:00:00 2001
From: mverch67 <manuel.verch@gmx.de>
Date: Wed, 21 Aug 2024 02:19:08 +0200
Subject: [PATCH] fix merge issue

---
 src/main.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main.cpp b/src/main.cpp
index ab2098fb8..a41eaa504 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -123,6 +123,7 @@ AudioThread *audioThread = nullptr;
 void tft_task_handler(void *);
 
 DeviceScreen *deviceScreen = nullptr;
+#endif
 
 #if defined(TCXO_OPTIONAL)
 float tcxoVoltage = SX126X_DIO3_TCXO_VOLTAGE; // if TCXO is optional, put this here so it can be changed further down.
@@ -1215,6 +1216,7 @@ extern meshtastic_DeviceMetadata getDeviceMetadata()
     deviceMetadata.hasRemoteHardware = moduleConfig.remote_hardware.enabled;
     return deviceMetadata;
 }
+
 #ifndef PIO_UNIT_TESTING
 void loop()
 {
@@ -1261,6 +1263,7 @@ void loop()
     }
     // if (didWake) LOG_DEBUG("wake!\n");
 }
+#endif
 
 #if HAS_TFT
 void tft_task_handler(void *param = nullptr)