Skip to content

Commit

Permalink
updated the CHANGELOG and version to release binary packages
Browse files Browse the repository at this point in the history
  • Loading branch information
robotpilot committed Jun 3, 2018
1 parent 2b04526 commit 90b1b51
Show file tree
Hide file tree
Showing 13 changed files with 73 additions and 16 deletions.
5 changes: 5 additions & 0 deletions open_manipulator_with_tb3/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package open_manipulator_with_tb3
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.0.1 (2018-06-04)
------------------
* added dependency package option
* Contributors: Pyo

1.0.0 (2018-06-01)
------------------
* updated the CHANGELOG and version to release binary packages
Expand Down
2 changes: 1 addition & 1 deletion open_manipulator_with_tb3/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>open_manipulator_with_tb3</name>
<version>1.0.0</version>
<version>1.0.1</version>
<description>
ROS-enabled OpenManipulator is a full open robot platform consisting of OpenSoftware​, OpenHardware and OpenCR(Embedded board)​.
The OpenManipulator is allowed users to control it more easily by linking with the MoveIt! package. Moreover it has full hardware compatibility with TurtleBot3​.
Expand Down
5 changes: 5 additions & 0 deletions open_manipulator_with_tb3_description/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package open_manipulator_with_tb3_description
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.0.1 (2018-06-04)
------------------
* added dependency package option
* Contributors: Pyo

1.0.0 (2018-06-01)
------------------
* updated the CHANGELOG and version to release binary packages
Expand Down
2 changes: 1 addition & 1 deletion open_manipulator_with_tb3_description/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>open_manipulator_with_tb3_description</name>
<version>1.0.0</version>
<version>1.0.1</version>
<description>
OpenManipulator 3D model description for visualization and simulation
</description>
Expand Down
5 changes: 5 additions & 0 deletions open_manipulator_with_tb3_tools/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package open_manipulator_with_tb3_tools
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.0.1 (2018-06-04)
------------------
* added dependency package option
* Contributors: Pyo

1.0.0 (2018-06-01)
------------------
* updated the CHANGELOG and version to release binary packages
Expand Down
11 changes: 6 additions & 5 deletions open_manipulator_with_tb3_tools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ find_package(catkin REQUIRED COMPONENTS
geometry_msgs
nav_msgs
open_manipulator_msgs
open_manipulator_with_tb3_msgs
ar_track_alvar_msgs
)

Expand All @@ -37,7 +38,7 @@ catkin_python_setup()
# Declare catkin specific configuration to be passed to dependent projects
################################################################################
catkin_package(
CATKIN_DEPENDS rospy roscpp std_msgs geometry_msgs nav_msgs open_manipulator_msgs ar_track_alvar_msgs
CATKIN_DEPENDS rospy roscpp std_msgs geometry_msgs nav_msgs open_manipulator_msgs open_manipulator_with_tb3_msgs ar_track_alvar_msgs
)

