Merge pull request #523 from sparkfun/pcUpdates

Better STATE_TESTING support for mosaic-X5

Author: nseidle

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)
             {
@@ -2517,7 +2533,7 @@ void paintSystemTest()
 
             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");

Firmware/RTK_Everywhere/GNSS_Mosaic.ino

@@ -2375,6 +2375,8 @@ void GNSS_MOSAIC::storeBlock4007(SEMP_PARSE_STATE *parse)
     _altitude = (float)sempSbfGetF8(parse, 32);
     _horizontalAccuracy = ((float)sempSbfGetU2(parse, 90)) / 100.0; // Convert from cm to m
     _satellitesInView = sempSbfGetU1(parse, 74);
+    if (_satellitesInView == 255) // 255 indicates "Do-Not-Use"
+        _satellitesInView = 0;
     _fixType = sempSbfGetU1(parse, 14) & 0x0F;
     _determiningFixedPosition = (sempSbfGetU1(parse, 14) >> 6) & 0x01;
     _clkBias_ms = sempSbfGetF8(parse, 60);
@@ -2646,9 +2648,17 @@ void processSBFReceiverSetup(SEMP_PARSE_STATE *parse, uint16_t type)
     if (sempSbfGetBlockNumber(parse) == 5902)
     {
         snprintf(gnssUniqueId, sizeof(gnssUniqueId), "%s", sempSbfGetString(parse, 156)); // Extract RxSerialNumber
+
         snprintf(gnssFirmwareVersion, sizeof(gnssFirmwareVersion), "%s",
                  sempSbfGetString(parse, 196)); // Extract RXVersion
 
+        // gnssFirmwareVersion is 4.14.4, 4.14.10.1, etc.
+        // Create gnssFirmwareVersionInt from the first two fields only, so it will fit on the OLED
+        int verMajor = 0;
+        int verMinor = 0;
+        sscanf(gnssFirmwareVersion, "%d.%d.", &verMajor, &verMinor); // Do we care if this fails?
+        gnssFirmwareVersionInt = (verMajor * 100) + verMinor;
+
         GNSS_MOSAIC *mosaic = (GNSS_MOSAIC *)gnss;
         mosaic->_receiverSetupSeen = true;
     }

Firmware/RTK_Everywhere/System.ino

@@ -98,7 +98,7 @@ void updateBattery()
                                        ((uint8_t)readAnalogPinAsDigital(pin_chargerLED));
                 systemPrint("MCP73833 Charger: ");
                 if (combinedStat == 3)
-                    systemPrintln("standby / fault");
+                    systemPrintln("standby");
                 else if (combinedStat == 2)
                     systemPrintln("battery is charging");
                 else if (combinedStat == 1)