Skip to content

Commit 6dee83c

Browse files
committed
Change default RTCM logging to MSM7
1 parent 382a238 commit 6dee83c

File tree

2 files changed

+35
-25
lines changed

2 files changed

+35
-25
lines changed

Firmware/RTK_Everywhere/GNSS_LG290P.ino

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,15 +1374,15 @@ uint8_t GNSS_LG290P::getLoggingType()
13741374
// GST is not available/default
13751375
if (getActiveNmeaMessageCount() == 6 && getActiveRtcmMessageCount() == 0)
13761376
logType = LOGGING_STANDARD;
1377-
else if (getActiveNmeaMessageCount() == 6 && getActiveRtcmMessageCount() == 8)
1377+
else if (getActiveNmeaMessageCount() == 6 && getActiveRtcmMessageCount() == 4)
13781378
logType = LOGGING_PPP;
13791379
}
13801380
else
13811381
{
13821382
// GST *is* available/default
13831383
if (getActiveNmeaMessageCount() == 7 && getActiveRtcmMessageCount() == 0)
13841384
logType = LOGGING_STANDARD;
1385-
else if (getActiveNmeaMessageCount() == 7 && getActiveRtcmMessageCount() == 8)
1385+
else if (getActiveNmeaMessageCount() == 7 && getActiveRtcmMessageCount() == 4)
13861386
logType = LOGGING_PPP;
13871387
}
13881388

@@ -1824,8 +1824,8 @@ void GNSS_LG290P::menuMessages()
18241824
systemPrintln("4) Set PQTM Messages");
18251825

18261826
systemPrintln("10) Reset to Defaults");
1827-
systemPrintln("11) Reset to PPP Logging (NMEAx7 / RTCMx8 - 30 second decimation)");
1828-
systemPrintln("12) Reset to High-rate PPP Logging (NMEAx7 / RTCMx8 - 1Hz)");
1827+
systemPrintln("11) Reset to PPP Logging (NMEAx7 / RTCMx4 - 30 second decimation)");
1828+
systemPrintln("12) Reset to High-rate PPP Logging (NMEAx7 / RTCMx4 - 1Hz)");
18291829

18301830
systemPrintln("x) Exit");
18311831

@@ -1875,23 +1875,30 @@ void GNSS_LG290P::menuMessages()
18751875

18761876
setRtcmRoverMessageRates(0); // Turn off all RTCM messages
18771877
setRtcmRoverMessageRateByName("RTCM3-1019", rtcmReportRate);
1878-
setRtcmRoverMessageRateByName("RTCM3-1020", rtcmReportRate);
1879-
setRtcmRoverMessageRateByName("RTCM3-1042", rtcmReportRate);
1880-
setRtcmRoverMessageRateByName("RTCM3-1046", rtcmReportRate);
1878+
// setRtcmRoverMessageRateByName("RTCM3-1020", rtcmReportRate); //Not needed when MSM7 is used
1879+
// setRtcmRoverMessageRateByName("RTCM3-1042", rtcmReportRate); //BeiDou not used by CSRS-PPP
1880+
// setRtcmRoverMessageRateByName("RTCM3-1046", rtcmReportRate); //Not needed when MSM7 is used
18811881
setRtcmRoverMessageRateByName("RTCM3-107X", rtcmReportRate);
18821882
setRtcmRoverMessageRateByName("RTCM3-108X", rtcmReportRate);
18831883
setRtcmRoverMessageRateByName("RTCM3-109X", rtcmReportRate);
1884-
setRtcmRoverMessageRateByName("RTCM3-112X", rtcmReportRate);
1884+
// setRtcmRoverMessageRateByName("RTCM3-112X", rtcmReportRate); //BeiDou not used by CSRS-PPP
1885+
1886+
// Default is MSM4. Change to MSM7 to aid in faster PPP CSRS results.
1887+
_lg290p->sendOkCommand("$PQTMCFGRTCM","W,7,0,15,07,06,1,0"); // Enable MSM7, 15 degree requirement on satellites
1888+
1889+
// Override settings for PPP logging
1890+
setElevation(15);
1891+
setMinCnoRadio(30);
18851892

18861893
setRate(1); // Go to 1 Hz
18871894

18881895
if (incoming == 12)
18891896
{
1890-
systemPrintln("Reset to High-rate PPP Logging Defaults (NMEAx1 / RTCMx8 - 1Hz)");
1897+
systemPrintln("Reset to High-rate PPP Logging Defaults (NMEAx7 / RTCMx4 - 1Hz)");
18911898
}
18921899
else
18931900
{
1894-
systemPrintln("Reset to PPP Logging Defaults (NMEAx1 / RTCMx8 - 30 second decimation)");
1901+
systemPrintln("Reset to PPP Logging Defaults (NMEAx7 / RTCMx4 - 30 second decimation)");
18951902
}
18961903
}
18971904

