Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update from upstream #14

Merged
merged 12 commits into from Oct 8, 2021
Merged
8 changes: 8 additions & 0 deletions fetch_calibration/CHANGELOG.rst
Expand Up @@ -2,6 +2,14 @@
Changelog for package fetch_calibration
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.8.3 (2021-03-06)
------------------
* Initial noetic release
* Add velocity-factor in calibrate_robot (`#133 <https://github.com/fetchrobotics/fetch_ros/issues/133>`_)
Limit velocity factor so that it can only be used to slow down calibration.
* Updates maintainers
* Contributors: Alex Moriarty, Eric Relson, Russell Toris, Shingo Kitagawa

0.8.2 (2019-08-06)
------------------

Expand Down
2 changes: 1 addition & 1 deletion fetch_calibration/package.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>fetch_calibration</name>
<version>0.8.2</version>
<version>0.8.3</version>
<description>
Launch and configuration files for calibrating Fetch using the 'robot_calibration' package.
</description>
Expand Down
4 changes: 2 additions & 2 deletions fetch_calibration/scripts/calibrate_robot
Expand Up @@ -93,7 +93,7 @@ def get_calibration_dict(directory, calibration = None):
files.sort()
# Open it
calfile = open(os.path.join(directory, files[-1]))
except IndexError, IOError:
except (IndexError, IOError):
print("Cannot open calibration.yaml")
return calibration
# Parse YAML
Expand Down Expand Up @@ -126,7 +126,7 @@ def get_base_calibration_dict(directory, calibration = None):
files.sort()
# Open it
calfile = open(os.path.join(directory, files[-1]))
except IndexError, IOError:
except (IndexError, IOError):
print("Cannot open base_calibration.yaml")
return calibration
# Parse YAML
Expand Down
6 changes: 6 additions & 0 deletions fetch_depth_layer/CHANGELOG.rst
Expand Up @@ -2,6 +2,12 @@
Changelog for package fetch_depth_layer
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.8.3 (2021-03-06)
------------------
* Initial noetic release
* Updates maintainers
* Contributors: Alex Moriarty, Russell Toris

0.8.2 (2019-08-06)
------------------

Expand Down
2 changes: 1 addition & 1 deletion fetch_depth_layer/package.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>fetch_depth_layer</name>
<version>0.8.2</version>
<version>0.8.3</version>
<description>The fetch_depth_layer package</description>

<author>Michael Ferguson</author>
Expand Down
7 changes: 7 additions & 0 deletions fetch_description/CHANGELOG.rst
Expand Up @@ -2,6 +2,13 @@
Changelog for package fetch_description
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.8.3 (2021-03-06)
------------------
* Initial noetic release
* Manually revert textures on URDF models (`#154 <https://github.com/fetchrobotics/fetch_ros/issues/154>`_)
* Updates maintainers
* Contributors: Alex Moriarty, Eric Relson, Russell Toris

0.8.2 (2019-08-06)
------------------
* License: CC BY-NC-SA 4.0 (Remove ND) (`#123 <https://github.com/fetchrobotics/fetch_ros/issues/123>`_)
Expand Down
264 changes: 132 additions & 132 deletions fetch_description/meshes/base_link.dae

Large diffs are not rendered by default.

264 changes: 132 additions & 132 deletions fetch_description/meshes/elbow_flex_link.dae

Large diffs are not rendered by default.

264 changes: 132 additions & 132 deletions fetch_description/meshes/forearm_roll_link.dae

Large diffs are not rendered by default.

Binary file modified fetch_description/meshes/gripper_link.STL
Binary file not shown.
357 changes: 224 additions & 133 deletions fetch_description/meshes/gripper_link.dae

Large diffs are not rendered by default.

264 changes: 132 additions & 132 deletions fetch_description/meshes/head_pan_link.dae

Large diffs are not rendered by default.

264 changes: 132 additions & 132 deletions fetch_description/meshes/head_tilt_link.dae

Large diffs are not rendered by default.

264 changes: 132 additions & 132 deletions fetch_description/meshes/shoulder_lift_link.dae

Large diffs are not rendered by default.

264 changes: 132 additions & 132 deletions fetch_description/meshes/shoulder_pan_link.dae

Large diffs are not rendered by default.

264 changes: 132 additions & 132 deletions fetch_description/meshes/torso_fixed_link.dae

Large diffs are not rendered by default.

264 changes: 132 additions & 132 deletions fetch_description/meshes/torso_lift_link.dae

Large diffs are not rendered by default.

264 changes: 132 additions & 132 deletions fetch_description/meshes/upperarm_roll_link.dae

Large diffs are not rendered by default.

264 changes: 132 additions & 132 deletions fetch_description/meshes/wrist_flex_link.dae

Large diffs are not rendered by default.

