Add NETWORK_STOP macro to print location of call to networkStop

Author: LeeLeahy2

Firmware/RTK_Surveyor/Network.ino

@@ -1041,7 +1041,9 @@ void networkTypeUpdate(uint8_t networkType)
         case NETWORK_STATE_DELAY:
             // Determine if the network is shutting down
             if (network->shutdown)
-                networkStop(network->type);
+            {
+                NETWORK_STOP(network->type);
+            }
 
             // Delay before starting the network
             else if ((millis() - network->timerStart) >= network->timeout)
@@ -1070,7 +1072,9 @@ void networkTypeUpdate(uint8_t networkType)
         case NETWORK_STATE_CONNECTING:
             // Determine if the network is shutting down
             if (network->shutdown)
-                networkStop(network->type);
+            {
+                NETWORK_STOP(network->type);
+            }
 
             // Determine if the connection failed
             else if ((millis() - network->timerStart) >= network->timeout)
@@ -1079,7 +1083,7 @@ void networkTypeUpdate(uint8_t networkType)
                 if (settings.debugNetworkLayer)
                     systemPrintf("Network: %s connection timed out\r\n", networkName[network->type]);
                 networkRestartNetwork(network);
-                networkStop(network->type);
+                NETWORK_STOP(network->type);
             }
 
             // Determine if the RTK host is connected to the network
@@ -1099,7 +1103,9 @@ void networkTypeUpdate(uint8_t networkType)
         case NETWORK_STATE_IN_USE:
             // Determine if the network is shutting down
             if (network->shutdown)
-                networkStop(network->type);
+            {
+                NETWORK_STOP(network->type);
+            }
 
             // Verify that the RTK device is still connected to the network
             else if (!networkIsMediaConnected(network))
@@ -1108,7 +1114,7 @@ void networkTypeUpdate(uint8_t networkType)
                 if (settings.debugNetworkLayer)
                     systemPrintf("Network: %s connection failed!\r\n", networkName[network->type]);
                 networkRestartNetwork(network);
-                networkStop(network->type);
+                NETWORK_STOP(network->type);
             }
 
             // Check for the idle timeout
@@ -1130,15 +1136,15 @@ void networkTypeUpdate(uint8_t networkType)
                 {
                     if (settings.debugNetworkLayer)
                         systemPrintf("Network shutting down %s, no users\r\n", networkName[network->type]);
-                    networkStop(network->type);
+                    NETWORK_STOP(network->type);
                 }
             }
             break;
 
         case NETWORK_STATE_WAIT_NO_USERS:
             // Stop the network when all the users are removed
             if (!network->activeUsers)
-                networkStop(network->type);
+                NETWORK_STOP(network->type);
             break;
     }
 
@@ -1208,7 +1214,7 @@ void networkUserClose(uint8_t user)
 
             // Shutdown the network if requested
             if (network->shutdown && (!network->activeUsers))
-                networkStop(network->type);
+                NETWORK_STOP(network->type);
         }
 
         // The network user is not running

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -208,6 +208,13 @@ char logFileName[sizeof("SFE_Reference_Station_230101_120101.ubx_plusExtraSpace"
 
 #include "esp_ota_ops.h" //Needed for partition counting and updateFromSD
 
+#define NETWORK_STOP(type)                                                                                                    \
+    {                                                                                                                  \
+        if (settings.debugNetworkLayer)                                                                                   \
+            systemPrintf("networkStop called by %s %d\r\n", __FILE__, __LINE__);                                          \
+        networkStop(type);                                                                                                    \
+    }
+
 #ifdef COMPILE_WIFI
 #include "ESP32OTAPull.h" //http://librarymanager/All#ESP-OTA-Pull Used for getting
 

Firmware/RTK_Surveyor/States.ino

@@ -121,7 +121,7 @@ void updateSystemState()
 
             setMuxport(settings.dataPortChannel); // Return mux to original channel
 
-            networkStop(NETWORK_TYPE_WIFI);
+            NETWORK_STOP(NETWORK_TYPE_WIFI);
             WIFI_STOP();      // Stop WiFi, ntripClient will start as needed.
             bluetoothStart(); // Turn on Bluetooth with 'Rover' name
             radioStart();     // Start internal radio if enabled, otherwise disable
@@ -254,7 +254,7 @@ void updateSystemState()
             // Allow WiFi to continue running if NTRIP Client is needed for assisted survey in
             if (wifiIsNeeded() == false)
             {
-                networkStop(NETWORK_TYPE_WIFI);
+                NETWORK_STOP(NETWORK_TYPE_WIFI);
                 WIFI_STOP();
             }
 

Firmware/RTK_Surveyor/WiFi.ino

@@ -426,7 +426,7 @@ void wifiStop()
         dnsServer.stop();
 
     // Stop the other network clients and then WiFi
-    networkStop(NETWORK_TYPE_WIFI);
+    NETWORK_STOP(NETWORK_TYPE_WIFI);
 }
 
 // Stop WiFi and release all resources