Skip to content

Commit 317012f

Browse files
robotpilotrobotpilot
authored
Merge pull request #57 from ROBOTIS-GIT/kinetic-devel
merge for sync kinetic-devel and master branch
2 parents d7161f1 + f44c58a commit 317012f

File tree

13 files changed

+102
-37
lines changed

13 files changed

+102
-37
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ compiler:
1212
- gcc
1313
notifications:
1414
email:
15-
on_success: always
15+
on_success: change
1616
on_failure: always
1717
recipients:
1818
- [email protected]

‎README.md‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
1-
# robotis_framework
2-
1+
# ROBOTIS Framework Metapackage
32
[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2FROBOTIS-Framework.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2FROBOTIS-Framework) [![Build Status](https://travis-ci.org/ROBOTIS-GIT/ROBOTIS-Framework.svg?branch=master)](https://travis-ci.org/ROBOTIS-GIT/ROBOTIS-Framework)
43

5-
ROS packages for the robotis_framework (meta package)
4+
# Documents for robotis_framework packages
5+
- [ROBOTIS e-Manual](http://emanual.robotis.com/docs/en/software/robotis_framework_packages/#robotis-framework)
6+
- http://wiki.ros.org/robotis_framework
7+
- http://wiki.ros.org/robotis_controller
8+
- http://wiki.ros.org/robotis_device
9+
- http://wiki.ros.org/robotis_framework_common
10+
11+
# ROS packages related to ROBOTIS Framework
12+
- [dynamixel_sdk](https://github.com/ROBOTIS-GIT/DynamixelSDK)
13+
- [robotis_framework](https://github.com/ROBOTIS-GIT/ROBOTIS-Framework)
14+
- [robotis_controller_msgs](https://github.com/ROBOTIS-GIT/ROBOTIS-Framework-msgs)
615

7-
# Documents
8-
- ROS Wiki: http://wiki.ros.org/robotis_framework
9-
- ROBOTIS e-Manual: http://emanual.robotis.com/docs/en/software/robotis_framework_packages/
16+
# Documents and Videos for ROBOTIS Framework
17+
- [ROBOTIS e-Manual for Dynamixel SDK](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/)
18+
- [ROBOTIS e-Manual for ROBOTIS Framework](http://emanual.robotis.com/docs/en/software/robotis_framework_packages/)

‎robotis_controller/CHANGELOG.rst‎

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

5+
0.2.8 (2018-03-20)
6+
------------------
7+
* modified CMakeLists.txt for system dependencies (yaml-cpp)
8+
* Contributors: Zerom, Pyo
9+
510
0.2.7 (2018-03-15)
611
------------------
712
* changed the License and package format to version 2

‎robotis_controller/CMakeLists.txt‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
################################################################################
2-
# CMake
2+
# Set minimum required version of cmake, project name and compile options
33
################################################################################
44
cmake_minimum_required(VERSION 2.8.3)
55
project(robotis_controller)
66

7-
set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
7+
## Compile as C++11, supported in ROS Kinetic and newer
8+
add_compile_options(-std=c++11)
89

910
################################################################################
10-
# Packages
11+
# Find catkin packages and libraries for catkin and system dependencies
1112
################################################################################
1213
find_package(catkin REQUIRED COMPONENTS
1314
roscpp
@@ -21,8 +22,27 @@ find_package(catkin REQUIRED COMPONENTS
2122
cmake_modules
2223
)
2324

25+
# Resolve system dependency on yaml-cpp, which apparently does not
26+
# provide a CMake find_package() module.
2427
find_package(PkgConfig REQUIRED)
25-
pkg_check_modules(yaml_cpp yaml-cpp REQUIRED)
28+
pkg_check_modules(YAML_CPP REQUIRED yaml-cpp)
29+
find_path(YAML_CPP_INCLUDE_DIR
30+
NAMES yaml_cpp.h
31+
PATHS ${YAML_CPP_INCLUDE_DIRS}
32+
)
33+
find_library(YAML_CPP_LIBRARY
34+
NAMES YAML_CPP
35+
PATHS ${YAML_CPP_LIBRARY_DIRS}
36+
)
37+
link_directories(${YAML_CPP_LIBRARY_DIRS})
38+
39+
if(NOT ${YAML_CPP_VERSION} VERSION_LESS "0.5")
40+
add_definitions(-DHAVE_NEW_YAMLCPP)
41+
endif(NOT ${YAML_CPP_VERSION} VERSION_LESS "0.5")
42+
43+
################################################################################
44+
# Setup for python modules and scripts
45+
################################################################################
2646

2747
################################################################################
2848
# Declare ROS messages, services and actions
@@ -33,7 +53,7 @@ pkg_check_modules(yaml_cpp yaml-cpp REQUIRED)
3353
################################################################################
3454

3555
################################################################################
36-
# Catkin specific configuration
56+
# Declare catkin specific configuration to be passed to dependent projects
3757
################################################################################
3858
catkin_package(
3959
INCLUDE_DIRS include
@@ -47,12 +67,12 @@ catkin_package(
4767
include_directories(
4868
include
4969
${catkin_INCLUDE_DIRS}
50-
${yaml_cpp_INCLUDE_DIRS}
70+
${YAML_CPP_INCLUDE_DIRS}
5171
)
5272

5373
add_library(robotis_controller src/robotis_controller/robotis_controller.cpp)
5474
add_dependencies(robotis_controller ${catkin_EXPORTED_TARGETS})
55-
target_link_libraries(robotis_controller ${yaml_cpp_LIBRARIES} ${catkin_LIBRARIES})
75+
target_link_libraries(robotis_controller ${catkin_LIBRARIES} ${YAML_CPP_LIBRARIES})
5676

5777
################################################################################
5878
# Install

‎robotis_controller/package.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>robotis_controller</name>
4-
<version>0.2.7</version>
4+
<version>0.2.8</version>
55
<description>
66
robotis_controller package for ROBOTIS's platform like Manipulator-H, THORMANG and OP series
77
</description>
88
<license>Apache 2.0</license>
99
<author email="[email protected]">Zerom</author>
10+
<author email="[email protected]">Kayman</author>
1011
<author email="[email protected]">SCH</author>
1112
<maintainer email="[email protected]">Pyo</maintainer>
12-
<url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
13-
<url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
1413
<url type="website">http://wiki.ros.org/robotis_controller</url>
14+
<url type="emanual">http://emanual.robotis.com/docs/en/software/robotis_framework_packages/</url>
15+
<url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
16+
<url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
1517
<buildtool_depend>catkin</buildtool_depend>
1618
<depend>roscpp</depend>
1719
<depend>roslib</depend>

‎robotis_device/CHANGELOG.rst‎

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

5+
0.2.8 (2018-03-20)
6+
------------------
7+
* added RH-P12-RN.device file
8+
* Contributors: Zerom, Pyo
9+
510
0.2.7 (2018-03-15)
6-
-------------------------
11+
------------------
712
* fixed a bug that occur when handling bulk read item that does not exist
813
* changed the License and package format to version 2
914
* Contributors: SCH, Pyo

‎robotis_device/CMakeLists.txt‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
################################################################################
2-
# CMake
2+
# Set minimum required version of cmake, project name and compile options
33
################################################################################
44
cmake_minimum_required(VERSION 2.8.3)
55
project(robotis_device)
66

77
################################################################################
8-
# Packages
8+
# Find catkin packages and libraries for catkin and system dependencies
99
################################################################################
1010
find_package(catkin REQUIRED COMPONENTS
1111
roscpp
1212
dynamixel_sdk
1313
)
1414

15+
################################################################################
16+
# Setup for python modules and scripts
17+
################################################################################
18+
1519
################################################################################
1620
# Declare ROS messages, services and actions
1721
################################################################################
@@ -21,7 +25,7 @@ find_package(catkin REQUIRED COMPONENTS
2125
################################################################################
2226

2327
################################################################################
24-
# Catkin specific configuration
28+
# Declare catkin specific configuration to be passed to dependent projects
2529
################################################################################
2630
catkin_package(
2731
INCLUDE_DIRS include

‎robotis_device/package.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>robotis_device</name>
4-
<version>0.2.7</version>
4+
<version>0.2.8</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
88
from the robotis_controller package.
99
</description>
1010
<license>Apache 2.0</license>
1111
<author email="[email protected]">Zerom</author>
12+
<author email="[email protected]">Kayman</author>
1213
<author email="[email protected]">SCH</author>
1314
<maintainer email="[email protected]">Pyo</maintainer>
14-
<url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
15-
<url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
1615
<url type="website">http://wiki.ros.org/robotis_device</url>
16+
<url type="emanual">http://emanual.robotis.com/docs/en/software/robotis_framework_packages/</url>
17+
<url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
18+
<url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
1719
<buildtool_depend>catkin</buildtool_depend>
1820
<depend>roscpp</depend>
1921
<depend>dynamixel_sdk</depend>

‎robotis_framework/CHANGELOG.rst‎

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

5+
0.2.8 (2018-03-20)
6+
------------------
7+
* added RH-P12-RN.device file
8+
* modified CMakeLists.txt for system dependencies (yaml-cpp)
9+
* Contributors: Zerom, Pyo
10+
511
0.2.7 (2018-03-15)
612
------------------
713
* changed all values read by bulk read are saved to dxl_state\_->bulk_read_table\_.

‎robotis_framework/package.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>robotis_framework</name>
4-
<version>0.2.7</version>
4+
<version>0.2.8</version>
55
<description>
66
ROS packages for the robotis_framework (meta package)
77
</description>
88
<license>Apache 2.0</license>
99
<author email="[email protected]">Zerom</author>
10+
<author email="[email protected]">Kayman</author>
1011
<author email="[email protected]">SCH</author>
1112
<maintainer email="[email protected]">Pyo</maintainer>
12-
<url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
13-
<url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
1413
<url type="website">http://wiki.ros.org/robotis_framework</url>
14+
<url type="emanual">http://emanual.robotis.com/docs/en/software/robotis_framework_packages/</url>
15+
<url type="repository">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework</url>
16+
<url type="bugtracker">https://github.com/ROBOTIS-GIT/ROBOTIS-Framework/issues</url>
1517
<buildtool_depend>catkin</buildtool_depend>
16-
<exec_depend>robotis_framework_common</exec_depend>
17-
<exec_depend>robotis_device</exec_depend>
1818
<exec_depend>robotis_controller</exec_depend>
19+
<exec_depend>robotis_device</exec_depend>
20+
<exec_depend>robotis_framework_common</exec_depend>
1921
<export><metapackage/></export>
2022
</package>

0 commit comments

Comments
 (0)