[SL-UP] Refactor Platform WiFi events

examples/platform/silabs/MatterConfig.cpp

@@ -433,7 +433,7 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
 
 #ifdef ENABLE_CHIP_SHELL
     chip::startShellTask();
-#endif
+#endif // ENABLE_CHIP_SHELL
 
     return CHIP_NO_ERROR;
 }

examples/platform/silabs/MatterShell.cpp

@@ -28,7 +28,12 @@
 #include "sl_cli_config.h"
 #include "sli_cli_io.h"
 #include <lib/support/StringBuilder.h>
-#endif
+#endif // SL_CATALOG_CLI_PRESENT
+#ifdef SL_WIFI
+#include <platform/CHIPDeviceLayer.h>
+#include <platform/silabs/NetworkCommissioningWiFiDriver.h>
+#include <lib/shell/commands/WiFi.h>
+#endif // SL_WIFI
 
 using namespace ::chip;
 using Shell::Engine;
@@ -194,6 +199,10 @@ void startShellTask()
     cmd_otcli_init();
 #endif
 
+#ifdef SL_WIFI
+    Shell::SetWiFiDriver(DeviceLayer::NetworkCommissioning::SlWiFiDriver::GetInstance());
+#endif // SL_WIFI
+
 #ifdef SL_CATALOG_CLI_PRESENT
     cmdSilabsInit();
 #endif

src/platform/silabs/CHIPDevicePlatformEvent.h

@@ -40,15 +40,15 @@ namespace DeviceEventType {
  */
 enum PublicPlatformSpecificEventTypes
 {
-    /* None currently defined */
+    kSLSystemEvent = kRange_PublicPlatformSpecific,
 };
 
 /**
  * Enumerates Silabs platform-specific event types that are internal to the Chip Device Layer.
  */
 enum InternalPlatformSpecificEventTypes
 {
-    kWFXSystemEvent = kRange_InternalPlatformSpecific,
+    kPlatformSLEvent = kRange_InternalPlatformSpecific,
 };
 
 } // namespace DeviceEventType

src/platform/silabs/ConnectivityManagerImpl.h

@@ -104,6 +104,7 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
     CHIP_ERROR _GetAndLogWifiStatsCounters(void);
     void _OnWiFiScanDone();
     void _OnWiFiStationProvisionChange();
+    CHIP_ERROR _DisconnectNetwork(void);
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
     CHIP_ERROR _SetPollingInterval(System::Clock::Milliseconds32 pollingInterval);
 #endif /* CHIP_CONFIG_ENABLE_ICD_SERVER */
@@ -117,17 +118,25 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
 
     // ===== Private members reserved for use by this class only.
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
-    System::Clock::Timestamp mLastStationConnectFailTime;
+    // variables for tracking the station mode and state
     WiFiStationMode mWiFiStationMode;
     WiFiStationState mWiFiStationState;
+    bool mWiFiStationAutoConnect;
+    // TODO: Remove this once the LIT disconnect is managed by the ConnectivityManager
+    bool mWiFiStationDisconnectPending;
+    // variables for tracking the last connection failure time and reconnect interval
+    System::Clock::Timestamp mLastStationConnectFailTime;
     System::Clock::Timeout mWiFiStationReconnectInterval;
+    uint8_t mWiFiStationReconnectCount;
+    // flags for tracking the internet connectivity state
     BitFlags<Flags> mFlags;
 
     void DriveStationState(void);
     void OnStationConnected(void);
     void OnStationDisconnected(void);
-    void ChangeWiFiStationState(WiFiStationState newState);
+    void ChangeWiFiStationState(WiFiStationState newState, bool driveStationState = true);
     static void DriveStationState(::chip::System::Layer * aLayer, void * aAppState);
+    void ResetReconnectionWiFiStationState(void);
 
     void UpdateInternetConnectivityState(void);
 #endif