mirror of
https://github.com/ROBOTIS-GIT/turtlebot3_simulations.git
synced 2025-09-15 13:08:35 +08:00
Merge pull request #49 from ROBOTIS-GIT/kinetic-devel
merge for sync kinetic-devel and master branch
This commit is contained in:
Pyo
GitHub
commit
14631cfe77
@ -18,11 +18,18 @@
|
||||
- [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)
|
||||
- [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)
|
||||
|
||||
@ -2,47 +2,51 @@
|
||||
Changelog for package turtlebot3_fake
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
1.0.0 (2018-05-29)
|
||||
------------------
|
||||
* none
|
||||
|
||||
0.2.4 (2018-03-14)
|
||||
-----------
|
||||
------------------
|
||||
* none
|
||||
|
||||
0.2.3 (2018-03-14)
|
||||
-----------
|
||||
------------------
|
||||
* none
|
||||
|
||||
0.2.2 (2018-03-14)
|
||||
-----------
|
||||
------------------
|
||||
* none
|
||||
|
||||
0.2.1 (2018-03-14)
|
||||
-----------
|
||||
------------------
|
||||
* none
|
||||
|
||||
0.2.0 (2018-03-13)
|
||||
-----------
|
||||
------------------
|
||||
* added TurtleBot3 Waffle Pi
|
||||
* Contributors: Darby Lim
|
||||
|
||||
0.1.7 (2017-08-16)
|
||||
-----------
|
||||
------------------
|
||||
* none
|
||||
|
||||
0.1.6 (2017-08-14)
|
||||
-----------
|
||||
------------------
|
||||
* updated rviz and add static tf publisher for depth camera
|
||||
* Contributors: Darby Lim
|
||||
|
||||
0.1.5 (2017-06-09)
|
||||
-----------
|
||||
------------------
|
||||
* none
|
||||
|
||||
0.1.4 (2017-05-23)
|
||||
-----------
|
||||
------------------
|
||||
* added as new meta-packages and version update (0.1.4)
|
||||
* Contributors: Darby Lim, Pyo
|
||||
|
||||
0.1.3 (2017-04-24)
|
||||
-----------
|
||||
------------------
|
||||
* modified the package information for release
|
||||
* modified SLAM param
|
||||
* modified the description, authors, depend option and delete the core package
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
################################################################################
|
||||
# CMake
|
||||
# Set minimum required version of cmake, project name and compile options
|
||||
################################################################################
|
||||
cmake_minimum_required(VERSION 2.8.3)
|
||||
project(turtlebot3_fake)
|
||||
|
||||
################################################################################
|
||||
# Packages
|
||||
# Find catkin packages and libraries for catkin and system dependencies
|
||||
################################################################################
|
||||
find_package(catkin REQUIRED COMPONENTS
|
||||
roscpp
|
||||
@ -17,6 +17,10 @@ find_package(catkin REQUIRED COMPONENTS
|
||||
turtlebot3_msgs
|
||||
)
|
||||
|
||||
################################################################################
|
||||
# Setup for python modules and scripts
|
||||
################################################################################
|
||||
|
||||
################################################################################
|
||||
# Declare ROS messages, services and actions
|
||||
################################################################################
|
||||
@ -26,7 +30,7 @@ find_package(catkin REQUIRED COMPONENTS
|
||||
################################################################################
|
||||
|
||||
################################################################################
|
||||
# Catkin specific configuration
|
||||
# Declare catkin specific configuration to be passed to dependent projects
|
||||
################################################################################
|
||||
catkin_package(
|
||||
INCLUDE_DIRS include
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0"?>
|
||||
<package format="2">
|
||||
<name>turtlebot3_fake</name>
|
||||
<version>0.2.4</version>
|
||||
<version>1.0.0</version>
|
||||
<description>
|
||||
Package for TurtleBot3 fake node. With this package, simple tests can be done without a robot.
|
||||
You can do simple tests using this package on rviz without real robots.
|
||||
@ -10,9 +10,10 @@
|
||||
<author email="pyo@robotis.com">Pyo</author>
|
||||
<author email="thlim@robotis.com">Darby Lim</author>
|
||||
<maintainer email="pyo@robotis.com">Pyo</maintainer>
|
||||
<url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues</url>
|
||||
<url type="website">http://wiki.ros.org/turtlebot3_fake</url>
|
||||
<url type="emanual">http://turtlebot3.robotis.com</url>
|
||||
<url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3_simulations</url>
|
||||
<url type="website">http://turtlebot3.robotis.com</url>
|
||||
<url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues</url>
|
||||
<buildtool_depend>catkin</buildtool_depend>
|
||||
<depend>roscpp</depend>
|
||||
<depend>std_msgs</depend>
|
||||
|
||||
@ -2,26 +2,35 @@
|
||||
Changelog for package turtlebot3_gazebo_ros
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
1.0.0 (2018-05-29)
|
||||
------------------
|
||||
* added world for turtlebot3_autorace
|
||||
* added world for turtlebot3_machine_learning
|
||||
* merged pull request `#46 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/46>`_ from AuTURBO/develop
|
||||
add turtlebot3_autorace world'
|
||||
* merged pull request `#48 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/48>`_ `#47 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/47>`_ `#44 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/44>`_ `#42 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/42>`_ `#41 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/41>`_
|
||||
* Contributors: Darby Lim, Gilbert, hyunoklee, Pyo
|
||||
|
||||
0.2.4 (2018-03-14)
|
||||
-----------
|
||||
------------------
|
||||
* none
|
||||
|
||||
0.2.3 (2018-03-14)
|
||||
-----------
|
||||
------------------
|
||||
* solved DuplicateVersionsException error
|
||||
* Contributors: Pyo
|
||||
|
||||
0.2.2 (2018-03-14)
|
||||
-----------
|
||||
------------------
|
||||
* none
|
||||
|
||||
0.2.1 (2018-03-14)
|
||||
-----------
|
||||
------------------
|
||||
* added worlds for gazebo and turtlebot3
|
||||
* Contributors: Darby Lim
|
||||
|
||||
0.2.0 (2018-03-13)
|
||||
-----------
|
||||
------------------
|
||||
* added slam with multiple tb3
|
||||
* added multi example
|
||||
* added turtlebot3_house
|
||||
@ -33,24 +42,24 @@ Changelog for package turtlebot3_gazebo_ros
|
||||
* Contributors: Darby Lim
|
||||
|
||||
0.1.7 (2017-08-16)
|
||||
-----------
|
||||
------------------
|
||||
* renamed missed the install rule (worlds -> models)
|
||||
* Contributors: Darby Lim, Tully Foote
|
||||
|
||||
0.1.6 (2017-08-14)
|
||||
-----------
|
||||
------------------
|
||||
* modified folder name and model path
|
||||
* updated rviz and add static tf publisher for depth camera
|
||||
* Contributors: Darby Lim
|
||||
|
||||
0.1.5 (2017-06-09)
|
||||
-----------
|
||||
------------------
|
||||
* modified make files for dependencies
|
||||
* updated turtlebot3 sim
|
||||
* updated world config
|
||||
* Contributors: Darby Lim
|
||||
|
||||
0.1.4 (2017-05-23)
|
||||
-----------
|
||||
------------------
|
||||
* added as new meta-packages and version update (0.1.4)
|
||||
* Contributors: Darby Lim, Pyo
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
################################################################################
|
||||
# CMake
|
||||
# Set minimum required version of cmake, project name and compile options
|
||||
################################################################################
|
||||
cmake_minimum_required(VERSION 2.8.3)
|
||||
project(turtlebot3_gazebo)
|
||||
|
||||
set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
|
||||
## Compile as C++11, supported in ROS Kinetic and newer
|
||||
add_compile_options(-std=c++11)
|
||||
|
||||
################################################################################
|
||||
# Packages
|
||||
# Find catkin packages and libraries for catkin and system dependencies
|
||||
################################################################################
|
||||
find_package(catkin REQUIRED COMPONENTS
|
||||
roscpp
|
||||
@ -21,6 +22,10 @@ find_package(catkin REQUIRED COMPONENTS
|
||||
|
||||
find_package(gazebo REQUIRED)
|
||||
|
||||
################################################################################
|
||||
# Setup for python modules and scripts
|
||||
################################################################################
|
||||
|
||||
################################################################################
|
||||
# Declare ROS messages, services and actions
|
||||
################################################################################
|
||||
@ -30,7 +35,7 @@ find_package(gazebo REQUIRED)
|
||||
################################################################################
|
||||
|
||||
################################################################################
|
||||
# Catkin specific configuration
|
||||
# Declare catkin specific configuration to be passed to dependent projects
|
||||
################################################################################
|
||||
catkin_package(
|
||||
INCLUDE_DIRS include
|
||||
@ -64,7 +69,7 @@ install(DIRECTORY include/${PROJECT_NAME}/
|
||||
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
|
||||
)
|
||||
|
||||
install(DIRECTORY launch rviz worlds models
|
||||
install(DIRECTORY launch models rviz worlds
|
||||
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
|
||||
)
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0"?>
|
||||
<package format="2">
|
||||
<name>turtlebot3_gazebo</name>
|
||||
<version>0.2.4</version>
|
||||
<version>1.0.0</version>
|
||||
<description>
|
||||
Gazebo simulation package for the TurtleBot3
|
||||
</description>
|
||||
@ -9,9 +9,10 @@
|
||||
<author email="pyo@robotis.com">Pyo</author>
|
||||
<author email="thlim@robotis.com">Darby Lim</author>
|
||||
<maintainer email="pyo@robotis.com">Pyo</maintainer>
|
||||
<url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues</url>
|
||||
<url type="website">http://wiki.ros.org/turtlebot3_gazebo</url>
|
||||
<url type="emanual">http://turtlebot3.robotis.com</url>
|
||||
<url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3_simulations</url>
|
||||
<url type="website">http://turtlebot3.robotis.com</url>
|
||||
<url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues</url>
|
||||
<buildtool_depend>catkin</buildtool_depend>
|
||||
<depend>roscpp</depend>
|
||||
<depend>std_msgs</depend>
|
||||
|
||||
@ -69,8 +69,8 @@ bool Turtlebot3Drive::init()
|
||||
cmd_vel_pub_ = nh_.advertise<geometry_msgs::Twist>(cmd_vel_topic_name, 10);
|
||||
|
||||
// initialize subscribers
|
||||
laser_scan_sub_ = nh_.subscribe("/scan", 10, &Turtlebot3Drive::laserScanMsgCallBack, this);
|
||||
joint_state_sub_ = nh_.subscribe("/joint_states", 10, &Turtlebot3Drive::jointStateMsgCallBack, this);
|
||||
laser_scan_sub_ = nh_.subscribe("scan", 10, &Turtlebot3Drive::laserScanMsgCallBack, this);
|
||||
joint_state_sub_ = nh_.subscribe("joint_states", 10, &Turtlebot3Drive::jointStateMsgCallBack, this);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -2,29 +2,38 @@
|
||||
Changelog for package turtlebot3_simulations
|
||||
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
1.0.0 (2018-05-29)
|
||||
------------------
|
||||
* added world for turtlebot3_autorace
|
||||
* added world for turtlebot3_machine_learning
|
||||
* merged pull request `#46 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/46>`_ from AuTURBO/develop
|
||||
add turtlebot3_autorace world'
|
||||
* merged pull request `#48 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/48>`_ `#47 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/47>`_ `#44 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/44>`_ `#42 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/42>`_ `#41 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/41>`_
|
||||
* Contributors: Darby Lim, Gilbert, hyunoklee, Pyo
|
||||
|
||||
0.2.4 (2018-03-14)
|
||||
-----------
|
||||
------------------
|
||||
* solved DuplicateVersionsException error
|
||||
* Contributors: Pyo
|
||||
|
||||
0.2.3 (2018-03-14)
|
||||
-----------
|
||||
------------------
|
||||
* solved DuplicateVersionsException error
|
||||
* Contributors: Pyo
|
||||
|
||||
0.2.2 (2018-03-14)
|
||||
-----------
|
||||
------------------
|
||||
* added line feed into metapackage
|
||||
* Contributors: Pyo
|
||||
|
||||
0.2.1 (2018-03-14)
|
||||
-----------
|
||||
------------------
|
||||
* added worlds for gazebo and turtlebot3
|
||||
* deleted turtlebot3_gazebo_plugin and merged into turtlebot3_gazebo_ros package
|
||||
* Contributors: Darby Lim
|
||||
|
||||
0.2.0 (2018-03-13)
|
||||
-----------
|
||||
------------------
|
||||
* added TurtleBot3 Waffle Pi
|
||||
* added slam with multiple tb3
|
||||
* added multi example
|
||||
@ -44,24 +53,24 @@ Changelog for package turtlebot3_simulations
|
||||
* Contributors: Darby Lim
|
||||
|
||||
0.1.7 (2017-08-16)
|
||||
-----------
|
||||
------------------
|
||||
* renamed missed the install rule (worlds -> models)
|
||||
* Contributors: Darby Lim, Tully Foote
|
||||
|
||||
0.1.6 (2017-08-14)
|
||||
-----------
|
||||
------------------
|
||||
* modified folder name and model path
|
||||
* updated rviz and add static tf publisher for depth camera
|
||||
* Contributors: Darby Lim
|
||||
|
||||
0.1.5 (2017-06-09)
|
||||
-----------
|
||||
------------------
|
||||
* modified make files for dependencies
|
||||
* updated turtlebot3 sim
|
||||
* updated world config
|
||||
* Contributors: Darby Lim
|
||||
|
||||
0.1.4 (2017-05-23)
|
||||
-----------
|
||||
------------------
|
||||
* added as new meta-packages and version update (0.1.4)
|
||||
* Contributors: Darby Lim, Pyo
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0"?>
|
||||
<package format="2">
|
||||
<name>turtlebot3_simulations</name>
|
||||
<version>0.2.4</version>
|
||||
<version>1.0.0</version>
|
||||
<description>
|
||||
ROS packages for the turtlebot3 simulation (meta package)
|
||||
</description>
|
||||
@ -9,9 +9,10 @@
|
||||
<author email="pyo@robotis.com">Pyo</author>
|
||||
<author email="thlim@robotis.com">Darby Lim</author>
|
||||
<maintainer email="pyo@robotis.com">Pyo</maintainer>
|
||||
<url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues</url>
|
||||
<url type="website">http://wiki.ros.org/turtlebot3_simulations</url>
|
||||
<url type="emanual">http://turtlebot3.robotis.com</url>
|
||||
<url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3_simulations</url>
|
||||
<url type="website">http://turtlebot3.robotis.com</url>
|
||||
<url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues</url>
|
||||
<buildtool_depend>catkin</buildtool_depend>
|
||||
<exec_depend>turtlebot3_fake</exec_depend>
|
||||
<exec_depend>turtlebot3_gazebo</exec_depend>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user