Sync csa branch with main (#262)

Author: jmartinez-silabs

examples/platform/silabs/MatterConfig.cpp

@@ -28,9 +28,9 @@
 #include <platform/silabs/wifi/WifiInterface.h>
 
 // TODO: We shouldn't need any platform specific includes in this file
-#ifdef WF200_WIFI
-#include <platform/silabs/wifi/wf200/ncp/sl_wfx_task.h>
-#endif // WF200_WIFI
+#if (defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1)
+#include <platform/silabs/SiWx917/SiWxPlatformInterface.h>
+#endif // (defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1)
 #endif // SL_WIFI
 
 #if PW_RPC_ENABLED
@@ -45,15 +45,6 @@
 #include "MemMonitoring.h"
 #endif
 
-// TODO: We shouldn't need any platform specific includes in this file
-#if (defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1)
-#include <platform/silabs/SiWx917/SiWxPlatformInterface.h>
-#endif // (defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1 )
-
-#if ((defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1) || defined(EXP_BOARD))
-#include <platform/silabs/wifi/wiseconnect-interface/WiseconnectWifiInterface.h>
-#endif // ((defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1) || defined(EXP_BOARD))
-
 #include <crypto/CHIPCryptoPAL.h>
 // If building with the EFR32-provided crypto backend, we can use the
 // opaque keystore
@@ -330,18 +321,7 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
 #ifdef SL_WIFI
 CHIP_ERROR SilabsMatterConfig::InitWiFi(void)
 {
-    // TODO: Platform specific init should not be required here
-#ifdef WF200_WIFI
-    // Start wfx bus communication task.
-    wfx_bus_start();
-#endif // WF200_WIFI
-
-    // TODO: Platform specific init should not be required here
-#if ((defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1) || defined(EXP_BOARD))
-    VerifyOrReturnError(InitSiWxWifi() == SL_STATUS_OK, CHIP_ERROR_INTERNAL);
-#endif //((defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1 ) || defined(EXP_BOARD))
-
-    return CHIP_NO_ERROR;
+    return InitWiFiStack();
 }
 #endif // SL_WIFI
 

integrations/cloudbuild/chef.yaml

@@ -58,28 +58,6 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "gcr.io/cloud-builders/docker"
-      args:
-          [
-              "/workspace/examples/chef/create_docker.py",
-              "--commit_sha",
-              "$COMMIT_SHA",
-              "--short_sha",
-              "$SHORT_SHA",
-              "--revision_id",
-              "$REVISION_ID",
-              "--build_id",
-              "$BUILD_ID",
-              "--image_name",
-              "$_DOCKER_IMAGE_NAME",
-              "--tar_path",
-              "/workspace/artifacts",
-          ]
-      id: DockerAll
-      entrypoint: python3
-      waitFor:
-          - CompileNoip
-
 logsBucket: matter-build-automation-build-logs
 
 # Global timeout for all steps

integrations/docker/images/stage-1/chip-build-crosscompile/start-sysroot-vm.sh

@@ -117,6 +117,7 @@ packages:
   - libdbus-1-dev
   - libgirepository1.0-dev
   - libglib2.0-dev
+  - libpcsclite-dev
   - libreadline-dev
   - libsdl2-dev
   - libssl-dev

src/BUILD.gn

@@ -66,6 +66,7 @@ if (chip_build_tests) {
       "${chip_root}/src/protocols/interaction_model/tests",
       "${chip_root}/src/protocols/secure_channel/tests",
       "${chip_root}/src/protocols/user_directed_commissioning/tests",
+      "${chip_root}/src/lib/support/verhoeff/tests",
       "${chip_root}/src/system/tests",
       "${chip_root}/src/transport/retransmit/tests",
       "${chip_root}/src/transport/tests",

src/darwin/Framework/CHIP/MTRCommissioneeInfo.h

@@ -25,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
  * Information read from the commissionee device during commissioning.
  */
 NS_SWIFT_SENDABLE
-MTR_NEWLY_AVAILABLE
+MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4))
 @interface MTRCommissioneeInfo : NSObject <NSCopying, NSSecureCoding>
 
 /**

src/darwin/Framework/CHIP/MTRCommissioningParameters.h

@@ -100,7 +100,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  * Read device type information from all endpoints during commissioning.
  * Defaults to NO.
  */
