Skip to content

Commit 86d3417

Browse files
chirag-silabschirag-silabs
committed
adding logs to places where it was missed for the build to pass
1 parent 0e012b2 commit 86d3417

File tree

15 files changed

+48
-48
lines changed

15 files changed

+48
-48
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
extern "C" {
3333
#endif
3434

35-
void efr32InitLog(void);
35+
void silabsInitLog(void);
3636

3737
void efr32Log(const char * aFormat, ...);
38-
#define EFR32_LOG(...) efr32Log(__VA_ARGS__);
38+
#define SILABS_LOG(...) efr32Log(__VA_ARGS__);
3939
void appError(int err);
4040

4141
#ifdef __cplusplus

‎examples/chef/efr32/src/AppTask.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ CHIP_ERROR AppTask::Init()
135135
err = BaseApplication::Init(&gIdentify);
136136
if (err != CHIP_NO_ERROR)
137137
{
138-
EFR32_LOG("BaseApplication::Init() failed");
138+
SILABS_LOG("BaseApplication::Init() failed");
139139
appError(err);
140140
}
141141

@@ -155,11 +155,11 @@ void AppTask::AppTaskMain(void * pvParameter)
155155
CHIP_ERROR err = sAppTask.Init();
156156
if (err != CHIP_NO_ERROR)
157157
{
158-
EFR32_LOG("AppTask.Init() failed");
158+
SILABS_LOG("AppTask.Init() failed");
159159
appError(err);
160160
}
161161

162-
EFR32_LOG("App Task started");
162+
SILABS_LOG("App Task started");
163163

164164
while (true)
165165
{

‎examples/chef/efr32/src/LightingManager.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ CHIP_ERROR LightingManager::Init()
3939

4040
if (sLightTimer == NULL)
4141
{
42-
EFR32_LOG("sLightTimer timer create failed");
42+
SILABS_LOG("sLightTimer timer create failed");
4343
return APP_ERROR_CREATE_TIMER_FAILED;
4444
}
4545

@@ -125,7 +125,7 @@ void LightingManager::StartTimer(uint32_t aTimeoutMs)
125125
{
126126
if (xTimerIsTimerActive(sLightTimer))
127127
{
128-
EFR32_LOG("app timer already started!");
128+
SILABS_LOG("app timer already started!");
129129
CancelTimer();
130130
}
131131

@@ -134,7 +134,7 @@ void LightingManager::StartTimer(uint32_t aTimeoutMs)
134134
// cannot immediately be sent to the timer command queue.
135135
if (xTimerChangePeriod(sLightTimer, (aTimeoutMs / portTICK_PERIOD_MS), 100) != pdPASS)
136136
{
137-
EFR32_LOG("sLightTimer timer start() failed");
137+
SILABS_LOG("sLightTimer timer start() failed");
138138
appError(APP_ERROR_START_TIMER_FAILED);
139139
}
140140
}
@@ -143,7 +143,7 @@ void LightingManager::CancelTimer(void)
143143
{
144144
if (xTimerStop(sLightTimer, 0) == pdFAIL)
145145
{
146-
EFR32_LOG("sLightTimer stop() failed");
146+
SILABS_LOG("sLightTimer stop() failed");
147147
appError(APP_ERROR_STOP_TIMER_FAILED);
148148
}
149149
}
@@ -183,7 +183,7 @@ void LightingManager::AutoTurnOffTimerEventHandler(AppEvent * aEvent)
183183

184184
light->mAutoTurnOffTimerArmed = false;
185185

186-
EFR32_LOG("Auto Turn Off has been triggered!");
186+
SILABS_LOG("Auto Turn Off has been triggered!");
187187

188188
light->InitiateAction(actor, OFF_ACTION);
189189
}
@@ -219,7 +219,7 @@ void LightingManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
219219

220220
light->mAutoTurnOffTimerArmed = true;
221221

222-
EFR32_LOG("Auto Turn off enabled. Will be triggered in %u seconds", light->mAutoTurnOffDuration);
222+
SILABS_LOG("Auto Turn off enabled. Will be triggered in %u seconds", light->mAutoTurnOffDuration);
223223
}
224224
}
225225
}

‎examples/chef/efr32/src/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,16 @@ int main(void)
6565
#endif
6666
chip::DeviceLayer::PlatformMgr().UnlockChipStack();
6767

68-
EFR32_LOG("Starting App Task");
68+
SILABS_LOG("Starting App Task");
6969
if (AppTask::GetAppTask().StartAppTask() != CHIP_NO_ERROR)
7070
appError(CHIP_ERROR_INTERNAL);
7171

72-
EFR32_LOG("Starting FreeRTOS scheduler");
72+
SILABS_LOG("Starting FreeRTOS scheduler");
7373
sl_system_kernel_start();
7474

