Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add msposd ground station OSD support #1715

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+20 −2
Open

Add msposd ground station OSD support #1715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7618ec0
Add msposd ground station OSD support
lida2003 Feb 19, 2025
fb52543
Fix tab/space alignement format
lida2003 Feb 19, 2025
bada6ae
Add msposd tunnel support
lida2003 Feb 26, 2025
736b827
Change msposd tunnel port from 5000 to 14551
lida2003 Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion general/package/legacy/datalink/files/telemetry
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ start_drone_telemetry() {
telemetry_tx -p "$stream_tx" -u "$port_tx" -K "$keydir/$unit.key" -B "$bandwidth" \
-M "$mcs_index" -S "$stbc" -L "$ldpc" -G "$guard_interval" -k "$fec_k" -n "$fec_n" \
-T "$pool_timeout" -i "$link_id" -f "$frame_type" "$wlan" > /dev/null &
elif [ "$router" -eq 3 ]; then
telemetry_tx -p "$stream_tx" -u "$tel_port" -K "$keydir/$unit.key" -B "$bandwidth" \
-M "$mcs_index" -S "$stbc" -L "$ldpc" -G "$guard_interval" -k "$fec_k" -n "$fec_n" \
-T "$pool_timeout" -i "$link_id" -f "$frame_type" "$wlan" > /dev/null &
fi
}

Expand All @@ -43,7 +47,13 @@ case "$1" in
else
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 &
--out 127.0.0.1:$tel_port -osd -r "$fps" --ahi "$ahi" > /dev/null &
elif [ "$router" -eq 3 ]; then
msposd --channels "$channels" --master "$serial" --baudrate "$baud" \
--out 127.0.0.1:$tel_port -r "$fps" --ahi "$ahi" > /dev/null &
elif [ "$router" -eq 4 ]; then
msposd --channels "$channels" --master "$serial" --baudrate "$baud" \
--out $tun_ip:$tun_port -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 &
Expand Down
10 changes: 9 additions & 1 deletion general/package/legacy/datalink/files/telemetry_drone.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ unit=drone
serial=/dev/ttyAMA0
baud=115200

### router: use simple mavfwd (0), classic mavlink-routerd (1) or msposd instead of mavfwd (2)
### router:
# 0: simple mavfwd (default)
# 1: classic mavlink-routerd
# 2: msposd airunit embedded osd
# 3: msposd ground osd using telemetry
# 4: msposd ground osd using tunnel
router=0

wlan=wlan0
Expand All @@ -31,3 +36,6 @@ channels=8
### for msposd: OSD over video
fps=20
ahi=0
tel_port=14551
tun_ip=10.5.0.1
tun_port=14551