samples: matter: light_bulb: Initialize PWM device after Server is started

Matter Server has to be started before reading attributes from
persistent storage. PWM device initization depends on values of some
attributes.

Signed-off-by: Adrian Gielniewski <[email protected]>

Author: adigie

samples/matter/light_bulb/src/app_task.cpp

@@ -264,6 +264,29 @@ void AppTask::UpdateClusterState()
 	});
 }
 
+void AppTask::InitPWMDDevice()
+{
+#if defined(CONFIG_PWM)
+	/* Initialize lighting device (PWM) */
+	uint8_t minLightLevel = kDefaultMinLevel;
+	Clusters::LevelControl::Attributes::MinLevel::Get(kLightEndpointId, &minLightLevel);
+
+	uint8_t maxLightLevel = kDefaultMaxLevel;
+	Clusters::LevelControl::Attributes::MaxLevel::Get(kLightEndpointId, &maxLightLevel);
+
+	Clusters::LevelControl::Attributes::CurrentLevel::TypeInfo::Type currentLevel;
+	Clusters::LevelControl::Attributes::CurrentLevel::Get(kLightEndpointId, currentLevel);
+
+	int ret =
+		mPWMDevice.Init(&sLightPwmDevice, minLightLevel, maxLightLevel, currentLevel.ValueOr(kDefaultMaxLevel));
+	if (ret != 0) {
+		LOG_ERR("Failed to initialize PWD device.");
+	}
+
+	mPWMDevice.SetCallbacks(ActionInitiated, ActionCompleted);
+#endif
+}
+
 CHIP_ERROR AppTask::Init()
 {
 	/* Initialize Matter stack */
@@ -292,22 +315,6 @@ CHIP_ERROR AppTask::Init()
 	/* Initialize trigger effect timer */
 	k_timer_init(&sTriggerEffectTimer, &AppTask::TriggerEffectTimerTimeoutCallback, nullptr);
 
-	/* Initialize lighting device (PWM) */
-	uint8_t minLightLevel = kDefaultMinLevel;
-	Clusters::LevelControl::Attributes::MinLevel::Get(kLightEndpointId, &minLightLevel);
-
-	uint8_t maxLightLevel = kDefaultMaxLevel;
-	Clusters::LevelControl::Attributes::MaxLevel::Get(kLightEndpointId, &maxLightLevel);
-
-#if defined(CONFIG_PWM)
-	int ret = mPWMDevice.Init(&sLightPwmDevice, minLightLevel, maxLightLevel, maxLightLevel);
-	if (ret != 0) {
-		return chip::System::MapErrorZephyr(ret);
-	}
-
-	mPWMDevice.SetCallbacks(ActionInitiated, ActionCompleted);
-#endif
-
 	return Nrf::Matter::StartServer();
 }
 

samples/matter/light_bulb/src/app_task.h

@@ -32,6 +32,7 @@ class AppTask {
 	CHIP_ERROR StartApp();
 
 	void UpdateClusterState();
+	void InitPWMDDevice();
 	Nrf::PWMDevice &GetPWMDevice() { return mPWMDevice; }
 
 	static void IdentifyStartHandler(Identify *);

samples/matter/light_bulb/src/zcl_callbacks.cpp

@@ -84,6 +84,8 @@ void emberAfOnOffClusterInitCallback(EndpointId endpoint)
 	if (status == Protocols::InteractionModel::Status::Success) {
 		/* Set actual state to the cluster state that was last persisted */
 #if defined(CONFIG_PWM)
+		AppTask::Instance().InitPWMDDevice();
+
 		AppTask::Instance().GetPWMDevice().InitiateAction(
 			storedValue ? Nrf::PWMDevice::ON_ACTION : Nrf::PWMDevice::OFF_ACTION,
 			static_cast<int32_t>(LightingActor::Remote), reinterpret_cast<uint8_t *>(&storedValue));

west.yml

@@ -158,7 +158,7 @@ manifest:
     - name: matter
       repo-path: sdk-connectedhomeip
       path: modules/lib/matter
-      revision: pull/512/head
+      revision: 9cfd6e13a239a61288f34b1219e1b41dc70f8457
       west-commands: scripts/west/west-commands.yml
       submodules:
         - name: nlio