7575
// Should never get here.
7676
chip::Platform::MemoryShutdown();
77-
EFR32_LOG("vTaskStartScheduler() failed");
77+
SILABS_LOG("vTaskStartScheduler() failed");
7878
appError(CHIP_ERROR_INTERNAL);
7979
}
8080

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ CHIP_ERROR AppTask::Init()
168168
err = RegisterLockEvents();
169169
if (err != CHIP_NO_ERROR)
170170
{
171-
EFR32_LOG("RegisterLockEvents() failed");
171+
SILABS_LOG("RegisterLockEvents() failed");
172172
appError(err);
173173
}
174174
#endif // ENABLE_CHIP_SHELL

‎examples/persistent-storage/efr32/include/AppConfig.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
extern "C" {
2525
#endif
2626

27-
void efr32InitLog(void);
27+
void silabsInitLog(void);
2828

2929
void efr32Log(const char * aFormat, ...);
30-
#define EFR32_LOG(...) efr32Log(__VA_ARGS__);
30+
#define SILABS_LOG(...) efr32Log(__VA_ARGS__);
3131

3232
#ifdef __cplusplus
3333
}

‎examples/persistent-storage/efr32/main.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void TestTask(void * pvParameter)
4040
{
4141
while (true)
4242
{
43-
EFR32_LOG("Running Tests:");
43+
SILABS_LOG("Running Tests:");
4444
chip::RunKvsTest();
4545
vTaskDelay(60000); // Run every minute
4646
}
@@ -51,16 +51,16 @@ int main(void)
5151
init_efrPlatform();
5252

5353
chip::DeviceLayer::PersistedStorage::KeyValueStoreMgrImpl().Init();
54-
EFR32_LOG("==================================================");
55-
EFR32_LOG("chip-efr32-persitent-storage-example starting");
56-
EFR32_LOG("==================================================");
54+
SILABS_LOG("==================================================");
55+
SILABS_LOG("chip-efr32-persitent-storage-example starting");
56+
SILABS_LOG("==================================================");
5757

5858
// Run tests
5959
xTaskCreate(TestTask, "Test", 2048, NULL, 1, &sTestTaskHandle);
60-
EFR32_LOG("Starting FreeRTOS scheduler");
60+
SILABS_LOG("Starting FreeRTOS scheduler");
6161
sl_system_kernel_start();
6262

6363
// Should never get here.
64-
EFR32_LOG("vTaskStartScheduler() failed");
64+
SILABS_LOG("vTaskStartScheduler() failed");
6565
return -1;
6666
}

‎examples/pigweed-app/efr32/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ efr32_sdk("sdk") {
4242
defines = [
4343
"BOARD_ID=${silabs_board}",
4444
"HAL_VCOM_ENABLE=1",
45-
"EFR32_LOG_ENABLED=1",
45+
"SILABS_LOG_ENABLED=1",
4646
"PW_RPC_ENABLED",
4747
]
4848
}

