[SL-UP] Allowing DUT to sleep after commissioning (#214)

Author: chirag-silabs

examples/platform/silabs/BaseApplication.cpp

@@ -201,6 +201,8 @@ void BaseApplicationDelegate::OnCommissioningSessionStarted()
 
 #if SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
     WifiSleepManager::GetInstance().HandleCommissioningSessionStarted();
+    // Setting the device to high power mode during commissioning
+    WifiSleepManager::GetInstance().RequestHighPerformance();
 #endif // SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
 }
 
@@ -210,6 +212,19 @@ void BaseApplicationDelegate::OnCommissioningSessionStopped()
 
 #if SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
     WifiSleepManager::GetInstance().HandleCommissioningSessionStopped();
+    // Removing the high power mode request on session stopped
+    WifiSleepManager::GetInstance().RemoveHighPerformanceRequest();
+#endif // SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
+}
+
+void BaseApplicationDelegate::OnCommissioningSessionEstablishmentError(CHIP_ERROR err)
+{
+    isComissioningStarted = false;
+
+#if SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
+    WifiSleepManager::GetInstance().HandleCommissioningSessionStopped();
+    // Removing the high power mode request on failed commissioning
+    WifiSleepManager::GetInstance().RemoveHighPerformanceRequest();
 #endif // SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
 }
 
@@ -240,6 +255,7 @@ void BaseApplicationDelegate::OnCommissioningWindowClosed()
 #endif // QR_CODE_ENABLED
 #endif // DISPLAY_ENABLED
     }
+
 }
 
 void BaseApplicationDelegate::OnFabricCommitted(const FabricTable & fabricTable, FabricIndex fabricIndex)
@@ -946,6 +962,8 @@ void BaseApplication::OnPlatformEvent(const ChipDeviceEvent * event, intptr_t)
 
     case DeviceEventType::kCommissioningComplete: {
 #if SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
+        // DUT is commissioned, removing the High Performance request
+        WifiSleepManager::GetInstance().RemoveHighPerformanceRequest();
         WifiSleepManager::GetInstance().VerifyAndTransitionToLowPowerMode(WifiSleepManager::PowerEvent::kCommissioningComplete);
 #endif // SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
 

examples/platform/silabs/BaseApplication.h

@@ -73,6 +73,7 @@ class BaseApplicationDelegate : public AppDelegate, public chip::FabricTable::De
     bool isComissioningStarted = false;
     void OnCommissioningSessionStarted() override;
     void OnCommissioningSessionStopped() override;
+    void OnCommissioningSessionEstablishmentError(CHIP_ERROR err) override;
     void OnCommissioningWindowClosed() override;
     void OnCommissioningWindowOpened() override;
 

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

@@ -462,12 +462,6 @@ sl_status_t JoinWifiNetwork(void)
 
     if (status == SL_STATUS_OK)
     {
-#if CHIP_CONFIG_ENABLE_ICD_SERVER
-        // TODO: We need a way to identify if this was a retry or a first attempt connect to avoid removing a req that was not ours
-        //  Remove High performance request that might have been added during the retry process
-        chip::DeviceLayer::Silabs::WifiSleepManager::GetInstance().RemoveHighPerformanceRequest();
-#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
-
         WifiEvent event = WifiEvent::kStationConnect;
         sl_matter_wifi_post_event(event);
         return status;

src/platform/silabs/wifi/icd/WifiSleepManager.cpp

@@ -160,7 +160,9 @@ CHIP_ERROR WifiSleepManager::VerifyAndTransitionToLowPowerMode(PowerEvent event)
 
     if (mIsCommissioningInProgress)
     {
-        return ConfigureDTIMBasedSleep();
+        // During commissioning, don't let the device to go to sleep
+        // This is needed to interrupt the sleep and retry to join the network
+        return CHIP_NO_ERROR;
     }
 
     // TODO: Clean this up when the Wi-Fi interface re-work is finished