GitHub-Mirror/qt-openzwave
2
0
Fork 0
mirror of https://github.com/Fishwaldo/qt-openzwave.git synced 2025-03-15 19:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Shift Node Stats under node topic

Browse source
This commit is contained in:
Justin Hammond 2019-11-07 15:41:22 +08:00
parent 253f35cc0a
commit d79f4a7523
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
qt-ozwdaemon/mqttpublisher.cpp
View file

@ -340,7 +340,7 @@ void mqttpublisher::doStats() {
dsjson["broadcastWriteCnt"] = static_cast<qint64>(ds.m_broadcastWriteCnt);
stats["Network"] = dsjson;
QJsonObject nodes;
this->m_client->publish(QMqttTopicName(getTopic(MQTT_OZW_STATS_TOPIC)), QJsonDocument(stats).toJson(), 0, false);
for (int i = 0; i < this->m_nodeModel->rowCount(QModelIndex()); i++) {
QJsonObject nsjson;
@ -379,10 +379,8 @@ void mqttpublisher::doStats() {
nsjson["routeTries"] = ns.routeTries; /**< The Number of attempts the Controller made to route the packet to the Node */
nsjson["lastFailedLinkFrom"] = ns.lastFailedLinkFrom; /**< The Last Failed Link From */
nsjson["lastFailedLinkTo"] = ns.lastFailedLinkTo; /**< The Last Failed Link To */
nodes[QString::number(NodeID)] = nsjson;
this->m_client->publish(QMqttTopicName(getNodeTopic(MQTT_OZW_STATS_NODE_TOPIC, NodeID)), QJsonDocument(nsjson).toJson(), 0, false);
}
stats["Nodes"] = nodes;
this->m_client->publish(QMqttTopicName(getTopic(MQTT_OZW_STATS_TOPIC)), QJsonDocument(stats).toJson(), 0, false);
}
@ -479,8 +477,6 @@ void mqttpublisher::setOZWDaemon(qtozwdaemon *ozwdaemon) {
}
}
#include <QSslSocket>
void mqttpublisher::updateLogStateChange()
{
qCDebug(ozwmp) << "State Change" << m_client->state();

1
qt-ozwdaemon/mqttpublisher.h
View file

@ -15,6 +15,7 @@ class MqttCommands;
#define MQTT_OZW_TOP_TOPIC "/OpenZWave/%1/"
#define MQTT_OZW_STATS_TOPIC "statistics/"
#define MQTT_OZW_STATS_NODE_TOPIC "node/%1/statistics/"
#define MQTT_OZW_STATUS_TOPIC "status/"
#define MQTT_OZW_NODE_TOPIC "node/%1/"
#define MQTT_OZW_VID_TOPIC "node/%1/value/%2/"