Skip to content

Commit ba4071a

Browse files
committed
Fix WiFi dependency in UdpServer
1 parent 68cffd0 commit ba4071a

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

Firmware/RTK_Everywhere/UdpServer.ino

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,24 +105,26 @@ int32_t udpServerSendDataBroadcast(uint8_t *data, uint16_t length)
105105
return 0;
106106

107107
// Send the data as broadcast
108-
if (settings.enableUdpServer && online.udpServer && wifiIsConnected())
108+
if (settings.enableUdpServer && online.udpServer && networkIsMediaConnected(networkGetUserNetwork(NETWORK_USER_UDP_SERVER)))
109109
{
110-
udpServer->beginPacket(networkGetBroadcastIpAddress(networkGetType(NETWORK_USER_UDP_SERVER)),
111-
settings.udpServerPort);
110+
IPAddress broadcastAddress = networkGetBroadcastIpAddress(networkGetType(NETWORK_USER_UDP_SERVER));
111+
udpServer->beginPacket( broadcastAddress, settings.udpServerPort);
112112
udpServer->write(data, length);
113113
if (udpServer->endPacket())
114114
{
115115
if ((settings.debugUdpServer || PERIODIC_DISPLAY(PD_UDP_SERVER_BROADCAST_DATA)) && (!inMainMenu))
116116
{
117-
systemPrintf("UDP Server wrote %d bytes as broadcast on port %d\r\n", length, settings.udpServerPort);
117+
systemPrintf("UDP Server wrote %d bytes as broadcast (%s) on port %d\r\n", length,
118+
broadcastAddress.toString(), settings.udpServerPort);
118119
PERIODIC_CLEAR(PD_UDP_SERVER_BROADCAST_DATA);
119120
}
120121
}
121122
// Failed to write the data
122123
else if ((settings.debugUdpServer || PERIODIC_DISPLAY(PD_UDP_SERVER_BROADCAST_DATA)) && (!inMainMenu))
123124
{
124125
PERIODIC_CLEAR(PD_UDP_SERVER_BROADCAST_DATA);
125-
systemPrintf("UDP Server failed to write %d bytes as broadcast\r\n", length);
126+
systemPrintf("UDP Server failed to write %d bytes as broadcast (%s) on port %d\r\n", length,
127+
broadcastAddress.toString(), settings.udpServerPort);
126128
length = 0;
127129
}
128130
}
@@ -204,17 +206,17 @@ void udpServerSetState(uint8_t newState)
204206
if ((settings.debugUdpServer || PERIODIC_DISPLAY(PD_UDP_SERVER_STATE)) && (!inMainMenu))
205207
{
206208
if (udpServerState == newState)
207-
systemPrint("*");
209+
systemPrint("UDP Server: *");
208210
else
209-
systemPrintf("%s --> ", udpServerStateName[udpServerState]);
211+
systemPrintf("UDP Server: %s --> ", udpServerStateName[udpServerState]);
210212
}
211213
udpServerState = newState;
212214
if ((settings.debugUdpServer || PERIODIC_DISPLAY(PD_UDP_SERVER_STATE)) && (!inMainMenu))
213215
{
214216
PERIODIC_CLEAR(PD_UDP_SERVER_STATE);
215217
if (newState >= UDP_SERVER_STATE_MAX)
216218
{
217-
systemPrintf("Unknown UDP Server state: %d\r\n", udpServerState);
219+
systemPrintf("Unknown state: %d\r\n", udpServerState);
218220
reportFatalError("Unknown UDP Server state");
219221
}
220222
else
@@ -311,7 +313,7 @@ void udpServerUpdate()
311313
// Wait until the UDP server is enabled
312314
case UDP_SERVER_STATE_OFF:
313315
// Determine if the UDP server should be running
314-
if (EQ_RTK_MODE(udpServerMode) && settings.enableUdpServer && (!wifiIsConnected()))
316+
if (EQ_RTK_MODE(udpServerMode) && settings.enableUdpServer) // Was && (!wifiIsConnected())) - TODO check this
315317
{
316318
if (networkUserOpen(NETWORK_USER_UDP_SERVER, NETWORK_TYPE_ACTIVE))
317319
{

0 commit comments

Comments
 (0)