BRSRI/bellande_humanoid_robot_intelligence_control_system_framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #49 from ROBOTIS-GIT/master

Browse Source 
merge (master -> develop)
This commit is contained in:
zerom
2017-08-09 14:13:10 +09:00
committed by GitHub
parent ef1c16664a 4b0f03ee5c
commit daf53e36e7
10 changed files with 102 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
robotis_controller/CHANGELOG.rst
View File

@ -2,6 +2,27 @@
Changelog for package robotis_controller
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
0.2.5 (2017-06-09)
-----------
* updated for yaml-cpp dependencies
* Contributors: SCH
0.2.4 (2017-06-07)
-----------
* added cmake_modules in package.xml
* Contributors: SCH
0.2.3 (2017-05-23)
-----------
* updated the cmake file for ros install
* Contributors: SCH
0.2.2 (2017-04-24)
-----------
* updated robotis_controller.cpp
* changed to read control cycle from .robot file
* Contributors: Zerom
0.2.1 (2016-11-23)
-----------
* Merge the changes and update

7
robotis_controller/CMakeLists.txt
View File

@ -19,6 +19,10 @@ find_package(catkin REQUIRED COMPONENTS
cmake_modules
)
set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CATKIN_DEVEL_PREFIX}/lib/pkgconfig")
find_package(PkgConfig)
pkg_check_modules(yaml_cpp yaml-cpp REQUIRED)
################################################################################
# Declare ROS messages, services and actions
################################################################################
@ -42,11 +46,12 @@ catkin_package(
include_directories(
include
${catkin_INCLUDE_DIRS}
${yaml_cpp_INCLUDE_DIRS}
)
add_library(robotis_controller src/robotis_controller/robotis_controller.cpp)
add_dependencies(robotis_controller ${catkin_EXPORTED_TARGETS})
target_link_libraries(robotis_controller yaml-cpp ${catkin_LIBRARIES})
target_link_libraries(robotis_controller ${yaml_cpp_LIBRARIES} ${catkin_LIBRARIES})
################################################################################
# Install

6
robotis_controller/package.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>robotis_controller</name>
<version>0.2.1</version>
<version>0.2.5</version>
<description>
The main package that controls THORMANG3.
</description>
@ -20,6 +20,8 @@
<build_depend>robotis_device</build_depend>
<build_depend>robotis_controller_msgs</build_depend>
<build_depend>robotis_framework_common</build_depend>
<build_depend>cmake_modules</build_depend>
<build_depend>yaml-cpp</build_depend>
<run_depend>roscpp</run_depend>
<run_depend>roslib</run_depend>
<run_depend>std_msgs</run_depend>
@ -28,5 +30,7 @@
<run_depend>robotis_device</run_depend>
<run_depend>robotis_controller_msgs</run_depend>
<run_depend>robotis_framework_common</run_depend>
<run_depend>cmake_modules</run_depend>
<run_depend>yaml-cpp</run_depend>
<export></export>
</package>