Skip to content

Commit f51bcc7

Browse files
JStechJoshua WhitleymabelzhanghidmicTaehun Lim
authored
Sync Dashing & Eloquent (#568)
* Fixing minor uncrustify failures. (#532) * Adding missing test dependency. (#534) * remove unneeded dependencies on rcl and angles (#537) * Ensure robot_localization filters use ROS 2 time properly. (#536) * Ensure robot_localization filters use ROS 2 time properly. Signed-off-by: Michel Hidalgo <[email protected]> * Use generic timer instead of wall timer. Signed-off-by: Michel Hidalgo <[email protected]> * add launch_ros exec_depend (#539) * print compiler optimization msg to stdout instead of stderr (#542) * Fix FilterBaseDiagnosticsTest.EmptyTimestamps test on amd64 (#541) * publish empty timestamp message for longer * change qos to keep_all for FilterBaseDiagnosticsTest.EmptyTimestamps test * remove debug printouts * fix cpplint * Attempt to fix binary build test errors (#548) * dependencies Signed-off-by: Mabel Zhang <[email protected]> * link tests with rosidl_typesupport_cpp Signed-off-by: Mabel Zhang <[email protected]> * fix uncrustify Signed-off-by: Mabel Zhang <[email protected]> * revert uncrustify * Modified to get datum array param (#549) * Modified get datum params * Leave vector to default constructor #549 * Fixing dual_ekf_navsat_example.yaml parameter file for dashing branch (#556) * Fixing dual_ekf_navsat_example paramter file for ros-dashing * Fixing 'value type integer' error * Fix utm coordinate print (#563) * Fix get parameters (#552) * Modified get datum params * Leave vector to default constructor #549 * Deleted vector init statements * Deleted initialization of `initial_state` vector * Added default values of acceleration_limits * Added vector resized when use_control param set false * uncrustify fix Co-authored-by: Joshua Whitley <[email protected]> Co-authored-by: Mabel Zhang <[email protected]> Co-authored-by: Michel Hidalgo <[email protected]> Co-authored-by: Taehun Lim <[email protected]> Co-authored-by: Pankhuri Vanjani <[email protected]> Co-authored-by: floroeske <[email protected]>
1 parent b1fa4d5 commit f51bcc7

File tree

6 files changed

+210
-181
lines changed

6 files changed

+210
-181
lines changed

CMakeLists.txt

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
1010
endif()
1111

1212
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
13-
message("${PROJECT_NAME}: You did not request a specific build type: selecting 'RelWithDebInfo'.")
13+
message(STATUS "${PROJECT_NAME}: You did not request a specific build type: selecting 'RelWithDebInfo'.")
1414
set(CMAKE_BUILD_TYPE RelWithDebInfo)
1515
endif()
1616

1717
find_package(ament_cmake REQUIRED)
18-
find_package(rcl REQUIRED)
1918
find_package(rclcpp REQUIRED)
2019
find_package(diagnostic_msgs REQUIRED)
2120
find_package(diagnostic_updater REQUIRED)
@@ -105,7 +104,6 @@ ament_target_dependencies(
105104
geographic_msgs
106105
geometry_msgs
107106
nav_msgs
108-
rcl
109107
rclcpp
110108
sensor_msgs
111109
std_msgs
@@ -162,7 +160,7 @@ if(BUILD_TESTING)
162160
find_package(ament_cmake_cpplint REQUIRED)
163161
find_package(ament_cmake_lint_cmake REQUIRED)
164162
find_package(ament_cmake_uncrustify REQUIRED)
165-
find_package(launch_testing_ament_cmake)
163+
find_package(launch_testing_ament_cmake REQUIRED)
166164

167165
#### FILTER BASE TESTS ####
168166
ament_add_gtest(filter_base-test test/test_filter_base.cpp)
@@ -172,6 +170,8 @@ if(BUILD_TESTING)
172170
ament_add_gtest_executable(test_filter_base_diagnostics_timestamps
173171
test/test_filter_base_diagnostics_timestamps.cpp)
174172
target_link_libraries(test_filter_base_diagnostics_timestamps ${library_name})
173+
rosidl_target_interfaces(test_filter_base_diagnostics_timestamps
174+
${PROJECT_NAME} "rosidl_typesupport_cpp")
175175
add_dependencies(test_filter_base_diagnostics_timestamps ekf_node)
176176
ament_add_test(test_filter_base_diagnostics_timestamps
177177
GENERATE_RESULT_FOR_RETURN_CODE_ZERO
@@ -183,10 +183,14 @@ if(BUILD_TESTING)
183183
#### EKF TESTS ######
184184
ament_add_gtest(test_ekf test/test_ekf.cpp)
185185
target_link_libraries(test_ekf ${library_name})
186+
rosidl_target_interfaces(test_ekf
187+
${PROJECT_NAME} "rosidl_typesupport_cpp")
186188

187189
ament_add_gtest_executable(test_ekf_localization_node_interfaces
188190
test/test_ekf_localization_node_interfaces.cpp)
189191
target_link_libraries(test_ekf_localization_node_interfaces ${library_name})
192+
rosidl_target_interfaces(test_ekf_localization_node_interfaces
193+
${PROJECT_NAME} "rosidl_typesupport_cpp")
190194
add_dependencies(test_ekf_localization_node_interfaces ekf_node)
191195
ament_add_test(test_ekf_localization_node_interfaces
192196
GENERATE_RESULT_FOR_RETURN_CODE_ZERO
@@ -198,11 +202,15 @@ if(BUILD_TESTING)
198202
#### UKF TESTS #####
199203
ament_add_gtest(test_ukf test/test_ukf.cpp)
200204
target_link_libraries(test_ukf ${library_name})
205+
rosidl_target_interfaces(test_ukf
206+
${PROJECT_NAME} "rosidl_typesupport_cpp")
201207

202208

203209
ament_add_gtest_executable(test_ukf_localization_node_interfaces
204210
test/test_ukf_localization_node_interfaces.cpp)
205211
target_link_libraries(test_ukf_localization_node_interfaces ${library_name})
212+
rosidl_target_interfaces(test_ukf_localization_node_interfaces
213+
${PROJECT_NAME} "rosidl_typesupport_cpp")
206214
add_dependencies(test_ukf_localization_node_interfaces ekf_node)
207215
ament_add_test(test_ukf_localization_node_interfaces
208216
GENERATE_RESULT_FOR_RETURN_CODE_ZERO
@@ -234,6 +242,8 @@ if(BUILD_TESTING)
234242
ament_add_gtest_executable(test_robot_localization_estimator
235243
test/test_robot_localization_estimator.cpp)
236244
target_link_libraries(test_robot_localization_estimator ${library_name})
245+
rosidl_target_interfaces(test_robot_localization_estimator
246+
${PROJECT_NAME} "rosidl_typesupport_cpp")
237247
ament_add_test(test_robot_localization_estimator
238248
GENERATE_RESULT_FOR_RETURN_CODE_ZERO
239249
TIMEOUT 100
@@ -244,9 +254,13 @@ if(BUILD_TESTING)
244254
ament_add_gtest_executable(test_ros_robot_localization_listener
245255
test/test_ros_robot_localization_listener.cpp)
246256
target_link_libraries(test_ros_robot_localization_listener ${library_name})
257+
rosidl_target_interfaces(test_ros_robot_localization_listener
258+
${PROJECT_NAME} "rosidl_typesupport_cpp")
247259
ament_add_gtest_executable(test_ros_robot_localization_listener_publisher
248260
test/test_ros_robot_localization_listener_publisher.cpp)
249261
target_link_libraries(test_ros_robot_localization_listener_publisher ${library_name})
262+
rosidl_target_interfaces(test_ros_robot_localization_listener_publisher
263+
${PROJECT_NAME} "rosidl_typesupport_cpp")
250264
ament_add_test(test_ros_robot_localization_listener
251265
GENERATE_RESULT_FOR_RETURN_CODE_ZERO
252266
TIMEOUT 100
@@ -307,4 +321,5 @@ install(DIRECTORY
307321

308322
ament_export_include_directories(include)
309323
ament_export_libraries(${library_name})
324+
ament_export_dependencies(rosidl_default_runtime)
310325
ament_package()

package.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@
1717
<buildtool_depend>builtin_interfaces</buildtool_depend>
1818
<buildtool_depend>rosidl_default_generators</buildtool_depend>
1919

20-
<depend>angles</depend>
2120
<depend>eigen</depend>
2221
<depend>geographic_msgs</depend>
2322
<depend>geometry_msgs</depend>
2423
<depend>diagnostic_msgs</depend>
2524
<depend>diagnostic_updater</depend>
2625
<depend>nav_msgs</depend>
27-
<build_depend>rcl</build_depend>
2826
<build_depend>rclcpp</build_depend>
2927
<build_depend>rmw_implementation</build_depend>
3028
<depend>sensor_msgs</depend>
@@ -45,6 +43,8 @@
4543

4644
<test_depend>ament_lint_auto</test_depend>
4745
<test_depend>ament_lint_common</test_depend>
46+
<test_depend>launch_ros</test_depend>
47+
<test_depend>launch_testing_ament_cmake</test_depend>
4848

4949
<member_of_group>rosidl_interface_packages</member_of_group>
5050

0 commit comments

Comments
 (0)