From a93752a5071254c00a14634d99948259dc98e4ed Mon Sep 17 00:00:00 2001 From: jj <957713278@qq.com> Date: Fri, 14 Feb 2025 19:39:28 +0800 Subject: [PATCH] Fix the bug that the launch file in examples is not available --- .../benchmark/gemini_330_series_benchmark.launch.py | 2 +- .../examples/benchmark/ob_benchmark_0.launch.py | 2 +- .../examples/benchmark/ob_benchmark_1.launch.py | 2 +- .../gemini_330_series_lower_cpu_usage.launch.py | 2 +- .../multi_camera_lower_cpu_usage.launch.py | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/orbbec_camera/examples/benchmark/gemini_330_series_benchmark.launch.py b/orbbec_camera/examples/benchmark/gemini_330_series_benchmark.launch.py index d1cc0142..6662adee 100644 --- a/orbbec_camera/examples/benchmark/gemini_330_series_benchmark.launch.py +++ b/orbbec_camera/examples/benchmark/gemini_330_series_benchmark.launch.py @@ -242,7 +242,7 @@ def generate_launch_description(): condition=UnlessCondition(attach_to_shared_component_container_arg) ) return [ - # orbbec_container, + orbbec_container, LoadComposableNodes( target_container=component_container_name_arg, composable_node_descriptions=[ diff --git a/orbbec_camera/examples/benchmark/ob_benchmark_0.launch.py b/orbbec_camera/examples/benchmark/ob_benchmark_0.launch.py index 35dab045..03fe59fe 100644 --- a/orbbec_camera/examples/benchmark/ob_benchmark_0.launch.py +++ b/orbbec_camera/examples/benchmark/ob_benchmark_0.launch.py @@ -53,7 +53,7 @@ def load_parameters(context, args): def generate_launch_description(): # Include launch files package_dir = get_package_share_directory("orbbec_camera") - launch_file_dir = os.path.join(package_dir, "launch") + launch_file_dir = os.path.join(package_dir, "examples/benchmark") attach_to_shared_component_container_arg = LaunchConfiguration('attach_to_shared_component_container', default=False) component_container_name_arg = LaunchConfiguration('component_container_name', default='shared_orbbec_container') diff --git a/orbbec_camera/examples/benchmark/ob_benchmark_1.launch.py b/orbbec_camera/examples/benchmark/ob_benchmark_1.launch.py index 73114c0f..d7de1068 100644 --- a/orbbec_camera/examples/benchmark/ob_benchmark_1.launch.py +++ b/orbbec_camera/examples/benchmark/ob_benchmark_1.launch.py @@ -53,7 +53,7 @@ def load_parameters(context, args): def generate_launch_description(): # Include launch files package_dir = get_package_share_directory("orbbec_camera") - launch_file_dir = os.path.join(package_dir, "launch") + launch_file_dir = os.path.join(package_dir, "examples/benchmark") attach_to_shared_component_container_arg = LaunchConfiguration('attach_to_shared_component_container', default=False) component_container_name_arg = LaunchConfiguration('component_container_name', default='shared_orbbec_container') diff --git a/orbbec_camera/examples/lower_cpu_usage/gemini_330_series_lower_cpu_usage.launch.py b/orbbec_camera/examples/lower_cpu_usage/gemini_330_series_lower_cpu_usage.launch.py index 8d01e3df..b1ebbd83 100644 --- a/orbbec_camera/examples/lower_cpu_usage/gemini_330_series_lower_cpu_usage.launch.py +++ b/orbbec_camera/examples/lower_cpu_usage/gemini_330_series_lower_cpu_usage.launch.py @@ -242,7 +242,7 @@ def generate_launch_description(): condition=UnlessCondition(attach_to_shared_component_container_arg) ) return [ - # orbbec_container, + orbbec_container, LoadComposableNodes( target_container=component_container_name_arg, composable_node_descriptions=[ diff --git a/orbbec_camera/examples/lower_cpu_usage/multi_camera_lower_cpu_usage.launch.py b/orbbec_camera/examples/lower_cpu_usage/multi_camera_lower_cpu_usage.launch.py index 0f850678..1e4ac037 100644 --- a/orbbec_camera/examples/lower_cpu_usage/multi_camera_lower_cpu_usage.launch.py +++ b/orbbec_camera/examples/lower_cpu_usage/multi_camera_lower_cpu_usage.launch.py @@ -53,7 +53,7 @@ def load_parameters(context, args): def generate_launch_description(): # Include launch files package_dir = get_package_share_directory("orbbec_camera") - launch_file_dir = os.path.join(package_dir, "launch") + launch_file_dir = os.path.join(package_dir, "examples/lower_cpu_usage") attach_to_shared_component_container_arg = LaunchConfiguration('attach_to_shared_component_container', default=False) component_container_name_arg = LaunchConfiguration('component_container_name', default='shared_orbbec_container') @@ -66,7 +66,7 @@ def generate_launch_description(): condition=UnlessCondition(attach_to_shared_component_container_arg), ) - attach_to_shared_component_container_arg = TextSubstitution(text="true") + launch1_include = IncludeLaunchDescription( PythonLaunchDescriptionSource( @@ -123,19 +123,19 @@ def generate_launch_description(): delayed_left_camera = TimerAction( period=2.0, - actions=args+[launch1_include], + actions=[launch1_include], ) delayed_right_camera = TimerAction( period=4.0, - actions=args+[launch2_include], + actions=[launch2_include], ) delayed_rear_camera = TimerAction( period=6.0, - actions=args+[launch3_include], + actions=[launch3_include], ) delayed_front_camera = TimerAction( period=8.0, - actions=args+[launch4_include], + actions=[launch4_include], ) ld = LaunchDescription( [