Skip to content

Commit 90a30a8

Browse files
authored
Merge pull request #25 from ctu-mrs/ft_ros2_rgbdcam
Updated: all camera macros - cameras now have a base template and spawner-compliant implementations Added: RGB-D and depth-only camera macros (addressing #23) Added: Unit tests for some of the jinja macros Added: Spawner argument check for incorrect parameters Added: unit tests integrated into github actions Added: dynamic generation of static TFs for all sensor components Updated: naming conventions of some TF frames (addressing #26)
2 parents 3972dcd + 113d178 commit 90a30a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3426
-1655
lines changed

.github/workflows/ros_build_test.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ concurrency:
2020
jobs:
2121

2222
build:
23-
uses: ctu-mrs/ci_scripts/.github/workflows/ros_build_test.yml@ros2
23+
uses: ctu-mrs/ci_scripts/.github/workflows/ros_build_test.yml@ros2_tests_enabling
24+
with:
25+
RUN_TESTS: true
2426
secrets:
2527
PUSH_TOKEN: ${{ secrets.PUSH_TOKEN }}

.github/workflows/ros_package_build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ concurrency:
1717
jobs:
1818

1919
build:
20-
uses: ctu-mrs/ci_scripts/.github/workflows/ros_package_build.yml@ros2
20+
uses: ctu-mrs/ci_scripts/.github/workflows/ros_package_build.yml@ros2_tests_enabling
21+
with:
22+
RUN_TESTS: true
2123
secrets:
2224
PUSH_TOKEN: ${{ secrets.PUSH_TOKEN }}

config/spawner_params.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ mrs_drone_spawner:
1717
extra_resource_paths: []
1818

1919
tf_static_publisher:
20-
base_link: "fcu"
21-
ignored_sensor_links: ["air_pressure_sensor", "magnetometer_sensor", "navsat_sensor", "imu_sensor", "lidar"] #lidar is reserved for PX4 Garmin
20+
base_frame: "fcu"
21+
ignored_sensor_frames: ["air_pressure_sensor", "magnetometer_sensor", "navsat_sensor", "imu_sensor", "lidar"] #lidar is reserved for PX4 Garmin

config/uav_ros_gz_bridge_config.yaml.jinja

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
{%- for topic in camera_info_topic_list -%}
2-
- ros_topic_name: "{{ topic }}"
3-
gz_topic_name: "{{ topic }}"
1+
{%- for topics in camera_info_topic_list -%}
2+
- ros_topic_name: "{{ topics["ros"] }}"
3+
gz_topic_name: "{{ topics["gazebo"] }}"
44
ros_type_name: "sensor_msgs/msg/CameraInfo"
55
gz_type_name: "gz.msgs.CameraInfo"
66
direction: GZ_TO_ROS
77
{% endfor %}
88

9-
{%- for topic in twoD_lidar_topic_list -%}
10-
- ros_topic_name: "{{ topic }}"
11-
gz_topic_name: "{{ topic }}"
9+
{%- for topic in laser_scan_topic_list -%}
10+
- ros_topic_name: "{{ topic["ros"] }}"
11+
gz_topic_name: "{{ topic["gazebo"] }}"
1212
ros_type_name: "sensor_msgs/msg/LaserScan"
1313
gz_type_name: "gz.msgs.LaserScan"
1414
direction: GZ_TO_ROS
1515
{% endfor %}
1616

17-
{%- for topic in threeD_lidar_topic_list -%}
18-
- ros_topic_name: "{{ topic }}/points"
19-
gz_topic_name: "{{ topic }}/points"
17+
{%- for topic in point_cloud_topic_list -%}
18+
- ros_topic_name: "{{ topic["ros"] }}"
19+
gz_topic_name: "{{ topic["gazebo"] }}"
2020
ros_type_name: "sensor_msgs/msg/PointCloud2"
2121
gz_type_name: "gz.msgs.PointCloudPacked"
2222
direction: GZ_TO_ROS
13.3 MB
Binary file not shown.

models/mrs_robots_description/sdf/README.md

Lines changed: 362 additions & 0 deletions
Large diffs are not rendered by default.

models/mrs_robots_description/sdf/components/camera/bluefox.sdf.jinja

Lines changed: 0 additions & 245 deletions
This file was deleted.

0 commit comments

Comments
 (0)