Skip to content

Commit c02aa74

Browse files
robotpilotrobotpilot
committed
tested for system dependencies
1 parent 9b2a520 commit c02aa74

File tree

8 files changed

+49
-25
lines changed

8 files changed

+49
-25
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/package.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
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/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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
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/package.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
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>

‎robotis_framework_common/CMakeLists.txt‎

Lines changed: 8 additions & 5 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_framework_common)
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
robotis_device
1313
)
1414

15+
################################################################################
16+
# Setup for python modules and scripts
17+
################################################################################
18+
1519
################################################################################
1620
# Declare ROS messages, services and actions
1721
################################################################################
@@ -21,11 +25,11 @@ 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
28-
LIBRARIES robotis_framework_common
32+
LIBRARIES ${PROJECT_NAME}
2933
CATKIN_DEPENDS roscpp robotis_device
3034
)
3135

@@ -42,7 +46,6 @@ add_library(${PROJECT_NAME}
4246
include/${PROJECT_NAME}/sensor_module.h
4347
include/${PROJECT_NAME}/singleton.h
4448
)
45-
4649
set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
4750

4851
################################################################################

‎robotis_framework_common/package.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
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_common</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>robotis_device</depend>

0 commit comments

Comments
 (0)