Skip to content

Commit

Permalink
Merge pull request #140 from ROBOTIS-GIT/develop
Browse files Browse the repository at this point in the history
prepare for release 1.3.1
  • Loading branch information
ROBOTIS-Will authored Jan 14, 2021
2 parents f9a9c11 + 41f99d8 commit 7603541
Show file tree
Hide file tree
Showing 32 changed files with 1,046 additions and 1,104 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ env:
matrix:
- ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=xenial
- ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=bionic
- ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch
- ROS_DISTRO=noetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=focal
branches:
only:
- master
- develop
- kinetic-devel
- melodic-devel
- noetic-devel
install:
- git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
script:
Expand Down
14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<img src="https://github.com/ROBOTIS-GIT/emanual/blob/master/assets/images/platform/turtlebot3/logo_turtlebot3.png" width="300">

## ROS 1 Packages for TurtleBot3 Simulations
|Version|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|Noetic + Ubuntu Focal|
|:---:|:---:|:---:|:---:|
|[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3_simulations.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2Fturtlebot3_simulations)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=kinetic-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=melodic-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=noetic-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations)|
|develop|master|Kinetic + Ubuntu Xenial|Melodic + Ubuntu Bionic|Noetic + Ubuntu Focal|
|:---:|:---:|:---:|:---:|:---:|
|[![Build Status](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=develop)](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations)|[![Build Status](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=master)](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations)|[![Build Status](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=kinetic-devel)](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations)|[![Build Status](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=melodic-devel)](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations)|[![Build Status](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=noetic-devel)](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations)|

