Merge branch 'master' into add_presets_to_Sdk

Author: hasty

src/app/clusters/level-control/level-control.cpp

@@ -369,7 +369,7 @@ static void reallyUpdateCoupledColorTemp(EndpointId endpoint)
 /*
  * @brief
  * This function is used to update the current level attribute
- * while respecting it's defined quiet reporting quality:
+ * while respecting its defined quiet reporting quality:
  * The attribute will be reported:
  * - At most once per second, or
  * - At the start of the movement/transition, or
@@ -386,8 +386,7 @@ static Status SetCurrentLevelQuietReport(EndpointId endpoint, EmberAfLevelContro
                                          DataModel::Nullable<uint8_t> newValue, bool isStartOrEndOfTransition)
 {
     AttributeDirtyState dirtyState;
-    MarkAttributeDirty markDirty = MarkAttributeDirty::kNo;
-    auto now                     = System::SystemClock().GetMonotonicTimestamp();
+    auto now = System::SystemClock().GetMonotonicTimestamp();
 
     if (isStartOrEndOfTransition)
     {
@@ -406,9 +405,10 @@ static Status SetCurrentLevelQuietReport(EndpointId endpoint, EmberAfLevelContro
         dirtyState     = state->quietCurrentLevel.SetValue(newValue, now, predicate);
     }
 
+    MarkAttributeDirty markDirty = MarkAttributeDirty::kNo;
     if (dirtyState == AttributeDirtyState::kMustReport)
     {
-        markDirty = MarkAttributeDirty::kIfChanged;
+        markDirty = MarkAttributeDirty::kYes;
     }
     return Attributes::CurrentLevel::Set(endpoint, state->quietCurrentLevel.value(), markDirty);
 }
@@ -542,7 +542,7 @@ static void writeRemainingTime(EndpointId endpoint, uint16_t remainingTimeMs)
         // - kMarkDirtyOnIncrement : When the value increases.
         if (state->quietRemainingTime.SetValue(remainingTimeDs, now) == AttributeDirtyState::kMustReport)
         {
-            markDirty = MarkAttributeDirty::kIfChanged;
+            markDirty = MarkAttributeDirty::kYes;
         }
 
         Attributes::RemainingTime::Set(endpoint, state->quietRemainingTime.value().ValueOr(0), markDirty);

src/app/util/af-types.h

@@ -307,6 +307,11 @@ enum class MarkAttributeDirty
 {
     kIfChanged,
     kNo,
+    // kYes might need to be used if the attribute value was previously changed
+    // without reporting, and now is being set in a situation where we know
+    // reporting needs to be triggered (e.g. because QuieterReportingAttribute
+    // indicated that).
+    kYes,
 };
 
 } // namespace app

src/app/util/attribute-table.cpp

@@ -408,7 +408,12 @@ Status emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, AttributeId at
 
     if (!valueChanging)
     {
-        // Just do nothing.
+        // Just do nothing, except triggering reporting if forced.
+        if (markDirty == MarkAttributeDirty::kYes)
+        {
+            MatterReportingAttributeChangeCallback(endpoint, cluster, attributeID);
+        }
+
         return Status::Success;
     }