dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

jMAVSim: update submodule, use -lockstep CLI arg 

This updates the jMAVSim submodule which includes a fix for HITL.
In order to fix HITL, a CLI argument `-lockstep` was required to enable
lockstep. This has now been added to the command in jmavsim_run.sh.
This commit is contained in:
Julian Oes 2019-02-18 15:44:05 +01:00 committed by Lorenz Meier
parent d6dc5a7302
commit 18f7ee2d50
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/jMAVSim

@ -1 +1 @@
Subproject commit 00bdf6d92b6a8678f5b683a3ebca9e52e88cb5ce
Subproject commit 0c25b7c18990a64fc851cfd7fe3aac9a4060aea3

4
Tools/jmavsim_run.sh
View File

@ -61,11 +61,11 @@ fi
ant create_run_jar copy_res
cd out/production
java -XX:GCTimeRatio=20 -Djava.ext.dirs= -jar jmavsim_run.jar $device $extra_args
java -XX:GCTimeRatio=20 -Djava.ext.dirs= -jar jmavsim_run.jar -lockstep $device $extra_args
ret=$?
if [ $ret -ne 0 -a $ret -ne 130 ]; then # 130 is Ctrl-C
# if the start of java fails, it's probably because the GC option is not
# understood. Try starting without it
java -Djava.ext.dirs= -jar jmavsim_run.jar $device $extra_args
java -Djava.ext.dirs= -jar jmavsim_run.jar -lockstep $device $extra_args
fi