Add to_underlying in examples

project-chip · Feb 13, 2024 · 00a209c · 00a209c
1 parent 96b1ac1
commit 00a209c
Show file tree

Hide file tree

Showing 45 changed files with 110 additions and 109 deletions.
diff --git a/examples/all-clusters-app/asr/src/AppTask.cpp b/examples/all-clusters-app/asr/src/AppTask.cpp
@@ -272,7 +272,7 @@ void AppTask::OnOffUpdateClusterState(void)
 
     if (status != Status::Success)
     {
-        ASR_LOG("ERR: updating on/off %x", status);
+        ASR_LOG("ERR: updating on/off %x", to_underlying(status));
     }
 }
 

diff --git a/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp b/examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp
@@ -413,7 +413,7 @@ void AppTask::OnOffUpdateClusterState(intptr_t context)
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        P6_LOG("ERR: updating on/off %x", status);
+        P6_LOG("ERR: updating on/off %x", to_underlying(status));
     }
 }
 

diff --git a/examples/all-clusters-app/nrfconnect/main/ZclDoorLockCallbacks.cpp b/examples/all-clusters-app/nrfconnect/main/ZclDoorLockCallbacks.cpp
@@ -58,6 +58,6 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint)
     Protocols::InteractionModel::Status status = DoorLock::Attributes::FeatureMap::Set(endpoint, 0);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        LOG_ERR("Updating feature map %x", status);
+        LOG_ERR("Updating feature map %x", to_underlying(status));
     }
 }
diff --git a/examples/all-clusters-app/telink/src/ZclDoorLockCallbacks.cpp b/examples/all-clusters-app/telink/src/ZclDoorLockCallbacks.cpp
@@ -58,6 +58,6 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint)
     Protocols::InteractionModel::Status status = DoorLock::Attributes::FeatureMap::Set(endpoint, 0);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        LOG_ERR("Updating feature map %x", status);
+        LOG_ERR("Updating feature map %x", to_underlying(status));
     }
 }
diff --git a/examples/all-clusters-minimal-app/asr/src/AppTask.cpp b/examples/all-clusters-minimal-app/asr/src/AppTask.cpp
@@ -225,7 +225,7 @@ void AppTask::OnOffUpdateClusterState(void)
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ASR_LOG("ERR: updating on/off %x", status);
+        ASR_LOG("ERR: updating on/off %x", to_underlying(status));
     }
 }
 

diff --git a/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp b/examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp
@@ -410,7 +410,7 @@ void AppTask::OnOffUpdateClusterState(intptr_t context)
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        P6_LOG("ERR: updating on/off %x", status);
+        P6_LOG("ERR: updating on/off %x", to_underlying(status));
     }
 }
 

diff --git a/examples/bridge-app/telink/src/AppTask.cpp b/examples/bridge-app/telink/src/AppTask.cpp
@@ -597,12 +597,12 @@ void AppTask::UpdateClusterState(void)
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        LOG_ERR("Update OnOff fail: %x", status);
+        LOG_ERR("Update OnOff fail: %x", to_underlying(status));
     }
     uint8_t setLevel = sAppTask.mPwmRgbBlueLed.GetLevel();
     status           = Clusters::LevelControl::Attributes::CurrentLevel::Set(kExampleEndpointId, setLevel);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        LOG_ERR("Update CurrentLevel fail: %x", status);
+        LOG_ERR("Update CurrentLevel fail: %x", to_underlying(status));
     }
 }
diff --git a/examples/common/imgui_ui/windows/light.cpp b/examples/common/imgui_ui/windows/light.cpp
@@ -76,7 +76,7 @@ void Light::UpdateState()
 
         if (status != chip::Protocols::InteractionModel::Status::Success)
         {
-            ChipLogError(AppServer, "Failed to set on/off value: %d", status);
+            ChipLogError(AppServer, "Failed to set on/off value: %d", to_underlying(status));
         }
 
         mTargetLightIsOn.ClearValue();

