From bb0eabfe626bb63bd5ac4ceee93fc1ce9e79485b Mon Sep 17 00:00:00 2001 From: Pyo Date: Mon, 6 Aug 2018 13:56:11 +0900 Subject: [PATCH] updated the package.xml and CMakeLists.txt and version to release this packages --- .travis.yml | 34 ++++++++++++++++++++ README.md | 41 +++++++++++++++++++++++++ turtlebot3_dqn/CMakeLists.txt | 16 ++++++++-- turtlebot3_dqn/package.xml | 13 +++++--- turtlebot3_machine_learning/package.xml | 12 +++++--- 5 files changed, 104 insertions(+), 12 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..bf4e50f --- /dev/null +++ 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 + \ No newline at end of file diff --git a/README.md b/README.md index 9cb2120..b811770 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,44 @@ ## 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 index 3652cc3..c9c3a55 100644 --- 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 index bf3db3a..7a90812 100644 --- a/turtlebot3_dqn/package.xml +++ b/turtlebot3_dqn/package.xml @@ -1,14 +1,17 @@ turtlebot3_dqn - 0.0.0 - The turtlebot3_dqn package + 1.0.0 + + The turtlebot3_dqn package includes applications using reinforcement learning with DQN (Deep Q-Learning). + Apache 2.0 - kkjong89 + Gilbert Pyo - + http://wiki.ros.org/turtlebot3_machine_learning http://turtlebot3.robotis.com - + https://github.com/ROBOTIS-GIT/turtlebot3_machine_learning + https://github.com/ROBOTIS-GIT/turtlebot3_machine_learning/issues catkin rospy diff --git a/turtlebot3_machine_learning/package.xml b/turtlebot3_machine_learning/package.xml index badac6c..b0aa6d6 100644 --- a/turtlebot3_machine_learning/package.xml +++ b/turtlebot3_machine_learning/package.xml @@ -1,13 +1,17 @@ turtlebot3_machine_learning - 0.0.0 + 1.0.0 - The turtlebot3_machine_learning package (meta package) + This metapackage includes various ROS packages using TurtleBot3 and machine learning. - Apache License 2.0 - Gilber + Apache 2.0 + Gilbert Pyo + http://wiki.ros.org/turtlebot3_machine_learning + http://turtlebot3.robotis.com + https://github.com/ROBOTIS-GIT/turtlebot3_machine_learning + https://github.com/ROBOTIS-GIT/turtlebot3_machine_learning/issues catkin turtlebot3_dqn