project-chip · mergify · Jul 9, 2025 · Jul 8, 2025 · Jul 8, 2025 · Jul 8, 2025
diff --git a/examples/closure-app/closure-common/src/ClosureControlEndpoint.cpp b/examples/closure-app/closure-common/src/ClosureControlEndpoint.cpp
@@ -273,6 +273,25 @@ void ClosureControlEndpoint::UpdateCurrentStateFromTargetState()
         overallCurrentState.Value().speed.SetValue(overallTargetState.Value().speed.Value());
     }
 
+    bool isClosureInSecureState = true;
+
+    // First, check if the closure is fully closed and has positioning feature.
+    if (mLogic.GetConformance().FeatureMap().Has(Feature::kPositioning))
+    {
+        isClosureInSecureState &= overallCurrentState.Value().position.HasValue() &&
+            !overallCurrentState.Value().position.Value().IsNull() &&
+            overallCurrentState.Value().position.Value().Value() == CurrentPositionEnum::kFullyClosed;
+    }
+
+    // Next, check if motion latching is enabled and latch is true.
+    if (mLogic.GetConformance().FeatureMap().Has(Feature::kMotionLatching))
+    {
+        isClosureInSecureState &= overallCurrentState.Value().latch.HasValue() &&
+            !overallCurrentState.Value().latch.Value().IsNull() && overallCurrentState.Value().latch.Value().Value() == true;
+    }
+
+    overallCurrentState.Value().secureState.SetValue(MakeNullable(isClosureInSecureState));
+
     mLogic.SetOverallCurrentState(overallCurrentState);
 }
 

diff --git a/src/app/clusters/closure-control-server/closure-control-cluster-logic.cpp b/src/app/clusters/closure-control-server/closure-control-cluster-logic.cpp
@@ -272,6 +272,29 @@ CHIP_ERROR ClusterLogic::SetOverallCurrentState(const DataModel::Nullable<Generi
             // supported by the closure. If the Speed feature is not supported, return an error.
             VerifyOrReturnError(mConformance.HasFeature(Feature::kPositioning) || mConformance.HasFeature(Feature::kMotionLatching),
                                 CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE);
+
+            if (!incomingOverallCurrentState.secureState.Value().IsNull())
+            {
+                // SecureStateChanged event SHALL be generated when the SecureState field in the OverallCurrentState attribute
+                // changes
+                if (mState.mOverallCurrentState.IsNull() || !mState.mOverallCurrentState.Value().secureState.HasValue() ||
+                    mState.mOverallCurrentState.Value().secureState.Value().IsNull())
+                {
+                    // As secureState field is not set in present current state and incoming current state has value, we generate
+                    // the event
+                    GenerateSecureStateChangedEvent(incomingOverallCurrentState.secureState.Value().Value());
+                }
+                else
+                {
+                    // If the secureState field is set in both present and incoming current state, we generate the event only if the
+                    // value has changed.
+                    if (mState.mOverallCurrentState.Value().secureState.Value().Value() !=
+                        incomingOverallCurrentState.secureState.Value().Value())
+                    {
+                        GenerateSecureStateChangedEvent(incomingOverallCurrentState.secureState.Value().Value());
+                    }
+                }
+            }
         }
     }