mirror of
https://github.com/orbbec/OrbbecSDK_ROS2.git
synced 2026-09-13 19:40:19 +08:00
fix: update frames_per_trigger and diagnostic_period to improve performance
This commit is contained in:
@@ -16,7 +16,7 @@ time_domain: "global" # global, device, system
|
|||||||
enable_sync_host_time: true
|
enable_sync_host_time: true
|
||||||
|
|
||||||
trigger_out_enabled: true
|
trigger_out_enabled: true
|
||||||
frames_per_trigger: 0
|
frames_per_trigger: 1
|
||||||
software_trigger_period: 0
|
software_trigger_period: 0
|
||||||
enable_fps_boost: false
|
enable_fps_boost: false
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ time_domain: "global" # global, device, system
|
|||||||
enable_sync_host_time: true
|
enable_sync_host_time: true
|
||||||
|
|
||||||
trigger_out_enabled: false
|
trigger_out_enabled: false
|
||||||
frames_per_trigger: 0
|
frames_per_trigger: 1
|
||||||
software_trigger_period: 0
|
software_trigger_period: 0
|
||||||
enable_fps_boost: false
|
enable_fps_boost: false
|
||||||
|
|
||||||
|
|||||||
@@ -182,7 +182,7 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
||||||
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('enable_fps_boost', default_value='false'),
|
DeclareLaunchArgument('enable_fps_boost', default_value='false'),
|
||||||
DeclareLaunchArgument('frames_per_trigger', default_value='2'),
|
DeclareLaunchArgument('frames_per_trigger', default_value='1'),
|
||||||
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
||||||
DeclareLaunchArgument('enable_ptp_config', default_value='false'),#Only for Gemini 335Le
|
DeclareLaunchArgument('enable_ptp_config', default_value='false'),#Only for Gemini 335Le
|
||||||
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
||||||
|
|||||||
@@ -182,7 +182,7 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
||||||
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('enable_fps_boost', default_value='false'),
|
DeclareLaunchArgument('enable_fps_boost', default_value='false'),
|
||||||
DeclareLaunchArgument('frames_per_trigger', default_value='2'),
|
DeclareLaunchArgument('frames_per_trigger', default_value='1'),
|
||||||
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
||||||
DeclareLaunchArgument('enable_ptp_config', default_value='false'),#Only for Gemini 335Le
|
DeclareLaunchArgument('enable_ptp_config', default_value='false'),#Only for Gemini 335Le
|
||||||
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
||||||
|
|||||||
+1
-1
@@ -182,7 +182,7 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
||||||
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('enable_fps_boost', default_value='false'),
|
DeclareLaunchArgument('enable_fps_boost', default_value='false'),
|
||||||
DeclareLaunchArgument('frames_per_trigger', default_value='2'),
|
DeclareLaunchArgument('frames_per_trigger', default_value='1'),
|
||||||
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
||||||
DeclareLaunchArgument('enable_ptp_config', default_value='false'),#Only for Gemini 335Le
|
DeclareLaunchArgument('enable_ptp_config', default_value='false'),#Only for Gemini 335Le
|
||||||
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
||||||
|
|||||||
@@ -865,7 +865,7 @@ class OBCameraNode {
|
|||||||
int trigger_out_delay_us_ = 0;
|
int trigger_out_delay_us_ = 0;
|
||||||
bool trigger_out_enabled_ = false;
|
bool trigger_out_enabled_ = false;
|
||||||
bool software_trigger_enabled_ = false;
|
bool software_trigger_enabled_ = false;
|
||||||
int frames_per_trigger_ = 2;
|
int frames_per_trigger_ = 1;
|
||||||
bool enable_ptp_config_ = false;
|
bool enable_ptp_config_ = false;
|
||||||
std::string depth_precision_str_;
|
std::string depth_precision_str_;
|
||||||
OB_DEPTH_PRECISION_LEVEL depth_precision_ = OB_PRECISION_0MM8;
|
OB_DEPTH_PRECISION_LEVEL depth_precision_ = OB_PRECISION_0MM8;
|
||||||
|
|||||||
@@ -167,7 +167,7 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('trigger2image_delay_us', default_value='0'),
|
DeclareLaunchArgument('trigger2image_delay_us', default_value='0'),
|
||||||
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
||||||
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('frames_per_trigger', default_value='2'),
|
DeclareLaunchArgument('frames_per_trigger', default_value='1'),
|
||||||
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
||||||
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
||||||
DeclareLaunchArgument('ordered_pc', default_value='false'),
|
DeclareLaunchArgument('ordered_pc', default_value='false'),
|
||||||
|
|||||||
@@ -167,7 +167,7 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('trigger2image_delay_us', default_value='0'),
|
DeclareLaunchArgument('trigger2image_delay_us', default_value='0'),
|
||||||
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
||||||
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('frames_per_trigger', default_value='2'),
|
DeclareLaunchArgument('frames_per_trigger', default_value='1'),
|
||||||
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
||||||
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
||||||
DeclareLaunchArgument('ordered_pc', default_value='false'),
|
DeclareLaunchArgument('ordered_pc', default_value='false'),
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('trigger2image_delay_us', default_value='0'),
|
DeclareLaunchArgument('trigger2image_delay_us', default_value='0'),
|
||||||
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
||||||
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('frames_per_trigger', default_value='2'),
|
DeclareLaunchArgument('frames_per_trigger', default_value='1'),
|
||||||
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
||||||
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
||||||
DeclareLaunchArgument('ordered_pc', default_value='false'),
|
DeclareLaunchArgument('ordered_pc', default_value='false'),
|
||||||
|
|||||||
@@ -167,7 +167,7 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('trigger2image_delay_us', default_value='0'),
|
DeclareLaunchArgument('trigger2image_delay_us', default_value='0'),
|
||||||
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
||||||
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('frames_per_trigger', default_value='2'),
|
DeclareLaunchArgument('frames_per_trigger', default_value='1'),
|
||||||
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
||||||
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
||||||
DeclareLaunchArgument('ordered_pc', default_value='false'),
|
DeclareLaunchArgument('ordered_pc', default_value='false'),
|
||||||
|
|||||||
@@ -198,7 +198,7 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
||||||
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('software_trigger_enabled', default_value='true'),
|
DeclareLaunchArgument('software_trigger_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('frames_per_trigger', default_value='2'),
|
DeclareLaunchArgument('frames_per_trigger', default_value='1'),
|
||||||
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
||||||
DeclareLaunchArgument('enable_ptp_config', default_value='false'),
|
DeclareLaunchArgument('enable_ptp_config', default_value='false'),
|
||||||
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
||||||
|
|||||||
@@ -227,7 +227,7 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
||||||
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('software_trigger_enabled', default_value='true'),
|
DeclareLaunchArgument('software_trigger_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('frames_per_trigger', default_value='2'),
|
DeclareLaunchArgument('frames_per_trigger', default_value='1'),
|
||||||
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
||||||
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
||||||
DeclareLaunchArgument('ordered_pc', default_value='false'),
|
DeclareLaunchArgument('ordered_pc', default_value='false'),
|
||||||
|
|||||||
@@ -215,7 +215,7 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('enable_fps_boost', default_value='false'),
|
DeclareLaunchArgument('enable_fps_boost', default_value='false'),
|
||||||
DeclareLaunchArgument('software_trigger_enabled', default_value='true'),
|
DeclareLaunchArgument('software_trigger_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('frames_per_trigger', default_value='2'),
|
DeclareLaunchArgument('frames_per_trigger', default_value='1'),
|
||||||
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
||||||
DeclareLaunchArgument('enable_ptp_config', default_value='false'),#Only for Gemini 335Le
|
DeclareLaunchArgument('enable_ptp_config', default_value='false'),#Only for Gemini 335Le
|
||||||
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
||||||
|
|||||||
@@ -210,7 +210,7 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('enable_fps_boost', default_value='false'),
|
DeclareLaunchArgument('enable_fps_boost', default_value='false'),
|
||||||
DeclareLaunchArgument('software_trigger_enabled', default_value='true'),
|
DeclareLaunchArgument('software_trigger_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('frames_per_trigger', default_value='2'),
|
DeclareLaunchArgument('frames_per_trigger', default_value='1'),
|
||||||
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
||||||
DeclareLaunchArgument('enable_ptp_config', default_value='false'),#Only for Gemini 335Le
|
DeclareLaunchArgument('enable_ptp_config', default_value='false'),#Only for Gemini 335Le
|
||||||
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ def generate_launch_description():
|
|||||||
DeclareLaunchArgument('trigger2image_delay_us', default_value='0'),
|
DeclareLaunchArgument('trigger2image_delay_us', default_value='0'),
|
||||||
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
DeclareLaunchArgument('trigger_out_delay_us', default_value='0'),
|
||||||
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
DeclareLaunchArgument('trigger_out_enabled', default_value='true'),
|
||||||
DeclareLaunchArgument('frames_per_trigger', default_value='2'),
|
DeclareLaunchArgument('frames_per_trigger', default_value='1'),
|
||||||
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
DeclareLaunchArgument('software_trigger_period', default_value='33'), # ms
|
||||||
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
DeclareLaunchArgument('enable_frame_sync', default_value='true'),
|
||||||
DeclareLaunchArgument('ordered_pc', default_value='false'),
|
DeclareLaunchArgument('ordered_pc', default_value='false'),
|
||||||
|
|||||||
@@ -4698,7 +4698,7 @@ void OBCameraNode::getParameters() {
|
|||||||
if (time_domain_ == "global" && !is_playback_device_) {
|
if (time_domain_ == "global" && !is_playback_device_) {
|
||||||
device_->enableGlobalTimestamp(true);
|
device_->enableGlobalTimestamp(true);
|
||||||
}
|
}
|
||||||
setAndGetNodeParameter<int>(frames_per_trigger_, "frames_per_trigger", 2);
|
setAndGetNodeParameter<int>(frames_per_trigger_, "frames_per_trigger", 1);
|
||||||
int software_trigger_period = 33;
|
int software_trigger_period = 33;
|
||||||
setAndGetNodeParameter<int>(software_trigger_period, "software_trigger_period", 33);
|
setAndGetNodeParameter<int>(software_trigger_period, "software_trigger_period", 33);
|
||||||
software_trigger_period_ = std::chrono::milliseconds(software_trigger_period);
|
software_trigger_period_ = std::chrono::milliseconds(software_trigger_period);
|
||||||
|
|||||||
Reference in New Issue
Block a user