pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-07-31 02:45:41 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' into better-shutdown

Browse Source
This commit is contained in:
Jonathan Bennett 2025-07-20 16:29:20 -05:00 committed by GitHub
commit cee8bef711
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesh/eth/ethClient.cpp
View File

@ -68,9 +68,11 @@ static int32_t reconnectETH()
initApiServer(); initApiServer();
} }
#endif #endif
#if HAS_UDP_MULTICAST
if (udpHandler && config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) { if (udpHandler && config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) {
udpHandler->start(); udpHandler->start();
} }
#endif
ethStartupComplete = true; ethStartupComplete = true;
} }

4
src/platform/nrf52/AsyncUDP.cpp
View File

@ -1,5 +1,7 @@
#include "AsyncUDP.h" #include "AsyncUDP.h"
#if HAS_ETHERNET
AsyncUDP::AsyncUDP() : OSThread("AsyncUDP"), localPort(0) {} AsyncUDP::AsyncUDP() : OSThread("AsyncUDP"), localPort(0) {}
bool AsyncUDP::listenMulticast(IPAddress multicastIP, uint16_t port, uint8_t ttl) bool AsyncUDP::listenMulticast(IPAddress multicastIP, uint16_t port, uint8_t ttl)
@ -67,3 +69,5 @@ int32_t AsyncUDP::runOnce()
} }
return 5; // check every 5ms return 5; // check every 5ms
} }
#endif // HAS_ETHERNET

6
src/platform/nrf52/AsyncUDP.h
View File

@ -1,6 +1,10 @@
#ifndef ASYNC_UDP_H #ifndef ASYNC_UDP_H
#define ASYNC_UDP_H #define ASYNC_UDP_H
#include "configuration.h"
#if HAS_ETHERNET
#include "concurrency/OSThread.h" #include "concurrency/OSThread.h"
#include <IPAddress.h> #include <IPAddress.h>
#include <Print.h> #include <Print.h>
@ -54,4 +58,6 @@ inline bool isMulticast(const IPAddress &ip)
return (ip[0] & 0xF0) == 0xE0; return (ip[0] & 0xF0) == 0xE0;
} }
#endif // HAS_ETHERNET
#endif // ASYNC_UDP_H #endif // ASYNC_UDP_H