Patch tests for atomic write of presets

examples/thermostat/linux/thermostat-delegate-impl.cpp

@@ -30,24 +30,6 @@ using namespace chip::app::Clusters::Thermostat::Structs;
 
 ThermostatDelegate ThermostatDelegate::sInstance;
 
-namespace {
-
-/**
- * @brief Checks if the presets are matching i.e the presetHandles are the same.
- *
- * @param[in] preset The preset to check.
- * @param[in] presetToMatch The preset to match with.
- *
- * @return true If the presets match, false otherwise. If both preset handles are null, returns false
- */
-bool PresetHandlesExistAndMatch(const PresetStructWithOwnedMembers & preset, const PresetStructWithOwnedMembers & presetToMatch)
-{
-    return !preset.GetPresetHandle().IsNull() && !presetToMatch.GetPresetHandle().IsNull() &&
-        preset.GetPresetHandle().Value().data_equal(presetToMatch.GetPresetHandle().Value());
-}
-
-} // anonymous namespace
-
 ThermostatDelegate::ThermostatDelegate()
 {
     mNumberOfPresets                   = kMaxNumberOfPresetTypes * kMaxNumberOfPresetsOfEachType;
@@ -207,30 +189,14 @@ CHIP_ERROR ThermostatDelegate::GetPendingPresetAtIndex(size_t index, PresetStruc
 
 CHIP_ERROR ThermostatDelegate::ApplyPendingPresets()
 {
-
-    // TODO: #34546 - Need to support deletion of presets that are removed from Presets.
+    mNextFreeIndexInPresetsList = 0;
     for (uint8_t indexInPendingPresets = 0; indexInPendingPresets < mNextFreeIndexInPendingPresetsList; indexInPendingPresets++)
     {
         const PresetStructWithOwnedMembers & pendingPreset = mPendingPresets[indexInPendingPresets];
+        mPresets[mNextFreeIndexInPresetsList]              = pendingPreset;
+        mNextFreeIndexInPresetsList++;
+                    ChipLogError(Zcl, "applied pending preset again");
 
-        bool found = false;
-        for (uint8_t indexInPresets = 0; indexInPresets < mNextFreeIndexInPresetsList; indexInPresets++)
-        {
-            if (PresetHandlesExistAndMatch(mPresets[indexInPresets], pendingPreset))
-            {
-                found = true;
-
-                // Replace the  preset with the pending preset
-                mPresets[indexInPresets] = pendingPreset;
-            }
-        }
-
-        // If pending preset was not found in the Presets list, append to the Presets list.
-        if (!found)
-        {
-            mPresets[mNextFreeIndexInPresetsList] = pendingPreset;
-            mNextFreeIndexInPresetsList++;
-        }
     }
     return CHIP_NO_ERROR;
 }

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

@@ -860,6 +860,7 @@ CHIP_ERROR ThermostatAttrAccess::Write(const ConcreteDataAttributePath & aPath,
         // and add to the pending presets list.
         if (!aPath.IsListOperation() || aPath.mListOp == ConcreteDataAttributePath::ListOperation::ReplaceAll)
         {
+            ChipLogError(Zcl, "Replace all!");
             // Clear the pending presets list
             delegate->ClearPendingPresetList();
 
@@ -886,6 +887,7 @@ CHIP_ERROR ThermostatAttrAccess::Write(const ConcreteDataAttributePath & aPath,
         // If the list operation is AppendItem, call the delegate to append the item to the list of pending presets.
         if (aPath.mListOp == ConcreteDataAttributePath::ListOperation::AppendItem)
         {
+            ChipLogError(Zcl, "Appending again!");
             PresetStruct::Type preset;
             ReturnErrorOnFailure(aDecoder.Decode(preset));
             if (IsValidPresetEntry(preset))
@@ -1571,12 +1573,14 @@ imcode commitPresets(Delegate * delegate, EndpointId endpoint)
     {
         return imcode::InvalidInState;
     }
+            ChipLogError(Zcl, "committed presets");
     return imcode::Success;
 }
 
 void handleAtomicCommit(CommandHandler * commandObj, const ConcreteCommandPath & commandPath,
                         const Commands::AtomicRequest::DecodableType & commandData)
 {
+            ChipLogError(Zcl, "handleAtomicCommit");
     if (!validAtomicAttributes(commandData, true))
     {
         commandObj->AddStatus(commandPath, imcode::InvalidCommand);
@@ -1711,13 +1715,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) == imcode::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)
                             {

src/app/tests/suites/certification/ci-pics-values

@@ -2000,8 +2000,6 @@ TSTAT.S.C03.Rsp=0
 TSTAT.S.C04.Rsp=0
 TSTAT.S.C06.Rsp=1
 TSTAT.S.C07.Rsp=1
-TSTAT.S.C08.Rsp=1
-TSTAT.S.C09.Rsp=1
 
 # Client
 TSTAT.C=0
@@ -2018,12 +2016,10 @@ TSTAT.S.C00.Tx=0
 TSTAT.S.C01.Tx=0
 TSTAT.C.C06.Tx=1
 TSTAT.C.C07.Tx=1
-TSTAT.C.C08.Tx=1
-TSTAT.C.C09.Tx=1
 
 # Client Commands
 TSTAT.C.C00.Tx=1
-TSTAT.C.C04.Tx=0
+TSTAT.C.C04.Tx=1
 
 # Access Control cluster
 ACL.S=1

src/controller/python/chip/clusters/__init__.py

@@ -32,7 +32,7 @@
                       EcosystemInformation, ElectricalEnergyMeasurement, ElectricalMeasurement, ElectricalPowerMeasurement,
                       EnergyEvse, EnergyEvseMode, EnergyPreference, EthernetNetworkDiagnostics, FanControl, FaultInjection,
                       FixedLabel, FlowMeasurement, FormaldehydeConcentrationMeasurement, GeneralCommissioning, GeneralDiagnostics,
-                      GroupKeyManagement, Groups, HepaFilterMonitoring, IcdManagement, Identify, IlluminanceMeasurement,
+                      Globals, GroupKeyManagement, Groups, HepaFilterMonitoring, IcdManagement, Identify, IlluminanceMeasurement,
                       KeypadInput, LaundryDryerControls, LaundryWasherControls, LaundryWasherMode, LevelControl,
                       LocalizationConfiguration, LowPower, MediaInput, MediaPlayback, MicrowaveOvenControl, MicrowaveOvenMode,
                       ModeSelect, NetworkCommissioning, NitrogenDioxideConcentrationMeasurement, OccupancySensing, OnOff,
@@ -56,7 +56,7 @@
            ContentControl, ContentLauncher, DemandResponseLoadControl, Descriptor, DeviceEnergyManagementMode, DeviceEnergyManagement, DeviceEnergyManagementMode, DiagnosticLogs, DishwasherAlarm, DishwasherMode,
            DoorLock, EcosystemInformation, ElectricalEnergyMeasurement, ElectricalMeasurement, ElectricalPowerMeasurement, EnergyEvse, EnergyEvseMode, EnergyPreference,
            EthernetNetworkDiagnostics, FanControl, FaultInjection, FixedLabel, FlowMeasurement,
-           FormaldehydeConcentrationMeasurement, GeneralCommissioning, GeneralDiagnostics, GroupKeyManagement, Groups,
+           FormaldehydeConcentrationMeasurement, GeneralCommissioning, GeneralDiagnostics, Globals, GroupKeyManagement, Groups,
            HepaFilterMonitoring, IcdManagement, Identify, IlluminanceMeasurement, KeypadInput, LaundryDryerControls,
            LaundryWasherControls, LaundryWasherMode, LevelControl, LocalizationConfiguration, LowPower, MediaInput, MediaPlayback, MicrowaveOvenControl,
            MicrowaveOvenMode, ModeSelect, NetworkCommissioning, NitrogenDioxideConcentrationMeasurement,