updated the package.xml and CMakeLists.txt and version to release thi…

…s packages
ROBOTIS-GIT · Aug 6, 2018 · bb0eabf · bb0eabf
1 parent 33064da
commit bb0eabf
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,34 @@
+# This config file for Travis CI utilizes ros-industrial/industrial_ci package.
+# For more info for the package, see https://github.com/ros-industrial/industrial_ci/blob/master/README.rst
+
+sudo: required
+dist: trusty
+services:
+  - docker
+language: generic
+python:
+  - "2.7"
+compiler:
+  - gcc
+notifications:
+  email:
+    on_success: change
+    on_failure: always
+    recipients:
+      - pyo@robotis.com
+env:
+  matrix:
+    - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=xenial
+    - ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=bionic
+matrix:
+  allow_failures:
+    - env: ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=bionic
+branches:
+  only:
+    - master
+    - develop
+install:
+  - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
+script:
+  - source .ci_config/travis.sh
+
diff --git a/README.md b/README.md
@@ -2,3 +2,44 @@
 <img src="https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/platform/turtlebot3/logo_turtlebot3.png" width="300">
 
 ## ROS Packages for TurtleBot3 Machine Learning
+|Version|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|
+|:---:|:---:|:---:|
+|[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3_machine_learning.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3_machine_learning)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_machine_learning.svg?branch=kinetic-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_machine_learning)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_machine_learning.svg?branch=melodic-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_machine_learning)|
+
+## ROBOTIS e-Manual for TurtleBot3
+- [ROBOTIS e-Manual for TurtleBot3](http://turtlebot3.robotis.com/)
+
+## Wiki for turtlebot3_machine_learning Packages
+- http://wiki.ros.org/turtlebot3_machine_learning (metapackage)
+- http://wiki.ros.org/turtlebot3_dqn
+
+## 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_msgs](https://github.com/ROBOTIS-GIT/turtlebot3_applications_msgs)
+- [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)
+- [turtlebot3_machine_learning](https://github.com/ROBOTIS-GIT/turtlebot3_machine_learning)
+- [hls_lfcd_lds_driver](https://github.com/ROBOTIS-GIT/hls_lfcd_lds_driver)
+- [open_manipulator_msgs](https://github.com/ROBOTIS-GIT/open_manipulator_msgs)
+- [open_manipulator](https://github.com/ROBOTIS-GIT/open_manipulator)
+- [open_manipulator_simulations](https://github.com/ROBOTIS-GIT/open_manipulator_simulations)
+- [open_manipulator_perceptions](https://github.com/ROBOTIS-GIT/open_manipulator_perceptions)
+- [open_manipulator_with_tb3_msgs](https://github.com/ROBOTIS-GIT/open_manipulator_with_tb3_msgs)
+- [open_manipulator_with_tb3](https://github.com/ROBOTIS-GIT/open_manipulator_with_tb3)
+- [open_manipulator_with_tb3_simulations](https://github.com/ROBOTIS-GIT/open_manipulator_with_tb3_simulations)
+- [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)
+
+## 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)
diff --git a/turtlebot3_dqn/CMakeLists.txt b/turtlebot3_dqn/CMakeLists.txt
@@ -7,7 +7,7 @@ project(turtlebot3_dqn)
 ################################################################################
 # Find catkin packages and libraries for catkin and system dependencies
 ################################################################################
-find_package(catkin REQUIRED)
+find_package(catkin REQUIRED COMPONENTS rospy)
 
 ################################################################################
 # Setup for python modules and scripts
@@ -25,7 +25,9 @@ catkin_python_setup()
 ################################################################################
 # Declare catkin specific configuration to be passed to dependent projects
 ################################################################################
-catkin_package()
+catkin_package(
+  CATKIN_DEPENDS rospy
+)
 
 ################################################################################
 # Build
@@ -44,10 +46,18 @@ catkin_install_python(PROGRAMS
   nodes/moving_obstacle
   nodes/combination_obstacle_1
   nodes/combination_obstacle_2
+  src/${PROJECT_NAME}/environment_stage_1.py
+  src/${PROJECT_NAME}/environment_stage_2.py
+  src/${PROJECT_NAME}/environment_stage_3.py
+  src/${PROJECT_NAME}/environment_stage_4.py
+  src/${PROJECT_NAME}/respawnGoal.py
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
 
-install(DIRECTORY launch
+install(DIRECTORY launch save_model
 	DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
 
+################################################################################
+# Test
+################################################################################
diff --git a/turtlebot3_dqn/package.xml b/turtlebot3_dqn/package.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>turtlebot3_dqn</name>
-  <version>0.0.0</version>
-  <description>The turtlebot3_dqn package</description>
+  <version>1.0.0</version>
+  <description>
+    The turtlebot3_dqn package includes applications using reinforcement learning with DQN (Deep Q-Learning).
+  </description>
   <license>Apache 2.0</license>
-  <author email="kkjong89@robotis.com">kkjong89</author>
+  <author email="kkjong@robotis.com">Gilbert</author>
   <maintainer email="pyo@robotis.com">Pyo</maintainer>
-
+  <url type="website">http://wiki.ros.org/turtlebot3_machine_learning</url>
   <url type="emanual">http://turtlebot3.robotis.com</url>
-
+  <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3_machine_learning</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_machine_learning/issues</url>
   <buildtool_depend>catkin</buildtool_depend>
   <exec_depend>rospy</exec_depend>
 </package>
diff --git a/turtlebot3_machine_learning/package.xml b/turtlebot3_machine_learning/package.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>turtlebot3_machine_learning</name>
-  <version>0.0.0</version>
+  <version>1.0.0</version>
   <description>
-    The turtlebot3_machine_learning package (meta package)
+    This metapackage includes various ROS packages using TurtleBot3 and machine learning.
   </description>
-  <license>Apache License 2.0</license>
-  <author email="kkjong@robotis.com">Gilber</author>
+  <license>Apache 2.0</license>
+  <author email="kkjong@robotis.com">Gilbert</author>
   <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <url type="website">http://wiki.ros.org/turtlebot3_machine_learning</url>
+  <url type="emanual">http://turtlebot3.robotis.com</url>
+  <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3_machine_learning</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_machine_learning/issues</url>
   <buildtool_depend>catkin</buildtool_depend>
   <exec_depend>turtlebot3_dqn</exec_depend>
   <export><metapackage/></export>