Merge branch 'master' into bugfix/add_dimmer_switch

Author: chirag-silabs

examples/lighting-app/realtek_bee/data_model/lighting-app.matter

@@ -2201,7 +2201,7 @@ provisional cluster ScenesManagement = 98 {
     optional int64s valueSigned64 = 8;
   }
 
-  struct ExtensionFieldSet {
+  struct ExtensionFieldSetStruct {
     cluster_id clusterID = 0;
     AttributeValuePairStruct attributeValueList[] = 1;
   }
@@ -2215,7 +2215,6 @@ provisional cluster ScenesManagement = 98 {
     fabric_idx fabricIndex = 254;
   }
 
-  readonly attribute optional nullable node_id lastConfiguredBy = 0;
   readonly attribute int16u sceneTableSize = 1;
   readonly attribute SceneInfoStruct fabricSceneInfo[] = 2;
   readonly attribute command_id generatedCommandList[] = 65528;
@@ -2229,8 +2228,8 @@ provisional cluster ScenesManagement = 98 {
     group_id groupID = 0;
     int8u sceneID = 1;
     int32u transitionTime = 2;
-    char_string sceneName = 3;
-    ExtensionFieldSet extensionFieldSets[] = 4;
+    char_string<16> sceneName = 3;
+    ExtensionFieldSetStruct extensionFieldSetStructs[] = 4;
   }
 
   response struct AddSceneResponse = 0 {
@@ -2249,8 +2248,8 @@ provisional cluster ScenesManagement = 98 {
     group_id groupID = 1;
     int8u sceneID = 2;
     optional int32u transitionTime = 3;
-    optional char_string sceneName = 4;
-    optional ExtensionFieldSet extensionFieldSets[] = 5;
+    optional char_string<16> sceneName = 4;
+    optional ExtensionFieldSetStruct extensionFieldSetStructs[] = 5;
   }
 
   request struct RemoveSceneRequest {
@@ -2315,7 +2314,7 @@ provisional cluster ScenesManagement = 98 {
     int8u sceneIdentifierFrom = 2;
   }
 
-  /** Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}' */
+  /** Add a scene to the scene table. Extension field sets are input as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeID": VALUE, "Value*": VALUE}]}'. */
   fabric command access(invoke: manage) AddScene(AddSceneRequest): AddSceneResponse = 0;
   /** Retrieves the requested scene entry from its Scene table. */
   fabric command ViewScene(ViewSceneRequest): ViewSceneResponse = 1;
@@ -2327,9 +2326,9 @@ provisional cluster ScenesManagement = 98 {
   fabric command access(invoke: manage) StoreScene(StoreSceneRequest): StoreSceneResponse = 4;
   /** Set the attributes and corresponding state for each other cluster implemented on the endpoint accordingly to the resquested scene entry in the Scene Table */
   fabric command RecallScene(RecallSceneRequest): DefaultSuccess = 5;
-  /** Get an unused scene identifier when no commissioning tool is in the network, or for a commissioning tool to get the used scene identifiers within a certain group */
+  /** This command can be used to get the used scene identifiers within a certain group, for the endpoint that implements this cluster. */
   fabric command GetSceneMembership(GetSceneMembershipRequest): GetSceneMembershipResponse = 6;
-  /** Allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair. */
+  /** This command allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair. */
   fabric command access(invoke: manage) CopyScene(CopySceneRequest): CopySceneResponse = 64;
 }
 
@@ -3154,7 +3153,6 @@ endpoint 1 {
   }
 
   server cluster ScenesManagement {
-    ram      attribute lastConfiguredBy;
     ram      attribute sceneTableSize default = 16;
     callback attribute fabricSceneInfo;
     callback attribute generatedCommandList;

examples/lighting-app/realtek_bee/data_model/lighting-app.zap

@@ -5097,22 +5097,6 @@
             }
           ],
           "attributes": [
-            {
-              "name": "LastConfiguredBy",
-              "code": 0,
-              "mfgCode": null,
-              "side": "server",
-              "type": "node_id",
-              "included": 1,
-              "storageOption": "RAM",
-              "singleton": 0,
-              "bounded": 0,
-              "defaultValue": "",
-              "reportable": 1,
-              "minInterval": 1,
-              "maxInterval": 65534,
-              "reportableChange": 0
-            },
             {
               "name": "SceneTableSize",
               "code": 1,

examples/platform/silabs/BaseApplication.cpp

@@ -69,7 +69,8 @@
 #include <platform/silabs/wifi/WifiInterface.h>
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-#include <platform/silabs/wifi/icd/WifiSleepManager.h>
+#include <platform/silabs/wifi/icd/WifiSleepManager.h> // nogncheck
+
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 #endif // SL_WIFI
 

examples/platform/silabs/MatterConfig.cpp

@@ -28,8 +28,8 @@
 #include <platform/silabs/wifi/WifiInterface.h>
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-#include <platform/silabs/wifi/icd/WifiSleepManager.h>
-#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+#include <platform/silabs/wifi/icd/WifiSleepManager.h> // nogncheck
+#endif                                                 // CHIP_CONFIG_ENABLE_ICD_SERVER
 
 // TODO: We shouldn't need any platform specific includes in this file
 #if (defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1)
@@ -203,6 +203,8 @@ void SilabsMatterConfig::AppInit()
 
 CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
 {
+    using namespace chip::DeviceLayer::Silabs;
+
     CHIP_ERROR err;
 #ifdef SL_WIFI
     // Because OpenThread needs to use memory allocation during its Key operations, we initialize the memory management for thread
@@ -234,9 +236,9 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
     ReturnErrorOnFailure(InitWiFi());
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-    ReturnErrorOnFailure(DeviceLayer::Silabs::WifiSleepManager::GetInstance().Init());
+    ReturnErrorOnFailure(WifiSleepManager::GetInstance().Init(&WifiInterface::GetInstance(), &WifiInterface::GetInstance()));
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
-#endif
+#endif // SL_WIFI
 
     ReturnErrorOnFailure(PlatformMgr().InitChipStack());
 

src/platform/silabs/SiWx917/OTAImageProcessorImpl.cpp

@@ -24,8 +24,8 @@
 #include <platform/silabs/wifi/WifiInterface.h>
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-#include <platform/silabs/wifi/icd/WifiSleepManager.h>
-#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+#include <platform/silabs/wifi/icd/WifiSleepManager.h> // nogncheck
+#endif                                                 // CHIP_CONFIG_ENABLE_ICD_SERVER
 
 #ifdef __cplusplus
 extern "C" {
@@ -165,7 +165,7 @@ void OTAImageProcessorImpl::HandlePrepareDownload(intptr_t context)
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
     // Setting the device in high performance - no-sleep mode during OTA tranfer
-    DeviceLayer::Silabs::WifiSleepManager::GetInstance().RequestHighPerformance();
+    DeviceLayer::Silabs::WifiSleepManager::GetInstance().RequestHighPerformanceWithTransition();
 #endif /* CHIP_CONFIG_ENABLE_ICD_SERVER*/
 
     imageProcessor->mDownloader->OnPreparedForDownload(CHIP_NO_ERROR);
@@ -223,7 +223,7 @@ void OTAImageProcessorImpl::HandleApply(intptr_t context)
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
     // Setting the device is in high performace - no-sleepy mode before soft reset as soft reset is not happening in sleep mode
-    DeviceLayer::Silabs::WifiSleepManager::GetInstance().RequestHighPerformance();
+    DeviceLayer::Silabs::WifiSleepManager::GetInstance().RequestHighPerformanceWithTransition();
 #endif /* CHIP_CONFIG_ENABLE_ICD_SERVER*/
 
     if (mReset)

src/platform/silabs/tests/BUILD.gn

@@ -23,6 +23,9 @@ chip_test_group("silabs_platform_tests") {
   tests = []
 
   if (sl_build_unit_tests) {
-    tests += [ "${chip_root}/examples/platform/silabs/tests:examples_tests" ]
+    tests += [
+      "${chip_root}/examples/platform/silabs/tests:examples_tests",
+      "${chip_root}/src/platform/silabs/wifi/icd/tests:wifi_icd_tests",
+    ]
   }
 }

src/platform/silabs/tests/args.gni

@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//build/chip/tests.gni")
+import("//build_overrides/chip.gni")
+import("${chip_root}/build/chip/tests.gni")
 
 declare_args() {
   # Build argument to enable Silabs specific unit tests

src/platform/silabs/wifi/BUILD.gn

@@ -15,6 +15,7 @@
 import("//build_overrides/chip.gni")
 import("//build_overrides/lwip.gni")
 import("${chip_root}/src/platform/device.gni")
+import("${chip_root}/src/platform/silabs/tests/args.gni")
 import("${chip_root}/third_party/silabs/efr32_sdk.gni")
 import("${chip_root}/third_party/silabs/silabs_board.gni")
 
@@ -35,7 +36,8 @@ declare_args() {
   sl_enable_wifi_debug = false
 }
 
-if (chip_enable_wifi && !wifi_soc) {
+# Workaround to prevent the assert when we are building the unit tests
+if (chip_enable_wifi && !wifi_soc && !sl_build_unit_tests) {
   assert(use_rs9116 || use_wf200 || use_SiWx917)
   import("${chip_root}/src/platform/silabs/wifi/args.gni")
 
@@ -100,6 +102,12 @@ config("wifi-platform-config") {
   }
 }
 
+source_set("state-provider") {
+  sources = [ "${silabs_platform_dir}/wifi/WifiStateProvider.h" ]
+
+  public_configs = [ ":wifi-platform-config" ]
+}
+
 source_set("wifi-platform") {
   sources = [
     "${silabs_platform_dir}/wifi/WifiInterface.cpp",
@@ -110,10 +118,12 @@ source_set("wifi-platform") {
   public_configs = [ ":wifi-platform-config" ]
 
   public_deps = [
+    ":state-provider",
     "${chip_root}/src/app/icd/server:icd-server-config",
     "${chip_root}/src/inet",
     "${chip_root}/src/lib/support",
     "${chip_root}/src/platform:platform_base",
+    "${silabs_platform_dir}/wifi/icd:power-save-interface",
   ]
 
   if (use_rs9116) {
@@ -152,14 +162,10 @@ source_set("wifi-platform") {
       "${silabs_platform_dir}/wifi/lwip-support/lwip_netif.h",
     ]
   }
-
-  # TODO: Once the WifiInterface refactor is done and becomes a class, we will inject an interface instead of having them in same source_set
   if (chip_enable_icd_server) {
-    public_deps += [ "${chip_root}/src/app/icd/server:configuration-data" ]
-
-    sources += [
-      "${silabs_platform_dir}/wifi/icd/WifiSleepManager.cpp",
-      "${silabs_platform_dir}/wifi/icd/WifiSleepManager.h",
+    public_deps += [
+      "${chip_root}/src/app/icd/server:configuration-data",
+      "${silabs_platform_dir}/wifi/icd:wifi-sleep-manager",
     ]
   }
 }

src/platform/silabs/wifi/SiWx/WifiInterfaceImpl.cpp

@@ -56,8 +56,8 @@ extern "C" {
 #endif
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-#include <app/icd/server/ICDConfigurationData.h> // nogncheck
-#include <platform/silabs/wifi/icd/WifiSleepManager.h>
+#include <app/icd/server/ICDConfigurationData.h>       // nogncheck
+#include <platform/silabs/wifi/icd/WifiSleepManager.h> // nogncheck
 
 #if SLI_SI91X_MCU_INTERFACE // SoC Only
 #include "rsi_rom_power_save.h"
@@ -434,6 +434,40 @@ sl_status_t SetWifiConfigurations()
     return status;
 }
 
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+/**
+ * @brief Converts the Matter Power Save Configuration to the SiWx Power Save Configuration
+ *
+ * @param configuration Matter Power Save Configuration
+ *
+ * @return sl_si91x_performance_profile_t SiWx Power Save Configuration; Default value is High Performance
+ *                                        kHighPerformance: HIGH_PERFORMANCE
+ *                                        kConnectedSleep: ASSOCIATED_POWER_SAVE
+ *                                        kDeepSleep: DEEP_SLEEP_WITH_RAM_RETENTION
+ */
+sl_si91x_performance_profile_t ConvertPowerSaveConfiguration(PowerSaveInterface::PowerSaveConfiguration configuration)
+{
+    sl_si91x_performance_profile_t profile = HIGH_PERFORMANCE;
+
+    switch (configuration)
+    {
+    case PowerSaveInterface::PowerSaveConfiguration::kHighPerformance:
+        profile = HIGH_PERFORMANCE;
+        break;
+    case PowerSaveInterface::PowerSaveConfiguration::kConnectedSleep:
+        profile = ASSOCIATED_POWER_SAVE;
+        break;
+    case PowerSaveInterface::PowerSaveConfiguration::kDeepSleep:
+        profile = DEEP_SLEEP_WITH_RAM_RETENTION;
+        break;
+    default:
+        break;
+    }
+
+    return profile;
+}
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+
 } // namespace
 
 namespace chip {
@@ -462,6 +496,11 @@ void WiseconnectWifiInterface::MatterWifiTask(void * arg)
     VerifyOrReturn(status == SL_STATUS_OK,
                    ChipLogError(DeviceLayer, "MatterWifiTask: SiWxPlatformInit failed: 0x%lx", static_cast<uint32_t>(status)));
 
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+    // Remove High performance request after the device is initialized
+    chip::DeviceLayer::Silabs::WifiSleepManager::GetInstance().RemoveHighPerformanceRequest();
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+
     WifiInterfaceImpl::GetInstance().NotifyWifiTaskInitialized();
 
     ChipLogDetail(DeviceLayer, "MatterWifiTask: starting event loop");
@@ -482,6 +521,11 @@ CHIP_ERROR WifiInterfaceImpl::InitWiFiStack(void)
 {
     sl_status_t status = SL_STATUS_OK;
 
+#if CHIP_CONFIG_ENABLE_ICD_SERVER
+    // Force the device to high performance mode during the init sequence.
+    chip::DeviceLayer::Silabs::WifiSleepManager::GetInstance().RequestHighPerformanceWithoutTransition();
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+
     status = sl_net_init(SL_NET_WIFI_CLIENT_INTERFACE, &config, &wifi_client_context, nullptr);
     VerifyOrReturnError(status == SL_STATUS_OK, CHIP_ERROR_INTERNAL, ChipLogError(DeviceLayer, "sl_net_init failed: %lx", status));
 
@@ -641,7 +685,7 @@ sl_status_t WifiInterfaceImpl::JoinWifiNetwork(void)
 // To avoid IOP issues, it is recommended to enable high-performance mode before joining the network.
 // TODO: Remove this once the IOP issue related to power save mode switching is fixed in the Wi-Fi SDK.
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-    chip::DeviceLayer::Silabs::WifiSleepManager::GetInstance().RequestHighPerformance();
+    chip::DeviceLayer::Silabs::WifiSleepManager::GetInstance().RequestHighPerformanceWithTransition();
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
     status = sl_net_up(SL_NET_WIFI_CLIENT_INTERFACE, SL_NET_DEFAULT_WIFI_CLIENT_PROFILE_ID);
@@ -760,14 +804,13 @@ sl_status_t WifiInterfaceImpl::TriggerPlatformWifiDisconnection()
 }
 
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-CHIP_ERROR WifiInterfaceImpl::ConfigurePowerSave(rsi_power_save_profile_mode_t sl_si91x_ble_state,
-                                                 sl_si91x_performance_profile_t sl_si91x_wifi_state, uint32_t listenInterval)
+CHIP_ERROR WifiInterfaceImpl::ConfigurePowerSave(PowerSaveInterface::PowerSaveConfiguration configuration, uint32_t listenInterval)
 {
-    int32_t error = rsi_bt_power_save_profile(sl_si91x_ble_state, RSI_MAX_PSP);
+    int32_t error = rsi_bt_power_save_profile(RSI_SLEEP_MODE_2, RSI_MAX_PSP);
     VerifyOrReturnError(error == RSI_SUCCESS, CHIP_ERROR_INTERNAL,
                         ChipLogError(DeviceLayer, "rsi_bt_power_save_profile failed: %ld", error));
 
-    sl_wifi_performance_profile_t wifi_profile = { .profile = sl_si91x_wifi_state,
+    sl_wifi_performance_profile_t wifi_profile = { .profile = ConvertPowerSaveConfiguration(configuration),
                                                    // TODO: Performance profile fails if not alligned with DTIM
                                                    .dtim_aligned_type = SL_SI91X_ALIGN_WITH_DTIM_BEACON,
                                                    // TODO: Different types need to be fixed in the Wi-Fi SDK

src/platform/silabs/wifi/SiWx/WifiInterfaceImpl.h

@@ -41,10 +41,10 @@ class WifiInterfaceImpl final : public WiseconnectWifiInterface
     CHIP_ERROR GetAccessPointInfo(wfx_wifi_scan_result_t & info) override;
     CHIP_ERROR GetAccessPointExtendedInfo(wfx_wifi_scan_ext_t & info) override;
     CHIP_ERROR ResetCounters() override;
+
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
     CHIP_ERROR ConfigureBroadcastFilter(bool enableBroadcastFilter) override;
-    CHIP_ERROR ConfigurePowerSave(rsi_power_save_profile_mode_t sl_si91x_ble_state,
-                                  sl_si91x_performance_profile_t sl_si91x_wifi_state, uint32_t listenInterval) override;
+    CHIP_ERROR ConfigurePowerSave(PowerSaveInterface::PowerSaveConfiguration configuration, uint32_t listenInterval) override;
 #endif // CHIP_CONFIG_ENABLE_ICD_SERVER
 
     /**

src/platform/silabs/wifi/WifiInterface.cpp

@@ -22,8 +22,8 @@
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/silabs/wifi/WifiInterface.h>
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
-#include <platform/silabs/wifi/icd/WifiSleepManager.h>
-#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
+#include <platform/silabs/wifi/icd/WifiSleepManager.h> // nogncheck
+#endif                                                 // CHIP_CONFIG_ENABLE_ICD_SERVER
 
 using namespace chip;
 using namespace chip::DeviceLayer;