264 changes: 132 additions & 132 deletions fetch_description/meshes/wrist_roll_link.dae

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion fetch_description/package.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>fetch_description</name>
<version>0.8.2</version>
<version>0.8.3</version>
<description>
URDF for Fetch Robot.
</description>
Expand Down
6 changes: 6 additions & 0 deletions fetch_ikfast_plugin/CHANGELOG.rst
Expand Up @@ -2,6 +2,12 @@
Changelog for package fetch_ikfast_plugin
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.8.3 (2021-03-06)
------------------
* Initial noetic release
* Updates maintainers
* Contributors: Alex Moriarty, Russell Toris

0.8.2 (2019-08-06)
------------------

Expand Down
2 changes: 1 addition & 1 deletion fetch_ikfast_plugin/package.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<package format="2">
<name>fetch_ikfast_plugin</name>
<version>0.8.2</version>
<version>0.8.3</version>
<description>
Kinematics plugin for Fetch robot, generated through IKFast
</description>
Expand Down
6 changes: 6 additions & 0 deletions fetch_maps/CHANGELOG.rst
Expand Up @@ -2,6 +2,12 @@
Changelog for package fetch_maps
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.8.3 (2021-03-06)
------------------
* Initial noetic release
* Updates maintainers
* Contributors: Alex Moriarty, Russell Toris

0.8.2 (2019-08-06)
------------------

Expand Down
2 changes: 1 addition & 1 deletion fetch_maps/package.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>fetch_maps</name>
<version>0.8.2</version>
<version>0.8.3</version>
<description>The fetch_maps package</description>

<author>Michael Ferguson</author>
Expand Down
9 changes: 9 additions & 0 deletions fetch_moveit_config/CHANGELOG.rst
Expand Up @@ -2,6 +2,15 @@
Changelog for package fetch_moveit_config
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.8.3 (2021-03-06)
------------------
* Initial noetic release
* Add srdf file path argument to move_group.launch
* Use xacro to load fetch.srdf
* Add srdf file path argument to move_group.launch
* Updates maintainers
* Contributors: Alex Moriarty, Carl Saldanha, Naoya Yamaguchi, Russell Toris

0.8.2 (2019-08-06)
------------------
* Fixed chomp configuration for porting to moveit melodic-devel (`#124 <https://github.com/fetchrobotics/fetch_ros/issues/124>`_)
Expand Down
5 changes: 4 additions & 1 deletion fetch_moveit_config/launch/move_group.launch
@@ -1,6 +1,9 @@
<launch>

<include file="$(find fetch_moveit_config)/launch/planning_context.launch" />
<arg name="srdf" default="$(find fetch_moveit_config)/config/fetch.srdf" />
<include file="$(find fetch_moveit_config)/launch/planning_context.launch" >
<arg name="srdf" value="$(arg srdf)" />
</include>

<!-- GDB Debug Option -->
<arg name="debug" default="false" />
Expand Down
7 changes: 5 additions & 2 deletions fetch_moveit_config/launch/planning_context.launch
Expand Up @@ -6,12 +6,15 @@
<!-- The name of the parameter under which the URDF is loaded -->
<arg name="robot_description" default="robot_description"/>

<!-- The path to srdf file -->
<arg name="srdf" default="$(find fetch_moveit_config)/config/fetch.srdf" />

<!-- Load universal robot description format (URDF) -->
<param if="$(arg load_robot_description)" name="$(arg robot_description)" textfile="$(find fetch_description)/robots/fetch.urdf"/>

<!-- The semantic description that corresponds to the URDF -->
<param name="$(arg robot_description)_semantic" textfile="$(find fetch_moveit_config)/config/fetch.srdf" />
<param name="$(arg robot_description)_semantic" command="$(find xacro)/xacro --inorder $(arg srdf)" />

<!-- Load updated joint limits (override information from URDF) -->
<group ns="$(arg robot_description)_planning">
<rosparam command="load" file="$(find fetch_moveit_config)/config/joint_limits.yaml"/>
Expand Down
2 changes: 1 addition & 1 deletion fetch_moveit_config/package.xml
Expand Up @@ -2,7 +2,7 @@
<package format="2">

<name>fetch_moveit_config</name>
<version>0.8.2</version>
<version>0.8.3</version>
<description>
An automatically generated package with all the configuration and launch files for using the fetch_urdf with the MoveIt Motion Planning Framework
</description>
Expand Down
10 changes: 10 additions & 0 deletions fetch_navigation/CHANGELOG.rst
Expand Up @@ -2,6 +2,16 @@
Changelog for package fetch_navigation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.8.3 (2021-03-06)
------------------
* Initial noetic release
* Add launch_map_server argument in fetch_nav.launch (`#147 <https://github.com/fetchrobotics/fetch_ros/issues/147>`_)
* Add use_map_topic arg in fetch_nav.launch (`#145 <https://github.com/fetchrobotics/fetch_ros/issues/145>`_)
* Update bias/scale params (`#141 <https://github.com/fetchrobotics/fetch_ros/issues/141>`_)
* Add topicname args to navigation launch (`#136 <https://github.com/fetchrobotics/fetch_ros/issues/136>`_)
* Updates maintainers
* Contributors: Alex Moriarty, Koki Shinjo, Michael Ferguson, Russell Toris, Shingo Kitagawa

