Correct L-Band spelling

Author: nseidle

Firmware/RTK_Surveyor/Begin.ino

@@ -128,7 +128,7 @@ void beginBoard()
     else if (productVariant == RTK_FACET_LBAND)
     {
       strcpy(platformFilePrefix, "SFE_Facet_LBand");
-      strcpy(platformPrefix, "Facet LBand");
+      strcpy(platformPrefix, "Facet L-Band");
     }
   }
 
@@ -681,7 +681,7 @@ void beginLBand()
 {
   if (i2cLBand.begin(Wire, 0x43) == false) //Connect to the u-blox NEO-D9S using Wire port. The D9S default I2C address is 0x43 (not 0x42)
   {
-    log_d("LBand not detected");
+    log_d("L-Band not detected");
     return;
   }
 
@@ -696,12 +696,12 @@ void beginLBand()
   {
     if ( (longitude > -125 && longitude < -67) && (latitude > -90 && latitude < 90))
     {
-      log_d("Setting LBand to US");
+      log_d("Setting L-Band to US");
       settings.LBandFreq = 1556290000; //We are in US band
     }
     else if ( (longitude > -25 && longitude < 70) && (latitude > -90 && latitude < 90))
     {
-      log_d("Setting LBand to EU");
+      log_d("Setting L-Band to EU");
       settings.LBandFreq = 1545260000; //We are in EU band
     }
     else
@@ -712,7 +712,7 @@ void beginLBand()
     recordSystemSettings();
   }
   else
-    log_d("No fix available for LBand frequency determination");
+    log_d("No fix available for L-Band frequency determination");
 
   bool response = true;
   response &= i2cLBand.setVal32(UBLOX_CFG_PMP_CENTER_FREQUENCY,   settings.LBandFreq); // Default 1539812500 Hz
@@ -732,15 +732,15 @@ void beginLBand()
   response &= i2cLBand.setVal32(UBLOX_CFG_UART2_BAUDRATE,         38400); // match baudrate with ZED default
 
   if (response == false)
-    Serial.println("LBand failed to configure");
+    Serial.println("L-Band failed to configure");
 
   i2cLBand.softwareResetGNSSOnly(); // Do a restart
 
   i2cLBand.setRXMPMPmessageCallbackPtr(&pushRXMPMP); // Call pushRXMPMP when new PMP data arrives. Push it to the GNSS
 
   i2cGNSS.setRXMCORcallbackPtr(&checkRXMCOR); // Check if the PMP data is being decrypted successfully
 
-  log_d("LBand online");
+  log_d("L-Band online");
 
   online.lband = true;
 }

Firmware/RTK_Surveyor/Display.ino

@@ -1639,7 +1639,7 @@ void paintSystemTest()
 
       drawFrame(); //Outside edge
 
-      //Test ZED Firmware, LBand, Buttons
+      //Test ZED Firmware, L-Band, Buttons
 
       oled.setFont(QW_FONT_5X7); //Set font to smallest
 
