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.

Sign up for GitHub

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

samples: matter: Use the generic ConnectivityManager methods #16559

Merged
merged 1 commit into from
Jul 24, 2024
Merged

samples: matter: Use the generic ConnectivityManager methods #16559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 1 addition & 11 deletions samples/matter/common/src/app/matter_event_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,11 @@ void DefaultEventHandler(const ChipDeviceEvent *event, intptr_t /* unused */)
}
#endif
break;
#if defined(CONFIG_NET_L2_OPENTHREAD)
case DeviceEventType::kDnssdInitialized:
#if CONFIG_CHIP_OTA_REQUESTOR
case DeviceEventType::kServerReady:
InitBasicOTARequestor();
#endif /* CONFIG_CHIP_OTA_REQUESTOR */
break;
#elif defined(CONFIG_CHIP_WIFI)
case DeviceEventType::kWiFiConnectivityChange:
#if CONFIG_CHIP_OTA_REQUESTOR
if (event->WiFiConnectivityChange.Result == kConnectivity_Established) {
InitBasicOTARequestor();
}
#endif /* CONFIG_CHIP_OTA_REQUESTOR */
#endif /* CONFIG_NET_L2_OPENTHREAD */
break;
default:
break;
}
Expand Down
47 changes: 30 additions & 17 deletions samples/matter/common/src/app/matter_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ void FeedFromMatter(Nrf::Watchdog::WatchdogSource *watchdogSource)
}
#endif

/* Matter stack design implies different initialization procedure for Thread and Wi-Fi backend. */
#if defined(CONFIG_NET_L2_OPENTHREAD)
CHIP_ERROR ConfigureThreadRole()
{
Expand All @@ -147,6 +148,32 @@ CHIP_ERROR ConfigureThreadRole()

return ConnectivityMgr().SetThreadDeviceType(threadRole);
}

CHIP_ERROR InitNetworkingStack()
{
CHIP_ERROR error{ CHIP_NO_ERROR };

error = ThreadStackMgr().InitThreadStack();
VerifyOrReturnLogError(error == CHIP_NO_ERROR, error);

error = ConfigureThreadRole();
VerifyOrReturnLogError(error == CHIP_NO_ERROR, error);

return error;
}

#elif defined(CONFIG_CHIP_WIFI)

CHIP_ERROR InitNetworkingStack()
{
if (sLocalInitData.mNetworkingInstance) {
sLocalInitData.mNetworkingInstance->Init();
}

return CHIP_NO_ERROR;
}
#else
#error "No valid L2 network backend selected");
#endif /* CONFIG_NET_L2_OPENTHREAD */

#define VerifyInitResultOrReturn(ec, msg) \
Expand Down Expand Up @@ -179,23 +206,9 @@ void DoInitChipServer(intptr_t /* unused */)
VerifyInitResultOrReturn(sInitResult, "Custom pre server initialization failed");
}

#if defined(CONFIG_NET_L2_OPENTHREAD)
sInitResult = ThreadStackMgr().InitThreadStack();
VerifyInitResultOrReturn(sInitResult, "ThreadStackMgr().InitThreadStack() failed");

sInitResult = ConfigureThreadRole();
VerifyInitResultOrReturn(sInitResult, "Cannot configure Thread role");

#elif defined(CONFIG_CHIP_WIFI)
if (!sLocalInitData.mNetworkingInstance) {
sInitResult = CHIP_ERROR_INTERNAL;
VerifyInitResultOrReturn(sInitResult, "No valid commissioning instance");
}
sLocalInitData.mNetworkingInstance->Init();
#else
sInitResult = CHIP_ERROR_INTERNAL;
VerifyInitResultOrReturn(sInitResult, "No valid L2 network backend selected");
#endif /* CONFIG_NET_L2_OPENTHREAD */
/* Initialize L2 networking backend. */
sInitResult = InitNetworkingStack();
VerifyInitResultOrReturn(sInitResult, "Cannot initialize IPv6 networking stack");

#ifdef CONFIG_CHIP_OTA_REQUESTOR
/* OTA image confirmation must be done before the factory data init. */
Expand Down
10 changes: 2 additions & 8 deletions samples/matter/common/src/board/board.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,17 +306,11 @@ void Board::DefaultMatterEventHandler(const ChipDeviceEvent *event, intptr_t /*
case DeviceEventType::kCHIPoBLEAdvertisingChange:
isBleConnected = ConnectivityMgr().NumBLEConnections() != 0;
break;
#if defined(CONFIG_NET_L2_OPENTHREAD)
case DeviceEventType::kThreadStateChange:
isNetworkProvisioned = ConnectivityMgr().IsThreadProvisioned() && ConnectivityMgr().IsThreadEnabled();
break;
#endif /* CONFIG_NET_L2_OPENTHREAD */
#if defined(CONFIG_CHIP_WIFI)
case DeviceEventType::kWiFiConnectivityChange:
isNetworkProvisioned =
ConnectivityMgr().IsWiFiStationProvisioned() && ConnectivityMgr().IsWiFiStationEnabled();
isNetworkProvisioned = ConnectivityMgrImpl().IsIPv6NetworkProvisioned() &&
ConnectivityMgrImpl().IsIPv6NetworkEnabled();
break;
#endif /* CONFIG_CHIP_WIFI */
default:
break;
}
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ manifest:
- name: matter
repo-path: sdk-connectedhomeip
path: modules/lib/matter
revision: 0ada603e141a23e9be9634ae1a843b5ee5998560
revision: 1f60b2102010153482a0df350a03cac82d1ae4cd
west-commands: scripts/west/west-commands.yml
submodules:
- name: nlio
Expand Down
Loading