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

minor update on our notifications - Need to check what is updated and currate this list

Browse source
This commit is contained in:
Justin Hammond 2019-05-22 18:06:27 +08:00
parent debb7ae21b
commit f479abe2e2
4 changed files with 111 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qt-openzwave.pri
View file

@ -1,6 +1,10 @@
top_srcdir=$$PWD
top_builddir=$$shadowed($$PWD)
mac {
PKG_CONFIG = /usr/local/bin/pkg-config
}
unix {
isEmpty(OZW_LIB_PATH) {
QT_CONFIG -= no-pkg-config

31
qt-openzwave/qt-openzwave.pro
View file

@ -22,38 +22,7 @@ qtConfig(static) {
# this is a static build
}
mac {
PKG_CONFIG = /usr/local/bin/pkg-config
}
unix {
isEmpty(OZW_LIB_PATH) {
QT_CONFIG -= no-pkg-config
CONFIG += link_pkgconfig
packagesExist(libopenzwave) {
message("Using Distribution copy of OpenZWave")
PKGCONFIG += openzwave
} else {
exists( $$top_srcdir/../open-zwave/cpp/src/) {
message("Found Openzwave in $$absolute_path($$top_srcdir/../open-zwave/cpp/src)")
OZW_LIB_PATH = $$absolute_path($$top_srcdir/../open-zwave/)
INCLUDEPATH += $$absolute_path($$top_srcdir/../open-zwave/cpp/src/)
LIBS += -L$$absolute_path($$top_srcdir/../open-zwave/) -lopenzwave
} else {
message("Can't Find a copy of OpenZwave")
}
}
} else {
exists($$OZW_LIB_PATH/cpp/src/) {
INCLUDEPATH += $$absolute_path($$OZW_LIB_PATH/cpp/src/)
LIBS += -L$$absolute_path($$OZW_LIB_PATH) -lopenzwave
message("Using OZW from Path Supplied in OZW_LIB_PATH varible: $$OZW_LIB_PATH" )
} else {
error("Unable to find a copy of OZW in $$OZW_LIB_PATH")
}
}
}
DEFINES += QTOPENZWAVE_LIBRARY

103
qt-openzwave/qtozwmanager.cpp
View file

@ -922,6 +922,61 @@ void QTOZWManager_Internal::pvt_nodeEssentialNodeQueriesComplete(uint8_t node)
QVariant data = this->m_manager->GetNodeQueryStage(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeQueryStage, data);
data = this->m_manager->GetNodeProductName(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductName, data);
data = this->m_manager->GetNodeManufacturerName(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeManufacturerName, data);
data = this->m_manager->GetNodeManufacturerId(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeManufacturerID, data);
data = this->m_manager->GetNodeProductId(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductID, data);
data = this->m_manager->GetNodeProductType(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductType, data);
data = this->m_manager->GetNodeProductId(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductID, data);
data = this->m_manager->GetNodeProductType(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductType, data);
data = nodeBasicStr(this->m_manager->GetNodeBasic(this->homeId(), node));
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasicString, data);
data = this->m_manager->GetNodeBasic(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasic, data);
data = this->m_manager->GetNodeDeviceTypeString(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeGenericString, data);
data = this->m_manager->GetNodeGeneric(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeGeneric, data);
data = this->m_manager->GetNodeSpecific(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecific, data);
/* XXX TODO: Need a OZW SpecificString function */
data = this->m_manager->GetNodeSpecific(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecificString, data);
data = this->m_manager->GetNodeMaxBaudRate(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBaudRate, data);
data = this->m_manager->GetNodeVersion(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeVersion, data);
/* set our Flags */
this->m_nodeModel->setNodeFlags(node, QTOZW_Nodes::isListening, this->m_manager->IsNodeListeningDevice(this->homeId(), node));
this->m_nodeModel->setNodeFlags(node, QTOZW_Nodes::isFlirs, this->m_manager->IsNodeFrequentListeningDevice(this->homeId(), node));
this->m_nodeModel->setNodeFlags(node, QTOZW_Nodes::isBeaming, this->m_manager->IsNodeBeamingDevice(this->homeId(), node));
this->m_nodeModel->setNodeFlags(node, QTOZW_Nodes::isRouting, this->m_manager->IsNodeRoutingDevice(this->homeId(), node));
this->m_nodeModel->setNodeFlags(node, QTOZW_Nodes::isNIFRecieved, this->m_manager->IsNodeInfoReceived(this->homeId(), node));
this->m_nodeModel->setNodeFlags(node, QTOZW_Nodes::isAwake, this->m_manager->IsNodeAwake(this->homeId(), node));
@ -929,6 +984,7 @@ void QTOZWManager_Internal::pvt_nodeEssentialNodeQueriesComplete(uint8_t node)
this->m_nodeModel->setNodeFlags(node, QTOZW_Nodes::isFailed, this->m_manager->IsNodeFailed(this->homeId(), node));
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeGroups, this->m_manager->GetNumGroups(this->homeId(), node));
} catch (OpenZWave::OZWException &e) {
qWarning() << "OZW Exception: " << e.GetMsg().c_str() << " at " << e.GetFile().c_str() <<":" << e.GetLine();
emit this->error(QTOZWErrorCodes::OZWException);
@ -962,6 +1018,53 @@ void QTOZWManager_Internal::pvt_nodeQueriesComplete(uint8_t node)
data = this->m_manager->GetNodeQueryStage(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeQueryStage, data);
data = this->m_manager->GetNodeProductName(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductName, data);
data = this->m_manager->GetNodeManufacturerName(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeManufacturerName, data);
data = this->m_manager->GetNodeManufacturerId(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeManufacturerID, data);
data = this->m_manager->GetNodeProductId(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductID, data);
data = this->m_manager->GetNodeProductType(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductType, data);
data = this->m_manager->GetNodeProductId(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductID, data);
data = this->m_manager->GetNodeProductType(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeProductType, data);
data = nodeBasicStr(this->m_manager->GetNodeBasic(this->homeId(), node));
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasicString, data);
data = this->m_manager->GetNodeBasic(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBasic, data);
data = this->m_manager->GetNodeDeviceTypeString(this->homeId(), node).c_str();
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeGenericString, data);
data = this->m_manager->GetNodeGeneric(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeGeneric, data);
data = this->m_manager->GetNodeSpecific(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecific, data);
/* XXX TODO: Need a OZW SpecificString function */
data = this->m_manager->GetNodeSpecific(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeSpecificString, data);
data = this->m_manager->GetNodeMaxBaudRate(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeBaudRate, data);
data = this->m_manager->GetNodeVersion(this->homeId(), node);
this->m_nodeModel->setNodeData(node, QTOZW_Nodes::NodeVersion, data);
/* set our Flags */
this->m_nodeModel->setNodeFlags(node, QTOZW_Nodes::isZWavePlus, this->m_manager->IsNodeZWavePlus(this->homeId(), node));

4
simpleclient/simpleclient.pro
View file

@ -13,6 +13,10 @@ macx {
ICON = res/ozw_logo.icns
}
unix {
QMAKE_POST_LINK += ln -s $$OZW_LIB_PATH/config config
}
win32 {
RC_ICONS += res/ozw_logo.ico
}