diff --git a/examples/contact-sensor-app/nxp/k32w/k32w0/main/AppTask.cpp b/examples/contact-sensor-app/nxp/k32w/k32w0/main/AppTask.cpp
@@ -895,7 +895,7 @@ void AppTask::UpdateClusterStateInternal(intptr_t arg)
     Protocols::InteractionModel::Status status = app::Clusters::BooleanState::Attributes::StateValue::Set(1, newValue);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(NotSpecified, "ERR: updating boolean status value %x", status);
+        ChipLogError(NotSpecified, "ERR: updating boolean status value %x", to_underlying(status));
     }
     logBooleanStateEvent(newValue);
 }

diff --git a/examples/contact-sensor-app/nxp/k32w/k32w1/main/AppTask.cpp b/examples/contact-sensor-app/nxp/k32w/k32w1/main/AppTask.cpp
@@ -798,7 +798,7 @@ void AppTask::UpdateClusterStateInternal(intptr_t arg)
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(NotSpecified, "ERR: updating boolean status value %x", status);
+        ChipLogError(NotSpecified, "ERR: updating boolean status value %x", to_underlying(status));
     }
     logBooleanStateEvent(newValue);
 }

diff --git a/examples/contact-sensor-app/telink/src/AppTask.cpp b/examples/contact-sensor-app/telink/src/AppTask.cpp
@@ -98,7 +98,7 @@ void AppTask::UpdateClusterStateInternal(intptr_t arg)
     Protocols::InteractionModel::Status status = app::Clusters::BooleanState::Attributes::StateValue::Set(1, newValue);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(NotSpecified, "ERR: updating boolean status value %x", status);
+        ChipLogError(NotSpecified, "ERR: updating boolean status value %x", to_underlying(status));
     }
 }
 

diff --git a/examples/light-switch-app/qpg/src/AppTask.cpp b/examples/light-switch-app/qpg/src/AppTask.cpp
@@ -500,7 +500,7 @@ void AppTask::UpdateClusterState(void)
 
         if (status != Protocols::InteractionModel::Status::Success)
         {
-            ChipLogError(NotSpecified, "ERR: updating on/off %x", status);
+            ChipLogError(NotSpecified, "ERR: updating on/off %x", to_underlying(status));
         }
     */
 }

diff --git a/examples/lighting-app/asr/src/AppTask.cpp b/examples/lighting-app/asr/src/AppTask.cpp
@@ -88,7 +88,7 @@ bool IsLightOn()
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ASR_LOG("Error Read OnOff Attribute 0x%02x\n", status);
+        ASR_LOG("Error Read OnOff Attribute 0x%02x\n", to_underlying(status));
     }
 
     return on != false;
@@ -103,7 +103,7 @@ uint8_t GetLightLevel()
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ASR_LOG("Error Read CurrentLevel Attribute 0x%02x\n", status);
+        ASR_LOG("Error Read CurrentLevel Attribute 0x%02x\n", to_underlying(status));
         return -1;
     }
 

diff --git a/examples/lighting-app/esp32/main/AppTask.cpp b/examples/lighting-app/esp32/main/AppTask.cpp
@@ -193,14 +193,14 @@ void AppTask::UpdateClusterState()
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ESP_LOGE(TAG, "Updating on/off cluster failed: %x", status);
+        ESP_LOGE(TAG, "Updating on/off cluster failed: %x", to_underlying(status));
     }
 
     ESP_LOGI(TAG, "Writing to Current Level cluster");
     status = Clusters::LevelControl::Attributes::CurrentLevel::Set(kLightEndpointId, AppLED.GetLevel());
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ESP_LOGE(TAG, "Updating level cluster failed: %x", status);
+        ESP_LOGE(TAG, "Updating level cluster failed: %x", to_underlying(status));
     }
 }
diff --git a/examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp b/examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp
@@ -54,7 +54,7 @@ bool LightingManager::IsLightOn(void)
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        printf("Error ReadServerAttribute 0x%02x\n", status);
+        printf("Error ReadServerAttribute 0x%02x\n", to_underlying(status));
     }
 
     return on != false;
@@ -103,7 +103,7 @@ void LightingManager::WriteClusterState(uint8_t value)
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        printf("Error WriteServerAttribute 0x%02x\n", status);
+        printf("Error WriteServerAttribute 0x%02x\n", to_underlying(status));
     }
 }
 
