diff --git a/libnymea-zigbee/libnymea-zigbee.pro b/libnymea-zigbee/libnymea-zigbee.pro index e79436c..643c1c5 100644 --- a/libnymea-zigbee/libnymea-zigbee.pro +++ b/libnymea-zigbee/libnymea-zigbee.pro @@ -14,6 +14,7 @@ packagesExist(libudev) { greaterThan(QT_MAJOR_VERSION, 5) { # Note: available since mantic # PKGCONFIG += qca2-qt6 + message(Building without TI support) DEFINES += DISABLE_TI } else { PKGCONFIG += qca2-qt5 diff --git a/libnymea-zigbee/zigbee.h b/libnymea-zigbee/zigbee.h index d414c0f..7b093c5 100644 --- a/libnymea-zigbee/zigbee.h +++ b/libnymea-zigbee/zigbee.h @@ -43,7 +43,9 @@ public: enum ZigbeeBackendType { ZigbeeBackendTypeDeconz, ZigbeeBackendTypeNxp, +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ZigbeeBackendTypeTi +#endif }; Q_ENUM(ZigbeeBackendType) diff --git a/libnymea-zigbee/zigbeenetworkmanager.cpp b/libnymea-zigbee/zigbeenetworkmanager.cpp index 492b8ee..cca7b3f 100644 --- a/libnymea-zigbee/zigbeenetworkmanager.cpp +++ b/libnymea-zigbee/zigbeenetworkmanager.cpp @@ -30,7 +30,9 @@ #include "backends/nxp/zigbeenetworknxp.h" #include "backends/deconz/zigbeenetworkdeconz.h" +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include "backends/ti/zigbeenetworkti.h" +#endif #include @@ -49,8 +51,10 @@ ZigbeeNetwork *ZigbeeNetworkManager::createZigbeeNetwork(const QUuid &networkUui return qobject_cast(new ZigbeeNetworkNxp(networkUuid, parent)); case Zigbee::ZigbeeBackendTypeDeconz: return qobject_cast(new ZigbeeNetworkDeconz(networkUuid, parent)); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) case Zigbee::ZigbeeBackendTypeTi: return qobject_cast(new ZigbeeNetworkTi(networkUuid, parent)); +#endif } return nullptr; diff --git a/libnymea-zigbee/zigbeeuartadaptermonitor.cpp b/libnymea-zigbee/zigbeeuartadaptermonitor.cpp index fe6173a..785d8ee 100644 --- a/libnymea-zigbee/zigbeeuartadaptermonitor.cpp +++ b/libnymea-zigbee/zigbeeuartadaptermonitor.cpp @@ -238,12 +238,15 @@ void ZigbeeUartAdapterMonitor::addAdapterInternally(const QString &serialPort) adapter.setBackendType(Zigbee::ZigbeeBackendTypeNxp); 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"}; if (QRegularExpression(".*(" + zStackModels.join("|") + ").*").match(serialPortInfo.description().toLower()).hasMatch()) { adapter.setHardwareRecognized(true); adapter.setBackendType(Zigbee::ZigbeeBackendTypeTi); adapter.setBaudRate(115200); } +#endif qCDebug(dcZigbeeAdapterMonitor()) << "Added" << adapter; m_availableAdapters.insert(adapter.serialPort(), adapter);