################################################################################
Expand All @@ -50,11 +51,11 @@ include_directories(

add_executable(pick src/pick.cpp)
add_dependencies(pick ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
target_link_libraries(pick ${catkin_LIBRARIES} ${Eigen3_LIBRARIES})
target_link_libraries(pick ${catkin_LIBRARIES})

add_executable(place src/place.cpp)
add_dependencies(place ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
target_link_libraries(place ${catkin_LIBRARIES} ${Eigen3_LIBRARIES})
target_link_libraries(place ${catkin_LIBRARIES})

################################################################################
# Install
Expand All @@ -64,11 +65,11 @@ catkin_install_python(PROGRAMS
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)

install(TARGETS pick
install(TARGETS pick place
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)

install(DIRECTORY launch rviz config maps
install(DIRECTORY config launch maps rviz
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)

Expand Down
3 changes: 2 additions & 1 deletion open_manipulator_with_tb3_tools/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>open_manipulator_with_tb3_tools</name>
<version>1.0.0</version>
<version>1.0.1</version>
<description>
The tools package(including SLAM, Navigation, Manipulation) for OpenManipulator with TurtleBot3
</description>
Expand All @@ -20,6 +20,7 @@
<depend>geometry_msgs</depend>
<depend>nav_msgs</depend>
<depend>open_manipulator_msgs</depend>
<depend>open_manipulator_with_tb3_msgs</depend>
<depend>ar_track_alvar_msgs</depend>
<exec_depend>joint_state_publisher</exec_depend>
<exec_depend>robot_state_publisher</exec_depend>
Expand Down
21 changes: 18 additions & 3 deletions open_manipulator_with_tb3_tools/src/pick.cpp
Original file line number Diff line number Diff line change
@@ -1,15 +1,30 @@
/*******************************************************************************
* Copyright 2018 ROBOTIS CO., LTD.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*******************************************************************************/

/* Authors: Darby Lim */

#include <ros/ros.h>

#include <std_msgs/Float64.h>
#include <std_msgs/String.h>

#include <geometry_msgs/PoseStamped.h>

#include <open_manipulator_msgs/SetJointPosition.h>
#include <open_manipulator_msgs/SetKinematicsPose.h>

#include <open_manipulator_msgs/State.h>

#include <open_manipulator_with_tb3_msgs/Pick.h>

#include <ar_track_alvar_msgs/AlvarMarkers.h>
Expand Down
21 changes: 18 additions & 3 deletions open_manipulator_with_tb3_tools/src/place.cpp
Original file line number Diff line number Diff line change
@@ -1,15 +1,30 @@
/*******************************************************************************
* Copyright 2018 ROBOTIS CO., LTD.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*******************************************************************************/

/* Authors: Darby Lim */

#include <ros/ros.h>

#include <std_msgs/Float64.h>
#include <std_msgs/String.h>

#include <geometry_msgs/PoseStamped.h>

#include <open_manipulator_msgs/SetJointPosition.h>
#include <open_manipulator_msgs/SetKinematicsPose.h>

#include <open_manipulator_msgs/State.h>

#include <open_manipulator_with_tb3_msgs/Place.h>

#include <ar_track_alvar_msgs/AlvarMarkers.h>
Expand Down
5 changes: 5 additions & 0 deletions open_manipulator_with_tb3_waffle_moveit/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package open_manipulator_with_tb3_waffle_moveit
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.0.1 (2018-06-04)
------------------
* added dependency package option
* Contributors: Pyo

1.0.0 (2018-06-01)
------------------
* updated the CHANGELOG and version to release binary packages
Expand Down
2 changes: 1 addition & 1 deletion open_manipulator_with_tb3_waffle_moveit/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>open_manipulator_with_tb3_waffle_moveit</name>
<version>1.0.0</version>
<version>1.0.1</version>
<description>
An automatically generated packages including all the configurations and launch files for OpenManipulator with TurtleBot3 Waffle by using MoveIt! Motion Planning Framework.
</description>
Expand Down
5 changes: 5 additions & 0 deletions open_manipulator_with_tb3_waffle_pi_moveit/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package open_manipulator_with_tb3_waffle_pi_moveit
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.0.1 (2018-06-04)
------------------
* added dependency package option
* Contributors: Pyo

1.0.0 (2018-06-01)
------------------
* updated the CHANGELOG and version to release binary packages
Expand Down
2 changes: 1 addition & 1 deletion open_manipulator_with_tb3_waffle_pi_moveit/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>open_manipulator_with_tb3_waffle_pi_moveit</name>
<version>1.0.0</version>
<version>1.0.1</version>
<description>
An automatically generated packages including all the configurations and launch files for OpenManipulator with TurtleBot3 Waffle Pi by using MoveIt! Motion Planning Framework.
</description>
Expand Down

0 comments on commit 90b1b51

Please sign in to comment.