From c93571827b13287f9d5e1237a2a1aa2a27dc835b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 23 Sep 2025 16:50:25 +0200 Subject: [PATCH] Update disable define --- libnymea-zigbee/libnymea-zigbee.pro | 6 +++--- libnymea-zigbee/zigbee.h | 2 +- libnymea-zigbee/zigbeenetworkmanager.cpp | 4 ++-- libnymea-zigbee/zigbeeuartadaptermonitor.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libnymea-zigbee/libnymea-zigbee.pro b/libnymea-zigbee/libnymea-zigbee.pro index ebd4c0b..ea27627 100644 --- a/libnymea-zigbee/libnymea-zigbee.pro +++ b/libnymea-zigbee/libnymea-zigbee.pro @@ -15,14 +15,14 @@ greaterThan(QT_MAJOR_VERSION, 5) { # Note: available since mantic # PKGCONFIG += qca2-qt6 message(Building without TI support) - DEFINES += DISABLE_TI + DEFINES += ZIGBEE_DISABLE_TI } else { packagesExist(qca2-qt5) { message(Build with libqca2 support) PKGCONFIG += qca2-qt5 } else { message(Build without libqca2 support) - DEFINES += DISABLE_TI + DEFINES += ZIGBEE_DISABLE_TI } } @@ -98,7 +98,7 @@ SOURCES += \ zigbeenode.cpp \ zigbeeaddress.cpp -!contains(DEFINES, DISABLE_TI) { +!contains(DEFINES, ZIGBEE_DISABLE_TI) { SOURCES += \ backends/ti/interface/zigbeeinterfaceti.cpp \ backends/ti/interface/zigbeeinterfacetireply.cpp \ diff --git a/libnymea-zigbee/zigbee.h b/libnymea-zigbee/zigbee.h index 9956117..0fc55c7 100644 --- a/libnymea-zigbee/zigbee.h +++ b/libnymea-zigbee/zigbee.h @@ -43,7 +43,7 @@ public: enum ZigbeeBackendType { ZigbeeBackendTypeDeconz, ZigbeeBackendTypeNxp, -#ifndef DISABLE_TI +#ifndef ZIGBEE_DISABLE_TI ZigbeeBackendTypeTi #endif }; diff --git a/libnymea-zigbee/zigbeenetworkmanager.cpp b/libnymea-zigbee/zigbeenetworkmanager.cpp index a21fca5..cc36c50 100644 --- a/libnymea-zigbee/zigbeenetworkmanager.cpp +++ b/libnymea-zigbee/zigbeenetworkmanager.cpp @@ -30,7 +30,7 @@ #include "backends/nxp/zigbeenetworknxp.h" #include "backends/deconz/zigbeenetworkdeconz.h" -#ifndef DISABLE_TI +#ifndef ZIGBEE_DISABLE_TI #include "backends/ti/zigbeenetworkti.h" #endif @@ -51,7 +51,7 @@ ZigbeeNetwork *ZigbeeNetworkManager::createZigbeeNetwork(const QUuid &networkUui return qobject_cast(new ZigbeeNetworkNxp(networkUuid, parent)); case Zigbee::ZigbeeBackendTypeDeconz: return qobject_cast(new ZigbeeNetworkDeconz(networkUuid, parent)); -#ifndef DISABLE_TI +#ifndef ZIGBEE_DISABLE_TI case Zigbee::ZigbeeBackendTypeTi: return qobject_cast(new ZigbeeNetworkTi(networkUuid, parent)); #endif diff --git a/libnymea-zigbee/zigbeeuartadaptermonitor.cpp b/libnymea-zigbee/zigbeeuartadaptermonitor.cpp index ea4f356..aa06e7c 100644 --- a/libnymea-zigbee/zigbeeuartadaptermonitor.cpp +++ b/libnymea-zigbee/zigbeeuartadaptermonitor.cpp @@ -239,7 +239,7 @@ void ZigbeeUartAdapterMonitor::addAdapterInternally(const QString &serialPort) adapter.setBaudRate(115200); } -#ifndef DISABLE_TI +#ifndef ZIGBEE_DISABLE_TI 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);