Skip to content

Commit 67b4b6b

Browse files
committed
Port example script for terrain_planner_benchmark
Fix launchfile Fix CMake F Fix goal position and rviz configs Run rviz with roslaunch
1 parent e368ef4 commit 67b4b6b

File tree

11 files changed

+621
-520
lines changed

11 files changed

+621
-520
lines changed

README.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<img align="right" height="60" src="https://user-images.githubusercontent.com/5248102/126074528-004a32b9-7911-486a-9e79-8b78e6e66fdc.png">
22

3-
# terrain-navigation
3+
# terrain-navigation2
44

55
[![Build Test](https://github.com/ethz-asl/terrain-navigation/actions/workflows/build_test.yml/badge.svg)](https://github.com/ethz-asl/terrain-navigation/actions/workflows/build_test.yml)
66

77
This package includes an implementation of the RA-L submission of "Safe Low-Altitude Navigation in Steep Terrain with Fixed-Wing Aerial Vehicles".
88
The implementation includes a global planner based on a RRT* in the Dubins Airplane space enabling low altitude navigation for fixed wing vehicles in steep terrain.
99

10+
This repository is a ROS 2 port of the original implementation in [terrain-navigation](https://github.com/ethz-asl/terrain-navigation)
11+
1012
<p align="center">
1113
<img src="https://github.com/ethz-asl/terrain-navigation/assets/5248102/90e43b60-ea8c-49db-9fb3-257b145fc35c" alt="overview">
1214
</p>
@@ -57,6 +59,17 @@ Next, run the image, mounting in the source into a workspace. All the dependenci
5759
docker run --network=host -it -v $(pwd):/root/ros2_ws/src/ethz-asl/terrain-navigation -w /root/ros2_ws terrain-navigation-ros2 bash
5860
```
5961

62+
## Running an example of the planner
63+
In order to run the examples, build the `terrain_planner_benchmark` package.
64+
```
65+
colcon build --packages-up-to terrain_planner_benchmark
66+
```
67+
Run a simple planning example:
68+
```
69+
ros2 launch terrain_planner_benchmark test_ompl_rrt_circle_launch.xml
70+
```
71+
72+
6073
### Running the Build
6174

6275
For dependencies that do not have binaries available, pull them into your ROS workspace using vcs.

terrain_planner/launch/test_ompl_dubins_to_circle.launch

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<launch>
3+
<arg name="visualization" default="true"/>
4+
5+
<!-- <node pkg="tf" type="static_transform_publisher" name="world_map" args="0 0 0 0 0 0 world map 10"/> -->
6+
<node pkg="terrain_planner" exec="test_ompl_dubins_to_circle" name="test_ompl_dubins_to_circle">
7+
<param name="map_path" value="$(find-pkg-share terrain_planner)/../resources/sertig.tif"/>
8+
<param name="color_file_path" value="$(find-pkg-share terrain_planner)/../resources/sertig_color.tif"/>
9+
</node>
10+
<!-- <group if="$(arg visualization)">
11+
<node type="rviz2" name="rviz2" pkg="rviz2" args="-d $(find terrain_planner)/launch/config_dubins_to_circle.rviz" />
12+
</group> -->
13+
</launch>

terrain_planner_benchmark/CMakeLists.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,19 @@ find_package(grid_map_geo REQUIRED)
2929
find_package(terrain_navigation REQUIRED)
3030
find_package(Boost REQUIRED) # Workaround for terrain_planner not exporting this correctly
3131
find_package(terrain_planner REQUIRED)
32+
find_package(geometry_msgs REQUIRED)
3233

3334
add_library(${PROJECT_NAME})
3435
add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
3536

3637
target_include_directories(${PROJECT_NAME}
3738
PUBLIC
3839
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
40+
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
41+
)
42+
43+
target_link_libraries(${PROJECT_NAME} PUBLIC
44+
${geometry_msgs_TARGETS}
3945
)
4046

4147
add_executable(terrain_planner_benchmark_node)
@@ -45,13 +51,19 @@ add_executable(test_rrt_replanning_node EXCLUDE_FROM_ALL)
4551
add_executable(surface_visualization EXCLUDE_FROM_ALL)
4652
add_executable(test_dubins_classification EXCLUDE_FROM_ALL)
4753
add_executable(run_replay EXCLUDE_FROM_ALL)
48-
add_executable(test_rrt_circle_goal EXCLUDE_FROM_ALL)
54+
add_executable(test_rrt_circle_goal
55+
src/test_rrt_circle_goal.cpp
56+
)
57+
target_link_libraries(test_rrt_circle_goal PUBLIC
58+
${PROJECT_NAME}
59+
)
4960
add_subdirectory(src)
5061

5162
include(GNUInstallDirs)
5263
install(
5364
TARGETS
5465
terrain_planner_benchmark_node
66+
test_rrt_circle_goal
5567
EXPORT export_${PROJECT_NAME}
5668
DESTINATION lib/${PROJECT_NAME}
5769
)

0 commit comments

Comments
 (0)