GitHub-Mirror/qt-openzwave
2
0
Fork 0
mirror of https://github.com/Fishwaldo/qt-openzwave.git synced 2025-07-08 06:08:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert Values based on the OZW type rather than the qvariant type. Send ControllerCommand Notifications to the right topics

Browse source
This commit is contained in:
Justin Hammond 2019-11-06 13:03:01 +08:00
parent 6389e1a0e6
commit 3d7c8db9e4
3 changed files with 169 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
qt-ozwdaemon/mqttcommands/hasNodeFailed.h
View file

@ -7,7 +7,7 @@ class MqttCommand_HasNodeFailed : public MqttCommand {
Q_OBJECT Q_OBJECT
public: public:
static MqttCommand *Create(QObject *parent = nullptr); static MqttCommand *Create(QObject *parent = nullptr);
static QString StaticGetCommand() { return "HadNodeFailed";}; static QString StaticGetCommand() { return "HasNodeFailed";};
QString GetCommand() override { return StaticGetCommand(); }; QString GetCommand() override { return StaticGetCommand(); };
bool processMessage(QJsonDocument) override; bool processMessage(QJsonDocument) override;
private: private:

1
qt-ozwdaemon/mqttcommands/mqttcommands.h
View file

@ -12,6 +12,7 @@
#include "mqttpublisher.h" #include "mqttpublisher.h"
class mqttpublisher; class mqttpublisher;
class MqttCommand : public QObject { class MqttCommand : public QObject {

183
qt-ozwdaemon/mqttpublisher.cpp
View file

@ -1,6 +1,7 @@
#include <QDateTime> #include <QDateTime>
#include "mqttpublisher.h" #include "mqttpublisher.h"
#include "mqttcommands/mqttcommands.h"
mqttNodeModel::mqttNodeModel(QObject *parent) mqttNodeModel::mqttNodeModel(QObject *parent)
{ {
@ -122,7 +123,7 @@ bool mqttValueIDModel::populateJsonObject(QJsonObject *jsonobject, quint64 vidKe
} else if (static_cast<QMetaType::Type>(data.type()) == QMetaType::ULongLong) { } else if (static_cast<QMetaType::Type>(data.type()) == QMetaType::ULongLong) {
jsonobject->insert(metaEnum.valueToKey(i), static_cast<qint64>(data.toULongLong())); jsonobject->insert(metaEnum.valueToKey(i), static_cast<qint64>(data.toULongLong()));
} else { } else {
qWarning() << "Can't Convert " << data.type() << "(" << metaEnum.valueToKey(i) << ") to store in JsonObject: " << vidKey; qWarning() << "mqttValueIDModel::populateJsonObject: Can't Convert " << data.type() << "(" << metaEnum.valueToKey(i) << ") to store in JsonObject: " << vidKey;
} }
break; break;
} }
@ -137,22 +138,81 @@ bool mqttValueIDModel::populateJsonObject(QJsonObject *jsonobject, quint64 vidKe
QJsonValue mqttValueIDModel::encodeValue(quint64 vidKey) { QJsonValue mqttValueIDModel::encodeValue(quint64 vidKey) {
QJsonValue value; QJsonValue value;
QVariant data = this->getValueData(vidKey, mqttValueIDModel::ValueIdColumns::Value); QVariant data = this->getValueData(vidKey, mqttValueIDModel::ValueIdColumns::Value);
if (static_cast<QMetaType::Type>(data.type()) == QMetaType::QString) { QTOZW_ValueIds::ValueIdTypes type = this->getValueData(vidKey, mqttValueIDModel::ValueIdColumns::Type).value<QTOZW_ValueIds::ValueIdTypes>();
value = data.toString(); switch (type) {
} else if (static_cast<QMetaType::Type>(data.type()) == QMetaType::Bool) { case QTOZW_ValueIds::ValueIdTypes::BitSet: {
value = data.toBool(); QJsonArray bitsets;
} else if (static_cast<QMetaType::Type>(data.type()) == QMetaType::Int) { QTOZW_ValueIDBitSet vidbs = data.value<QTOZW_ValueIDBitSet>();
value = data.toInt(); int size = vidbs.mask.size();
} else if (static_cast<QMetaType::Type>(data.type()) == QMetaType::UInt) { for (int i = 0; i < size; i++) {
value = data.toInt(); if (vidbs.mask[i] == 1) {
} else if (static_cast<QMetaType::Type>(data.type()) == QMetaType::Float) { QJsonObject bitset;
value = data.toDouble(); bitset["Label"] = vidbs.label[i];
} else if (static_cast<QMetaType::Type>(data.type()) == QMetaType::ULongLong) { bitset["Help"] = vidbs.help[i];
value = static_cast<qint64>(data.toULongLong()); bitset["Value"] = static_cast<bool>(vidbs.values[i]);
} else if (static_cast<QMetaType::Type>(data.type()) == QMetaType::Short) { bitset["Position"] = i;
value = static_cast<qint16>(data.toInt()); bitsets.push_back(bitset);
} else { }
qWarning() << "Can't Convert " << data.type() << " to store in JsonObject: " << vidKey << this->getValueData(vidKey, mqttValueIDModel::ValueIdColumns::Label).toString() << this->getValueData(vidKey, mqttValueIDModel::ValueIdColumns::Type); }
value = bitsets;
break;
}
case QTOZW_ValueIds::ValueIdTypes::Bool: {
value = data.toBool();
break;
}
case QTOZW_ValueIds::ValueIdTypes::Button: {
value = data.toBool();
break;
}
case QTOZW_ValueIds::ValueIdTypes::Byte: {
value = data.toInt();
break;
}
case QTOZW_ValueIds::ValueIdTypes::Decimal: {
value = data.toFloat();
break;
}
case QTOZW_ValueIds::ValueIdTypes::Int:{
value = data.toInt();
break;
}
case QTOZW_ValueIds::ValueIdTypes::List: {
QTOZW_ValueIDList vidlist = data.value<QTOZW_ValueIDList>();
int size = vidlist.values.count();
QJsonArray list;
for (int i = 0; i < size; i++) {
QJsonObject entry;
entry["Value"] = static_cast<int>(vidlist.values[i]);
entry["Label"] = vidlist.labels[i];
list.push_back(entry);
}
QJsonObject var;
var["List"] = list;
var["Selected"] = vidlist.selectedItem;
value = var;
break;
}
case QTOZW_ValueIds::ValueIdTypes::Raw: {
qWarning() << "Raw ValueType not handled in mqttValueIdModel::encodeValue yet";
break;
}
case QTOZW_ValueIds::ValueIdTypes::Schedule: {
qWarning() << "Raw ValueType not handled in mqttValueIdModel::encodeValue yet";
break;
}
case QTOZW_ValueIds::ValueIdTypes::Short: {
value = data.toInt();
break;
}
case QTOZW_ValueIds::ValueIdTypes::String: {
value = data.toString();
break;
}
case QTOZW_ValueIds::ValueIdTypes::TypeCount: {
qWarning() << "Unhandled ValueID Type" << type << "in mqttValueIdModel::encodeValue" << vidKey << this->getValueData(vidKey, mqttValueIDModel::ValueIdColumns::Label).toString();
break;
}
} }
return value; return value;
} }
@ -521,7 +581,96 @@ void mqttpublisher::driverAwakeNodesQueried() {
} }
void mqttpublisher::controllerCommand(quint8 node, NotificationTypes::QTOZW_Notification_Controller_Cmd command, NotificationTypes::QTOZW_Notification_Controller_State state, NotificationTypes::QTOZW_Notification_Controller_Error error) { void mqttpublisher::controllerCommand(quint8 node, NotificationTypes::QTOZW_Notification_Controller_Cmd command, NotificationTypes::QTOZW_Notification_Controller_State state, NotificationTypes::QTOZW_Notification_Controller_Error error) {
qDebug() << "Publishing Event controllerCommand" << node << command << state << error; qDebug() << "Publishing Event controllerCommand" << node << command << state << error;
QJsonObject js;
if (node > 0)
js["Node"] = node;
QMetaEnum metaEnum = QMetaEnum::fromType<NotificationTypes::QTOZW_Notification_Controller_State>();
js["State"] = metaEnum.valueToKey(state);
if (error != NotificationTypes::QTOZW_Notification_Controller_Error::Ctrl_Error_None) {
metaEnum = QMetaEnum::fromType<NotificationTypes::QTOZW_Notification_Controller_Error>();
js["Error"] = metaEnum.valueToKey(error);
}
switch(command) {
case NotificationTypes::Ctrl_Cmd_None: {
qWarning() << "Got a controllerCommand Event with no Controller Command" << command << state << error;
break;
}
case NotificationTypes::Ctrl_Cmd_AddNode: {
this->sendCommandUpdate("AddNode", js);
break;
}
case NotificationTypes::Ctrl_Cmd_AssignReturnRoute: {
this->sendCommandUpdate("AssignReturnRoute", js);
break;
}
case NotificationTypes::Ctrl_Cmd_CreateButton: {
js["Command"] = QMetaEnum::fromType<NotificationTypes::QTOZW_Notification_Controller_Cmd>().valueToKey(command);
this->sendCommandUpdate("ControllerCommand", js);
break;
}
case NotificationTypes::Ctrl_Cmd_CreateNewPrimary: {
js["Command"] = QMetaEnum::fromType<NotificationTypes::QTOZW_Notification_Controller_Cmd>().valueToKey(command);
this->sendCommandUpdate("ControllerCommand", js);
break;
}
case NotificationTypes::Ctrl_Cmd_DeleteAllReturnRoute: {
this->sendCommandUpdate("DeleteAllReturnRoute", js);
break;
}
case NotificationTypes::Ctrl_Cmd_DeleteButton: {
js["Command"] = QMetaEnum::fromType<NotificationTypes::QTOZW_Notification_Controller_Cmd>().valueToKey(command);
this->sendCommandUpdate("ControllerCommand", js);
break;
}
case NotificationTypes::Ctrl_Cmd_HasNodeFailed: {
this->sendCommandUpdate("HasNodeFailed", js);
break;
}
case NotificationTypes::Ctrl_Cmd_ReceiveConfiguration: {
js["Command"] = QMetaEnum::fromType<NotificationTypes::QTOZW_Notification_Controller_Cmd>().valueToKey(command);
this->sendCommandUpdate("ControllerCommand", js);
break;
}
case NotificationTypes::Ctrl_Cmd_RemoveFailedNode: {
this->sendCommandUpdate("RemoveFailedNode", js);
break;
}
case NotificationTypes::Ctrl_Cmd_RemoveNode: {
this->sendCommandUpdate("RemoveNode", js);
break;
}
case NotificationTypes::Ctrl_Cmd_ReplaceFailedNode: {
this->sendCommandUpdate("ReplaceFailedNode", js);
break;
}
case NotificationTypes::Ctrl_Cmd_ReplicationSend: {
js["Command"] = QMetaEnum::fromType<NotificationTypes::QTOZW_Notification_Controller_Cmd>().valueToKey(command);
this->sendCommandUpdate("ControllerCommand", js);
break;
}
case NotificationTypes::Ctrl_Cmd_RequestNetworkUpdate: {
this->sendCommandUpdate("RequestNetworkUpdate", js);
break;
}
case NotificationTypes::Ctrl_Cmd_RequestNodeNeighborUpdate: {
this->sendCommandUpdate("RequestNodeNeighborUpdate", js);
break;
}
case NotificationTypes::Ctrl_Cmd_SendNodeInformation: {
this->sendCommandUpdate("SendNodeInformation", js);
break;
}
case NotificationTypes::Ctrl_Cmd_TransferPrimaryRole: {
js["Command"] = QMetaEnum::fromType<NotificationTypes::QTOZW_Notification_Controller_Cmd>().valueToKey(command);
this->sendCommandUpdate("ControllerCommand", js);
break;
}
case NotificationTypes::Ctrl_Cmd_count: {
qWarning() << "Recieved controllerCommand for a unknown Command:" << command;
return;
}
};
} }
void mqttpublisher::ozwNotification(quint8 node, NotificationTypes::QTOZW_Notification_Code event) { void mqttpublisher::ozwNotification(quint8 node, NotificationTypes::QTOZW_Notification_Code event) {
qDebug() << "Publishing Event ozwNotification"; qDebug() << "Publishing Event ozwNotification";