Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor triggered_camera demo #645

Open
wants to merge 3 commits into
base: ros2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
6 changes: 6 additions & 0 deletions ros_gz_sim_demos/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ if(BUILD_TESTING)
ament_lint_auto_find_test_dependencies()
endif()

install(
DIRECTORY
config/
DESTINATION share/${PROJECT_NAME}/config
)

install(
DIRECTORY
launch/
Expand Down
2 changes: 1 addition & 1 deletion ros_gz_sim_demos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Using the regular bridge:

To use a camera that only publishes information when triggered:

ros2 launch ros_gz_sim_demos triggered_camera.launch.py
ros2 launch ros_gz_sim_demos triggered_camera.launch.xml

Trigger the camera:

Expand Down
27 changes: 27 additions & 0 deletions ros_gz_sim_demos/config/triggered_camera.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# triggered_cammera configuration.
- ros_topic_name: "/camera"
gz_topic_name: "/camera"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be simlpified

Suggested change
- ros_topic_name: "/camera"
gz_topic_name: "/camera"
- topic_name: "/camera"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Simplified in 3c5d49b.

ros_type_name: "sensor_msgs/msg/Image"
gz_type_name: "gz.msgs.Image"
subscriber_queue: 5
publisher_queue: 6
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to specify these for sure? Can we not just use the defaults?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed in 3c5d49b.

lazy: false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think there's harm in making lazy=true.

Suggested change
lazy: false
lazy: true

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed in 3c5d49b.

direction: GZ_TO_ROS

- ros_topic_name: "/camera_info"
gz_topic_name: "/camera_info"
ros_type_name: "sensor_msgs/msg/CameraInfo"
gz_type_name: "gz.msgs.CameraInfo"
subscriber_queue: 5
publisher_queue: 6
lazy: false
direction: GZ_TO_ROS

- ros_topic_name: "/camera/trigger"
gz_topic_name: "/camera/trigger"
ros_type_name: "std_msgs/msg/Bool"
gz_type_name: "gz.msgs.Boolean"
subscriber_queue: 5
publisher_queue: 6
lazy: false
direction: ROS_TO_GZ
64 changes: 0 additions & 64 deletions ros_gz_sim_demos/launch/triggered_camera.launch.py

This file was deleted.

6 changes: 6 additions & 0 deletions ros_gz_sim_demos/launch/triggered_camera.launch.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<launch>
<gz_server world_sdf_file="triggered_camera_sensor.sdf" use_composition="True" create_own_container="True" />
<ros_gz_bridge bridge_name="ros_gz_bridge" config_file="$(find-pkg-share ros_gz_sim_demos)/config/triggered_camera.yaml" use_composition="True" />
<node pkg="rviz2" exec="rviz2" args="-d $(find-pkg-share ros_gz_sim_demos)/rviz/camera.rviz" />
<executable cmd="gz sim -g" />
</launch>
Loading