Sync csa branch with main (#239)

Author: mkardous-silabs

examples/common/pigweed/rpc_services/Descriptor.h

@@ -52,7 +52,7 @@ class Descriptor : public pw_rpc::nanopb::Descriptor::Service<Descriptor>
             // TODO: Need to update the Pigweed proto definition to actually represent this
             //       as a list of device types.
             //
-            chip_rpc_DeviceType out{ .device_type = deviceTypeList.data()[0].deviceId };
+            chip_rpc_DeviceType out{ .device_type = deviceTypeList.data()[0].deviceTypeId };
             writer.Write(out);
         }
 

examples/virtual-device-app/android/java/DeviceApp-JNI.cpp

@@ -134,7 +134,7 @@ JNI_METHOD(void, postServerInit)(JNIEnv *, jobject app, jint deviceTypeId)
     chip::DeviceLayer::StackLock lock;
     ChipLogProgress(Zcl, "DeviceAppJNI::postServerInit");
 
-    gDeviceTypeIds[0].deviceId = static_cast<uint16_t>(deviceTypeId);
+    gDeviceTypeIds[0].deviceTypeId = static_cast<uint16_t>(deviceTypeId);
     emberAfSetDeviceTypeList(1, Span<const EmberAfDeviceType>(gDeviceTypeIds));
 }
 

integrations/docker/images/base/chip-build/version

@@ -1 +1 @@
-100 : [linux] Added libpcsclite-dev package for NFC Commissioning on Linux platforms.
+101 : [Silabs] Update Silabs docker to support MG26 Modules.

integrations/docker/images/stage-2/chip-build-efr32/Dockerfile

@@ -25,8 +25,8 @@ RUN wget https://github.com/SiliconLabs/simplicity_sdk/releases/download/v2024.1
     && find /tmp/simplicity_sdk/protocol/openthread -name "*efr32mg21*" -delete \
     && find /tmp/simplicity_sdk \( -name "libsl_platform_ftd_efr32mg2*" -o -name "libsl_ot_stack_mtd_efr32mg2*" \) -type f -delete \
     && find /tmp/simplicity_sdk/hardware/board/config -mindepth 1 -maxdepth 1 -type d ! \( -name '*brd4186c*' -o -name '*brd4187c*' -o -name '*brd4186a*' -o -name '*brd4187a*' -o -name '*brd2601b*' -o -name '*brd2703a*' -o -name '*brd2704a*' -o -name '*component*' \
-    -o -name '*brd4316a*' -o -name '*brd4317a*' -o -name '*brd4318a*' -o -name '*brd4319a*' -o -name '*brd4116a*' -o -name '*brd4117a*' -o -name '*brd4118a*' -o -name '*brd2608a*' \) -exec rm -rf {} + \
-    && find /tmp/simplicity_sdk/platform/Device/SiliconLabs  -mindepth 1 -maxdepth 1 -type d ! \( -name 'EFR32MG24' -o -name 'EFR32MG26' -o -name 'MGM24' \) -exec rm -rf {} + \
+    -o -name '*brd4316a*' -o -name '*brd4317a*' -o -name '*brd4318a*' -o -name '*brd4319a*' -o -name '*brd4116a*' -o -name '*brd4117a*' -o -name '*brd4118a*' -o -name '*brd2608a*' -o -name '*brd4350a*' -o -name '*brd4351a*' -o -name '*brd2709a*' \) -exec rm -rf {} + \
+    && find /tmp/simplicity_sdk/platform/Device/SiliconLabs  -mindepth 1 -maxdepth 1 -type d ! \( -name 'EFR32MG24' -o -name 'EFR32MG26' -o -name 'MGM24' -o -name 'MGM26' \) -exec rm -rf {} + \
     && : # last line
 
 # Clone WiSeConnect Wi-Fi and Bluetooth Software 2.10.3 (b6d6cb5)

