Merge pull request #378 from sparkfun/Fix_#359

Fix #359

Author: nseidle

Firmware/RTK_Everywhere/Ethernet.ino

@@ -35,6 +35,17 @@ void menuEthernet()
             systemPrintln(settings.ethernetSubnet.toString().c_str());
         }
 
+        //------------------------------
+        // Display the network layer menu items
+        //------------------------------
+
+        systemPrint("d) Default network: ");
+        networkPrintName(settings.defaultNetworkType);
+        systemPrintln();
+
+        systemPrint("f) Ethernet / WiFi Failover: ");
+        systemPrintf("%s\r\n", settings.enableNetworkFailover ? "Enabled" : "Disabled");
+
         systemPrintln("x) Exit");
 
         byte incoming = getUserInputCharacterNumber();
@@ -96,6 +107,24 @@ void menuEthernet()
             else
                 systemPrint("Error: invalid Subnet Mask");
         }
+
+        //------------------------------
+        // Get the network layer parameters
+        //------------------------------
+
+        else if (incoming == 'd')
+        {
+            // Toggle the network type
+            settings.defaultNetworkType += 1;
+            if (settings.defaultNetworkType > NETWORK_TYPE_USE_DEFAULT)
+                settings.defaultNetworkType = 0;
+        }
+        else if (incoming == 'f')
+        {
+            // Toggle failover support
+            settings.enableNetworkFailover ^= 1;
+        }
+
         else if (incoming == 'x')
             break;
         else if (incoming == INPUT_RESPONSE_GETCHARACTERNUMBER_EMPTY)

Firmware/RTK_Everywhere/Network.ino

@@ -232,20 +232,6 @@ void menuTcpUdp()
         if (settings.enableUdpServer)
             systemPrintf("7) UDP Server Port: %ld\r\n", settings.udpServerPort);
 
-        if (present.ethernet_ws5500 == true)
-        {
-            //------------------------------
-            // Display the network layer menu items
-            //------------------------------
-
-            systemPrint("d) Default network: ");
-            networkPrintName(settings.defaultNetworkType);
-            systemPrintln();
-
-            systemPrint("f) Ethernet / WiFi Failover: ");
-            systemPrintf("%s\r\n", settings.enableNetworkFailover ? "Enabled" : "Disabled");
-        }
-
         //------------------------------
         // Finish the menu and get the input
         //------------------------------
@@ -317,23 +303,6 @@ void menuTcpUdp()
             getNewSetting("Enter the UDP port to use", 0, 65535, &settings.udpServerPort);
         }
 
-        //------------------------------
-        // Get the network layer parameters
-        //------------------------------
-
-        else if ((incoming == 'd') && (present.ethernet_ws5500 == true))
-        {
-            // Toggle the network type
-            settings.defaultNetworkType += 1;
-            if (settings.defaultNetworkType > NETWORK_TYPE_USE_DEFAULT)
-                settings.defaultNetworkType = 0;
-        }
-        else if ((incoming == 'f') && (present.ethernet_ws5500 == true))
-        {
-            // Toggle failover support
-            settings.enableNetworkFailover ^= 1;
-        }
-
         //------------------------------
         // Handle exit and invalid input
         //------------------------------