Skip to content

Commit fa8d9e6

Browse files
authored
Merge pull request #1089 from ROBOTIS-GIT/feature-multi-robot-upgrade
Feature multi robot upgrade
2 parents ca08f8c + 59e707a commit fa8d9e6

File tree

31 files changed

+223
-140
lines changed

31 files changed

+223
-140
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# TurtleBot3
22
<img src="https://raw.githubusercontent.com/ROBOTIS-GIT/emanual/master/assets/images/platform/turtlebot3/logo_turtlebot3.png" width="300">
33

4-
- Active Branches: noetic, humble, main
4+
- Active Branches: noetic, humble, jazzy, main
55
- Legacy Branches: *-devel
66

77
## Open Source Projects Related to TurtleBot3

turtlebot3/CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package turtlebot3
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.2.8 (2025-04-11)
6+
------------------
7+
* Support flexible configuration of the frame_id used when publishing the topic
8+
* Contributors: Hyungyu Kim
9+
510
2.2.7 (2025-03-27)
611
------------------
712
* Modified Relative Move

turtlebot3/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>turtlebot3</name>
5-
<version>2.2.7</version>
5+
<version>2.2.8</version>
66
<description>
77
ROS 2 packages for TurtleBot3
88
</description>

turtlebot3_bringup/CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package turtlebot3_bringup
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.2.8 (2025-04-11)
6+
------------------
7+
* Support flexible configuration of the frame_id used when publishing the topic
8+
* Contributors: Hyungyu Kim
9+
510
2.2.7 (2025-03-27)
611
------------------
712
* None

turtlebot3_bringup/launch/robot.launch.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
from launch.actions import IncludeLaunchDescription
2525
from launch.launch_description_sources import PythonLaunchDescriptionSource
2626
from launch.substitutions import LaunchConfiguration
27-
from launch.substitutions import PythonExpression
2827
from launch.substitutions import ThisLaunchFileDir
2928
from launch_ros.actions import Node
3029
from launch_ros.actions import PushRosNamespace
@@ -104,17 +103,17 @@ def generate_launch_description():
104103

105104
IncludeLaunchDescription(
106105
PythonLaunchDescriptionSource([lidar_pkg_dir, LDS_LAUNCH_FILE]),
107-
launch_arguments={'port': '/dev/ttyUSB0', 'frame_id': 'base_scan'}.items(),
106+
launch_arguments={'port': '/dev/ttyUSB0',
107+
'frame_id': 'base_scan',
108+
'namespace': namespace}.items(),
108109
),
109110

110111
Node(
111112
package='turtlebot3_node',
112113
executable='turtlebot3_ros',
113114
parameters=[
114115
tb3_param_dir,
115-
{'odometry.frame_id': PythonExpression(['"', namespace, '/odom"'])},
116-
{'odometry.child_frame_id': PythonExpression(
117-
['"', namespace, '/base_footprint"'])}],
116+
{'namespace': namespace}],
118117
arguments=['-i', usb_port],
119118
output='screen'),
120119
])

turtlebot3_bringup/launch/turtlebot3_state_publisher.launch.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from ament_index_python.packages import get_package_share_directory
2222
from launch import LaunchDescription
2323
from launch.actions import DeclareLaunchArgument
24+
from launch.substitutions import Command
2425
from launch.substitutions import LaunchConfiguration
2526
from launch.substitutions import PythonExpression
2627
from launch_ros.actions import Node
@@ -41,10 +42,15 @@ def generate_launch_description():
4142
'urdf',
4243
urdf_file_name)
4344

45+
robot_desc = Command([
46+
'xacro ',
47+
urdf,
48+
' namespace:=',
49+
PythonExpression(['"', namespace, '" + "/" if "', namespace, '" != "" else ""']),
50+
])
51+
4452
# Major refactor of the robot_state_publisher
4553
# Reference page: https://github.com/ros2/demos/pull/426
46-
with open(urdf, 'r') as infp:
47-
robot_desc = infp.read()
4854

4955
rsp_params = {'robot_description': robot_desc}
5056

@@ -61,6 +67,5 @@ def generate_launch_description():
6167
output='screen',
6268
parameters=[
6369
rsp_params,
64-
{'use_sim_time': use_sim_time},
65-
{'frame_prefix': PythonExpression(['"', namespace, '/"'])}])
70+
{'use_sim_time': use_sim_time}])
6671
])

turtlebot3_bringup/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>turtlebot3_bringup</name>
5-
<version>2.2.7</version>
5+
<version>2.2.8</version>
66
<description>
77
ROS 2 launch scripts for starting the TurtleBot3
88
</description>

turtlebot3_cartographer/CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Changelog for package turtlebot3_cartographer
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.2.8 (2025-04-11)
6+
------------------
7+
* None
8+
59
2.2.7 (2025-03-27)
610
------------------
711
* None

turtlebot3_cartographer/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>turtlebot3_cartographer</name>
5-
<version>2.2.7</version>
5+
<version>2.2.8</version>
66
<description>
77
ROS 2 launch scripts for cartographer
88
</description>

turtlebot3_description/CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package turtlebot3_description
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.2.8 (2025-04-11)
6+
------------------
7+
* Support flexible configuration of the frame_id used when publishing the topic
8+
* Contributors: Hyungyu Kim
9+
510
2.2.7 (2025-03-27)
611
------------------
712
* None

0 commit comments

Comments
 (0)