From 302cd47b441e129878d71ef8a99ad4a156396f54 Mon Sep 17 00:00:00 2001 From: Ram Date: Wed, 29 Jan 2025 19:47:56 +0530 Subject: [PATCH] Ability to switch between GS and Air MSPOSD --- general/package/datalink/files/telemetry | 3 +++ general/package/datalink/files/telemetry_drone.conf | 2 +- general/package/wifibroadcast-ng/files/wifibroadcast | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/general/package/datalink/files/telemetry b/general/package/datalink/files/telemetry index 7479eeee..d7a88d5a 100755 --- a/general/package/datalink/files/telemetry +++ b/general/package/datalink/files/telemetry @@ -44,6 +44,9 @@ case "$1" in if [ "$router" -eq 2 ]; then msposd --channels "$channels" --master "$serial" --baudrate "$baud" \ --out 127.0.0.1:$(($port_tx + 1)) -osd -r "$fps" --ahi "$ahi" > /dev/null & + elif [ "$router" -eq 3 ]; then + msposd --channels "$channels" --master "$serial" --baudrate "$baud" \ + --out 10.5.0.1:$(($port_tx + 1)) -r "$fps" --ahi "$ahi" > /dev/null & else mavfwd --channels "$channels" --master "$serial" --baudrate "$baud" -p 100 -t -a "$aggregate" \ --out 127.0.0.1:$port_tx --in 127.0.0.1:$port_rx > /dev/null & diff --git a/general/package/datalink/files/telemetry_drone.conf b/general/package/datalink/files/telemetry_drone.conf index 14d2f7e4..90c83a6e 100644 --- a/general/package/datalink/files/telemetry_drone.conf +++ b/general/package/datalink/files/telemetry_drone.conf @@ -4,7 +4,7 @@ unit=drone serial=/dev/ttyAMA0 baud=115200 -### router: use simple mavfwd (0), classic mavlink-routerd (1) or msposd instead of mavfwd (2) +### router: use simple mavfwd (0), classic mavlink-routerd (1) or msposd instead of mavfwd (2) or msposd on ground station (3) router=0 wlan=wlan0 diff --git a/general/package/wifibroadcast-ng/files/wifibroadcast b/general/package/wifibroadcast-ng/files/wifibroadcast index 350acaf7..671f5bd0 100755 --- a/general/package/wifibroadcast-ng/files/wifibroadcast +++ b/general/package/wifibroadcast-ng/files/wifibroadcast @@ -93,6 +93,10 @@ start_telemetry() { echo "- Starting $router" msposd --baudrate 115200 --channels 8 -osd --ahi 0 -r "$osd_fps" \ --master "$serial" --out 10.5.0.1:14551 > /dev/null & + elif ["$router" = "msposd_gs"]; then + echo "- Starting $router" + msposd --baudrate 115200 --channels 8 --ahi 0 -r "$osd_fps" \ + --master "$serial" --out 10.5.0.1:14551 > /dev/null & elif [ "$router" = "mavfwd" ]; then echo "- Starting $router" mavfwd --baudrate 115200 --channels 8 -p 100 -a 15 -t \