Merge pull request #398 from LeeLeahy2/ethernet-firmware

Firmware menu now does OTA over Ethernet

Author: nseidle

Firmware/RTK_Everywhere/Network.ino

@@ -493,6 +493,31 @@ uint8_t networkGetActiveType()
 //----------------------------------------
 // Get the network type
 //----------------------------------------
+uint8_t networkGetType()
+{
+    NETWORK_DATA *network;
+
+    // Return the current type if known
+    network = networkGet(NETWORK_TYPE_ACTIVE, false);
+    if (network && (network->type < NETWORK_TYPE_MAX))
+        return network->type;
+
+    // Network type not determined yet
+    // Determine if this type will be Ethernet
+    if (present.ethernet_ws5500)
+    {
+        if ((settings.defaultNetworkType == NETWORK_TYPE_USE_DEFAULT)
+            || (settings.defaultNetworkType == NETWORK_TYPE_ETHERNET))
+            return NETWORK_TYPE_ETHERNET;
+    }
+
+    // Type will be WiFi
+    return NETWORK_TYPE_WIFI;
+}
+
+//----------------------------------------
+// Get the network type for a network user
+//----------------------------------------
 uint8_t networkGetType(uint8_t user)
 {
     NETWORK_DATA *network;

Firmware/RTK_Everywhere/menuFirmware.ino

@@ -589,19 +589,24 @@ void otaUpdate()
     bool previouslyConnected = wifiIsConnected();
 
     bool wasInAPmode;
+    uint8_t networkType;
 
-    if (wifiConnect(settings.wifiConnectTimeoutMs, true, &wasInAPmode) ==
-        true) // Use WIFI_AP_STA if already in WIFI_AP mode
+    networkType = networkGetType();
+    if ((networkType != NETWORK_TYPE_WIFI)
+        || (wifiConnect(settings.wifiConnectTimeoutMs, true, &wasInAPmode)
+            == true)) // Use WIFI_AP_STA if already in WIFI_AP mode
         overTheAirUpdate();
 
     // Update failed. If we were in WIFI_AP mode, return to WIFI_AP mode
-    if (wasInAPmode)
-        wifiSetApMode();
-
-    // Update failed. If WiFi was originally off, turn it off again
-    if (previouslyConnected == false)
-        WIFI_STOP();
+    if (networkType == NETWORK_TYPE_WIFI)
+    {
+        if (wasInAPmode)
+            wifiSetApMode();
 
+        // Update failed. If WiFi was originally off, turn it off again
+        if (previouslyConnected == false)
+            WIFI_STOP();
+    }
 #endif // COMPILE_NETWORK
 }