Skip to content

Commit

Permalink
Merge pull request ROBOTIS-GIT#554 from ROBOTIS-GIT/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ROBOTIS-Will authored Mar 23, 2020
2 parents 9e527f8 + fb2387e commit f538230
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion turtlebot3/package.xml
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.2</version>
<version>1.2.3</version>
<description>
ROS packages for the Turtlebot3 (meta package)
</description>
Expand Down
2 changes: 1 addition & 1 deletion turtlebot3_bringup/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>turtlebot3_bringup</name>
<version>1.2.2</version>
<version>1.2.3</version>
<description>
roslaunch scripts for starting the TurtleBot3
</description>
Expand Down
4 changes: 2 additions & 2 deletions turtlebot3_bringup/src/turtlebot3_diagnostics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#include <turtlebot3_msgs/VersionInfo.h>
#include <string>

#define SOFTWARE_VERSION "1.1.0"
#define HARDWARE_VERSION "2017.05.30"
#define SOFTWARE_VERSION "1.2.3"
#define HARDWARE_VERSION "2020.03.16"
#define FIRMWARE_VERSION_MAJOR_NUMBER 1
#define FIRMWARE_VERSION_MINOR_NUMBER 2

Expand Down
2 changes: 1 addition & 1 deletion turtlebot3_description/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>turtlebot3_description</name>
<version>1.2.2</version>
<version>1.2.3</version>
<description>
3D models of the TurtleBot3 for simulation and visualization
</description>
Expand Down
2 changes: 1 addition & 1 deletion turtlebot3_example/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>turtlebot3_example</name>
<version>1.2.2</version>
<version>1.2.3</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>
Expand Down
2 changes: 1 addition & 1 deletion turtlebot3_navigation/package.xml
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.2</version>
<version>1.2.3</version>
<description>
The turtlebot3_navigation provides roslaunch scripts for starting the navigation.
</description>
Expand Down
2 changes: 1 addition & 1 deletion turtlebot3_slam/package.xml
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.2</version>
<version>1.2.3</version>
<description>
The turtlebot3_slam package provides roslaunch scripts for starting the SLAM
</description>
Expand Down
2 changes: 1 addition & 1 deletion turtlebot3_teleop/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>turtlebot3_teleop</name>
<version>1.2.2</version>
<version>1.2.3</version>
<description>
Provides teleoperation using keyboard for TurtleBot3.
</description>
Expand Down

0 comments on commit f538230

Please sign in to comment.