Skip to content

Commit f914513

Browse files
committed
Update mosaic signatures. Correct use of restartRover/Base makes the signatures largely redundant
1 parent a93b871 commit f914513

File tree

1 file changed

+16
-21
lines changed

1 file changed

+16
-21
lines changed

Firmware/RTK_Everywhere/GNSS_Mosaic.ino

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -390,15 +390,10 @@ bool GNSS_MOSAIC::checkPPPRates()
390390
// Returns true if successfully configured and false upon failure
391391
//----------------------------------------
392392
// If any of the settings in the signature have changed, reapply the Base configuration
393-
#define GNSS_MOSAIC_BASE_SIGNATURE \
394-
( \
395-
((settings.minElev & 0x01) << 1) \
396-
| ((settings.enableGnssToUsbSerial & 0x01) << 2) \
397-
| ((settings.enablePointPerfectCorrections & 0x01) << 3) \
398-
| ((settings.ntripClient_TransmitGGA & 0x01) << 4) \
399-
| ((settings.enableLogging & 0x01) << 5) \
400-
| ((settings.enableLoggingRINEX & 0x01) << 6) \
401-
| ((settings.enableExternalHardwareEventLogging & 0x01) << 7) \
393+
// See GNSS_MOSAIC_ROVER_SIGNATURE as an example
394+
#define GNSS_MOSAIC_BASE_SIGNATURE \
395+
( \
396+
0 \
402397
)
403398
bool GNSS_MOSAIC::configureBase()
404399
{
@@ -555,9 +550,9 @@ bool GNSS_MOSAIC::configureLBand(bool enableLBand, uint32_t LBandFreq)
555550
//----------------------------------------
556551
// If any of the settings in the signature have changed, reapply the configuration
557552
// See GNSS_MOSAIC_ROVER_SIGNATURE as an example
558-
#define GNSS_MOSAIC_ONCE_SIGNATURE \
559-
( \
560-
0 \
553+
#define GNSS_MOSAIC_ONCE_SIGNATURE \
554+
( \
555+
0 \
561556
)
562557
bool GNSS_MOSAIC::configureOnce()
563558
{
@@ -662,13 +657,13 @@ bool GNSS_MOSAIC::configureGNSS()
662657
// Returns true if successfully configured and false upon failure
663658
//----------------------------------------
664659
// If any of the settings in the signature have changed, reapply the Rover configuration
665-
#define GNSS_MOSAIC_ROVER_SIGNATURE \
666-
( \
667-
((settings.enablePointPerfectCorrections & 0x01) << 1) \
668-
| ((settings.enableGnssToUsbSerial & 0x01) << 2) \
669-
| ((settings.ntripClient_TransmitGGA & 0x01) << 3) \
670-
| ((settings.enableLogging & 0x01) << 4) \
671-
| ((settings.enableExternalHardwareEventLogging & 0x01) << 5) \
660+
// E.g. ((settings.enablePointPerfectCorrections & 0x01) << 1)
661+
// | ((settings.enableGnssToUsbSerial & 0x01) << 2)
662+
// But most of this is taken care of by restartRover and restartBase
663+
// You should only use the signature to trap any exceptions not covered by restartRover/Base
664+
#define GNSS_MOSAIC_ROVER_SIGNATURE \
665+
( \
666+
0 \
672667
)
673668
bool GNSS_MOSAIC::configureRover()
674669
{
@@ -696,9 +691,9 @@ bool GNSS_MOSAIC::configureRover()
696691

697692
response &= sendWithResponse("spm,Rover,all,auto\n\r", "PVTMode");
698693

699-
response &= setModel(settings.dynamicModel);
694+
response &= setModel(settings.dynamicModel); // Set by menuGNSS which calls gnss->setModel
700695

701-
response &= setElevation(settings.minElev);
696+
response &= setElevation(settings.minElev); // Set by menuGNSS which calls gnss->setElevation
702697

703698
response &= enableRTCMRover();
704699

0 commit comments

Comments
 (0)