Skip to content

Commit 74edcbb

Browse files
robotpilotrobotpilot
authored
Merge pull request #10 from ROBOTIS-GIT/kinetic-devel
merge for sync kinetic-devel and master branch
2 parents 7fe40ec + c886c58 commit 74edcbb

File tree

31 files changed

+322
-249
lines changed

31 files changed

+322
-249
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# This config file for Travis CI utilizes ros-industrial/industrial_ci package.
22
# For more info for the package, see https://github.com/ros-industrial/industrial_ci/blob/master/README.rst
33

4-
dist: trusty
54
sudo: required
5+
dist: trusty
66
services:
77
- docker
88
language: generic
@@ -18,11 +18,8 @@ notifications:
1818
- [email protected]
1919
env:
2020
matrix:
21-
- ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu USE_DEB=true
22-
- ROS_DISTRO="kinetic" PRERELEASE=true PRERELEASE_DOWNSTREAM_DEPTH=0
23-
matrix:
24-
allow_failures:
25-
- env: ROS_DISTRO="kinetic" PRERELEASE=true PRERELEASE_DOWNSTREAM_DEPTH=0
21+
- ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian
22+
# - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=jessie
2623
branches:
2724
only:
2825
- master
@@ -32,4 +29,4 @@ install:
3229
- git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
3330
script:
3431
- source .ci_config/travis.sh
35-
32+

