From b61e95adfd901196f0cd40c90e26cecbc2635770 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sat, 17 Oct 2015 17:41:57 +0200 Subject: [PATCH] Automate SITL run --- Makefile | 6 +++--- Tools/sitl_run.sh | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bb5d915f7c..635b0c3e9f 100644 --- a/Makefile +++ b/Makefile @@ -130,7 +130,7 @@ posix: posix_sitl_simple ros: ros_sitl_simple run_sitl_quad: posix - Tools/sitl_run.sh posix-configs/SITL/init/rcS + Tools/sitl_run.sh posix-configs/SITL/init/rcS none jmavsim run_sitl_iris: posix Tools/sitl_run.sh posix-configs/SITL/init/rcS_iris_gazebo @@ -142,7 +142,7 @@ run_sitl_ros: posix Tools/sitl_run.sh posix-configs/SITL/init/rc_iris_ros lldb_sitl_quad: posix - Tools/sitl_run.sh posix-configs/SITL/init/rcS lldb + Tools/sitl_run.sh posix-configs/SITL/init/rcS lldb jmavsim lldb_sitl_plane: posix Tools/sitl_run.sh posix-configs/SITL/init/rc.fixed_wing lldb @@ -151,7 +151,7 @@ lldb_sitl_ros: posix Tools/sitl_run.sh posix-configs/SITL/init/rc_iris_ros lldb gdb_sitl_quad: posix - Tools/sitl_run.sh posix-configs/SITL/init/rcS gdb + Tools/sitl_run.sh posix-configs/SITL/init/rcS gdb jmavsim gdb_sitl_plane: posix Tools/sitl_run.sh posix-configs/SITL/init/rc.fixed_wing lldb diff --git a/Tools/sitl_run.sh b/Tools/sitl_run.sh index 1a7741d6fd..1d80464fad 100755 --- a/Tools/sitl_run.sh +++ b/Tools/sitl_run.sh @@ -1,10 +1,18 @@ #!/bin/bash cp Tools/posix_lldbinit build_posix_sitl_simple/src/firmware/posix/.lldbinit cp Tools/posix.gdbinit build_posix_sitl_simple/src/firmware/posix/.gdbinit +if [ "$3" == "jmavsim" ] +then + cd Tools/jMAVSim + ant + java -Djava.ext.dirs= -cp lib/*:out/production/jmavsim.jar me.drton.jmavsim.Simulator -udp 127.0.0.1:14560 & + cd ../.. +fi cd build_posix_sitl_simple/src/firmware/posix mkdir -p rootfs/fs/microsd mkdir -p rootfs/eeprom touch rootfs/eeprom/parameters +# Start Java simulator if [ "$2" == "lldb" ] then lldb -- mainapp ../../../../$1