Browse Source

ROMFS/Tools: switch to TCP connection for SITL

This switches from UDP to TCP to connect to jMAVSim.
sbg
Julian Oes 6 years ago
parent
commit
b436f3dd56
  1. 4
      ROMFS/px4fmu_common/init.d-posix/rcS
  2. 6
      Tools/jmavsim_run.sh

4
ROMFS/px4fmu_common/init.d-posix/rcS

@ -82,7 +82,7 @@ fi
# multi-instance setup # multi-instance setup
# shellcheck disable=SC2154 # shellcheck disable=SC2154
param set MAV_SYS_ID $((px4_instance+1)) param set MAV_SYS_ID $((px4_instance+1))
simulator_udp_port=$((14560+px4_instance)) simulator_tcp_port=$((4560+px4_instance))
udp_offboard_port_local=$((14580+px4_instance)) udp_offboard_port_local=$((14580+px4_instance))
udp_offboard_port_remote=$((14540+px4_instance)) udp_offboard_port_remote=$((14540+px4_instance))
udp_gcs_port_local=$((14570+px4_instance)) udp_gcs_port_local=$((14570+px4_instance))
@ -182,7 +182,7 @@ sh "$autostart_file"
dataman start dataman start
replay tryapplyparams replay tryapplyparams
simulator start -s -u $simulator_udp_port simulator start -s -t $simulator_tcp_port
tone_alarm start tone_alarm start
gyrosim start gyrosim start
accelsim start accelsim start

6
Tools/jmavsim_run.sh

@ -5,7 +5,7 @@ set -e
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd "$SCRIPT_DIR/jMAVSim" cd "$SCRIPT_DIR/jMAVSim"
udp_port=14560 tcp_port=4560
extra_args= extra_args=
baudrate=921600 baudrate=921600
device= device=
@ -22,7 +22,7 @@ while getopts ":b:d:p:qr:f:i:" opt; do
ip="$OPTARG" ip="$OPTARG"
;; ;;
p) p)
udp_port=$OPTARG tcp_port=$OPTARG
;; ;;
q) q)
extra_args="$extra_args -qgc" extra_args="$extra_args -qgc"
@ -41,7 +41,7 @@ while getopts ":b:d:p:qr:f:i:" opt; do
done done
if [ "$device" == "" ]; then if [ "$device" == "" ]; then
device="-udp $ip:$udp_port" device="-tcp $ip:$tcp_port"
else else
device="-serial $device $baudrate" device="-serial $device $baudrate"
fi fi

Loading…
Cancel
Save