‎README.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<img src="https://raw.githubusercontent.com/ROBOTIS-GIT/ROBOTIS-Documents/master/wiki-images/Turtlebot3/Turtlebot3_logo.jpg" width="300">
2+
3+
# TurtleBot3 Applications Package
4+
[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3_applications.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3_applications) [![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_applications.svg?branch=master)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_applications)
5+
6+
# TurtleBot3 Packages
7+
- [turtlebot3](https://github.com/ROBOTIS-GIT/turtlebot3)
8+
- [turtlebot3_msgs](https://github.com/ROBOTIS-GIT/turtlebot3_msgs)
9+
- [turtlebot3_simulations](https://github.com/ROBOTIS-GIT/turtlebot3_simulations)
10+
- [turtlebot3_applications](https://github.com/ROBOTIS-GIT/turtlebot3_applications)
11+
- [turtlebot3_autorace](https://github.com/ROBOTIS-GIT/turtlebot3_autorace)
12+
13+
# TurtleBot3 Documents
14+
- http://turtlebot3.robotis.com/
15+
- http://www.turtlebot.com/
16+
-

‎turtlebot3_applications/CHANGELOG.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package turtlebot3_applications
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
0.1.0 (2018-03-14)
6+
------------------
7+
* added turtlebot3_automatic_parking pkg
8+
* added turtlebot3_follow_filter pkg
9+
* added turtlebot3_follower pkg
10+
* added turtlebot3_automatic_parking pkg
11+
* refactoring to release
12+
* Contributors: Ashe, Chris, Leon Jung, Darby Lim, Gilbert, Pyo

‎turtlebot3_applications/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
cmake_minimum_required(VERSION 2.8.3)
2+
project(turtlebot3_applications)
3+
find_package(catkin REQUIRED)
4+
catkin_metapackage()

‎turtlebot3_applications/package.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0"?>
2+
<package format="2">
3+
<name>turtlebot3_applications</name>
4+
<version>0.1.0</version>
5+
<description>
6+
ROS packages for the turtlebot3 applications (meta package)
7+
</description>
8+
<license>Apache 2.0</license>
9+
<license>BSD</license>
10+
<author>Christopher Tatsch</author>
11+
<author>Ashe Kim</author>
12+
<author email="[email protected]">Leon Jung</author>
13+
<author email="[email protected]">Darby Lim</author>
14+
<author email="[email protected]">Gilbert</author>
15+
<author email="[email protected]">Pyo</author>
16+
<maintainer email="[email protected]">Pyo</maintainer>
17+
<url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_applications/issues</url>
18+
<url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3_applications</url>
19+
<url type="website">http://turtlebot3.robotis.com</url>
20+
<buildtool_depend>catkin</buildtool_depend>
21+
<exec_depend>turtlebot3_automatic_parking</exec_depend>
22+
<exec_depend>turtlebot3_follow_filter</exec_depend>
23+
<exec_depend>turtlebot3_follower</exec_depend>
24+
<exec_depend>turtlebot3_panorama</exec_depend>
25+
<export><metapackage/></export>
26+
</package>

‎turtlebot3_automatic_parking/CHANGELOG.rst‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package turtlebot3_automatic_parking
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
0.1.0 (2018-03-14)
6+
------------------
7+
* added turtlebot3_automatic_parking pkg
8+
* refactoring to release
9+
* Contributors: Gilbert, Leon Jung, Pyo

‎turtlebot3_automatic_parking/CMakeLists.txt‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ project(turtlebot3_automatic_parking)
99
################################################################################
1010
find_package(catkin REQUIRED COMPONENTS
1111
rospy
12-
sensor_msgs
1312
std_msgs
14-
nav_msgs
13+
sensor_msgs
1514
geometry_msgs
15+
nav_msgs
1616
)
1717

1818
################################################################################
@@ -27,24 +27,28 @@ find_package(catkin REQUIRED COMPONENTS
2727
# Catkin specific configuration
2828
################################################################################
2929
catkin_package(
30-
#INCLUDE_DIRS include
31-
CATKIN_DEPENDS rospy sensor_msgs std_msgs nav_msgs geometry_msgs
30+
CATKIN_DEPENDS rospy std_msgs sensor_msgs geometry_msgs nav_msgs
3231
)
3332

3433
################################################################################
3534
# Build
3635
################################################################################
3736
include_directories(
38-
include
3937
${catkin_INCLUDE_DIRS}
4038
)
4139

4240
################################################################################
4341
# Install
4442
################################################################################
45-
catkin_install_python(PROGRAMS src/automatic_parking.py
46-
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
43+
catkin_install_python(PROGRAMS
44+
scripts/automatic_parking.py
45+
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
4746
)
4847

48+
install(DIRECTORY rviz
49+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
50+
)
4951

50-
52+
################################################################################
53+
# Test
54+
################################################################################

‎turtlebot3_automatic_parking/package.xml‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
11
<?xml version="1.0"?>
2-
<package>
2+
<package format="2">
33
<name>turtlebot3_automatic_parking</name>
4-
<version>0.0.0</version>
4+
<version>0.1.0</version>
55
<description>
6-
Package for turtlebot3 automatic_parking. You need a reflective tape and real robots.
7-
You can see parking spot using this pacakge on rviz.
6+
Package for turtlebot3 automatic_parking. You need a reflective tape and real robots. You can see parking spot using this pacakge on rviz.
87
</description>
9-
<license>Apache License 2.0</license>
10-
<author email="kkjong89@naver.com">Gilbert</author>
8+
<license>Apache 2.0</license>
9+
<author email="kkjong@robotis.com">Gilbert</author>
1110
<maintainer email="[email protected]">Pyo</maintainer>
1211
<url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_applications/issues</url>
1312
<url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3_applications</url>
1413
<url type="website">http://turtlebot3.robotis.com</url>
1514
<buildtool_depend>catkin</buildtool_depend>
16-
<build_depend>rospy</build_depend>
17-
<build_depend>sensor_msgs</build_depend>
18-
<build_depend>std_msgs</build_depend>
19-
<build_depend>nav_msgs</build_depend>
20-
<build_depend>geometry_msgs</build_depend>
21-
<run_depend>nav_msgs</run_depend>
22-
<run_depend>geometry_msgs</run_depend>
23-
<run_depend>rospy</run_depend>
24-
<run_depend>sensor_msgs</run_depend>
25-
<run_depend>std_msgs</run_depend>
15+
<depend>rospy</depend>
16+
<depend>std_msgs</depend>
17+
<depend>sensor_msgs</depend>
18+
<depend>geometry_msgs</depend>
19+
<depend>nav_msgs</depend>
2620
</package>

‎turtlebot3_automatic_parking/src/automatic_parking.py‎ renamed to ‎turtlebot3_automatic_parking/scripts/automatic_parking.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22
#################################################################################
3-
# Copyright 2016 ROBOTIS CO., LTD.
3+
# Copyright 2018 ROBOTIS CO., LTD.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.

‎turtlebot3_follow_filter/CHANGELOG.rst‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package turtlebot3_follow_filter
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
0.1.0 (2018-03-14)
6+
------------------
7+
* added turtlebot3_follow_filter pkg
8+
* refactoring to release
9+
* Contributors: Ashe, Chris

0 commit comments

Comments
 (0)