From d38f0db90d774a2cfb9a3e3a001d5fa1064e1310 Mon Sep 17 00:00:00 2001
From: slz <shenlanzhou@orbbec.com>
Date: Fri, 4 Sep 2026 10:21:07 +0800
Subject: [PATCH] fix: simplify preset version output

---
 orbbec_camera/src/ob_camera_node.cpp         | 7 +++----
 orbbec_camera/tools/firmware_update_tool.cpp | 8 +++++---
 orbbec_camera/tools/list_camera_profile.cpp  | 3 +--
 orbbec_camera/tools/list_devices_node.cpp    | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/orbbec_camera/src/ob_camera_node.cpp b/orbbec_camera/src/ob_camera_node.cpp
index 2b4e9405..917ba861 100644
--- a/orbbec_camera/src/ob_camera_node.cpp
+++ b/orbbec_camera/src/ob_camera_node.cpp
@@ -946,8 +946,7 @@ void OBCameraNode::setupDevices() {
           // Older firmware can enumerate presets but may not report per-preset versions.
         }
         RCLCPP_DEBUG_STREAM(logger_, "Preset " << i << ": " << preset_list->getName(i)
-                                               << ", depth work mode version: "
-                                               << (version.empty() ? "not available" : version));
+                                               << (version.empty() ? "" : " (" + version + ")"));
       }
 
       if (device_preset_version_.empty()) {
@@ -972,8 +971,8 @@ void OBCameraNode::setupDevices() {
       }
       RCLCPP_INFO_STREAM(logger_,
                          "Loaded device preset: "
-                             << current_preset << ", depth work mode version: "
-                             << (current_version.empty() ? "not available" : current_version));
+                             << current_preset
+                             << (current_version.empty() ? "" : " (" + current_version + ")"));
       if (!device_preset_version_.empty() && !current_version.empty() &&
           current_version != device_preset_version_) {
         RCLCPP_WARN_STREAM(logger_, "Requested device preset depth work mode version "
diff --git a/orbbec_camera/tools/firmware_update_tool.cpp b/orbbec_camera/tools/firmware_update_tool.cpp
index e4cfd1c5..be693071 100644
--- a/orbbec_camera/tools/firmware_update_tool.cpp
+++ b/orbbec_camera/tools/firmware_update_tool.cpp
@@ -461,9 +461,11 @@ void logCurrentPresetList(const rclcpp::Logger &logger, const std::shared_ptr<ob
       } catch (...) {
         // Older firmware can enumerate presets without exposing version information.
       }
-      RCLCPP_INFO(logger, "[%s] Preset[%u]: %s, depth work mode version: %s", stage, i,
-                  preset_list->getName(i),
-                  version == nullptr || version[0] == '\0' ? "not available" : version);
+      if (version == nullptr || version[0] == '\0') {
+        RCLCPP_INFO(logger, "[%s] Preset[%u]: %s", stage, i, preset_list->getName(i));
+      } else {
+        RCLCPP_INFO(logger, "[%s] Preset[%u]: %s (%s)", stage, i, preset_list->getName(i), version);
+      }
     }
   } catch (const ob::Error &e) {
     RCLCPP_WARN(logger, "[%s] Failed to query preset list: %s", stage,
diff --git a/orbbec_camera/tools/list_camera_profile.cpp b/orbbec_camera/tools/list_camera_profile.cpp
index 3e31a706..7f3673a6 100644
--- a/orbbec_camera/tools/list_camera_profile.cpp
+++ b/orbbec_camera/tools/list_camera_profile.cpp
@@ -213,8 +213,7 @@ void printPreset(const std::shared_ptr<ob::Device>& device) {
       // Older firmware can enumerate presets without exposing version information.
     }
     std::cout << "Preset list[" << i << "]: " << name
-              << ", depth work mode version: " << (version.empty() ? "not available" : version)
-              << std::endl;
+              << (version.empty() ? "" : " (" + version + ")") << std::endl;
   }
 }
 
diff --git a/orbbec_camera/tools/list_devices_node.cpp b/orbbec_camera/tools/list_devices_node.cpp
index 274a25a7..f9f7be70 100644
--- a/orbbec_camera/tools/list_devices_node.cpp
+++ b/orbbec_camera/tools/list_devices_node.cpp
@@ -188,8 +188,8 @@ void printPresetInfo(const std::shared_ptr<ob::Device> &device) {
         } catch (...) {
           // Older firmware can enumerate presets without exposing version information.
         }
-        RCLCPP_INFO_STREAM(logger, "  - " << preset_name << " (depth work mode version: "
-                                          << (version.empty() ? "not available" : version) << ")");
+        RCLCPP_INFO_STREAM(logger,
+                           "  - " << preset_name << (version.empty() ? "" : " (" + version + ")"));
       }
     }