diff options
| -rwxr-xr-x | Tools/ros/px4_ros_installation_ubuntu.sh | 18 | ||||
| -rwxr-xr-x | Tools/ros/px4_workspace_setup.sh | 2 |
2 files changed, 12 insertions, 8 deletions
diff --git a/Tools/ros/px4_ros_installation_ubuntu.sh b/Tools/ros/px4_ros_installation_ubuntu.sh index 80f684590..5bca6dfc4 100755 --- a/Tools/ros/px4_ros_installation_ubuntu.sh +++ b/Tools/ros/px4_ros_installation_ubuntu.sh @@ -2,17 +2,15 @@ # main ROS Setup # following http://wiki.ros.org/indigo/Installation/Ubuntu -# also adding dependencies for gazebo http://gazebosim.org/tutorials?tut=drcsim_install +# also adding drcsim http://gazebosim.org/tutorials?tut=drcsim_install # run this file with . ./px4_ros_setup_ubuntu.sh ## add ROS repository sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu trusty main" > /etc/apt/sources.list.d/ros-latest.list' -sudo sh -c 'echo "deb http://packages.osrfoundation.org/drc/ubuntu trusty main" > /etc/apt/sources.list.d/drc-latest.list' ## add key wget https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -O - | \ sudo apt-key add - -wget http://packages.osrfoundation.org/drc.key -O - | sudo apt-key add - ## Install main ROS pacakges sudo apt-get update @@ -22,12 +20,20 @@ rosdep update ## Setup environment variables echo "source /opt/ros/indigo/setup.bash" >> ~/.bashrc -source ~/.bashrc +. ~/.bashrc # get rosinstall sudo apt-get install python-rosinstall -# additional dependencies necessary +# additional dependencies sudo apt-get install ros-indigo-octomap-msgs -sudo apt-get install drcsim +## drcsim setup (for models) +### add osrf repository +sudo sh -c 'echo "deb http://packages.osrfoundation.org/drc/ubuntu trusty main" > /etc/apt/sources.list.d/drc-latest.list' + +### add key +wget http://packages.osrfoundation.org/drc.key -O - | sudo apt-key add - + +### install drcsim +sudo apt-get install drcsim diff --git a/Tools/ros/px4_workspace_setup.sh b/Tools/ros/px4_workspace_setup.sh index 8c50579b6..1675e54f3 100755 --- a/Tools/ros/px4_workspace_setup.sh +++ b/Tools/ros/px4_workspace_setup.sh @@ -25,8 +25,6 @@ git clone https://github.com/ethz-asl/glog_catkin.git git clone https://github.com/catkin/catkin_simple.git # drcsim (for scenery and models) -hg clone https://bitbucket.org/osrf/osrf-common -hg clone https://bitbucket.org/osrf/sandia-hand cd .. |