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

Fix building and linking Qt6 and disable TI everywhere until it can be fixed

Browse Source
This commit is contained in:
Simon Stürz 2024-10-04 10:03:35 +02:00
parent 9ccaff3c2f
commit 59236e318a
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ packagesExist(libudev) {
greaterThan(QT_MAJOR_VERSION, 5) { greaterThan(QT_MAJOR_VERSION, 5) {
# Note: available since mantic # Note: available since mantic
# PKGCONFIG += qca2-qt6 # PKGCONFIG += qca2-qt6
message(Building without TI support)
DEFINES += DISABLE_TI DEFINES += DISABLE_TI
} else { } else {
PKGCONFIG += qca2-qt5 PKGCONFIG += qca2-qt5

2
libnymea-zigbee/zigbee.h
View File

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

4
libnymea-zigbee/zigbeenetworkmanager.cpp
View File

@ -30,7 +30,9 @@
#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)
#include "backends/ti/zigbeenetworkti.h" #include "backends/ti/zigbeenetworkti.h"
#endif
#include <QDateTime> #include <QDateTime>
@ -49,8 +51,10 @@ 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)
case Zigbee::ZigbeeBackendTypeTi: case Zigbee::ZigbeeBackendTypeTi:
return qobject_cast<ZigbeeNetwork *>(new ZigbeeNetworkTi(networkUuid, parent)); return qobject_cast<ZigbeeNetwork *>(new ZigbeeNetworkTi(networkUuid, parent));
#endif
} }
return nullptr; return nullptr;

3
libnymea-zigbee/zigbeeuartadaptermonitor.cpp
View File

@ -238,12 +238,15 @@ void ZigbeeUartAdapterMonitor::addAdapterInternally(const QString &serialPort)
adapter.setBackendType(Zigbee::ZigbeeBackendTypeNxp); adapter.setBackendType(Zigbee::ZigbeeBackendTypeNxp);
adapter.setBaudRate(115200); adapter.setBaudRate(115200);
} }
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
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);
adapter.setBackendType(Zigbee::ZigbeeBackendTypeTi); adapter.setBackendType(Zigbee::ZigbeeBackendTypeTi);
adapter.setBaudRate(115200); adapter.setBaudRate(115200);
} }
#endif
qCDebug(dcZigbeeAdapterMonitor()) << "Added" << adapter; qCDebug(dcZigbeeAdapterMonitor()) << "Added" << adapter;
m_availableAdapters.insert(adapter.serialPort(), adapter); m_availableAdapters.insert(adapter.serialPort(), adapter);