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

Merge branch 'customer/sdk_2.8.2_338' into merge/sdk_2.8.2

Browse Source
This commit is contained in:
ob-yalian
2026-04-15 09:19:17 +08:00
parent ebb5d738b3 5b808b19a7
commit 1b4658e3a6
10 changed files with 379 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
orbbec_camera/src/ob_camera_node.cpp
+4 -5
View File
@@ -3437,8 +3437,7 @@ void OBCameraNode::setDepthAutoExposureROI() {
return;
}
if (isGemini305SeriesPID(pid_) && ae_reference_stream_ == "color") {
RCLCPP_WARN_STREAM(logger_,
"Skip setting depth AE ROI because AE Reference Stream is color");
RCLCPP_WARN_STREAM(logger_, "Skip setting depth AE ROI because AE Reference Stream is color");
depth_roi_has_run = true;
return;
}
@@ -3483,8 +3482,7 @@ void OBCameraNode::setColorAutoExposureROI() {
return;
}
if (isGemini305SeriesPID(pid_) && ae_reference_stream_ == "depth") {
RCLCPP_WARN_STREAM(logger_,
"Skip setting color AE ROI because AE Reference Stream is depth");
RCLCPP_WARN_STREAM(logger_, "Skip setting color AE ROI because AE Reference Stream is depth");
color_roi_has_run = true;
return;
}
@@ -4717,7 +4715,8 @@ bool OBCameraNode::isGemini335PID(uint32_t pid) {
pid == GEMINI_335L_PID || pid == GEMINI_330L_PID || pid == GEMINI_336L_PID ||
pid == GEMINI_335LG_PID || pid == GEMINI_336LG_PID || pid == GEMINI_335LE_PID ||
pid == GEMINI_336LE_PID || pid == CUSTOM_ADVANTECH_GEMINI_336_PID ||
pid == CUSTOM_ADVANTECH_GEMINI_336L_PID || pid == GEMINI_338_PID;
pid == CUSTOM_ADVANTECH_GEMINI_336L_PID || pid == GEMINI_338_PID ||
pid == GEMINI_338L_PID || pid == GEMINI_338LE_PID || pid == GEMINI_338LG_PID;
}
bool OBCameraNode::isGemini435LePID(uint32_t pid) { return pid == GEMINI_435Le_PID; }