Merge pull request #10 from ROBOTIS-GIT/master

merge for sync kinetic-devel and master branch

Author: robotpilot

.travis.yml

@@ -12,7 +12,7 @@ compiler:
   - gcc
 notifications:
   email:
-    on_success: always
+    on_success: change
     on_failure: always
     recipients:
       - [email protected]
@@ -29,4 +29,4 @@ install:
   - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
 script:
   - source .ci_config/travis.sh
-  
+  

CMakeLists.txt

@@ -9,7 +9,6 @@ project(turtlebot3_msgs)
 ################################################################################
 find_package(catkin REQUIRED COMPONENTS
   std_msgs
-  sensor_msgs
   message_generation
 )
 
@@ -21,21 +20,12 @@ add_message_files(
   FILES
   SensorState.msg
   VersionInfo.msg
-  PanoramaImg.msg
   Sound.msg
 )
 
-add_service_files(
-  DIRECTORY srv
-  FILES
-  TakePanorama.srv
-  SetFollowState.srv
-)
-
 generate_messages(
   DEPENDENCIES
   std_msgs
-  sensor_msgs
 )
 
 ################################################################################
@@ -46,7 +36,7 @@ generate_messages(
 # Catkin specific configuration
 ################################################################################
 catkin_package(
-  CATKIN_DEPENDS std_msgs sensor_msgs message_runtime
+  CATKIN_DEPENDS std_msgs message_runtime
 )
 
 ################################################################################

README.md

@@ -1,14 +1,37 @@
-<img src="https://raw.githubusercontent.com/ROBOTIS-GIT/ROBOTIS-Documents/master/wiki-images/Turtlebot3/Turtlebot3_logo.jpg" width="300">
+# TurtleBot3
 
-# TurtleBot3 Messages Package
-[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3_msgs.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3_msgs) [![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_msgs.svg?branch=master)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_msgs)
+<img src="https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/platform/turtlebot3/logo_turtlebot3.png" width="300">
 
-# TurtleBot3 Packages
+## ROS Packages for TurtleBot3 Messages
+|Version|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|
+|:---:|:---:|:---:|
+|[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3_msgs.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3_msgs)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_msgs.svg?branch=kinetic-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_msgs)|-|
+
+## ROBOTIS e-Manual for TurtleBot3
+- [ROBOTIS e-Manual for TurtleBot3](http://turtlebot3.robotis.com/)
+
+## Wiki for turtlebot3_msgs Packages
+- http://wiki.ros.org/turtlebot3_msgs
+
+## Open Source related to TurtleBot3
 - [turtlebot3](https://github.com/ROBOTIS-GIT/turtlebot3)
 - [turtlebot3_msgs](https://github.com/ROBOTIS-GIT/turtlebot3_msgs)
 - [turtlebot3_simulations](https://github.com/ROBOTIS-GIT/turtlebot3_simulations)
 - [turtlebot3_applications](https://github.com/ROBOTIS-GIT/turtlebot3_applications)
+- [turtlebot3_autorace](https://github.com/ROBOTIS-GIT/turtlebot3_autorace)
+- [turtlebot3_deliver](https://github.com/ROBOTIS-GIT/turtlebot3_deliver)
+- [hls_lfcd_lds_driver](https://github.com/ROBOTIS-GIT/hls_lfcd_lds_driver)
+- [open_manipulator](https://github.com/ROBOTIS-GIT/open_manipulator)
+- [dynamixel_sdk](https://github.com/ROBOTIS-GIT/DynamixelSDK)
+- [dynamixel_workbench](https://github.com/ROBOTIS-GIT/dynamixel-workbench)
+- [OpenCR-Hardware](https://github.com/ROBOTIS-GIT/OpenCR-Hardware)
+- [OpenCR](https://github.com/ROBOTIS-GIT/OpenCR)
 
-# TurtleBot3 Documents
-- http://turtlebot3.robotis.com/
-- http://www.turtlebot.com/
+## Documents and Videos related to TurtleBot3
+- [ROBOTIS e-Manual for TurtleBot3](http://turtlebot3.robotis.com/)
+- [ROBOTIS e-Manual for OpenManipulator](http://emanual.robotis.com/docs/en/platform/openmanipulator/)
+- [ROBOTIS e-Manual for Dynamixel SDK](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/)
+- [ROBOTIS e-Manual for Dynamixel Workbench](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/)
+- [Website for TurtleBot Series](http://www.turtlebot.com/)
+- [e-Book for TurtleBot3](https://community.robotsource.org/t/download-the-ros-robot-programming-book-for-free/51/)
+- [Videos for TurtleBot3 ](https://www.youtube.com/playlist?list=PLRG6WP3c31_XI3wlvHlx2Mp8BYqgqDURU)

msg/PanoramaImg.msg

@@ -2,19 +2,21 @@
 # CONSTANTS
 ########################################
 # Bumper states (states are combined, when multiple bumpers are pressed)
-uint8 BUMPER_RIGHT  = 1
-uint8 BUMPER_CENTER = 2
-uint8 BUMPER_LEFT   = 4
+uint8 BUMPER_FORWARD  = 1
+uint8 BUMPER_BACKWARD = 2
 
 # Cliff sensor states (states are combined, when multiple cliff sensors are triggered)
-uint8 CLIFF_RIGHT  = 1
-uint8 CLIFF_CENTER = 2
-uint8 CLIFF_LEFT   = 4
+uint8 CLIFF = 1
 
-# Button states (only one button can be triggered at a time)
+# Sonar sensor states (states are combined, when multiple sonar sensors are triggered)
+uint8 SONAR = 1
+
+# Illumination sensor (states are combined, when multiple illumination sensors are triggered) 
+uint8 ILLUMINATION = 1
+
+# Button states (states are combined, when multiple buttons are pressed)
 uint8 BUTTON0 = 1
 uint8 BUTTON1 = 2
-uint8 BUTTON2 = 4
 
 # Motor errors
 uint8 ERROR_LEFT_MOTOR  = 1
@@ -27,9 +29,12 @@ uint8 TORQUE_OFF = 2
 ########################################
 # Messages
 ########################################
-Header header
-uint8  bumper
-uint8  cliff
+Header  header
+uint8   bumper
+float32 cliff
+float32 sonar
+float32 illumination
+uint8   led
 uint8  button
 bool   torque
 int32  left_encoder    # (-2,147,483,648 ~ 2,147,483,647)

msg/SensorState.msg

@@ -14,7 +14,6 @@
   <url type="website">http://turtlebot3.robotis.com</url>
   <buildtool_depend>catkin</buildtool_depend>
   <depend>std_msgs</depend>
-  <depend>sensor_msgs</depend>
   <build_depend>message_generation</build_depend>
   <build_export_depend>message_runtime</build_export_depend>
   <exec_depend>message_runtime</exec_depend>