Skip to content

Commit 10bc21e

Browse files
asirko-softasirko-soft
authored
Merge branch 'master' into tc_cnet_4_10_automate
2 parents 523e694 + 132a7a8 commit 10bc21e

File tree

65 files changed

+180
-182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+180
-182
lines changed

‎examples/air-quality-sensor-app/silabs/include/AppConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#define APP_TASK_NAME "AQS"
2727

28-
#define BLE_DEV_NAME "SiLabs-Air-Quality-Sensor"
28+
#define BLE_DEV_NAME "SL-" APP_TASK_NAME
2929

3030
// Time it takes in ms for the simulated actuator to move from one
3131
// APP Logo, boolean only. must be 64x64

‎examples/air-quality-sensor-app/silabs/src/AppTask.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ CHIP_ERROR AppTask::AppInit()
7373
CHIP_ERROR err = CHIP_NO_ERROR;
7474
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
7575
#ifdef DISPLAY_ENABLED
76-
GetLCD().Init((uint8_t *) "Air-Quality-Sensor");
7776
GetLCD().SetCustomUI(AirQualitySensorUI::DrawUI);
7877
#endif
7978

‎examples/chef/silabs/include/AppConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
// ---- Lighting Example App Config ----
2424

25-
#define APP_TASK_NAME "Lit"
25+
#define APP_TASK_NAME "Chef"
2626

2727
// Time it takes in ms for the simulated actuator to move from one
2828
// state to another.

‎examples/contact-sensor-app/nxp/k32w1/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ chip_enable_ble = true
2727
chip_generate_link_map_file = true
2828

2929
chip_system_config_provide_statistics = false
30-
chip_system_config_use_open_thread_inet_endpoints = true
30+
chip_system_config_use_openthread_inet_endpoints = true
3131
chip_with_lwip = false
3232

3333
chip_enable_icd_server = true

‎examples/contact-sensor-app/nxp/mcxw71/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ chip_enable_ble = true
2626
chip_generate_link_map_file = true
2727

2828
chip_system_config_provide_statistics = false
29-
chip_system_config_use_open_thread_inet_endpoints = true
29+
chip_system_config_use_openthread_inet_endpoints = true
3030
chip_with_lwip = false
3131

3232
chip_enable_icd_server = true

‎examples/dishwasher-app/silabs/include/AppTask.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ class AppTask : public BaseApplication
7575
private:
7676
static AppTask sAppTask;
7777
/**
78-
* @brief AppTask initialisation function
78+
* @brief Override of BaseApplication::AppInit() virtual method, called by BaseApplication::Init()
7979
*
8080
* @return CHIP_ERROR
8181
*/
82-
CHIP_ERROR Init();
82+
CHIP_ERROR AppInit() override;
8383

