Skip to content

Commit 646c425

Browse files
authored
Merge pull request #226 from ROBOTIS-GIT/feature-auto-race-simulation
Add autorace2020 map and model and Fix model's mesh in rviz and gazebo.
2 parents abcc052 + 9295cb7 commit 646c425

File tree

105 files changed

+261664
-389
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+261664
-389
lines changed

.github/workflows/ros-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
linter: [cppcheck, cpplint, flake8, pep257, lint_cmake, xmllint, copyright]
17+
linter: [cppcheck, cpplint, uncrustify, flake8, pep257, lint_cmake, xmllint, copyright]
1818
steps:
1919
- name: Checkout code
2020
uses: actions/checkout@v4

README.md

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,40 @@
11
# TurtleBot3
2-
<img src="https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/platform/turtlebot3/logo_turtlebot3.png" width="300">
2+
<img src="https://raw.githubusercontent.com/ROBOTIS-GIT/emanual/master/assets/images/platform/turtlebot3/logo_turtlebot3.png" width="300">
33

44
- Active Branches: noetic, humble, main
55
- Legacy Branches: *-devel
66

7-
## ROBOTIS e-Manual for TurtleBot3
8-
- [ROBOTIS e-Manual for TurtleBot3](http://turtlebot3.robotis.com/)
9-
10-
## Wiki for turtlebot3_simulations Packages
11-
- http://wiki.ros.org/turtlebot3_simulations (metapackage)
12-
- http://wiki.ros.org/turtlebot3_fake
13-
- http://wiki.ros.org/turtlebot3_gazebo
14-
15-
## Open Source related to TurtleBot3
7+
## Open Source Projects Related to TurtleBot3
168
- [turtlebot3](https://github.com/ROBOTIS-GIT/turtlebot3)
179
- [turtlebot3_msgs](https://github.com/ROBOTIS-GIT/turtlebot3_msgs)
1810
- [turtlebot3_simulations](https://github.com/ROBOTIS-GIT/turtlebot3_simulations)
19-
- [turtlebot3_applications_msgs](https://github.com/ROBOTIS-GIT/turtlebot3_applications_msgs)
11+
- [turtlebot3_manipulation](https://github.com/ROBOTIS-GIT/turtlebot3_manipulation)
12+
- [turtlebot3_manipulation_simulations](https://github.com/ROBOTIS-GIT/turtlebot3_manipulation_simulations)
2013
- [turtlebot3_applications](https://github.com/ROBOTIS-GIT/turtlebot3_applications)
14+
- [turtlebot3_applications_msgs](https://github.com/ROBOTIS-GIT/turtlebot3_applications_msgs)
15+
- [turtlebot3_machine_learning](https://github.com/ROBOTIS-GIT/turtlebot3_machine_learning)
2116
- [turtlebot3_autorace](https://github.com/ROBOTIS-GIT/turtlebot3_autorace)
22-
- [turtlebot3_deliver](https://github.com/ROBOTIS-GIT/turtlebot3_deliver)
17+
- [turtlebot3_home_service_challenge](https://github.com/ROBOTIS-GIT/turtlebot3_home_service_challenge)
2318
- [hls_lfcd_lds_driver](https://github.com/ROBOTIS-GIT/hls_lfcd_lds_driver)
2419
- [ld08_driver](https://github.com/ROBOTIS-GIT/ld08_driver)
25-
- [open_manipulator_msgs](https://github.com/ROBOTIS-GIT/open_manipulator_msgs)
2620
- [open_manipulator](https://github.com/ROBOTIS-GIT/open_manipulator)
27-
- [open_manipulator_simulations](https://github.com/ROBOTIS-GIT/open_manipulator_simulations)
28-
- [open_manipulator_perceptions](https://github.com/ROBOTIS-GIT/open_manipulator_perceptions)
29-
- [open_manipulator_with_tb3_msgs](https://github.com/ROBOTIS-GIT/open_manipulator_with_tb3_msgs)
30-
- [open_manipulator_with_tb3](https://github.com/ROBOTIS-GIT/open_manipulator_with_tb3)
31-
- [open_manipulator_with_tb3_simulations](https://github.com/ROBOTIS-GIT/open_manipulator_with_tb3_simulations)
3221
- [dynamixel_sdk](https://github.com/ROBOTIS-GIT/DynamixelSDK)
3322
- [OpenCR-Hardware](https://github.com/ROBOTIS-GIT/OpenCR-Hardware)
3423
- [OpenCR](https://github.com/ROBOTIS-GIT/OpenCR)
3524

36-
## Documents and Videos related to TurtleBot3
37-
- [ROBOTIS e-Manual for TurtleBot3](http://turtlebot3.robotis.com/)
38-
- [ROBOTIS e-Manual for OpenManipulator](http://emanual.robotis.com/docs/en/platform/openmanipulator/)
39-
- [ROBOTIS e-Manual for Dynamixel SDK](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/)
40-
- [Website for TurtleBot Series](http://www.turtlebot.com/)
41-
- [e-Book for TurtleBot3](https://community.robotsource.org/t/download-the-ros-robot-programming-book-for-free/51/)
42-
- [Videos for TurtleBot3 ](https://www.youtube.com/playlist?list=PLRG6WP3c31_XI3wlvHlx2Mp8BYqgqDURU)
25+
## Documentation, Videos, and Community
26+
27+
### Official Documentation
28+
- ⚙️ **[ROBOTIS DYNAMIXEL](https://dynamixel.com/)** – Official website for DYNAMIXEL
29+
- 📚 **[ROBOTIS e-Manual for Dynamixel SDK](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/)** – Official guide for Dynamixel SDK
30+
- 📚 **[ROBOTIS e-Manual for TurtleBot3](http://turtlebot3.robotis.com/)** – Official guide for TurtleBot3
31+
- 📚 **[ROBOTIS e-Manual for OpenMANIPULATOR-X](https://emanual.robotis.com/docs/en/platform/openmanipulator_x/overview/)** – Official guide for OpenMANIPULATOR-X
32+
33+
### Learning Resources
34+
- 🎥 **[ROBOTIS YouTube Channel](https://www.youtube.com/@ROBOTISCHANNEL)**
35+
- 🎥 **[ROBOTIS Open Source YouTube Channel](https://www.youtube.com/@ROBOTISOpenSourceTeam)**
36+
- 🎥 **[ROBOTIS TurtleBot3 YouTube Playlist](https://www.youtube.com/playlist?list=PLRG6WP3c31_XI3wlvHlx2Mp8BYqgqDURU)** – Video tutorials for TurtleBot3
37+
- 🎥 **[ROBOTIS OpenMANIPULATOR YouTube Playlist](https://www.youtube.com/playlist?list=PLRG6WP3c31_WpEsB6_Rdt3KhiopXQlUkb)** – Video tutorials for OpenMANIPULATOR
38+
39+
### Community & Support
40+
- 💬 **[ROBOTIS Community Forum](https://forum.robotis.com/)** – Get help and discuss with other users

turtlebot3_fake_node/CHANGELOG.rst

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,23 @@
22
Changelog for package turtlebot3_fake
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
2.3.0 (2025-02-17)
6+
------------------
7+
* None
8+
59
2.2.6 (2202-05-26)
610
------------------
7-
* ROS2 Humble Hawksbill supported
11+
* ROS 2 Humble Hawksbill supported
12+
* Contributors: Will Son
813

914
2.2.5 (2021-08-25)
1015
------------------
11-
* Release for ROS2 Rolling
16+
* Release for ROS 2 Rolling
1217
* Contributors: Will Son
1318

1419
2.2.4 (2021-06-14)
1520
------------------
16-
* Release for ROS2 Galactic
21+
* Release for ROS 2 Galactic
1722
* Clean up unncessary files
1823
* Use turtlebot3_common mesh modeling
1924
* Independent turtlebot3_simulations package
@@ -26,7 +31,7 @@ Changelog for package turtlebot3_fake
2631

2732
2.2.2 (2021-02-24)
2833
------------------
29-
* none
34+
* None
3035

3136
2.2.1 (2021-01-13)
3237
------------------
@@ -36,7 +41,7 @@ Changelog for package turtlebot3_fake
3641

3742
2.2.0 (2020-06-29)
3843
------------------
39-
* none
44+
* None
4045

4146
2.1.0 (2019-09-10)
4247
------------------
@@ -46,15 +51,15 @@ Changelog for package turtlebot3_fake
4651

4752
2.0.1 (2019-09-05)
4853
------------------
49-
* none
54+
* None
5055

5156
2.0.0 (2019-08-20)
5257
------------------
53-
* none
58+
* None
5459

5560
1.3.0 (2020-06-29)
5661
------------------
57-
* none
62+
* None
5863

5964
1.2.0 (2019-01-22)
6065
------------------
@@ -68,31 +73,31 @@ Changelog for package turtlebot3_fake
6873

6974
1.0.2 (2018-06-01)
7075
------------------
71-
* none
76+
* None
7277

7378
1.0.1 (2018-05-30)
7479
------------------
75-
* none
80+
* None
7681

7782
1.0.0 (2018-05-29)
7883
------------------
79-
* none
84+
* None
8085

8186
0.2.4 (2018-03-14)
8287
------------------
83-
* none
88+
* None
8489

8590
0.2.3 (2018-03-14)
8691
------------------
87-
* none
92+
* None
8893

8994
0.2.2 (2018-03-14)
9095
------------------
91-
* none
96+
* None
9297

9398
0.2.1 (2018-03-14)
9499
------------------
95-
* none
100+
* None
96101

97102
0.2.0 (2018-03-13)
98103
------------------
@@ -101,7 +106,7 @@ Changelog for package turtlebot3_fake
101106

102107
0.1.7 (2017-08-16)
103108
------------------
104-
* none
109+
* None
105110

106111
0.1.6 (2017-08-14)
107112
------------------
@@ -110,7 +115,7 @@ Changelog for package turtlebot3_fake
110115

111116
0.1.5 (2017-06-09)
112117
------------------
113-
* none
118+
* None
114119

115120
0.1.4 (2017-05-23)
116121
------------------

turtlebot3_fake_node/package.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@
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_fake_node</name>
5-
<version>2.2.6</version>
5+
<version>2.3.0</version>
66
<description>
77
Package for TurtleBot3 fake node. With this package, simple tests can be done without a robot.
88
You can do simple tests using this package on rviz without real robots.
99
</description>
10-
<maintainer email="willson@robotis.com">Will Son</maintainer>
10+
<maintainer email="pyo@robotis.com">Pyo</maintainer>
1111
<license>Apache 2.0</license>
1212
<url type="website">http://turtlebot3.robotis.com</url>
1313
<url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3_simulations</url>
1414
<url type="bugtracker">https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues</url>
1515
<author email="[email protected]">Pyo</author>
1616
<author email="[email protected]">Darby Lim</author>
1717
<author>Ryan Shim</author>
18+
<author email="[email protected]">Will Son</author>
1819
<depend>ament_cmake</depend>
1920
<depend>geometry_msgs</depend>
2021
<depend>nav_msgs</depend>

turtlebot3_gazebo/CHANGELOG.rst

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,27 @@
22
Changelog for package turtlebot3_gazebo
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5-
2.2.6 (2202-05-26)
5+
2.3.0 (2025-02-17)
66
------------------
7-
* ROS2 Humble Hawksbill supported
7+
* Added multi-robot launch functionality
8+
* Updated robot mesh in Gazebo and RViz
9+
* Added launch file for TurtleBot3 Autorace 2020
10+
* Added plugins to the models of Autorace 2020
11+
* Contributors: Hyungyu Kim
12+
13+
2.2.6 (2022-05-26)
14+
------------------
15+
* ROS 2 Humble Hawksbill supported
16+
* Contributors: Will Son
817

918
2.2.5 (2021-08-25)
1019
------------------
11-
* Release for ROS2 Rolling
20+
* Release for ROS 2 Rolling
1221
* Contributors: Will Son
1322

1423
2.2.4 (2021-06-14)
1524
------------------
16-
* Release for ROS2 Galactic
25+
* Release for ROS 2 Galactic
1726
* Separate world and robot models(#162)
1827
* Clean up unncessary files
1928
* Use turtlebot3_common mesh modeling
@@ -114,7 +123,7 @@ Changelog for package turtlebot3_gazebo
114123

115124
0.2.4 (2018-03-14)
116125
------------------
117-
* none
126+
* None
118127

119128
0.2.3 (2018-03-14)
120129
------------------
@@ -123,7 +132,7 @@ Changelog for package turtlebot3_gazebo
123132

124133
0.2.2 (2018-03-14)
125134
------------------
126-
* none
135+
* None
127136

128137
0.2.1 (2018-03-14)
129138
------------------

turtlebot3_gazebo/CMakeLists.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,19 @@ set(EXEC_NAME "turtlebot3_drive")
5353
add_executable(${EXEC_NAME} src/turtlebot3_drive.cpp)
5454
ament_target_dependencies(${EXEC_NAME} ${dependencies})
5555

56-
add_library(obstacle1 SHARED models/turtlebot3_dqn_world/obstacle_plugin/obstacle1.cc)
56+
add_library(traffic_light_plugin SHARED src/traffic_light_plugin.cpp)
57+
target_link_libraries(traffic_light_plugin ${GAZEBO_LIBRARIES})
58+
59+
add_library(traffic_bar_plugin SHARED src/traffic_bar_plugin.cpp)
60+
target_link_libraries(traffic_bar_plugin ${GAZEBO_LIBRARIES})
61+
62+
add_library(obstacle1 SHARED src/obstacle1.cpp)
5763
target_link_libraries(obstacle1 ${GAZEBO_LIBRARIES})
5864

59-
add_library(obstacle2 SHARED models/turtlebot3_dqn_world/obstacle_plugin/obstacle2.cc)
65+
add_library(obstacle2 SHARED src/obstacle2.cpp)
6066
target_link_libraries(obstacle2 ${GAZEBO_LIBRARIES})
6167

62-
add_library(obstacles SHARED models/turtlebot3_dqn_world/obstacle_plugin/obstacles.cc)
68+
add_library(obstacles SHARED src/obstacles.cpp)
6369
target_link_libraries(obstacles ${GAZEBO_LIBRARIES})
6470

6571
################################################################################
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// Copyright 2012 Open Source Robotics Foundation
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
//
15+
// Author: Ryan Shim
16+
17+
#ifndef TURTLEBOT3_GAZEBO__OBSTACLE1_HPP_
18+
#define TURTLEBOT3_GAZEBO__OBSTACLE1_HPP_
19+
20+
#include <ignition/math.hh>
21+
#include <gazebo/common/common.hh>
22+
#include <gazebo/gazebo.hh>
23+
#include <gazebo/physics/physics.hh>
24+
25+
namespace gazebo
26+
{
27+
class Obstacle1 : public ModelPlugin
28+
{
29+
public:
30+
void Load(physics::ModelPtr _parent, sdf::ElementPtr /*_sdf*/) override;
31+
32+
private:
33+
physics::ModelPtr model;
34+
event::ConnectionPtr updateConnection;
35+
};
36+
GZ_REGISTER_MODEL_PLUGIN(Obstacle1);
37+
} // namespace gazebo
38+
#endif // TURTLEBOT3_GAZEBO__OBSTACLE1_HPP_
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
// Copyright 2012 Open Source Robotics Foundation
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
//
15+
// Author: Ryan Shim
16+
17+
#ifndef TURTLEBOT3_GAZEBO__OBSTACLE2_HPP_
18+
#define TURTLEBOT3_GAZEBO__OBSTACLE2_HPP_
19+
20+
#include <ignition/math.hh>
21+
#include <gazebo/common/common.hh>
22+
#include <gazebo/gazebo.hh>
23+
#include <gazebo/physics/physics.hh>
24+
25+
namespace gazebo
26+
{
27+
class Obstacle2 : public ModelPlugin
28+
{
29+
public:
30+
Obstacle2() = default;
31+
void Load(physics::ModelPtr _parent, sdf::ElementPtr /*_sdf*/) override;
32+
33+
private:
34+
physics::ModelPtr model;
35+
event::ConnectionPtr updateConnection;
36+
};
37+
GZ_REGISTER_MODEL_PLUGIN(Obstacle2);
38+
} // namespace gazebo
39+
#endif // TURTLEBOT3_GAZEBO__OBSTACLE2_HPP_

0 commit comments

Comments
 (0)