-@property (nonatomic, assign) BOOL readEndpointInformation MTR_NEWLY_AVAILABLE;
+@property (nonatomic, assign) BOOL readEndpointInformation MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4));
 
 @end
 

src/darwin/Framework/CHIP/MTRDeviceController.h

@@ -273,7 +273,7 @@ MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1))
  * Forget any information we have about the device with the given node ID.  That
  * includes clearing any information we have stored about it.
  */
-- (void)forgetDeviceWithNodeID:(NSNumber *)nodeID MTR_NEWLY_AVAILABLE;
+- (void)forgetDeviceWithNodeID:(NSNumber *)nodeID MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4));
 
 /**
  * Compute a PASE verifier for the desired setup passcode.

src/darwin/Framework/CHIP/MTRDeviceControllerDelegate.h

@@ -94,12 +94,11 @@ MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4))
  * so the information delivered by this notification should not be trusted.
  */
 - (void)controller:(MTRDeviceController *)controller
-    readCommissioneeInfo:(MTRCommissioneeInfo *)info MTR_NEWLY_AVAILABLE;
+    readCommissioneeInfo:(MTRCommissioneeInfo *)info MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4));
 
 - (void)controller:(MTRDeviceController *)controller
     readCommissioningInfo:(MTRProductIdentity *)info
-    MTR_AVAILABLE(ios(17.0), macos(14.0), watchos(10.0), tvos(17.0))
-        MTR_NEWLY_DEPRECATED("Use controller:readCommissioneeInfo:");
+    MTR_DEPRECATED("Use controller:readCommissioneeInfo:", ios(17.0, 18.4), macos(14.0, 15.4), watchos(10.0, 11.4), tvos(17.0, 18.4));
 
 /**
  * Notify the delegate when the suspended state changed of the controller, after this happens

src/darwin/Framework/CHIP/MTRDeviceType.h

@@ -55,7 +55,7 @@ MTR_AVAILABLE(ios(18.2), macos(15.2), watchos(11.2), tvos(18.2))
 
 @end
 
-MTR_NEWLY_AVAILABLE
+MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4))
 @interface MTRDeviceType () <NSCopying>
 @end
 

src/darwin/Framework/CHIP/MTRDeviceTypeRevision.h

@@ -44,7 +44,7 @@ MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6))
 /**
  * Initializes the receiver based on the values in the specified struct.
  */
-- (nullable instancetype)initWithDeviceTypeStruct:(MTRDescriptorClusterDeviceTypeStruct *)deviceTypeStruct MTR_NEWLY_AVAILABLE;
+- (nullable instancetype)initWithDeviceTypeStruct:(MTRDescriptorClusterDeviceTypeStruct *)deviceTypeStruct MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4));
 
 @property (nonatomic, copy, readonly) NSNumber * deviceTypeID;
 @property (nonatomic, copy, readonly) NSNumber * deviceTypeRevision;
@@ -53,11 +53,11 @@ MTR_AVAILABLE(ios(17.6), macos(14.6), watchos(10.6), tvos(17.6))
  * Returns the MTRDeviceType corresponding to deviceTypeID,
  * or nil if deviceTypeID does not represent a known device type.
  */
-@property (nonatomic, copy, readonly, nullable) MTRDeviceType * typeInformation MTR_NEWLY_AVAILABLE;
+@property (nonatomic, copy, readonly, nullable) MTRDeviceType * typeInformation MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4));
 
 @end
 
-MTR_NEWLY_AVAILABLE
+MTR_AVAILABLE(ios(18.4), macos(15.4), watchos(11.4), tvos(18.4))
 @interface MTRDeviceTypeRevision () <NSSecureCoding>
 @end