Merge branch 'release_candidate' into more_web_config_tweaks

Author: PaulZC

Firmware/RTK_Everywhere/Begin.ino

@@ -901,8 +901,7 @@ void tickerBegin()
         ledcSetup(ledBtChannel, pwmFreq, pwmResolution);
         ledcAttachPin(pin_bluetoothStatusLED, ledBtChannel);
         ledcWrite(ledBtChannel, 255);                                               // Turn on BT LED at startup
-        bluetoothLedTask.detach();                                                  // Turn off any previous task
-        bluetoothLedTask.attach(bluetoothLedTaskPace2Hz, tickerBluetoothLedUpdate); // Rate in seconds, callback
+        //Attach happens in bluetoothStart()
     }
 
     if (pin_gnssStatusLED != PIN_UNDEFINED)

Firmware/RTK_Everywhere/Bluetooth.ino

@@ -355,6 +355,9 @@ void bluetoothStart()
 
         systemPrintln(deviceName);
 
+        bluetoothLedTask.detach(); // Reset BT LED blinker task rate to 2Hz
+        bluetoothLedTask.attach(bluetoothLedTaskPace2Hz, tickerBluetoothLedUpdate); // Rate in seconds, callback
+
         bluetoothState = BT_NOTCONNECTED;
         reportHeapNow(false);
         online.bluetooth = true;

Firmware/RTK_Everywhere/Network.ino

@@ -389,7 +389,7 @@ void networkDisplayIpAddress(uint8_t networkType)
         {
             strcpy(ipAddress, networkGetIpAddress(networkType).toString().c_str());
             if (network->type == NETWORK_TYPE_WIFI)
-                systemPrintf("%s '%s' IP address: %s, RSSI: %d\r\n", networkName[network->type], ipAddress, wifiGetSsid(), wifiGetRssi());
+                systemPrintf("%s '%s' IP address: %s, RSSI: %d\r\n", networkName[network->type], wifiGetSsid(), ipAddress, wifiGetRssi());
             else
                 systemPrintf("%s IP address: %s\r\n", networkName[network->type], ipAddress);
 

Firmware/RTK_Everywhere/Tasks.ino

@@ -1115,22 +1115,8 @@ void handleGnssDataTask(void *e)
 // This is only called if ticker task is started so no pin tests are done
 void tickerBluetoothLedUpdate()
 {
-    // Blink on/off while we wait for BT connection
-    if (bluetoothGetState() == BT_NOTCONNECTED)
-    {
-        if (btFadeLevel == 0)
-            btFadeLevel = 255;
-        else
-            btFadeLevel = 0;
-        ledcWrite(ledBtChannel, btFadeLevel);
-    }
-
-    // Solid LED if BT Connected
-    else if (bluetoothGetState() == BT_CONNECTED)
-        ledcWrite(ledBtChannel, 255);
-
-    // Pulse LED while no BT and we wait for WiFi connection
-    else if (wifiState == WIFI_STATE_CONNECTING || wifiState == WIFI_STATE_CONNECTED)
+    // If we are in WiFi config mode, fade LED
+    if (inWiFiConfigMode() == true)
     {
         // Fade in/out the BT LED during WiFi AP mode
         btFadeLevel += pwmFadeAmount;
@@ -1144,6 +1130,18 @@ void tickerBluetoothLedUpdate()
 
         ledcWrite(ledBtChannel, btFadeLevel);
     }
+    // Blink on/off while we wait for BT connection
+    else if (bluetoothGetState() == BT_NOTCONNECTED)
+    {
+        if (btFadeLevel == 0)
+            btFadeLevel = 255;
+        else
+            btFadeLevel = 0;
+        ledcWrite(ledBtChannel, btFadeLevel);
+    }
+    // Solid LED if BT Connected
+    else if (bluetoothGetState() == BT_CONNECTED)
+        ledcWrite(ledBtChannel, 255);
     else
         ledcWrite(ledBtChannel, 0);
 }