Changed firmware, version and hardware names

Author: danimtb

MqttManager/MqttManager.cpp

@@ -1,5 +1,7 @@
 #include "MqttManager.h"
 
+#include "ArduinoJson.h"
+
 MqttManager::MqttManager()
 {
     m_connected = false;
@@ -30,32 +32,35 @@ void MqttManager::setup(std::string mqttServer, std::string mqttPort, std::strin
     m_checkConnectivityTimer.start();
 }
 
-void MqttManager::setDeviceData(std::string deviceName, std::string deviceType, std::string deviceIP, std::string fw, std::string fwVersion)
+void MqttManager::setDeviceData(std::string deviceName, std::string hardware, std::string deviceIP, std::string firmware, std::string firmwareVersion)
 {
     m_deviceName = deviceName;
-    m_deviceType = deviceType;
     m_deviceIP = deviceIP;
-    m_fw = fw;
-    m_fwVersion = fwVersion;
+    m_hardware = hardware;
+    m_firmware = firmware;
+    m_firmwareVersion = firmwareVersion;
 
     m_mqttClient.setClientId(m_deviceName.c_str());
 
-    m_deviceNameTopic = "/" + m_deviceName;
-    m_deviceMacTopic = m_deviceNameTopic + "/mac";
-    m_deviceIpTopic = m_deviceNameTopic + "/ip";
-    m_deviceTypeTopic = m_deviceNameTopic + "/type";
-    m_fwTopic = m_deviceNameTopic + "/fw";
-    m_fwVersionTopic = m_fwTopic + "/version";
+    m_deviceDataTopic = "/" + m_deviceName;
 }
 
 void MqttManager::publishDeviceStatusInfo()
 {
-    m_mqttClient.publish(m_deviceNameTopic.c_str(), 1, true, m_deviceName.c_str());
-    m_mqttClient.publish(m_deviceMacTopic.c_str(), 1, true, m_deviceMac.c_str());
-    m_mqttClient.publish(m_deviceIpTopic.c_str(), 1, true, m_deviceIP.c_str());
-    m_mqttClient.publish(m_deviceTypeTopic.c_str(), 1, true, m_deviceType.c_str());
-    m_mqttClient.publish(m_fwTopic.c_str(), 1, true, m_fw.c_str());
-    m_mqttClient.publish(m_fwVersionTopic.c_str(), 1, true, m_fwVersion.c_str());
+    StaticJsonBuffer<200> deviceDataBuffer;
+    JsonObject& deviceDataObject = deviceDataBuffer.createObject();
+    String deviceDataString;
+
+    deviceDataObject["name"] = m_deviceName.c_str();
+    deviceDataObject["mac"] = m_deviceMac.c_str();
+    deviceDataObject["ip"] = m_deviceIP.c_str();
+    deviceDataObject["hardware"] = m_hardware.c_str();
+    deviceDataObject["firmware"] = m_firmware.c_str();
+    deviceDataObject["firmware_version"] = m_firmwareVersion.c_str();
+
+    deviceDataObject.printTo(deviceDataString);
+
+    m_mqttClient.publish(m_deviceDataTopic.c_str(), 1, true, deviceDataString.c_str());
 
     this->refreshStatusTopics();
 }

MqttManager/MqttManager.h

@@ -24,18 +24,13 @@ class MqttManager
     std::string m_mqttPassword;
 
     std::string m_deviceName;
-    std::string m_deviceType;
     std::string m_deviceIP;
     std::string m_deviceMac;
-    std::string m_fw;
-    std::string m_fwVersion;
+    std::string m_hardware;
+    std::string m_firmware;
+    std::string m_firmwareVersion;
 
-    std::string m_deviceMacTopic;
-    std::string m_deviceIpTopic;
-    std::string m_deviceNameTopic;
-    std::string m_deviceTypeTopic;
-    std::string m_fwTopic;
-    std::string m_fwVersionTopic;
+    std::string m_deviceDataTopic;
 
     std::map<std::string, std::string> m_statusTopics;
     std::vector<std::string> m_subscribeTopics;
@@ -61,7 +56,7 @@ class MqttManager
 
     void setup(std::string mqttServer, std::string mqttPort, std::string mqttUsername, std::string mqttPassword);
 
-    void setDeviceData(std::string deviceName, std::string deviceType, std::string deviceIP, std::string fw, std::string fwVersion);
+    void setDeviceData(std::string deviceName, std::string hardware, std::string deviceIP, std::string firmware, std::string firmwareVersion);
     void setCallback(void (*callback)(char*, char*, AsyncMqttClientMessageProperties, size_t, size_t, size_t ));
     void setLastWillMQTT(std::string topic, const char* payload);
 

UpdateManager/UpdateManager.cpp

@@ -9,19 +9,19 @@ UpdateManager::UpdateManager()
     m_checkUpdateTimer.setup(RT_ON, 600000); // 10 minutes
 }
 
-void UpdateManager::setup(std::string host, std::string fw, std::string fwVersion, std::string device)
+void UpdateManager::setup(std::string host, std::string firmware, std::string firmwareVersion, std::string hardware)
 {
     m_host = host;
-    m_fw = fw;
-    m_fwVersion = fwVersion;
-    m_device = device;
+    m_firmware = firmware;
+    m_firmwareVersion = firmwareVersion;
+    m_hardware = hardware;
 
     m_checkUpdateTimer.start();
 }
 
 int16_t UpdateManager::getServerResponse(std::string &payload)
 {
-    std::string request = m_host + "/" + m_fw + "/" + m_fwVersion + "/" + m_device;
+    std::string request = m_host + "/" + m_firmware + "/" + m_firmwareVersion + "/" + m_hardware;
 
     HTTPClient http;
     http.begin((char *)request.c_str());
@@ -67,9 +67,9 @@ void UpdateManager::checkUpdate()
 
             if (response.containsKey("version"))
             {
-                if (response.containsKey("fw"))
+                if (response.containsKey("firmware"))
                 {
-                    firmwareDownload = response["fw"].as<char*>();
+                    firmwareDownload = response["firmware"].as<char*>();
                 }
                 else
                 {

UpdateManager/UpdateManager.h

@@ -16,9 +16,9 @@ class UpdateManager
     SimpleTimer m_checkUpdateTimer;
 
     std::string m_host;
-    std::string m_fw;
-    std::string m_fwVersion;
-    std::string m_device;
+    std::string m_firmware;
+    std::string m_firmwareVersion;
+    std::string m_hardware;
 
     int16_t getServerResponse(std::string &payload);
     bool updateSpiffs(std::string spiffsUrl);
@@ -28,7 +28,7 @@ class UpdateManager
 public:
     UpdateManager();
     void checkUpdate();
-    void setup(std::string host, std::string fw, std::string fwVersion, std::string device);
+    void setup(std::string host, std::string firmware, std::string firmwareVersion, std::string hardware);
     void loop();
 };