Skip to content

Commit 913eb12

Browse files
mkardous-silabsmkardous-silabs
committed
Rename PlatformSleepManager to WifiSleepManager
1 parent 22942a1 commit 913eb12

File tree

7 files changed

+38
-38
lines changed

7 files changed

+38
-38
lines changed

‎examples/platform/silabs/BaseApplication.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
7070

7171
#if CHIP_CONFIG_ENABLE_ICD_SERVER
72-
#include <platform/silabs/wifi/icd/PlatformSleepManager.h>
72+
#include <platform/silabs/wifi/icd/WifiSleepManager.h>
7373
#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
7474
#endif // SL_WIFI
7575

@@ -188,7 +188,7 @@ void BaseApplicationDelegate::OnCommissioningSessionStarted()
188188
isComissioningStarted = true;
189189

190190
#if SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
191-
PlatformSleepManager::GetInstance().HandleCommissioningSessionStarted();
191+
WifiSleepManager::GetInstance().HandleCommissioningSessionStarted();
192192
#endif // SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
193193
}
194194

@@ -197,7 +197,7 @@ void BaseApplicationDelegate::OnCommissioningSessionStopped()
197197
isComissioningStarted = false;
198198

199199
#if SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
200-
PlatformSleepManager::GetInstance().HandleCommissioningSessionStopped();
200+
WifiSleepManager::GetInstance().HandleCommissioningSessionStopped();
201201
#endif // SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
202202
}
203203

@@ -219,7 +219,7 @@ void BaseApplicationDelegate::OnCommissioningWindowClosed()
219219
}
220220

221221
#if SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
222-
PlatformSleepManager::GetInstance().HandleCommissioningWindowClose();
222+
WifiSleepManager::GetInstance().HandleCommissioningWindowClose();
223223
#endif // SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
224224
}
225225

