i/OrbbecSDK_ROS2
1
0
Fork 0
mirror of https://github.com/orbbec/OrbbecSDK_ROS2.git synced 2026-10-04 12:07:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: update device access mode values to use consistent casing

Browse Source
This commit is contained in:
ob-yalian
2025-12-05 09:15:40 +08:00
parent c2a94692f5
commit 856213072f
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
orbbec_camera/launch/gemini_330_series.launch.py
+1 -1
View File
@@ -187,7 +187,7 @@ def generate_launch_description():
DeclareLaunchArgument('enumerate_net_device', default_value='true'), DeclareLaunchArgument('enumerate_net_device', default_value='true'),
DeclareLaunchArgument('net_device_ip', default_value=''), DeclareLaunchArgument('net_device_ip', default_value=''),
DeclareLaunchArgument('net_device_port', default_value='0'), DeclareLaunchArgument('net_device_port', default_value='0'),
DeclareLaunchArgument('device_access_mode', default_value='default'), # default, exclusive, control or monitor . only for 335le DeclareLaunchArgument('device_access_mode', default_value='Default'), # Default, EA, CA or MR . only for 335le
DeclareLaunchArgument('exposure_range_mode', default_value='default'),#default, ultimate or regular DeclareLaunchArgument('exposure_range_mode', default_value='default'),#default, ultimate or regular
DeclareLaunchArgument('log_level', default_value='none'), DeclareLaunchArgument('log_level', default_value='none'),
DeclareLaunchArgument('log_file_name', default_value=''), DeclareLaunchArgument('log_file_name', default_value=''),
orbbec_camera/src/ob_camera_node_driver.cpp
+9 -9
View File
@@ -253,7 +253,7 @@ void OBCameraNodeDriver::init() {
net_device_port_ = static_cast<int>(declare_parameter<int>("net_device_port", 0)); net_device_port_ = static_cast<int>(declare_parameter<int>("net_device_port", 0));
enumerate_net_device_ = declare_parameter<bool>("enumerate_net_device", false); enumerate_net_device_ = declare_parameter<bool>("enumerate_net_device", false);
uvc_backend_ = declare_parameter<std::string>("uvc_backend", "libuvc"); uvc_backend_ = declare_parameter<std::string>("uvc_backend", "libuvc");
device_access_mode_str_ = declare_parameter<std::string>("device_access_mode", "default"); device_access_mode_str_ = declare_parameter<std::string>("device_access_mode", "Default");
device_access_mode_ = stringToAccessMode(device_access_mode_str_); device_access_mode_ = stringToAccessMode(device_access_mode_str_);
RCLCPP_INFO_STREAM(logger_, "Device access mode: " << device_access_mode_str_ << " (" RCLCPP_INFO_STREAM(logger_, "Device access mode: " << device_access_mode_str_ << " ("
<< device_access_mode_ << ")"); << device_access_mode_ << ")");
@@ -1424,11 +1424,11 @@ OBDeviceAccessMode OBCameraNodeDriver::stringToAccessMode(const std::string &mod
std::transform(mode_str.begin(), mode_str.end(), std::back_inserter(lower_mode), std::transform(mode_str.begin(), mode_str.end(), std::back_inserter(lower_mode),
[](auto ch) { return tolower(ch); }); [](auto ch) { return tolower(ch); });
if (lower_mode == "exclusive") { if (lower_mode == "ea") {
return OB_DEVICE_EXCLUSIVE_ACCESS; return OB_DEVICE_EXCLUSIVE_ACCESS;
} else if (lower_mode == "control") { } else if (lower_mode == "ca") {
return OB_DEVICE_CONTROL_ACCESS; return OB_DEVICE_CONTROL_ACCESS;
} else if (lower_mode == "monitor") { } else if (lower_mode == "mr") {
return OB_DEVICE_MONITOR_ACCESS; return OB_DEVICE_MONITOR_ACCESS;
} else if (lower_mode == "default") { } else if (lower_mode == "default") {
return OB_DEVICE_DEFAULT_ACCESS; return OB_DEVICE_DEFAULT_ACCESS;
@@ -1441,16 +1441,16 @@ OBDeviceAccessMode OBCameraNodeDriver::stringToAccessMode(const std::string &mod
std::string OBCameraNodeDriver::accessModeToString(OBDeviceAccessMode mode) { std::string OBCameraNodeDriver::accessModeToString(OBDeviceAccessMode mode) {
switch (mode) { switch (mode) {
case OB_DEVICE_EXCLUSIVE_ACCESS: case OB_DEVICE_EXCLUSIVE_ACCESS:
return "exclusive"; return "EA";
case OB_DEVICE_CONTROL_ACCESS: case OB_DEVICE_CONTROL_ACCESS:
return "control"; return "CA";
case OB_DEVICE_MONITOR_ACCESS: case OB_DEVICE_MONITOR_ACCESS:
return "monitor"; return "MR";
case OB_DEVICE_ACCESS_DENIED: case OB_DEVICE_ACCESS_DENIED:
return "denied"; return "Denied";
case OB_DEVICE_DEFAULT_ACCESS: case OB_DEVICE_DEFAULT_ACCESS:
default: default:
return "default"; return "Default";
} }
} }
} // namespace orbbec_camera } // namespace orbbec_camera