yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup jsbsim run scripts (#15959)

Browse Source 
* Cleanup startup scripts

This commit cleansup the run script for the jsbsim_bridge

* Update jsbsim_bridge submodule
This commit is contained in:
JaeyoungLim
2020-10-14 16:41:11 +02:00
committed by GitHub
parent 6416abc817
commit 34ced0c26c
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/jsbsim_bridge

Submodule Tools/jsbsim_bridge updated: a14e6cc27f...7df4fd965e

4
Tools/setup_jsbsim.bash
View File

@@ -19,15 +19,12 @@ export FG_AIRCRAFT="${SRC_DIR}/Tools/jsbsim_bridge/models"
# Need more architectural discussions to make this more scalable # Need more architectural discussions to make this more scalable
case "$MODEL" in case "$MODEL" in
rascal) rascal)
AIRCRAFT_DIR="Rascal"
MODEL_NAME="Rascal110-JSBSim" MODEL_NAME="Rascal110-JSBSim"
;; ;;
quadrotor_x) quadrotor_x)
AIRCRAFT_DIR="quadrotor_x"
MODEL_NAME="quadrotor_x" MODEL_NAME="quadrotor_x"
;; ;;
hexarotor_x) hexarotor_x)
AIRCRAFT_DIR="hexarotor_x"
MODEL_NAME="hexarotor_x" MODEL_NAME="hexarotor_x"
;; ;;
*) *)
@@ -36,5 +33,4 @@ case "$MODEL" in
esac esac
export JSBSIM_AIRCRAFT_DIR="$AIRCRAFT_DIR"
export JSBSIM_AIRCRAFT_MODEL="$MODEL_NAME" export JSBSIM_AIRCRAFT_MODEL="$MODEL_NAME"

5
Tools/sitl_run.sh
View File

@@ -57,10 +57,11 @@ if [ "$program" == "jmavsim" ]; then
fi fi
if [ "$model" == "" ] || [ "$model" == "none" ]; then if [ "$model" == "" ] || [ "$model" == "none" ]; then
echo "empty model, setting iris as default"
if [ "$program" == "jsbsim" ]; then if [ "$program" == "jsbsim" ]; then
echo "empty model, setting rascal as default for jsbsim"
model="rascal" model="rascal"
else else
echo "empty model, setting iris as default"
model="iris" model="iris"
fi fi
fi fi
@@ -163,7 +164,7 @@ elif [ "$program" == "jsbsim" ] && [ -z "$no_sim" ]; then
--disable-ai-models &> /dev/null & --disable-ai-models &> /dev/null &
FGFS_PID=$! FGFS_PID=$!
fi fi
"${build_path}/build_jsbsim_bridge/jsbsim_bridge" "models/${JSBSIM_AIRCRAFT_DIR}" $JSBSIM_AIRCRAFT_MODEL ${model} "${src_path}/Tools/jsbsim_bridge/scene/${world}.xml" $HEADLESS 2> /dev/null & "${build_path}/build_jsbsim_bridge/jsbsim_bridge" ${model} -s "${src_path}/Tools/jsbsim_bridge/scene/${world}.xml" 2> /dev/null &
JSBSIM_PID=$! JSBSIM_PID=$!
fi fi