@@ -904,7 +904,7 @@ void BaseApplication::OnPlatformEvent(const ChipDeviceEvent * event, intptr_t)
904904
{
905905
#if SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
906906
chip::app::DnssdServer::Instance().StartServer();
907-
PlatformSleepManager::GetInstance().HandleInternetConnectivityChange();
907+
WifiSleepManager::GetInstance().HandleInternetConnectivityChange();
908908
#endif // SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
909909

910910
#if SILABS_OTA_ENABLED
@@ -918,7 +918,7 @@ void BaseApplication::OnPlatformEvent(const ChipDeviceEvent * event, intptr_t)
918918

919919
case DeviceEventType::kCommissioningComplete: {
920920
#if SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
921-
PlatformSleepManager::GetInstance().HandleCommissioningComplete();
921+
WifiSleepManager::GetInstance().HandleCommissioningComplete();
922922
#endif // SL_WIFI && CHIP_CONFIG_ENABLE_ICD_SERVER
923923

924924
// SL-Only

‎examples/platform/silabs/MatterConfig.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
2929

3030
#if CHIP_CONFIG_ENABLE_ICD_SERVER
31-
#include <platform/silabs/wifi/icd/PlatformSleepManager.h>
31+
#include <platform/silabs/wifi/icd/WifiSleepManager.h>
3232
#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
3333
#endif /* SL_WIFI */
3434

@@ -49,7 +49,7 @@
4949
#include <platform/silabs/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.h>
5050
#endif // SLI_SI91X_MCU_INTERFACE
5151

52-
// TODO: Add suport for the WF200 in the PlatformSleepManager
52+
// TODO: Add suport for the WF200 in the WifiSleepManager
5353
#if defined(RS911X_WIFI) || SLI_SI91X_MCU_INTERFACE
5454
#endif // defined(RS911X_WIFI) || SLI_SI91X_MCU_INTERFACE
5555

@@ -250,7 +250,7 @@ CHIP_ERROR SilabsMatterConfig::InitMatter(const char * appName)
250250
ReturnErrorOnFailure(InitWiFi());
251251

252252
#if CHIP_CONFIG_ENABLE_ICD_SERVER
253-
err = DeviceLayer::Silabs::PlatformSleepManager::GetInstance().Init();
253+
err = DeviceLayer::Silabs::WifiSleepManager::GetInstance().Init();
254254
VerifyOrReturnError(err == CHIP_NO_ERROR, err);
255255
#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
256256
#endif // SL_WIFI

‎src/platform/silabs/SiWx917/OTAImageProcessorImpl.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <app/clusters/ota-requestor/OTARequestorInterface.h>
2121
#include <platform/silabs/OTAImageProcessorImpl.h>
2222
#include <platform/silabs/SilabsConfig.h>
23-
#include <platform/silabs/wifi/icd/PlatformSleepManager.h>
23+
#include <platform/silabs/wifi/icd/WifiSleepManager.h>
2424

2525
#ifdef __cplusplus
2626
extern "C" {
@@ -159,7 +159,7 @@ void OTAImageProcessorImpl::HandlePrepareDownload(intptr_t context)
159159

160160
#if CHIP_CONFIG_ENABLE_ICD_SERVER
161161
// Setting the device is in high performace - no-sleepy mode during OTA tranfer
162-
DeviceLayer::Silabs::PlatformSleepManager::GetInstance().RequestHighPerformance();
162+
DeviceLayer::Silabs::WifiSleepManager::GetInstance().RequestHighPerformance();
163163
#endif /* CHIP_CONFIG_ENABLE_ICD_SERVER*/
164164

165165
imageProcessor->mDownloader->OnPreparedForDownload(CHIP_NO_ERROR);
@@ -198,7 +198,7 @@ void OTAImageProcessorImpl::HandleFinalize(intptr_t context)
198198

199199
#if (CHIP_CONFIG_ENABLE_ICD_SERVER)
200200
// Setting the device back to power save mode when transfer is completed successfully
201-
DeviceLayer::Silabs::PlatformSleepManager::GetInstance().RemoveHighPerformanceRequest();
201+
DeviceLayer::Silabs::WifiSleepManager::GetInstance().RemoveHighPerformanceRequest();
202202
#endif /* CHIP_CONFIG_ENABLE_ICD_SERVER*/
203203

204204
ChipLogProgress(SoftwareUpdate, "OTA image downloaded successfully");
@@ -217,7 +217,7 @@ void OTAImageProcessorImpl::HandleApply(intptr_t context)
217217

218218
#if CHIP_CONFIG_ENABLE_ICD_SERVER
219219
// Setting the device is in high performace - no-sleepy mode before soft reset as soft reset is not happening in sleep mode
220-
DeviceLayer::Silabs::PlatformSleepManager::GetInstance().RequestHighPerformance();
220+
DeviceLayer::Silabs::WifiSleepManager::GetInstance().RequestHighPerformance();
221221
#endif /* CHIP_CONFIG_ENABLE_ICD_SERVER*/
222222

223223
if (mReset)
@@ -240,7 +240,7 @@ void OTAImageProcessorImpl::HandleAbort(intptr_t context)
240240

241241
#if CHIP_CONFIG_ENABLE_ICD_SERVER
242242
// Setting the device back to power save mode when transfer is aborted in the middle
243-
DeviceLayer::Silabs::PlatformSleepManager::GetInstance().RemoveHighPerformanceRequest();
243+
DeviceLayer::Silabs::WifiSleepManager::GetInstance().RemoveHighPerformanceRequest();
244244
#endif /* CHIP_CONFIG_ENABLE_ICD_SERVER*/
245245

246246
// Not clearing the image storage area as it is done during each write

‎src/platform/silabs/wifi/BUILD.gn

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ source_set("wifi-platform") {
154154
public_deps += [ "${chip_root}/src/app/icd/server:configuration-data" ]
155155

156156
sources += [
157-
"${silabs_platform_dir}/wifi/icd/PlatformSleepManager.cpp",
158-
"${silabs_platform_dir}/wifi/icd/PlatformSleepManager.h",
157+
"${silabs_platform_dir}/wifi/icd/WifiSleepManager.cpp",
158+
"${silabs_platform_dir}/wifi/icd/WifiSleepManager.h",
159159
]
160160
}
161161
}

‎src/platform/silabs/wifi/WifiInterfaceAbstraction.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <lib/support/CodeUtils.h>
2424
#include <lib/support/logging/CHIPLogging.h>
2525
#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
26-
#include <platform/silabs/wifi/icd/PlatformSleepManager.h>
26+
#include <platform/silabs/wifi/icd/WifiSleepManager.h>
2727
#include <stdbool.h>
2828
#include <stdio.h>
2929
#include <stdlib.h>
@@ -55,7 +55,7 @@ osTimerId_t sRetryTimer;
5555
void RetryConnectionTimerHandler(void * arg)
5656
{
5757
#if CHIP_CONFIG_ENABLE_ICD_SERVER
58-
Silabs::PlatformSleepManager::GetInstance().RequestHighPerformance();
58+
Silabs::WifiSleepManager::GetInstance().RequestHighPerformance();
5959
#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
6060

6161
if (wfx_connect_to_ap() != SL_STATUS_OK)
@@ -197,7 +197,7 @@ void wfx_retry_connection(uint16_t retryAttempt)
197197
return;
198198
}
199199
#if CHIP_CONFIG_ENABLE_ICD_SERVER
200-
Silabs::PlatformSleepManager::GetInstance().RemoveHighPerformanceRequest();
200+
Silabs::WifiSleepManager::GetInstance().RemoveHighPerformanceRequest();
201201
#endif // CHIP_CONFIG_ENABLE_ICD_SERVER
202202
ChipLogProgress(DeviceLayer, "wfx_retry_connection : Next attempt after %d Seconds", retryInterval);
203203
retryInterval += retryInterval;

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <app/icd/server/ICDConfigurationData.h>
1919
#include <lib/support/logging/CHIPLogging.h>
2020
#include <platform/silabs/wifi/WifiInterfaceAbstraction.h>
21-
#include <platform/silabs/wifi/icd/PlatformSleepManager.h>
21+
#include <platform/silabs/wifi/icd/WifiSleepManager.h>
2222

2323
using namespace chip::app;
2424

@@ -27,39 +27,39 @@ namespace DeviceLayer {
2727
namespace Silabs {
2828

2929
// Initialize the static instance
30-
PlatformSleepManager PlatformSleepManager::mInstance;
30+
WifiSleepManager WifiSleepManager::mInstance;
3131

32-
CHIP_ERROR PlatformSleepManager::Init()
32+
CHIP_ERROR WifiSleepManager::Init()
3333
{
3434
return CHIP_NO_ERROR;
3535
}
3636

37-
void PlatformSleepManager::HandleCommissioningComplete()
37+
void WifiSleepManager::HandleCommissioningComplete()
3838
{
3939
TransitionToLowPowerMode();
4040
}
4141

42-
void PlatformSleepManager::HandleInternetConnectivityChange()
42+
void WifiSleepManager::HandleInternetConnectivityChange()
4343
{
4444
if (!isCommissioningInProgress)
4545
{
4646
TransitionToLowPowerMode();
4747
}
4848
}
4949

50-
void PlatformSleepManager::HandleCommissioningWindowClose() {}
50+
void WifiSleepManager::HandleCommissioningWindowClose() {}
5151

52-
void PlatformSleepManager::HandleCommissioningSessionStarted()
52+
void WifiSleepManager::HandleCommissioningSessionStarted()
5353
{
5454
isCommissioningInProgress = true;
5555
}
5656

57-
void PlatformSleepManager::HandleCommissioningSessionStopped()
57+
void WifiSleepManager::HandleCommissioningSessionStopped()
5858
{
5959
isCommissioningInProgress = false;
6060
}
6161

62-
CHIP_ERROR PlatformSleepManager::RequestHighPerformance()
62+
CHIP_ERROR WifiSleepManager::RequestHighPerformance()
6363
{
6464
VerifyOrReturnError(mHighPerformanceRequestCounter < std::numeric_limits<uint8_t>::max(), CHIP_ERROR_INTERNAL,
6565
ChipLogError(DeviceLayer, "High performance request counter overflow"));
@@ -78,7 +78,7 @@ CHIP_ERROR PlatformSleepManager::RequestHighPerformance()
7878
return CHIP_NO_ERROR;
7979
}
8080

81-
CHIP_ERROR PlatformSleepManager::RemoveHighPerformanceRequest()
81+
CHIP_ERROR WifiSleepManager::RemoveHighPerformanceRequest()
8282
{
8383
VerifyOrReturnError(mHighPerformanceRequestCounter > 0, CHIP_NO_ERROR,
8484
ChipLogError(DeviceLayer, "Wi-Fi configuration already in low power mode"));
@@ -93,7 +93,7 @@ CHIP_ERROR PlatformSleepManager::RemoveHighPerformanceRequest()
9393
return CHIP_NO_ERROR;
9494
}
9595

96-
CHIP_ERROR PlatformSleepManager::TransitionToLowPowerMode()
96+
CHIP_ERROR WifiSleepManager::TransitionToLowPowerMode()
9797
{
9898
VerifyOrReturnError(mHighPerformanceRequestCounter == 0, CHIP_NO_ERROR,
9999
ChipLogDetail(DeviceLayer, "High Performance Requested - Device cannot go to a lower power mode."));

‎src/platform/silabs/wifi/icd/PlatformSleepManager.h ‎src/platform/silabs/wifi/icd/WifiSleepManager.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ namespace DeviceLayer {
2424
namespace Silabs {
2525

2626
/**
27-
* @brief PlatformSleepManager is a singleton class that manages the sleep modes for Wi-Fi devices.
27+
* @brief WifiSleepManager is a singleton class that manages the sleep modes for Wi-Fi devices.
2828
* The class contains the buisness logic associated with optimizing the sleep states based on the Matter SDK internal states
2929
*/
30-
class PlatformSleepManager
30+
class WifiSleepManager
3131
{
3232
public:
33-
PlatformSleepManager(const PlatformSleepManager &) = delete;
34-
PlatformSleepManager & operator=(const PlatformSleepManager &) = delete;
33+
WifiSleepManager(const WifiSleepManager &) = delete;
34+
WifiSleepManager & operator=(const WifiSleepManager &) = delete;
3535

36-
static PlatformSleepManager & GetInstance() { return mInstance; }
36+
static WifiSleepManager & GetInstance() { return mInstance; }
3737

3838
/**
3939
* @brief Init function that configure the SleepManager APIs based on the type of ICD.
@@ -70,8 +70,8 @@ class PlatformSleepManager
7070
void HandleCommissioningSessionStopped();
7171

7272
private:
73-
PlatformSleepManager() = default;
74-
~PlatformSleepManager() = default;
73+
WifiSleepManager() = default;
74+
~WifiSleepManager() = default;
7575

7676
/**
7777
* @brief Transition the device to the Lowest Power State.
@@ -81,7 +81,7 @@ class PlatformSleepManager
8181
*/
8282
CHIP_ERROR TransitionToLowPowerMode();
8383

84-
static PlatformSleepManager mInstance;
84+
static WifiSleepManager mInstance;
8585
bool isCommissioningInProgress = false;
8686

8787
uint8_t mHighPerformanceRequestCounter = 0;

0 commit comments

Comments
 (0)