Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SL-ONLY] Update sl_apps Apptask Init to AppInit post change in baseApplication #345

Merged
merged 1 commit into from
Mar 14, 2025
Merged

[SL-ONLY] Update sl_apps Apptask Init to AppInit post change in baseApplication #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/dishwasher-app/silabs/include/AppTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ class AppTask : public BaseApplication
private:
static AppTask sAppTask;
/**
* @brief AppTask initialisation function
* @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
*
* @return CHIP_ERROR
*/
CHIP_ERROR Init();
CHIP_ERROR AppInit() override;

/**
* @brief PB0 Button event processing function
Expand Down
9 changes: 1 addition & 8 deletions examples/dishwasher-app/silabs/src/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ static EnergyReportingTestEventTriggerHandler sEnergyReportingTestEventTriggerHa
static DeviceEnergyManagementTestEventTriggerHandler sDeviceEnergyManagementTestEventTriggerHandler;
#endif

CHIP_ERROR AppTask::Init()
CHIP_ERROR AppTask::AppInit()
{
CHIP_ERROR err = CHIP_NO_ERROR;
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
Expand All @@ -69,13 +69,6 @@ CHIP_ERROR AppTask::Init()
GetLCD().Init((uint8_t *) "Dishwasher-App");
#endif

err = BaseApplication::Init();
if (err != CHIP_NO_ERROR)
{
SILABS_LOG("BaseApplication::Init() failed");
appError(err);
}

PlatformMgr().LockChipStack();
err = DeviceEnergyManager::Instance().Init();
PlatformMgr().UnlockChipStack();
Expand Down
4 changes: 2 additions & 2 deletions examples/fan-control-app/silabs/include/AppTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ class AppTask : public BaseApplication

private:
/**
* @brief AppTask initialisation function
* @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
*
* @return CHIP_ERROR
*/
CHIP_ERROR Init();
CHIP_ERROR AppInit() override;

static AppTask sAppTask;

Expand Down
9 changes: 1 addition & 8 deletions examples/fan-control-app/silabs/src/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ using namespace chip::app::Clusters;

AppTask AppTask::sAppTask;

CHIP_ERROR AppTask::Init()
CHIP_ERROR AppTask::AppInit()
{
CHIP_ERROR err = CHIP_NO_ERROR;
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
Expand All @@ -75,13 +75,6 @@ CHIP_ERROR AppTask::Init()
GetLCD().SetCustomUI(FanControlUI::DrawUI);
#endif

err = BaseApplication::Init();
if (err != CHIP_NO_ERROR)
{
ChipLogError(AppServer, "BaseApplication::Init() failed");
appError(err);
}

err = FanControlMgr().Init();
if (err != CHIP_NO_ERROR)
{
Expand Down
4 changes: 2 additions & 2 deletions examples/multi-sensor-app/silabs/include/AppTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@ class AppTask : public BaseApplication
};

/**
* @brief AppTask initialisation function
* @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
*
* @return CHIP_ERROR
*/
CHIP_ERROR Init();
CHIP_ERROR AppInit() override;

#ifdef DISPLAY_ENABLED
/**
Expand Down
9 changes: 1 addition & 8 deletions examples/multi-sensor-app/silabs/src/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,14 @@ constexpr uint8_t kOccupancyLedId = 0;

AppTask AppTask::sAppTask;

CHIP_ERROR AppTask::Init()
CHIP_ERROR AppTask::AppInit()
{
CHIP_ERROR err = CHIP_NO_ERROR;
GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
#ifdef DISPLAY_ENABLED
GetLCD().Init((uint8_t *) SENSOR_NAME);
#endif

err = BaseApplication::Init();
if (err != CHIP_NO_ERROR)
{
ChipLogError(AppServer, "BaseApplication::Init() failed");
appError(err);
}

sOccupancyLed.Init(kOccupancyLedId);
sOccupancyLed.Set(false);

Expand Down
4 changes: 2 additions & 2 deletions examples/onoff-plug-app/silabs/include/AppTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ class AppTask : public BaseApplication
static void UpdateClusterState(intptr_t context);

/**
* @brief AppTask initialisation function
* @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
*
* @return CHIP_ERROR
*/
CHIP_ERROR Init();
CHIP_ERROR AppInit() override;

static void TimerEventHandler(TimerHandle_t xTimer);
};
9 changes: 1 addition & 8 deletions examples/onoff-plug-app/silabs/src/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ using namespace ::chip::DeviceLayer;

AppTask AppTask::sAppTask;

CHIP_ERROR AppTask::Init()
CHIP_ERROR AppTask::AppInit()
{
CHIP_ERROR err = CHIP_NO_ERROR;
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
Expand All @@ -71,13 +71,6 @@ CHIP_ERROR AppTask::Init()
GetLCD().Init((uint8_t *) "onoffPlug-App");
#endif

err = BaseApplication::Init();
if (err != CHIP_NO_ERROR)
{
SILABS_LOG("BaseApplication::Init() failed");
appError(err);
}

err = PlugMgr().Init();
if (err != CHIP_NO_ERROR)
{
Expand Down
7 changes: 6 additions & 1 deletion examples/template/silabs/include/AppTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@ class AppTask : public BaseApplication
private:
friend AppTask & GetAppTask(void);

CHIP_ERROR Init();
/**
* @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
*
* @return CHIP_ERROR
*/
CHIP_ERROR AppInit() override;
static AppTask sAppTask;
/**
* @brief PB0 Button event processing function
Expand Down
9 changes: 1 addition & 8 deletions examples/template/silabs/src/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,11 @@ using namespace ::chip::DeviceLayer;

AppTask AppTask::sAppTask;

CHIP_ERROR AppTask::Init()
CHIP_ERROR AppTask::AppInit()
{
CHIP_ERROR err = CHIP_NO_ERROR;
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);

err = BaseApplication::Init();
if (err != CHIP_NO_ERROR)
{
SILABS_LOG("BaseApplication::Init() failed");
appError(err);
}

return err;
}

Expand Down
4 changes: 2 additions & 2 deletions examples/zigbee-matter-light/silabs/include/AppTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ class AppTask : public BaseApplication
static void UpdateClusterState(intptr_t context);

/**
* @brief AppTask initialisation function
* @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
*
* @return CHIP_ERROR
*/
CHIP_ERROR Init();
CHIP_ERROR AppInit() override;

/**
* @brief PB0 Button event processing function
Expand Down
9 changes: 1 addition & 8 deletions examples/zigbee-matter-light/silabs/src/AppTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ using namespace ::chip::DeviceLayer;

AppTask AppTask::sAppTask;

CHIP_ERROR AppTask::Init()
CHIP_ERROR AppTask::AppInit()
{
CHIP_ERROR err = CHIP_NO_ERROR;
app::SetAttributePersistenceProvider(&gDeferredAttributePersister);
Expand All @@ -113,13 +113,6 @@ CHIP_ERROR AppTask::Init()
ChipLogProgress(AppServer, "Sequential CMP app");
#endif

err = BaseApplication::Init();
if (err != CHIP_NO_ERROR)
{
SILABS_LOG("BaseApplication::Init() failed");
appError(err);
}

err = LightMgr().Init();
if (err != CHIP_NO_ERROR)
{
Expand Down
Loading