Replace SILABS_LOG with ChipLogging

Author: brosahay

examples/platform/silabs/BaseApplication.cpp

@@ -166,22 +166,7 @@ bool BaseApplication::sIsFactoryResetTriggered        = false;
 LEDWidget * BaseApplication::sAppActionLed            = nullptr;
 BaseApplicationDelegate BaseApplication::sAppDelegate = BaseApplicationDelegate();
 
-#ifdef DIC_ENABLE
-namespace {
-void AppSpecificConnectivityEventCallback(const ChipDeviceEvent * event, intptr_t arg)
-{
-    SILABS_LOG("AppSpecificConnectivityEventCallback: call back for IPV4");
-    if ((event->Type == DeviceEventType::kInternetConnectivityChange) &&
-        (event->InternetConnectivityChange.IPv4 == kConnectivity_Established))
-    {
-        SILABS_LOG("Got IPv4 Address! Starting DIC module\n");
-        if (DIC_OK != dic_init(dic::control::subscribeCB))
-            SILABS_LOG("Failed to initialize DIC module\n");
-    }
-}
-} // namespace
-#endif // DIC_ENABLE
-
+#if CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
 void BaseApplicationDelegate::OnCommissioningSessionStarted()
 {
     isComissioningStarted = true;
@@ -203,7 +188,7 @@ void BaseApplicationDelegate::OnCommissioningWindowClosed()
             ChipLogError(DeviceLayer, "Failed to enable the TA Deep Sleep");
         }
     }
-#endif // CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917qq
+#endif // CHIP_CONFIG_ENABLE_ICD_SERVER && SLI_SI917
 }
 
 void BaseApplicationDelegate::OnFabricCommitted(const FabricTable & fabricTable, FabricIndex fabricIndex)
@@ -234,15 +219,15 @@ CHIP_ERROR BaseApplication::StartAppTask(osThreadFunc_t taskFunction)
     sAppEventQueue = osMessageQueueNew(APP_EVENT_QUEUE_SIZE, sizeof(AppEvent), &appEventQueueAttr);
     if (sAppEventQueue == NULL)
     {
-        SILABS_LOG("Failed to allocate app event queue");
+        ChipLogDetail(AppServer, "Failed to allocate app event queue");
         appError(APP_ERROR_EVENT_QUEUE_FAILED);
     }
 
     // Start App task.
     sAppTaskHandle = osThreadNew(taskFunction, &sAppEventQueue, &appTaskAttr);
     if (sAppTaskHandle == nullptr)
     {
-        SILABS_LOG("Failed to create app task");
+        ChipLogDetail(AppServer, "Failed to create app task");
         appError(APP_ERROR_CREATE_TASK_FAILED);
     }
     return CHIP_NO_ERROR;
@@ -256,12 +241,12 @@ CHIP_ERROR BaseApplication::Init()
     /*
      * Wait for the WiFi to be initialized
      */
-    SILABS_LOG("APP: Wait WiFi Init");
+    ChipLogDetail(AppServer, "APP: Wait WiFi Init");
     while (!wfx_hw_ready())
     {
         vTaskDelay(pdMS_TO_TICKS(10));
     }
-    SILABS_LOG("APP: Done WiFi Init");
+    ChipLogDetail(AppServer, "APP: Done WiFi Init");
     /* We will init server when we get IP */
 
     chip::DeviceLayer::PlatformMgr().LockChipStack();
@@ -278,7 +263,7 @@ CHIP_ERROR BaseApplication::Init()
     );
     if (sFunctionTimer == NULL)
     {
-        SILABS_LOG("funct timer create failed");
+        ChipLogDetail(AppServer, "funct timer create failed");
         appError(APP_ERROR_CREATE_TIMER_FAILED);
     }
 
@@ -290,16 +275,12 @@ CHIP_ERROR BaseApplication::Init()
     );
     if (sLightTimer == NULL)
     {
-        SILABS_LOG("Light Timer create failed");
+        ChipLogDetail(AppServer, "Light Timer create failed");
         appError(APP_ERROR_CREATE_TIMER_FAILED);
     }
 
