Merge pull request #744 from sparkfun/release_candidate

Merge v4.0 changes

Author: nseidle

Firmware/RTK_Surveyor/Bluetooth.ino

@@ -156,7 +156,10 @@ void bluetoothStart()
         else if (systemState >= STATE_BASE_NOT_STARTED && systemState <= STATE_BASE_FIXED_TRANSMITTING)
             strncpy(stateName, "Base-", sizeof(stateName) - 1);
         else
+        {
+            strncpy(stateName, "Rover-", sizeof(stateName) - 1);
             log_d("State out of range for Bluetooth Broadcast: %d", systemState);
+        }
 
         char productName[50] = {0};
         strncpy(productName, platformPrefix, sizeof(productName));

Firmware/RTK_Surveyor/menuPP.ino

@@ -613,26 +613,23 @@ bool pointperfectUpdateKeys()
 
         systemPrintf("Attempting to connect to MQTT broker: %s\r\n", settings.pointPerfectBrokerHost);
 
-        if (mqttClient.connect(settings.pointPerfectClientID))
+        if (mqttClient.connect(settings.pointPerfectClientID) == true)
         {
             // Successful connection
             systemPrintln("MQTT connected");
 
             // Originally the provisioning process reported the '/pp/key/Lb' channel which fails to respond with
             // keys. Looks like they fixed it to /pp/ubx/0236/Lb.
             mqttClient.subscribe(settings.pointPerfectLBandTopic);
-            break;
         }
-
-        // Check for connection failure
-        if (mqttClient.connected() == false)
+        else
         {
             systemPrintln("Failed to connect to MQTT Broker");
 
             // MQTT does not provide good error reporting.
             // Throw out everything and attempt to provision the device to get better error checking.
             pointperfectProvisionDevice();
-            break;
+            break; //Skip the remaining MQTT checking, release resources
         }
 
         systemPrint("Waiting for keys");