fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move additional logic block to rc.vehicle_setup, add rc.vehicle_setup to init.d/CMakeLists.txt, and relocate sd card logic block higher up in rcS. (#9896)

Browse Source
This commit is contained in:
Mark Sauder 2018-07-12 14:45:19 -06:00 committed by Daniel Agar
parent 84d22fe0c6
commit 72de9a901d
3 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ROMFS/px4fmu_common/init.d/CMakeLists.txt
View File

@ -114,6 +114,7 @@ px4_add_romfs_files(
rc.thermal_cal
rc.ugv_apps
rc.ugv_defaults
rc.vehicle_setup
rc.vtol_apps
rc.vtol_defaults
rcS

9
ROMFS/px4fmu_common/init.d/rc.vehicle_setup
View File

@ -165,3 +165,12 @@ then
# Start standard UGV apps
sh /etc/init.d/rc.ugv_apps
fi
#
# Generic setup (autostart ID not found).
#
if [ $VEHICLE_TYPE == none ]
then
echo "No autostart ID found"
ekf2 start
fi

41
ROMFS/px4fmu_common/init.d/rcS
View File

@ -100,6 +100,18 @@ else
fi
fi
if ver hwcmp CRAZYFLIE -o ver hwcmp AEROCORE2
then
# AEROCORE2 and CF2 shouldn't have an sd card.
else
# Run no SD alarm.
if [ $LOG_FILE == /dev/null ]
then
# Play SOS.
tone_alarm error
fi
fi
#
# Look for an init script on the microSD card.
# Disable autostart if the script found.
@ -561,15 +573,6 @@ then
#
navigator start
#
# Generic setup (autostart ID not found).
#
if [ $VEHICLE_TYPE == none ]
then
echo "No autostart ID found"
ekf2 start
fi
# Start any custom addons.
if [ -f $FEXTRAS ]
then
@ -577,26 +580,6 @@ then
sh $FEXTRAS
fi
if ver hwcmp CRAZYFLIE
then
# CF2 shouldn't have an sd card.
else
if ver hwcmp AEROCORE2
then
# AEROCORE2 shouldn't have an sd card.
else
# Run no SD alarm.
if [ $LOG_FILE == /dev/null ]
then
# Play SOS.
tone_alarm error
fi
fi
fi
#
# Start a thermal calibration if required.
#