Add MatterReportingAttributeChangeCallback calls for updated attributes

Author: hasty

examples/thermostat/thermostat-common/src/atomic-write-manager.cpp

@@ -18,6 +18,7 @@
 
 #include <atomic-write-manager.h>
 
+#include <app/reporting/reporting.h>
 #include <platform/internal/CHIPDeviceLayerInternal.h>
 
 using namespace chip;
@@ -436,31 +437,38 @@ bool ThermostatAtomicWriteManager::CommitWrite(chip::app::CommandHandler * comma
         };
     }
 
-    status = Status::Success;
+    bool commitSuccessful = true;
     for (auto & attributeStatus : attributeStatuses)
     {
         auto statusCode = mDelegate->OnPreCommitWrite(endpoint, attributeStatus.attributeID);
         if (statusCode != Status::Success)
         {
-            status = Status::Failure;
+            commitSuccessful = false;
         }
 
         attributeStatus.statusCode = to_underlying(statusCode);
     }
 
-    if (status == Status::Success)
+    if (commitSuccessful)
     {
         for (auto & attributeStatus : attributeStatuses)
         {
             auto statusCode = mDelegate->OnCommitWrite(endpoint, attributeStatus.attributeID);
             if (statusCode != Status::Success)
             {
-                status = Status::Failure;
+                commitSuccessful = false;
             }
             attributeStatus.statusCode = to_underlying(statusCode);
         }
     }
-    if (status == Status::Failure)
+    if (commitSuccessful) // All attributes were successfully written
+    {
+        for (auto & attributeStatus : attributeStatuses)
+        {
+            MatterReportingAttributeChangeCallback(endpoint, Clusters::Thermostat::Id, attributeStatus.attributeID);
+        }
+    }
+    else
     {
         // Either one of the calls to OnPreCommitWrite failed, or one of the calls to OnCommitWrite failed; in the former case,
         // discard any pending writes. Do the same for the latter, knowing that the server may be in an inconsistent state
@@ -470,7 +478,7 @@ bool ThermostatAtomicWriteManager::CommitWrite(chip::app::CommandHandler * comma
         }
     }
     Commands::AtomicResponse::Type response;
-    response.statusCode = to_underlying(status);
+    response.statusCode = to_underlying(commitSuccessful ? Status::Success : Status::Failure);
     response.attributeStatus =
         DataModel::List<const AtomicAttributeStatusStruct::Type>(attributeStatuses.data(), attributeStatuses.size());
     commandObj->AddResponse(commandPath, response);

src/app/clusters/thermostat-server/thermostat-server-presets.cpp

@@ -18,6 +18,8 @@
 #include "thermostat-server-setpoints.h"
 #include "thermostat-server.h"
 
+#include <app/reporting/reporting.h>
+
 using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters;
@@ -537,6 +539,9 @@ Status ThermostatAttrAccess::SetActivePreset(EndpointId endpoint, ByteSpan newPr
         ChipLogError(Zcl, "Failed to set ActivePresetHandle with error %" CHIP_ERROR_FORMAT, err.Format());
         return StatusIB(err).mStatus;
     }
+
+    MatterReportingAttributeChangeCallback(endpoint, Clusters::Thermostat::Id, ActivePresetHandle::Id);
+
     return Status::Success;
 }
 

src/app/clusters/thermostat-server/thermostat-server.cpp

@@ -683,47 +683,6 @@ bool emberAfThermostatClusterSetActiveScheduleRequestCallback(
     return false;
 }
 
-bool validAtomicAttributes(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
-                           const Commands::AtomicRequest::DecodableType & commandData, bool requireBoth)
-{
-    auto attributeIdsIter = commandData.attributeRequests.begin();
-    bool requestedPresets = false, requestedSchedules = false;
-    while (attributeIdsIter.Next())
-    {
-        auto & attributeId = attributeIdsIter.GetValue();
-
-        switch (attributeId)
-        {
-        case Presets::Id:
-            if (requestedPresets) // Double-requesting an attribute is invalid
-            {
-                return false;
-            }
-            requestedPresets = true;
-            break;
-        case Schedules::Id:
-            if (requestedSchedules) // Double-requesting an attribute is invalid
-            {
-                return false;
-            }
-            requestedSchedules = true;
-            break;
-        default:
-            return false;
-        }
-    }
-    if (attributeIdsIter.GetStatus() != CHIP_NO_ERROR)
-    {
-        return false;
-    }
-    if (requireBoth)
-    {
-        return (requestedPresets && requestedSchedules);
-    }
-    // If the atomic request doesn't contain at least one of these attributes, it's invalid
-    return (requestedPresets || requestedSchedules);
-}
-
 bool emberAfThermostatClusterSetActivePresetRequestCallback(
     CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
     const Clusters::Thermostat::Commands::SetActivePresetRequest::DecodableType & commandData)
@@ -808,13 +767,13 @@ bool emberAfThermostatClusterSetpointRaiseLowerCallback(app::CommandHandler * co
             {
                 DesiredCoolingSetpoint = static_cast<int16_t>(CoolingSetpoint + amount * 10);
                 CoolLimit              = static_cast<int16_t>(DesiredCoolingSetpoint -
-                                                              EnforceCoolingSetpointLimits(DesiredCoolingSetpoint, aEndpointId));
+                                                 EnforceCoolingSetpointLimits(DesiredCoolingSetpoint, aEndpointId));
                 {
                     if (OccupiedHeatingSetpoint::Get(aEndpointId, &HeatingSetpoint) == Status::Success)
                     {
                         DesiredHeatingSetpoint = static_cast<int16_t>(HeatingSetpoint + amount * 10);
                         HeatLimit              = static_cast<int16_t>(DesiredHeatingSetpoint -
-                                                                      EnforceHeatingSetpointLimits(DesiredHeatingSetpoint, aEndpointId));
+                                                         EnforceHeatingSetpointLimits(DesiredHeatingSetpoint, aEndpointId));
                         {
                             if (CoolLimit != 0 || HeatLimit != 0)
                             {