some fixes for fpv (#1085)

pull/1086/head
cronyx 2023-10-24 16:16:20 +03:00 committed by GitHub
parent f3637abce8
commit 98657cf0d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 9 deletions

View File

@ -34,9 +34,7 @@ case "$1" in
echo "Loading MAVLink telemetry service..." echo "Loading MAVLink telemetry service..."
if [ ${router} -eq 1 ] || [ ${fw} = "lte" ]; then if [ ${router} -eq 1 ] || [ ${fw} = "lte" ]; then
if ! [ ${unit} = "gs" ]; then mavlink-routerd -c /etc/mavlink.conf > /dev/null 2>&1 &
mavlink-routerd -c /etc/mavlink.conf &
fi
else else
mavfwd --channels ${channels} --master ${serial} --baudrate ${baud} --out 127.0.0.1:${port_tx} --in 127.0.0.1:${port_rx} > /dev/null & mavfwd --channels ${channels} --master ${serial} --baudrate ${baud} --out 127.0.0.1:${port_tx} --in 127.0.0.1:${port_rx} > /dev/null &
fi fi

View File

@ -15,8 +15,8 @@ mcs_index=1
stream_rx=16 stream_rx=16
stream_tx=144 stream_tx=144
link_id=7669206 link_id=7669206
port_rx=14551 port_rx=14651
port_tx=14550 port_tx=14650
fec_k=1 fec_k=1
fec_n=2 fec_n=2
fec_timeout=0 fec_timeout=0

View File

@ -37,6 +37,7 @@ sigmastar() {
all_other() { all_other() {
# don't load f2fs module (disabled in kernel) # don't load f2fs module (disabled in kernel)
sed -i "s!f2fs!#f2fs!g" /etc/modules sed -i "s!f2fs!#f2fs!g" /etc/modules
sed -i "s!console::respawn:/sbin/getty -L console 0 vt100 # GENERIC_SERIAL!#console::respawn:/sbin/getty -L console 0 vt100 # GENERIC_SERIAL!g" /etc/inittab
if [ -f /usr/bin/mavlink-routerd ]; then if [ -f /usr/bin/mavlink-routerd ]; then
# disable mavlink routerd autostart # disable mavlink routerd autostart
sed -i "s!/usr/bin/mavlink-routerd &!#/usr/bin/mavlink-routerd &!g" /etc/init.d/S97mavlink sed -i "s!/usr/bin/mavlink-routerd &!#/usr/bin/mavlink-routerd &!g" /etc/init.d/S97mavlink
@ -101,8 +102,6 @@ case "$1" in
fw_setenv osmem 40M fw_setenv osmem 40M
fi fi
sed -i "s!console::respawn:/sbin/getty -L console 0 vt100 # GENERIC_SERIAL!#console::respawn:/sbin/getty -L console 0 vt100 # GENERIC_SERIAL!g" /etc/inittab
# remove unneeded to reduce some memory # remove unneeded to reduce some memory
rm -f /etc/init.d/S60crond /etc/init.d/S49ntpd /etc/init.d/S02klogd rm -f /etc/init.d/S60crond /etc/init.d/S49ntpd /etc/init.d/S02klogd
@ -133,6 +132,11 @@ case "$1" in
hi3536dv100) hi3536dv100)
echo "Preparing system tweaks for ${chip}..." echo "Preparing system tweaks for ${chip}..."
if [ -f /usr/bin/mavlink-routerd ]; then
# disable mavlink routerd autostart
sed -i "s!/usr/bin/mavlink-routerd &!#/usr/bin/mavlink-routerd &!g" /etc/init.d/S97mavlink
fi
finish finish
;; ;;
ssc33x) ssc33x)

View File

@ -8,9 +8,9 @@ Baud = 115200
[UdpEndpoint telemetry_tx] [UdpEndpoint telemetry_tx]
Mode = Normal Mode = Normal
Address = 127.0.0.1 Address = 127.0.0.1
Port = 14550 Port = 14650
[UdpEndpoint telemetry_rx] [UdpEndpoint telemetry_rx]
Mode = Server Mode = Server
Address = 0.0.0.0 Address = 0.0.0.0
Port = 14551 Port = 14651

View File

@ -3,6 +3,7 @@ unit=gs
wlan=wlan0 wlan=wlan0
region=BO region=BO
### By default used channel number, but, you may set freq instead. For ex: 2387M
channel=14 channel=14
frequency= frequency=
txpower=20 txpower=20