i/OrbbecSDK_ROS2
1
0
Fork 0
mirror of https://github.com/orbbec/OrbbecSDK_ROS2.git synced 2026-10-11 06:59:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: simplify preset version output

Browse Source
This commit is contained in:
slz
2026-09-04 10:21:07 +08:00
parent 7e855fa058
commit d38f0db90d
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
orbbec_camera/src/ob_camera_node.cpp
+3 -4
View File
@@ -946,8 +946,7 @@ void OBCameraNode::setupDevices() {
// Older firmware can enumerate presets but may not report per-preset versions. // Older firmware can enumerate presets but may not report per-preset versions.
} }
RCLCPP_DEBUG_STREAM(logger_, "Preset " << i << ": " << preset_list->getName(i) RCLCPP_DEBUG_STREAM(logger_, "Preset " << i << ": " << preset_list->getName(i)
<< ", depth work mode version: " << (version.empty() ? "" : " (" + version + ")"));
<< (version.empty() ? "not available" : version));
} }
if (device_preset_version_.empty()) { if (device_preset_version_.empty()) {
@@ -972,8 +971,8 @@ void OBCameraNode::setupDevices() {
} }
RCLCPP_INFO_STREAM(logger_, RCLCPP_INFO_STREAM(logger_,
"Loaded device preset: " "Loaded device preset: "
<< current_preset << ", depth work mode version: " << current_preset
<< (current_version.empty() ? "not available" : current_version)); << (current_version.empty() ? "" : " (" + current_version + ")"));
if (!device_preset_version_.empty() && !current_version.empty() && if (!device_preset_version_.empty() && !current_version.empty() &&
current_version != device_preset_version_) { current_version != device_preset_version_) {
RCLCPP_WARN_STREAM(logger_, "Requested device preset depth work mode version " RCLCPP_WARN_STREAM(logger_, "Requested device preset depth work mode version "
orbbec_camera/tools/firmware_update_tool.cpp
+5 -3
View File
@@ -461,9 +461,11 @@ void logCurrentPresetList(const rclcpp::Logger &logger, const std::shared_ptr<ob
} catch (...) { } catch (...) {
// Older firmware can enumerate presets without exposing version information. // Older firmware can enumerate presets without exposing version information.
} }
RCLCPP_INFO(logger, "[%s] Preset[%u]: %s, depth work mode version: %s", stage, i, if (version == nullptr || version[0] == '\0') {
preset_list->getName(i), RCLCPP_INFO(logger, "[%s] Preset[%u]: %s", stage, i, preset_list->getName(i));
version == nullptr || version[0] == '\0' ? "not available" : version); } else {
RCLCPP_INFO(logger, "[%s] Preset[%u]: %s (%s)", stage, i, preset_list->getName(i), version);
}
} }
} catch (const ob::Error &e) { } catch (const ob::Error &e) {
RCLCPP_WARN(logger, "[%s] Failed to query preset list: %s", stage, RCLCPP_WARN(logger, "[%s] Failed to query preset list: %s", stage,
orbbec_camera/tools/list_camera_profile.cpp
+1 -2
View File
@@ -213,8 +213,7 @@ void printPreset(const std::shared_ptr<ob::Device>& device) {
// Older firmware can enumerate presets without exposing version information. // Older firmware can enumerate presets without exposing version information.
} }
std::cout << "Preset list[" << i << "]: " << name std::cout << "Preset list[" << i << "]: " << name
<< ", depth work mode version: " << (version.empty() ? "not available" : version) << (version.empty() ? "" : " (" + version + ")") << std::endl;
<< std::endl;
} }
} }
orbbec_camera/tools/list_devices_node.cpp
+2 -2
View File
@@ -188,8 +188,8 @@ void printPresetInfo(const std::shared_ptr<ob::Device> &device) {
} catch (...) { } catch (...) {
// Older firmware can enumerate presets without exposing version information. // Older firmware can enumerate presets without exposing version information.
} }
RCLCPP_INFO_STREAM(logger, " - " << preset_name << " (depth work mode version: " RCLCPP_INFO_STREAM(logger,
<< (version.empty() ? "not available" : version) << ")"); " - " << preset_name << (version.empty() ? "" : " (" + version + ")"));
} }
} }