Skip to content

Commit 4e56f19

Browse files
LeeLeahy2LeeLeahy2
committed
GNSS: Add gnssCmdUpdateMessageRates called by menuCommands
1 parent 4cf000c commit 4e56f19

File tree

3 files changed

+32
-18
lines changed

3 files changed

+32
-18
lines changed

‎Firmware/RTK_Everywhere/GNSS.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,4 +399,7 @@ class GNSS
399399
// Update the constellations following a set command
400400
bool gnssCmdUpdateConstellations(int commandIndex);
401401

402+
// Update the message rates following a set command
403+
bool gnssCmdUpdateMessageRates(int commandIndex);
404+
402405
#endif // __GNSS_H__

‎Firmware/RTK_Everywhere/GNSS.ino‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,3 +438,14 @@ bool gnssCmdUpdateConstellations(int commandIndex)
438438
}
439439

440440
//----------------------------------------
441+
// Update the message rates following a set command
442+
//----------------------------------------
443+
bool gnssCmdUpdateMessageRates(int commandIndex)
444+
{
445+
if (gnss == nullptr)
446+
return false;
447+
448+
return gnss->setMessages(MAX_SET_MESSAGES_RETRIES);
449+
}
450+
451+
//----------------------------------------

‎Firmware/RTK_Everywhere/settings.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,9 +1285,9 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
12851285
// messageRateNMEA_, messageRateRTCMBase_, and messageRateRTCMRover_ are common to UM980 and LG290P
12861286
// The qualifier is defined inside updateSettingWithValue, parseLine
12871287
{ 0, 0, 1, 1, 1, 1, 1, 1, 1, ALL, 1, tCmnCnst, 0, nullptr, "constellation_", gnssCmdUpdateConstellations, },
1288-
{ 0, 0, 1, 1, 1, 1, 1, 1, 1, ALL, 1, tCmnRtNm, 0, nullptr, "messageRateNMEA_", nullptr, },
1289-
{ 0, 0, 1, 1, 1, 1, 1, 1, 1, ALL, 1, tCnRtRtB, 0, nullptr, "messageRateRTCMBase_", nullptr, },
1290-
{ 0, 0, 1, 1, 1, 1, 1, 1, 1, ALL, 1, tCnRtRtR, 0, nullptr, "messageRateRTCMRover_", nullptr, },
1288+
{ 0, 0, 1, 1, 1, 1, 1, 1, 1, ALL, 1, tCmnRtNm, 0, nullptr, "messageRateNMEA_", gnssCmdUpdateMessageRates, },
1289+
{ 0, 0, 1, 1, 1, 1, 1, 1, 1, ALL, 1, tCnRtRtB, 0, nullptr, "messageRateRTCMBase_", gnssCmdUpdateMessageRates, },
1290+
{ 0, 0, 1, 1, 1, 1, 1, 1, 1, ALL, 1, tCnRtRtR, 0, nullptr, "messageRateRTCMRover_", gnssCmdUpdateMessageRates, },
12911291

12921292
// <--- Insert any new essential "priority" (non-sorted) settings above this line --->
12931293

