Merge pull request #60 from ROBOTIS-GIT/kinetic-devel
merge for sync kinetic-devel and master branch
This commit is contained in:
		| @@ -18,8 +18,9 @@ notifications: | ||||
|       - pyo@robotis.com | ||||
| env: | ||||
|   matrix: | ||||
|     - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian | ||||
| #   - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian | ||||
| #   - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=jessie | ||||
|     - ROS_DISTRO=kinetic ROS_REPO=ros UPSTREAM_WORKSPACE=file OS_NAME=debian OS_CODE_NAME=jessie $ROSINSTALL_FILENAME=".robotis_framework.rosinstall" | ||||
| branches: | ||||
|   only: | ||||
|     - master | ||||
|   | ||||
							
								
								
									
										24
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								README.md
									
									
									
									
									
								
							| @@ -1,18 +1,22 @@ | ||||
| # ROBOTIS Framework Metapackage | ||||
| [](https://badge.fury.io/gh/ROBOTIS-GIT%2FROBOTIS-Framework) [](https://travis-ci.org/ROBOTIS-GIT/ROBOTIS-Framework) | ||||
| ## ROS Packages for ROBOTIS Framework | ||||
| |Version|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic| | ||||
| |:---:|:---:|:---:| | ||||
| |[](https://badge.fury.io/gh/ROBOTIS-GIT%2FROBOTIS-Framework)|[](https://travis-ci.org/ROBOTIS-GIT/ROBOTIS-Framework)|-| | ||||
|  | ||||
| # Documents for robotis_framework packages | ||||
| - [ROBOTIS e-Manual](http://emanual.robotis.com/docs/en/software/robotis_framework_packages/#robotis-framework) | ||||
| - http://wiki.ros.org/robotis_framework | ||||
| ## ROBOTIS e-Manual for ROBOTIS Framework | ||||
| - [ROBOTIS e-Manual for ROBOTIS Framework](http://emanual.robotis.com/docs/en/software/robotis_framework_packages) | ||||
|  | ||||
| ## Wiki for robotis_framework Packages | ||||
| - http://wiki.ros.org/robotis_framework (metapackage) | ||||
| - http://wiki.ros.org/robotis_controller | ||||
| - http://wiki.ros.org/robotis_device | ||||
| - http://wiki.ros.org/robotis_framework_common | ||||
|  | ||||
| # ROS packages related to ROBOTIS Framework | ||||
| - [dynamixel_sdk](https://github.com/ROBOTIS-GIT/DynamixelSDK) | ||||
| ## Open Source related to ROBOTIS Framework | ||||
| - [robotis_framework](https://github.com/ROBOTIS-GIT/ROBOTIS-Framework) | ||||
| - [robotis_controller_msgs](https://github.com/ROBOTIS-GIT/ROBOTIS-Framework-msgs) | ||||
| - [dynamixel_sdk](https://github.com/ROBOTIS-GIT/DynamixelSDK) | ||||
|  | ||||
| # Documents and Videos for ROBOTIS Framework | ||||
| - [ROBOTIS e-Manual for Dynamixel SDK](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/) | ||||
| - [ROBOTIS e-Manual for ROBOTIS Framework](http://emanual.robotis.com/docs/en/software/robotis_framework_packages/) | ||||
| ## Documents and Videos related to ROBOTIS Framework | ||||
| - [ROBOTIS e-Manual for ROBOTIS Framework](http://emanual.robotis.com/docs/en/software/robotis_framework_packages/) | ||||
| - [ROBOTIS e-Manual for Dynamixel SDK](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/) | ||||
		Reference in New Issue
	
	Block a user
	 Pyo
					Pyo