0.8.2 (2019-08-06)
------------------

Expand Down
23 changes: 14 additions & 9 deletions fetch_navigation/launch/fetch_nav.launch
Expand Up @@ -6,6 +6,8 @@
<arg name="map_file" default="$(find fetch_maps)/maps/3_1_16_localization.yaml" />
<arg name="map_keepout_file" default="$(find fetch_maps)/maps/3_1_16_keepout.yaml" />
<arg name="use_keepout" default="false" />
<arg name="launch_map_server" default="true" />
<arg name="use_map_topic" default="false" />

<!-- Navigation parameter files -->
<arg name="move_base_include" default="$(find fetch_navigation)/launch/include/move_base.launch.xml" />
Expand All @@ -17,21 +19,24 @@
<arg name="cmd_vel_topic" default="cmd_vel" />
<arg name="odom_topic" default="odom" />

<!-- serve up a map -->
<node name="map_server" pkg="map_server" type="map_server" args="$(arg map_file)" />

<!-- serve up a map with keepout zones -->
<group if="$(arg use_keepout)" >
<node name="map_keepout_server" pkg="map_server" type="map_server" args="$(arg map_keepout_file)" >
<remap from="map" to="map_keepout" />
<remap from="static_map" to="static_map_keepout" />
</node>
<group if="$(arg launch_map_server)">
<!-- serve up a map -->
<node name="map_server" pkg="map_server" type="map_server" args="$(arg map_file)" />

<!-- serve up a map with keepout zones -->
<group if="$(arg use_keepout)" >
<node name="map_keepout_server" pkg="map_server" type="map_server" args="$(arg map_keepout_file)" >
<remap from="map" to="map_keepout" />
<remap from="static_map" to="static_map_keepout" />
</node>
</group>
</group>

<!-- localize the robot -->
<include file="$(arg amcl_include)" >
<arg name="scan_topic" value="$(arg scan_topic)" />
<arg name="map_topic" value="$(arg map_topic)" />
<arg name="use_map_topic" value="$(arg use_map_topic)" />
</include>

<!-- move the robot -->
Expand Down
2 changes: 1 addition & 1 deletion fetch_navigation/package.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>fetch_navigation</name>
<version>0.8.2</version>
<version>0.8.3</version>
<description>Configuration and launch files for running ROS navigation on Fetch.</description>

<author>Michael Ferguson</author>
Expand Down
6 changes: 6 additions & 0 deletions fetch_ros/CHANGELOG.rst
Expand Up @@ -2,6 +2,12 @@
Changelog for package fetch_ros
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.8.3 (2021-03-06)
------------------
* Initial noetic release
* Updates maintainers
* Contributors: Alex Moriarty, Russell Toris

0.8.2 (2019-08-06)
------------------

Expand Down
2 changes: 1 addition & 1 deletion fetch_ros/package.xml
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>fetch_ros</name>
<version>0.8.2</version>
<version>0.8.3</version>
<description>Fetch ROS, packages for working with Fetch and Freight</description>
<maintainer email="selliott@fetchrobotics.com">Sarah Elliott</maintainer>
<maintainer email="narora@fetchrobotics.com">Niharika Arora</maintainer>
Expand Down
11 changes: 11 additions & 0 deletions fetch_teleop/CHANGELOG.rst
Expand Up @@ -2,6 +2,17 @@
Changelog for package fetch_teleop
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.8.3 (2021-03-06)
------------------
* Initial noetic release
* Fix tuck arm moveit check [OPEN-48] (`#150 <https://github.com/fetchrobotics/fetch_ros/issues/150>`_)
* Tuck arm script: Add ground collision for melodic (`#130 <https://github.com/fetchrobotics/fetch_ros/issues/130>`_)
and (`#132 <https://github.com/fetchrobotics/fetch_ros/issues/132>`_)
* add ground as collision object
* use mesh for tuck arm collision
* Updates maintainers
* Contributors: Alex Moriarty, Jeff Wilson, Russell Toris, Shingo Kitagawa

0.8.2 (2019-08-06)
------------------
* Merge pull request `#118 <https://github.com/fetchrobotics/fetch_ros/issues/118>`_ from 708yamaguchi/add-teleop-rosparam-melodic
Expand Down
5 changes: 5 additions & 0 deletions fetch_teleop/CMakeLists.txt
Expand Up @@ -38,3 +38,8 @@ install(
PROGRAMS scripts/tuck_arm.py
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)

install(DIRECTORY mesh
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
USE_SOURCE_PERMISSIONS
)