@@ -1463,12 +1463,12 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
14631463
// Mosaic
14641464
#ifdef COMPILE_MOSAICX5
14651465
{ 1, 1, 1, 0, 0, 1, 0, 0, 0, MX5, 0, tMosaicConst, MAX_MOSAIC_CONSTELLATIONS, & settings.mosaicConstellations, "constellation_", gnssCmdUpdateConstellations, },
1466-
{ 1, 1, 1, 0, 0, 1, 0, 0, 0, MX5, 0, tMosaicMSNmea, MAX_MOSAIC_NMEA_MSG, & settings.mosaicMessageStreamNMEA, "messageStreamNMEA_", nullptr, },
1467-
{ 1, 1, 1, 0, 0, 1, 0, 0, 0, MX5, 0, tMosaicSINmea, MOSAIC_NUM_NMEA_STREAMS, & settings.mosaicStreamIntervalsNMEA, "streamIntervalNMEA_", nullptr, },
1468-
{ 1, 1, 1, 0, 0, 1, 0, 0, 0, MX5, 0, tMosaicMIRvRT, MAX_MOSAIC_RTCM_V3_INTERVAL_GROUPS, & settings.mosaicMessageIntervalsRTCMv3Rover, "messageIntervalRTCMRover_", nullptr, },
1469-
{ 1, 1, 1, 0, 0, 1, 0, 0, 0, MX5, 0, tMosaicMIBaRT, MAX_MOSAIC_RTCM_V3_INTERVAL_GROUPS, & settings.mosaicMessageIntervalsRTCMv3Base, "messageIntervalRTCMBase_", nullptr, },
1470-
{ 1, 1, 1, 0, 0, 1, 0, 0, 0, MX5, 0, tMosaicMERvRT, MAX_MOSAIC_RTCM_V3_MSG, & settings.mosaicMessageEnabledRTCMv3Rover, "messageEnabledRTCMRover_", nullptr, },
1471-
{ 1, 1, 1, 0, 0, 1, 0, 0, 0, MX5, 0, tMosaicMEBaRT, MAX_MOSAIC_RTCM_V3_MSG, & settings.mosaicMessageEnabledRTCMv3Base, "messageEnabledRTCMBase_", nullptr, },
1466+
{ 1, 1, 1, 0, 0, 1, 0, 0, 0, MX5, 0, tMosaicMSNmea, MAX_MOSAIC_NMEA_MSG, & settings.mosaicMessageStreamNMEA, "messageStreamNMEA_", gnssCmdUpdateMessageRates, },
1467+
{ 1, 1, 1, 0, 0, 1, 0, 0, 0, MX5, 0, tMosaicSINmea, MOSAIC_NUM_NMEA_STREAMS, & settings.mosaicStreamIntervalsNMEA, "streamIntervalNMEA_", gnssCmdUpdateMessageRates, },
1468+
{ 1, 1, 1, 0, 0, 1, 0, 0, 0, MX5, 0, tMosaicMIRvRT, MAX_MOSAIC_RTCM_V3_INTERVAL_GROUPS, & settings.mosaicMessageIntervalsRTCMv3Rover, "messageIntervalRTCMRover_", gnssCmdUpdateMessageRates, },
1469+
{ 1, 1, 1, 0, 0, 1, 0, 0, 0, MX5, 0, tMosaicMIBaRT, MAX_MOSAIC_RTCM_V3_INTERVAL_GROUPS, & settings.mosaicMessageIntervalsRTCMv3Base, "messageIntervalRTCMBase_", gnssCmdUpdateMessageRates, },
1470+
{ 1, 1, 1, 0, 0, 1, 0, 0, 0, MX5, 0, tMosaicMERvRT, MAX_MOSAIC_RTCM_V3_MSG, & settings.mosaicMessageEnabledRTCMv3Rover, "messageEnabledRTCMRover_", gnssCmdUpdateMessageRates, },
1471+
{ 1, 1, 1, 0, 0, 1, 0, 0, 0, MX5, 0, tMosaicMEBaRT, MAX_MOSAIC_RTCM_V3_MSG, & settings.mosaicMessageEnabledRTCMv3Base, "messageEnabledRTCMBase_", gnssCmdUpdateMessageRates, },
14721472
{ 1, 1, 0, 0, 0, 1, 0, 0, 0, MX5, 0, _bool, 0, & settings.enableLoggingRINEX, "enableLoggingRINEX", nullptr, },
14731473
{ 1, 1, 0, 0, 0, 1, 0, 0, 0, MX5, 0, _uint8_t, 0, & settings.RINEXFileDuration, "RINEXFileDuration", nullptr, },
14741474
{ 1, 1, 0, 0, 0, 1, 0, 0, 0, MX5, 0, _uint8_t, 0, & settings.RINEXObsInterval, "RINEXObsInterval", nullptr, },
@@ -1728,8 +1728,8 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
17281728
// ublox GNSS Receiver
17291729
#ifdef COMPILE_ZED
17301730
{ 1, 1, 1, 1, 1, 0, 0, 1, 0, ZED, 0, tUbxConst, MAX_UBX_CONSTELLATIONS, & settings.ubxConstellations[0], "constellation_", gnssCmdUpdateConstellations, },
1731-
{ 0, 1, 1, 1, 1, 0, 0, 1, 0, ZED, 0, tUbxMsgRt, MAX_UBX_MSG, & settings.ubxMessageRates[0], "ubxMessageRate_", nullptr, },
1732-
{ 0, 1, 1, 1, 1, 0, 0, 1, 0, ZED, 0, tUbMsgRtb, MAX_UBX_MSG_RTCM, & settings.ubxMessageRatesBase[0], "ubxMessageRateBase_", nullptr, },
1731+
{ 0, 1, 1, 1, 1, 0, 0, 1, 0, ZED, 0, tUbxMsgRt, MAX_UBX_MSG, & settings.ubxMessageRates[0], "ubxMessageRate_", gnssCmdUpdateMessageRates, },
1732+
{ 0, 1, 1, 1, 1, 0, 0, 1, 0, ZED, 0, tUbMsgRtb, MAX_UBX_MSG_RTCM, & settings.ubxMessageRatesBase[0], "ubxMessageRateBase_", gnssCmdUpdateMessageRates, },
17331733
#endif // COMPILE_ZED
17341734

17351735
// UDP Server
@@ -1762,9 +1762,9 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
17621762

