Add settings.displayServerIP

Author: PaulZC

Firmware/RTK_Surveyor/Display.ino

@@ -236,6 +236,9 @@ void menuNetwork()
         if (settings.enablePvtUdpServer)
             systemPrintf("7) PVT UDP Server Port: %ld\r\n", settings.pvtUdpServerPort);
 
+        if ((settings.enablePvtServer) || (settings.enablePvtUdpServer))
+            systemPrintf("8) Display server IP address: %s\r\n", settings.displayServerIP ? "Enabled" : "Disabled");
+
         if (HAS_ETHERNET)
         {
             //------------------------------
@@ -348,7 +351,10 @@ void menuNetwork()
             }
         }
 
-        //------------------------------
+        else if (incoming == 8 && ((settings.enablePvtServer) || (settings.enablePvtUdpServer)))
+            settings.displayServerIP ^= 1;
+
+            //------------------------------
         // Get the network layer parameters
         //------------------------------
 

Firmware/RTK_Surveyor/Network.ino

@@ -83,6 +83,8 @@ static volatile RING_BUFFER_OFFSET pvtServerClientTails[PVT_SERVER_MAX_CLIENTS];
 // PVT Server handleGnssDataTask Support Routines
 //----------------------------------------
 
+bool pvtServerRunning() { return (pvtServerState == PVT_SERVER_STATE_RUNNING); }
+
 // Send data to the PVT clients
 int32_t pvtServerClientSendData(int index, uint8_t *data, uint16_t length)
 {
@@ -576,4 +578,21 @@ void pvtServerZeroTail()
         pvtServerClientTails[index] = 0;
 }
 
+void paintPvtServerIP()
+{
+    IPAddress localIp;
+    NETWORK_DATA * network;
+    network = &networkData;
+    if (network)
+        localIp = networkGetIpAddress(network->type);
+
+    char message[31];
+
+    snprintf(message, sizeof(message), "%d.%d. %d.%d: %d",
+                 localIp[0], localIp[1], localIp[2], localIp[3],
+                 settings.pvtServerPort);
+
+    displayMessageSmall(message, 0);
+}
+
 #endif // COMPILE_NETWORK

Firmware/RTK_Surveyor/PvtServer.ino

@@ -101,6 +101,10 @@ static volatile RING_BUFFER_OFFSET pvtUdpServerTail;
 // PVT UDP Server handleGnssDataTask Support Routines
 //----------------------------------------
 
+bool udpServerRunning()
+{
+    return (pvtUdpServerState == PVT_UDP_SERVER_STATE_RUNNING);
+}
 // Send data as broadcast
 int32_t pvtUdpServerSendDataBroadcast(uint8_t *data, uint16_t length)
 {
@@ -378,4 +382,21 @@ void pvtUdpServerZeroTail()
     pvtUdpServerTail = 0;
 }
 
+void paintUdpServerIP()
+{
+    IPAddress localIp;
+    NETWORK_DATA * network;
+    network = &networkData;
+    if (network)
+        localIp = networkGetIpAddress(network->type);
+
+    char message[31];
+
+    snprintf(message, sizeof(message), "%d.%d. %d.%d: %d",
+                 localIp[0], localIp[1], localIp[2], localIp[3],
+                 settings.pvtUdpServerPort);
+
+    displayMessageSmall(message, 0);
+}
+
 #endif // COMPILE_NETWORK

Firmware/RTK_Surveyor/PvtUdpServer.ino

@@ -481,6 +481,12 @@ const uint8_t btMaxEscapeCharacters = 3; // Number of characters needed to enter
 // External Display
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #include <SparkFun_Qwiic_OLED.h> //http://librarymanager/All#SparkFun_Qwiic_Graphic_OLED
+
+#ifdef COMPILE_NETWORK
+bool pvtServerRunning(); // Header
+bool udpServerRunning(); // Header
+#endif // COMPILE_NETWORK
+
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 // Firmware binaries loaded from SD

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -1192,6 +1192,7 @@ typedef struct
     bool debugPvtServer = false;
     bool enablePvtServer = false;
     uint16_t pvtServerPort = 2948; // PVT server port, 2948 is GPS Daemon: http://tcp-udp-ports.com/port-2948.htm
+    bool displayServerIP = true;
 
     // UDP Server
     bool debugPvtUdpServer = false;