diff --git a/general/package/datalink/files/telemetry b/general/package/datalink/files/telemetry index 9b58a7f6..ea38a288 100755 --- a/general/package/datalink/files/telemetry +++ b/general/package/datalink/files/telemetry @@ -33,8 +33,10 @@ case "$1" in start) echo "Loading MAVLink telemetry service..." - if [ ${router} -eq 1 ] || [ ${fw} = "lte" ] || [ ${unit} = "gs" ]; then - mavlink-routerd -c /etc/mavlink.conf & + if [ ${router} -eq 1 ] || [ ${fw} = "lte" ]; then + if ! [ ${unit} = "gs" ]; then + mavlink-routerd -c /etc/mavlink.conf & + fi else mavfwd --channels ${channels} --master ${serial} --baudrate ${baud} --out 127.0.0.1:${port_tx} --in 127.0.0.1:${port_rx} > /dev/null & fi diff --git a/general/package/datalink/files/telemetry_gs.conf b/general/package/datalink/files/telemetry_gs.conf index 29a9b820..ba7b6e38 100644 --- a/general/package/datalink/files/telemetry_gs.conf +++ b/general/package/datalink/files/telemetry_gs.conf @@ -15,8 +15,8 @@ mcs_index=1 stream_rx=16 stream_tx=144 link_id=7669206 -port_rx=14651 -port_tx=14650 +port_rx=14551 +port_tx=14550 fec_k=1 fec_n=2 fec_timeout=0 diff --git a/general/package/datalink/files/tweaksys b/general/package/datalink/files/tweaksys index 9c4eb222..a4a903c4 100755 --- a/general/package/datalink/files/tweaksys +++ b/general/package/datalink/files/tweaksys @@ -29,6 +29,11 @@ hisi_goke() { sed -i "s!Isp_FrameRate=25!Isp_FrameRate=30!g" /etc/sensors/smtsec_imx307_i2c_4l_1080p.ini } +sigmastar() { + sed -i "s!serial=/dev/ttyAMA0!serial=/dev/ttyS0!g" /etc/telemetry.conf + sed -i "s!Device = /dev/ttyAMA0!Device = /dev/ttyS0!g" /etc/mavlink.conf +} + all_other() { # don't load f2fs module (disabled in kernel) sed -i "s!f2fs!#f2fs!g" /etc/modules @@ -47,22 +52,21 @@ all_other() { cli -s .video0.bitrate 4096 cli -s .video0.codec h264 cli -s .video0.rcMode cbr - cli -s .video0.gopSize 0.2 + cli -s .video0.gopSize 1 cli -s .hls.enabled false cli -s .netip.enabled false cli -s .jpeg.enabled false # lowdelay support only imx307 sensor if [ ${sensor} = "imx307" ]; then cli -s .video0.size 1280x720 + cli -s .video0.gopSize 0.2 # cli -s .video0.fps 30 cli -s .isp.lowDelay true # cli -s .video0.sliceUnits 4 fi -# outgoing rtp stream to udp -cat >> /etc/majestic.yaml << EOF -outgoing: - - udp://127.0.0.1:5600 -EOF + # outgoing rtp stream to udp + cli -s .outgoing.enabled true + cli -s .outgoing.server udp://127.0.0.1:5600 fi # tune socket buffer @@ -70,7 +74,9 @@ cat >> /etc/sysctl.conf << EOF net.core.rmem_default=524288 net.core.rmem_max=2048000 EOF +} +finish() { # complete tweaks touch /etc/system.ok echo "Preparing system done." @@ -102,6 +108,7 @@ case "$1" in hisi_goke all_other + finish ;; gk7205v300 | hi3516ev300) echo "Preparing system tweaks for ${chip}..." @@ -116,6 +123,7 @@ case "$1" in hisi_goke all_other + finish ;; t31l | t31n | t31x | t31zx) echo "Preparing system tweaks for ${chip}..." @@ -124,10 +132,17 @@ case "$1" in ;; hi3536dv100) echo "Preparing system tweaks for ${chip}..." - touch /etc/system.ok - echo "Preparing system done." + + finish + ;; + ssc33x) + echo "Preparing system tweaks for ${chip}..." + + sigmastar + all_other + finish ;; *) - echo "Usage: $0 {gk7205v200|gk7205v210|gk7205v300|hi3516ev200|hi3516ev300|t31l|t31n|t31x|t31zx|hi3536dv100}" + echo "Usage: $0 {gk7205v200|gk7205v210|gk7205v300|hi3516ev200|hi3516ev300|t31l|t31n|t31x|t31zx|hi3536dv100|ssc33x}" exit 1 esac