@@ -148,7 +148,7 @@ CHIP_ERROR AppTask::StartAppTask()
148148 sAppEventQueue = xQueueCreateStatic (APP_EVENT_QUEUE_SIZE, sizeof (AppEvent), sAppEventQueueBuffer , &sAppEventQueueStruct );
149149 if (sAppEventQueue == NULL )
150150 {
151- P6_LOG (" Failed to allocate app event queue"
151+ PSOC6_LOG (" Failed to allocate app event queue"
152152 appError (APP_ERROR_EVENT_QUEUE_FAILED);
153153 }
154154 // Start App task.
@@ -160,10 +160,10 @@ CHIP_ERROR AppTask::Init()
160160{
161161 CHIP_ERROR err = CHIP_NO_ERROR;
162162#if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
163- int rc = boot_set_confirmed ();
163+ int rc = flash_area_boot_set_confirmed ();
164164 if (rc != 0 )
165165 {
166- P6_LOG ( " boot_set_confirmed failed"
166+ PSOC6_LOG ( " flash_area_boot_set_confirmed failed"
167167 appError (CHIP_ERROR_UNINITIALIZED);
168168 }
169169#endif
@@ -196,11 +196,11 @@ CHIP_ERROR AppTask::Init()
196196 );
197197 if (sFunctionTimer == NULL )
198198 {
199- P6_LOG (" funct timer create failed"
199+ PSOC6_LOG (" funct timer create failed"
200200 appError (APP_ERROR_CREATE_TIMER_FAILED);
201201 }
202202 NetWorkCommissioningInstInit ();
203- P6_LOG (" Current Software Version: %s"
203+ PSOC6_LOG (" Current Software Version: %s"
204204
205205 // Initialize LEDs
206206 sStatusLED .Init (SYSTEM_STATE_LED);
@@ -221,11 +221,11 @@ void AppTask::AppTaskMain(void * pvParameter)
221221 CHIP_ERROR err = sAppTask .Init ();
222222 if (err != CHIP_NO_ERROR)
223223 {
224- P6_LOG (" AppTask.Init() failed"
224+ PSOC6_LOG (" AppTask.Init() failed"
225225 appError (err);
226226 }
227227
228- P6_LOG (" App Task started"
228+ PSOC6_LOG (" App Task started"
229229
230230 while (true )
231231 {
@@ -301,7 +301,8 @@ void AppTask::FunctionHandler(AppEvent * event)
301301 {
302302 if (!sAppTask .mFunctionTimerActive && sAppTask .mFunction == Function::kNoneSelected )
303303 {
304- P6_LOG (" Factory Reset Triggered. Press button again within %us to cancel." 1000 );
304+ PSOC6_LOG (" Factory Reset Triggered. Press button again within %us to cancel."
305+ FACTORY_RESET_CANCEL_WINDOW_TIMEOUT / 1000 );
305306 // Start timer for FACTORY_RESET_CANCEL_WINDOW_TIMEOUT to allow user to
306307 // cancel, if required.
307308 sAppTask .StartTimer (FACTORY_RESET_CANCEL_WINDOW_TIMEOUT);
@@ -325,7 +326,7 @@ void AppTask::FunctionHandler(AppEvent * event)
325326 // canceled.
326327 sAppTask .mFunction = Function::kNoneSelected ;
327328
328- P6_LOG (" Factory Reset has been Canceled"
329+ PSOC6_LOG (" Factory Reset has been Canceled"
329330 }
330331 }
331332}
@@ -334,7 +335,7 @@ void AppTask::CancelTimer()
334335{
335336 if (xTimerStop (sFunctionTimer , 0 ) == pdFAIL)
336337 {
337- P6_LOG (" app timer stop() failed"
338+ PSOC6_LOG (" app timer stop() failed"
338339 appError (APP_ERROR_STOP_TIMER_FAILED);
339340 }
340341
@@ -345,7 +346,7 @@ void AppTask::StartTimer(uint32_t aTimeoutInMs)
345346{
346347 if (xTimerIsTimerActive (sFunctionTimer ))
347348 {
348- P6_LOG (" app timer already started!"
349+ PSOC6_LOG (" app timer already started!"
349350 CancelTimer ();
350351 }
351352
@@ -354,7 +355,7 @@ void AppTask::StartTimer(uint32_t aTimeoutInMs)
354355 // cannot immediately be sent to the timer command queue.
355356 if (xTimerChangePeriod (sFunctionTimer , aTimeoutInMs / portTICK_PERIOD_MS, 100 ) != pdPASS)
356357 {
357- P6_LOG (" app timer start() failed"
358+ PSOC6_LOG (" app timer start() failed"
358359 appError (APP_ERROR_START_TIMER_FAILED);
359360 }
360361
@@ -385,11 +386,11 @@ void AppTask::PostEvent(const AppEvent * event)
385386 }
386387
387388 if (!status)
388- P6_LOG (" Failed to post event to app task event queue"
389+ PSOC6_LOG (" Failed to post event to app task event queue"
389390 }
390391 else
391392 {
392- P6_LOG (" Event Queue is NULL should never happen"
393+ PSOC6_LOG (" Event Queue is NULL should never happen"
393394 }
394395}
395396
@@ -401,7 +402,7 @@ void AppTask::DispatchEvent(AppEvent * event)
401402 }
402403 else
403404 {
404- P6_LOG (" Event received with no handler. Dropping event."
405+ PSOC6_LOG (" Event received with no handler. Dropping event."
405406 }
406407}
407408
@@ -414,7 +415,7 @@ void AppTask::OnOffUpdateClusterState(intptr_t context)
414415
415416 if (status != Protocols::InteractionModel::Status::Success)
416417 {
417- P6_LOG (" ERR: updating on/off %x" to_underlying (status));
418+ PSOC6_LOG (" ERR: updating on/off %x" to_underlying (status));
418419 }
419420}
420421
@@ -435,7 +436,7 @@ void AppTask::InitOTARequestor()
435436
436437 gRequestorUser .Init (&gRequestorCore , &gImageProcessor );
437438
438- P6_LOG (" Current Software Version: %u"
439- P6_LOG (" Current Software Version String: %s"
439+ PSOC6_LOG (" Current Software Version: %u"
440+ PSOC6_LOG (" Current Software Version String: %s"
440441}
441442#endif
0 commit comments