8484
/**
8585
* @brief PB0 Button event processing function

‎examples/dishwasher-app/silabs/src/AppTask.cpp

+1-12
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,11 @@ static EnergyReportingTestEventTriggerHandler sEnergyReportingTestEventTriggerHa
6060
static DeviceEnergyManagementTestEventTriggerHandler sDeviceEnergyManagementTestEventTriggerHandler;
6161
#endif
6262

63-
CHIP_ERROR AppTask::Init()
63+
CHIP_ERROR AppTask::AppInit()
6464
{
6565
CHIP_ERROR err = CHIP_NO_ERROR;
6666
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
6767

68-
#ifdef DISPLAY_ENABLED
69-
GetLCD().Init((uint8_t *) "Dishwasher-App");
70-
#endif
71-
72-
err = BaseApplication::Init();
73-
if (err != CHIP_NO_ERROR)
74-
{
75-
SILABS_LOG("BaseApplication::Init() failed");
76-
appError(err);
77-
}
78-
7968
PlatformMgr().LockChipStack();
8069
err = DeviceEnergyManager::Instance().Init();
8170
PlatformMgr().UnlockChipStack();

‎examples/energy-management-app/silabs/include/AppConfig.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323

2424
// ---- EVSE Example App Config ----
2525

26+
#if SL_MATTER_CONFIG_ENABLE_EXAMPLE_EVSE_DEVICE
2627
#define APP_TASK_NAME "EVSE"
28+
#else
29+
#define APP_TASK_NAME "W-Heater"
30+
#endif
2731

28-
#define BLE_DEV_NAME "SiLabs-EVSE"
32+
#define BLE_DEV_NAME "SL-" APP_TASK_NAME

‎examples/energy-management-app/silabs/src/AppTask.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -181,15 +181,6 @@ CHIP_ERROR AppTask::AppInit()
181181
{
182182
CHIP_ERROR err = CHIP_NO_ERROR;
183183
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
184-
185-
#ifdef DISPLAY_ENABLED
186-
#if SL_MATTER_CONFIG_ENABLE_EXAMPLE_EVSE_DEVICE
187-
GetLCD().Init((uint8_t *) "energy-management-App (EVSE)");
188-
#elif SL_CONFIG_ENABLE_EXAMPLE_WATER_HEATER_DEVICE
189-
GetLCD().Init((uint8_t *) "energy-management-App (WaterHeater)");
190-
#endif
191-
#endif
192-
193184
ApplicationInit();
194185

195186
#ifdef SL_MATTER_TEST_EVENT_TRIGGER_ENABLED

‎examples/light-switch-app/silabs/include/AppConfig.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
// ---- Lighting Example App Config ----
2525

26-
#define APP_TASK_NAME "Lit"
26+
#define APP_TASK_NAME "Light-Sw"
2727

28-
#define BLE_DEV_NAME "SiLabs-Light-Switch"
28+
#define BLE_DEV_NAME "SL-" APP_TASK_NAME
2929

3030
// Time it takes in ms for the simulated actuator to move from one
3131
// state to another.

‎examples/light-switch-app/silabs/src/AppTask.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ CHIP_ERROR AppTask::AppInit()
7676
CHIP_ERROR err = CHIP_NO_ERROR;
7777
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
7878

79-
#ifdef DISPLAY_ENABLED
80-
GetLCD().Init((uint8_t *) "Light Switch");
81-
#endif
82-
8379
err = LightSwitchMgr::GetInstance().Init(kLightSwitchEndpoint, kGenericSwitchEndpoint);
8480
if (err != CHIP_NO_ERROR)
8581
{

‎examples/lighting-app/nxp/k32w1/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ chip_openthread_ftd = true
3333
nxp_enable_ot_cli = false
3434

3535
chip_system_config_provide_statistics = false
36-
chip_system_config_use_open_thread_inet_endpoints = true
36+
chip_system_config_use_openthread_inet_endpoints = true
3737
chip_with_lwip = false
3838
#nxp_use_smu2_static = true
3939
#nxp_use_smu2_dynamic = true

‎examples/lighting-app/nxp/k32w1/with_pw_rpc.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ chip_openthread_ftd = true
2828
chip_stack_lock_tracking = "fatal"
2929

3030
chip_system_config_provide_statistics = false
31-
chip_system_config_use_open_thread_inet_endpoints = true
31+
chip_system_config_use_openthread_inet_endpoints = true
3232

3333
chip_with_lwip = false
3434
nxp_enable_ot_cli = false

‎examples/lighting-app/nxp/mcxw71/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ chip_openthread_ftd = true
3333
nxp_enable_ot_cli = false
3434

3535
chip_system_config_provide_statistics = false
36-
chip_system_config_use_open_thread_inet_endpoints = true
36+
chip_system_config_use_openthread_inet_endpoints = true
3737
chip_with_lwip = false
3838
#nxp_use_smu2_static = true
3939
#nxp_use_smu2_dynamic = true

‎examples/lighting-app/nxp/mcxw71/with_pw_rpc.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ chip_openthread_ftd = true
2828
chip_stack_lock_tracking = "fatal"
2929

3030
chip_system_config_provide_statistics = false
31-
chip_system_config_use_open_thread_inet_endpoints = true
31+
chip_system_config_use_openthread_inet_endpoints = true
3232

3333
chip_with_lwip = false
3434
nxp_enable_ot_cli = false

‎examples/lighting-app/silabs/include/AppConfig.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
// ---- Lighting Example App Config ----
2525

26-
#define APP_TASK_NAME "Lit"
26+
#define APP_TASK_NAME "Light"
2727

28-
#define BLE_DEV_NAME "SiLabs-Light"
28+
#define BLE_DEV_NAME "SL-" APP_TASK_NAME
2929

3030
// Time it takes in ms for the simulated actuator to move from one
3131
// state to another.

‎examples/lighting-app/silabs/src/AppTask.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@ CHIP_ERROR AppTask::AppInit()
6767
CHIP_ERROR err = CHIP_NO_ERROR;
6868
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
6969

70-
#ifdef DISPLAY_ENABLED
71-
GetLCD().Init((uint8_t *) "Lighting-App");
72-
#endif
73-
7470
err = LightMgr().Init();
7571
if (err != CHIP_NO_ERROR)
7672
{

‎examples/lit-icd-app/silabs/include/AppConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#define APP_TASK_NAME "Lit"
2626

27-
#define BLE_DEV_NAME "SiLabs-LIT-ICD"
27+
#define BLE_DEV_NAME "SL-" APP_TASK_NAME
2828

2929
// APP Logo, boolean only. must be 64x64
3030
#define ON_DEMO_BITMAP \

‎examples/lit-icd-app/silabs/src/AppTask.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@ CHIP_ERROR AppTask::AppInit()
7272
{
7373
CHIP_ERROR err = CHIP_NO_ERROR;
7474
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
75-
76-
#ifdef DISPLAY_ENABLED
77-
GetLCD().Init((uint8_t *) "LIT ICD");
78-
#endif
79-
8075
return err;
8176
}
8277

‎examples/lock-app/nxp/k32w1/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ chip_enable_ble = true
2626
chip_generate_link_map_file = true
2727

2828
chip_system_config_provide_statistics = false
29-
chip_system_config_use_open_thread_inet_endpoints = true
29+
chip_system_config_use_openthread_inet_endpoints = true
3030
chip_with_lwip = false
3131

3232
chip_enable_icd_server = true

‎examples/lock-app/nxp/mcxw71/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ chip_enable_ble = true
2626
chip_generate_link_map_file = true
2727

2828
chip_system_config_provide_statistics = false
29-
chip_system_config_use_open_thread_inet_endpoints = true
29+
chip_system_config_use_openthread_inet_endpoints = true
3030
chip_with_lwip = false
3131

3232
chip_enable_icd_server = true

‎examples/lock-app/silabs/include/AppConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#define APP_TASK_NAME "Lock"
2727

28-
#define BLE_DEV_NAME "SiLabs-Door-Lock"
28+
#define BLE_DEV_NAME "SL-" APP_TASK_NAME
2929

3030
// Time it takes in ms for the simulated actuator to move from one
3131
// state to another.

‎examples/lock-app/silabs/src/AppTask.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,6 @@ CHIP_ERROR AppTask::AppInit()
122122

123123
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
124124

125-
#ifdef DISPLAY_ENABLED
126-
GetLCD().Init((uint8_t *) "Lock-App", true);
127-
#endif
128-
129125
#if defined(ENABLE_CHIP_SHELL)
130126
err = RegisterLockEvents();
131127
if (err != CHIP_NO_ERROR)

‎examples/lock-app/silabs/src/EventHandlerLibShell.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -209,4 +209,7 @@ void EventWorkerFunction(intptr_t context)
209209
break;
210210
}
211211
}
212+
213+
// free the allocated memory from the event handlers
214+
Platform::Delete(data);
212215
}

‎examples/persistent-storage/qpg/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import("${chip_root}/examples/platform/qpg/args.gni")
1919
qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain")
2020
chip_enable_openthread = false
2121
chip_openthread_ftd = false
22-
chip_system_config_use_open_thread_inet_endpoints = true
22+
chip_system_config_use_openthread_inet_endpoints = true
2323
chip_with_lwip = false
2424

2525
lwip_debug = false

‎examples/platform/qpg/args.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import("//build_overrides/chip.gni")
1717
import("${chip_root}/src/platform/qpg/args.gni")
1818

1919
chip_enable_openthread = true
20-
chip_system_config_use_open_thread_inet_endpoints = true
20+
chip_system_config_use_openthread_inet_endpoints = true
2121
chip_with_lwip = false
2222
openthread_project_core_config_file = "OpenThreadConfig.h"
2323
openthread_core_config_deps = []

‎examples/platform/silabs/BaseApplication.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,10 @@ CHIP_ERROR BaseApplication::BaseInit()
288288
{
289289
CHIP_ERROR err = CHIP_NO_ERROR;
290290

291+
#ifdef DISPLAY_ENABLED
292+
GetLCD().Init((uint8_t *) APP_TASK_NAME);
293+
#endif
294+
291295
#ifdef SL_WIFI
292296
/*
293297
* Wait for the WiFi to be initialized

‎examples/pump-app/silabs/include/AppConfig.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
// ---- Lighting Example App Config ----
2525

26-
#define APP_TASK_NAME "Lit"
26+
#define APP_TASK_NAME "Pump"
2727

28-
#define BLE_DEV_NAME "SiLabs-Pump"
28+
#define BLE_DEV_NAME "SL-" APP_TASK_NAME
2929

3030
#define ON_DEMO_BITMAP \
3131
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, \

‎examples/pump-app/silabs/src/AppTask.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ CHIP_ERROR AppTask::AppInit()
7676
CHIP_ERROR err = CHIP_NO_ERROR;
7777
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
7878

79-
#ifdef DISPLAY_ENABLED
80-
GetLCD().Init((uint8_t *) "Pump-App");
81-
#endif
82-
8379
err = PumpMgr().Init();
8480
if (err != CHIP_NO_ERROR)
8581
{

‎examples/refrigerator-app/silabs/include/AppConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#define APP_TASK_NAME "Refr"
2626

27-
#define BLE_DEV_NAME "SiLabs-Refrigerator"
27+
#define BLE_DEV_NAME "SL-" APP_TASK_NAME
2828

2929
// Time it takes in ms for the simulated actuator to move from one
3030
// state to another.

‎examples/refrigerator-app/silabs/src/AppTask.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,6 @@ CHIP_ERROR AppTask::AppInit()
8080
CHIP_ERROR err = CHIP_NO_ERROR;
8181
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
8282

83-
#ifdef DISPLAY_ENABLED
84-
GetLCD().Init((uint8_t *) "Refrigrator-App");
85-
#endif
86-
8783
err = RefrigeratorMgr().Init();
8884
if (err != CHIP_NO_ERROR)
8985
{

‎examples/smoke-co-alarm-app/silabs/include/AppConfig.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
// ---- Smoke CO Alarm Example App Config ----
2323

24-
#define APP_TASK_NAME "Alm"
24+
#define APP_TASK_NAME "Smoke"
2525

26-
#define BLE_DEV_NAME "SiLabs-Alarm"
26+
#define BLE_DEV_NAME "SL-" APP_TASK_NAME
2727

2828
// Time it takes in ms for the simulated actuator to move from one
2929
// state to another.

‎examples/smoke-co-alarm-app/silabs/src/AppTask.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ CHIP_ERROR AppTask::AppInit()
5959
CHIP_ERROR err = CHIP_NO_ERROR;
6060
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
6161

62-
#ifdef DISPLAY_ENABLED
63-
GetLCD().Init((uint8_t *) "Smoke-CO-Alarm-App");
64-
#endif
65-
6662
err = AlarmMgr().Init();
6763
if (err != CHIP_NO_ERROR)
6864
{

‎examples/thermostat/silabs/include/AppConfig.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
// ---- Lighting Example App Config ----
2525

26-
#define APP_TASK_NAME "Lit"
26+
#define APP_TASK_NAME "Therm"
2727

28-
#define BLE_DEV_NAME "SiLabs-Thermostat"
28+
#define BLE_DEV_NAME "SL-" APP_TASK_NAME
2929

3030
// Time it takes in ms for the simulated actuator to move from one
3131
// state to another.

‎examples/thermostat/silabs/src/AppTask.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ CHIP_ERROR AppTask::AppInit()
7979
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
8080

8181
#ifdef DISPLAY_ENABLED
82-
GetLCD().Init((uint8_t *) "Thermostat-App");
8382
GetLCD().SetCustomUI(ThermostatUI::DrawUI);
8483
#endif
8584

‎examples/window-app/silabs/include/AppConfig.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include "silabs_utils.h"
2323

2424
// ---- Window Example App Config ----
25-
#define APP_TASK_NAME "APP"
25+
#define APP_TASK_NAME "Window"
2626
#define APP_EVENT_QUEUE_SIZE 20
27-
#define BLE_DEV_NAME "SiLabs-Window"
27+
#define BLE_DEV_NAME "SL-" APP_TASK_NAME
2828

2929
#define LCD_SIZE 128
3030
#define LCD_MARGIN_SIZE 1

‎examples/window-app/silabs/src/AppTask.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ CHIP_ERROR AppTask::AppInit()
5050
CHIP_ERROR err = CHIP_NO_ERROR;
5151
chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(WindowManager::ButtonEventHandler);
5252

53-
#ifdef DISPLAY_ENABLED
54-
GetLCD().Init((uint8_t *) "Window-App");
55-
#endif
56-
5753
err = WindowManager::sWindow.Init();
5854

5955
if (err != CHIP_NO_ERROR)

0 commit comments

Comments
 (0)