‎examples/pigweed-app/efr32/include/AppConfig.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
extern "C" {
4040
#endif
4141

42-
void efr32InitLog(void);
42+
void silabsInitLog(void);
4343
void efr32Log(const char * aFormat, ...);
44-
#define EFR32_LOG(...) efr32Log(__VA_ARGS__);
44+
#define SILABS_LOG(...) efr32Log(__VA_ARGS__);
4545
void appError(int err);
4646

4747
#ifdef __cplusplus

‎examples/pigweed-app/efr32/src/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void RunRpcService(void *)
6060
int main(void)
6161
{
6262
init_efrPlatform();
63-
EFR32_LOG("***** CHIP EFR32 pigweed example *****\r\n");
63+
SILABS_LOG("***** CHIP EFR32 pigweed example *****\r\n");
6464

6565
pw_sys_io_Init();
6666
// Initialize LEDs

‎examples/shell/efr32/include/AppConfig.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
extern "C" {
5555
#endif
5656

57-
void efr32InitLog(void);
57+
void silabsInitLog(void);
5858

5959
void efr32Log(const char * aFormat, ...);
60-
#define EFR32_LOG(...) efr32Log(__VA_ARGS__);
60+
#define SILABS_LOG(...) efr32Log(__VA_ARGS__);
6161
void appError(int err);
6262

6363
#ifdef __cplusplus

‎examples/shell/efr32/src/main.cpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ using chip::Shell::Engine;
7070

7171
void appError(int err)
7272
{
73-
EFR32_LOG("!!!!!!!!!!!! App Critical Error: %d !!!!!!!!!!!", err);
73+
SILABS_LOG("!!!!!!!!!!!! App Critical Error: %d !!!!!!!!!!!", err);
7474
portDISABLE_INTERRUPTS();
7575
while (true)
7676
;
@@ -102,56 +102,56 @@ int main(void)
102102
MemMonitoring::startHeapMonitoring();
103103
#endif
104104

105-
EFR32_LOG("==================================================");
106-
EFR32_LOG("chip-efr32-shell-example starting");
107-
EFR32_LOG("==================================================");
105+
SILABS_LOG("==================================================");
106+
SILABS_LOG("chip-efr32-shell-example starting");
107+
SILABS_LOG("==================================================");
108108

109-
EFR32_LOG("Init CHIP Stack");
109+
SILABS_LOG("Init CHIP Stack");
110110

111111
// Init Chip memory management before the stack
112112
chip::Platform::MemoryInit();
113113

114114
CHIP_ERROR ret = PlatformMgr().InitChipStack();
115115
if (ret != CHIP_NO_ERROR)
116116
{
117-
EFR32_LOG("PlatformMgr().InitChipStack() failed");
117+
SILABS_LOG("PlatformMgr().InitChipStack() failed");
118118
appError(ret);
119119
}
120120
chip::DeviceLayer::ConnectivityMgr().SetBLEDeviceName("EFR32_SHELL");
121121

122-
EFR32_LOG("Starting Platform Manager Event Loop");
122+
SILABS_LOG("Starting Platform Manager Event Loop");
123123
ret = PlatformMgr().StartEventLoopTask();
124124
if (ret != CHIP_NO_ERROR)
125125
{
126-
EFR32_LOG("PlatformMgr().StartEventLoopTask() failed");
126+
SILABS_LOG("PlatformMgr().StartEventLoopTask() failed");
127127
appError(ret);
128128
}
129129

130130
#if CHIP_ENABLE_OPENTHREAD
131-
EFR32_LOG("Initializing OpenThread stack");
131+
SILABS_LOG("Initializing OpenThread stack");
132132
ret = ThreadStackMgr().InitThreadStack();
133133
if (ret != CHIP_NO_ERROR)
134134
{
135-
EFR32_LOG("ThreadStackMgr().InitThreadStack() failed");
135+
SILABS_LOG("ThreadStackMgr().InitThreadStack() failed");
136136
appError(ret);
137137
}
138138

139139
ret = ConnectivityMgr().SetThreadDeviceType(ConnectivityManager::kThreadDeviceType_Router);
140140
if (ret != CHIP_NO_ERROR)
141141
{
142-
EFR32_LOG("ConnectivityMgr().SetThreadDeviceType() failed");
142+
SILABS_LOG("ConnectivityMgr().SetThreadDeviceType() failed");
143143
appError(ret);
144144
}
145145
#endif // CHIP_ENABLE_OPENTHREAD
146146

147147
#if CHIP_ENABLE_OPENTHREAD
148-
EFR32_LOG("Starting OpenThread task");
148+
SILABS_LOG("Starting OpenThread task");
149149

150150
// Start OpenThread task
151151
ret = ThreadStackMgrImpl().StartThreadTask();
152152
if (ret != CHIP_NO_ERROR)
153153
{
154-
EFR32_LOG("ThreadStackMgr().StartThreadTask() failed");
154+
SILABS_LOG("ThreadStackMgr().StartThreadTask() failed");
155155
appError(ret);
156156
}
157157
#endif // CHIP_ENABLE_OPENTHREAD

‎src/test_driver/efr32/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ efr32_sdk("sdk") {
5757

5858
defines = [
5959
"BOARD_ID=${silabs_board}",
60-
"EFR32_LOG_ENABLED=1",
60+
"SILABS_LOG_ENABLED=1",
6161
"PW_RPC_ENABLED",
6262

6363
# Thread is built but test driver do not have the NETWORK_COMMISSIONING cluster or zap config.

‎src/test_driver/efr32/include/AppConfig.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
extern "C" {
2626
#endif
2727

28-
void efr32InitLog(void);
28+
void silabsInitLog(void);
2929
void efr32Log(const char * aFormat, ...);
30-
#define EFR32_LOG(...) efr32Log(__VA_ARGS__);
30+
#define SILABS_LOG(...) efr32Log(__VA_ARGS__);
3131
void appError(int err);
3232

3333
#ifdef __cplusplus

‎src/test_driver/efr32/src/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@ int main(void)
189189

190190
chip::DeviceLayer::PlatformMgr().InitChipStack();
191191

192-
EFR32_LOG("***** CHIP EFR32 device tests *****\r\n");
192+
SILABS_LOG("***** CHIP EFR32 device tests *****\r\n");
193193

194194
// Start RPC service which runs the tests.
195195
sTestTaskHandle = xTaskCreateStatic(RunRpcService, "RPC_TEST_TASK", ArraySize(sTestTaskStack), nullptr, TEST_TASK_PRIORITY,
196196
sTestTaskStack, &sTestTaskBuffer);
197-
EFR32_LOG("Starting FreeRTOS scheduler");
197+
SILABS_LOG("Starting FreeRTOS scheduler");
198198
sl_system_kernel_start();
199199

200200
// Should never get here.
201-
EFR32_LOG("vTaskStartScheduler() failed");
201+
SILABS_LOG("vTaskStartScheduler() failed");
202202
return -1;
203203
}

0 commit comments

Comments
 (0)