17631763
#ifdef COMPILE_UM980
17641764
{ 1, 1, 1, 0, 0, 0, 1, 0, 0, U98, 0, tUmConst, MAX_UM980_CONSTELLATIONS, & settings.um980Constellations, "constellation_", gnssCmdUpdateConstellations, },
1765-
{ 0, 1, 1, 0, 0, 0, 1, 0, 0, U98, 0, tUmMRNmea, MAX_UM980_NMEA_MSG, & settings.um980MessageRatesNMEA, "messageRateNMEA_", nullptr, },
1766-
{ 0, 1, 1, 0, 0, 0, 1, 0, 0, U98, 0, tUmMRBaRT, MAX_UM980_RTCM_MSG, & settings.um980MessageRatesRTCMBase, "messageRateRTCMBase_", nullptr, },
1767-
{ 0, 1, 1, 0, 0, 0, 1, 0, 0, U98, 0, tUmMRRvRT, MAX_UM980_RTCM_MSG, & settings.um980MessageRatesRTCMRover, "messageRateRTCMRover_", nullptr, },
1765+
{ 0, 1, 1, 0, 0, 0, 1, 0, 0, U98, 0, tUmMRNmea, MAX_UM980_NMEA_MSG, & settings.um980MessageRatesNMEA, "messageRateNMEA_", gnssCmdUpdateMessageRates, },
1766+
{ 0, 1, 1, 0, 0, 0, 1, 0, 0, U98, 0, tUmMRBaRT, MAX_UM980_RTCM_MSG, & settings.um980MessageRatesRTCMBase, "messageRateRTCMBase_", gnssCmdUpdateMessageRates, },
1767+
{ 0, 1, 1, 0, 0, 0, 1, 0, 0, U98, 0, tUmMRRvRT, MAX_UM980_RTCM_MSG, & settings.um980MessageRatesRTCMRover, "messageRateRTCMRover_", gnssCmdUpdateMessageRates, },
17681768
#endif // COMPILE_UM980
17691769

17701770
// Web Server
@@ -1811,10 +1811,10 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
18111811

18121812
#ifdef COMPILE_LG290P
18131813
{ 1, 1, 1, 0, 0, 0, 0, 0, 1, L29, 1, tLgConst, MAX_LG290P_CONSTELLATIONS, & settings.lg290pConstellations, "constellation_", gnssCmdUpdateConstellations, },
1814-
{ 0, 1, 1, 0, 0, 0, 0, 0, 1, L29, 1, tLgMRNmea, MAX_LG290P_NMEA_MSG, & settings.lg290pMessageRatesNMEA, "messageRateNMEA_", nullptr, },
1815-
{ 0, 1, 1, 0, 0, 0, 0, 0, 1, L29, 1, tLgMRBaRT, MAX_LG290P_RTCM_MSG, & settings.lg290pMessageRatesRTCMBase, "messageRateRTCMBase_", nullptr, },
1816-
{ 0, 1, 1, 0, 0, 0, 0, 0, 1, L29, 1, tLgMRRvRT, MAX_LG290P_RTCM_MSG, & settings.lg290pMessageRatesRTCMRover, "messageRateRTCMRover_", nullptr, },
1817-
{ 0, 1, 1, 0, 0, 0, 0, 0, 1, L29, 1, tLgMRPqtm, MAX_LG290P_PQTM_MSG, & settings.lg290pMessageRatesPQTM, "messageRatePQTM_", nullptr, },
1814+
{ 0, 1, 1, 0, 0, 0, 0, 0, 1, L29, 1, tLgMRNmea, MAX_LG290P_NMEA_MSG, & settings.lg290pMessageRatesNMEA, "messageRateNMEA_", gnssCmdUpdateMessageRates, },
1815+
{ 0, 1, 1, 0, 0, 0, 0, 0, 1, L29, 1, tLgMRBaRT, MAX_LG290P_RTCM_MSG, & settings.lg290pMessageRatesRTCMBase, "messageRateRTCMBase_", gnssCmdUpdateMessageRates, },
1816+
{ 0, 1, 1, 0, 0, 0, 0, 0, 1, L29, 1, tLgMRRvRT, MAX_LG290P_RTCM_MSG, & settings.lg290pMessageRatesRTCMRover, "messageRateRTCMRover_", gnssCmdUpdateMessageRates, },
1817+
{ 0, 1, 1, 0, 0, 0, 0, 0, 1, L29, 1, tLgMRPqtm, MAX_LG290P_PQTM_MSG, & settings.lg290pMessageRatesPQTM, "messageRatePQTM_", gnssCmdUpdateMessageRates, },
18181818
#endif // COMPILE_LG290P
18191819

18201820
{ 0, 0, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _bool, 0, & settings.debugSettings, "debugSettings", nullptr, },

0 commit comments

Comments
 (0)