@@ -113,6 +113,6 @@ void LightingManager::WriteClusterLevel(uint8_t value)
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        printf("Error WriteServerAttribute 0x%02x\n", status);
+        printf("Error WriteServerAttribute 0x%02x\n", to_underlying(status));
     }
 }
diff --git a/examples/lighting-app/infineon/psoc6/src/AppTask.cpp b/examples/lighting-app/infineon/psoc6/src/AppTask.cpp
@@ -558,7 +558,7 @@ void AppTask::UpdateClusterState(intptr_t context)
     Protocols::InteractionModel::Status status = app::Clusters::OnOff::Attributes::OnOff::Set(1, newValue);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        P6_LOG("ERR: updating on/off %x", status);
+        P6_LOG("ERR: updating on/off %x", to_underlying(status));
     }
 }
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR

diff --git a/examples/lighting-app/mbed/main/AppTask.cpp b/examples/lighting-app/mbed/main/AppTask.cpp
@@ -465,7 +465,7 @@ void AppTask::UpdateClusterState()
     Protocols::InteractionModel::Status status = app::Clusters::OnOff::Attributes::OnOff::Set(1, onoff);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(NotSpecified, "Updating on/off cluster failed: %x", status);
+        ChipLogError(NotSpecified, "Updating on/off cluster failed: %x", to_underlying(status));
     }
 
     uint8_t level = LightingMgr().GetLevel();
@@ -474,6 +474,6 @@ void AppTask::UpdateClusterState()
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(NotSpecified, "Updating level cluster failed: %x", status);
+        ChipLogError(NotSpecified, "Updating level cluster failed: %x", to_underlying(status));
     }
 }
diff --git a/examples/lighting-app/nrfconnect/main/AppTask.cpp b/examples/lighting-app/nrfconnect/main/AppTask.cpp
@@ -694,15 +694,15 @@ void AppTask::UpdateClusterState()
 
         if (status != Protocols::InteractionModel::Status::Success)
         {
-            LOG_ERR("Updating on/off cluster failed: %x", status);
+            LOG_ERR("Updating on/off cluster failed: %x", to_underlying(status));
         }
 
         // write the current level
         status = Clusters::LevelControl::Attributes::CurrentLevel::Set(kLightEndpointId, mPWMDevice.GetLevel());
 
         if (status != Protocols::InteractionModel::Status::Success)
         {
-            LOG_ERR("Updating level cluster failed: %x", status);
+            LOG_ERR("Updating level cluster failed: %x", to_underlying(status));
         }
     });
 }
diff --git a/examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp b/examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp
@@ -958,7 +958,7 @@ void AppTask::UpdateClusterStateInternal(intptr_t arg)
     Protocols::InteractionModel::Status status = app::Clusters::OnOff::Attributes::OnOff::Set(1, newValue);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(NotSpecified, "ERR: updating on/off %x", status);
+        ChipLogError(NotSpecified, "ERR: updating on/off %x", to_underlying(status));
     }
 }
 

diff --git a/examples/lighting-app/nxp/k32w/k32w1/main/AppTask.cpp b/examples/lighting-app/nxp/k32w/k32w1/main/AppTask.cpp
@@ -841,7 +841,7 @@ void AppTask::UpdateClusterStateInternal(intptr_t arg)
     Protocols::InteractionModel::Status status = app::Clusters::OnOff::Attributes::OnOff::Set(1, newValue);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(NotSpecified, "ERR: updating on/off %x", status);
+        ChipLogError(NotSpecified, "ERR: updating on/off %x", to_underlying(status));
     }
 }
 

diff --git a/examples/lighting-app/qpg/src/AppTask.cpp b/examples/lighting-app/qpg/src/AppTask.cpp
@@ -647,14 +647,14 @@ void AppTask::UpdateClusterState(void)
 
         if (status != Protocols::InteractionModel::Status::Success)
         {
-            ChipLogError(NotSpecified, "ERR: updating on/off %x", status);
+            ChipLogError(NotSpecified, "ERR: updating on/off %x", to_underlying(status));
         }
 
         // Write new level value
         status = Clusters::LevelControl::Attributes::CurrentLevel::Set(QPG_LIGHT_ENDPOINT_ID, LightingMgr().GetLevel());
         if (status != Protocols::InteractionModel::Status::Success)
         {
-            ChipLogError(NotSpecified, "ERR: updating level %x", status);
+            ChipLogError(NotSpecified, "ERR: updating level %x", to_underlying(status));
         }
     });
 }

