Skip to content

Commit 5f19e58

Browse files
nseidlenseidle
committed
Correct L-Band spelling
1 parent d92e529 commit 5f19e58

File tree

7 files changed

+40
-40
lines changed

7 files changed

+40
-40
lines changed

‎Firmware/RTK_Surveyor/Begin.ino

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ void beginBoard()
128128
else if (productVariant == RTK_FACET_LBAND)
129129
{
130130
strcpy(platformFilePrefix, "SFE_Facet_LBand");
131-
strcpy(platformPrefix, "Facet LBand");
131+
strcpy(platformPrefix, "Facet L-Band");
132132
}
133133
}
134134

@@ -681,7 +681,7 @@ void beginLBand()
681681
{
682682
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)
683683
{
684-
log_d("LBand not detected");
684+
log_d("L-Band not detected");
685685
return;
686686
}
687687

@@ -696,12 +696,12 @@ void beginLBand()
696696
{
697697
if ( (longitude > -125 && longitude < -67) && (latitude > -90 && latitude < 90))
698698
{
699-
log_d("Setting LBand to US");
699+
log_d("Setting L-Band to US");
700700
settings.LBandFreq = 1556290000; //We are in US band
701701
}
702702
else if ( (longitude > -25 && longitude < 70) && (latitude > -90 && latitude < 90))
703703
{
704-
log_d("Setting LBand to EU");
704+
log_d("Setting L-Band to EU");
705705
settings.LBandFreq = 1545260000; //We are in EU band
706706
}
707707
else
@@ -712,7 +712,7 @@ void beginLBand()
712712
recordSystemSettings();
713713
}
714714
else
715-
log_d("No fix available for LBand frequency determination");
715+
log_d("No fix available for L-Band frequency determination");
716716

717717
bool response = true;
718718
response &= i2cLBand.setVal32(UBLOX_CFG_PMP_CENTER_FREQUENCY, settings.LBandFreq); // Default 1539812500 Hz
@@ -732,15 +732,15 @@ void beginLBand()
732732
response &= i2cLBand.setVal32(UBLOX_CFG_UART2_BAUDRATE, 38400); // match baudrate with ZED default
733733

734734
if (response == false)
735-
Serial.println("LBand failed to configure");
735+
Serial.println("L-Band failed to configure");
736736

737737
i2cLBand.softwareResetGNSSOnly(); // Do a restart
738738

739739
i2cLBand.setRXMPMPmessageCallbackPtr(&pushRXMPMP); // Call pushRXMPMP when new PMP data arrives. Push it to the GNSS
740740

741741
i2cGNSS.setRXMCORcallbackPtr(&checkRXMCOR); // Check if the PMP data is being decrypted successfully
742742

743-
log_d("LBand online");
743+
log_d("L-Band online");
744744

745745
online.lband = true;
746746
}

‎Firmware/RTK_Surveyor/Display.ino

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1639,7 +1639,7 @@ void paintSystemTest()
16391639

16401640
drawFrame(); //Outside edge
16411641

1642-
//Test ZED Firmware, LBand, Buttons
1642+
//Test ZED Firmware, L-Band, Buttons
16431643

16441644
oled.setFont(QW_FONT_5X7); //Set font to smallest
16451645

