Initial Melodic commit.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5742c94..7d68652 100644 (file)
--- 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 (file)
--- 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<const urdf::Joint> joint_urdf_;
+  urdf::JointConstSharedPtr joint_urdf_;
   realtime_tools::RealtimeBuffer<Commands> 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 (file)
--- 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<const urdf::Joint> joint_urdf_;
+  urdf::JointConstSharedPtr joint_urdf_;
   realtime_tools::RealtimeBuffer<Commands> 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 (file)
--- a/package.xml
+++ b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>voltage_controllers</name>
-  <version>0.0.0</version>
+  <version>0.1.0</version>
   <description>The voltage_controllers package</description>
 
   <!-- One maintainer tag required, multiple allowed, one person per tag -->