-    SILABS_LOG("Current Software Version String: %s", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING);
-    SILABS_LOG("Current Software Version: %d", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
-
-#ifdef DIC_ENABLE
-    chip::DeviceLayer::PlatformMgr().AddEventHandler(AppSpecificConnectivityEventCallback, reinterpret_cast<intptr_t>(nullptr));
-#endif // DIC_ENABLE
+    ChipLogDetail(AppServer, "Current Software Version String: %s", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING);
+    ChipLogDetail(AppServer, "Current Software Version: %d", CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION);
 
     ConfigurationMgr().LogDeviceConfig();
 
@@ -549,12 +530,12 @@ void BaseApplication::ButtonHandler(AppEvent * aEvent)
                 chip::DeviceLayer::PlatformMgr().UnlockChipStack();
                 if (err != CHIP_NO_ERROR)
                 {
-                    SILABS_LOG("Failed to open the Basic Commissioning Window");
+                    ChipLogDetail(AppServer, "Failed to open the Basic Commissioning Window");
                 }
             }
             else
             {
-                SILABS_LOG("Network is already provisioned, Ble advertisement not enabled");
+                ChipLogDetail(AppServer, "Network is already provisioned, Ble advertisement not enabled");
 #if CHIP_CONFIG_ENABLE_ICD_SERVER
                 // Temporarily claim network activity, until we implement a "user trigger" reason for ICD wakeups.
                 PlatformMgr().ScheduleWork([](intptr_t) { ICDNotifier::GetInstance().NotifyNetworkActivityNotification(); });
@@ -577,7 +558,7 @@ void BaseApplication::CancelFunctionTimer()
 {
     if (osTimerStop(sFunctionTimer) == osError)
     {
-        SILABS_LOG("app timer stop() failed");
+        ChipLogDetail(AppServer, "app timer stop() failed");
         appError(APP_ERROR_STOP_TIMER_FAILED);
     }
 }
@@ -587,15 +568,15 @@ void BaseApplication::StartFunctionTimer(uint32_t aTimeoutInMs)
     // Starts or restarts the function timer
     if (osTimerStart(sFunctionTimer, pdMS_TO_TICKS(aTimeoutInMs)) != osOK)
     {
-        SILABS_LOG("app timer start() failed");
+        ChipLogDetail(AppServer, "app timer start() failed");
         appError(APP_ERROR_START_TIMER_FAILED);
     }
 }
 
 void BaseApplication::StartFactoryResetSequence()
 {
     // Initiate the factory reset sequence
-    SILABS_LOG("Factory Reset Triggered. Release button within %ums to cancel.", FACTORY_RESET_CANCEL_WINDOW_TIMEOUT);
+    ChipLogDetail(AppServer, "Factory Reset Triggered. Release button within %ums to cancel.", FACTORY_RESET_CANCEL_WINDOW_TIMEOUT);
 
     // Start timer for FACTORY_RESET_CANCEL_WINDOW_TIMEOUT to allow user to
     // cancel, if required.
@@ -624,15 +605,15 @@ void BaseApplication::CancelFactoryResetSequence()
     if (sIsFactoryResetTriggered)
     {
         sIsFactoryResetTriggered = false;
-        SILABS_LOG("Factory Reset has been Canceled");
+        ChipLogDetail(AppServer, "Factory Reset has been Canceled");
     }
 }
 
 void BaseApplication::StartStatusLEDTimer()
 {
     if (osTimerStart(sLightTimer, kLightTimerPeriod) != osOK)
     {
-        SILABS_LOG("Light Time start failed");
+        ChipLogDetail(AppServer, "Light Time start failed");
         appError(APP_ERROR_START_TIMER_FAILED);
     }
 }
@@ -645,7 +626,7 @@ void BaseApplication::StopStatusLEDTimer()
 
     if (osTimerStop(sLightTimer) == osError)
     {
-        SILABS_LOG("Light Time start failed");
+        ChipLogDetail(AppServer, "Light Time start failed");
         appError(APP_ERROR_STOP_TIMER_FAILED);
     }
 }
@@ -762,12 +743,12 @@ void BaseApplication::PostEvent(const AppEvent * aEvent)
     {
         if (osMessageQueuePut(sAppEventQueue, aEvent, osPriorityNormal, 0) != osOK)
         {
-            SILABS_LOG("Failed to post event to app task event queue");
+            ChipLogDetail(AppServer, "Failed to post event to app task event queue");
         }
     }
     else
     {
-        SILABS_LOG("App Event Queue is uninitialized");
+        ChipLogDetail(AppServer, "App Event Queue is uninitialized");
     }
 }
 
@@ -779,7 +760,7 @@ void BaseApplication::DispatchEvent(AppEvent * aEvent)
     }
     else
     {
-        SILABS_LOG("Event received with no handler. Dropping event.");
+        ChipLogDetail(AppServer, "Event received with no handler. Dropping event.");
     }
 }
 
@@ -827,6 +808,16 @@ void BaseApplication::OnPlatformEvent(const ChipDeviceEvent * event, intptr_t)
         // Note: This is only called on Attach, we need to add a method to detect Thread Network Detach
         BaseApplication::sIsProvisioned = event->ServiceProvisioningChange.IsServiceProvisioned;
     }
+#ifdef DIC_ENABLE
+    else if (event->Type == DeviceEventType::kInternetConnectivityChange)
+    {
+        VerifyOrReturn(event->InternetConnectivityChange.IPv4 == kConnectivity_Established);
+        if (DIC_OK != dic_init(dic::control::subscribeCB))
+        {
+            ChipLogDetail(AppServer, "Failed to initialize DIC module");
+        }
+    }
+#endif // DIC_ENABLE
 }
 
 void BaseApplication::OutputQrCode(bool refreshLCD)
@@ -853,7 +844,7 @@ void BaseApplication::OutputQrCode(bool refreshLCD)
     }
     else
     {
-        SILABS_LOG("Getting QR code failed!");
+        ChipLogDetail(AppServer, "Getting QR code failed!");
     }
 }