diff --git a/samples/matter/common/src/app/fabric_table_delegate.h b/samples/matter/common/src/app/fabric_table_delegate.h index fdc6e4051660..e683a598a4ec 100644 --- a/samples/matter/common/src/app/fabric_table_delegate.h +++ b/samples/matter/common/src/app/fabric_table_delegate.h @@ -11,6 +11,7 @@ #include #include "app/group_data_provider.h" +#include #ifdef CONFIG_CHIP_WIFI #include @@ -57,10 +58,14 @@ class AppFabricTableDelegate : public chip::FabricTable::Delegate { #if CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT chip::DeviceLayer::ThreadStackMgr().ClearAllSrpHostAndServices(); #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT + /*/ Disable mpsl before start removing settings to improve the performance. */ + mpsl_lib_uninit(); /* Erase Matter data */ chip::DeviceLayer::PersistedStorage::KeyValueStoreMgrImpl().DoFactoryReset(); /* Erase Network credentials and disconnect */ chip::DeviceLayer::ConnectivityMgr().ErasePersistentInfo(); + /*/ Re-enable mpsl after clearing persistent data. */ + mpsl_lib_init(); #ifdef CONFIG_CHIP_WIFI chip::DeviceLayer::WiFiManager::Instance().Disconnect(); chip::DeviceLayer::ConnectivityMgr().ClearWiFiStationProvision(); diff --git a/west.yml b/west.yml index 699b28e9fd79..fed1ff312051 100644 --- a/west.yml +++ b/west.yml @@ -159,7 +159,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: 20babbe7904f55511c39f19cae2162f7b770f974 + revision: pull/527/head west-commands: scripts/west/west-commands.yml submodules: - name: nlio