Skip to content

Commit

Permalink
Merge pull request #20 from ROBOTIS-GIT/develop
Browse files Browse the repository at this point in the history
prepare to release
  • Loading branch information
ROBOTIS-Will authored Sep 27, 2020
2 parents 56ebc5c + b36be59 commit 132d3f5
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ notifications:
on_success: change
on_failure: always
recipients:
- pyo@robotis.com
- willson@robotis.com
env:
matrix:
- ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=xenial
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
Changelog for package robotis_manipulator
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.1.0 (2020-09-27)
------------------
* supports Doxygen
* added getTrajectory function
* added torque coefficient
* change return type of funtions from void to bool
* added dynamics solving options
* fixed several bugs
* Contributors: Hye-Jong KIM, Yong-Ho Na, Tomoya Yamanokuchi

1.0.0 (2019-02-08)
------------------
* updated the CHANGELOG and version to release binary packages
Expand Down
4 changes: 2 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>robotis_manipulator</name>
<version>1.0.0</version>
<version>1.1.0</version>
<description>
This package contains the manipulation API and functions for controlling the manipulator.
</description>
Expand All @@ -10,8 +10,8 @@
<author email="thlim@robotis.com">Darby Lim</author>
<author email="yhna@robotis.com">Yong-Ho Na</author>
<author email="jhshim@robotis.com">Ryan Shim</author>
<maintainer email="pyo@robotis.com">Pyo</maintainer>
<maintainer email="hjkim@robotis.com">Hye-Jong KIM</maintainer>
<maintainer email="willson@robotis.com">Will Son</maintainer>
<url type="website">http://wiki.ros.org/robotis_manipulator</url>
<url type="emanual">http://emanual.robotis.com/docs/en/platform/openmanipulator</url>
<url type="repository">https://github.com/ROBOTIS-GIT/robotis_manipulator</url>
Expand Down

0 comments on commit 132d3f5

Please sign in to comment.