Fix merge issues after update from RC

Author: nseidle

Firmware/RTK_Everywhere/Bluetooth.ino

@@ -29,6 +29,8 @@
 
 static volatile BTState bluetoothState = BT_OFF;
 
+BluetoothRadioType_e bluetoothRadioPreviousOnType = BLUETOOTH_RADIO_OFF;
+
 #ifdef COMPILE_BT
 
 #include <BleBatteryService.h>
@@ -48,8 +50,6 @@ BleBatteryService bluetoothBatteryService;
 
 TaskHandle_t bluetoothCommandTaskHandle = nullptr; // Task to monitor incoming CLI from BLE
 
-BluetoothRadioType_e bluetoothRadioPreviousOnType = BLUETOOTH_RADIO_OFF;
-
 #endif // COMPILE_BT
 
 //----------------------------------------

Firmware/RTK_Everywhere/GNSS_LG290P.ino

@@ -1889,6 +1889,8 @@ bool GNSS_LG290P::setHighAccuracyService(bool enableGalileoHas)
 
     // TODO - We should read/modify/write on PQTMCFGPPP
 
+    bool result = true;
+
     // Enable E6 and PPP if enabled
     if (enableGalileoHas)
     {
@@ -1899,7 +1901,7 @@ bool GNSS_LG290P::setHighAccuracyService(bool enableGalileoHas)
         // Enable E6 HAS, WGS84, 120 timeout, 0.10m Horizontal convergence accuracy threshold, 0.15m Vertical
         // threshold
         char paramConfigurePPP[sizeof(settings.configurePPP) + 4];
-        snprintf(paramConfigurePPP, sizeof(paramConfigurePPP), ",W,%s", configPppSpacesToCommas(configurePPP));
+        snprintf(paramConfigurePPP, sizeof(paramConfigurePPP), ",W,%s", configPppSpacesToCommas(settings.configurePPP));
         if (_lg290p->sendOkCommand("$PQTMCFGPPP", paramConfigurePPP) == true)
         {
             systemPrintln("Galileo E6 HAS service enabled");

Firmware/RTK_Everywhere/WiFi.ino

@@ -1266,7 +1266,7 @@ void wifiUpdateSettings()
 
 //*********************************************************************
 // Determine if any of the WiFi station SSID values are set
-bool wifiAfterCommand(int cmdIndex)
+bool wifiAfterCommand(const char *settingName, void *settingData, int settingType)
 {
     wifiUpdateSettings();
     return true;

Firmware/RTK_Everywhere/menuMessages.ino

@@ -270,7 +270,7 @@ void menuMessagesBaseRTCM()
             if (elevation >= -90 && elevation <= 90)
             {
                 settings.rtcmMinElev = elevation;
-                restartBase = true;
+                gnssConfigure(GNSS_CONFIG_ELEVATION); // Request receiver to use new settings
             }
         }
 
@@ -888,7 +888,7 @@ void checkGNSSArrayDefaults()
         }
         else if (present.gnss_lg290p)
         {
-            settings.minCNO = 10;                    // Default 10 dBHz
+            settings.minCN0 = 10;                    // Default 10 dBHz
             settings.surveyInStartingAccuracy = 2.0; // Default 2m
             settings.measurementRateMs = 500;        // Default 2Hz.
         }

Firmware/RTK_Everywhere/settings.h

@@ -1205,7 +1205,7 @@ typedef enum
 typedef bool (* AFTER_CMD)(const char *settingName, void *settingData, int settingType);
 
 // Forward routines
-bool wifiAfterCommand(int cmdIndex);
+bool wifiAfterCommand(const char *settingName, void *settingData, int settingType);
 
 typedef struct
 {
@@ -1799,10 +1799,10 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
     // WiFi
     { 0, 0, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _bool,     0, & settings.debugWebServer, "debugWebServer", nullptr, },
     { 0, 0, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _bool,     0, & settings.debugWifiState, "debugWifiState", nullptr, },
-    { 0, 0, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _bool,     0, & settings.enableCaptivePortal, "enableCaptivePortal", wifiAfterCommand, },
-    { 0, 1, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _uint8_t,  0, & settings.wifiChannel, "wifiChannel", wifiAfterCommand, },
-    { 1, 0, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _bool,     0, & settings.wifiConfigOverAP, "wifiConfigOverAP", wifiAfterCommand, },
-    { 1, 1, 1, 1, 1, 1, 1, 1, 1, ALL, 1, tWiFiNet,  MAX_WIFI_NETWORKS, & settings.wifiNetworks, "wifiNetwork_", wifiAfterCommand, },
+    { 0, 0, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _bool,     0, & settings.enableCaptivePortal, "enableCaptivePortal", nullptr, },
+    { 0, 1, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _uint8_t,  0, & settings.wifiChannel, "wifiChannel", nullptr, },
+    { 1, 0, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _bool,     0, & settings.wifiConfigOverAP, "wifiConfigOverAP", nullptr, },
+    { 1, 1, 1, 1, 1, 1, 1, 1, 1, ALL, 1, tWiFiNet,  MAX_WIFI_NETWORKS, & settings.wifiNetworks, "wifiNetwork_", nullptr, },
     { 0, 0, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _uint32_t, 0, & settings.wifiConnectTimeoutMs, "wifiConnectTimeoutMs", nullptr, },
 
     { 0, 1, 0, 1, 1, 1, 1, 1, 1, ALL, 1, _bool,     0, & settings.outputTipAltitude, "outputTipAltitude", nullptr, },