Skip to content

Commit fcbb668

Browse files
robotpilotrobotpilot
authored
Merge pull request #17 from ROBOTIS-GIT/ros2-devel
ROS2 dashing release
2 parents 6813d30 + 3ac9978 commit fcbb668

File tree

6 files changed

+66
-47
lines changed

6 files changed

+66
-47
lines changed

‎.travis.yml

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,26 @@
1-
# This config file for Travis CI utilizes ros-industrial/industrial_ci package.
2-
# For more info for the package, see https://github.com/ros-industrial/industrial_ci/blob/master/README.rst
3-
4-
sudo: required
5-
dist: trusty
61
services:
72
- docker
8-
language: generic
9-
python:
10-
- "2.7"
11-
compiler:
12-
- gcc
3+
4+
language:
5+
- none
6+
137
notifications:
148
email:
159
on_success: change
1610
on_failure: always
1711
recipients:
1812
- [email protected]
19-
env:
20-
matrix:
21-
- ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=xenial
22-
- ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=bionic
23-
- ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch
24-
matrix:
25-
allow_failures:
26-
- env: ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=bionic
27-
- env: ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch
13+
- [email protected]
14+
2815
branches:
2916
only:
30-
- master
31-
- develop
17+
- ros2
18+
- ros2-devel
19+
- dashing-devel
20+
3221
install:
33-
- git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
34-
script:
35-
- source .ci_config/travis.sh
36-
22+
- git clone --quiet --depth 1 https://github.com/robotpilot/ros2ci.git .ros2ci
23+
24+
matrix:
25+
include:
26+
- script: .ros2ci/travis.bash dashing

‎CHANGELOG.rst

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,38 @@
22
Changelog for package turtlebot3_msgs
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.1.0 (2019-08-20)
6+
------------------
7+
* Supported ROS 2 Dashing Diademata
8+
* Added Sound service file
9+
* Contributors: Darby Lim, Pyo
10+
511
2.0.0 (2018-07-26)
612
------------------
7-
* Added support for ROS2
13+
* Added support for ROS 2
814
* Contributors: Vineet Ghatge
915

1016
1.0.0 (2018-05-29)
1117
------------------
12-
* added sensors
13-
* deleted unused msg and srv
14-
* separated turtlebot3_msgs and applications related messages
15-
* merged pull request `#10 <https://github.com/ROBOTIS-GIT/turtlebot3_msgs/issues/10>`_ `#9 <https://github.com/ROBOTIS-GIT/turtlebot3_msgs/issues/9>`_ `#8 <https://github.com/ROBOTIS-GIT/turtlebot3_msgs/issues/8>`_ `#7 <https://github.com/ROBOTIS-GIT/turtlebot3_msgs/issues/7>`_
18+
* Added sensors
19+
* Deleted unused msg and srv
20+
* Separated turtlebot3_msgs and applications related messages
21+
* Merged pull request `#10 <https://github.com/ROBOTIS-GIT/turtlebot3_msgs/issues/10>`_ `#9 <https://github.com/ROBOTIS-GIT/turtlebot3_msgs/issues/9>`_ `#8 <https://github.com/ROBOTIS-GIT/turtlebot3_msgs/issues/8>`_ `#7 <https://github.com/ROBOTIS-GIT/turtlebot3_msgs/issues/7>`_
1622
* Contributors: Darby Lim, Gilbert, Pyo
1723

1824
0.1.5 (2018-03-14)
1925
------------------
20-
* modified CMakeLists.txt and package for package format v2
26+
* Modified CMakeLists.txt and package for package format v2
2127
* Contributors: Pyo
2228

2329
0.1.4 (2018-03-10)
2430
------------------
25-
* added torque msg in sensor_msgs
26-
* added Sound.msg
27-
* deleted motorpower.msg in cmakelists
31+
* Added torque msg in sensor_msgs
32+
* Added Sound.msg
33+
* Deleted motorpower.msg in cmakelists
2834
* Contributors: Darby Lim, Pyo
2935

