changed simuation scripts

Hymilex · Mar 15, 2021 · 9b12d64 · 9b12d64
1 parent a117599
commit 9b12d64
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/build_all.sh b/build_all.sh
@@ -1,3 +1,3 @@
 # A simple and naive BVT :)
 
-cd algorithms&&source devel/setup.bash&&catkin build && cd ../simulation&&source ./devel/setup.bash&&catkin build
+cd algorithms&&source devel/setup.bash&&catkin_make && cd ../simulation&&source ./devel/setup.bash&&catkin_make
diff --git a/simulation/scripts/prepare_simulation.sh b/simulation/scripts/prepare_simulation.sh
@@ -4,7 +4,11 @@ export GAZEBO_PLUGIN_PATH=${GAZEBO_PLUGIN_PATH}:${PX4_ENV_PATH}/devel/lib/
 export LAUNCH_FILE="mavros_posix_sitl.launch"
 #export LAUNCH_FILE="posix_sitl.launch"
 export DRONE_ITEM="iris_stereo_rgb_lidar_gps"  # can be "iris" "iris_stereo_rgb_gps" "iris_stereo_gray_gps".
-export WORLD_ITEM=$PX4_ENV_PATH$SF/Tools/sitl_gazebo/worlds/obstacle_avoidance.world
+#export DRONE_ITEM="rover"
+#export WORLD_ITEM=$PX4_ENV_PATH$SF/Tools/sitl_gazebo/worlds/obstacle_avoidance.world
+export WORLD_ITEM=$PX4_ENV_PATH$SF/Tools/sitl_gazebo/worlds/obstacle_avoidance_without_iris.world
+#export WORLD_ITEM=$PX4_ENV_PATH$SF/Tools/sitl_gazebo/worlds/park_large.world
+#export WORLD_ITEM=$PX4_ENV_PATH$SF/Tools/sitl_gazebo/worlds/park_large_without_iris.world
 #To use iris_vision, you need to copy files from GAAS. See Readme.md.
 
 echo "COMMAND: roslaunch px4 $LAUNCH_FILE vehicle:=$DRONE_ITEM"