wassname/kair_algorithms_draft
1
0
Fork 0
mirror of https://github.com/wassname/kair_algorithms_draft.git synced 2026-09-09 11:25:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feat/demo_refactoring

Browse Source
This commit is contained in:
Whi Kwon
2019-07-19 23:13:53 +09:00
committed by GitHub
parent 4856da56c0 61471fdf9c
commit 2127ec5330
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+2 -2
View File
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get -y upgrade && apt-get -y install git wget vim
# install ROS
RUN sh -c 'echo "deb http://packages.ros.org/ros/ubuntu xenial main" > /etc/apt/sources.list.d/ros-latest.list'
RUN sudo -E apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
RUN apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
RUN apt-get update -y && apt-get upgrade -y
RUN apt-get install -y ros-${ROS_DISTRO}-desktop-full ros-${ROS_DISTRO}-rqt-*
RUN rosdep init && rosdep update
@@ -49,7 +49,7 @@ RUN apt-get update && apt-get install -y python3-opengl zlib1g-dev libjpeg-dev p
cmake swig libboost-all-dev libsdl2-dev libosmesa6-dev xvfb ffmpeg
# install repository requirements
RUN apt-get remove -y python-psutil
RUN dpkg -P --force-all python-psutil python-enum34 python-yaml
RUN cd src/kair_algorithms_draft/scripts && python2.7 -m pip install -r requirements.txt
RUN python2.7 -m pip install gym['Box2d']
launch/open_manipulator_env.launch
+3 -3
View File
@@ -8,9 +8,9 @@
<arg name="debug" default="false"/>
<!-- robot URDF parse args -->
<arg name="om_urdf" value="robot_description"/>
<arg name="open_manipulator_urdf" value="robot_description"/>
<arg name="urdf_param" default="/robot_description"/>
<param name="$(arg om_urdf)" textfile="$(find kair_algorithms)/urdf/open_manipulator.urdf"/>
<param name="$(arg open_manipulator_urdf)" textfile="$(find kair_algorithms)/urdf/open_manipulator.urdf"/>
<arg name="load_robot_description" default="false"/>
<!-- gazebo related -->
@@ -25,7 +25,7 @@
</include>
<!--KDL chain related args-->
<param if="$(arg load_robot_description)" name="$(arg urdf_param)" command="$(find xacro)/xacro --inorder $(find kair_algorithms)/urdf/om.urdf"/>
<param if="$(arg load_robot_description)" name="$(arg urdf_param)" command="$(find xacro)/xacro --inorder $(find kair_algorithms)/urdf/open_manipulator.urdf"/>
<!-- Load the URDF into the ROS Parameter Server -->
<param name="robot_description"