pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-20 20:12:12 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix merge issue

Browse Source
This commit is contained in:
mverch67 2024-08-21 02:19:08 +02:00
parent 4746112752
commit 1d1995b798
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.cpp
View File

@ -123,6 +123,7 @@ AudioThread *audioThread = nullptr;
void tft_task_handler(void *); void tft_task_handler(void *);
DeviceScreen *deviceScreen = nullptr; DeviceScreen *deviceScreen = nullptr;
#endif
#if defined(TCXO_OPTIONAL) #if defined(TCXO_OPTIONAL)
float tcxoVoltage = SX126X_DIO3_TCXO_VOLTAGE; // if TCXO is optional, put this here so it can be changed further down. 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; deviceMetadata.hasRemoteHardware = moduleConfig.remote_hardware.enabled;
return deviceMetadata; return deviceMetadata;
} }
#ifndef PIO_UNIT_TESTING #ifndef PIO_UNIT_TESTING
void loop() void loop()
{ {
@ -1261,6 +1263,7 @@ void loop()
} }
// if (didWake) LOG_DEBUG("wake!\n"); // if (didWake) LOG_DEBUG("wake!\n");
} }
#endif
#if HAS_TFT #if HAS_TFT
void tft_task_handler(void *param = nullptr) void tft_task_handler(void *param = nullptr)