Merge branch 'release_candidate' into Add_AP+STN_for_firmwware_update_on_AP

Author: PaulZC

Firmware/RTK_Everywhere/MQTT_Client.ino

@@ -347,7 +347,7 @@ void mqttClientReceiveMessage(int messageSize)
                 if (((settings.debugMqttClientData == true) || (settings.debugCorrections == true)) && !inMainMenu)
                     systemPrintf("Pushing %d bytes from %s topic to PPL for UM980\r\n", mqttCount, topic);
 
-                if (online.ppl == false)
+                if (online.ppl == false && settings.debugMqttClientData == true)
                     systemPrintln("Warning: PPL is offline");
 
                 sendSpartnToPpl(mqttData, mqttCount);

Firmware/RTK_Everywhere/menuCommands.ino

@@ -1933,9 +1933,21 @@ bool getSettingValue(const char *settingName, char *settingValueStr)
 
     if (knownSetting == false)
     {
+        //Report deviceID over CLI - Useful for label generation
+        if (strcmp(settingName, "deviceId") == 0)
+        {
+            char hardwareID[15];
+            snprintf(hardwareID, sizeof(hardwareID), "%02X%02X%02X%02X%02X%02X%02X", btMACAddress[0], btMACAddress[1],
+                    btMACAddress[2], btMACAddress[3], btMACAddress[4], btMACAddress[5],
+                    productVariant);
+
+            writeToString(settingValueStr, hardwareID);
+            knownSetting = true;
+        }
+
         // Unused variables - read to avoid errors
         // TODO: check this! Is this really what we want?
-        if (strcmp(settingName, "fixedLatText") == 0)
+        else if (strcmp(settingName, "fixedLatText") == 0)
         {
             knownSetting = true;
         }
@@ -2321,6 +2333,8 @@ void printAvailableSettings()
         }
     }
 
+    systemPrint("deviceId,char[18],");
+
     // TODO: check this! Is this really what we want?
     systemPrint("fixedLatText,char[],");
     systemPrint("fixedLongText,char[],");