Skip to content
This repository has been archived by the owner on Dec 13, 2024. It is now read-only.

Ensure we do not launch camera nodes if there are not supported cameras #13

Merged
merged 1 commit into from
May 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions src/picknik_ur_base_config/launch/hardware.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,27 @@


def generate_launch_description():
nodes_to_start = []
included_launch_files = []
nodes_to_launch = []

frame_pair_params = [
{
"world_frame": "world",
"camera_frames": generate_camera_frames(cameras_config),
}
]

nodes_to_start.append(
Node(
# Do not launch any nodes if there are no configured cameras.
if not cameras_config:
print(
"No camera configuration found. Not launching any camera transform nodes."
)
else:
frame_pair_params = [
{
"world_frame": "world",
"camera_frames": generate_camera_frames(cameras_config),
}
]
camera_transforms_node = Node(
package="moveit_studio_agent",
executable="camera_transforms_node",
name="camera_transforms_node",
output="screen",
parameters=frame_pair_params,
)
)
nodes_to_launch.append(camera_transforms_node)

return LaunchDescription(nodes_to_start + included_launch_files)
return LaunchDescription(nodes_to_launch)
40 changes: 22 additions & 18 deletions src/picknik_ur_base_config/launch/sim/hardware_sim.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,27 @@


def generate_launch_description():
frame_pair_params = [
{
"world_frame": "world",
"camera_frames": generate_camera_frames(cameras_config),
}
]
nodes_to_launch = []

camera_transforms_node = Node(
package="moveit_studio_agent",
executable="camera_transforms_node",
name="camera_transforms_node",
output="screen",
parameters=frame_pair_params,
)

return LaunchDescription(
[
camera_transforms_node,
# Do not launch any nodes if there are no configured cameras.
if not cameras_config:
print(
"No camera configuration found. Not launching any camera transform nodes."
)
else:
frame_pair_params = [
{
"world_frame": "world",
"camera_frames": generate_camera_frames(cameras_config),
}
]
)
camera_transforms_node = Node(
package="moveit_studio_agent",
executable="camera_transforms_node",
name="camera_transforms_node",
output="screen",
parameters=frame_pair_params,
)
nodes_to_launch.append(camera_transforms_node)

return LaunchDescription(nodes_to_launch)