Merge pull request #527 from sparkfun/leeUpdates

Lee updates

Author: nseidle

Firmware/RTK_Everywhere/AP-Config/src/main.js

@@ -529,7 +529,7 @@ function parseIncoming(msg) {
         else if (id.includes("antennaHeight_mm")) {
             ge("antennaHeight_m").value = val / 1000.0;
         }
-            
+
         //Check boxes / radio buttons
         else if (val == "true") {
             try {
@@ -2700,4 +2700,4 @@ function printableInputType(coordinateInputType) {
             break;
     }
     return ("Unknown");
-}
+}

Firmware/RTK_Everywhere/Developer.ino

@@ -202,10 +202,11 @@ void menuWiFi() {systemPrintln("**WiFi not compiled**");}
 bool wifiApIsRunning() {return false;}
 bool wifiConnect(bool startWiFiStation, bool startWiFiAP, unsigned long timeout) {return false;}
 uint32_t wifiGetStartTimeout() {return 0;}
-bool wifiIsRunning() {return false;}
+#define WIFI_IS_RUNNING()
 int wifiNetworkCount() {return 0;}
 void wifiResetThrottleTimeout() {}
 void wifiResetTimeout() {}
+#define WIFI_SOFT_AP_RUNNING() {return false;}
 bool wifiStart() {return false;}
 bool wifiStationIsRunning() {return false;}
 #define WIFI_STOP() {}

Firmware/RTK_Everywhere/Display.ino

@@ -654,9 +654,9 @@ void setRadioIcons(std::vector<iconPropertyBlinking> *iconList)
 
             // Count the number of radios in use
             uint8_t numberOfRadios = 1; // Bluetooth always indicated. TODO don't count if BT radio type is OFF.
-            if (wifiIsRunning())
+            if (WIFI_IS_RUNNING())
                 numberOfRadios++;
-            if (espnowState > ESPNOW_OFF)
+            if (espnowGetState() > ESPNOW_OFF)
                 numberOfRadios++;
 
             // Bluetooth only
@@ -671,9 +671,9 @@ void setRadioIcons(std::vector<iconPropertyBlinking> *iconList)
                 setBluetoothIcon_TwoRadios(iconList);
 
                 // Do we have WiFi or ESP
-                if (wifiIsRunning())
+                if (WIFI_IS_RUNNING())
                     setWiFiIcon_TwoRadios(iconList);
-                else if (espnowState > ESPNOW_OFF)
+                else if (espnowGetState() > ESPNOW_OFF)
                     setESPNowIcon_TwoRadios(iconList);
 
                 setModeIcon(iconList); // Turn on Rover/Base type icons
@@ -706,7 +706,7 @@ void setRadioIcons(std::vector<iconPropertyBlinking> *iconList)
                 iconList->push_back(prop);
             }
 
-            if (wifiIsRunning()) // WiFi : Columns 34 - 46
+            if (WIFI_IS_RUNNING()) // WiFi : Columns 34 - 46
             {
 #ifdef COMPILE_WIFI
                 int wifiRSSI = WiFi.RSSI();
@@ -753,7 +753,7 @@ void setRadioIcons(std::vector<iconPropertyBlinking> *iconList)
             }
 #endif // /COMPILE_CELLULAR
 
-            if (espnowState == ESPNOW_PAIRED) // ESPNOW : Columns 64 - 71
+            if (espnowGetState() == ESPNOW_PAIRED) // ESPNOW : Columns 64 - 71
             {
                 iconPropertyBlinking prop;
                 prop.duty = 0b11111111;
@@ -792,7 +792,7 @@ void setRadioIcons(std::vector<iconPropertyBlinking> *iconList)
                 }
             }
 
-            if (espnowState == ESPNOW_PAIRED)
+            if (espnowGetState() == ESPNOW_PAIRED)
             {
                 if (espnowIncomingRTCM == true) // Download : Columns 74 - 81
                 {
@@ -1023,7 +1023,7 @@ void setBluetoothIcon_TwoRadios(std::vector<iconPropertyBlinking> *iconList)
 // This is 64x48-specific
 void setESPNowIcon_TwoRadios(std::vector<iconPropertyBlinking> *iconList)
 {
-    if (espnowState == ESPNOW_PAIRED)
+    if (espnowGetState() == ESPNOW_PAIRED)
     {
         if (espnowIncomingRTCM == true || espnowOutgoingRTCM == true)
         {