Skip to content

Commit b07fea7

Browse files
nseidlenseidle
authored
Merge pull request #326 from LeeLeahy2/ubx-removed
Remove UBX from message names
2 parents a5f7d0f + c6f1b6e commit b07fea7

File tree

5 files changed

+68
-68
lines changed

5 files changed

+68
-68
lines changed

‎Firmware/RTK_Everywhere/Form.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ void createMessageListBase(String &returnText)
865865

866866
if (present.gnss_zedf9p)
867867
{
868-
int firstRTCMRecord = zedGetMessageNumberByName("UBX_RTCM_1005");
868+
int firstRTCMRecord = zedGetMessageNumberByName("RTCM_1005");
869869

870870
for (int messageNumber = 0; messageNumber < MAX_UBX_MSG_RTCM; messageNumber++)
871871
{

‎Firmware/RTK_Everywhere/NVM.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ void recordSystemSettingsToFile(File *settingsFile)
369369
case tUbMsgRtb: {
370370
// Record message settings
371371

372-
int firstRTCMRecord = zedGetMessageNumberByName("UBX_RTCM_1005");
372+
int firstRTCMRecord = zedGetMessageNumberByName("RTCM_1005");
373373

374374
for (int x = 0; x < rtkSettingsEntries[i].qualifier; x++)
375375
{
@@ -1041,7 +1041,7 @@ bool parseLine(char *str)
10411041
}
10421042
break;
10431043
case tUbMsgRtb: {
1044-
int firstRTCMRecord = zedGetMessageNumberByName("UBX_RTCM_1005");
1044+
int firstRTCMRecord = zedGetMessageNumberByName("RTCM_1005");
10451045

10461046
for (int x = 0; x < qualifier; x++)
10471047
{

‎Firmware/RTK_Everywhere/ZED.ino

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ bool zedConfigureRover()
497497
// product - in Rover mode - we want to leave any RTCM messages enabled on SPI so they can be logged if desired.
498498

499499
// Find first RTCM record in ubxMessage array
500-
int firstRTCMRecord = zedGetMessageNumberByName("UBX_RTCM_1005");
500+
int firstRTCMRecord = zedGetMessageNumberByName("RTCM_1005");
501501

502502
// Set RTCM messages to user's settings
503503
for (int x = 0; x < MAX_UBX_MSG_RTCM; x++)
@@ -600,7 +600,7 @@ bool zedConfigureBase()
600600
// (Tertiary) UART1 in case RTK device is sending RTCM to a phone that is then NTRIP Caster
601601

602602
// Find first RTCM record in ubxMessage array
603-
int firstRTCMRecord = zedGetMessageNumberByName("UBX_RTCM_1005");
603+
int firstRTCMRecord = zedGetMessageNumberByName("RTCM_1005");
604604

605605
// ubxMessageRatesBase is an array of ~12 uint8_ts
606606
// ubxMessage is an array of ~80 messages
@@ -1046,7 +1046,7 @@ bool zedSetRate(double secondsBetweenSolutions)
10461046
response &= theGNSS->addCfgValset(UBLOX_CFG_RATE_MEAS, measRate);
10471047
response &= theGNSS->addCfgValset(UBLOX_CFG_RATE_NAV, navRate);
10481048

1049-
int gsvRecordNumber = zedGetMessageNumberByName("UBX_NMEA_GSV");
1049+
int gsvRecordNumber = zedGetMessageNumberByName("NMEA_GSV");
10501050

10511051
// If enabled, adjust GSV NMEA to be reported at 1Hz to avoid swamping SPP connection
10521052
if (settings.ubxMessageRates[gsvRecordNumber] > 0)
@@ -1057,7 +1057,7 @@ bool zedSetRate(double secondsBetweenSolutions)
10571057

10581058
log_d("Adjusting GSV setting to %f", measurementFrequency);
10591059

1060-
zedSetMessageRateByName("UBX_NMEA_GSV", measurementFrequency); // Update GSV setting in file
1060+
zedSetMessageRateByName("NMEA_GSV", measurementFrequency); // Update GSV setting in file
10611061
response &= theGNSS->addCfgValset(ubxMessages[gsvRecordNumber].msgConfigKey,
10621062
settings.ubxMessageRates[gsvRecordNumber]); // Update rate on module
10631063
}
@@ -1583,36 +1583,36 @@ void zedMenuMessages()
15831583
else if (incoming == 10)
15841584
{
15851585
setGNSSMessageRates(settings.ubxMessageRates, 0); // Turn off all messages
1586-
zedSetMessageRateByName("UBX_NMEA_GGA", 1);
1587-
zedSetMessageRateByName("UBX_NMEA_GSA", 1);
1588-
zedSetMessageRateByName("UBX_NMEA_GST", 1);
1586+
zedSetMessageRateByName("NMEA_GGA", 1);
1587+
zedSetMessageRateByName("NMEA_GSA", 1);
1588+
zedSetMessageRateByName("NMEA_GST", 1);
15891589

15901590
// We want GSV NMEA to be reported at 1Hz to avoid swamping SPP connection
15911591
float measurementFrequency = (1000.0 / settings.measurementRateMs) / settings.navigationRate;
15921592
if (measurementFrequency < 1.0)
15931593
measurementFrequency = 1.0;
1594-
zedSetMessageRateByName("UBX_NMEA_GSV", measurementFrequency); // One report per second
1594+
zedSetMessageRateByName("NMEA_GSV", measurementFrequency); // One report per second
15951595

1596-
zedSetMessageRateByName("UBX_NMEA_RMC", 1);
1596+
zedSetMessageRateByName("NMEA_RMC", 1);
15971597
systemPrintln("Reset to Surveying Defaults (NMEAx5)");
15981598
}
15991599
else if (incoming == 11)
16001600
{
16011601
setGNSSMessageRates(settings.ubxMessageRates, 0); // Turn off all messages
1602-
zedSetMessageRateByName("UBX_NMEA_GGA", 1);
1603-
zedSetMessageRateByName("UBX_NMEA_GSA", 1);
1604-
zedSetMessageRateByName("UBX_NMEA_GST", 1);
1602+
zedSetMessageRateByName("NMEA_GGA", 1);
1603+
zedSetMessageRateByName("NMEA_GSA", 1);
1604+
zedSetMessageRateByName("NMEA_GST", 1);
16051605

16061606
// We want GSV NMEA to be reported at 1Hz to avoid swamping SPP connection
16071607
float measurementFrequency = (1000.0 / settings.measurementRateMs) / settings.navigationRate;
16081608
if (measurementFrequency < 1.0)
16091609
measurementFrequency = 1.0;
1610-
zedSetMessageRateByName("UBX_NMEA_GSV", measurementFrequency); // One report per second
1610+
zedSetMessageRateByName("NMEA_GSV", measurementFrequency); // One report per second
16111611

1612-
zedSetMessageRateByName("UBX_NMEA_RMC", 1);
1612+
zedSetMessageRateByName("NMEA_RMC", 1);
16131613

1614-
zedSetMessageRateByName("UBX_RXM_RAWX", 1);
1615-
zedSetMessageRateByName("UBX_RXM_SFRBX", 1);
1614+
zedSetMessageRateByName("RXM_RAWX", 1);
1615+
zedSetMessageRateByName("RXM_SFRBX", 1);
16161616
systemPrintln("Reset to PPP Logging Defaults (NMEAx5 + RXMx2)");
16171617
}
16181618
else if (incoming == 12)
@@ -1648,41 +1648,41 @@ void zedMenuMessages()
16481648
// Set RTCM for base mode to defaults (1005/1074/1084/1094/1124 1Hz & 1230 0.1Hz)
16491649
void zedBaseRtcmDefault()
16501650
{
1651-
int firstRTCMRecord = zedGetMessageNumberByName("UBX_RTCM_1005");
1652-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1005") - firstRTCMRecord] = 1; // 1105
1653-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1074") - firstRTCMRecord] = 1; // 1074
1654-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1077") - firstRTCMRecord] = 0; // 1077
1655-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1084") - firstRTCMRecord] = 1; // 1084
1656-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1087") - firstRTCMRecord] = 0; // 1087
1651+
int firstRTCMRecord = zedGetMessageNumberByName("RTCM_1005");
1652+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1005") - firstRTCMRecord] = 1; // 1105
1653+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1074") - firstRTCMRecord] = 1; // 1074
1654+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1077") - firstRTCMRecord] = 0; // 1077
1655+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1084") - firstRTCMRecord] = 1; // 1084
1656+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1087") - firstRTCMRecord] = 0; // 1087
16571657

1658-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1094") - firstRTCMRecord] = 1; // 1094
1659-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1097") - firstRTCMRecord] = 0; // 1097
1660-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1124") - firstRTCMRecord] = 1; // 1124
1661-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1127") - firstRTCMRecord] = 0; // 1127
1662-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1230") - firstRTCMRecord] = 10; // 1230
1658+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1094") - firstRTCMRecord] = 1; // 1094
1659+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1097") - firstRTCMRecord] = 0; // 1097
1660+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1124") - firstRTCMRecord] = 1; // 1124
1661+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1127") - firstRTCMRecord] = 0; // 1127
1662+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1230") - firstRTCMRecord] = 10; // 1230
16631663

1664-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_4072_0") - firstRTCMRecord] = 0; // 4072_0
1665-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_4072_1") - firstRTCMRecord] = 0; // 4072_1
1664+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_4072_0") - firstRTCMRecord] = 0; // 4072_0
1665+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_4072_1") - firstRTCMRecord] = 0; // 4072_1
16661666
}
16671667

16681668
// Reset to Low Bandwidth Link (1074/1084/1094/1124 0.5Hz & 1005/1230 0.1Hz)
16691669
void zedBaseRtcmLowDataRate()
16701670
{
1671-
int firstRTCMRecord = zedGetMessageNumberByName("UBX_RTCM_1005");
1672-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1005") - firstRTCMRecord] = 10; // 1105 0.1Hz
1673-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1074") - firstRTCMRecord] = 2; // 1074 0.5Hz
1674-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1077") - firstRTCMRecord] = 0; // 1077
1675-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1084") - firstRTCMRecord] = 2; // 1084 0.5Hz
1676-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1087") - firstRTCMRecord] = 0; // 1087
1671+
int firstRTCMRecord = zedGetMessageNumberByName("RTCM_1005");
1672+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1005") - firstRTCMRecord] = 10; // 1105 0.1Hz
1673+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1074") - firstRTCMRecord] = 2; // 1074 0.5Hz
1674+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1077") - firstRTCMRecord] = 0; // 1077
1675+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1084") - firstRTCMRecord] = 2; // 1084 0.5Hz
1676+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1087") - firstRTCMRecord] = 0; // 1087
16771677

1678-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1094") - firstRTCMRecord] = 2; // 1094 0.5Hz
1679-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1097") - firstRTCMRecord] = 0; // 1097
1680-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1124") - firstRTCMRecord] = 2; // 1124 0.5Hz
1681-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1127") - firstRTCMRecord] = 0; // 1127
1682-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_1230") - firstRTCMRecord] = 10; // 1230 0.1Hz
1678+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1094") - firstRTCMRecord] = 2; // 1094 0.5Hz
1679+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1097") - firstRTCMRecord] = 0; // 1097
1680+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1124") - firstRTCMRecord] = 2; // 1124 0.5Hz
1681+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1127") - firstRTCMRecord] = 0; // 1127
1682+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_1230") - firstRTCMRecord] = 10; // 1230 0.1Hz
16831683

1684-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_4072_0") - firstRTCMRecord] = 0; // 4072_0
1685-
settings.ubxMessageRatesBase[zedGetMessageNumberByName("UBX_RTCM_4072_1") - firstRTCMRecord] = 0; // 4072_1
1684+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_4072_0") - firstRTCMRecord] = 0; // 4072_0
1685+
settings.ubxMessageRatesBase[zedGetMessageNumberByName("RTCM_4072_1") - firstRTCMRecord] = 0; // 4072_1
16861686
}
16871687

16881688
char *zedGetRtcmDefaultString()
@@ -1752,7 +1752,7 @@ void zedSetMessageOffsets(const ubxMsg *localMessage, const char *messageType, i
17521752
if (present.gnss_zedf9p)
17531753
{
17541754
char messageNamePiece[40]; // UBX_RTCM
1755-
snprintf(messageNamePiece, sizeof(messageNamePiece), "UBX_%s", messageType); // Put UBX_ infront of type
1755+
snprintf(messageNamePiece, sizeof(messageNamePiece), "%s", messageType); // Put UBX_ infront of type
17561756

17571757
// Find the first occurrence
17581758
for (startOfBlock = 0; startOfBlock < MAX_UBX_MSG; startOfBlock++)

‎Firmware/RTK_Everywhere/menuCommands.ino

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ SettingValueResponse updateSettingWithValue(bool inCommands, const char *setting
708708
}
709709
break;
710710
case tUbMsgRtb: {
711-
int firstRTCMRecord = zedGetMessageNumberByName("UBX_RTCM_1005");
711+
int firstRTCMRecord = zedGetMessageNumberByName("RTCM_1005");
712712

713713
for (int x = 0; x < qualifier; x++)
714714
{
@@ -1367,7 +1367,7 @@ void createSettingsString(char *newSettings)
13671367
case tUbMsgRtb: {
13681368
// Record message settings
13691369

1370-
int firstRTCMRecord = zedGetMessageNumberByName("UBX_RTCM_1005");
1370+
int firstRTCMRecord = zedGetMessageNumberByName("RTCM_1005");
13711371

13721372
for (int x = 0; x < rtkSettingsEntries[i].qualifier; x++)
13731373
{
@@ -2060,7 +2060,7 @@ SettingValueResponse getSettingValue(bool inCommands, const char *settingName, c
20602060
}
20612061
break;
20622062
case tUbMsgRtb: {
2063-
int firstRTCMRecord = zedGetMessageNumberByName("UBX_RTCM_1005");
2063+
int firstRTCMRecord = zedGetMessageNumberByName("RTCM_1005");
20642064

20652065
for (int x = 0; x < qualifier; x++)
20662066
{
@@ -2450,7 +2450,7 @@ void commandList(bool inCommands, int i)
24502450
break;
24512451
case tUbMsgRtb: {
24522452
// Record message settings
2453-
int firstRTCMRecord = zedGetMessageNumberByName("UBX_RTCM_1005");
2453+
int firstRTCMRecord = zedGetMessageNumberByName("RTCM_1005");
24542454

24552455
for (int x = 0; x < rtkSettingsEntries[i].qualifier; x++)
24562456
{

‎Firmware/RTK_Everywhere/menuMessages.ino

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ void zedMenuMessagesSubtype(uint8_t *localMessageRate, const char *messageType)
207207
{
208208
startOfBlock = 0;
209209
endOfBlock = MAX_UBX_MSG_RTCM;
210-
rtcmOffset = zedGetMessageNumberByName("UBX_RTCM_1005");
210+
rtcmOffset = zedGetMessageNumberByName("RTCM_1005");
211211
}
212212
else
213213
zedSetMessageOffsets(&ubxMessages[0], messageType, startOfBlock,
@@ -621,7 +621,7 @@ void checkGNSSArrayDefaults()
621621
defaultsApplied = true;
622622

623623
// Reset Base rates to defaults
624-
int firstRTCMRecord = zedGetMessageNumberByName("UBX_RTCM_1005");
624+
int firstRTCMRecord = zedGetMessageNumberByName("RTCM_1005");
625625
for (int x = 0; x < MAX_UBX_MSG_RTCM; x++)
626626
settings.ubxMessageRatesBase[x] = ubxMessages[firstRTCMRecord + x].msgDefaultRate;
627627
}
@@ -698,13 +698,13 @@ void setLoggingType()
698698
int messageCount = gnssGetActiveMessageCount();
699699
if (messageCount == 5 || messageCount == 7)
700700
{
701-
if (zedGetMessageRateByName("UBX_NMEA_GGA") > 0 && zedGetMessageRateByName("UBX_NMEA_GSA") > 0 &&
702-
zedGetMessageRateByName("UBX_NMEA_GST") > 0 && zedGetMessageRateByName("UBX_NMEA_GSV") > 0 &&
703-
zedGetMessageRateByName("UBX_NMEA_RMC") > 0)
701+
if (zedGetMessageRateByName("NMEA_GGA") > 0 && zedGetMessageRateByName("NMEA_GSA") > 0 &&
702+
zedGetMessageRateByName("NMEA_GST") > 0 && zedGetMessageRateByName("NMEA_GSV") > 0 &&
703+
zedGetMessageRateByName("NMEA_RMC") > 0)
704704
{
705705
loggingType = LOGGING_STANDARD;
706706

707-
if (zedGetMessageRateByName("UBX_RXM_RAWX") > 0 && zedGetMessageRateByName("UBX_RXM_SFRBX") > 0)
707+
if (zedGetMessageRateByName("RXM_RAWX") > 0 && zedGetMessageRateByName("RXM_SFRBX") > 0)
708708
loggingType = LOGGING_PPP;
709709
}
710710
}
@@ -721,23 +721,23 @@ void setLogTestFrequencyMessages(int rate, int messages)
721721
setGNSSMessageRates(settings.ubxMessageRates, 0); // Turn off all messages
722722
if (messages == 5)
723723
{
724-
zedSetMessageRateByName("UBX_NMEA_GGA", 1);
725-
zedSetMessageRateByName("UBX_NMEA_GSA", 1);
726-
zedSetMessageRateByName("UBX_NMEA_GST", 1);
727-
zedSetMessageRateByName("UBX_NMEA_GSV", rate); // One report per second
728-
zedSetMessageRateByName("UBX_NMEA_RMC", 1);
724+
zedSetMessageRateByName("NMEA_GGA", 1);
725+
zedSetMessageRateByName("NMEA_GSA", 1);
726+
zedSetMessageRateByName("NMEA_GST", 1);
727+
zedSetMessageRateByName("NMEA_GSV", rate); // One report per second
728+
zedSetMessageRateByName("NMEA_RMC", 1);
729729

730730
log_d("Messages: Surveying Defaults (NMEAx5)");
731731
}
732732
else if (messages == 7)
733733
{
734-
zedSetMessageRateByName("UBX_NMEA_GGA", 1);
735-
zedSetMessageRateByName("UBX_NMEA_GSA", 1);
736-
zedSetMessageRateByName("UBX_NMEA_GST", 1);
737-
zedSetMessageRateByName("UBX_NMEA_GSV", rate); // One report per second
738-
zedSetMessageRateByName("UBX_NMEA_RMC", 1);
739-
zedSetMessageRateByName("UBX_RXM_RAWX", 1);
740-
zedSetMessageRateByName("UBX_RXM_SFRBX", 1);
734+
zedSetMessageRateByName("NMEA_GGA", 1);
735+
zedSetMessageRateByName("NMEA_GSA", 1);
736+
zedSetMessageRateByName("NMEA_GST", 1);
737+
zedSetMessageRateByName("NMEA_GSV", rate); // One report per second
738+
zedSetMessageRateByName("NMEA_RMC", 1);
739+
zedSetMessageRateByName("RXM_RAWX", 1);
740+
zedSetMessageRateByName("RXM_SFRBX", 1);
741741

742742
log_d("Messages: PPP NMEAx5+RXMx2");
743743
}

0 commit comments

Comments
 (0)