Merge branch 'master' into granbery/preset_atomic_write_fabric_index

Author: hasty

examples/rvc-app/rvc-common/rvc-app.matter

@@ -1480,11 +1480,11 @@ provisional cluster ServiceArea = 336 {
   }
 
   readonly attribute AreaStruct supportedAreas[] = 0;
-  readonly attribute nullable MapStruct supportedMaps[] = 1;
-  readonly attribute nullable int32u selectedAreas[] = 2;
+  readonly attribute MapStruct supportedMaps[] = 1;
+  readonly attribute int32u selectedAreas[] = 2;
   readonly attribute optional nullable int32u currentArea = 3;
   readonly attribute optional nullable epoch_s estimatedEndTime = 4;
-  readonly attribute optional nullable ProgressStruct progress[] = 5;
+  readonly attribute optional ProgressStruct progress[] = 5;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -1493,7 +1493,7 @@ provisional cluster ServiceArea = 336 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct SelectAreasRequest {
-    nullable int32u newAreas[] = 0;
+    int32u newAreas[] = 0;
   }
 
   response struct SelectAreasResponse = 1 {

src/app/clusters/ecosystem-information-server/ecosystem-information-server.cpp

@@ -26,6 +26,9 @@ namespace Clusters {
 namespace EcosystemInformation {
 namespace {
 
+#define ZCL_ECOSYSTEM_INFORMATION_CLUSTER_REVISION (1u)
+#define ZCL_ECOSYSTEM_INFORMATION_FEATURE_MAP (0u)
+
 constexpr size_t kDeviceNameMaxSize             = 64;
 constexpr size_t kUniqueLocationIdMaxSize       = 64;
 constexpr size_t kUniqueLocationIdsListMaxSize  = 64;
@@ -46,18 +49,7 @@ class AttrAccess : public AttributeAccessInterface
 CHIP_ERROR AttrAccess::Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
 {
     VerifyOrDie(aPath.mClusterId == Clusters::EcosystemInformation::Id);
-    switch (aPath.mAttributeId)
-    {
-    case Attributes::RemovedOn::Id:
-        return EcosystemInformationServer::Instance().EncodeRemovedOnAttribute(aPath.mEndpointId, aEncoder);
-    case Attributes::DeviceDirectory ::Id:
-        return EcosystemInformationServer::Instance().EncodeDeviceDirectoryAttribute(aPath.mEndpointId, aEncoder);
-    case Attributes::LocationDirectory ::Id:
-        return EcosystemInformationServer::Instance().EncodeLocationStructAttribute(aPath.mEndpointId, aEncoder);
-    default:
-        break;
-    }
-    return CHIP_NO_ERROR;
+    return EcosystemInformationServer::Instance().ReadAttribute(aPath, aEncoder);
 }
 
 // WARNING: caller is expected to use the returned LocationDescriptorStruct::Type immediately. Caller must
@@ -285,6 +277,30 @@ CHIP_ERROR EcosystemInformationServer::RemoveDevice(EndpointId aEndpoint, uint64
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR EcosystemInformationServer::ReadAttribute(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
+{
+    switch (aPath.mAttributeId)
+    {
+    case Attributes::RemovedOn::Id:
+        return EcosystemInformationServer::Instance().EncodeRemovedOnAttribute(aPath.mEndpointId, aEncoder);
+    case Attributes::DeviceDirectory::Id:
+        return EcosystemInformationServer::Instance().EncodeDeviceDirectoryAttribute(aPath.mEndpointId, aEncoder);
+    case Attributes::LocationDirectory::Id:
+        return EcosystemInformationServer::Instance().EncodeLocationStructAttribute(aPath.mEndpointId, aEncoder);
+    case Attributes::ClusterRevision::Id: {
+        uint16_t rev = ZCL_ECOSYSTEM_INFORMATION_CLUSTER_REVISION;
+        return aEncoder.Encode(rev);
+    }
+    case Attributes::FeatureMap::Id: {
+        uint32_t featureMap = ZCL_ECOSYSTEM_INFORMATION_FEATURE_MAP;
+        return aEncoder.Encode(featureMap);
+    }
+    default:
+        break;
+    }
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR EcosystemInformationServer::EncodeRemovedOnAttribute(EndpointId aEndpoint, AttributeValueEncoder & aEncoder)
 {
     auto it = mDevicesMap.find(aEndpoint);

src/app/clusters/ecosystem-information-server/ecosystem-information-server.h

@@ -182,9 +182,7 @@ class EcosystemInformationServer
     CHIP_ERROR RemoveDevice(EndpointId aEndpoint, uint64_t aEpochUs);
     // TODO(#33223) Add removal and update counterparts to AddDeviceInfo and AddLocationInfo.
 
-    CHIP_ERROR EncodeRemovedOnAttribute(EndpointId aEndpoint, AttributeValueEncoder & aEncoder);
-    CHIP_ERROR EncodeDeviceDirectoryAttribute(EndpointId aEndpoint, AttributeValueEncoder & aEncoder);
-    CHIP_ERROR EncodeLocationStructAttribute(EndpointId aEndpoint, AttributeValueEncoder & aEncoder);
+    CHIP_ERROR ReadAttribute(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder);
 
 private:
     struct DeviceInfo
@@ -194,6 +192,11 @@ class EcosystemInformationServer
         // Map key is using the UniqueLocationId
         std::map<std::string, std::unique_ptr<EcosystemLocationStruct>> mLocationDirectory;
     };
+
+    CHIP_ERROR EncodeRemovedOnAttribute(EndpointId aEndpoint, AttributeValueEncoder & aEncoder);
+    CHIP_ERROR EncodeDeviceDirectoryAttribute(EndpointId aEndpoint, AttributeValueEncoder & aEncoder);
+    CHIP_ERROR EncodeLocationStructAttribute(EndpointId aEndpoint, AttributeValueEncoder & aEncoder);
+
     std::map<EndpointId, DeviceInfo> mDevicesMap;
 
     static EcosystemInformationServer mInstance;

src/app/clusters/service-area-server/service-area-server.cpp

@@ -134,7 +134,7 @@ CHIP_ERROR Instance::ReadSupportedAreas(AttributeValueEncoder & aEncoder)
 {
     if (mDelegate->GetNumberOfSupportedAreas() == 0)
     {
-        return aEncoder.EncodeNull();
+        return aEncoder.EncodeEmptyList();
     }
 
     return aEncoder.EncodeList([this](const auto & encoder) -> CHIP_ERROR {
@@ -153,7 +153,7 @@ CHIP_ERROR Instance::ReadSupportedMaps(AttributeValueEncoder & aEncoder)
 {
     if (mDelegate->GetNumberOfSupportedMaps() == 0)
     {
-        return aEncoder.EncodeNull();
+        return aEncoder.EncodeEmptyList();
     }
 
     return aEncoder.EncodeList([this](const auto & encoder) -> CHIP_ERROR {
@@ -172,7 +172,7 @@ CHIP_ERROR Instance::ReadSelectedAreas(AttributeValueEncoder & aEncoder)
 {
     if (mDelegate->GetNumberOfSelectedAreas() == 0)
     {
-        return aEncoder.EncodeNull();
+        return aEncoder.EncodeEmptyList();
     }
 
     return aEncoder.EncodeList([this](const auto & encoder) -> CHIP_ERROR {
@@ -191,7 +191,7 @@ CHIP_ERROR Instance::ReadProgress(AttributeValueEncoder & aEncoder)
 {
     if (mDelegate->GetNumberOfProgressElements() == 0)
     {
-        return aEncoder.EncodeNull();
+        return aEncoder.EncodeEmptyList();
     }
 
     return aEncoder.EncodeList([this](const auto & encoder) -> CHIP_ERROR {
@@ -224,9 +224,8 @@ void Instance::HandleSelectAreasCmd(HandlerContext & ctx, const Commands::Select
 
     size_t numberOfLocations = 0;
     // Get the number of Selected Locations in the command parameter and check that it is valid.
-    if (!req.newAreas.IsNull())
     {
-        if (CHIP_NO_ERROR != req.newAreas.Value().ComputeSize(&numberOfLocations))
+        if (CHIP_NO_ERROR != req.newAreas.ComputeSize(&numberOfLocations))
         {
             ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Status::InvalidCommand);
             return;
@@ -244,14 +243,14 @@ void Instance::HandleSelectAreasCmd(HandlerContext & ctx, const Commands::Select
     // if number of selected locations in parameter matches number in attribute - the locations *might* be the same
     bool matchesCurrentSelectedAreas = (numberOfLocations == mDelegate->GetNumberOfSelectedAreas());
 
-    if (!req.newAreas.IsNull())
+    if (numberOfLocations != 0)
     {
         // do as much parameter validation as we can
         {
             uint32_t ignoredIndex = 0;
             uint32_t oldSelectedLocation;
             uint32_t i         = 0;
-            auto iLocationIter = req.newAreas.Value().begin();
+            auto iLocationIter = req.newAreas.begin();
             while (iLocationIter.Next())
             {
                 uint32_t aSelectedLocation = iLocationIter.GetValue();
@@ -266,7 +265,7 @@ void Instance::HandleSelectAreasCmd(HandlerContext & ctx, const Commands::Select
 
                 // Checking for duplicate locations.
                 uint32_t j         = 0;
-                auto jLocationIter = req.newAreas.Value().begin();
+                auto jLocationIter = req.newAreas.begin();
                 while (j < i)
                 {
                     jLocationIter
@@ -343,9 +342,9 @@ void Instance::HandleSelectAreasCmd(HandlerContext & ctx, const Commands::Select
         // and the SelectedAreas attribute SHALL be set to the value of the newAreas field.
         mDelegate->ClearSelectedAreas();
 
-        if (!req.newAreas.IsNull())
+        if (numberOfLocations != 0)
         {
-            auto locationIter = req.newAreas.Value().begin();
+            auto locationIter = req.newAreas.begin();
             uint32_t ignored;
             while (locationIter.Next())
             {

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

@@ -321,46 +321,21 @@ bool IsPresetHandlePresentInPresets(Delegate * delegate, const ByteSpan & preset
 }
 
 /**
- * @brief Returns the length of the list of presets if the pending presets were to be applied. The calculation is done by
- *        adding the number of presets in Presets attribute list to the number of pending presets in the pending
- *        presets list and subtracting the number of duplicate presets. This is called before changes are actually applied.
+ * @brief Returns the length of the list of presets if the pending presets were to be applied. The size of the pending presets list
+ *        calculated, after all the constraint checks are done, is the new size of the updated Presets attribute since the pending
+ *        preset list is expected to have all existing presets with or without edits plus new presets.
+ *        This is called before changes are actually applied.
  *
  * @param[in] delegate The delegate to use.
  *
  * @return count of the updated Presets attribute if the pending presets were applied to it. Return 0 for error cases.
  */
-uint8_t CountUpdatedPresetsAfterApplyingPendingPresets(Delegate * delegate)
+uint8_t CountNumberOfPendingPresets(Delegate * delegate)
 {
-    uint8_t numberOfPresets        = 0;
-    uint8_t numberOfMatches        = 0;
     uint8_t numberOfPendingPresets = 0;
 
     VerifyOrReturnValue(delegate != nullptr, 0);
 
-    for (uint8_t i = 0; true; i++)
-    {
-        PresetStructWithOwnedMembers preset;
-        CHIP_ERROR err = delegate->GetPresetAtIndex(i, preset);
-
-        if (err == CHIP_ERROR_PROVIDER_LIST_EXHAUSTED)
-        {
-            break;
-        }
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "GetUpdatedPresetsCount: GetPresetAtIndex failed with error %" CHIP_ERROR_FORMAT, err.Format());
-            return 0;
-        }
-        numberOfPresets++;
-
-        bool found = MatchingPendingPresetExists(delegate, preset);
-
-        if (found)
-        {
-            numberOfMatches++;
-        }
-    }
-
     for (uint8_t i = 0; true; i++)
     {
         PresetStructWithOwnedMembers pendingPreset;
@@ -372,16 +347,14 @@ uint8_t CountUpdatedPresetsAfterApplyingPendingPresets(Delegate * delegate)
         }
         if (err != CHIP_NO_ERROR)
         {
-            ChipLogError(Zcl, "GetUpdatedPresetsCount: GetPendingPresetAtIndex failed with error %" CHIP_ERROR_FORMAT,
+            ChipLogError(Zcl, "CountNumberOfPendingPresets: GetPendingPresetAtIndex failed with error %" CHIP_ERROR_FORMAT,
                          err.Format());
             return 0;
         }
         numberOfPendingPresets++;
     }
 
-    // TODO: #34546 - Need to support deletion of presets that are removed from Presets.
-    // This API needs to modify its logic for the deletion case.
-    return static_cast<uint8_t>(numberOfPresets + numberOfPendingPresets - numberOfMatches);
+    return numberOfPendingPresets;
 }
 
 /**
@@ -1545,7 +1518,7 @@ imcode commitPresets(Delegate * delegate, EndpointId endpoint)
         }
     }
 
-    uint8_t totalCount = CountUpdatedPresetsAfterApplyingPendingPresets(delegate);
+    uint8_t totalCount = CountNumberOfPendingPresets(delegate);
 
     uint8_t numberOfPresetsSupported = delegate->GetNumberOfPresets();
 

src/app/zap-templates/zcl/data-model/chip/service-area-cluster.xml

@@ -89,18 +89,18 @@ limitations under the License.
 
     <!-- Attributes -->
     <attribute side="server" code="0x0000" define="SupportedAreas"      type="array"     entryType="AreaStruct"      writable="false" isNullable="false" optional="false">SupportedAreas</attribute>
-    <attribute side="server" code="0x0001" define="SupportedMaps"       type="array"     entryType="MapStruct"       writable="false" isNullable="true"  optional="false">SupportedMaps</attribute>
-    <attribute side="server" code="0x0002" define="SelectedAreas"       type="array"     entryType="int32u"          writable="false" isNullable="true"  optional="false">SelectedAreas</attribute>
+    <attribute side="server" code="0x0001" define="SupportedMaps"       type="array"     entryType="MapStruct"       writable="false" isNullable="false" optional="false">SupportedMaps</attribute>
+    <attribute side="server" code="0x0002" define="SelectedAreas"       type="array"     entryType="int32u"          writable="false" isNullable="false" optional="false">SelectedAreas</attribute>
     <attribute side="server" code="0x0003" define="CurrentArea"         type="int32u"                                writable="false" isNullable="true"  optional="true" >CurrentArea</attribute>
     <attribute side="server" code="0x0004" define="EstimatedEndTime"    type="epoch_s"                               writable="false" isNullable="true"  optional="true" >EstimatedEndTime</attribute>
-    <attribute side="server" code="0x0005" define="Progress"            type="array"     entryType="ProgressStruct"  writable="false" isNullable="true"  optional="true" >Progress</attribute>
+    <attribute side="server" code="0x0005" define="Progress"            type="array"     entryType="ProgressStruct"  writable="false" isNullable="false" optional="true" >Progress</attribute>
 
     <!-- Commands -->
     <command source="client" code="0x00" name="SelectAreas" response="SelectAreasResponse" optional="false">
       <description>
         Command used to select a set of device areas, where the device is to operate.
       </description>
-      <arg name="NewAreas" type="int32u" array="true" isNullable="true"/>
+      <arg name="NewAreas" type="int32u" array="true"/>
     </command>
 
     <command source="server" code="0x01" name="SelectAreasResponse" disableDefaultResponse="true" optional="false">

src/controller/data_model/controller-clusters.matter

@@ -6502,11 +6502,11 @@ provisional cluster ServiceArea = 336 {
   }
 
   readonly attribute AreaStruct supportedAreas[] = 0;
-  readonly attribute nullable MapStruct supportedMaps[] = 1;
-  readonly attribute nullable int32u selectedAreas[] = 2;
+  readonly attribute MapStruct supportedMaps[] = 1;
+  readonly attribute int32u selectedAreas[] = 2;
   readonly attribute optional nullable int32u currentArea = 3;
   readonly attribute optional nullable epoch_s estimatedEndTime = 4;
-  readonly attribute optional nullable ProgressStruct progress[] = 5;
+  readonly attribute optional ProgressStruct progress[] = 5;
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -6515,7 +6515,7 @@ provisional cluster ServiceArea = 336 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct SelectAreasRequest {
-    nullable int32u newAreas[] = 0;
+    int32u newAreas[] = 0;
   }
 
   response struct SelectAreasResponse = 1 {