From 3ea7639b9ddaac86352934852bff4b429f2c3a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 23 Sep 2025 12:14:12 +0200 Subject: [PATCH] Make TI backend support configurable --- libnymea-core/jsonrpc/zigbeehandler.cpp | 2 +- libnymea-core/libnymea-core.pro | 6 ++++++ libnymea-core/zigbee/zigbeeadapter.cpp | 2 +- libnymea-core/zigbee/zigbeeadapter.h | 2 +- libnymea-core/zigbee/zigbeemanager.cpp | 6 +++--- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libnymea-core/jsonrpc/zigbeehandler.cpp b/libnymea-core/jsonrpc/zigbeehandler.cpp index 91364af6..63695fb3 100644 --- a/libnymea-core/jsonrpc/zigbeehandler.cpp +++ b/libnymea-core/jsonrpc/zigbeehandler.cpp @@ -672,7 +672,7 @@ QVariantMap ZigbeeHandler::packNetwork(ZigbeeNetwork *network) case Zigbee::ZigbeeBackendTypeNxp: networkMap.insert("backend", ZigbeeAdapter::backendNames().value(ZigbeeAdapter::ZigbeeBackendTypeNxp)); break; -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +#ifndef ZIGBEE_DISABLE_TI case Zigbee::ZigbeeBackendTypeTi: networkMap.insert("backend", ZigbeeAdapter::backendNames().value(ZigbeeAdapter::ZigbeeBackendTypeTi)); break; diff --git a/libnymea-core/libnymea-core.pro b/libnymea-core/libnymea-core.pro index dd951c14..09259ab5 100644 --- a/libnymea-core/libnymea-core.pro +++ b/libnymea-core/libnymea-core.pro @@ -27,6 +27,8 @@ greaterThan(QT_MAJOR_VERSION, 5) { message("QtSerialBus package not found. Building without QtSerialBus support.") } + DEFINES += ZIGBEE_DISABLE_TI + # Separate module in Qt6 QT += concurrent } else { @@ -37,6 +39,10 @@ greaterThan(QT_MAJOR_VERSION, 5) { } else { message("Qt5SerialBus package not found. Building without QtSerialBus support.") } + + contains(DEFINES, ZIGBEE_DISABLE_TI) { + message(Build without zigbee TI backend support) + } } # Note: udev is not available on all platforms diff --git a/libnymea-core/zigbee/zigbeeadapter.cpp b/libnymea-core/zigbee/zigbeeadapter.cpp index 5faa4631..e7f26aa3 100644 --- a/libnymea-core/zigbee/zigbeeadapter.cpp +++ b/libnymea-core/zigbee/zigbeeadapter.cpp @@ -127,7 +127,7 @@ QHash ZigbeeAdapter::backendNames() QHash backendNameHash; backendNameHash.insert(ZigbeeBackendTypeDeconz, "deCONZ"); backendNameHash.insert(ZigbeeBackendTypeNxp, "NXP"); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +#ifndef ZIGBEE_DISABLE_TI backendNameHash.insert(ZigbeeBackendTypeTi, "TI"); #endif return backendNameHash; diff --git a/libnymea-core/zigbee/zigbeeadapter.h b/libnymea-core/zigbee/zigbeeadapter.h index c626d749..edf94afe 100644 --- a/libnymea-core/zigbee/zigbeeadapter.h +++ b/libnymea-core/zigbee/zigbeeadapter.h @@ -53,7 +53,7 @@ public: enum ZigbeeBackendType { ZigbeeBackendTypeDeconz, ZigbeeBackendTypeNxp, -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +#ifndef ZIGBEE_DISABLE_TI ZigbeeBackendTypeTi #endif }; diff --git a/libnymea-core/zigbee/zigbeemanager.cpp b/libnymea-core/zigbee/zigbeemanager.cpp index 033e9c73..fd54bb4b 100644 --- a/libnymea-core/zigbee/zigbeemanager.cpp +++ b/libnymea-core/zigbee/zigbeemanager.cpp @@ -272,7 +272,7 @@ void ZigbeeManager::saveNetwork(ZigbeeNetwork *network) case Zigbee::ZigbeeBackendTypeNxp: settings.setValue("backendType", static_cast(ZigbeeAdapter::ZigbeeBackendTypeNxp)); break; -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +#ifndef ZIGBEE_DISABLE_TI case Zigbee::ZigbeeBackendTypeTi: settings.setValue("backendType", static_cast(ZigbeeAdapter::ZigbeeBackendTypeTi)); break; @@ -454,7 +454,7 @@ ZigbeeNetwork *ZigbeeManager::buildNetworkObject(const QUuid &networkId, ZigbeeA case ZigbeeAdapter::ZigbeeBackendTypeNxp: network = ZigbeeNetworkManager::createZigbeeNetwork(networkId, Zigbee::ZigbeeBackendTypeNxp, this); break; -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +#ifndef ZIGBEE_DISABLE_TI case ZigbeeAdapter::ZigbeeBackendTypeTi: network = ZigbeeNetworkManager::createZigbeeNetwork(networkId, Zigbee::ZigbeeBackendTypeTi, this); break; @@ -642,7 +642,7 @@ ZigbeeAdapter ZigbeeManager::convertUartAdapterToAdapter(const ZigbeeUartAdapter case Zigbee::ZigbeeBackendTypeNxp: adapter.setBackendType(ZigbeeAdapter::ZigbeeBackendTypeNxp); break; -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +#ifndef ZIGBEE_DISABLE_TI case Zigbee::ZigbeeBackendTypeTi: adapter.setBackendType(ZigbeeAdapter::ZigbeeBackendTypeTi); break;