From 708e80b2530e01b013950af2f7bcd0ab314ee992 Mon Sep 17 00:00:00 2001
From: Satya Naag Bollimpalli <sabollim@silabs.com>
Date: Tue, 8 Jul 2025 17:55:57 +0530
Subject: [PATCH 1/5] Securestate event changes

---
 .../closure-control-cluster-logic.cpp         | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

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
index 5a77e10b6e3ec0..273f2f3a5862c2 100644
--- 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,27 @@ 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());
+                    }
+                }
+            }
         }
     }
 

From b02b49559aeaaa6176cc065b9bac64aef5245999 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Tue, 8 Jul 2025 14:12:13 +0000
Subject: [PATCH 2/5] Restyled by whitespace

---
 .../closure-control-server/closure-control-cluster-logic.cpp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 273f2f3a5862c2..cfe279b3798c5a 100644
--- 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,7 +272,7 @@ 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

From 903165a4841a9c706e76578681ba8b55ed81a4ef Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Tue, 8 Jul 2025 14:12:17 +0000
Subject: [PATCH 3/5] Restyled by clang-format

---
 .../closure-control-cluster-logic.cpp                  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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
index cfe279b3798c5a..8507d562d8befd 100644
--- a/src/app/clusters/closure-control-server/closure-control-cluster-logic.cpp
+++ b/src/app/clusters/closure-control-server/closure-control-cluster-logic.cpp
@@ -275,19 +275,21 @@ CHIP_ERROR ClusterLogic::SetOverallCurrentState(const DataModel::Nullable<Generi
 
             if (!incomingOverallCurrentState.secureState.Value().IsNull())
             {
-                // SecureStateChanged event SHALL be generated when the SecureState field in the OverallCurrentState attribute changes
+                // 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
+                    // 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())
+                    if (mState.mOverallCurrentState.Value().secureState.Value().Value() !=
+                        incomingOverallCurrentState.secureState.Value().Value())
                     {
                         GenerateSecureStateChangedEvent(incomingOverallCurrentState.secureState.Value().Value());
                     }

From c7ac5599bf969e7fa62726afc588ab139cd046be Mon Sep 17 00:00:00 2001
From: Satya Naag Bollimpalli <sabollim@silabs.com>
Date: Tue, 8 Jul 2025 20:15:33 +0530
Subject: [PATCH 4/5] add secure state sette

---
 .../src/ClosureControlEndpoint.cpp            | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/examples/closure-app/closure-common/src/ClosureControlEndpoint.cpp b/examples/closure-app/closure-common/src/ClosureControlEndpoint.cpp
index f060bf4ea6b2d9..14663cbc3398fd 100644
--- a/examples/closure-app/closure-common/src/ClosureControlEndpoint.cpp
+++ b/examples/closure-app/closure-common/src/ClosureControlEndpoint.cpp
@@ -273,6 +273,26 @@ 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);
 }
 

From 16fed1e494b432d9c5ea58cde0720a13949b927b Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Tue, 8 Jul 2025 14:47:58 +0000
Subject: [PATCH 5/5] Restyled by clang-format

---
 .../closure-common/src/ClosureControlEndpoint.cpp          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/examples/closure-app/closure-common/src/ClosureControlEndpoint.cpp b/examples/closure-app/closure-common/src/ClosureControlEndpoint.cpp
index 14663cbc3398fd..cbf1787a1752b1 100644
--- a/examples/closure-app/closure-common/src/ClosureControlEndpoint.cpp
+++ b/examples/closure-app/closure-common/src/ClosureControlEndpoint.cpp
@@ -279,16 +279,15 @@ void ClosureControlEndpoint::UpdateCurrentStateFromTargetState()
     if (mLogic.GetConformance().FeatureMap().Has(Feature::kPositioning))
     {
         isClosureInSecureState &= overallCurrentState.Value().position.HasValue() &&
-        !overallCurrentState.Value().position.Value().IsNull() &&
-        overallCurrentState.Value().position.Value().Value() == CurrentPositionEnum::kFullyClosed;
+            !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().latch.Value().IsNull() && overallCurrentState.Value().latch.Value().Value() == true;
     }
 
     overallCurrentState.Value().secureState.SetValue(MakeNullable(isClosureInSecureState));