Skip to content

Commit 136bff1

Browse files
committed
Adding config checks for functions specific to only wifi and thread in NetworkCommissioning Cluster code. (#33268)
* Adding config checks for fucntions specific to only wifi and thread in NetworkCommissioning * Restlyed
1 parent aa1ecd2 commit 136bff1

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

src/app/clusters/network-commissioning/network-commissioning.cpp

+13-1
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,11 @@ namespace NetworkCommissioning {
4646
using namespace DeviceLayer::NetworkCommissioning;
4747

4848
namespace {
49-
// For WiFi and Thread scan results, each item will cose ~60 bytes in TLV, thus 15 is a safe upper bound of scan results.
49+
50+
// For WiFi and Thread scan results, each item will cost ~60 bytes in TLV, thus 15 is a safe upper bound of scan results.
51+
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION || CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP || CHIP_DEVICE_CONFIG_ENABLE_THREAD
5052
constexpr size_t kMaxNetworksInScanResponse = 15;
53+
#endif
5154

5255
enum ValidWiFiCredentialLength
5356
{
@@ -315,6 +318,7 @@ bool CheckFailSafeArmed(CommandHandlerInterface::HandlerContext & ctx)
315318

316319
void Instance::HandleAddOrUpdateWiFiNetwork(HandlerContext & ctx, const Commands::AddOrUpdateWiFiNetwork::DecodableType & req)
317320
{
321+
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION || CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
318322
MATTER_TRACE_SCOPE("HandleAddOrUpdateWiFiNetwork", "NetworkCommissioning");
319323

320324
VerifyOrReturn(CheckFailSafeArmed(ctx));
@@ -369,10 +373,13 @@ void Instance::HandleAddOrUpdateWiFiNetwork(HandlerContext & ctx, const Commands
369373
{
370374
UpdateBreadcrumb(req.breadcrumb);
371375
}
376+
#endif
372377
}
373378

374379
void Instance::HandleAddOrUpdateThreadNetwork(HandlerContext & ctx, const Commands::AddOrUpdateThreadNetwork::DecodableType & req)
375380
{
381+
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
382+
376383
MATTER_TRACE_SCOPE("HandleAddOrUpdateThreadNetwork", "NetworkCommissioning");
377384

378385
VerifyOrReturn(CheckFailSafeArmed(ctx));
@@ -392,6 +399,7 @@ void Instance::HandleAddOrUpdateThreadNetwork(HandlerContext & ctx, const Comman
392399
{
393400
UpdateBreadcrumb(req.breadcrumb);
394401
}
402+
#endif
395403
}
396404

397405
void Instance::UpdateBreadcrumb(const Optional<uint64_t> & breadcrumb)
@@ -508,6 +516,7 @@ void Instance::OnResult(Status commissioningError, CharSpan debugText, int32_t i
508516

509517
void Instance::OnFinished(Status status, CharSpan debugText, ThreadScanResponseIterator * networks)
510518
{
519+
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
511520
CHIP_ERROR err = CHIP_NO_ERROR;
512521
auto commandHandleRef = std::move(mAsyncCommandHandle);
513522
auto commandHandle = commandHandleRef.Get();
@@ -618,10 +627,12 @@ void Instance::OnFinished(Status status, CharSpan debugText, ThreadScanResponseI
618627
CommitSavedBreadcrumb();
619628
}
620629
networks->Release();
630+
#endif
621631
}
622632

623633
void Instance::OnFinished(Status status, CharSpan debugText, WiFiScanResponseIterator * networks)
624634
{
635+
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION || CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
625636
CHIP_ERROR err = CHIP_NO_ERROR;
626637
auto commandHandleRef = std::move(mAsyncCommandHandle);
627638
auto commandHandle = commandHandleRef.Get();
@@ -682,6 +693,7 @@ void Instance::OnFinished(Status status, CharSpan debugText, WiFiScanResponseIte
682693
{
683694
networks->Release();
684695
}
696+
#endif
685697
}
686698

687699
void Instance::OnPlatformEventHandler(const DeviceLayer::ChipDeviceEvent * event, intptr_t arg)

0 commit comments

Comments
 (0)