Add settingPossibleOnPlatform

Author: PaulZC

Firmware/RTK_Everywhere/GNSS_Mosaic.ino

@@ -1739,7 +1739,8 @@ void GNSS_MOSAIC::menuConstellations()
 
         for (int x = 0; x < MAX_MOSAIC_CONSTELLATIONS; x++)
         {
-            systemPrintf("%d) Constellation %s: ", x + 1, mosaicSignalConstellations[x].name);
+            const char *ptr = mosaicSignalConstellations[x].configName;
+            systemPrintf("%d) Constellation %s: ", x + 1, ptr);
             if (settings.mosaicConstellations[x] > 0)
                 systemPrint("Enabled");
             else

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -892,7 +892,7 @@ unsigned long loraLastIncomingSerial; // Last time a user sent a serial command.
 
 // Display boot times
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#define MAX_BOOT_TIME_ENTRIES 42
+#define MAX_BOOT_TIME_ENTRIES 43
 uint8_t bootTimeIndex;
 uint32_t bootTime[MAX_BOOT_TIME_ENTRIES];
 const char *bootTimeString[MAX_BOOT_TIME_ENTRIES];
@@ -1190,7 +1190,7 @@ void setup()
     identifyBoard(); // Determine what hardware platform we are running on.
 
     DMW_b("commandIndexFill");
-    if (!commandIndexFill()) // Initialize the command table index
+    if (!commandIndexFill(true)) // Initialize the command table index using possible settings
         reportFatalError("Failed to allocate and fill the commandIndex!");
 
     DMW_b("beginBoard");
@@ -1238,6 +1238,7 @@ void setup()
     DMW_b("verifyTables");
     verifyTables(); // Verify the consistency of the internal tables
 
+    DMW_b("beginVersion");
     beginVersion(); // Assemble platform name. Requires settings/LFS.
 
     DMW_b("displaySplash");
@@ -1249,8 +1250,14 @@ void setup()
     DMW_b("loadSettings");
     loadSettings(); // Attempt to load settings after SD is started so we can read the settings file if available
 
+    DMW_b("gnssDetectReceiverType");
     gnssDetectReceiverType(); // If we don't know the receiver from the platform, auto-detect it. Uses settings.
 
+    DMW_b("commandIndexFill (2)");
+    commandIndexFill(false); // Shrink the commandIndex table now we're certain what GNSS we have
+    loadSettings();
+    recordSystemSettings();
+
     DMW_b("beginGnssUart");
     beginGnssUart(); // Requires settings. Start the UART connected to the GNSS receiver on core 0. Start before
                      // gnssBegin in case it is needed (Torch).

Firmware/RTK_Everywhere/menuCommands.ino

@@ -3436,8 +3436,33 @@ bool settingAvailableOnPlatform(int i)
     return true;
 }
 
+// Determine if the setting is possible on this platform
+bool settingPossibleOnPlatform(int i)
+{
+    do
+    {
+        // Verify that the command is available on the platform
+        if ((productVariant == RTK_EVK) && rtkSettingsEntries[i].platEvk)
+            break;
+        if ((productVariant == RTK_FACET_V2) && rtkSettingsEntries[i].platFacetV2)
+            break;
+        if ((productVariant == RTK_FACET_V2_LBAND) && rtkSettingsEntries[i].platFacetV2LBand)
+            break;
+        if ((productVariant == RTK_FACET_MOSAIC) && rtkSettingsEntries[i].platFacetMosaic)
+            break;
+        if ((productVariant == RTK_TORCH) && rtkSettingsEntries[i].platTorch)
+            break;
+        if ((productVariant == RTK_POSTCARD) && rtkSettingsEntries[i].platPostcard)
+            break;
+        if ((productVariant == RTK_FLEX) && (rtkSettingsEntries[i].platFlex > FFN))
+            break;
+        return false;
+    } while (0);
+    return true;
+}
+
 // Allocate and fill the commandIndex table
-bool commandIndexFill()
+bool commandIndexFill(bool usePossibleSettings)
 {
     int i;
     const char *iCommandName;
@@ -3450,14 +3475,26 @@ bool commandIndexFill()
     commandCount = 0;
     for (i = 0; i < numRtkSettingsEntries; i++)
     {
-        if (settingAvailableOnPlatform(i))
-            commandCount += 1;
+        if (usePossibleSettings)
+        {
+            // commandIndexFill is called after identifyBoard. On Flex, we don't yet know
+            // the detectedGnssReceiver, so we have to use settingPossibleOnPlatform
+            if (settingPossibleOnPlatform(i))
+                commandCount += 1;
+        }
+        else
+        {
+            if (settingAvailableOnPlatform(i))
+                commandCount += 1;
+        }
     }
     commandCount += COMMAND_COUNT - 1;
 
     // Allocate the command array. Never freed
     length = commandCount * sizeof(*commandIndex);
 
+    if (commandIndex)
+        rtkFree(commandIndex, "Command index array (commandIndex)");
     commandIndex = (int16_t *)rtkMalloc(length, "Command index array (commandIndex)");
     if (!commandIndex)
     {
@@ -3469,8 +3506,18 @@ bool commandIndexFill()
     // Initialize commandIndex with index values into rtkSettingsEntries
     commandCount = 0;
     for (i = 0; i < numRtkSettingsEntries; i++)
-        if (settingAvailableOnPlatform(i))
-            commandIndex[commandCount++] = i;
+    {
+        if (usePossibleSettings)
+        {
+            if (settingPossibleOnPlatform(i))
+                commandIndex[commandCount++] = i;
+        }
+        else
+        {
+            if (settingAvailableOnPlatform(i))
+                commandIndex[commandCount++] = i;
+        }
+    }
 
     // Add the man-machine interface commands to the list
     for (i = 1; i < COMMAND_COUNT; i++)