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

Use Basic/Generic/Specific Strings from OZW

Browse source
This commit is contained in:
Justin Hammond 2019-11-25 20:36:47 +08:00
parent c08ef47349
commit 5ed756376c
1 changed files with 10 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

37
qt-openzwave/source/qtozwmanager_p.cpp
View file

@ -29,22 +29,6 @@
#include "qtozwmanager_p.h" #include "qtozwmanager_p.h"
#include "qt-openzwave/qtozwmanager.h" #include "qt-openzwave/qtozwmanager.h"
/* XXX TODO: this needs to go into OZW */
QString nodeBasicStr (uint8 basic)
{
switch (basic) {
case 1:
return "Controller";
case 2:
return "Static Controller";
case 3:
return "Slave";
case 4:
return "Routing Slave";
}
return "unknown";
}
QTOZWManager_Internal::QTOZWManager_Internal(QObject *parent) QTOZWManager_Internal::QTOZWManager_Internal(QObject *parent)
: QTOZWManagerSimpleSource (parent) : QTOZWManagerSimpleSource (parent)
@ -1142,13 +1126,13 @@ void QTOZWManager_Internal::pvt_nodeProtocolInfo(quint8 node)
data = this->m_manager->GetNodeProductType(this->homeId(), node).c_str(); data = this->m_manager->GetNodeProductType(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductType, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductType, data, true);
data = nodeBasicStr(this->m_manager->GetNodeBasic(this->homeId(), node)); data = this->m_manager->GetNodeBasicString(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasicString, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasicString, data, true);
data = this->m_manager->GetNodeBasic(this->homeId(), node); data = this->m_manager->GetNodeBasic(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasic, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasic, data, true);
data = this->m_manager->GetNodeDeviceTypeString(this->homeId(), node).c_str(); data = this->m_manager->GetNodeGenericString(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeGenericString, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeGenericString, data, true);
data = this->m_manager->GetNodeGeneric(this->homeId(), node); data = this->m_manager->GetNodeGeneric(this->homeId(), node);
@ -1157,8 +1141,7 @@ void QTOZWManager_Internal::pvt_nodeProtocolInfo(quint8 node)
data = this->m_manager->GetNodeSpecific(this->homeId(), node); data = this->m_manager->GetNodeSpecific(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecific, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecific, data, true);
/* XXX TODO: Need a OZW SpecificString function */ data = this->m_manager->GetNodeSpecificString(this->homeId(), node).c_str();
data = this->m_manager->GetNodeSpecific(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecificString, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecificString, data, true);
data = this->m_manager->GetNodeMaxBaudRate(this->homeId(), node); data = this->m_manager->GetNodeMaxBaudRate(this->homeId(), node);
@ -1221,13 +1204,13 @@ void QTOZWManager_Internal::pvt_nodeEssentialNodeQueriesComplete(quint8 node)
data = this->m_manager->GetNodeProductType(this->homeId(), node).c_str(); data = this->m_manager->GetNodeProductType(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductType, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductType, data, true);
data = nodeBasicStr(this->m_manager->GetNodeBasic(this->homeId(), node)); data = this->m_manager->GetNodeBasicString(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasicString, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasicString, data, true);
data = this->m_manager->GetNodeBasic(this->homeId(), node); data = this->m_manager->GetNodeBasic(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasic, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasic, data, true);
data = this->m_manager->GetNodeDeviceTypeString(this->homeId(), node).c_str(); data = this->m_manager->GetNodeGenericString(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeGenericString, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeGenericString, data, true);
data = this->m_manager->GetNodeGeneric(this->homeId(), node); data = this->m_manager->GetNodeGeneric(this->homeId(), node);
@ -1236,8 +1219,7 @@ void QTOZWManager_Internal::pvt_nodeEssentialNodeQueriesComplete(quint8 node)
data = this->m_manager->GetNodeSpecific(this->homeId(), node); data = this->m_manager->GetNodeSpecific(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecific, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecific, data, true);
/* XXX TODO: Need a OZW SpecificString function */ data = this->m_manager->GetNodeSpecificString(this->homeId(), node).c_str();
data = this->m_manager->GetNodeSpecific(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecificString, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecificString, data, true);
data = this->m_manager->GetNodeMaxBaudRate(this->homeId(), node); data = this->m_manager->GetNodeMaxBaudRate(this->homeId(), node);
@ -1319,13 +1301,13 @@ void QTOZWManager_Internal::pvt_nodeQueriesComplete(quint8 node)
data = this->m_manager->GetNodeProductType(this->homeId(), node).c_str(); data = this->m_manager->GetNodeProductType(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductType, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductType, data, true);
data = nodeBasicStr(this->m_manager->GetNodeBasic(this->homeId(), node)); data = this->m_manager->GetNodeBasicString(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasicString, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasicString, data, true);
data = this->m_manager->GetNodeBasic(this->homeId(), node); data = this->m_manager->GetNodeBasic(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasic, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasic, data, true);
data = this->m_manager->GetNodeDeviceTypeString(this->homeId(), node).c_str(); data = this->m_manager->GetNodeGenericString(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeGenericString, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeGenericString, data, true);
data = this->m_manager->GetNodeGeneric(this->homeId(), node); data = this->m_manager->GetNodeGeneric(this->homeId(), node);
@ -1334,8 +1316,7 @@ void QTOZWManager_Internal::pvt_nodeQueriesComplete(quint8 node)
data = this->m_manager->GetNodeSpecific(this->homeId(), node); data = this->m_manager->GetNodeSpecific(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecific, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecific, data, true);
/* XXX TODO: Need a OZW SpecificString function */ data = this->m_manager->GetNodeSpecificString(this->homeId(), node).c_str();
data = this->m_manager->GetNodeSpecific(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecificString, data, true); this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecificString, data, true);
data = this->m_manager->GetNodeMaxBaudRate(this->homeId(), node); data = this->m_manager->GetNodeMaxBaudRate(this->homeId(), node);