dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/rcvariables' into ros

This commit is contained in:
Thomas Gubler 2015-01-08 17:08:59 +01:00
parent fb151a855f 450d8ee452
commit 12ae4fe869
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ROMFS/px4fmu_common/init.d/rc.interface
View File

@ -125,3 +125,4 @@ then
fi fi
fi fi
fi fi
unset OUTPUT_DEV

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

@ -12,7 +12,6 @@ set MODE autostart
set FRC /fs/microsd/etc/rc.txt set FRC /fs/microsd/etc/rc.txt
set FCONFIG /fs/microsd/etc/config.txt set FCONFIG /fs/microsd/etc/config.txt
set FEXTRAS /fs/microsd/etc/extras.txt
set TUNE_ERR ML<<CP4CP4CP4CP4CP4 set TUNE_ERR ML<<CP4CP4CP4CP4CP4
@ -42,6 +41,7 @@ then
else else
echo "[i] Init script not found: $FRC" echo "[i] Init script not found: $FRC"
fi fi
unset FRC
# if this is an APM build then there will be a rc.APM script # if this is an APM build then there will be a rc.APM script
# from an EXTERNAL_SCRIPTS build option # from an EXTERNAL_SCRIPTS build option
@ -275,6 +275,7 @@ then
set FMU_MODE serial set FMU_MODE serial
fi fi
fi fi
unset HIL
# waypoint storage # waypoint storage
if dataman start if dataman start
@ -355,8 +356,9 @@ then
echo "[i] ERROR: MK start failed" echo "[i] ERROR: MK start failed"
tone_alarm $TUNE_ERR tone_alarm $TUNE_ERR
fi fi
unset MKBLCTRL_ARG
fi fi
unset MK_MODE
if [ $OUTPUT_MODE == hil ] if [ $OUTPUT_MODE == hil ]
then then
@ -604,6 +606,9 @@ then
sh /etc/init.d/rc.vtol_apps sh /etc/init.d/rc.vtol_apps
fi fi
fi fi
unset MIXER
unset MAV_TYPE
unset OUTPUT_MODE
# #
# Start the navigator # Start the navigator
@ -620,6 +625,7 @@ then
fi fi
# Start any custom addons # Start any custom addons
set FEXTRAS /fs/microsd/etc/extras.txt
if [ -f $FEXTRAS ] if [ -f $FEXTRAS ]
then then
echo "[i] Addons script: $FEXTRAS" echo "[i] Addons script: $FEXTRAS"