Support runs without simulation

This commit is contained in:
Lorenz Meier
2015-10-30 16:33:19 +01:00
parent c912be70d1
commit 3d13e771a8
+2 -2
View File
@@ -42,13 +42,13 @@ cp Tools/posix.gdbinit $build_path/src/firmware/posix/.gdbinit
SIM_PID=0 SIM_PID=0
if [ "$program" == "jmavsim" ] if [ "$program" == "jmavsim" ] && [ "$no_sim" == "" ]
then then
cd Tools/jMAVSim cd Tools/jMAVSim
ant ant
java -Djava.ext.dirs= -cp lib/*:out/production/jmavsim.jar me.drton.jmavsim.Simulator -udp 127.0.0.1:14560 & java -Djava.ext.dirs= -cp lib/*:out/production/jmavsim.jar me.drton.jmavsim.Simulator -udp 127.0.0.1:14560 &
SIM_PID=`echo $!` SIM_PID=`echo $!`
elif [ "$3" == "gazebo" ] elif [ "$3" == "gazebo" ] && [ "$no_sim" == "" ]
then then
if [ -x "$(command -v gazebo)" ] if [ -x "$(command -v gazebo)" ]
then then