-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #644 from ROBOTIS-GIT/develop
Develop
- Loading branch information
Showing
19 changed files
with
86 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <?xml version="1.0"?> | ||
| <package format="2"> | ||
| <name>turtlebot3</name> | ||
| <version>1.2.3</version> | ||
| <version>1.2.4</version> | ||
| <description> | ||
| ROS packages for the Turtlebot3 (meta package) | ||
| </description> | ||
|
|
@@ -12,7 +12,7 @@ | |
| <author email="[email protected]">Gilbert</author> | ||
| <author email="[email protected]">HanCheol Cho</author> | ||
| <author>Leon Jung</author> | ||
| <maintainer email="pyo@robotis.com">Pyo</maintainer> | ||
| <maintainer email="willson@robotis.com">Will Son</maintainer> | ||
| <url type="website">http://wiki.ros.org/turtlebot3</url> | ||
| <url type="emanual">http://turtlebot3.robotis.com</url> | ||
| <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| <?xml version="1.0"?> | ||
| <package format="2"> | ||
| <name>turtlebot3_bringup</name> | ||
| <version>1.2.3</version> | ||
| <version>1.2.4</version> | ||
| <description> | ||
| roslaunch scripts for starting the TurtleBot3 | ||
| </description> | ||
| <license>Apache 2.0</license> | ||
| <author email="[email protected]">Pyo</author> | ||
| <author email="[email protected]">Darby Lim</author> | ||
| <author email="[email protected]">Gilbert</author> | ||
| <maintainer email="pyo@robotis.com">Pyo</maintainer> | ||
| <maintainer email="willson@robotis.com">Will Son</maintainer> | ||
| <url type="website">http://wiki.ros.org/turtlebot3_bringup</url> | ||
| <url type="emanual">http://turtlebot3.robotis.com</url> | ||
| <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| <?xml version="1.0"?> | ||
| <package format="2"> | ||
| <name>turtlebot3_description</name> | ||
| <version>1.2.3</version> | ||
| <version>1.2.4</version> | ||
| <description> | ||
| 3D models of the TurtleBot3 for simulation and visualization | ||
| </description> | ||
| <license>Apache 2.0</license> | ||
| <author email="[email protected]">Pyo</author> | ||
| <author email="[email protected]">Darby Lim</author> | ||
| <author email="[email protected]">Gilbert</author> | ||
| <maintainer email="pyo@robotis.com">Pyo</maintainer> | ||
| <maintainer email="willson@robotis.com">Will Son</maintainer> | ||
| <url type="website">http://wiki.ros.org/turtlebot3_description</url> | ||
| <url type="emanual">http://turtlebot3.robotis.com</url> | ||
| <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,14 @@ | ||
| <?xml version="1.0"?> | ||
| <package format="2"> | ||
| <name>turtlebot3_example</name> | ||
| <version>1.2.3</version> | ||
| <version>1.2.4</version> | ||
| <description> | ||
| This package provides four TurtleBot3 basic example include move using interactive marker, move and stop using LDS, move to goal position, move to custom routes. The interactions node is that you can control the TurtleBot3 front and back side or rotate to goal position. The obstacle node is that when the robot meets an obstacle, it stops. The patrol node is that TurtleBot3 move to custom route. There are 3 route(square, triangle, circle) in this package. You can add your route and move the TurtleBot3. The pointop node is that you can insert goal position include distance x-axis, y-axis and angluar z-axis. | ||
| </description> | ||
| <license>Apache 2.0</license> | ||
| <author email="[email protected]">Gilbert</author> | ||
| <maintainer email="[email protected]">Pyo</maintainer> | ||
| <author email="[email protected]">Pyo</author> | ||
| <maintainer email="[email protected]">Will Son</maintainer> | ||
| <url type="website">http://wiki.ros.org/turtlebot3_example</url> | ||
| <url type="emanual">http://turtlebot3.robotis.com</url> | ||
| <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <?xml version="1.0"?> | ||
| <package format="2"> | ||
| <name>turtlebot3_navigation</name> | ||
| <version>1.2.3</version> | ||
| <version>1.2.4</version> | ||
| <description> | ||
| The turtlebot3_navigation provides roslaunch scripts for starting the navigation. | ||
| </description> | ||
|
|
@@ -10,7 +10,7 @@ | |
| <author email="[email protected]">Darby Lim</author> | ||
| <author email="[email protected]">Gilbert</author> | ||
| <author>Leon Jung</author> | ||
| <maintainer email="pyo@robotis.com">Pyo</maintainer> | ||
| <maintainer email="willson@robotis.com">Will Son</maintainer> | ||
| <url type="website">http://wiki.ros.org/turtlebot3_navigation</url> | ||
| <url type="emanual">http://turtlebot3.robotis.com</url> | ||
| <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <?xml version="1.0"?> | ||
| <package format="2"> | ||
| <name>turtlebot3_slam</name> | ||
| <version>1.2.3</version> | ||
| <version>1.2.4</version> | ||
| <description> | ||
| The turtlebot3_slam package provides roslaunch scripts for starting the SLAM | ||
| </description> | ||
|
|
@@ -10,7 +10,7 @@ | |
| <author email="[email protected]">Darby Lim</author> | ||
| <author email="[email protected]">Gilbert</author> | ||
| <author>Leon Jung</author> | ||
| <maintainer email="pyo@robotis.com">Pyo</maintainer> | ||
| <maintainer email="willson@robotis.com">Will Son</maintainer> | ||
| <url type="website">http://wiki.ros.org/turtlebot3_slam</url> | ||
| <url type="emanual">http://turtlebot3.robotis.com</url> | ||
| <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url> | ||
|
|
@@ -19,13 +19,4 @@ | |
| <depend>roscpp</depend> | ||
| <depend>sensor_msgs</depend> | ||
| <exec_depend>turtlebot3_bringup</exec_depend> | ||
| <!-- <exec_depend>slam_gmapping</exec_depend> | ||
| <exec_depend>cartographer</exec_depend> | ||
| <exec_depend>cartographer_ros</exec_depend> | ||
| <exec_depend>cartographer_ros_msgs</exec_depend> | ||
| <exec_depend>cartographer_rviz</exec_depend> | ||
| <exec_depend>hector_mapping</exec_depend> | ||
| <exec_depend>slam_karto</exec_depend> | ||
| <exec_depend>frontier_exploration</exec_depend> | ||
| <exec_depend>navigation_stage</exec_depend> --> | ||
| </package> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,15 @@ | ||
| <?xml version="1.0"?> | ||
| <package format="2"> | ||
| <name>turtlebot3_teleop</name> | ||
| <version>1.2.3</version> | ||
| <version>1.2.4</version> | ||
| <description> | ||
| Provides teleoperation using keyboard for TurtleBot3. | ||
| </description> | ||
| <license>BSD</license> | ||
| <author>Melonee Wise</author> | ||
| <author email="[email protected]">Darby Lim</author> | ||
| <maintainer email="[email protected]">Pyo</maintainer> | ||
| <author email="[email protected]">Pyo</author> | ||
| <maintainer email="[email protected]">Will Son</maintainer> | ||
| <url type="website">http://wiki.ros.org/turtlebot3_teleop</url> | ||
| <url type="emanual">http://turtlebot3.robotis.com</url> | ||
| <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3</url> | ||
|
|
||