Skip to content

Commit 31d10bc

Browse files
authored
Added endpoint id for Thread network commissioning instance (#33685)
1 parent c1a6391 commit 31d10bc

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

src/platform/BUILD.gn

+8
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
8585
# devices with multiple radios that have different sleep behavior for
8686
# different radios.
8787
chip_device_config_enable_dynamic_mrp_config = false
88+
89+
# Define the default endpoint id for the generic Thread network commissioning instance
90+
chip_device_config_thread_network_endpoint_id = 0
8891
}
8992

9093
if (chip_stack_lock_tracking == "auto") {
@@ -389,6 +392,11 @@ if (chip_device_platform != "none" && chip_device_platform != "external") {
389392

390393
defines += [ "CHIP_DEVICE_CONFIG_MAX_DISCOVERED_IP_ADDRESSES=${chip_max_discovered_ip_addresses}" ]
391394

395+
if (chip_enable_openthread && chip_device_platform != "linux" &&
396+
chip_device_platform != "tizen" && chip_device_platform != "webos") {
397+
defines += [ "CHIP_DEVICE_CONFIG_THREAD_NETWORK_ENDPOINT_ID=${chip_device_config_thread_network_endpoint_id}" ]
398+
}
399+
392400
visibility = [
393401
":platform_config_header",
394402
"${chip_root}/src/ble:ble_config_header",

src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ static_assert(OPENTHREAD_API_VERSION >= 219, "OpenThread version too old");
7676
namespace {
7777
#ifndef _NO_NETWORK_COMMISSIONING_DRIVER_
7878
NetworkCommissioning::GenericThreadDriver sGenericThreadDriver;
79-
app::Clusters::NetworkCommissioning::Instance sThreadNetworkCommissioningInstance(0 /* Endpoint Id */, &sGenericThreadDriver);
79+
app::Clusters::NetworkCommissioning::Instance
80+
sThreadNetworkCommissioningInstance(CHIP_DEVICE_CONFIG_THREAD_NETWORK_ENDPOINT_ID /* Endpoint Id */, &sGenericThreadDriver);
8081
#endif
8182

8283
void initNetworkCommissioningThreadDriver(void)

0 commit comments

Comments
 (0)