Update switch cluster attributes before triggering the related event (#…

…20893) (#20997) Co-authored-by: Yufeng Wang <[email protected]>
project-chip · Jul 20, 2022 · 4da09e0 · 4da09e0
1 parent d506fa5
commit 4da09e0
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp b/examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp
@@ -29,6 +29,7 @@
 
 using namespace chip;
 using namespace chip::app;
+using namespace chip::app::Clusters;
 using namespace chip::DeviceLayer;
 
 void AllClustersCommandDelegate::OnEventCommandReceived(const char * command)
@@ -228,30 +229,44 @@ void AllClustersCommandDelegate::OnSwitchEventHandler(uint32_t eventId)
 
     if (eventId == Clusters::Switch::Events::SwitchLatched::Id)
     {
+        EmberAfStatus status = Switch::Attributes::CurrentPosition::Set(endpoint, newPosition);
+        VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status, ChipLogError(NotSpecified, "Failed to set CurrentPosition attribute"));
         Clusters::SwitchServer::Instance().OnSwitchLatch(endpoint, newPosition);
     }
     else if (eventId == Clusters::Switch::Events::InitialPress::Id)
     {
+        EmberAfStatus status = Switch::Attributes::CurrentPosition::Set(endpoint, newPosition);
+        VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status, ChipLogError(NotSpecified, "Failed to set CurrentPosition attribute"));
         Clusters::SwitchServer::Instance().OnInitialPress(endpoint, newPosition);
     }
     else if (eventId == Clusters::Switch::Events::LongPress::Id)
     {
+        EmberAfStatus status = Switch::Attributes::CurrentPosition::Set(endpoint, newPosition);
+        VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status, ChipLogError(NotSpecified, "Failed to set CurrentPosition attribute"));
         Clusters::SwitchServer::Instance().OnLongPress(endpoint, newPosition);
     }
     else if (eventId == Clusters::Switch::Events::ShortRelease::Id)
     {
+        EmberAfStatus status = Switch::Attributes::CurrentPosition::Set(endpoint, 0);
+        VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status, ChipLogError(NotSpecified, "Failed to reset CurrentPosition attribute"));
         Clusters::SwitchServer::Instance().OnShortRelease(endpoint, previousPosition);
     }
     else if (eventId == Clusters::Switch::Events::LongRelease::Id)
     {
+        EmberAfStatus status = Switch::Attributes::CurrentPosition::Set(endpoint, 0);
+        VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status, ChipLogError(NotSpecified, "Failed to reset CurrentPosition attribute"));
         Clusters::SwitchServer::Instance().OnLongRelease(endpoint, previousPosition);
     }
     else if (eventId == Clusters::Switch::Events::MultiPressOngoing::Id)
     {
+        EmberAfStatus status = Switch::Attributes::CurrentPosition::Set(endpoint, newPosition);
+        VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status, ChipLogError(NotSpecified, "Failed to set CurrentPosition attribute"));
         Clusters::SwitchServer::Instance().OnMultiPressOngoing(endpoint, newPosition, count);
     }
     else if (eventId == Clusters::Switch::Events::MultiPressComplete::Id)
     {
+        EmberAfStatus status = Switch::Attributes::CurrentPosition::Set(endpoint, newPosition);
+        VerifyOrReturn(EMBER_ZCL_STATUS_SUCCESS == status, ChipLogError(NotSpecified, "Failed to set CurrentPosition attribute"));
         Clusters::SwitchServer::Instance().OnMultiPressComplete(endpoint, newPosition, count);
     }
     else