diff --git a/examples/lighting-app/silabs/src/AppTask.cpp b/examples/lighting-app/silabs/src/AppTask.cpp
@@ -250,6 +250,6 @@ void AppTask::UpdateClusterState(intptr_t context)
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        SILABS_LOG("ERR: updating on/off %x", status);
+        SILABS_LOG("ERR: updating on/off %x", to_underlying(status));
     }
 }
diff --git a/examples/lighting-app/stm32/src/STM32WB5/AppTask.cpp b/examples/lighting-app/stm32/src/STM32WB5/AppTask.cpp
@@ -448,14 +448,14 @@ void AppTask::UpdateClusterState(void)
         Clusters::OnOff::Attributes::OnOff::Set(STM32_LIGHT_ENDPOINT_ID, LightingMgr().IsTurnedOn());
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(NotSpecified, "ERR: updating on/off %x", status);
+        ChipLogError(NotSpecified, "ERR: updating on/off %x", to_underlying(status));
     }
 
     // Write new level value
     status = Clusters::LevelControl::Attributes::CurrentLevel::Set(STM32_LIGHT_ENDPOINT_ID, LightingMgr().GetLevel());
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(NotSpecified, "ERR: updating level %x", status);
+        ChipLogError(NotSpecified, "ERR: updating level %x", to_underlying(status));
     }
 }
 

diff --git a/examples/lighting-app/telink/src/AppTask.cpp b/examples/lighting-app/telink/src/AppTask.cpp
@@ -242,13 +242,13 @@ void AppTask::UpdateClusterState(void)
     status = Clusters::OnOff::Attributes::OnOff::Set(kExampleEndpointId, isTurnedOn);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        LOG_ERR("Update OnOff fail: %x", status);
+        LOG_ERR("Update OnOff fail: %x", to_underlying(status));
     }
 
     status = Clusters::LevelControl::Attributes::CurrentLevel::Set(kExampleEndpointId, setLevel);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        LOG_ERR("Update CurrentLevel fail: %x", status);
+        LOG_ERR("Update CurrentLevel fail: %x", to_underlying(status));
     }
 }
 

diff --git a/examples/lock-app/asr/src/AppTask.cpp b/examples/lock-app/asr/src/AppTask.cpp
@@ -485,7 +485,7 @@ void AppTask::UpdateCluster(intptr_t context)
         : Protocols::InteractionModel::Status::Failure;
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ASR_LOG("ERR: updating lock state %x", status);
+        ASR_LOG("ERR: updating lock state %x", to_underlying(status));
     }
 }
 

diff --git a/examples/lock-app/esp32/main/AppTask.cpp b/examples/lock-app/esp32/main/AppTask.cpp
@@ -471,6 +471,6 @@ void AppTask::UpdateClusterState(intptr_t context)
     Protocols::InteractionModel::Status status = chip::app::Clusters::OnOff::Attributes::OnOff::Set(1, newValue);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ESP_LOGI(TAG, "ERR: updating on/off %x", status);
+        ESP_LOGI(TAG, "ERR: updating on/off %x", to_underlying(status));
     }
 }
diff --git a/examples/lock-app/genio/src/AppTask.cpp b/examples/lock-app/genio/src/AppTask.cpp
@@ -602,6 +602,6 @@ void AppTask::UpdateClusterState(intptr_t context)
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        MT793X_LOG("ERR: updating lock state %x", status);
+        MT793X_LOG("ERR: updating lock state %x", to_underlying(status));
     }
 }
diff --git a/examples/lock-app/genio/src/ZclCallbacks.cpp b/examples/lock-app/genio/src/ZclCallbacks.cpp
@@ -66,31 +66,31 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint)
     status = DoorLock::Attributes::LockType::Set(endpoint, DlLockType::kDeadBolt);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(Zcl, "Failed to set LockType %x", status);
