samples: matter: Fixed deferred attribute persister

Fixed problems with not working deferred attribute persister
due to missining initialization.

Signed-off-by: Kamil Kasperczyk <[email protected]>

Author: kkasperczyk-no

doc/nrf/releases_and_maturity/migration/migration_guide_3.1.rst

@@ -38,8 +38,37 @@ Matter
 
       * The :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_ZAP_FILE_PATH` Kconfig option has been introduced.
         Previously, the path to the ZAP file was deduced based on hardcoded locations.
-        Now, the location is configured using :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_ZAP_FILE_PATH` Kconfig option.
-        This change requires you to update your application ``prj.conf`` file by setting :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_ZAP_FILE_PATH` to point the location of you ZAP file.
+        Now, the location is configured using the :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_ZAP_FILE_PATH` Kconfig option.
+        This change requires you to update your application ``prj.conf`` file by setting the :kconfig:option:`CONFIG_NCS_SAMPLE_MATTER_ZAP_FILE_PATH` option to point the location of you ZAP file.
+
+   * For the :ref:`Matter light bulb <matter_light_bulb_sample>` sample:
+
+      * The deferred attribute persistence implementation has changed in the latest Matter version and you must align it as follows:
+
+        * Remove the following lines from the :file:`app_task.cpp` file located in the application's :file:`src` directory:
+
+          .. code-block:: C++
+
+             #include <app/DeferredAttributePersistenceProvider.h>
+
+             DeferredAttributePersistenceProvider gDeferredAttributePersister(Server::GetInstance().GetDefaultAttributePersister(),
+                                                                              Span<DeferredAttribute>(&gCurrentLevelPersister, 1),
+                                                                              System::Clock::Milliseconds32(5000));
+
+        * Add the following lines to the :file:`app_task.cpp` file located in the application's :file:`src` directory:
+
+          .. code-block:: C++
+
+             #include <app/util/persistence/DefaultAttributePersistenceProvider.h>
+             #include <app/util/persistence/DeferredAttributePersistenceProvider.h>
+
+             DefaultAttributePersistenceProvider gSimpleAttributePersistence;
+             DeferredAttributePersistenceProvider gDeferredAttributePersister(gSimpleAttributePersistence,
+                                                                              Span<DeferredAttribute>(&gCurrentLevelPersister, 1),
+                                                                              System::Clock::Milliseconds32(5000));
+
+        * Modify the ``mPostServerInitClbk`` function passed to the ``Nrf::Matter::PrepareServer`` function in the :file:`app_task.cpp` file should be modified to call additionally the ``gSimpleAttributePersistence.Init(Nrf::Matter::GetPersistentStorageDelegate())``.
+
 
 Thread
 ------

samples/matter/common/src/app/matter_init.cpp

@@ -437,4 +437,9 @@ FactoryDataProviderBase *GetFactoryDataProvider()
 }
 #endif
 
+PersistentStorageDelegate * GetPersistentStorageDelegate()
+{
+	return sLocalInitData.mServerInitParams->persistentStorageDelegate;
+}
+
 } /* namespace Nrf::Matter */

samples/matter/common/src/app/matter_init.h

@@ -12,6 +12,7 @@
 #include <app/clusters/network-commissioning/network-commissioning.h>
 #include <app/server/Server.h>
 #include <lib/core/Optional.h>
+#include <lib/core/CHIPPersistentStorageDelegate.h>
 #include <lib/support/Variant.h>
 #include <platform/PlatformManager.h>
 
@@ -128,4 +129,6 @@ CHIP_ERROR StartServer();
 chip::DeviceLayer::FactoryDataProviderBase *GetFactoryDataProvider();
 #endif
 
+chip::PersistentStorageDelegate * GetPersistentStorageDelegate();
+
 } /* namespace Nrf::Matter */

samples/matter/light_bulb/src/app_task.cpp

@@ -290,8 +290,9 @@ void AppTask::InitPWMDDevice()
 CHIP_ERROR AppTask::Init()
 {
 	/* Initialize Matter stack */
-	ReturnErrorOnFailure(Nrf::Matter::PrepareServer(Nrf::Matter::InitData{ .mPostServerInitClbk = [] {
+	ReturnErrorOnFailure(Nrf::Matter::PrepareServer(Nrf::Matter::InitData{ .mPostServerInitClbk = []() {
 		app::SetAttributePersistenceProvider(&gDeferredAttributePersister);
+		gSimpleAttributePersistence.Init(Nrf::Matter::GetPersistentStorageDelegate());
 		return CHIP_NO_ERROR;
 	} }));
 

samples/matter/light_bulb/src/zcl_callbacks.cpp

@@ -81,6 +81,7 @@ void emberAfOnOffClusterInitCallback(EndpointId endpoint)
 
 	/* Read storedValue on/off value */
 	status = Attributes::OnOff::Get(endpoint, &storedValue);
+
 	if (status == Protocols::InteractionModel::Status::Success) {
 		/* Set actual state to the cluster state that was last persisted */
 #if defined(CONFIG_PWM)