aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-01-22 12:13:41 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-01-22 12:13:41 +0100
commit296e6e29d7a94a50e890dbdfaeed9dcf39a54551 (patch)
tree86fa6e3a721ec4e25ed31951f033a95fda16d551
parent1628999361f5bd939ffd6312cae1d9e67698f3d4 (diff)
downloadpx4-firmware-ros_drcfromsource.tar.gz
px4-firmware-ros_drcfromsource.tar.bz2
px4-firmware-ros_drcfromsource.zip
simulator setup script: install drcsim from sourceros_drcfromsource
-rwxr-xr-xTools/ros/px4_ros_installation_ubuntu.sh11
-rwxr-xr-xTools/ros/px4_workspace_setup.sh3
2 files changed, 3 insertions, 11 deletions
diff --git a/Tools/ros/px4_ros_installation_ubuntu.sh b/Tools/ros/px4_ros_installation_ubuntu.sh
index 72b4f9468..01801c81a 100755
--- a/Tools/ros/px4_ros_installation_ubuntu.sh
+++ b/Tools/ros/px4_ros_installation_ubuntu.sh
@@ -27,14 +27,3 @@ sudo apt-get -y install python-rosinstall
# additional dependencies
sudo apt-get -y install ros-indigo-octomap-msgs
-
-## 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 update
-sudo apt-get -y install drcsim
diff --git a/Tools/ros/px4_workspace_setup.sh b/Tools/ros/px4_workspace_setup.sh
index 1675e54f3..808ea277f 100755
--- a/Tools/ros/px4_workspace_setup.sh
+++ b/Tools/ros/px4_workspace_setup.sh
@@ -25,6 +25,9 @@ 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
+hg clone https://bitbucket.org/osrf/drcsim
cd ..