Change test display for LBand

Author: nseidle

Firmware/RTK_Surveyor/Display.ino

@@ -1509,7 +1509,7 @@ void paintSystemTest()
       systemTestDisplayNumber %= 2;
     }
 
-    if (systemTestDisplayNumber == 1)
+    if (systemTestDisplayNumber == 1 || productVariant != RTK_FACET_LBAND)
     {
       int xOffset = 2;
       int yOffset = 2;
@@ -1627,76 +1627,41 @@ void paintSystemTest()
         oled.print(F("OK"));
     } //End display 1
 
-    if (systemTestDisplayNumber == 0)
+    if (productVariant == RTK_FACET_LBAND)
     {
-      int xOffset = 2;
-      int yOffset = 2;
-
-      int charHeight = 7;
-
-      char macAddress[5];
-      sprintf(macAddress, "%02X%02X", unitMACAddress[4], unitMACAddress[5]);
-
-      drawFrame(); //Outside edge
-
-      //Test ZED Firmware, L-Band, Buttons
-
-      oled.setFont(QW_FONT_5X7); //Set font to smallest
+      if (systemTestDisplayNumber == 0)
+      {
+        int xOffset = 2;
+        int yOffset = 2;
 
-      oled.setCursor(xOffset, yOffset); //x, y
-      oled.print(F("ZED Firm:"));
-      oled.setCursor(xOffset, yOffset + (1 * charHeight) ); //x, y
-      oled.print("  ");
-      oled.print(zedFirmwareVersionInt);
-      oled.print(F("-"));
-      if (zedFirmwareVersionInt < 130)
-        oled.print(F("FAIL"));
-      else
-        oled.print(F("OK"));
+        int charHeight = 7;
 
-      oled.setCursor(xOffset, yOffset + (2 * charHeight) ); //x, y
-      oled.print(F("LBand:"));
-      if (online.lband == true)
-        oled.print(F("OK"));
-      else
-        oled.print(F("FAIL"));
+        drawFrame(); //Outside edge
 
-      oled.setCursor(xOffset, yOffset + (3 * charHeight) ); //x, y
-      if (powerBtn != NULL)
-      {
-        powerBtn->read();
-        oled.print(F("Power:"));
+        //Test ZED Firmware, L-Band
 
-        if (powerButtonTestPassed == false && powerBtn->isPressed() == true)
-          powerButtonTestPassed = true;
+        oled.setFont(QW_FONT_5X7); //Set font to smallest
 
-        if (powerBtn->isPressed() == true)
-          oled.print(F("On"));
-        else if (powerButtonTestPassed == false)
+        oled.setCursor(xOffset, yOffset); //x, y
+        oled.print(F("ZED Firm:"));
+        oled.setCursor(xOffset, yOffset + (1 * charHeight) ); //x, y
+        oled.print("  ");
+        oled.print(zedFirmwareVersionInt);
+        oled.print(F("-"));
+        if (zedFirmwareVersionInt < 130)
           oled.print(F("FAIL"));
         else
-          oled.print(F("PASS"));
-      }
-      
-      oled.setCursor(xOffset, yOffset + (4 * charHeight) ); //x, y
-      if (setupBtn != NULL)
-      {
-        setupBtn->read();
-        oled.print(F("Setup:"));
-
-        if (setupButtonTestPassed == false && setupBtn->isPressed() == true)
-          setupButtonTestPassed = true;
+          oled.print(F("OK"));
 
-        if (setupBtn->isPressed() == true)
-          oled.print(F("On"));
-        else if (setupButtonTestPassed == false)
-          oled.print(F("FAIL"));
+        oled.setCursor(xOffset, yOffset + (2 * charHeight) ); //x, y
+        oled.print(F("LBand:"));
+        if (online.lband == true)
+          oled.print(F("OK"));
         else
-          oled.print(F("PASS"));
-      }
-
-
-    } //End display 0
+          oled.print(F("FAIL"));
+      } //End display 0
+    } //End Facet L-Band testing
+    
   }
 }
 

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -53,7 +53,7 @@ const int FIRMWARE_VERSION_MINOR = 0;
 #define COMPILE_WIFI //Comment out to remove WiFi functionality
 #define COMPILE_BT //Comment out to remove Bluetooth functionality
 #define COMPILE_AP //Comment out to remove Access Point functionality
-#define ENABLE_DEVELOPER //Uncomment this line to enable special developer modes (don't check power button at startup)
+//#define ENABLE_DEVELOPER //Uncomment this line to enable special developer modes (don't check power button at startup)
 
 //Define the RTK board identifier:
 //  This is an int which is unique to this variant of the RTK Surveyor hardware which allows us
@@ -471,8 +471,6 @@ uint8_t leapSeconds = 0; //Gets set if GNSS is online
 unsigned long systemTestDisplayTime = 0; //Timestamp for swapping the graphic during testing
 uint8_t systemTestDisplayNumber = 0; //Tracks which test screen we're looking at
 unsigned long rtcWaitTime = 0; //At poweron, we give the RTC a few seconds to update during L-Band Key checking
-bool setupButtonTestPassed = false; //Tracks button press during test screen
-bool powerButtonTestPassed = false; //Tracks button press during test screen
 
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 

Firmware/RTK_Surveyor/menuPP.ino

@@ -282,7 +282,7 @@ bool provisionDevice()
   sprintf(hardwareID, "%02X%02X%02X%02X%02X%02X", whitelistID[0], whitelistID[1], whitelistID[2], whitelistID[3], whitelistID[4], whitelistID[5]);
 #endif
 
-  char givenName[50];
+  char givenName[100];
   sprintf(givenName, "SparkFun RTK %s v%d.%d - %s", platformPrefix, FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR, hardwareID); //Get ready for JSON
 
   StaticJsonDocument<256> pointPerfectAPIPost;