Handling OverallState and OverallTarget from Instance

Author: satyanaag-silabs

src/app/clusters/closure-control-server/closure-control-server.cpp

@@ -91,7 +91,28 @@ CHIP_ERROR Instance::SetMainState(const MainStateEnum & aMainState)
     if (mMainState != oldMainState)
     {
         MatterReportingAttributeChangeCallback(mDelegate.GetEndpointId(), mClusterId, Attributes::MainState::Id);
-        UpdateCountdownTimeFromClusterLogic();
+    }
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR Instance::SetOverallState(const DataModel::Nullable<Structs::OverallStateStruct::Type> & aOverallState)
+{
+    DataModel::Nullable<Structs::OverallStateStruct::Type> oldOverallState = mOverallState;
+    mOverallState                         = aOverallState;
+    if (mOverallState != oldOverallState)
+    {
+        MatterReportingAttributeChangeCallback(mDelegate.GetEndpointId(), mClusterId, Attributes::OverallState::Id);
+    }
+    return CHIP_NO_ERROR;
+}
+
+CHIP_ERROR Instance::SetOverallTarget(const DataModel::Nullable<Structs::OverallTargetStruct::Type> & aOverallTarget)
+{
+    DataModel::Nullable<Structs::OverallTargetStruct::Type> oldOverallTarget = mOverallTarget;
+    mOverallTarget                         = aOverallTarget;
+    if (mOverallTarget != oldOverallTarget)
+    {
+        MatterReportingAttributeChangeCallback(mDelegate.GetEndpointId(), mClusterId, Attributes::OverallTarget::Id);
     }
     return CHIP_NO_ERROR;
 }
@@ -101,6 +122,16 @@ MainStateEnum Instance::GetMainState() const
     return mMainState;
 }
 
+DataModel::Nullable<Structs::OverallStateStruct::Type> Instance::GetOverallState() const
+{
+    return mOverallState;
+}
+
+DataModel::Nullable<Structs::OverallTargetStruct::Type> Instance::GetOverallTarget() const
+{
+    return mOverallTarget;
+}
+
 void Instance::UpdateCountdownTime(bool fromDelegate)
 {
     app::DataModel::Nullable<uint32_t> newCountdownTime = mDelegate.GetCountdownTime();
@@ -110,20 +141,11 @@ void Instance::UpdateCountdownTime(bool fromDelegate)
 
     if (fromDelegate)
     {
-        // Updates from delegate are reduce-reported to every 10s max (choice of this implementation), in addition
+        // Updates from delegate are reduce-reported to every 1s max (choice of this implementation), in addition
         // to default change-from-null, change-from-zero and increment policy.
-        auto predicate = [](const decltype(mCountdownTime)::SufficientChangePredicateCandidate & candidate) -> bool {
-            if (candidate.lastDirtyValue.IsNull() || candidate.newValue.IsNull())
-            {
-                return false;
-            }
-
-            uint32_t lastDirtyValue           = candidate.lastDirtyValue.Value();
-            uint32_t newValue                 = candidate.newValue.Value();
-            uint32_t kNumSecondsDeltaToReport = 10;
-            return (newValue < lastDirtyValue) && ((lastDirtyValue - newValue) > kNumSecondsDeltaToReport);
-        };
-        markDirty = (mCountdownTime.SetValue(newCountdownTime, now, predicate) == AttributeDirtyState::kMustReport);
+        System::Clock::Milliseconds64 reportInterval = System::Clock::Milliseconds64(1000);
+        auto predicate                               = mCountdownTime.GetPredicateForSufficientTimeSinceLastDirty(reportInterval);
+        markDirty                                    = (mCountdownTime.SetValue(newCountdownTime, now, predicate) == AttributeDirtyState::kMustReport);
     }
     else
     {
@@ -155,9 +177,9 @@ CHIP_ERROR Instance::Read(const ConcreteReadAttributePath & aPath, AttributeValu
     case CurrentErrorList::Id:
         return aEncoder.EncodeList([this](const auto & encoder) -> CHIP_ERROR { return this->EncodeCurrentErrorList(encoder); });
     case OverallState::Id:
-        return aEncoder.Encode(mDelegate.GetOverallState());
+        return aEncoder.Encode(GetOverallState());
     case OverallTarget::Id:
-        return aEncoder.Encode(mDelegate.GetOverallTarget());
+        return aEncoder.Encode(GetOverallTarget());
     case RestingProcedure::Id:
         if (HasFeature(Feature::kFallback))
         {

src/app/clusters/closure-control-server/closure-control-server.h

@@ -61,8 +61,6 @@ class Delegate
     // ------------------------------------------------------------------
     // Get attribute methods
     virtual DataModel::Nullable<uint32_t> GetCountdownTime()                           = 0;
-    virtual DataModel::Nullable<Structs::OverallStateStruct::Type> GetOverallState()   = 0;
-    virtual DataModel::Nullable<Structs::OverallTargetStruct::Type> GetOverallTarget() = 0;
     virtual RestingProcedureEnum GetRestingProcedure()                                 = 0;
     virtual TriggerConditionEnum GetTriggerCondition()                                 = 0;
     virtual TriggerPositionEnum GetTriggerPosition()                                   = 0;
@@ -114,13 +112,39 @@ class Instance : public AttributeAccessInterface, public CommandHandlerInterface
      */
     CHIP_ERROR SetMainState(const MainStateEnum & aMainState);
 
+    /**
+     * Set OverallState.
+     * @param aMainState The OverallState that should now be the current State.
+     * @return CHIP_NO_ERROR if set was successful.
+     */
+    CHIP_ERROR SetOverallState(const DataModel::Nullable<Structs::OverallStateStruct::Type> & aOverallState);
+
+    /**
+     * Set OverallTarget.
+     * @param aMainState The OverallTarget that should be set.
+     * @return CHIP_NO_ERROR if set was successful.
+     */
+    CHIP_ERROR SetOverallTarget(const DataModel::Nullable<Structs::OverallTargetStruct::Type> & aOverallTarget);
+
     // Attribute getters
     /**
      * Get Main State.
      * @return The Main State.
      */
     MainStateEnum GetMainState() const;
 
+    /**
+     * Get OverallState.
+     * @return The OverallState.
+     */
+    DataModel::Nullable<Structs::OverallStateStruct::Type> GetOverallState() const;
+
+    /**
+     * Get OverallTarget.
+     * @return The OverallTarget.
+     */
+    DataModel::Nullable<Structs::OverallTargetStruct::Type> GetOverallTarget() const;
+
     /**
      * @brief Whenever application delegate wants to possibly report a new updated time,
      *        call this method. The `GetCountdownTime()` method will be called on the delegate.
@@ -149,11 +173,13 @@ class Instance : public AttributeAccessInterface, public CommandHandlerInterface
 private:
     Delegate & mDelegate;
     const ClusterId mClusterId;
-    
     BitMask<Feature> mFeature;
     BitMask<OptionalAttributes> mOptionalAttrs;
-    MainStateEnum mMainState;
+
     app::QuieterReportingAttribute<uint32_t> mCountdownTime{ DataModel::NullNullable };
+    MainStateEnum mMainState;
+    DataModel::Nullable<Structs::OverallStateStruct::Type> & mOverallState;
+    DataModel::Nullable<Structs::OverallTargetStruct::Type> & mOverallTarget;
 
     // AttributeAccessInterface
     CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;