Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace _NO_NETWORK_COMMISSIONING_DRIVER_ with _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_ #33608

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/shell/genio/include/CHIPProjectConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@
*/
#define CHIP_DEVICE_CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE (512)

#define _NO_NETWORK_COMMISSIONING_DRIVER_
#define _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
2 changes: 1 addition & 1 deletion examples/shell/mbed/main/include/CHIPProjectConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@

// shell app uses openthread but does not have the NETWORK_COMMISSIONING cluster or zap config
// Do not instantiate the NETWORK_COMMISSIONING thread driver
#define _NO_NETWORK_COMMISSIONING_DRIVER_
#define _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
2 changes: 1 addition & 1 deletion examples/shell/nrfconnect/CHIPProjectConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@

// shell app uses openthread but does not have the NETWORK_COMMISSIONING cluster or zap config
// Do not instantiate the NETWORK_COMMISSIONING thread driver
#define _NO_NETWORK_COMMISSIONING_DRIVER_
#define _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
2 changes: 1 addition & 1 deletion examples/shell/qpg/include/CHIPProjectConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

// shell app uses openthread but does not have the NETWORK_COMMISSIONING cluster or zap config
// Do not instantiate the NETWORK_COMMISSIONING thread driver
#define _NO_NETWORK_COMMISSIONING_DRIVER_
#define _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_

// For convenience, enable Chip Security Test Mode and disable the requirement for
// authentication in various protocols.
Expand Down
2 changes: 1 addition & 1 deletion examples/shell/telink/include/CHIPProjectConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@

// shell app uses openthread but does not have the NETWORK_COMMISSIONING cluster or zap config
// Do not instantiate the NETWORK_COMMISSIONING thread driver
#define _NO_NETWORK_COMMISSIONING_DRIVER_
#define _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ static_assert(OPENTHREAD_API_VERSION >= 219, "OpenThread version too old");

// Network commissioning
namespace {
#ifndef _NO_NETWORK_COMMISSIONING_DRIVER_
#ifndef _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
NetworkCommissioning::GenericThreadDriver sGenericThreadDriver;
app::Clusters::NetworkCommissioning::Instance
sThreadNetworkCommissioningInstance(CHIP_DEVICE_CONFIG_THREAD_NETWORK_ENDPOINT_ID /* Endpoint Id */, &sGenericThreadDriver);
#endif

void initNetworkCommissioningThreadDriver(void)
{
#ifndef _NO_NETWORK_COMMISSIONING_DRIVER_
#ifndef _NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_
sThreadNetworkCommissioningInstance.Init();
#endif
}
Expand Down
2 changes: 1 addition & 1 deletion src/platform/nxp/rt/rw61x/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ config("nxp_platform_config") {
}
if (chip_enable_wifi && chip_enable_openthread) {
# Disable thread nwk commissioning instance on endpoint 0, when OTBR is enabled
defines += [ "_NO_NETWORK_COMMISSIONING_DRIVER_" ]
defines += [ "_NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_" ]
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/test_driver/efr32/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ efr32_sdk("sdk") {
"PW_RPC_ENABLED",

# Thread is built but test driver do not have the NETWORK_COMMISSIONING cluster or zap config.
"_NO_NETWORK_COMMISSIONING_DRIVER_",
"_NO_GENERIC_THREAD_NETWORK_COMMISSIONING_DRIVER_",
]
}

Expand Down
Loading