+        ChipLogError(Zcl, "Failed to set LockType %x", to_underlying(status));
     }
 
     status = DoorLock::Attributes::NumberOfTotalUsersSupported::Set(endpoint, CONFIG_LOCK_NUM_USERS);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(Zcl, "Failed to set number of users %x", status);
+        ChipLogError(Zcl, "Failed to set number of users %x", to_underlying(status));
     }
 
     status = DoorLock::Attributes::NumberOfPINUsersSupported::Set(endpoint, CONFIG_LOCK_NUM_USERS);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(Zcl, "Failed to set number of PIN users %x", status);
+        ChipLogError(Zcl, "Failed to set number of PIN users %x", to_underlying(status));
     }
 
     status = DoorLock::Attributes::NumberOfRFIDUsersSupported::Set(endpoint, 0);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(Zcl, "Failed to set number of RFID users %x", status);
+        ChipLogError(Zcl, "Failed to set number of RFID users %x", to_underlying(status));
     }
 
     status = DoorLock::Attributes::NumberOfCredentialsSupportedPerUser::Set(endpoint, CONFIG_LOCK_NUM_CREDENTIALS_PER_USER);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(Zcl, "Failed to set number of credentials per user %x", status);
+        ChipLogError(Zcl, "Failed to set number of credentials per user %x", to_underlying(status));
     }
 
     // Note: Due to current logic of credential, do not enable PIN and RFID
@@ -99,7 +99,7 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint)
     status = DoorLock::Attributes::FeatureMap::Set(endpoint, 0x101);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(Zcl, "Failed to set number of credentials per user %x", status);
+        ChipLogError(Zcl, "Failed to set number of credentials per user %x", to_underlying(status));
     }
 }
 

diff --git a/examples/lock-app/infineon/cyw30739/src/main.cpp b/examples/lock-app/infineon/cyw30739/src/main.cpp
@@ -330,7 +330,7 @@ void UpdateClusterState(intptr_t context)
 
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(Zcl, "ERR: updating lock state %x", status);
+        ChipLogError(Zcl, "ERR: updating lock state %x", to_underlying(status));
     }
 }
 

diff --git a/examples/lock-app/infineon/psoc6/src/AppTask.cpp b/examples/lock-app/infineon/psoc6/src/AppTask.cpp
@@ -665,7 +665,7 @@ void AppTask::UpdateCluster(intptr_t context)
         : Protocols::InteractionModel::Status::Failure;
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        P6_LOG("ERR: updating lock state %x", status);
+        P6_LOG("ERR: updating lock state %x", to_underlying(status));
     }
 }
 

diff --git a/examples/lock-app/mbed/main/AppTask.cpp b/examples/lock-app/mbed/main/AppTask.cpp
@@ -464,6 +464,6 @@ void AppTask::UpdateClusterState()
     Protocols::InteractionModel::Status status = app::Clusters::OnOff::Attributes::OnOff::Set(1, newValue);
     if (status != Protocols::InteractionModel::Status::Success)
     {
-        ChipLogError(NotSpecified, "ZCL update failed: %lx", status);
+        ChipLogError(NotSpecified, "ZCL update failed: %lx", to_underlying(status));
     }
 }
diff --git a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp
@@ -115,7 +115,7 @@ void emberAfDoorLockClusterInitCallback(EndpointId endpoint)
     const auto logOnFailure = [](Protocols::InteractionModel::Status status, const char * attributeName) {
         if (status != Protocols::InteractionModel::Status::Success)
         {
-            ChipLogError(Zcl, "Failed to set DoorLock %s: %x", attributeName, status);
+            ChipLogError(Zcl, "Failed to set DoorLock %s: %x", attributeName, to_underlying(status));
         }
     };
-Original file line number
+Diff line change
@@ Expand Up / @@ -272,7 +272,7 @@ void AppTask::OnOffUpdateClusterState(void) @@
         if (status != Status::Success)
         {
-            ASR_LOG("ERR: updating on/off %x", status);
+            ASR_LOG("ERR: updating on/off %x", to_underlying(status));
         }
     }
@@ Expand Down @@