[Telink] Add CHIP_DEVICE_CONFIG_ENABLE_THREAD check

project-chip · Mar 1, 2023 · 17571fe · 17571fe
1 parent dd0d82d
commit 17571fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/app/server/CommissioningWindowManager.cpp b/src/app/server/CommissioningWindowManager.cpp
@@ -25,7 +25,7 @@
 #include <platform/CommissionableDataProvider.h>
 #include <platform/DeviceControlServer.h>
 
-#if CHIP_DEVICE_CONFIG_THREAD_FTD
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_THREAD_FTD
 #include <openthread/thread_ftd.h>
 using namespace chip::DeviceLayer;
 #endif
@@ -553,7 +553,7 @@ void CommissioningWindowManager::UpdateWindowStatus(CommissioningWindowStatusEnu
                                                AdministratorCommissioning::Attributes::WindowStatus::Id);
     }
 
-#if CHIP_DEVICE_CONFIG_THREAD_FTD
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_THREAD_FTD
     // Block device role changing into Router if commissioning window opened and device not yet Router.
     if (mWindowStatus == CommissioningWindowStatusEnum::kEnhancedWindowOpen &&
         ConnectivityManagerImpl().GetThreadDeviceType() == ConnectivityManager::kThreadDeviceType_Router &&

diff --git a/src/app/server/CommissioningWindowManager.h b/src/app/server/CommissioningWindowManager.h
@@ -215,7 +215,7 @@ class CommissioningWindowManager : public Messaging::UnsolicitedMessageHandler,
     bool mSEDActiveModeEnabled = false;
 #endif
 
-#if CHIP_DEVICE_CONFIG_THREAD_FTD
+#if CHIP_DEVICE_CONFIG_ENABLE_THREAD && CHIP_DEVICE_CONFIG_THREAD_FTD
     bool mRecoverRouterDeviceRole = false;
 #endif