@@ -2074,7 +2074,7 @@ void displayKeysUpdated()
20742074
void paintKeyDaysRemaining(int daysRemaining, uint16_t displayTime)
20752075
{
20762076
//28 days
2077-
//until LBand
2077+
//until L-Band
20782078
//keys expire
20792079

20802080
if (online.display == true)
@@ -2112,9 +2112,9 @@ void paintKeyDaysRemaining(int daysRemaining, uint16_t displayTime)
21122112
oled.print("Until");
21132113

21142114
y += fontHeight;
2115-
textX = x - (oled.getStringWidth("LBand") / 2);
2115+
textX = x - (oled.getStringWidth("L-Band") / 2);
21162116
oled.setCursor(textX, y);
2117-
oled.print("LBand");
2117+
oled.print("L-Band");
21182118

21192119
y += fontHeight;
21202120
textX = x - (oled.getStringWidth("Keys") / 2);
@@ -2134,7 +2134,7 @@ void paintKeyDaysRemaining(int daysRemaining, uint16_t displayTime)
21342134

21352135
void paintKeyWiFiFail(uint16_t displayTime)
21362136
{
2137-
//LBand
2137+
//L-Band
21382138
//Update
21392139
//Failed
21402140
//No WiFi
@@ -2150,9 +2150,9 @@ void paintKeyWiFiFail(uint16_t displayTime)
21502150
int fontHeight = 13;
21512151
int textX;
21522152

2153-
textX = x - (oled.getStringWidth("LBand") / 2); //Starting point of text
2153+
textX = x - (oled.getStringWidth("L-Band") / 2); //Starting point of text
21542154
oled.setCursor(textX, y);
2155-
oled.print("LBand");
2155+
oled.print("L-Band");
21562156

21572157
y += fontHeight;
21582158
textX = x - (oled.getStringWidth("Update") / 2);
@@ -2227,7 +2227,7 @@ void paintKeysExpired()
22272227

22282228
void paintLBandConfigure()
22292229
{
2230-
displayMessage("LBand Config", 0);
2230+
displayMessage("L-Band Config", 0);
22312231
}
22322232

22332233
void paintGettingKeys()

‎Firmware/RTK_Surveyor/RTK_Surveyor.ino

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
Add ntripClient_TransmitGGA to AP config
4444
Add ntripServer_CasterUser/PW to AP config
4545
Add maxLogLength_minutes to AP config
46-
Add LBand to AP config
46+
Add L-Band to AP config
4747
4848
*/
4949

@@ -355,7 +355,7 @@ int incomingSettingsSpot = 0;
355355
unsigned long timeSinceLastIncomingSetting = 0;
356356
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
357357

358-
//LBand Corrections
358+
//L-Band Corrections
359359
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
360360
SFE_UBLOX_GNSS i2cLBand; // NEO-D9S
361361

@@ -464,13 +464,13 @@ int maxNtripClientConnectionAttempts = 3; //Give up connecting after this number
464464
bool ntripClientAttempted = false; //Goes true once we attempt WiFi. Allows graceful failure.
465465

466466
unsigned long startTime = 0; //Used for checking longest running functions
467-
bool lbandCorrectionsReceived = false; //Used to display LBand SIV icon when corrections are successfully decrypted
467+
bool lbandCorrectionsReceived = false; //Used to display L-Band SIV icon when corrections are successfully decrypted
468468
unsigned long lastLBandDecryption = 0; //Timestamp of last successfully decrypted PMP message
469469
bool mqttMessageReceived = false; //Goes true when the subscribed MQTT channel reports back
470470
uint8_t leapSeconds = 0; //Gets set if GNSS is online
471471
unsigned long systemTestDisplayTime = 0; //Timestamp for swapping the graphic during testing
472472
uint8_t systemTestDisplayNumber = 0; //Tracks which test screen we're looking at
473-
unsigned long rtcWaitTime = 0; //At poweron, we give the RTC a few seconds to update during LBand Key checking
473+
unsigned long rtcWaitTime = 0; //At poweron, we give the RTC a few seconds to update during L-Band Key checking
474474
bool setupButtonTestPassed = false; //Tracks button press during test screen
475475
bool powerButtonTestPassed = false; //Tracks button press during test screen
476476

@@ -511,7 +511,7 @@ void setup()
511511

512512
beginSystemState(); //Determine initial system state. Start task for button monitoring.
513513

514-
updateRTC(); //The GNSS likely has time/date. Update ESP32 RTC to match. Needed for LBand key expiration.
514+
updateRTC(); //The GNSS likely has time/date. Update ESP32 RTC to match. Needed for L-Band key expiration.
515515

516516
Serial.flush(); //Complete any previous prints
517517

@@ -544,7 +544,7 @@ void loop()
544544

545545
updateNTRIPClient(); //Move any available incoming NTRIP to ZED
546546

547-
updateLBand(); //Check if we've recently received LBand corrections or not
547+
updateLBand(); //Check if we've recently received L-Band corrections or not
548548

549549
//Convert current system time to minutes. This is used in F9PSerialReadTask()/updateLogs() to see if we are within max log window.
550550
systemTime_minutes = millis() / 1000L / 60;

‎Firmware/RTK_Surveyor/States.ino

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,7 @@ void updateSystemState()
11161116
//We want an immediate change from this state
11171117
forceSystemStateUpdate = true; //Imediately go to this new state
11181118

1119-
//If user has turned off LBand, skip everything
1119+
//If user has turned off L-Band, skip everything
11201120
if (settings.enableLBandCorrections == false)
11211121
{
11221122
changeState(settings.lastState); //Go to either rover or base
@@ -1220,7 +1220,7 @@ void updateSystemState()
12201220

12211221
case (STATE_KEYS_WIFI_CONNECTED):
12221222
{
1223-
if (updatePointPerfectKeys() == true) //Connect to ThingStream MQTT and get LBand key UBX packet
1223+
if (updatePointPerfectKeys() == true) //Connect to ThingStream MQTT and get L-Band key UBX packet
12241224
{
12251225
displayKeysUpdated();
12261226
}
@@ -1239,7 +1239,7 @@ void updateSystemState()
12391239
if (settings.pointPerfectNextKeyStart > 0)
12401240
{
12411241
uint8_t daysRemaining = daysFromEpoch(settings.pointPerfectNextKeyStart + settings.pointPerfectNextKeyDuration + 1);
1242-
Serial.printf("Days until LBand keys expire: %d\n\r", daysRemaining);
1242+
Serial.printf("Days until L-Band keys expire: %d\n\r", daysRemaining);
12431243
paintKeyDaysRemaining(daysRemaining, 2000);
12441244
}
12451245
}
@@ -1293,7 +1293,7 @@ void updateSystemState()
12931293

12941294
case (STATE_KEYS_LBAND_ENCRYPTED):
12951295
{
1296-
//Since LBand is not available, be sure RTCM can be provided over UART2
1296+
//Since L-Band is not available, be sure RTCM can be provided over UART2
12971297
i2cGNSS.setPortInput(COM_PORT_UART2, COM_TYPE_RTCM3); //Set the UART2 to input RTCM
12981298

12991299
forceSystemStateUpdate = true; //Imediately go to this new state
@@ -1519,10 +1519,10 @@ void changeState(SystemState newState)
15191519
Serial.println(F("State: Keys Days Remaining"));
15201520
break;
15211521
case (STATE_KEYS_LBAND_CONFIGURE):
1522-
Serial.println(F("State: Keys LBand Configure"));
1522+
Serial.println(F("State: Keys L-Band Configure"));
15231523
break;
15241524
case (STATE_KEYS_LBAND_ENCRYPTED):
1525-
Serial.println(F("State: Keys LBand Encrypted"));
1525+
Serial.println(F("State: Keys L-Band Encrypted"));
15261526
break;
15271527
case (STATE_KEYS_PROVISION_WIFI_STARTED):
15281528
Serial.println(F("State: Keys Provision - WiFi Started"));

‎Firmware/RTK_Surveyor/menuMain.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void menuMain()
4949
Serial.println(F("p) Configure Profiles"));
5050

5151
if (online.lband == true)
52-
Serial.println(F("l) Configure LBand"));
52+
Serial.println(F("l) Configure L-Band"));
5353

5454
Serial.println(F("s) System Status"));
5555

‎Firmware/RTK_Surveyor/menuPP.ino

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void menuPointPerfect()
2323
else
2424
Serial.println("No keys");
2525

26-
Serial.print(F("1) Use LBand Corrections: "));
26+
Serial.print(F("1) Use L-Band Corrections: "));
2727
if (settings.enableLBandCorrections == true) Serial.println(F("Enabled"));
2828
else Serial.println(F("Disabled"));
2929

@@ -402,7 +402,7 @@ bool updatePointPerfectKeys()
402402
{
403403
Serial.println("connected");
404404
//mqttClient.subscribe(settings.pointPerfectLBandTopic); //The /pp/key/Lb channel fails to respond with keys
405-
mqttClient.subscribe("/pp/ubx/0236/Lb"); //Alternate channel for LBand keys
405+
mqttClient.subscribe("/pp/ubx/0236/Lb"); //Alternate channel for L-Band keys
406406

407407
//if(settings.enableIPCorrections == true) ...
408408
//mqttClient.subscribe(mqtt_lband_correction_topic_eu);
@@ -770,14 +770,14 @@ long gpsToMjd(long GpsCycle, long GpsWeek, long GpsSeconds)
770770
return dateToMjd(1980, 1, 6) + GpsDays;
771771
}
772772

773-
//Process any new LBand from I2C
774-
//If a certain amount of time has elapsed between last decryption, turn off LBand icon
773+
//Process any new L-Band from I2C
774+
//If a certain amount of time has elapsed between last decryption, turn off L-Band icon
775775
void updateLBand()
776776
{
777777
if (online.lbandCorrections == true)
778778
{
779779
i2cLBand.checkUblox(); // Check for the arrival of new PMP data and process it.
780-
i2cLBand.checkCallbacks(); // Check if any LBand callbacks are waiting to be processed.
780+
i2cLBand.checkCallbacks(); // Check if any L-Band callbacks are waiting to be processed.
781781

782782
if (lbandCorrectionsReceived == true && millis() - lastLBandDecryption > 5000)
783783
lbandCorrectionsReceived = false;
@@ -794,7 +794,7 @@ void pushRXMPMP(UBX_RXM_PMP_message_data_t *pmpData)
794794
i2cGNSS.pushRawData(&pmpData->checksumA, (size_t)2); // Push the checksum bytes
795795
}
796796

797-
//If we have decryption keys, and LBand is online, configure module
797+
//If we have decryption keys, and L-Band is online, configure module
798798
void applyLBandKeys()
799799
{
800800
if (online.lband == true)
@@ -808,12 +808,12 @@ void applyLBandKeys()
808808
//NEO-D9S encrypted PMP messages are only supported on ZED-F9P firmware v1.30 and above
809809
if (zedModuleType != PLATFORM_F9P)
810810
{
811-
Serial.println("Error: LBand corrections currently only supported on the ZED-F9P.");
811+
Serial.println("Error: L-Band corrections currently only supported on the ZED-F9P.");
812812
return;
813813
}
814814
if (zedFirmwareVersionInt < 130)
815815
{
816-
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");
816+
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");
817817
return;
818818
}
819819

@@ -846,21 +846,21 @@ void applyLBandKeys()
846846
Serial.println(F("setDynamicSPARTNKeys failed"));
847847
else
848848
{
849-
log_d("LBand keys applied");
849+
log_d("L-Band keys applied");
850850
online.lbandCorrections = true;
851851
}
852852
}
853853
else
854854
{
855-
log_d("No LBand keys available");
855+
log_d("No L-Band keys available");
856856
}
857857
}
858858
}
859859

860860
// Check if the PMP data is being decrypted successfully
861861
void checkRXMCOR(UBX_RXM_COR_data_t *ubxDataStruct)
862862
{
863-
log_d("LBand Eb/N0[dB] (>9 is good): %0.2f", ubxDataStruct->ebno * pow(2, -3));
863+
log_d("L-Band Eb/N0[dB] (>9 is good): %0.2f", ubxDataStruct->ebno * pow(2, -3));
864864
lBandEBNO = ubxDataStruct->ebno * pow(2, -3);
865865

866866
if (ubxDataStruct->statusInfo.bits.msgDecrypted == 2) //Successfully decrypted

‎Firmware/RTK_Surveyor/settings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ typedef struct {
366366
char pointPerfectDeviceProfileToken[40] = "";
367367
bool enableLBandCorrections = true;
368368
bool enableIPCorrections = false; //We do not plan to use IP based point perfect
369-
char home_wifiSSID[50] = ""; //WiFi network to use when attempting to obtain LBand keys and ThingStream provisioning
369+
char home_wifiSSID[50] = ""; //WiFi network to use when attempting to obtain L-Band keys and ThingStream provisioning
370370
char home_wifiPW[50] = "";
371371
bool autoKeyRenewal = true; //Attempt to get keys if we get under 28 days from the expiration date
372372
char pointPerfectClientID[50] = "";

0 commit comments

Comments
 (0)