integrations/docker/images/stage-2/chip-build-nuttx/Dockerfile

@@ -14,7 +14,7 @@ RUN set -x \
 # Download and build g++-13
 RUN set -x \
     && ! test -d /opt/nuttx/gcc-13 \
-    && wget -P gcc_build https://ftp.tsukuba.wide.ad.jp/software/gcc/releases/gcc-13.1.0/gcc-13.1.0.tar.gz \
+    && wget -P gcc_build https://mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-13.1.0/gcc-13.1.0.tar.gz \
     && cd gcc_build \
     && tar xzf gcc-13.1.0.tar.gz \
     && cd gcc-13.1.0 \

src/app/data-model-provider/BUILD.gn

@@ -14,6 +14,16 @@
 import("//build_overrides/chip.gni")
 import("//build_overrides/pigweed.gni")
 
+source_set("metadata") {
+  sources = [ "MetadataTypes.h" ]
+
+  public_deps = [
+    "${chip_root}/src/access:types",
+    "${chip_root}/src/lib/core:types",
+    "${chip_root}/src/lib/support",
+  ]
+}
+
 source_set("data-model-provider") {
   sources = [
     "ActionContext.h",
@@ -25,15 +35,15 @@ source_set("data-model-provider") {
     "MetadataList.h",
     "MetadataLookup.cpp",
     "MetadataLookup.h",
-    "MetadataTypes.cpp",
-    "MetadataTypes.h",
     "OperationTypes.h",
     "Provider.h",
     "ProviderChangeListener.h",
+    "ProviderMetadataTree.cpp",
+    "ProviderMetadataTree.h",
   ]
 
   public_deps = [
-    "${chip_root}/src/access:types",
+    ":metadata",
     "${chip_root}/src/app:attribute-access",
     "${chip_root}/src/app:command-handler-interface",
     "${chip_root}/src/app:events",

src/app/data-model-provider/MetadataLookup.h

@@ -21,6 +21,7 @@
 #include <app/ConcreteClusterPath.h>
 #include <app/data-model-provider/MetadataList.h>
 #include <app/data-model-provider/MetadataTypes.h>
+#include <app/data-model-provider/ProviderMetadataTree.h>
 #include <lib/core/DataModelTypes.h>
 #include <lib/support/CodeUtils.h>
 

src/app/data-model-provider/MetadataTypes.h

@@ -20,17 +20,8 @@
 #include <optional>
 
 #include <access/Privilege.h>
-#include <app-common/zap-generated/cluster-objects.h>
-#include <app/AttributePathParams.h>
-#include <app/ConcreteAttributePath.h>
-#include <app/ConcreteClusterPath.h>
-#include <app/ConcreteCommandPath.h>
-#include <app/data-model-provider/MetadataList.h>
-#include <app/data-model/List.h>
 #include <lib/core/DataModelTypes.h>
 #include <lib/support/BitFlags.h>
-#include <lib/support/BitMask.h>
-#include <lib/support/Span.h>
 
 namespace chip {
 namespace app {
@@ -135,65 +126,6 @@ struct DeviceTypeEntry
     }
 };
 
-/// Provides metadata information for a data model
-///
-/// The data model can be viewed as a tree of endpoint/cluster/(attribute+commands+events)
-/// where each element can be iterated through independently.
-///
-/// Iteration rules:
-///   - Invalid paths will be returned when iteration ends (IDs will be kInvalid* and in particular
-///     mEndpointId will be kInvalidEndpointId). See `::kInvalid` constants for entries and
-///     can use ::IsValid() to determine if the entry is valid or not.
-///   - Global Attributes are NOT returned since they are implied
-///   - Any internal iteration errors are just logged (callers do not handle iteration CHIP_ERROR)
-///   - Iteration order is NOT guaranteed globally. Only the following is guaranteed:
-///     - Complete tree iteration (e.g. when iterating an endpoint, ALL clusters of that endpoint
-///       are returned, when iterating over a cluster, all attributes/commands are iterated over)
-///     - uniqueness and completeness (iterate over all possible distinct values as long as no
-///       internal structural changes occur)
-class ProviderMetadataTree
-{
-public:
-    virtual ~ProviderMetadataTree() = default;
-
-    using SemanticTag = Clusters::Descriptor::Structs::SemanticTagStruct::Type;
-
-    virtual CHIP_ERROR Endpoints(ListBuilder<EndpointEntry> & builder) = 0;
-
-    virtual CHIP_ERROR SemanticTags(EndpointId endpointId, ListBuilder<SemanticTag> & builder)          = 0;
-    virtual CHIP_ERROR DeviceTypes(EndpointId endpointId, ListBuilder<DeviceTypeEntry> & builder)       = 0;
-    virtual CHIP_ERROR ClientClusters(EndpointId endpointId, ListBuilder<ClusterId> & builder)          = 0;
-    virtual CHIP_ERROR ServerClusters(EndpointId endpointId, ListBuilder<ServerClusterEntry> & builder) = 0;
-
-    virtual CHIP_ERROR Attributes(const ConcreteClusterPath & path, ListBuilder<AttributeEntry> & builder)             = 0;
-    virtual CHIP_ERROR GeneratedCommands(const ConcreteClusterPath & path, ListBuilder<CommandId> & builder)           = 0;
-    virtual CHIP_ERROR AcceptedCommands(const ConcreteClusterPath & path, ListBuilder<AcceptedCommandEntry> & builder) = 0;
-
-    /// Workaround function to report attribute change.
-    ///
-    /// When this is invoked, the caller is expected to increment the cluster data version, and the attribute path
-    /// should be marked as `dirty` by the data model provider listener so that the reporter can notify the subscriber
-    /// of attribute changes.
-    /// This function should be invoked when attribute managed by attribute access interface is modified but not
-    /// through an actual Write interaction.
-    /// For example, if the LastNetworkingStatus attribute changes because the NetworkCommissioning driver detects a
-    /// network connection status change and calls SetLastNetworkingStatusValue(). The data model provider can recognize
-    /// this change by invoking this function at the point of change.
-    ///
-    /// This is a workaround function as we cannot notify the attribute change to the data model provider. The provider
-    /// should own its data and versions.
-    ///
-    /// TODO: We should remove this function when the AttributeAccessInterface/CommandHandlerInterface is able to report
-    /// the attribute changes.
-    virtual void Temporary_ReportAttributeChanged(const AttributePathParams & path) = 0;
-
-    // "convenience" functions that just return the data and ignore the error
-    // This returns the builder as-is even after the error (e.g. not found would return empty data)
-    ReadOnlyBuffer<EndpointEntry> EndpointsIgnoreError();
-    ReadOnlyBuffer<ServerClusterEntry> ServerClustersIgnoreError(EndpointId endpointId);
-    ReadOnlyBuffer<AttributeEntry> AttributesIgnoreError(const ConcreteClusterPath & path);
-};
-
 } // namespace DataModel
 } // namespace app
 } // namespace chip

src/app/data-model-provider/Provider.h

@@ -27,8 +27,8 @@
 
 #include <app/data-model-provider/ActionReturnStatus.h>
 #include <app/data-model-provider/Context.h>
-#include <app/data-model-provider/MetadataTypes.h>
 #include <app/data-model-provider/OperationTypes.h>
+#include <app/data-model-provider/ProviderMetadataTree.h>
 
 namespace chip {
 namespace app {

src/app/data-model-provider/MetadataTypes.cpp renamed to src/app/data-model-provider/ProviderMetadataTree.cpp

@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-#include <app/data-model-provider/MetadataTypes.h>
+#include <app/data-model-provider/ProviderMetadataTree.h>
 
 #include <app/data-model-provider/MetadataList.h>