[no-ci] indent with tabs in shell scripts (#1156)

pull/1158/head
Paul Philippov 2023-11-22 12:24:49 -05:00 committed by GitHub
parent 511b2d4c8b
commit 089144f01e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 189 additions and 189 deletions

View File

@ -4,7 +4,7 @@ root = true
charset = utf-8 charset = utf-8
end_of_line = lf end_of_line = lf
indent_size = 2 indent_size = 2
indent_style = space indent_style = tab
insert_final_newline = true insert_final_newline = true
max_line_length = 120 max_line_length = 120
tab_width = 2 tab_width = 2

View File

@ -4,39 +4,39 @@ destdir=/mnt
my_umount() my_umount()
{ {
if grep -qs "^/dev/$1 " /proc/mounts ; then if grep -qs "^/dev/$1 " /proc/mounts ; then
umount "${destdir}/$1"; umount "${destdir}/$1";
fi fi
[ -d "${destdir}/$1" ] && rmdir "${destdir}/$1" [ -d "${destdir}/$1" ] && rmdir "${destdir}/$1"
} }
my_mount() my_mount()
{ {
mkdir -p "${destdir}/$1" || exit 1 mkdir -p "${destdir}/$1" || exit 1
if ! mount -t auto -o sync "/dev/$1" "${destdir}/$1"; then if ! mount -t auto -o sync "/dev/$1" "${destdir}/$1"; then
# failed to mount, clean up mountpoint # failed to mount, clean up mountpoint
rmdir "${destdir}/$1" rmdir "${destdir}/$1"
exit 1 exit 1
fi fi
# copy files from autoconfig folder # copy files from autoconfig folder
[ -d "${destdir}/$1/autoconfig" ] && cp -afv ${destdir}/$1/autoconfig/* / | logger -s -p daemon.info -t autoconfig [ -d "${destdir}/$1/autoconfig" ] && cp -afv ${destdir}/$1/autoconfig/* / | logger -s -p daemon.info -t autoconfig
# execution of the specified commands one time # execution of the specified commands one time
[ -f "${destdir}/$1/autoconfig.sh" ] && (sh ${destdir}/$1/autoconfig.sh ; rm -f ${destdir}/$1/autoconfig.sh) | logger -s -p daemon.info -t autoconfig [ -f "${destdir}/$1/autoconfig.sh" ] && (sh ${destdir}/$1/autoconfig.sh ; rm -f ${destdir}/$1/autoconfig.sh) | logger -s -p daemon.info -t autoconfig
# execution of the specified commands # execution of the specified commands
[ -f "${destdir}/$1/autostart.sh" ] && sh ${destdir}/$1/autostart.sh | logger -s -p daemon.info -t autostart [ -f "${destdir}/$1/autostart.sh" ] && sh ${destdir}/$1/autostart.sh | logger -s -p daemon.info -t autostart
} }
case "${ACTION}" in case "${ACTION}" in
add|"") add|"")
my_umount ${MDEV} my_umount ${MDEV}
my_mount ${MDEV} my_mount ${MDEV}
;; ;;
remove) remove)
my_umount ${MDEV} my_umount ${MDEV}
;; ;;
esac esac

View File

@ -11,46 +11,46 @@ keydir="/etc"
fw=$(grep "BUILD_OPTION" "/etc/os-release" | cut -d= -f2) fw=$(grep "BUILD_OPTION" "/etc/os-release" | cut -d= -f2)
if [ ! -f /usr/bin/telemetry_rx -a ! -f /usr/bin/telemetry_tx ]; then if [ ! -f /usr/bin/telemetry_rx -a ! -f /usr/bin/telemetry_tx ]; then
ln -s /usr/bin/wfb_rx /usr/bin/telemetry_rx ; chmod +x /usr/bin/telemetry_rx ln -s /usr/bin/wfb_rx /usr/bin/telemetry_rx ; chmod +x /usr/bin/telemetry_rx
ln -s /usr/bin/wfb_tx /usr/bin/telemetry_tx ; chmod +x /usr/bin/telemetry_tx ln -s /usr/bin/wfb_tx /usr/bin/telemetry_tx ; chmod +x /usr/bin/telemetry_tx
fi fi
start_drone_telemetry() { start_drone_telemetry() {
if [ ${one_way} = "false" ]; then if [ ${one_way} = "false" ]; then
telemetry_rx -p ${stream_rx} -u ${port_rx} -K ${keydir}/${unit}.key -i ${link_id} ${wlan} > /dev/null & telemetry_rx -p ${stream_rx} -u ${port_rx} -K ${keydir}/${unit}.key -i ${link_id} ${wlan} > /dev/null &
fi fi
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 & 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 &
} }
start_gs_telemetry() { start_gs_telemetry() {
if [ ${one_way} = "false" ]; then if [ ${one_way} = "false" ]; then
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 & 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 &
fi fi
telemetry_rx -p ${stream_rx} -u ${port_rx} -K ${keydir}/${unit}.key -i ${link_id} ${wlan} > /dev/null & telemetry_rx -p ${stream_rx} -u ${port_rx} -K ${keydir}/${unit}.key -i ${link_id} ${wlan} > /dev/null &
} }
case "$1" in case "$1" in
start) start)
echo "Loading MAVLink telemetry service..." echo "Loading MAVLink telemetry service..."
if [ ${router} -eq 1 ] || [ ${fw} = "lte" ]; then if [ ${router} -eq 1 ] || [ ${fw} = "lte" ]; then
mavlink-routerd -c /etc/mavlink.conf > /dev/null 2>&1 & mavlink-routerd -c /etc/mavlink.conf > /dev/null 2>&1 &
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
if [ ${fw} = "fpv" ] || [ ${fw} = "venc" ]; then if [ ${fw} = "fpv" ] || [ ${fw} = "venc" ]; then
start_${unit}_telemetry start_${unit}_telemetry
fi fi
echo "Done." echo "Done."
;; ;;
stop) stop)
echo "Stopping telemetry services..." echo "Stopping telemetry services..."
kill -9 $(pidof telemetry_rx) kill -9 $(pidof telemetry_rx)
kill -9 $(pidof telemetry_tx) kill -9 $(pidof telemetry_tx)
kill -9 $(pidof mavlink-routerd) kill -9 $(pidof mavlink-routerd)
kill -9 $(pidof mavfwd) kill -9 $(pidof mavfwd)
;; ;;
*) *)
echo "Usage: $0 {start|stop}" echo "Usage: $0 {start|stop}"
exit 1 exit 1
esac esac

View File

@ -5,174 +5,174 @@ family=$(ipcinfo -f)
vendor=$(ipcinfo -v) vendor=$(ipcinfo -v)
if ! [ ${chip} = "hi3536dv100" ]; then if ! [ ${chip} = "hi3536dv100" ]; then
sensor=$(ipcinfo -s) sensor=$(ipcinfo -s)
fi fi
basic() { basic() {
# set boot delay # set boot delay
fw_setenv bootdelay 0 fw_setenv bootdelay 0
# 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
# freely uart for telemetry # freely uart for telemetry
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 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
# tune socket buffer # tune socket buffer
echo "net.core.rmem_default=512000" >> /etc/sysctl.conf echo "net.core.rmem_default=512000" >> /etc/sysctl.conf
} }
prefix=${family} prefix=${family}
hisi_goke() { hisi_goke() {
if [ ${vendor} = "hisilicon" ]; then if [ ${vendor} = "hisilicon" ]; then
prefix="open" prefix="open"
fi fi
# remove unneeded modules # remove unneeded modules
sed -i "s!insmod ${prefix}_rgn.ko!#insmod ${prefix}_rgn.ko!g" /usr/bin/load_${vendor} sed -i "s!insmod ${prefix}_rgn.ko!#insmod ${prefix}_rgn.ko!g" /usr/bin/load_${vendor}
sed -i "s!insmod ${prefix}_jpege.ko!#insmod ${prefix}_jpege.ko!g" /usr/bin/load_${vendor} sed -i "s!insmod ${prefix}_jpege.ko!#insmod ${prefix}_jpege.ko!g" /usr/bin/load_${vendor}
sed -i "s!insmod ${prefix}_ive.ko save_power=0!#insmod ${prefix}_ive.ko save_power=0!g" /usr/bin/load_${vendor} sed -i "s!insmod ${prefix}_ive.ko save_power=0!#insmod ${prefix}_ive.ko save_power=0!g" /usr/bin/load_${vendor}
sed -i "s!insmod ${prefix}_aio.ko!#insmod ${prefix}_aio.ko!g" /usr/bin/load_${vendor} sed -i "s!insmod ${prefix}_aio.ko!#insmod ${prefix}_aio.ko!g" /usr/bin/load_${vendor}
sed -i "s!insmod ${prefix}_ai.ko!#insmod ${prefix}_ai.ko!g" /usr/bin/load_${vendor} sed -i "s!insmod ${prefix}_ai.ko!#insmod ${prefix}_ai.ko!g" /usr/bin/load_${vendor}
sed -i "s!insmod ${prefix}_ao.ko!#insmod ${prefix}_ao.ko!g" /usr/bin/load_${vendor} sed -i "s!insmod ${prefix}_ao.ko!#insmod ${prefix}_ao.ko!g" /usr/bin/load_${vendor}
sed -i "s!insmod ${prefix}_aenc.ko!#insmod ${prefix}_aenc.ko!g" /usr/bin/load_${vendor} sed -i "s!insmod ${prefix}_aenc.ko!#insmod ${prefix}_aenc.ko!g" /usr/bin/load_${vendor}
sed -i "s!insmod ${prefix}_adec.ko!#insmod ${prefix}_adec.ko!g" /usr/bin/load_${vendor} sed -i "s!insmod ${prefix}_adec.ko!#insmod ${prefix}_adec.ko!g" /usr/bin/load_${vendor}
sed -i "s!insmod ${prefix}_acodec.ko!#insmod ${prefix}_acodec.ko!g" /usr/bin/load_${vendor} sed -i "s!insmod ${prefix}_acodec.ko!#insmod ${prefix}_acodec.ko!g" /usr/bin/load_${vendor}
# change fps 25 -> 30 # change fps 25 -> 30
sed -i "s!Isp_FrameRate=25!Isp_FrameRate=30!g" /etc/sensors/imx307_i2c_2l_1080p.ini sed -i "s!Isp_FrameRate=25!Isp_FrameRate=30!g" /etc/sensors/imx307_i2c_2l_1080p.ini
sed -i "s!Isp_FrameRate=25!Isp_FrameRate=30!g" /etc/sensors/smtsec_imx307_i2c_4l_1080p.ini sed -i "s!Isp_FrameRate=25!Isp_FrameRate=30!g" /etc/sensors/smtsec_imx307_i2c_4l_1080p.ini
sed -i "s!Isp_FrameRate=25!Isp_FrameRate=30!g" /etc/sensors/imx335_i2c_4M.ini sed -i "s!Isp_FrameRate=25!Isp_FrameRate=30!g" /etc/sensors/imx335_i2c_4M.ini
} }
sigmastar() { sigmastar() {
sed -i "s!serial=/dev/ttyAMA0!serial=/dev/ttyS0!g" /etc/telemetry.conf 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 sed -i "s!Device = /dev/ttyAMA0!Device = /dev/ttyS0!g" /etc/mavlink.conf
} }
majestic_generic() { majestic_generic() {
cli -s .isp.slowShutter disabled cli -s .isp.slowShutter disabled
# enable digital image stabilization # enable digital image stabilization
# cli -s .isp.dis true # cli -s .isp.dis true
cli -s .image.contrast 50 cli -s .image.contrast 50
cli -s .image.luminance 50 cli -s .image.luminance 50
cli -s .video0.size 1920x1080 cli -s .video0.size 1920x1080
cli -s .video0.fps 30 cli -s .video0.fps 30
cli -s .video0.bitrate 5120 cli -s .video0.bitrate 5120
cli -s .video0.codec h264 cli -s .video0.codec h264
cli -s .video0.rcMode cbr cli -s .video0.rcMode cbr
cli -s .video0.gopSize 1.5 cli -s .video0.gopSize 1.5
# lowdelay support only imx307 sensor # lowdelay support only imx307 sensor
if [ ${sensor} = "imx307" ]; then if [ ${sensor} = "imx307" ]; then
cli -s .isp.lowDelay true cli -s .isp.lowDelay true
# cli -s .video0.sliceUnits 4 # cli -s .video0.sliceUnits 4
fi fi
if [ ${sensor} = "imx335" ]; then if [ ${sensor} = "imx335" ]; then
cli -s .isp.drc 350 cli -s .isp.drc 350
cli -s .isp.sensorConfig /etc/sensors/imx335_i2c_4M.ini cli -s .isp.sensorConfig /etc/sensors/imx335_i2c_4M.ini
fi fi
cli -s .hls.enabled false cli -s .hls.enabled false
cli -s .netip.enabled false cli -s .netip.enabled false
cli -s .jpeg.enabled false cli -s .jpeg.enabled false
} }
majestic_sigmastar() { majestic_sigmastar() {
cli -s .isp.exposure 10 cli -s .isp.exposure 10
cli -s .isp.aGain 8 cli -s .isp.aGain 8
cli -s .isp.dGain 8 cli -s .isp.dGain 8
cli -s .video0.size 1920x1080 cli -s .video0.size 1920x1080
cli -s .video0.fps 90 cli -s .video0.fps 90
cli -s .video0.rcMode cbr cli -s .video0.rcMode cbr
cli -s .jpeg.enabled false cli -s .jpeg.enabled false
} }
streamer() { streamer() {
if [ -f /usr/bin/majestic ]; then if [ -f /usr/bin/majestic ]; then
if [ ${vendor} = "sigmastar" ]; then if [ ${vendor} = "sigmastar" ]; then
majestic_sigmastar majestic_sigmastar
else else
majestic_generic majestic_generic
fi fi
# outgoing rtp stream to udp # outgoing rtp stream to udp
cli -s .outgoing.enabled true cli -s .outgoing.enabled true
cli -s .outgoing.server udp://127.0.0.1:5600 cli -s .outgoing.server udp://127.0.0.1:5600
fi fi
if [ -f /usr/bin/venc ]; then if [ -f /usr/bin/venc ]; then
if [ ${sensor} = "imx335" ]; then if [ ${sensor} = "imx335" ]; then
sed -i "s!version=200_imx307B!version=300_imx335B!g" /etc/venc.conf sed -i "s!version=200_imx307B!version=300_imx335B!g" /etc/venc.conf
sed -i "s!size=720p!size=1292x972!g" /etc/venc.conf sed -i "s!size=720p!size=1292x972!g" /etc/venc.conf
fi fi
fi fi
} }
finish() { finish() {
# complete tweaks and add marker # complete tweaks and add marker
touch /etc/system.ok touch /etc/system.ok
echo "Preparing system done." echo "Preparing system done."
reboot reboot
} }
case "$1" in case "$1" in
gk7205v200 | gk7205v210 | hi3516ev200) gk7205v200 | gk7205v210 | hi3516ev200)
echo "Preparing system tweaks for ${chip}..." echo "Preparing system tweaks for ${chip}..."
# set custom config # set custom config
if [ ${chip} = "gk7205v200" ] && [ ${sensor} = "imx307" ]; then if [ ${chip} = "gk7205v200" ] && [ ${sensor} = "imx307" ]; then
echo "switch to custom sensor config" echo "switch to custom sensor config"
# cli -s .isp.sensorConfig /etc/sensors/60fps/720p_imx307_i2c_2l.ini # cli -s .isp.sensorConfig /etc/sensors/60fps/720p_imx307_i2c_2l.ini
fi fi
# fix osmem in bootargs # fix osmem in bootargs
bootargs=$(fw_printenv -n bootargs) bootargs=$(fw_printenv -n bootargs)
if echo ${bootargs} | grep -q "32M"; then if echo ${bootargs} | grep -q "32M"; then
newbootargs="mem=\${osmem} "$(echo ${bootargs} | cut -d " " -f2-) newbootargs="mem=\${osmem} "$(echo ${bootargs} | cut -d " " -f2-)
fw_setenv bootargs ${newbootargs} fw_setenv bootargs ${newbootargs}
fw_setenv osmem 40M fw_setenv osmem 40M
fi fi
# 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
basic basic
hisi_goke hisi_goke
streamer streamer
finish finish
;; ;;
gk7205v300 | hi3516ev300) gk7205v300 | hi3516ev300)
echo "Preparing system tweaks for ${chip}..." echo "Preparing system tweaks for ${chip}..."
# increase osmem # increase osmem
mem=$(fw_printenv -n osmem) && [ "${mem}" = "32M" ] && fw_setenv osmem 64M && set_allocator cma || echo "Memory allocated for the system:" ${mem} mem=$(fw_printenv -n osmem) && [ "${mem}" = "32M" ] && fw_setenv osmem 64M && set_allocator cma || echo "Memory allocated for the system:" ${mem}
# set sensor config for smtsec board # set sensor config for smtsec board
if [ ${chip} = "gk7205v300" ] && [ ${sensor} = "imx307" ]; then if [ ${chip} = "gk7205v300" ] && [ ${sensor} = "imx307" ]; then
cli -s .isp.sensorConfig /etc/sensors/smtsec_imx307_i2c_4l_1080p.ini cli -s .isp.sensorConfig /etc/sensors/smtsec_imx307_i2c_4l_1080p.ini
fi fi
basic basic
hisi_goke hisi_goke
streamer streamer
finish finish
;; ;;
t31l | t31n | t31x | t31zx) t31l | t31n | t31x | t31zx)
echo "Preparing system tweaks for ${chip}..." echo "Preparing system tweaks for ${chip}..."
basic basic
streamer streamer
finish finish
;; ;;
hi3536dv100) hi3536dv100)
echo "Preparing system tweaks for ${chip}..." echo "Preparing system tweaks for ${chip}..."
finish finish
;; ;;
ssc33x) ssc33x)
echo "Preparing system tweaks for ${chip}..." echo "Preparing system tweaks for ${chip}..."
basic basic
sigmastar sigmastar
streamer streamer
finish finish
;; ;;
*) *)
echo "Usage: $0 {gk7205v200|gk7205v210|gk7205v300|hi3516ev200|hi3516ev300|t31l|t31n|t31x|t31zx|hi3536dv100|ssc33x}" echo "Usage: $0 {gk7205v200|gk7205v210|gk7205v300|hi3516ev200|hi3516ev300|t31l|t31n|t31x|t31zx|hi3536dv100|ssc33x}"
exit 1 exit 1
esac esac

View File

@ -121,10 +121,10 @@ case ${SENSOR} in
SENSOR_PARAM="" SENSOR_PARAM=""
;; ;;
"jxk04") "jxk04")
AVPU_PARAM="clk_name=vpll avpu_clk=400000000" AVPU_PARAM="clk_name=vpll avpu_clk=400000000"
ISP_PARAM="isp_clk=125000000 isp_ch0_pre_dequeue_time=14 isp_ch0_pre_dequeue_interrupt_process=0 isp_ch0_pre_dequeue_valid_lines=540 isp_memopt=1" ISP_PARAM="isp_clk=125000000 isp_ch0_pre_dequeue_time=14 isp_ch0_pre_dequeue_interrupt_process=0 isp_ch0_pre_dequeue_valid_lines=540 isp_memopt=1"
SENSOR_PARAM="shvflip=1" SENSOR_PARAM="shvflip=1"
;; ;;
"os03b10") "os03b10")
AVPU_PARAM="clk_name=vpll avpu_clk=400000000" AVPU_PARAM="clk_name=vpll avpu_clk=400000000"
ISP_PARAM="isp_clk=200000000" ISP_PARAM="isp_clk=200000000"