samples: matter: Align sdk-nrf Matter files with Matter 1.6

WIP

Provided all required changes in sdk-nrf Matter files to work
with Matter 1.6

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

Author: ArekBalysNordic

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

@@ -33,7 +33,8 @@ class AppFabricTableDelegate : public chip::FabricTable::Delegate {
 	{
 #ifndef CONFIG_CHIP_LAST_FABRIC_REMOVED_NONE
 		static AppFabricTableDelegate sAppFabricDelegate;
-		chip::Server::GetInstance().GetFabricTable().AddFabricDelegate(&sAppFabricDelegate);
+		TEMPORARY_RETURN_IGNORED chip::Server::GetInstance().GetFabricTable().AddFabricDelegate(
+			&sAppFabricDelegate);
 		k_timer_init(&sFabricRemovedTimer, &OnFabricRemovedTimerCallback, nullptr);
 #endif // CONFIG_CHIP_LAST_FABRIC_REMOVED_NONE
 	}
@@ -59,35 +60,37 @@ class AppFabricTableDelegate : public chip::FabricTable::Delegate {
 	{
 #ifndef CONFIG_CHIP_LAST_FABRIC_REMOVED_NONE
 		if (chip::Server::GetInstance().GetFabricTable().FabricCount() == 0) {
-			chip::DeviceLayer::PlatformMgr().ScheduleWork([](intptr_t) {
+			if (CHIP_NO_ERROR == chip::DeviceLayer::PlatformMgr().ScheduleWork([](intptr_t) {
 #ifdef CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_REBOOT
-				chip::Server::GetInstance().ScheduleFactoryReset();
+				    chip::Server::GetInstance().ScheduleFactoryReset();
 #elif defined(CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_ONLY) ||                                                           \
 	defined(CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_PAIRING_START)
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
-				chip::DeviceLayer::ThreadStackMgr().ClearAllSrpHostAndServices();
+				    chip::DeviceLayer::ThreadStackMgr().ClearAllSrpHostAndServices();
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT
-				/* Erase Matter data */
-				chip::DeviceLayer::PersistedStorage::KeyValueStoreMgrImpl().DoFactoryReset();
-				/* Erase Network credentials and disconnect */
-				chip::DeviceLayer::ConnectivityMgr().ErasePersistentInfo();
+				    /* Erase Matter data */
+				    chip::DeviceLayer::PersistedStorage::KeyValueStoreMgrImpl().DoFactoryReset();
+				    /* Erase Network credentials and disconnect */
+				    chip::DeviceLayer::ConnectivityMgr().ErasePersistentInfo();
 #ifdef CONFIG_CHIP_WIFI
-				chip::DeviceLayer::WiFiManager::Instance().Disconnect();
-				chip::DeviceLayer::ConnectivityMgr().ClearWiFiStationProvision();
+				    chip::DeviceLayer::WiFiManager::Instance().Disconnect();
+				    chip::DeviceLayer::ConnectivityMgr().ClearWiFiStationProvision();
 #endif
 #ifdef CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_PAIRING_START
-				/* Start the New BLE advertising */
-				if (!chip::DeviceLayer::ConnectivityMgr().IsBLEAdvertisingEnabled()) {
-					if (CHIP_NO_ERROR == chip::Server::GetInstance()
-								     .GetCommissioningWindowManager()
-								     .OpenBasicCommissioningWindow()) {
-						return;
-					}
-				}
-				ChipLogError(FabricProvisioning, "Could not start Bluetooth LE advertising");
+				    /* Start the New BLE advertising */
+				    if (!chip::DeviceLayer::ConnectivityMgr().IsBLEAdvertisingEnabled()) {
+					    if (CHIP_NO_ERROR == chip::Server::GetInstance()
+									 .GetCommissioningWindowManager()
+									 .OpenBasicCommissioningWindow()) {
+						    return;
+					    }
+				    }
+				    ChipLogError(FabricProvisioning, "Could not start Bluetooth LE advertising");
 #endif // CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_PAIRING_START
 #endif // CONFIG_CHIP_LAST_FABRIC_REMOVED_ERASE_AND_REBOOT
-			});
+			    })) {
+				ChipLogError(FabricProvisioning, "Could not schedule factory reset");
+			}
 		}
 #endif // CONFIG_CHIP_LAST_FABRIC_REMOVED_NONE
 	}

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

@@ -193,7 +193,8 @@ CHIP_ERROR InitNetworkingStack()
 	error = ConfigureThreadRole();
 	VerifyOrReturnLogError(error == CHIP_NO_ERROR, error);
 
-	sThreadNetworkDriver.Init();
+	error = sThreadNetworkDriver.Init();
+	VerifyOrReturnLogError(error == CHIP_NO_ERROR, error);
 
 	return error;
 }
@@ -215,7 +216,8 @@ void UnlockOpenThreadTask(void)
 CHIP_ERROR InitNetworkingStack()
 {
 	if (sLocalInitData.mNetworkingInstance) {
-		sLocalInitData.mNetworkingInstance->Init();
+		CHIP_ERROR error = sLocalInitData.mNetworkingInstance->Init();
+		VerifyOrReturnError(error == CHIP_NO_ERROR, error);
 	}
 
 	return CHIP_NO_ERROR;
@@ -297,11 +299,12 @@ void DoInitChipServer(intptr_t /* unused */)
 	MutableByteSpan enableKey(enableKeyData);
 	sInitResult = sLocalInitData.mFactoryDataProvider->GetEnableKey(enableKey);
 	VerifyInitResultOrReturn(sInitResult, "GetEnableKey() failed");
-	Nrf::Matter::TestEventTrigger::Instance().SetEnableKey(enableKey);
+	sInitResult = Nrf::Matter::TestEventTrigger::Instance().SetEnableKey(enableKey);
 	VerifyInitResultOrReturn(sInitResult, "SetEnableKey() failed");
 #ifdef CONFIG_NCS_SAMPLE_MATTER_TEST_EVENT_TRIGGERS_REGISTER_DEFAULTS
 	sLocalInitData.mServerInitParams->testEventTriggerDelegate = &Nrf::Matter::TestEventTrigger::Instance();
-	Nrf::Matter::DefaultTestEventTriggers::Register();
+	sInitResult = Nrf::Matter::DefaultTestEventTriggers::Register();
+	VerifyInitResultOrReturn(sInitResult, "DefaultTestEventTriggers::Register() failed");
 #endif /* CONFIG_NCS_SAMPLE_MATTER_TEST_EVENT_TRIGGERS_REGISTER_DEFAULTS */
 #endif /* CONFIG_NCS_SAMPLE_MATTER_TEST_EVENT_TRIGGERS */
 #else

samples/matter/common/src/certification/thread_platform/thread_certification.zap

@@ -888,10 +888,10 @@
               "side": "server",
               "type": "boolean",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -904,10 +904,10 @@
               "side": "server",
               "type": "UpdateStateEnum",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -920,10 +920,10 @@
               "side": "server",
               "type": "int8u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -984,10 +984,10 @@
               "side": "server",
               "type": "bitmap32",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "0",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -1000,10 +1000,10 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -3655,10 +3655,10 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "2",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
@@ -4623,10 +4623,10 @@
               "side": "server",
               "type": "int16u",
               "included": 1,
-              "storageOption": "RAM",
+              "storageOption": "External",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "3",
+              "defaultValue": null,
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

samples/matter/common/src/dfu/ota/ota_util.cpp

@@ -8,6 +8,7 @@
 
 #if CONFIG_CHIP_OTA_REQUESTOR
 #include <app/clusters/ota-requestor/BDXDownloader.h>
+#include <app/clusters/ota-requestor/CodegenIntegration.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestor.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorDriver.h>
 #include <app/clusters/ota-requestor/DefaultOTARequestorStorage.h>
@@ -54,7 +55,9 @@ void InitBasicOTARequestor()
 	imageProcessor.SetOTADownloader(&sBDXDownloader);
 	sBDXDownloader.SetImageProcessorDelegate(&imageProcessor);
 	sOTARequestorStorage.Init(Server::GetInstance().GetPersistentStorage());
-	sOTARequestor.Init(Server::GetInstance(), sOTARequestorStorage, sOTARequestorDriver, sBDXDownloader);
+	TEMPORARY_RETURN_IGNORED sOTARequestor.Init(Server::GetInstance(), sOTARequestorStorage, sOTARequestorDriver,
+						    sBDXDownloader, GetOTARequestorAttributes(),
+						    GetDefaultOTARequestorEventGenerator());
 	chip::SetRequestorInstance(&sOTARequestor);
 	sOTARequestorDriver.Init(&sOTARequestor, &imageProcessor);
 }