@@ -1910,6 +1917,8 @@ void GNSS_LG290P::menuMessages()
19101917
restartRover = true;
19111918
else
19121919
restartBase = true;
1920+
1921+
setLoggingType(); // Determine if we are standard, PPP, or custom. Changes logging icon accordingly.
19131922
}
19141923

19151924
//----------------------------------------

Firmware/RTK_Everywhere/GNSS_UM980.ino

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,8 +1331,8 @@ void GNSS_UM980::menuMessages()
13311331
systemPrintln("3) Set Base RTCM Messages");
13321332

13331333
systemPrintln("10) Reset to Defaults");
1334-
systemPrintln("11) Reset to PPP Logging (NMEAx1 / RTCMx8 - 30 second decimation)");
1335-
systemPrintln("12) Reset to High-rate PPP Logging (NMEAx1 / RTCMx8 - 1Hz)");
1334+
systemPrintln("11) Reset to PPP Logging (NMEAx5 / RTCMx4 - 30 second decimation)");
1335+
systemPrintln("12) Reset to High-rate PPP Logging (NMEAx5 / RTCMx4 - 1Hz)");
13361336

13371337
systemPrintln("x) Exit");
13381338

@@ -1373,25 +1373,25 @@ void GNSS_UM980::menuMessages()
13731373
// Reset NMEA rates to defaults
13741374
for (int x = 0; x < MAX_UM980_NMEA_MSG; x++)
13751375
settings.um980MessageRatesNMEA[x] = umMessagesNMEA[x].msgDefaultRate;
1376-
setNmeaMessageRateByName("GPGSV", 5); //Limit GSV updates to 1 every 5 seconds
1376+
setNmeaMessageRateByName("GPGSV", 5); // Limit GSV updates to 1 every 5 seconds
13771377

13781378
setRtcmRoverMessageRates(0); // Turn off all RTCM messages
13791379
setRtcmRoverMessageRateByName("RTCM1019", reportRate);
1380-
setRtcmRoverMessageRateByName("RTCM1020", reportRate);
1381-
setRtcmRoverMessageRateByName("RTCM1042", reportRate);
1382-
setRtcmRoverMessageRateByName("RTCM1046", reportRate);
1383-
setRtcmRoverMessageRateByName("RTCM1074", reportRate);
1384-
setRtcmRoverMessageRateByName("RTCM1084", reportRate);
1385-
setRtcmRoverMessageRateByName("RTCM1094", reportRate);
1386-
setRtcmRoverMessageRateByName("RTCM1124", reportRate);
1380+
// setRtcmRoverMessageRateByName("RTCM1020", reportRate); //Not needed when MSM7 is used
1381+
// setRtcmRoverMessageRateByName("RTCM1042", reportRate); //BeiDou not used by CSRS-PPP
1382+
// setRtcmRoverMessageRateByName("RTCM1046", reportRate); //Not needed when MSM7 is used
1383+
setRtcmRoverMessageRateByName("RTCM1077", reportRate);
1384+
setRtcmRoverMessageRateByName("RTCM1087", reportRate);
1385+
setRtcmRoverMessageRateByName("RTCM1097", reportRate);
1386+
// setRtcmRoverMessageRateByName("RTCM1124", reportRate); //BeiDou not used by CSRS-PPP
13871387

13881388
if (incoming == 12)
13891389
{
1390-
systemPrintln("Reset to High-rate PPP Logging (NMEAx5 / RTCMx8 - 1Hz)");
1390+
systemPrintln("Reset to High-rate PPP Logging (NMEAx5 / RTCMx4 - 1Hz)");
13911391
}
13921392
else
13931393
{
1394-
systemPrintln("Reset to PPP Logging (NMEAx5 / RTCMx8 - 30 second decimation)");
1394+
systemPrintln("Reset to PPP Logging (NMEAx5 / RTCMx4 - 30 second decimation)");
13951395
}
13961396
}
13971397

@@ -2078,9 +2078,10 @@ void um980FirmwareBeginUpdate()
20782078

20792079
systemPrintln();
20802080
systemPrintf("Entering UM980 direct connect for firmware update and configuration. Disconnect this terminal "
2081-
"connection. Use "
2082-
"UPrecise to update the firmware. Baudrate: 115200bps. Press the %s button to return "
2083-
"to normal operation.\r\n", present.button_mode ? "mode" : "power");
2081+
"connection. Use "
2082+
"UPrecise to update the firmware. Baudrate: 115200bps. Press the %s button to return "
2083+
"to normal operation.\r\n",
2084+
present.button_mode ? "mode" : "power");
20842085
systemFlush();
20852086

20862087
// Make sure ESP-UART is connected to UM980

0 commit comments

Comments
 (0)