Add networkGetBroadcastIpAddress and networkGetSubnetMask

Author: LeeLeahy2

Firmware/RTK_Everywhere/Developer.ino

@@ -12,6 +12,7 @@
 void menuEthernet() {systemPrintln("**Ethernet not compiled**");}
 void ethernetBegin() {}
 IPAddress ethernetGetIpAddress() {return IPAddress((uint32_t)0);}
+IPAddress ethernetGetSubnetMask() {return IPAddress((uint32_t)0);}
 void ethernetUpdate() {}
 void ethernetVerifyTables() {}
 
@@ -154,6 +155,7 @@ void menuWiFi() {systemPrintln("**WiFi not compiled**");}
 bool wifiConnect(unsigned long timeout) {return false;}
 IPAddress wifiGetGatewayIpAddress() {return IPAddress((uint32_t)0);}
 IPAddress wifiGetIpAddress() {return IPAddress((uint32_t)0);}
+IPAddress wifiGetSubnetMask() {return IPAddress((uint32_t)0);}
 int wifiGetRssi() {return -999;}
 String wifiGetSsid() {return "**WiFi Not compiled**";}
 bool wifiIsConnected() {return false;}

Firmware/RTK_Everywhere/Ethernet.ino

@@ -162,6 +162,12 @@ IPAddress ethernetGetIpAddress()
     return ETH.localIP();
 }
 
+// Return the subnet mask for the Ethernet controller
+IPAddress ethernetGetSubnetMask()
+{
+    return ETH.subnetMask();
+}
+
 // Determine if Ethernet is needed. Saves RAM...
 bool ethernetIsNeeded()
 {

Firmware/RTK_Everywhere/Network.ino

@@ -433,6 +433,23 @@ NETWORK_DATA *networkGet(uint8_t networkType, bool updateRequestedNetwork)
     return network;
 }
 
+//----------------------------------------
+// Get the broadast IP address
+//----------------------------------------
+IPAddress networkGetBroadcastIpAddress(uint8_t networkType)
+{
+    IPAddress ip;
+    IPAddress mask;
+    IPAddress temp;
+
+    // Get the local network address and subnet mask
+    ip = networkGetIpAddress(networkType);
+    mask = networkGetSubnetMask(networkType);
+
+    // Return the local network broadcast IP address
+    return IPAddress((uint32_t)ip | (~(uint32_t)mask));
+}
+
 //----------------------------------------
 // Get the IP address
 //----------------------------------------
@@ -445,6 +462,19 @@ IPAddress networkGetIpAddress(uint8_t networkType)
     return IPAddress((uint32_t)0);
 }
 
+//----------------------------------------
+// Get the subnet mask
+//----------------------------------------
+IPAddress networkGetSubnetMask(uint8_t networkType)
+{
+    // Determine the network address
+    if (networkType == NETWORK_TYPE_ETHERNET)
+        return ethernetGetSubnetMask();
+    else if (networkType == NETWORK_TYPE_WIFI)
+        return wifiGetSubnetMask();
+    return IPAddress((uint32_t)0);
+}
+
 //----------------------------------------
 // Get the network type
 //----------------------------------------

Firmware/RTK_Everywhere/UdpServer.ino

@@ -107,7 +107,8 @@ int32_t udpServerSendDataBroadcast(uint8_t *data, uint16_t length)
     // Send the data as broadcast
     if (settings.enableUdpServer && online.udpServer && wifiIsConnected())
     {
-        udpServer->beginPacket(WiFi.broadcastIP(), settings.udpServerPort);
+        udpServer->beginPacket(networkGetBroadcastIpAddress(networkGetType(NETWORK_USER_UDP_SERVER)),
+                               settings.udpServerPort);
         udpServer->write(data, length);
         if (udpServer->endPacket())
         {

Firmware/RTK_Everywhere/WiFi.ino

@@ -489,6 +489,7 @@ bool wifiConnect(unsigned long timeout)
 {
     return wifiConnect(timeout, false, nullptr);
 }
+
 bool wifiConnect(unsigned long timeout, bool useAPSTAMode, bool *wasInAPmode)
 {
     if (wifiIsConnected())
@@ -698,21 +699,31 @@ void wifiPrintNetworkInfo()
     systemPrintln();
 }
 
+// Return the gateway IP address for the WiFi controller
 IPAddress wifiGetGatewayIpAddress()
 {
     return WiFi.gatewayIP();
 }
 
+// Return the IP address for the WiFi controller
 IPAddress wifiGetIpAddress()
 {
     return WiFi.localIP();
 }
 
+// Return the subnet mask for the WiFi controller
+IPAddress wifiGetSubnetMask()
+{
+    return WiFi.subnetMask();
+}
+
+// Return the WiFi signal signal strength
 int wifiGetRssi()
 {
     return WiFi.RSSI();
 }
 
+// Return the Wifi station ID
 String wifiGetSsid()
 {
     return WiFi.SSID();