Skip to content

Commit daf53e3

Browse files
ROBOTIS-zeromROBOTIS-zerom
authored
Merge pull request #49 from ROBOTIS-GIT/master
merge (master -> develop)
2 parents ef1c166 + 4b0f03e commit daf53e3

File tree

10 files changed

+102
-6
lines changed

10 files changed

+102
-6
lines changed

‎robotis_controller/CHANGELOG.rst‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,27 @@
22
Changelog for package robotis_controller
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.2.5 (2017-06-09)
6+
-----------
7+
* updated for yaml-cpp dependencies
8+
* Contributors: SCH
9+
10+
0.2.4 (2017-06-07)
11+
-----------
12+
* added cmake_modules in package.xml
13+
* Contributors: SCH
14+
15+
0.2.3 (2017-05-23)
16+
-----------
17+
* updated the cmake file for ros install
18+
* Contributors: SCH
19+
20+
0.2.2 (2017-04-24)
21+
-----------
22+
* updated robotis_controller.cpp
23+
* changed to read control cycle from .robot file
24+
* Contributors: Zerom
25+
526
0.2.1 (2016-11-23)
627
-----------
728
* Merge the changes and update

‎robotis_controller/CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ find_package(catkin REQUIRED COMPONENTS
1919
cmake_modules
2020
)
2121

22+
set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CATKIN_DEVEL_PREFIX}/lib/pkgconfig")
23+
find_package(PkgConfig)
24+
pkg_check_modules(yaml_cpp yaml-cpp REQUIRED)
25+
2226
################################################################################
2327
# Declare ROS messages, services and actions
2428
################################################################################
@@ -42,11 +46,12 @@ catkin_package(
4246
include_directories(
4347
include
4448
${catkin_INCLUDE_DIRS}
49+
${yaml_cpp_INCLUDE_DIRS}
4550
)
4651

4752
add_library(robotis_controller src/robotis_controller/robotis_controller.cpp)
4853
add_dependencies(robotis_controller ${catkin_EXPORTED_TARGETS})
49-
target_link_libraries(robotis_controller yaml-cpp ${catkin_LIBRARIES})
54+
target_link_libraries(robotis_controller ${yaml_cpp_LIBRARIES} ${catkin_LIBRARIES})
5055

5156
################################################################################
5257
# Install

‎robotis_controller/package.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package>
33
<name>robotis_controller</name>
4-
<version>0.2.1</version>
4+
<version>0.2.5</version>
55
<description>
66
The main package that controls THORMANG3.
77
</description>
@@ -20,6 +20,8 @@
2020
<build_depend>robotis_device</build_depend>
2121
<build_depend>robotis_controller_msgs</build_depend>
2222
<build_depend>robotis_framework_common</build_depend>
23+
<build_depend>cmake_modules</build_depend>
24+
<build_depend>yaml-cpp</build_depend>
2325
<run_depend>roscpp</run_depend>
2426
<run_depend>roslib</run_depend>
2527
<run_depend>std_msgs</run_depend>
@@ -28,5 +30,7 @@
2830
<run_depend>robotis_device</run_depend>
2931
<run_depend>robotis_controller_msgs</run_depend>
3032
<run_depend>robotis_framework_common</run_depend>
33+
<run_depend>cmake_modules</run_depend>
34+
<run_depend>yaml-cpp</run_depend>
3135
<export></export>
3236
</package>

‎robotis_device/CHANGELOG.rst‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,25 @@
22
Changelog for package robotis_device
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.2.5 (2017-06-09)
6+
-----------
7+
* none
8+
9+
0.2.4 (2017-06-07)
10+
-----------
11+
* none
12+
13+
0.2.3 (2017-05-23)
14+
-----------
15+
* updated the cmake file for ros install
16+
* Contributors: SCH
17+
18+
0.2.2 (2017-04-24)
19+
-----------
20+
* added a deivce: OpenCR
21+
* changed to read control cycle from .robot file
22+
* Contributors: Zerom, Kayman
23+
524
0.2.1 (2016-11-23)
625
-----------
726
* Merge the changes and update
@@ -26,6 +45,7 @@ Changelog for package robotis_device
2645
0.1.1 (2016-08-18)
2746
-----------
2847
* updated the package information
48+
* Contributors: Zerom
2949

3050
0.1.0 (2016-08-12)
3151
-----------
@@ -42,4 +62,4 @@ Changelog for package robotis_device
4262
ConvertRadian2Value / ConvertValue2Radian function bug fixed.
4363
* added code to support the gazebo simulator
4464
* renewal
45-
* Contributors: ROBOTIS, ROBOTIS-zerom, pyo
65+
* Contributors: Zerom

‎robotis_device/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package>
33
<name>robotis_device</name>
4-
<version>0.2.1</version>
4+
<version>0.2.5</version>
55
<description>
66
The package that manages device information of ROBOTIS robots.
77
This package is used when reading device information with the robot information file

‎robotis_framework/CHANGELOG.rst‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,28 @@
22
Changelog for package robotis_framework
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.2.5 (2017-06-09)
6+
-----------
7+
* updated for yaml-cpp dependencies (robotis_controller)
8+
* Contributors: SCH
9+
10+
0.2.4 (2017-06-07)
11+
-----------
12+
* added cmake_modules in package.xml
13+
* Contributors: SCH
14+
15+
0.2.3 (2017-05-23)
16+
-----------
17+
* updated the cmake file for ros install
18+
* Contributors: SCH
19+
20+
0.2.2 (2017-04-24)
21+
-----------
22+
* added a deivce: OpenCR
23+
* updated robotis_controller.cpp
24+
* changed to read control cycle from .robot file
25+
* Contributors: Zerom, Kayman
26+
527
0.2.1 (2016-11-23)
628
-----------
729
* Merge the changes and update

‎robotis_framework/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package>
33
<name>robotis_framework</name>
4-
<version>0.2.1</version>
4+
<version>0.2.5</version>
55
<description>ROS packages for the robotis_framework (meta package)</description>
66
<license>BSD</license>
77
<author email="[email protected]">Zerom</author>

‎robotis_framework_common/CHANGELOG.rst‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22
Changelog for package robotis_framework_common
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.2.5 (2017-06-09)
6+
-----------
7+
* none
8+
9+
0.2.4 (2017-06-07)
10+
-----------
11+
* none
12+
13+
0.2.3 (2017-05-23)
14+
-----------
15+
* updated the cmake file for ros install
16+
* Contributors: SCH
17+
18+
0.2.2 (2017-04-24)
19+
-----------
20+
* updated for other packages
21+
* Contributors: Zerom, Kayman
22+
523
0.2.1 (2016-11-23)
624
-----------
725
* Merge the changes and update

‎robotis_framework_common/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
4646
################################################################################
4747
# Install
4848
################################################################################
49+
install(TARGETS robotis_framework_common
50+
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
51+
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
52+
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
53+
)
54+
4955
install(DIRECTORY include/${PROJECT_NAME}/
5056
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
5157
)

‎robotis_framework_common/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package>
33
<name>robotis_framework_common</name>
4-
<version>0.2.1</version>
4+
<version>0.2.5</version>
55
<description>
66
The package contains commonly used Headers for the ROBOTIS Framework.
77
</description>

0 commit comments

Comments
 (0)