Skip to content

Commit 6376538

Browse files
author
Bruno Brito
committed
planar joint plugin
1 parent 1346ef7 commit 6376538

15 files changed

+2644
-0
lines changed

‎.docker/ci-shadow-fixed/Dockerfile.orig

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<<<<<<< HEAD
2+
# moveit/moveit:kinetic-ci-shadow-fixed
3+
# Sets up a base image to use for running Continuous Integration on Travis
4+
5+
FROM ros:kinetic-ros-base
6+
=======
7+
# moveit/moveit:indigo-ci-shadow-fixed
8+
# Sets up a base image to use for running Continuous Integration on Travis
9+
10+
FROM moveit/moveit:indigo-ci
11+
>>>>>>> 3ac54de0f712315bc8f1603056d54c43886987ca
12+
MAINTAINER Dave Coleman dave@dav.ee
13+
14+
ENV TERM xterm
15+
16+
# Setup catkin workspace
17+
ENV CATKIN_WS=/root/ws_moveit
18+
RUN mkdir -p $CATKIN_WS/src
19+
WORKDIR $CATKIN_WS/src
20+
21+
# Commands are combined in single RUN statement with "apt/lists" folder removal to reduce image size
22+
<<<<<<< HEAD
23+
RUN wstool init . && \
24+
# Download moveit source so that we can get necessary dependencies
25+
wstool merge https://raw.githubusercontent.com/ros-planning/moveit/${ROS_DISTRO}-devel/moveit.rosinstall && \
26+
wstool update && \
27+
# Switch to shadow-fixed
28+
echo "deb http://packages.ros.org/ros-shadow-fixed/ubuntu `lsb_release -cs` main" | tee /etc/apt/sources.list.d/ros-latest.list && \
29+
# Update apt-get because previous images clear this cache
30+
apt-get -qq update && \
31+
# Temp hack, see https://github.com/ros/ros_comm/issues/904
32+
apt-get -qq remove -y ros-${ROS_DISTRO}-rostest && \
33+
# Do a dist-upgrade to ensure our CI is building on top of the latest version of packages
34+
apt-get -qq dist-upgrade && \
35+
# Install some base dependencies
36+
apt-get -qq install -y \
37+
# Some source builds require a package.xml be downloaded via wget from an external location
38+
wget \
39+
# Required for rosdep command
40+
sudo \
41+
# Required for installing dependencies
42+
python-rosdep \
43+
# Preferred build tool
44+
python-catkin-tools && \
45+
# Download all dependencies of MoveIt!
46+
rosdep update && \
47+
rosdep install -y --from-paths . --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
48+
# Remove the source code from this container. TODO: in the future we may want to keep this here for further optimization of later containers
49+
cd .. && \
50+
rm -rf src/ && \
51+
=======
52+
# Switch to shadow-fixed
53+
RUN echo "deb http://packages.ros.org/ros-shadow-fixed/ubuntu `lsb_release -cs` main" | tee /etc/apt/sources.list.d/ros-latest.list && \
54+
# Update apt-get because previous images clear this cache
55+
apt-get -qq update && \
56+
# Do a dist-upgrade to ensure our CI is building on top of the latest version of packages
57+
apt-get -qq dist-upgrade && \
58+
>>>>>>> 3ac54de0f712315bc8f1603056d54c43886987ca
59+
# Clear apt-cache to reduce image size
60+
rm -rf /var/lib/apt/lists/*
61+
62+
# Continous Integration Setting
63+
ENV IN_DOCKER 1

‎.docker/ci/Dockerfile.orig

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<<<<<<< HEAD
2+
# moveit/moveit:kinetic-ci
3+
# Sets up a base image to use for running Continuous Integration on Travis
4+
5+
FROM ros:kinetic-ros-base
6+
=======
7+
# moveit/moveit:indigo-ci
8+
# Sets up a base image to use for running Continuous Integration on Travis
9+
10+
FROM ros:indigo-ros-base
11+
>>>>>>> 3ac54de0f712315bc8f1603056d54c43886987ca
12+
MAINTAINER Dave Coleman dave@dav.ee
13+
14+
ENV TERM xterm
15+
16+
# Setup catkin workspace
17+
ENV CATKIN_WS=/root/ws_moveit
18+
RUN mkdir -p $CATKIN_WS/src
19+
WORKDIR $CATKIN_WS/src
20+
21+
# Commands are combined in single RUN statement with "apt/lists" folder removal to reduce image size
22+
RUN wstool init . && \
23+
# Download moveit source so that we can get necessary dependencies
24+
wstool merge https://raw.githubusercontent.com/ros-planning/moveit/${ROS_DISTRO}-devel/moveit.rosinstall && \
25+
wstool update && \
26+
# Update apt-get because previous images clear this cache
27+
apt-get -qq update && \
28+
# Install some base dependencies
29+
apt-get -qq install -y \
30+
<<<<<<< HEAD
31+
# Some source builds require a package.xml be downloaded via wget from an external location
32+
wget \
33+
=======
34+
>>>>>>> 3ac54de0f712315bc8f1603056d54c43886987ca
35+
# Required for rosdep command
36+
sudo \
37+
# Required for installing dependencies
38+
python-rosdep \
39+
# Preferred build tool
40+
<<<<<<< HEAD
41+
python-catkin-tools && \
42+
=======
43+
python-catkin-tools \
44+
# Not sure if necessary:
45+
ros-$ROS_DISTRO-rosbash \
46+
ros-$ROS_DISTRO-rospack && \
47+
>>>>>>> 3ac54de0f712315bc8f1603056d54c43886987ca
48+
# Download all dependencies of MoveIt!
49+
rosdep update && \
50+
rosdep install -y --from-paths . --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
51+
# Remove the source code from this container. TODO: in the future we may want to keep this here for further optimization of later containers
52+
cd .. && \
53+
rm -rf src/ && \
54+
# Clear apt-cache to reduce image size
55+
rm -rf /var/lib/apt/lists/*
56+
57+
# Continous Integration Setting
58+
ENV IN_DOCKER 1

‎.docker/release/Dockerfile.orig

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<<<<<<< HEAD
2+
# moveit/moveit:kinetic-release
3+
# Full debian-based install of MoveIt! using apt-get
4+
5+
FROM moveit/moveit:kinetic-ci
6+
=======
7+
# moveit/moveit:indigo-release
8+
# Full debian-based install of MoveIt! using apt-get
9+
10+
FROM moveit/moveit:indigo-ci
11+
>>>>>>> 3ac54de0f712315bc8f1603056d54c43886987ca
12+
MAINTAINER Dave Coleman dave@dav.ee
13+
14+
# Commands are combined in single RUN statement with "lists" folder removal to reduce image size
15+
RUN apt-get update && \
16+
apt-get install -y \
17+
ros-${ROS_DISTRO}-moveit-* && \
18+
rm -rf /var/lib/apt/lists/*

‎.docker/source/Dockerfile.orig

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<<<<<<< HEAD
2+
# moveit/moveit:kinetic-source
3+
# Downloads the moveit source code, install remaining debian dependencies, and builds workspace
4+
5+
FROM moveit/moveit:kinetic-ci-shadow-fixed
6+
=======
7+
# moveit/moveit:indigo-source
8+
# Downloads the moveit source code, install remaining debian dependencies, and builds workspace
9+
10+
FROM moveit/moveit:indigo-ci
11+
>>>>>>> 3ac54de0f712315bc8f1603056d54c43886987ca
12+
MAINTAINER Dave Coleman dave@dav.ee
13+
14+
ENV CATKIN_WS=/root/ws_moveit
15+
RUN mkdir -p $CATKIN_WS/src
16+
WORKDIR $CATKIN_WS/src
17+
18+
# Download moveit source
19+
RUN wstool init . && \
20+
wstool merge https://raw.githubusercontent.com/ros-planning/moveit/${ROS_DISTRO}-devel/moveit.rosinstall && \
21+
wstool update
22+
23+
# Update apt-get because osrf image clears this cache. download deps
24+
<<<<<<< HEAD
25+
# Note that because we're building on top of kinetic-ci, there should not be any deps installed
26+
=======
27+
# Note that because we're building on top of indigo-ci, there should not be any deps installed
28+
>>>>>>> 3ac54de0f712315bc8f1603056d54c43886987ca
29+
# unless something has changed in the source code since the other container was made
30+
# (they are triggered together so should only be one-build out of sync)
31+
RUN apt-get -qq update && \
32+
apt-get -qq install -y \
33+
wget && \
34+
rosdep update && \
35+
rosdep install -y --from-paths . --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false && \
36+
rm -rf /var/lib/apt/lists/*
37+
38+
# Replacing shell with bash for later docker build commands
39+
RUN mv /bin/sh /bin/sh-old && \
40+
ln -s /bin/bash /bin/sh
41+
42+
# Build repo
43+
WORKDIR $CATKIN_WS
44+
ENV TERM xterm
45+
ENV PYTHONIOENCODING UTF-8
46+
<<<<<<< HEAD
47+
RUN catkin config --extend /opt/ros/$ROS_DISTRO --install --cmake-args -DCMAKE_BUILD_TYPE=Release && \
48+
# Status rate is limited so that just enough info is shown to keep Docker from timing out, but not too much
49+
# such that the Docker log gets too long (another form of timeout)
50+
catkin build --jobs 1 --limit-status-rate 0.001 --no-notify
51+
=======
52+
RUN source /ros_entrypoint.sh && \
53+
catkin build --no-status
54+
>>>>>>> 3ac54de0f712315bc8f1603056d54c43886987ca

‎moveit/CHANGELOG.rst.orig

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package moveit
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
<<<<<<< HEAD
6+
0.9.4 (2017-02-06)
7+
------------------
8+
9+
0.9.3 (2016-11-16)
10+
------------------
11+
* [maintenance] Updated package.xml maintainers and author emails `#330 <https://github.com/ros-planning/moveit/issues/330>`_
12+
* Contributors: Dave Coleman, Ian McMahon
13+
14+
0.9.2 (2016-11-05)
15+
------------------
16+
17+
0.9.0 (2016-10-19)
18+
------------------
19+
* Initial release into ROS Kinetic
20+
=======
21+
0.7.7 (2017-02-06)
22+
------------------
23+
24+
0.7.6 (2016-12-30)
25+
------------------
26+
* [fix][Indigo] re-enable support for cmake 2.8.11 `#391 <https://github.com/ros-planning/moveit/pull/391>`_
27+
* Contributors: Michael Goerner
28+
29+
0.7.5 (2016-12-25)
30+
------------------
31+
32+
0.7.4 (2016-12-22)
33+
------------------
34+
* [indigo][changelog] Remove wrong version entries (see https://github.com/ros-planning/moveit/issues/386#issuecomment-268689110).
35+
* Contributors: Isaac I.Y. Saito
36+
37+
0.7.3 (2016-12-20)
38+
------------------
39+
* [ROS Indigo] Initial release from `ros-planning/moveit <https://github.com/ros-planning/moveit>`_ repository.
40+
* Contributors: Isaac I.Y. Saito
41+
>>>>>>> 3ac54de0f712315bc8f1603056d54c43886987ca

‎moveit_commander/CHANGELOG.rst.orig

+114
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package moveit_commander
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
<<<<<<< HEAD
6+
0.9.4 (2017-02-06)
7+
------------------
8+
* [fix] issue `#373 <https://github.com/ros-planning/moveit/issues/373>`_ for Kinetic (`#377 <https://github.com/ros-planning/moveit/issues/377>`_) (`#385 <https://github.com/ros-planning/moveit/issues/385>`_)
9+
* [fix] typo in moveit_commander (`#376 <https://github.com/ros-planning/moveit/issues/376>`_)
10+
* Contributors: Dave Coleman, Shingo Kitagawa
11+
12+
0.9.3 (2016-11-16)
13+
------------------
14+
* [maintenance] Updated package.xml maintainers and author emails `#330 <https://github.com/ros-planning/moveit/issues/330>`_
15+
* Contributors: Dave Coleman, Ian McMahon
16+
17+
0.9.2 (2016-11-05)
18+
=======
19+
0.7.7 (2017-02-06)
20+
------------------
21+
22+
0.7.6 (2016-12-30)
23+
------------------
24+
25+
0.7.5 (2016-12-25)
26+
------------------
27+
28+
0.7.4 (2016-12-22)
29+
------------------
30+
31+
0.7.3 (2016-12-20)
32+
>>>>>>> 3ac54de0f712315bc8f1603056d54c43886987ca
33+
------------------
34+
35+
0.6.1 (2016-04-28)
36+
------------------
37+
* [feat] Add the possibility to choose description file `#43 <https://github.com/ros-planning/moveit_commander/issues/43>`_
38+
* [improve] support pyassimp 3.2. Looks like they changed their import path. robot_description should not be hardcoded to allow changing the name of the description file. This is usefull when working with several robots that do not share the same description file. `#45 <https://github.com/ros-planning/moveit_commander/issues/45>`_
39+
* [improve] add queue_size option in planning_scene_interface.py `#41 <https://github.com/ros-planning/moveit_commander/issues/41>`_
40+
* Contributors: Dave Coleman, Isaac I.Y. Saito, Kei Okada, Michael Görner, buschbapti
41+
42+
0.6.0 (2016-01-30)
43+
------------------
44+
* Merge pull request #38 from 130s/doc/python_if
45+
[RobotCommander] Fill in in-code document where missing.
46+
* [moveit_commander/robot.py] Code cleaning; semi-PEP8.
47+
* Merge pull request #35 from MichaelStevens/set_num_planning_attempts
48+
adding set_num_planning_attempts to commander interface
49+
* Merge pull request #30 from ymollard/indigo-devel
50+
Planning scene improvements + added python wrapper for MoveGroup.asyncExecute()
51+
* Added python wrapper for MoveGroup.asyncExecute()
52+
* Allow to clean all objects in a row
53+
* Allow to attash an existing object without recreating the whole CollisionObject
54+
* Merge pull request #24 from ymollard/hydro-devel
55+
Allowed user to change the scale of a mesh
56+
* Merge pull request #23 from HumaRobotics/hydro-devel
57+
Fixed arguments removal in python roscpp_initializer
58+
* Merge pull request #26 from corot/hydro-devel
59+
Add missing variants of place (PlaceLocation, place anywhere)
60+
* Added a way to change the size of a mesh when grasping
61+
* Allowed user to change the scale of a mesh
62+
* Fixed arguments removal in python roscpp_initializer
63+
* Contributors: Dave Coleman, Ioan A Sucan, Isaac I.Y. Saito, Michael Stevens, Philippe Capdepuy, Yoan Mollard, corot
64+
65+
0.5.7 (2014-07-05)
66+
------------------
67+
* Merge pull request `#21 <https://github.com/ros-planning/moveit_commander/issues/21>` from pirobot/hydro-devel
68+
Added set_support_surface_name function to move_group.py
69+
* Added set_support_surface_name function to move_group.py
70+
* Contributors: Patrick Goebel, Sachin Chitta
71+
72+
0.5.6 (2014-03-24)
73+
------------------
74+
* Added the calls necessary to manage path constraints.
75+
* fix joint and link acces on __getattr__ when trying to acces a joint and its paramaters throught
76+
* Contributors: Acorn, Emili Boronat, Sachin Chitta
77+
78+
0.5.5 (2014-02-27)
79+
------------------
80+
* adding get for active joints
81+
* Contributors: Acorn, Sachin Chitta
82+
83+
0.5.4 (2014-02-06)
84+
------------------
85+
86+
* Install moveit_commander_cmdline.py into package specific directory, not to global bin.
87+
* Fix typos in comments
88+
89+
0.5.3 (2014-01-03)
90+
------------------
91+
* work around name bug
92+
move group interface python programs cannot be launched from launch files if
93+
the __name:= argument is used. This works around the problem and allows using
94+
launch files to launch python moveit programs.
95+
* Added Travis Continuous Integration
96+
97+
0.5.2 (2013-09-23)
98+
------------------
99+
* add support for setting joint targets from approximate IK
100+
* no longer depend on manipulation_msgs
101+
* expand functionality of MoveGroupInterface
102+
103+
0.5.1 (2013-08-13)
104+
------------------
105+
* make pick() more general
106+
* use msg serialization
107+
* use new attach / detach operations
108+
* fix header for demo code
109+
* Duration class bug fixed in commander conversion.
110+
111+
0.5.0 (2013-07-18)
112+
------------------
113+
* move msgs to common_msgs
114+
* fixed ground command

‎moveit_commander/package.xml.orig

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<package>
2+
<name>moveit_commander</name>
3+
<<<<<<< HEAD
4+
<version>0.9.4</version>
5+
=======
6+
<version>0.7.7</version>
7+
>>>>>>> 3ac54de0f712315bc8f1603056d54c43886987ca
8+
<description>Python interfaces to MoveIt</description>
9+
10+
<author email="isucan@google.com">Ioan Sucan</author>
11+
12+
<maintainer email="me@v4hn.de">Michael Görner</maintainer>
13+
<maintainer email="rhaschke@techfak.uni-bielefeld.de">Robert Haschke</maintainer>
14+
15+
<license>BSD</license>
16+
17+
<url type="website">http://moveit.ros.org</url>
18+
<url type="bugtracker">https://github.com/ros-planning/moveit/issues</url>
19+
<url type="repository">https://github.com/ros-planning/moveit</url>
20+
21+
<buildtool_depend>catkin</buildtool_depend>
22+
<buildtool_depend>python-catkin-pkg</buildtool_depend>
23+
24+
<build_depend>python</build_depend>
25+
26+
<run_depend>geometry_msgs</run_depend>
27+
<run_depend>moveit_msgs</run_depend>
28+
<run_depend>moveit_ros_planning_interface</run_depend>
29+
<run_depend>python</run_depend>
30+
<run_depend>python-pyassimp</run_depend>
31+
<run_depend>rospy</run_depend>
32+
<run_depend>sensor_msgs</run_depend>
33+
<run_depend>shape_msgs</run_depend>
34+
<run_depend>tf</run_depend>
35+
</package>

0 commit comments

Comments
 (0)