Skip to content

Commit 1f67e8d

Browse files
robotpilotrobotpilot
authored
Merge pull request #1133 from ROBOTIS-GIT/main
Bump 2.3.6
2 parents d10844c + da785b7 commit 1f67e8d

File tree

29 files changed

+205
-22
lines changed

29 files changed

+205
-22
lines changed

‎ISSUE_TEMPLATE.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ISSUE TEMPLATE ver. 0.4.2
1+
ISSUE TEMPLATE ver. 0.4.3
22

33
**Please search for similar issues in the repository before submit an issue ticket.**
44

@@ -11,6 +11,7 @@ ISSUE TEMPLATE ver. 0.4.2
1111

1212
- [ ] Raspberry Pi 3 B+
1313
- [ ] Raspberry Pi 4 (specify RAM size: 2/4/8GB)
14+
- [ ] Raspberry Pi 5 (specify RAM size: 2/4/8GB)
1415
- [ ] other (specify the product)
1516

1617
3. Which OS is installed on the TurtleBot3 SBC?
@@ -19,6 +20,7 @@ ISSUE TEMPLATE ver. 0.4.2
1920
- [ ] Ubuntu preinstalled server 18.04
2021
- [ ] Ubuntu preinstalled server 20.04
2122
- [ ] Ubuntu preinstalled server 22.04
23+
- [ ] Ubuntu preinstalled server 24.04
2224
- [ ] other (specify the OS)
2325

2426
4. Which OS is installed on Remote PC?
@@ -27,6 +29,7 @@ ISSUE TEMPLATE ver. 0.4.2
2729
- [ ] Ubuntu 18.04 LTS (Bionic Beaver)
2830
- [ ] Ubuntu 20.04 LTS (Focal Fossa)
2931
- [ ] Ubuntu 22.04 LTS (Jammy Jellyfish)
32+
- [ ] Ubuntu 24.04 LTS (Noble Numbat)
3033
- [ ] other (specify the OS)
3134

3235
5. Which ROS version do you use?
@@ -39,6 +42,7 @@ ISSUE TEMPLATE ver. 0.4.2
3942
- [ ] ROS2 Foxy Fitzroy
4043
- [ ] ROS2 Galactic Geochelone
4144
- [ ] ROS2 Humble Hawksbill
45+
- [ ] ROS2 Jazzy Jellyfish
4246
- [ ] ROS2 Rolling Ridley
4347

4448
6. Please describe the issue.

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
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, jazzy, main(rolling)
5-
- Legacy Branches: *-devel
4+
- Active Branches: humble, jazzy, main(rolling)
5+
- Legacy Branches: *-devel, noetic
66

