Merge pull request #529 from LeeLeahy2/minor-changes

Minor changes: Add RTK_WIFI specific code and values, add macros and do some renaming

Author: nseidle

Firmware/RTK_Everywhere/Cellular.ino

@@ -87,7 +87,7 @@ void cellularEvent(arduino_event_id_t event)
     if (networkInterfaceHasInternet(NETWORK_CELLULAR) && (event != ARDUINO_EVENT_ETH_GOT_IP) &&
         (event != ARDUINO_EVENT_ETH_GOT_IP6) && (event != ARDUINO_EVENT_PPP_CONNECTED))
     {
-        networkInterfaceInternetConnectionLost(NETWORK_CELLULAR);
+        networkInterfaceEventInternetLost(NETWORK_CELLULAR);
     }
 
     // Cellular State Machine
@@ -108,7 +108,7 @@ void cellularEvent(arduino_event_id_t event)
 
     case ARDUINO_EVENT_PPP_CONNECTED:
         systemPrintln("Cellular Connected");
-        networkInterfaceInternetConnectionAvailable(NETWORK_CELLULAR);
+        networkInterfaceEventInternetAvailable(NETWORK_CELLULAR);
         break;
 
     case ARDUINO_EVENT_PPP_DISCONNECTED:

Firmware/RTK_Everywhere/Developer.ino

@@ -177,17 +177,17 @@ void webServerUpdate()  {}
 
 #ifndef COMPILE_ESPNOW
 
-bool espNowStart()  {return false;}
-bool espNowStop()   {return false;}
-
+bool espnowGetState()                   {return ESPNOW_OFF;}
 bool espnowIsPaired()                   {return false;}
 void espnowProcessRTCM(byte incoming)   {}
 esp_err_t espnowRemovePeer(uint8_t *peerMac)        {return ESP_OK;}
 esp_err_t espnowSendPairMessage(uint8_t *sendToMac) {return ESP_OK;}
 bool espnowSetChannel(uint8_t channelNumber)        {return false;}
 void espnowStart()                      {}
+#define ESPNOW_START()                  false
 void espnowStaticPairing()              {}
 void espnowStop()                       {}
+#define ESPNOW_STOP()                   true
 void updateEspnow()                     {}
 
 #endif   // COMPILE_ESPNOW
@@ -202,7 +202,7 @@ 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;}
-#define WIFI_IS_RUNNING()
+#define WIFI_IS_RUNNING() 0
 int wifiNetworkCount() {return 0;}
 void wifiResetThrottleTimeout() {}
 void wifiResetTimeout() {}

Firmware/RTK_Everywhere/Display.ino

@@ -2387,15 +2387,31 @@ void paintSystemTest()
             drawFrame(); // Outside edge
 
             oled->setFont(QW_FONT_5X7);        // Set font to smallest
-            oled->setCursor(xOffset, yOffset); // x, y
-            oled->print("SD:");
 
-            if (online.microSD == false)
-                beginSD(); // Test if SD is present
-            if (online.microSD == true)
-                oled->print("OK");
-            else
-                oled->print("FAIL");
+            if (present.microSd)
+            {
+                oled->setCursor(xOffset, yOffset); // x, y
+                oled->print("SD:");
+
+                if (online.microSD == false)
+                    beginSD(); // Test if SD is present
+                if (online.microSD == true)
+                    oled->print("OK");
+                else
+                    oled->print("FAIL");
+            }
+            else if (present.gnss_mosaicX5)
+            {
+                // Facet mosaic has an SD card, but it is connected directly to the mosaic-X5
+                // Calling gnss->update() during the GNSS check will cause sdCardSize to be updated
+                oled->setCursor(xOffset, yOffset); // x, y
+                oled->print("SD:");
+
+                if (sdCardSize > 0)
+                    oled->print("OK");
+                else
+                    oled->print("FAIL");
+            }
 
             if (present.fuelgauge_max17048 || present.fuelgauge_bq40z50)
             {
@@ -2510,14 +2526,14 @@ void paintSystemTest()
             oled->print(" ");
             oled->print(gnssFirmwareVersionInt);
             oled->print("-");
-            if ((present.gnss_zedf9p) && (gnssFirmwareVersionInt < 130))
+            if ((present.gnss_zedf9p) && (gnssFirmwareVersionInt < 150))
                 oled->print("FAIL");
             else
                 oled->print("OK");
 
             oled->setCursor(xOffset, yOffset + (2 * charHeight)); // x, y
             oled->print("LBand:");
-            if (online.lband_neo == true)
+            if ((online.lband_neo == true) || (present.gnss_mosaicX5))
                 oled->print("OK");
             else
                 oled->print("FAIL");