Skip to content

Commit df08818

Browse files
committed
Fix bad print of dynamic models.
1 parent 936c5a6 commit df08818

File tree

1 file changed

+41
-39
lines changed

1 file changed

+41
-39
lines changed

Firmware/RTK_Everywhere/menuGNSS.ino

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -76,49 +76,51 @@ void menuGNSS()
7676
break;
7777
#endif // COMPILE_ZED
7878
}
79+
systemPrintln();
7980
}
80-
}
8181

8282
#ifdef COMPILE_UM980
83-
else if (present.gnss_um980)
84-
{
85-
switch (settings.dynamicModel)
83+
else if (present.gnss_um980)
8684
{
87-
default:
88-
systemPrint("Unknown");
89-
break;
90-
case UM980_DYN_MODEL_SURVEY:
91-
systemPrint("Survey");
92-
break;
93-
case UM980_DYN_MODEL_UAV:
94-
systemPrint("UAV");
95-
break;
96-
case UM980_DYN_MODEL_AUTOMOTIVE:
97-
systemPrint("Automotive");
98-
break;
85+
switch (settings.dynamicModel)
86+
{
87+
default:
88+
systemPrint("Unknown");
89+
break;
90+
case UM980_DYN_MODEL_SURVEY:
91+
systemPrint("Survey");
92+
break;
93+
case UM980_DYN_MODEL_UAV:
94+
systemPrint("UAV");
95+
break;
96+
case UM980_DYN_MODEL_AUTOMOTIVE:
97+
systemPrint("Automotive");
98+
break;
99+
}
100+
systemPrintln();
99101
}
100-
}
101102
#endif // COMPILE_UM980
102103

103-
else if (present.gnss_mosaicX5)
104-
{
105-
switch (settings.dynamicModel)
104+
else if (present.gnss_mosaicX5)
106105
{
107-
default:
108-
systemPrint("Unknown");
109-
break;
110-
case MOSAIC_DYN_MODEL_STATIC:
111-
case MOSAIC_DYN_MODEL_QUASISTATIC:
112-
case MOSAIC_DYN_MODEL_PEDESTRIAN:
113-
case MOSAIC_DYN_MODEL_AUTOMOTIVE:
114-
case MOSAIC_DYN_MODEL_RACECAR:
115-
case MOSAIC_DYN_MODEL_HEAVYMACHINERY:
116-
case MOSAIC_DYN_MODEL_UAV:
117-
case MOSAIC_DYN_MODEL_UNLIMITED:
118-
systemPrint(mosaicReceiverDynamics[settings.dynamicModel].humanName);
119-
break;
106+
switch (settings.dynamicModel)
107+
{
108+
default:
109+
systemPrint("Unknown");
110+
break;
111+
case MOSAIC_DYN_MODEL_STATIC:
112+
case MOSAIC_DYN_MODEL_QUASISTATIC:
113+
case MOSAIC_DYN_MODEL_PEDESTRIAN:
114+
case MOSAIC_DYN_MODEL_AUTOMOTIVE:
115+
case MOSAIC_DYN_MODEL_RACECAR:
116+
case MOSAIC_DYN_MODEL_HEAVYMACHINERY:
117+
case MOSAIC_DYN_MODEL_UAV:
118+
case MOSAIC_DYN_MODEL_UNLIMITED:
119+
systemPrint(mosaicReceiverDynamics[settings.dynamicModel].humanName);
120+
break;
121+
}
122+
systemPrintln();
120123
}
121-
systemPrintln();
122124
}
123125

124126
systemPrintln("4) Set Constellations");
@@ -186,7 +188,7 @@ void menuGNSS()
186188
else if ((incoming == 2) && (!present.gnss_mosaicX5))
187189
{
188190
float rate_ms = 0.0; //
189-
float minRate = 1.0; //Seconds between fixes
191+
float minRate = 1.0; // Seconds between fixes
190192
float maxRate = 1.0;
191193

192194
if (present.gnss_zedf9p)
@@ -202,14 +204,14 @@ void menuGNSS()
202204
else if (present.gnss_lg290p)
203205
{
204206
minRate = 0.05; // 20Hz
205-
maxRate = 1.0; // The LG290P doesn't support slower speeds than 1Hz
207+
maxRate = 1.0; // The LG290P doesn't support slower speeds than 1Hz
206208
}
207209

208-
if (getNewSetting("Enter GNSS measurement rate in seconds between measurements", minRate, maxRate, &rate_ms) ==
209-
INPUT_RESPONSE_VALID)
210+
if (getNewSetting("Enter GNSS measurement rate in seconds between measurements", minRate, maxRate,
211+
&rate_ms) == INPUT_RESPONSE_VALID)
210212
{
211213
// This will set settings.measurementRateMs, settings.navigationRate, and GSV message
212-
gnss->setRate(rate_ms);
214+
gnss->setRate(rate_ms);
213215
}
214216
}
215217
else if (incoming == 3 && present.dynamicModel)

0 commit comments

Comments
 (0)