Skip to content

Commit 046531a

Browse files
authored
Fix Linux (and NXP) App builds when NonConcurrent Commissioning is used (project-chip#41977)
* Fix the Linux build for Non-concurrent Commissioning; triggered by setting CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION to 0 * Duplicate changes to NXP platform
1 parent 7e1bc6b commit 046531a

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

examples/platform/linux/AppMain.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ class SampleTestEventTriggerHandler : public TestEventTriggerHandler
402402
}
403403
};
404404

405-
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
405+
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF && CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION
406406
/*
407407
Get the freq_list from args.
408408
Format:
@@ -702,7 +702,7 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions,
702702
}
703703
}
704704
#endif // CHIP_DEVICE_CONFIG_ENABLE_WPA
705-
#if CHIP_DEVICE_CONFIG_ENABLE_WPA && CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
705+
#if CHIP_DEVICE_CONFIG_ENABLE_WPA && CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF && CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION
706706
if (LinuxDeviceOptions::GetInstance().mWiFi && LinuxDeviceOptions::GetInstance().mWiFiPAF)
707707
{
708708
ChipLogProgress(WiFiPAF, "WiFi-PAF: initialzing");

examples/platform/nxp/se05x/linux/AppMain.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ class SampleTestEventTriggerHandler : public TestEventTriggerHandler
400400
}
401401
};
402402

403-
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
403+
#if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF && CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION
404404
/*
405405
Get the freq_list from args.
406406
Format:
@@ -586,7 +586,7 @@ int ChipLinuxAppInit(int argc, char * const argv[], OptionSet * customOptions,
586586
}
587587
}
588588
#endif // CHIP_DEVICE_CONFIG_ENABLE_WPA
589-
#if CHIP_DEVICE_CONFIG_ENABLE_WPA && CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
589+
#if CHIP_DEVICE_CONFIG_ENABLE_WPA && CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF && CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION
590590
if (LinuxDeviceOptions::GetInstance().mWiFi && LinuxDeviceOptions::GetInstance().mWiFiPAF)
591591
{
592592
ChipLogProgress(WiFiPAF, "WiFi-PAF: initialzing");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ void NetworkCommissioningCluster::SendNonConcurrentConnectNetworkResponse()
243243
#endif // CONFIG_NETWORK_LAYER_BLE
244244
ChipLogProgress(NetworkProvisioning, "Non-concurrent mode. Send ConnectNetworkResponse(Success)");
245245
Commands::ConnectNetworkResponse::Type response;
246-
response.networkingStatus = NetworkCommissioning::Status::kSuccess;
246+
response.networkingStatus = Status::kSuccess;
247247
commandHandle->AddResponse(mAsyncCommandPath, response);
248248
}
249249
#endif // CHIP_DEVICE_CONFIG_SUPPORTS_CONCURRENT_CONNECTION

0 commit comments

Comments
 (0)