diff --git a/urc_bringup/CMakeLists.txt b/urc_bringup/CMakeLists.txt index 04139ef9..4bfd142a 100644 --- a/urc_bringup/CMakeLists.txt +++ b/urc_bringup/CMakeLists.txt @@ -14,6 +14,8 @@ find_package(sensor_msgs REQUIRED) find_package(tf2_ros REQUIRED) find_package(nav_msgs REQUIRED) find_package(urc_msgs REQUIRED) +find_package(ros_gz REQUIRED) +find_package(effort_controllers REQUIRED) include_directories( include @@ -37,6 +39,8 @@ set(dependencies tf2_msgs tf2_ros urc_msgs + ros_gz + effort_controllers ) ament_target_dependencies(${PROJECT_NAME} diff --git a/urc_bringup/package.xml b/urc_bringup/package.xml index f727e61f..860545c4 100644 --- a/urc_bringup/package.xml +++ b/urc_bringup/package.xml @@ -16,6 +16,9 @@ sensor_msgs tf2_msgs urc_msgs + ros_gz + effort_controllers + grid_map_rviz_plugin ament_lint_auto ament_lint_common diff --git a/urc_controllers/CMakeLists.txt b/urc_controllers/CMakeLists.txt index b7ef6892..53e5284a 100644 --- a/urc_controllers/CMakeLists.txt +++ b/urc_controllers/CMakeLists.txt @@ -22,6 +22,7 @@ find_package(geometry_msgs REQUIRED) find_package(tf2 REQUIRED) find_package(tf2_ros REQUIRED) find_package(tf2_geometry_msgs REQUIRED) +find_package(ros2_control REQUIRED) add_library( ${PROJECT_NAME} @@ -55,6 +56,7 @@ ament_target_dependencies( tf2 tf2_ros tf2_geometry_msgs + ros2_control ) target_compile_definitions(urc_controllers PRIVATE "urc_hw_BUILDING_LIBRARY") diff --git a/urc_controllers/package.xml b/urc_controllers/package.xml index bef46369..5fe9578c 100644 --- a/urc_controllers/package.xml +++ b/urc_controllers/package.xml @@ -19,6 +19,7 @@ urc_msgs joint_trajectory_controller geometry_msgs + ros2_control pluginlib diff --git a/urc_hw_description/CMakeLists.txt b/urc_hw_description/CMakeLists.txt index e6c465bc..bc6328fc 100644 --- a/urc_hw_description/CMakeLists.txt +++ b/urc_hw_description/CMakeLists.txt @@ -19,6 +19,10 @@ endif() find_package(ament_cmake REQUIRED) find_package(urdf REQUIRED) find_package(xacro REQUIRED) +find_package(gz_ros2_control REQUIRED) +find_package(ros_gz_sim REQUIRED) +find_package(ros_gz_bridge REQUIRED) +find_package(joint_state_broadcaster REQUIRED) install( DIRECTORY diff --git a/urc_hw_description/package.xml b/urc_hw_description/package.xml index 9a16e37c..4f1a3ff9 100644 --- a/urc_hw_description/package.xml +++ b/urc_hw_description/package.xml @@ -11,11 +11,15 @@ urdf xacro urc_bringup + joint_state_broadcaster robot_state_publisher joint_state_publisher joint_state_publisher_gui + ros_gz_sim + ros_gz_bridge + gz_ros2_control rviz2 launch launch_ros diff --git a/urc_perception/CMakeLists.txt b/urc_perception/CMakeLists.txt index 2d33da0a..df4fadd0 100644 --- a/urc_perception/CMakeLists.txt +++ b/urc_perception/CMakeLists.txt @@ -19,6 +19,7 @@ find_package(PCL 1.10 REQUIRED) find_package(grid_map_core REQUIRED) find_package(grid_map_ros REQUIRED) find_package(grid_map_msgs REQUIRED) +find_package(grid_map_visualization REQUIRED) find_package(grid_map_pcl REQUIRED) find_package(grid_map_cv REQUIRED) find_package(Eigen3 REQUIRED) @@ -65,6 +66,7 @@ set(dependencies grid_map_core grid_map_ros grid_map_msgs + grid_map_visualization grid_map_pcl grid_map_cv filters diff --git a/urc_perception/package.xml b/urc_perception/package.xml index 6db4685e..1d203fa9 100644 --- a/urc_perception/package.xml +++ b/urc_perception/package.xml @@ -22,13 +22,13 @@ tf2_sensor_msgs tf2_geometry_msgs pcl_conversions - pcl_1.10 filters pluginlib rcl_interfaces grid_map_core grid_map_ros grid_map_msgs + grid_map_visualization grid_map_pcl grid_map_cv