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

Add some info about the Network/Controller

Browse source
This commit is contained in:
Justin Hammond 2019-12-03 14:07:17 +08:00
parent dbe644e29a
commit 04440c3929
5 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
qt-ozwdaemon/mqttpublisher.cpp
View file

@ -286,6 +286,18 @@ bool mqttpublisher::sendStatusUpdate() {
return true;
}
bool mqttpublisher::clearStatusUpdate() {
QT2JS::removeField(this->m_ozwstatus, "getControllerNodeId");
QT2JS::removeField(this->m_ozwstatus, "getSUCNodeId");
QT2JS::removeField(this->m_ozwstatus, "isPrimaryController");
QT2JS::removeField(this->m_ozwstatus, "isBridgeController");
QT2JS::removeField(this->m_ozwstatus, "hasExtendedTXStatistics");
QT2JS::removeField(this->m_ozwstatus, "getControllerLibraryVersion");
QT2JS::removeField(this->m_ozwstatus, "getControllerLibraryType");
QT2JS::removeField(this->m_ozwstatus, "getControllerPath");
return true;
}
bool mqttpublisher::sendNodeUpdate(quint8 node) {
QT2JS::SetUInt64(*this->m_nodes[node], "TimeStamp", QDateTime::currentSecsSinceEpoch());
this->m_client->publish(QMqttTopicName(getNodeTopic(MQTT_OZW_NODE_TOPIC, node)), QT2JS::getJSON(*this->m_nodes[node]), 0, true);
@ -376,6 +388,7 @@ bool mqttpublisher::delCommandClassTopic(quint8 node, quint8 instance, quint8 cc
void mqttpublisher::ready() {
qCDebug(ozwmp) << "Publishing Event ready:";
this->clearStatusUpdate();
QT2JS::SetString(this->m_ozwstatus, "Status", "Ready");
this->sendStatusUpdate();
}
@ -547,11 +560,20 @@ void mqttpublisher::nodeQueriesComplete(quint8 node) {
void mqttpublisher::driverReady(quint32 homeID) {
qCDebug(ozwmp) << "Publishing Event driverReady:" << homeID;
QT2JS::SetString(this->m_ozwstatus, "Status", "driverReady");
QT2JS::SetUint(this->m_ozwstatus, "getControllerNodeId", this->getQTOZWManager()->getControllerNodeId());
QT2JS::SetUint(this->m_ozwstatus, "getSUCNodeId", this->getQTOZWManager()->getSucNodeId());
QT2JS::SetBool(this->m_ozwstatus, "isPrimaryController", this->getQTOZWManager()->isStaticUpdateController());
QT2JS::SetBool(this->m_ozwstatus, "isBridgeController", this->getQTOZWManager()->isBridgeController());
QT2JS::SetBool(this->m_ozwstatus, "hasExtendedTXStatistics", this->getQTOZWManager()->hasExtendedTXStatus());
QT2JS::SetString(this->m_ozwstatus, "getControllerLibraryVersion", this->getQTOZWManager()->getLibraryVersion());
QT2JS::SetString(this->m_ozwstatus, "getControllerLibraryType", this->getQTOZWManager()->getLibraryTypeName());
QT2JS::SetString(this->m_ozwstatus, "getControllerPath", this->getQTOZWManager()->getControllerPath());
QT2JS::SetUint(this->m_ozwstatus, "homeID", homeID);
this->sendStatusUpdate();
}
void mqttpublisher::driverFailed(quint32 homeID) {
qCDebug(ozwmp) << "Publishing Event driverFailed:" << homeID;
this->clearStatusUpdate();
QT2JS::SetString(this->m_ozwstatus, "Status", "driverFailed");
QT2JS::SetUint(this->m_ozwstatus, "homeID", homeID);
this->sendStatusUpdate();
@ -559,6 +581,7 @@ void mqttpublisher::driverFailed(quint32 homeID) {
}
void mqttpublisher::driverReset(quint32 homeID) {
qCDebug(ozwmp) << "Publishing Event driverReset:" << homeID;
this->clearStatusUpdate();
QT2JS::SetString(this->m_ozwstatus, "Status", "driverReset");
QT2JS::SetUint(this->m_ozwstatus, "homeID", homeID);
this->sendStatusUpdate();
@ -566,6 +589,7 @@ void mqttpublisher::driverReset(quint32 homeID) {
}
void mqttpublisher::driverRemoved(quint32 homeID) {
qCDebug(ozwmp) << "Publishing Event driverRemoved:" << homeID;
this->clearStatusUpdate();
QT2JS::SetString(this->m_ozwstatus, "Status", "driverRemoved");
QT2JS::SetUint(this->m_ozwstatus, "homeID", homeID);
this->sendStatusUpdate();
@ -706,11 +730,13 @@ void mqttpublisher::manufacturerSpecificDBReady() {
void mqttpublisher::starting() {
qCDebug(ozwmp) << "Publishing Event starting";
this->clearStatusUpdate();
QT2JS::SetString(this->m_ozwstatus, "Status", "starting");
this->sendStatusUpdate();
}
void mqttpublisher::started(quint32 homeID) {
qCDebug(ozwmp) << "Publishing Event started";
this->clearStatusUpdate();
QT2JS::SetString(this->m_ozwstatus, "Status", "started");
QT2JS::SetUint(this->m_ozwstatus, "homeID", homeID);
this->sendStatusUpdate();
@ -718,6 +744,7 @@ void mqttpublisher::started(quint32 homeID) {
}
void mqttpublisher::stopped(quint32 homeID) {
qCDebug(ozwmp) << "Publishing Event stopped";
this->clearStatusUpdate();
QT2JS::SetString(this->m_ozwstatus, "Status", "stopped");
QT2JS::SetUint(this->m_ozwstatus, "homeID", homeID);
this->sendStatusUpdate();

1
qt-ozwdaemon/mqttpublisher.h
View file

@ -89,6 +89,7 @@ private:
QString getCommandTopic();
QString getCommandResponseTopic(QString);
bool sendStatusUpdate();
bool clearStatusUpdate();
bool sendNodeUpdate(quint8);
bool sendValueUpdate(quint64);
bool sendInstanceUpdate(quint8, quint8);

10
qt-ozwdaemon/qtrj.cpp
View file

@ -162,3 +162,13 @@ QByteArray QT2JS::getJSON(rapidjson::Document &doc) {
doc.Accept(writer); // Accept() traverses the DOM and generates Handler events.
return sb.GetString();
}
bool QT2JS::removeField(rapidjson::Document &doc, QString field) {
if (!doc.IsObject())
doc.SetObject();
if (doc.HasMember(field.toStdString().c_str())) {
return doc.RemoveMember(field.toStdString().c_str());
} else {
return false;
}
}

1
qt-ozwdaemon/qtrj.h
View file

@ -15,6 +15,7 @@ class QT2JS {
static bool SetBool(rapidjson::Document &, QString, bool);
static bool SetDouble(rapidjson::Document &, QString, double);
static QByteArray getJSON(rapidjson::Document &);
static bool removeField(rapidjson::Document &, QString);
};

2
setenv.sh
View file

@ -1,2 +1,2 @@
export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:`pwd`/qt-openzwave"
export LD_LIBRARY_PATH="/home/fish/workspace/open-zwave/:/home/fish/workspace/qt-openzwave/qt-openzwave/:/home/fish/workspace/qt-openzwave/qt-openzwavedatabase/"
export LD_LIBRARY_PATH="../open-zwave/:./qt-openzwave/:./qt-openzwavedatabase/"