From ad1757d96237004e42aa2a63144d4d9cbbd2f12c Mon Sep 17 00:00:00 2001 From: Walter Fetter Lages Date: Wed, 21 Mar 2018 13:36:45 -0300 Subject: [PATCH] Bug fixes. twil_description: include transmisions twil_ident: enable install target on CMakeLists.txt twil_controllers: use namespace on joint_effort.launch --- twil_controllers/launch/joint_effort.launch | 2 +- twil_description/xacro/fixed_wheel.urdf.xacro | 11 +++++++++++ twil_ident/CMakeLists.txt | 6 +++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/twil_controllers/launch/joint_effort.launch b/twil_controllers/launch/joint_effort.launch index 1138f8a..0fe3514 100644 --- a/twil_controllers/launch/joint_effort.launch +++ b/twil_controllers/launch/joint_effort.launch @@ -11,6 +11,6 @@ - + diff --git a/twil_description/xacro/fixed_wheel.urdf.xacro b/twil_description/xacro/fixed_wheel.urdf.xacro index dfc8761..862bdf1 100644 --- a/twil_description/xacro/fixed_wheel.urdf.xacro +++ b/twil_description/xacro/fixed_wheel.urdf.xacro @@ -34,6 +34,17 @@ + + transmission_interface/SimpleTransmission" + + EffortJointInterface + + + EffortJointInterface + 1 + + + Gazebo/FlatBlack diff --git a/twil_ident/CMakeLists.txt b/twil_ident/CMakeLists.txt index bb4fe69..ad82545 100644 --- a/twil_ident/CMakeLists.txt +++ b/twil_ident/CMakeLists.txt @@ -130,11 +130,11 @@ include_directories( # ) ## Mark executables and/or libraries for installation -# install(TARGETS twil_ident twil_ident_node +install(TARGETS twil_ident twil_ident_node # ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} # LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} -# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} -# ) + RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} +) ## Mark cpp header files for installation # install(DIRECTORY include/${PROJECT_NAME}/ -- 2.12.0