@@ -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,7 @@ 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." 1000 );
305305 // Start timer for FACTORY_RESET_CANCEL_WINDOW_TIMEOUT to allow user to
306306 // cancel, if required.
307307 sAppTask .StartTimer (FACTORY_RESET_CANCEL_WINDOW_TIMEOUT);
@@ -325,7 +325,7 @@ void AppTask::FunctionHandler(AppEvent * event)
325325 // canceled.
326326 sAppTask .mFunction = Function::kNoneSelected ;
327327
328- P6_LOG (" Factory Reset has been Canceled"
328+ PSOC6_LOG (" Factory Reset has been Canceled"
329329 }
330330 }
331331}
@@ -334,7 +334,7 @@ void AppTask::CancelTimer()
334334{
335335 if (xTimerStop (sFunctionTimer , 0 ) == pdFAIL)
336336 {
337- P6_LOG (" app timer stop() failed"
337+ PSOC6_LOG (" app timer stop() failed"
338338 appError (APP_ERROR_STOP_TIMER_FAILED);
339339 }
340340
@@ -345,7 +345,7 @@ void AppTask::StartTimer(uint32_t aTimeoutInMs)
345345{
346346 if (xTimerIsTimerActive (sFunctionTimer ))
347347 {
348- P6_LOG (" app timer already started!"
348+ PSOC6_LOG (" app timer already started!"
349349 CancelTimer ();
350350 }
351351
@@ -354,7 +354,7 @@ void AppTask::StartTimer(uint32_t aTimeoutInMs)
354354 // cannot immediately be sent to the timer command queue.
355355 if (xTimerChangePeriod (sFunctionTimer , aTimeoutInMs / portTICK_PERIOD_MS, 100 ) != pdPASS)
356356 {
357- P6_LOG (" app timer start() failed"
357+ PSOC6_LOG (" app timer start() failed"
358358 appError (APP_ERROR_START_TIMER_FAILED);
359359 }
360360
@@ -385,11 +385,11 @@ void AppTask::PostEvent(const AppEvent * event)
385385 }
386386
387387 if (!status)
388- P6_LOG (" Failed to post event to app task event queue"
388+ PSOC6_LOG (" Failed to post event to app task event queue"
389389 }
390390 else
391391 {
392- P6_LOG (" Event Queue is NULL should never happen"
392+ PSOC6_LOG (" Event Queue is NULL should never happen"
393393 }
394394}
395395
@@ -401,7 +401,7 @@ void AppTask::DispatchEvent(AppEvent * event)
401401 }
402402 else
403403 {
404- P6_LOG (" Event received with no handler. Dropping event."
404+ PSOC6_LOG (" Event received with no handler. Dropping event."
405405 }
406406}
407407
@@ -414,7 +414,7 @@ void AppTask::OnOffUpdateClusterState(intptr_t context)
414414
415415 if (status != Protocols::InteractionModel::Status::Success)
416416 {
417- P6_LOG (" ERR: updating on/off %x" to_underlying (status));
417+ PSOC6_LOG (" ERR: updating on/off %x" to_underlying (status));
418418 }
419419}
420420
@@ -435,7 +435,7 @@ void AppTask::InitOTARequestor()
435435
436436 gRequestorUser .Init (&gRequestorCore , &gImageProcessor );
437437
438- P6_LOG (" Current Software Version: %u"
439- P6_LOG (" Current Software Version String: %s"
438+ PSOC6_LOG (" Current Software Version: %u"
439+ PSOC6_LOG (" Current Software Version String: %s"
440440}
441441#endif
0 commit comments