77
## Open Source Projects Related to TurtleBot3
88
- [turtlebot3](https://github.com/ROBOTIS-GIT/turtlebot3)
@@ -17,6 +17,7 @@
1717
- [turtlebot3_home_service_challenge](https://github.com/ROBOTIS-GIT/turtlebot3_home_service_challenge)
1818
- [hls_lfcd_lds_driver](https://github.com/ROBOTIS-GIT/hls_lfcd_lds_driver)
1919
- [ld08_driver](https://github.com/ROBOTIS-GIT/ld08_driver)
20+
- [coin_d4_driver](https://github.com/ROBOTIS-GIT/coin_d4_driver)
2021
- [open_manipulator](https://github.com/ROBOTIS-GIT/open_manipulator)
2122
- [dynamixel_sdk](https://github.com/ROBOTIS-GIT/DynamixelSDK)
2223
- [OpenCR-Hardware](https://github.com/ROBOTIS-GIT/OpenCR-Hardware)

‎docker/humble/Dockerfile‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,34 @@ RUN apt-get update && \
2121
ros-${ROS_DISTRO}-cartographer-ros \
2222
ros-${ROS_DISTRO}-navigation2 \
2323
ros-${ROS_DISTRO}-nav2-bringup \
24+
ros-${ROS_DISTRO}-nav2-route \
2425
ros-${ROS_DISTRO}-turtlebot3-msgs \
2526
ros-${ROS_DISTRO}-dynamixel-sdk \
2627
ros-${ROS_DISTRO}-xacro \
2728
ros-${ROS_DISTRO}-hls-lfcd-lds-driver \
2829
ros-${ROS_DISTRO}-ld08-driver \
2930
ros-${ROS_DISTRO}-coin-d4-driver \
31+
ros-${ROS_DISTRO}-camera-ros \
32+
ros-${ROS_DISTRO}-urdf \
33+
&& rm -rf /var/lib/apt/lists/*
34+
35+
RUN apt-get update && \
36+
apt-get install -y --no-install-recommends \
37+
python3-pip \
38+
python3-jinja2 \
39+
ninja-build \
40+
libgnutls28-dev \
41+
openssl \
42+
libtiff-dev \
43+
pybind11-dev \
44+
qtbase5-dev \
45+
libqt5core5a \
46+
libqt5widgets5 \
47+
cmake \
48+
python3-yaml \
49+
python3-ply \
50+
libglib2.0-dev \
51+
libgstreamer-plugins-base1.0-dev \
3052
&& rm -rf /var/lib/apt/lists/*
3153

3254
WORKDIR ${COLCON_WS}
@@ -39,10 +61,21 @@ RUN bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash && \
3961
cd ${COLCON_WS} && \
4062
colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release"
4163

64+
RUN python3 -m pip config set global.break-system-packages true
65+
RUN pip3 install meson
66+
67+
WORKDIR /root
68+
RUN git clone -b v0.5.2 --depth 1 https://github.com/raspberrypi/libcamera.git && \
69+
cd libcamera && \
70+
meson setup build --buildtype=release -Dpipelines=rpi/vc4,rpi/pisp -Dipas=rpi/vc4,rpi/pisp -Dv4l2=true -Dgstreamer=enabled -Dtest=false -Dlc-compliance=disabled -Dcam=disabled -Dqcam=disabled -Ddocumentation=disabled -Dpycamera=enabled && \
71+
ninja -C build install && \
72+
ldconfig
73+
4274
RUN echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> ~/.bashrc && \
4375
echo "source ${COLCON_WS}/install/setup.bash" >> ~/.bashrc && \
4476
echo "alias cb='colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release'" >> ~/.bashrc && \
4577
echo "export ROS_DOMAIN_ID=30 # TURTLEBOT3" >> ~/.bashrc && \
78+
echo 'export LD_LIBRARY_PATH=/usr/local/lib/aarch64-linux-gnu:$LD_LIBRARY_PATH' >> ~/.bashrc && \
4679
echo "# export TURTLEBOT3_MODEL= # burger, waffle, waffle_pi" >> ~/.bashrc && \
4780
echo "# export LDS_MODEL= # LDS-01, LDS-02, LDS-03" >> ~/.bashrc
4881

‎docker/humble/docker-compose.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
image: robotis/turtlebot3:humble-latest
55
# build:
66
# context: .
7-
# dockerfile: Dockerfile.pc
7+
# dockerfile: Dockerfile
88
tty: true
99
restart: unless-stopped
1010
cap_add:
@@ -22,6 +22,7 @@ services:
2222
volumes:
2323
- /dev:/dev
2424
- /dev/shm:/dev/shm
25+
- /run/udev:/run/udev
2526
- /tmp/.X11-unix:/tmp/.X11-unix:rw
2627
- /tmp/.docker.xauth:/tmp/.docker.xauth:rw
2728
- ./workspace:/workspace

‎docker/jazzy/Dockerfile‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,27 @@ RUN apt-get update && \
2828
ros-${ROS_DISTRO}-hls-lfcd-lds-driver \
2929
ros-${ROS_DISTRO}-ld08-driver \
3030
ros-${ROS_DISTRO}-coin-d4-driver \
31+
ros-${ROS_DISTRO}-camera-ros \
32+
ros-${ROS_DISTRO}-urdf \
33+
&& rm -rf /var/lib/apt/lists/*
34+
35+
RUN apt-get update && \
36+
apt-get install -y --no-install-recommends \
37+
python3-pip \
38+
python3-jinja2 \
39+
ninja-build \
40+
libgnutls28-dev \
41+
openssl \
42+
libtiff-dev \
43+
pybind11-dev \
44+
qtbase5-dev \
45+
libqt5core5a \
46+
libqt5widgets5 \
47+
cmake \
48+
python3-yaml \
49+
python3-ply \
50+
libglib2.0-dev \
51+
libgstreamer-plugins-base1.0-dev \
3152
&& rm -rf /var/lib/apt/lists/*
3253

3354
WORKDIR ${COLCON_WS}
@@ -40,10 +61,21 @@ RUN bash -c "source /opt/ros/${ROS_DISTRO}/setup.bash && \
4061
cd ${COLCON_WS} && \
4162
colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release"
4263

64+
RUN python3 -m pip config set global.break-system-packages true
65+
RUN pip3 install meson
66+
67+
WORKDIR /root
68+
RUN git clone -b v0.5.2 --depth 1 https://github.com/raspberrypi/libcamera.git && \
69+
cd libcamera && \
70+
meson setup build --buildtype=release -Dpipelines=rpi/vc4,rpi/pisp -Dipas=rpi/vc4,rpi/pisp -Dv4l2=true -Dgstreamer=enabled -Dtest=false -Dlc-compliance=disabled -Dcam=disabled -Dqcam=disabled -Ddocumentation=disabled -Dpycamera=enabled && \
71+
ninja -C build install && \
72+
ldconfig
73+
4374
RUN echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> ~/.bashrc && \
4475
echo "source ${COLCON_WS}/install/setup.bash" >> ~/.bashrc && \
4576
echo "alias cb='colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release'" >> ~/.bashrc && \
4677
echo "export ROS_DOMAIN_ID=30 # TURTLEBOT3" >> ~/.bashrc && \
78+
echo 'export LD_LIBRARY_PATH=/usr/local/lib/aarch64-linux-gnu:$LD_LIBRARY_PATH' >> ~/.bashrc && \
4779
echo "# export TURTLEBOT3_MODEL= # burger, waffle, waffle_pi" >> ~/.bashrc && \
4880
echo "# export LDS_MODEL= # LDS-01, LDS-02, LDS-03" >> ~/.bashrc
4981

‎docker/jazzy/docker-compose.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ services:
2222
volumes:
2323
- /dev:/dev
2424
- /dev/shm:/dev/shm
25+
- /run/udev:/run/udev
2526
- /tmp/.X11-unix:/tmp/.X11-unix:rw
2627
- /tmp/.docker.xauth:/tmp/.docker.xauth:rw
2728
- ./workspace:/workspace

‎turtlebot3/CHANGELOG.rst‎

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

5+
2.3.6 (2025-12-15)
6+
------------------
7+
* Fixed an issue where the reset trigger did not work correctly
8+
* Contributors: Hyungyu Kim
9+
10+
2.3.5 (2025-12-09)
11+
------------------
12+
* Supported Pi Camera in Docker containers for TurtleBot3 with Humble and Jazzy
13+
* Contributors: Hyungyu Kim
14+
515
2.3.4 (2025-10-24)
616
------------------
717
* Supported Docker for TurtleBot3 with Humble and Jazzy

‎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.3.4</version>
5+
<version>2.3.6</version>
66
<description>
77
ROS 2 packages for TurtleBot3
88
</description>

‎turtlebot3_bringup/CHANGELOG.rst‎

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

5+
2.3.6 (2025-12-15)
6+
------------------
7+
* None
8+
9+
2.3.5 (2025-12-09)
10+
------------------
11+
* None
12+
513
2.3.4 (2025-10-24)
614
------------------
715
* None

‎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.3.4</version>
5+
<version>2.3.6</version>
66
<description>
77
ROS 2 launch scripts for starting the TurtleBot3
88
</description>

0 commit comments

Comments
 (0)