[K32W] Sync button push with cluster state (#8761)

* [K32W] Sync button push with cluster state If buttons are used for locking/unlocking the elock or for turn off/down of the lighting then this change needs to be propagated to the cluster state. Signed-off-by: Doru Gucea <[email protected]> * [K32W] Sync button push with cluster state If buttons are used for locking/unlocking the elock or for turn off/down of the lighting then this change needs to be propagated to the cluster state. Signed-off-by: Doru Gucea <[email protected]> * Restyled by clang-format Co-authored-by: Restyled.io <[email protected]>
project-chip · Aug 11, 2021 · 4155043 · 4155043
1 parent afc731a
commit 4155043
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/examples/lighting-app/k32w/main/AppTask.cpp b/examples/lighting-app/k32w/main/AppTask.cpp
@@ -100,6 +100,7 @@ CHIP_ERROR AppTask::Init()
 
     sLightLED.Init(LIGHT_STATE_LED);
     sLightLED.Set(LightingMgr().IsTurnedOff());
+    UpdateClusterState();
 
     /* intialize the Keyboard and button press calback */
     KBD_Init(KBD_Callback);
@@ -565,6 +566,11 @@ void AppTask::ActionInitiated(LightingManager::Action_t aAction, int32_t aActor)
         K32W_LOG("Turn off Action has been initiated")
     }
 
+    if (aActor == AppEvent::kEventType_Button)
+    {
+        sAppTask.mSyncClusterToButtonAction = true;
+    }
+
     sAppTask.mFunction = kFunctionTurnOnTurnOff;
 }
 
@@ -583,6 +589,12 @@ void AppTask::ActionCompleted(LightingManager::Action_t aAction)
         sLightLED.Set(false);
     }
 
+    if (sAppTask.mSyncClusterToButtonAction)
+    {
+        sAppTask.UpdateClusterState();
+        sAppTask.mSyncClusterToButtonAction = false;
+    }
+
     sAppTask.mFunction = kFunction_NoneSelected;
 }
 

diff --git a/examples/lighting-app/k32w/main/include/AppTask.h b/examples/lighting-app/k32w/main/include/AppTask.h
@@ -87,8 +87,9 @@ class AppTask
         kFunction_Invalid
     } Function;
 
-    Function_t mFunction;
-    bool mResetTimerActive;
+    Function_t mFunction            = kFunction_NoneSelected;
+    bool mResetTimerActive          = false;
+    bool mSyncClusterToButtonAction = false;
 
     static AppTask sAppTask;
 };

diff --git a/examples/lock-app/k32w/main/AppTask.cpp b/examples/lock-app/k32w/main/AppTask.cpp
@@ -97,6 +97,7 @@ CHIP_ERROR AppTask::Init()
 
     sLockLED.Init(LOCK_STATE_LED);
     sLockLED.Set(!BoltLockMgr().IsUnlocked());
+    UpdateClusterState();
 
     /* intialize the Keyboard and button press calback */
     KBD_Init(KBD_Callback);
@@ -570,6 +571,11 @@ void AppTask::ActionInitiated(BoltLockManager::Action_t aAction, int32_t aActor)
         K32W_LOG("Unlock Action has been initiated")
     }
 
+    if (aActor == AppEvent::kEventType_Button)
+    {
+        sAppTask.mSyncClusterToButtonAction = true;
+    }
+
     sAppTask.mFunction = kFunctionLockUnlock;
     sLockLED.Blink(50, 50);
 }
@@ -590,6 +596,12 @@ void AppTask::ActionCompleted(BoltLockManager::Action_t aAction)
         sLockLED.Set(false);
     }
 
+    if (sAppTask.mSyncClusterToButtonAction)
+    {
+        sAppTask.UpdateClusterState();
+        sAppTask.mSyncClusterToButtonAction = false;
+    }
+
     sAppTask.mFunction = kFunction_NoneSelected;
 }
 

diff --git a/examples/lock-app/k32w/main/include/AppTask.h b/examples/lock-app/k32w/main/include/AppTask.h
@@ -79,8 +79,9 @@ class AppTask
         kFunction_Invalid
     } Function;
 
-    Function_t mFunction;
-    bool mResetTimerActive;
+    Function_t mFunction            = kFunction_NoneSelected;
+    bool mResetTimerActive          = false;
+    bool mSyncClusterToButtonAction = false;
 
     static AppTask sAppTask;
 };