@@ -2074,7 +2074,7 @@ void displayKeysUpdated()
 void paintKeyDaysRemaining(int daysRemaining, uint16_t displayTime)
 {
   //28 days
-  //until LBand
+  //until L-Band
   //keys expire
 
   if (online.display == true)
@@ -2112,9 +2112,9 @@ void paintKeyDaysRemaining(int daysRemaining, uint16_t displayTime)
     oled.print("Until");
 
     y += fontHeight;
-    textX = x - (oled.getStringWidth("LBand") / 2);
+    textX = x - (oled.getStringWidth("L-Band") / 2);
     oled.setCursor(textX, y);
-    oled.print("LBand");
+    oled.print("L-Band");
 
     y += fontHeight;
     textX = x - (oled.getStringWidth("Keys") / 2);
@@ -2134,7 +2134,7 @@ void paintKeyDaysRemaining(int daysRemaining, uint16_t displayTime)
 
 void paintKeyWiFiFail(uint16_t displayTime)
 {
-  //LBand
+  //L-Band
   //Update
   //Failed
   //No WiFi
@@ -2150,9 +2150,9 @@ void paintKeyWiFiFail(uint16_t displayTime)
     int fontHeight = 13;
     int textX;
 
-    textX = x - (oled.getStringWidth("LBand") / 2); //Starting point of text
+    textX = x - (oled.getStringWidth("L-Band") / 2); //Starting point of text
     oled.setCursor(textX, y);
-    oled.print("LBand");
+    oled.print("L-Band");
 
     y += fontHeight;
     textX = x - (oled.getStringWidth("Update") / 2);
@@ -2227,7 +2227,7 @@ void paintKeysExpired()
 
 void paintLBandConfigure()
 {
-  displayMessage("LBand Config", 0);
+  displayMessage("L-Band Config", 0);
 }
 
 void paintGettingKeys()

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -43,7 +43,7 @@
     Add ntripClient_TransmitGGA to AP config
     Add ntripServer_CasterUser/PW to AP config
     Add maxLogLength_minutes to AP config
-    Add LBand to AP config
+    Add L-Band to AP config
 
 */
 
@@ -355,7 +355,7 @@ int incomingSettingsSpot = 0;
 unsigned long timeSinceLastIncomingSetting = 0;
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-//LBand Corrections
+//L-Band Corrections
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 SFE_UBLOX_GNSS i2cLBand; // NEO-D9S
 
@@ -464,13 +464,13 @@ int maxNtripClientConnectionAttempts = 3; //Give up connecting after this number
 bool ntripClientAttempted = false; //Goes true once we attempt WiFi. Allows graceful failure.
 
 unsigned long startTime = 0; //Used for checking longest running functions
-bool lbandCorrectionsReceived = false; //Used to display LBand SIV icon when corrections are successfully decrypted
+bool lbandCorrectionsReceived = false; //Used to display L-Band SIV icon when corrections are successfully decrypted
 unsigned long lastLBandDecryption = 0; //Timestamp of last successfully decrypted PMP message
 bool mqttMessageReceived = false; //Goes true when the subscribed MQTT channel reports back
 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 LBand Key checking
+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
 
@@ -511,7 +511,7 @@ void setup()
 
   beginSystemState(); //Determine initial system state. Start task for button monitoring.
 
-  updateRTC(); //The GNSS likely has time/date. Update ESP32 RTC to match. Needed for LBand key expiration.
+  updateRTC(); //The GNSS likely has time/date. Update ESP32 RTC to match. Needed for L-Band key expiration.
 
   Serial.flush(); //Complete any previous prints
 
@@ -544,7 +544,7 @@ void loop()
 
   updateNTRIPClient(); //Move any available incoming NTRIP to ZED
 
-  updateLBand(); //Check if we've recently received LBand corrections or not
+  updateLBand(); //Check if we've recently received L-Band corrections or not
 
   //Convert current system time to minutes. This is used in F9PSerialReadTask()/updateLogs() to see if we are within max log window.
   systemTime_minutes = millis() / 1000L / 60;

Firmware/RTK_Surveyor/States.ino

@@ -1116,7 +1116,7 @@ void updateSystemState()
           //We want an immediate change from this state
           forceSystemStateUpdate = true; //Imediately go to this new state
 
-          //If user has turned off LBand, skip everything
+          //If user has turned off L-Band, skip everything
           if (settings.enableLBandCorrections == false)
           {
             changeState(settings.lastState); //Go to either rover or base
@@ -1220,7 +1220,7 @@ void updateSystemState()
 
       case (STATE_KEYS_WIFI_CONNECTED):
         {
-          if (updatePointPerfectKeys() == true) //Connect to ThingStream MQTT and get LBand key UBX packet
+          if (updatePointPerfectKeys() == true) //Connect to ThingStream MQTT and get L-Band key UBX packet
           {
             displayKeysUpdated();
           }
@@ -1239,7 +1239,7 @@ void updateSystemState()
             if (settings.pointPerfectNextKeyStart > 0)
             {
               uint8_t daysRemaining = daysFromEpoch(settings.pointPerfectNextKeyStart + settings.pointPerfectNextKeyDuration + 1);
-              Serial.printf("Days until LBand keys expire: %d\n\r", daysRemaining);
+              Serial.printf("Days until L-Band keys expire: %d\n\r", daysRemaining);
               paintKeyDaysRemaining(daysRemaining, 2000);
             }
           }
@@ -1293,7 +1293,7 @@ void updateSystemState()
 
       case (STATE_KEYS_LBAND_ENCRYPTED):
         {
-          //Since LBand is not available, be sure RTCM can be provided over UART2
+          //Since L-Band is not available, be sure RTCM can be provided over UART2
           i2cGNSS.setPortInput(COM_PORT_UART2, COM_TYPE_RTCM3); //Set the UART2 to input RTCM
 
           forceSystemStateUpdate = true; //Imediately go to this new state
@@ -1519,10 +1519,10 @@ void changeState(SystemState newState)
       Serial.println(F("State: Keys Days Remaining"));
       break;
     case (STATE_KEYS_LBAND_CONFIGURE):
-      Serial.println(F("State: Keys LBand Configure"));
+      Serial.println(F("State: Keys L-Band Configure"));
       break;
     case (STATE_KEYS_LBAND_ENCRYPTED):
-      Serial.println(F("State: Keys LBand Encrypted"));
+      Serial.println(F("State: Keys L-Band Encrypted"));
       break;
     case (STATE_KEYS_PROVISION_WIFI_STARTED):
       Serial.println(F("State: Keys Provision - WiFi Started"));

Firmware/RTK_Surveyor/menuMain.ino

@@ -49,7 +49,7 @@ void menuMain()
     Serial.println(F("p) Configure Profiles"));
 
     if (online.lband == true)
-      Serial.println(F("l) Configure LBand"));
+      Serial.println(F("l) Configure L-Band"));
 
     Serial.println(F("s) System Status"));
 

Firmware/RTK_Surveyor/menuPP.ino

@@ -23,7 +23,7 @@ void menuPointPerfect()
     else
       Serial.println("No keys");
 
-    Serial.print(F("1) Use LBand Corrections: "));
+    Serial.print(F("1) Use L-Band Corrections: "));
     if (settings.enableLBandCorrections == true) Serial.println(F("Enabled"));
     else Serial.println(F("Disabled"));
 
@@ -402,7 +402,7 @@ bool updatePointPerfectKeys()
     {
       Serial.println("connected");
       //mqttClient.subscribe(settings.pointPerfectLBandTopic); //The /pp/key/Lb channel fails to respond with keys
-      mqttClient.subscribe("/pp/ubx/0236/Lb"); //Alternate channel for LBand keys
+      mqttClient.subscribe("/pp/ubx/0236/Lb"); //Alternate channel for L-Band keys
 
       //if(settings.enableIPCorrections == true) ...
       //mqttClient.subscribe(mqtt_lband_correction_topic_eu);
@@ -770,14 +770,14 @@ long gpsToMjd(long GpsCycle, long GpsWeek, long GpsSeconds)
   return dateToMjd(1980, 1, 6) + GpsDays;
 }
 
-//Process any new LBand from I2C
-//If a certain amount of time has elapsed between last decryption, turn off LBand icon
+//Process any new L-Band from I2C
+//If a certain amount of time has elapsed between last decryption, turn off L-Band icon
 void updateLBand()
 {
   if (online.lbandCorrections == true)
   {
     i2cLBand.checkUblox(); // Check for the arrival of new PMP data and process it.
-    i2cLBand.checkCallbacks(); // Check if any LBand callbacks are waiting to be processed.
+    i2cLBand.checkCallbacks(); // Check if any L-Band callbacks are waiting to be processed.
 
     if (lbandCorrectionsReceived == true && millis() - lastLBandDecryption > 5000)
       lbandCorrectionsReceived = false;
@@ -794,7 +794,7 @@ void pushRXMPMP(UBX_RXM_PMP_message_data_t *pmpData)
   i2cGNSS.pushRawData(&pmpData->checksumA, (size_t)2); // Push the checksum bytes
 }
 
-//If we have decryption keys, and LBand is online, configure module
+//If we have decryption keys, and L-Band is online, configure module
 void applyLBandKeys()
 {
   if (online.lband == true)
@@ -808,12 +808,12 @@ void applyLBandKeys()
     //NEO-D9S encrypted PMP messages are only supported on ZED-F9P firmware v1.30 and above
     if (zedModuleType != PLATFORM_F9P)
     {
-      Serial.println("Error: LBand corrections currently only supported on the ZED-F9P.");
+      Serial.println("Error: L-Band corrections currently only supported on the ZED-F9P.");
       return;
     }
     if (zedFirmwareVersionInt < 130)
     {
-      Serial.println("Error: LBand corrections currently supported by ZED-F9P firmware v1.30 and above. Please upgrade your ZED firmware: https://learn.sparkfun.com/tutorials/how-to-upgrade-firmware-of-a-u-blox-gnss-receiver");
+      Serial.println("Error: L-Band corrections currently supported by ZED-F9P firmware v1.30 and above. Please upgrade your ZED firmware: https://learn.sparkfun.com/tutorials/how-to-upgrade-firmware-of-a-u-blox-gnss-receiver");
       return;
     }
 
@@ -846,21 +846,21 @@ void applyLBandKeys()
         Serial.println(F("setDynamicSPARTNKeys failed"));
       else
       {
-        log_d("LBand keys applied");
+        log_d("L-Band keys applied");
         online.lbandCorrections = true;
       }
     }
     else
     {
-      log_d("No LBand keys available");
+      log_d("No L-Band keys available");
     }
   }
 }
 
 // Check if the PMP data is being decrypted successfully
 void checkRXMCOR(UBX_RXM_COR_data_t *ubxDataStruct)
 {
-  log_d("LBand Eb/N0[dB] (>9 is good): %0.2f", ubxDataStruct->ebno * pow(2, -3));
+  log_d("L-Band Eb/N0[dB] (>9 is good): %0.2f", ubxDataStruct->ebno * pow(2, -3));
   lBandEBNO = ubxDataStruct->ebno * pow(2, -3);
 
   if (ubxDataStruct->statusInfo.bits.msgDecrypted == 2) //Successfully decrypted

Firmware/RTK_Surveyor/settings.h

@@ -366,7 +366,7 @@ typedef struct {
   char pointPerfectDeviceProfileToken[40] = "";
   bool enableLBandCorrections = true;
   bool enableIPCorrections = false; //We do not plan to use IP based point perfect
-  char home_wifiSSID[50] = ""; //WiFi network to use when attempting to obtain LBand keys and ThingStream provisioning
+  char home_wifiSSID[50] = ""; //WiFi network to use when attempting to obtain L-Band keys and ThingStream provisioning
   char home_wifiPW[50] = "";
   bool autoKeyRenewal = true; //Attempt to get keys if we get under 28 days from the expiration date
   char pointPerfectClientID[50] = "";