## ROS 2 Packages for TurtleBot3 Simulations
|ros2-devel|ros2|Dashing + Ubuntu Bionic|Eloquent + Ubuntu Bionic|Foxy + Ubuntu Focal|
|:---:|:---:|:---:|:---:|:---:|
|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=ros2-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=ros2)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=dashing-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=eloquent-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations)|[![Build Status](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=foxy-devel)](https://travis-ci.org/ROBOTIS-GIT/turtlebot3_simulations)|
|ros2-devel|ros2|Dashing + Ubuntu Bionic|Foxy + Ubuntu Focal|
|:---:|:---:|:---:|:---:|
|[![Build Status](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=ros2-devel)](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations)|[![Build Status](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=ros2)](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations)|[![Build Status](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=dashing-devel)](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations)|[![Build Status](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations.svg?branch=foxy-devel)](https://travis-ci.com/ROBOTIS-GIT/turtlebot3_simulations)|

## ROBOTIS e-Manual for TurtleBot3
- [ROBOTIS e-Manual for TurtleBot3](http://turtlebot3.robotis.com/)
Expand All @@ -36,15 +36,13 @@
- [open_manipulator_simulations](https://github.com/ROBOTIS-GIT/open_manipulator_simulations)
- [open_manipulator_perceptions](https://github.com/ROBOTIS-GIT/open_manipulator_perceptions)
- [dynamixel_sdk](https://github.com/ROBOTIS-GIT/DynamixelSDK)
- [dynamixel_workbench](https://github.com/ROBOTIS-GIT/dynamixel-workbench)
- [OpenCR-Hardware](https://github.com/ROBOTIS-GIT/OpenCR-Hardware)
- [OpenCR](https://github.com/ROBOTIS-GIT/OpenCR)

## Documents and Videos related to TurtleBot3
- [ROBOTIS e-Manual for TurtleBot3](http://turtlebot3.robotis.com/)
- [ROBOTIS e-Manual for OpenManipulator](http://emanual.robotis.com/docs/en/platform/openmanipulator/)
- [ROBOTIS e-Manual for Dynamixel SDK](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/)
- [ROBOTIS e-Manual for Dynamixel Workbench](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/)
- [Website for TurtleBot Series](http://www.turtlebot.com/)
- [e-Book for TurtleBot3](https://community.robotsource.org/t/download-the-ros-robot-programming-book-for-free/51/)
- [Videos for TurtleBot3 ](https://www.youtube.com/playlist?list=PLRG6WP3c31_XI3wlvHlx2Mp8BYqgqDURU)
7 changes: 7 additions & 0 deletions turtlebot3_fake/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
Changelog for package turtlebot3_fake
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.3.1 (2021-01-07)
------------------
* fix init() in turtlebot3_drive.cpp
* Apply low poly models
* Noetic release
* Contributors: Sean Yen, Will Son

1.3.0 (2020-09-29)
------------------
* fix ROS Assert issue when debugging (#124)
Expand Down
2 changes: 1 addition & 1 deletion turtlebot3_fake/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_fake</name>
<version>1.3.0</version>
<version>1.3.1</version>
<description>
Package for TurtleBot3 fake node. With this package, simple tests can be done without a robot.
You can do simple tests using this package on rviz without real robots.
Expand Down
7 changes: 7 additions & 0 deletions turtlebot3_gazebo/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
Changelog for package turtlebot3_gazebo_ros
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.3.1 (2021-01-07)
------------------
* fix init() in turtlebot3_drive.cpp
* Apply low poly models
* Noetic release
* Contributors: Sean Yen, Will Son

1.3.0 (2020-09-29)
------------------
* fix ROS Assert issue when debugging (#124)
Expand Down
89 changes: 0 additions & 89 deletions turtlebot3_gazebo/models/turtlebot3_burger/meshes/burger_base.dae

This file was deleted.

89 changes: 0 additions & 89 deletions turtlebot3_gazebo/models/turtlebot3_burger/meshes/lds.dae

This file was deleted.

89 changes: 0 additions & 89 deletions turtlebot3_gazebo/models/turtlebot3_burger/meshes/left_tire.dae

This file was deleted.

89 changes: 0 additions & 89 deletions turtlebot3_gazebo/models/turtlebot3_burger/meshes/right_tire.dae

This file was deleted.

8 changes: 4 additions & 4 deletions turtlebot3_gazebo/models/turtlebot3_burger/model-1_4.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<pose>-0.032 0 0 0 0 0</pose>
<geometry>
<mesh>
<uri>model://turtlebot3_burger/meshes/burger_base.dae</uri>
<uri>model://turtlebot3_common_meshes/burger_base.dae</uri>
<scale>0.001 0.001 0.001</scale>
</mesh>
</geometry>
Expand Down Expand Up @@ -85,7 +85,7 @@
<pose>-0.032 0 0.171 0 0 0</pose>
<geometry>
<mesh>
<uri>model://turtlebot3_burger/meshes/lds.dae</uri>
<uri>model://turtlebot3_common_meshes/lds.dae</uri>
<scale>0.001 0.001 0.001</scale>
</mesh>
</geometry>
Expand Down Expand Up @@ -160,7 +160,7 @@
<pose>0 0.08 0.023 0 0 0</pose>
<geometry>
<mesh>
<uri>model://turtlebot3_burger/meshes/left_tire.dae</uri>
<uri>model://turtlebot3_common_meshes/tire.dae</uri>
<scale>0.001 0.001 0.001</scale>
</mesh>
</geometry>
Expand Down Expand Up @@ -208,7 +208,7 @@
<pose>0.0 -0.08 0.023 0 0 0</pose>
<geometry>
<mesh>
<uri>model://turtlebot3_burger/meshes/right_tire.dae</uri>
<uri>model://turtlebot3_common_meshes/tire.dae</uri>
<scale>0.001 0.001 0.001</scale>
</mesh>
</geometry>
Expand Down
8 changes: 4 additions & 4 deletions turtlebot3_gazebo/models/turtlebot3_burger/model.sdf
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<pose>-0.032 0 0 0 0 0</pose>
<geometry>
<mesh>
<uri>model://turtlebot3_burger/meshes/burger_base.dae</uri>
<uri>model://turtlebot3_common_meshes/burger_base.dae</uri>
<scale>0.001 0.001 0.001</scale>
</mesh>
</geometry>
Expand Down Expand Up @@ -85,7 +85,7 @@
<pose>-0.032 0 0.171 0 0 0</pose>
<geometry>
<mesh>
<uri>model://turtlebot3_burger/meshes/lds.dae</uri>
<uri>model://turtlebot3_common_meshes/lds.dae</uri>
<scale>0.001 0.001 0.001</scale>
</mesh>
</geometry>
Expand Down Expand Up @@ -160,7 +160,7 @@
<pose>0 0.08 0.023 0 0 0</pose>
<geometry>
<mesh>
<uri>model://turtlebot3_burger/meshes/left_tire.dae</uri>
<uri>model://turtlebot3_common_meshes/tire.dae</uri>
<scale>0.001 0.001 0.001</scale>
</mesh>
</geometry>
Expand Down Expand Up @@ -208,7 +208,7 @@
<pose>0.0 -0.08 0.023 0 0 0</pose>
<geometry>
<mesh>
<uri>model://turtlebot3_burger/meshes/right_tire.dae</uri>
<uri>model://turtlebot3_common_meshes/tire.dae</uri>
<scale>0.001 0.001 0.001</scale>
</mesh>
</geometry>
Expand Down
Loading

0 comments on commit 7603541

Please sign in to comment.