3036
0.1.3 (2017-04-24)
3137
------------------
32-
* added msg package for TB3
38+
* Added msg package for TB3
3339
* Contributors: Pyo

‎CMakeLists.txt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
cmake_minimum_required(VERSION 3.5)
55
project(turtlebot3_msgs)
66

7-
#C++14
87
if(NOT CMAKE_CXX_STANDARD)
98
set(CMAKE_CXX_STANDARD 14)
109
endif()
10+
1111
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
12-
# we dont use add_compile_options with pedantic in message packages
13-
# because the Python C extensions dont comply with it
14-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic")
12+
add_compile_options(-Wall -Wextra -Wpedantic)
1513
endif()
14+
1615
################################################################################
1716
# Find ament packages and libraries for ament and system dependencies
1817
################################################################################
@@ -28,16 +27,20 @@ find_package(std_msgs REQUIRED)
2827
# Declare ROS messages, services and actions
2928
################################################################################
3029
set(msg_files
31-
"msg/SensorState.msg"
32-
"msg/VersionInfo.msg"
33-
"msg/Sound.msg"
30+
"msg/SensorState.msg"
31+
"msg/Sound.msg"
32+
"msg/VersionInfo.msg"
33+
)
34+
35+
set(srv_files
36+
"srv/Sound.srv"
3437
)
3538

3639
rosidl_generate_interfaces(${PROJECT_NAME}
3740
${msg_files}
41+
${srv_files}
3842
DEPENDENCIES std_msgs
3943
ADD_LINTER_TESTS
4044
)
4145
ament_export_dependencies(rosidl_default_runtime)
4246
ament_package()
43-

‎README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@
22

33
<img src="https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/platform/turtlebot3/logo_turtlebot3.png" width="300">
44

5-
## ROS Packages for TurtleBot3 Messages
5+
## ROS 1 Packages for TurtleBot3 Messages
66
|Version|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|
77
|:---:|:---:|:---:|
88
|[![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)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_msgs.svg?branch=melodic-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_msgs)|
99

10+
## ROS 2 Packages for TurtleBot3 Messages
11+
|Version|Dashing + Ubuntu Bionic|
12+
|:---:|:---:|
13+
|[![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=dashing-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_msgs)|
14+
1015
## ROBOTIS e-Manual for TurtleBot3
1116
- [ROBOTIS e-Manual for TurtleBot3](http://turtlebot3.robotis.com/)
1217

‎package.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0"?>
2+
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
23
<package format="3">
34
<name>turtlebot3_msgs</name>
4-
<version>1.0.0</version>
5+
<version>2.1.0</version>
56
<description>
67
Message and service types: custom messages and services for TurtleBot3 packages for ROS2
78
</description>
@@ -17,10 +18,10 @@
1718
<url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_msgs/issues</url>
1819
<buildtool_depend>ament_cmake</buildtool_depend>
1920
<buildtool_depend>rosidl_default_generators</buildtool_depend>
20-
21+
2122
<build_depend>builtin_interfaces</build_depend>
2223
<build_depend>std_msgs</build_depend>
23-
24+
2425
<exec_depend>builtin_interfaces</exec_depend>
2526
<exec_depend>rosidl_default_runtime</exec_depend>
2627
<exec_depend>std_msgs</exec_depend>

‎srv/Sound.srv

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
########################################
2+
# CONSTANTS
3+
########################################
4+
# uint8 OFF = 0
5+
# uint8 ON = 1
6+
# uint8 LOW_BATTERY = 2
7+
# uint8 ERROR = 3
8+
# uint8 BUTTON1 = 4
9+
# uint8 BUTTON2 = 5
10+
11+
uint8 value
12+
---
13+
bool success
14+
string message

0 commit comments

Comments
 (0)