Skip to content

Commit 894f67b

Browse files
committed
Fix LG290P command settings. Add debugSettings.
1 parent d02ab36 commit 894f67b

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

Firmware/RTK_Everywhere/menuGNSS.ino

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,25 +183,25 @@ void menuGNSS()
183183

184184
if (present.gnss_zedf9p)
185185
{
186-
maxRateHz = 20; // 20Hz
187186
minRateHz = 0.00012; // Limit of 127 (navRate) * 65000ms (measRate) = 137 minute limit.
187+
maxRateHz = 20; // 20Hz
188188
}
189189
else if (present.gnss_um980)
190190
{
191191
minRateHz = 0.02; // 1 / 65 = 0.015384 Hz = Found experimentally
192-
maxRateHz = 20; // 20Hz
192+
maxRateHz = 20; // 20Hz
193193
}
194194
else if (present.gnss_lg290p)
195195
{
196-
minRateHz = 1.0; // The LG290P doesn't support slower speeds than 1Hz
197-
maxRateHz = 20; // 20Hz
196+
minRateHz = 1.0; // The LG290P doesn't support slower speeds than 1Hz
197+
maxRateHz = 20; // 20Hz
198198
}
199199

200200
if (getNewSetting("Enter GNSS measurement rate in Hz", minRateHz, maxRateHz, &rateHz) ==
201201
INPUT_RESPONSE_VALID) // 20Hz limit with all constellations enabled
202202
{
203203
gnss->setRate(1.0 / rateHz); // Convert Hz to seconds. This will set settings.measurementRateMs,
204-
// settings.navigationRate, and GSV message
204+
// settings.navigationRate, and GSV message
205205
}
206206
}
207207
else if ((incoming == 2) && (!present.gnss_mosaicX5))

Firmware/RTK_Everywhere/settings.h

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1566,15 +1566,15 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
15661566
// S g s x k 2 c h d d Type Qual Variable Name
15671567

15681568
// UM980 GNSS Receiver
1569-
{ 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, _bool, 0, & settings.enableGalileoHas, "enableGalileoHas", },
1569+
{ 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, _bool, 0, & settings.enableGalileoHas, "enableGalileoHas", },
15701570
{ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, _bool, 0, & settings.enableImuCompensationDebug, "enableImuCompensationDebug", },
15711571
{ 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, _bool, 0, & settings.enableImuDebug, "enableImuDebug", },
15721572
{ 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, _bool, 0, & settings.enableTiltCompensation, "enableTiltCompensation", },
15731573
#ifdef COMPILE_UM980
1574-
{ 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, tUmConst, MAX_UM980_CONSTELLATIONS, & settings.um980Constellations, "constellation_", },
1575-
{ 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, tUmMRNmea, MAX_UM980_NMEA_MSG, & settings.um980MessageRatesNMEA, "messageRateNMEA_", },
1576-
{ 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, tUmMRBaRT, MAX_UM980_RTCM_MSG, & settings.um980MessageRatesRTCMBase, "messageRateRTCMBase_", },
1577-
{ 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, tUmMRRvRT, MAX_UM980_RTCM_MSG, & settings.um980MessageRatesRTCMRover, "messageRateRTCMRover_", },
1574+
{ 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, tUmConst, MAX_UM980_CONSTELLATIONS, & settings.um980Constellations, "constellation_", },
1575+
{ 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, tUmMRNmea, MAX_UM980_NMEA_MSG, & settings.um980MessageRatesNMEA, "messageRateNMEA_", },
1576+
{ 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, tUmMRBaRT, MAX_UM980_RTCM_MSG, & settings.um980MessageRatesRTCMBase, "messageRateRTCMBase_", },
1577+
{ 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, tUmMRRvRT, MAX_UM980_RTCM_MSG, & settings.um980MessageRatesRTCMRover, "messageRateRTCMRover_", },
15781578
#endif // COMPILE_UM980
15791579

15801580
// Web Server
@@ -1620,12 +1620,13 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
16201620
// S g s x k 2 c h d d Type Qual Variable Name
16211621

16221622
#ifdef COMPILE_LG290P
1623-
{ 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, tLgConst, MAX_LG290P_CONSTELLATIONS, & settings.lg290pConstellations, "constellation_", },
1624-
{ 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, tLgMRNmea, MAX_LG290P_NMEA_MSG, & settings.lg290pMessageRatesNMEA, "messageRateNMEA_", },
1625-
{ 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, tLgMRBaRT, MAX_LG290P_RTCM_MSG, & settings.lg290pMessageRatesRTCMBase, "messageRateRTCMBase_", },
1626-
{ 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, tLgMRRvRT, MAX_LG290P_RTCM_MSG, & settings.lg290pMessageRatesRTCMRover, "messageRateRTCMRover_", },
1627-
#endif // COMPILE_UM980
1623+
{ 1, 1, 1, 1, 0, 0, 0, 0, 0, 1, tLgConst, MAX_LG290P_CONSTELLATIONS, & settings.lg290pConstellations, "constellation_", },
1624+
{ 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, tLgMRNmea, MAX_LG290P_NMEA_MSG, & settings.lg290pMessageRatesNMEA, "messageRateNMEA_", },
1625+
{ 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, tLgMRBaRT, MAX_LG290P_RTCM_MSG, & settings.lg290pMessageRatesRTCMBase, "messageRateRTCMBase_", },
1626+
{ 1, 0, 1, 1, 0, 0, 0, 0, 0, 1, tLgMRRvRT, MAX_LG290P_RTCM_MSG, & settings.lg290pMessageRatesRTCMRover, "messageRateRTCMRover_", },
1627+
#endif // COMPILE_LG290P
16281628

1629+
{ 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, _bool, 0, & settings.debugSettings, "debugSettings", },
16291630

16301631
// Add new settings to appropriate group above or create new group
16311632
// Then also add to the same group in settings above

0 commit comments

Comments
 (0)