ETM-Schurig/powersync-zigbee
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make TI optional based on package detection in qt5 depending

Browse Source
This commit is contained in:
Simon Stürz 2025-09-23 12:04:12 +02:00
parent 63e9e424d3
commit e9c26ee85a
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libnymea-zigbee/libnymea-zigbee.pro
View File

@ -17,7 +17,13 @@ greaterThan(QT_MAJOR_VERSION, 5) {
message(Building without TI support) message(Building without TI support)
DEFINES += DISABLE_TI DEFINES += DISABLE_TI
} else { } else {
PKGCONFIG += qca2-qt5 packagesExist(qca2-qt5) {
message(Build with libqca2 support)
PKGCONFIG += qca2-qt5
} else {
message(Build without libqca2 support)
DEFINES += DISABLE_TI
}
} }
SOURCES += \ SOURCES += \

2
libnymea-zigbee/zigbee.h
View File

@ -43,7 +43,7 @@ public:
enum ZigbeeBackendType { enum ZigbeeBackendType {
ZigbeeBackendTypeDeconz, ZigbeeBackendTypeDeconz,
ZigbeeBackendTypeNxp, ZigbeeBackendTypeNxp,
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #ifndef DISABLE_TI
ZigbeeBackendTypeTi ZigbeeBackendTypeTi
#endif #endif
}; };

4
libnymea-zigbee/zigbeenetworkmanager.cpp
View File

@ -30,7 +30,7 @@
#include "backends/nxp/zigbeenetworknxp.h" #include "backends/nxp/zigbeenetworknxp.h"
#include "backends/deconz/zigbeenetworkdeconz.h" #include "backends/deconz/zigbeenetworkdeconz.h"
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #ifndef DISABLE_TI
#include "backends/ti/zigbeenetworkti.h" #include "backends/ti/zigbeenetworkti.h"
#endif #endif
@ -51,7 +51,7 @@ ZigbeeNetwork *ZigbeeNetworkManager::createZigbeeNetwork(const QUuid &networkUui
return qobject_cast<ZigbeeNetwork *>(new ZigbeeNetworkNxp(networkUuid, parent)); return qobject_cast<ZigbeeNetwork *>(new ZigbeeNetworkNxp(networkUuid, parent));
case Zigbee::ZigbeeBackendTypeDeconz: case Zigbee::ZigbeeBackendTypeDeconz:
return qobject_cast<ZigbeeNetwork *>(new ZigbeeNetworkDeconz(networkUuid, parent)); return qobject_cast<ZigbeeNetwork *>(new ZigbeeNetworkDeconz(networkUuid, parent));
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #ifndef DISABLE_TI
case Zigbee::ZigbeeBackendTypeTi: case Zigbee::ZigbeeBackendTypeTi:
return qobject_cast<ZigbeeNetwork *>(new ZigbeeNetworkTi(networkUuid, parent)); return qobject_cast<ZigbeeNetwork *>(new ZigbeeNetworkTi(networkUuid, parent));
#endif #endif

2
libnymea-zigbee/zigbeeuartadaptermonitor.cpp
View File

@ -239,7 +239,7 @@ void ZigbeeUartAdapterMonitor::addAdapterInternally(const QString &serialPort)
adapter.setBaudRate(115200); adapter.setBaudRate(115200);
} }
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #ifndef DISABLE_TI
QStringList zStackModels = {"cc2530", "cc2531", "cc2538", "cc1352p", "cc2652p", "cc2652r", "cc2652rb", "sonoff zigbee 3.0 usb"}; QStringList zStackModels = {"cc2530", "cc2531", "cc2538", "cc1352p", "cc2652p", "cc2652r", "cc2652rb", "sonoff zigbee 3.0 usb"};
if (QRegularExpression(".*(" + zStackModels.join("|") + ").*").match(serialPortInfo.description().toLower()).hasMatch()) { if (QRegularExpression(".*(" + zStackModels.join("|") + ").*").match(serialPortInfo.description().toLower()).hasMatch()) {
adapter.setHardwareRecognized(true); adapter.setHardwareRecognized(true);