From c389e4e2afb093cc89cfaf47e8f19b6aa6d17baf Mon Sep 17 00:00:00 2001 From: alekskl01 Date: Sat, 14 Oct 2023 17:32:20 +0200 Subject: [PATCH] added config directory to install in CMake --- motion/thruster_interface/CMakeLists.txt | 5 +++-- ...hruster_interface_ros.hpp => thruster_interface_node.hpp} | 2 +- ...hruster_interface_ros.cpp => thruster_interface_node.cpp} | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) rename motion/thruster_interface/include/thruster_interface/{thruster_interface_ros.hpp => thruster_interface_node.hpp} (98%) rename motion/thruster_interface/src/{thruster_interface_ros.cpp => thruster_interface_node.cpp} (96%) diff --git a/motion/thruster_interface/CMakeLists.txt b/motion/thruster_interface/CMakeLists.txt index 135f25b8..350a9c82 100644 --- a/motion/thruster_interface/CMakeLists.txt +++ b/motion/thruster_interface/CMakeLists.txt @@ -21,7 +21,7 @@ include_directories(include) add_executable(${PROJECT_NAME}_node src/thruster_interface.cpp - src/thruster_interface_ros.cpp + src/thruster_interface_node.cpp ) ament_target_dependencies(${PROJECT_NAME}_node @@ -32,12 +32,13 @@ ament_target_dependencies(${PROJECT_NAME}_node install( DIRECTORY include/ - DESTINATION include + DESTINATION include ) # Install launch files. install(DIRECTORY launch + config DESTINATION share/${PROJECT_NAME} ) diff --git a/motion/thruster_interface/include/thruster_interface/thruster_interface_ros.hpp b/motion/thruster_interface/include/thruster_interface/thruster_interface_node.hpp similarity index 98% rename from motion/thruster_interface/include/thruster_interface/thruster_interface_ros.hpp rename to motion/thruster_interface/include/thruster_interface/thruster_interface_node.hpp index f71f84e6..24174575 100644 --- a/motion/thruster_interface/include/thruster_interface/thruster_interface_ros.hpp +++ b/motion/thruster_interface/include/thruster_interface/thruster_interface_node.hpp @@ -11,7 +11,7 @@ using std::placeholders::_1; class ThrusterInterfaceROS : public rclcpp::Node { private: std::string mapping_file = - ament_index_cpp::get_package_share_directory("thruster_interface") + + ament_index_cpp::get_package_share_directory("thruster_interface") + "/config/ThrustMe_P1000_force_mapping.csv"; ThrusterInterface thrusterInterface{mapping_file}; diff --git a/motion/thruster_interface/src/thruster_interface_ros.cpp b/motion/thruster_interface/src/thruster_interface_node.cpp similarity index 96% rename from motion/thruster_interface/src/thruster_interface_ros.cpp rename to motion/thruster_interface/src/thruster_interface_node.cpp index 7754aab5..a0a4a111 100644 --- a/motion/thruster_interface/src/thruster_interface_ros.cpp +++ b/motion/thruster_interface/src/thruster_interface_node.cpp @@ -1,4 +1,4 @@ -#include +#include void ThrusterInterfaceROS::thrust_callback( const vortex_msgs::msg::ThrusterForces::SharedPtr msg) {