File tree Expand file tree Collapse file tree 3 files changed +25
-5
lines changed Expand file tree Collapse file tree 3 files changed +25
-5
lines changed Original file line number Diff line number Diff line change @@ -227,8 +227,21 @@ void recordSystemSettingsToFile(File *settingsFile)
227
227
for (int i = 0 ; i < numRtkSettingsEntries; i++)
228
228
{
229
229
// Do not record this setting if it is not supported by the current platform
230
- if (settingAvailableOnPlatform (i) == false )
231
- continue ;
230
+ // But oh what a tangled web we weave...
231
+ // Thanks to Facet Flex, initially we should be saving all possible settings.
232
+ // Later, once we know what Flex GNSS is present, we save only the available
233
+ // settings for that platform. Passing usePossibleSettings in as a parameter
234
+ // would be messy. So, we'll use a global flag which is updated by commandIndexFill
235
+ if (savePossibleSettings)
236
+ {
237
+ if (settingPossibleOnPlatform (i) == false )
238
+ continue ;
239
+ }
240
+ else
241
+ {
242
+ if (settingAvailableOnPlatform (i) == false )
243
+ continue ;
244
+ }
232
245
233
246
switch (rtkSettingsEntries[i].type )
234
247
{
Original file line number Diff line number Diff line change @@ -390,6 +390,9 @@ const int sdSizeCheckStackSize = 3000;
390
390
bool sdSizeCheckTaskComplete;
391
391
392
392
char logFileName[sizeof (" SFE_Reference_Station_230101_120101.ubx_plusExtraSpace" )] = {0 };
393
+
394
+ bool savePossibleSettings = true ; // Save possible vs. available settings. See recordSystemSettingsToFile for details
395
+
393
396
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
394
397
395
398
// WiFi support
@@ -1589,12 +1592,14 @@ void logUpdate()
1589
1592
{
1590
1593
if (logTimeExceeded ())
1591
1594
{
1592
- systemPrintln (" Log file: maximum logging time reached" );
1595
+ if (!inMainMenu)
1596
+ systemPrintln (" Log file: maximum logging time reached" );
1593
1597
endSD (false , true ); // Close down SD.
1594
1598
}
1595
1599
else
1596
1600
{
1597
- systemPrintln (" Log file: log length reached" );
1601
+ if (!inMainMenu)
1602
+ systemPrintln (" Log file: log length reached" );
1598
1603
endLogging (false , true ); // (gotSemaphore, releaseSemaphore) Close file. Reset parser stats.
1599
1604
beginLogging (); // Create new file based on current RTC.
1600
1605
setLoggingType (); // Determine if we are standard, PPP, or custom. Changes logging icon accordingly.
@@ -1610,7 +1615,7 @@ void logUpdate()
1610
1615
{
1611
1616
lastFileReport = millis ();
1612
1617
1613
- if (settings.enablePrintLogFileStatus )
1618
+ if (( settings.enablePrintLogFileStatus ) && (!inMainMenu) )
1614
1619
{
1615
1620
systemPrintf (" Log file size: %lld" , logFileSize);
1616
1621
Original file line number Diff line number Diff line change @@ -3548,6 +3548,8 @@ bool commandIndexFillActual()
3548
3548
}
3549
3549
bool commandIndexFill (bool usePossibleSettings)
3550
3550
{
3551
+ savePossibleSettings = usePossibleSettings; // Update savePossibleSettings
3552
+
3551
3553
int i;
3552
3554
const char *iCommandName;
3553
3555
int j;
You can’t perform that action at this time.
0 commit comments