From f49a6cb4000cf8d85322bc493acf462e814ccdf3 Mon Sep 17 00:00:00 2001 From: Walter Fetter Lages Date: Sun, 18 Nov 2018 02:27:37 -0200 Subject: [PATCH] Initial Melodic commit. --- CMakeLists.txt | 8 ++++---- include/voltage_controllers/joint_effort_controller.h | 2 +- include/voltage_controllers/joint_position_controller.h | 2 +- package.xml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5742c94..7d68652 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3) project(voltage_controllers) ## Compile as C++11, supported in ROS Kinetic and newer -# add_compile_options(-std=c++11) +add_compile_options(-std=c++11) ## Find catkin macros and libraries ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) @@ -182,11 +182,11 @@ install(TARGETS ${PROJECT_NAME} ) ## Mark cpp header files for installation -# install(DIRECTORY include/${PROJECT_NAME}/ -# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} +install(DIRECTORY include/${PROJECT_NAME}/ + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} # FILES_MATCHING PATTERN "*.h" # PATTERN ".svn" EXCLUDE -# ) +) ## Mark other files for installation (e.g. launch and bag files, etc.) install(FILES diff --git a/include/voltage_controllers/joint_effort_controller.h b/include/voltage_controllers/joint_effort_controller.h index 6ffd59d..23bed46 100644 --- a/include/voltage_controllers/joint_effort_controller.h +++ b/include/voltage_controllers/joint_effort_controller.h @@ -175,7 +175,7 @@ public: double getEffort(); hardware_interface::JointHandle joint_; - boost::shared_ptr joint_urdf_; + urdf::JointConstSharedPtr joint_urdf_; realtime_tools::RealtimeBuffer command_; Commands command_struct_; // pre-allocated memory that is re-used to set the realtime buffer diff --git a/include/voltage_controllers/joint_position_controller.h b/include/voltage_controllers/joint_position_controller.h index 1adce92..228def0 100644 --- a/include/voltage_controllers/joint_position_controller.h +++ b/include/voltage_controllers/joint_position_controller.h @@ -175,7 +175,7 @@ public: double getPosition(); hardware_interface::JointHandle joint_; - boost::shared_ptr joint_urdf_; + urdf::JointConstSharedPtr joint_urdf_; realtime_tools::RealtimeBuffer command_; Commands command_struct_; // pre-allocated memory that is re-used to set the realtime buffer diff --git a/package.xml b/package.xml index 43607ee..3ebc850 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ voltage_controllers - 0.0.0 + 0.1.0 The voltage_controllers package -- 2.12.0