diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-08 17:08:59 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-08 17:08:59 +0100 |
commit | 12ae4fe86996fb97f021f50efa1089bd485a2eec (patch) | |
tree | 4e0d68ae92e2f6f8e5d25706860779bb184c50e9 | |
parent | fb151a855f22e407eaa49db42851c90b6f1333f5 (diff) | |
parent | 450d8ee45289d6a820808c54bc6fa8fd30faa57b (diff) | |
download | px4-firmware-12ae4fe86996fb97f021f50efa1089bd485a2eec.tar.gz px4-firmware-12ae4fe86996fb97f021f50efa1089bd485a2eec.tar.bz2 px4-firmware-12ae4fe86996fb97f021f50efa1089bd485a2eec.zip |
Merge remote-tracking branch 'upstream/rcvariables' into ros
-rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.interface | 1 | ||||
-rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.interface b/ROMFS/px4fmu_common/init.d/rc.interface index 4015a911b..7fde482df 100644 --- a/ROMFS/px4fmu_common/init.d/rc.interface +++ b/ROMFS/px4fmu_common/init.d/rc.interface @@ -125,3 +125,4 @@ then fi fi fi +unset OUTPUT_DEV diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 31d6a8a2d..84c7e096d 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -12,7 +12,6 @@ set MODE autostart set FRC /fs/microsd/etc/rc.txt set FCONFIG /fs/microsd/etc/config.txt -set FEXTRAS /fs/microsd/etc/extras.txt set TUNE_ERR ML<<CP4CP4CP4CP4CP4 @@ -42,6 +41,7 @@ then else echo "[i] Init script not found: $FRC" fi +unset FRC # if this is an APM build then there will be a rc.APM script # from an EXTERNAL_SCRIPTS build option @@ -275,6 +275,7 @@ then set FMU_MODE serial fi fi + unset HIL # waypoint storage if dataman start @@ -355,8 +356,9 @@ then echo "[i] ERROR: MK start failed" tone_alarm $TUNE_ERR fi - + unset MKBLCTRL_ARG fi + unset MK_MODE if [ $OUTPUT_MODE == hil ] then @@ -604,6 +606,9 @@ then sh /etc/init.d/rc.vtol_apps fi fi + unset MIXER + unset MAV_TYPE + unset OUTPUT_MODE # # Start the navigator @@ -620,6 +625,7 @@ then fi # Start any custom addons + set FEXTRAS /fs/microsd/etc/extras.txt if [ -f $FEXTRAS ] then echo "[i] Addons script: $FEXTRAS" |