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

Merged beta to master

This commit is contained in:
Lorenz Meier 2015-08-06 10:08:50 +02:00
parent d4e9b72a01 003a3b0b36
commit 951b27518f
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,14 +97,6 @@ then
fi
fi
# check if should load secondary mixer
set OUTPUT_AUX_DEV /dev/pwm_output1
if [ -f $OUTPUT_AUX_DEV ]
then
else
set MIXER_AUX none
fi
if [ $MIXER_AUX != none ]
then
#
@ -112,6 +104,7 @@ then
#
set MIXER_AUX_FILE none
set OUTPUT_AUX_DEV /dev/pwm_output1
if [ -f $SDCARD_MIXERS_PATH/$MIXER_AUX.aux.mix ]
then
@ -128,16 +121,24 @@ then
then
if fmu mode_pwm
then
if mixer load $OUTPUT_AUX_DEV $MIXER_AUX_FILE
if [ -e $OUTPUT_AUX_DEV ]
then
echo "[i] Mixer: $MIXER_AUX_FILE on $OUTPUT_AUX_DEV"
if mixer load $OUTPUT_AUX_DEV $MIXER_AUX_FILE
then
echo "[i] Mixer: $MIXER_AUX_FILE on $OUTPUT_AUX_DEV"
else
echo "[i] Error loading mixer: $MIXER_AUX_FILE"
echo "ERROR: Could not load mixer: $MIXER_AUX_FILE" >> $LOG_FILE
fi
else
echo "[i] Error loading mixer: $MIXER_AUX_FILE"
echo "ERROR: Could not load mixer: $MIXER_AUX_FILE" >> $LOG_FILE
set PWM_AUX_OUT none
set FAILSAFE_AUX none
fi
else
echo "ERROR: Could not start: fmu mode_pwm" >> $LOG_FILE
tone_alarm $TUNE_ERR
set PWM_AUX_OUT none
set FAILSAFE_AUX none
fi
if [ $PWM_AUX_OUT != none ]

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

@ -705,13 +705,6 @@ then
fi
unset FEXTRAS
if [ $EXIT_ON_END == yes ]
then
echo "Exit from nsh"
exit
fi
unset EXIT_ON_END
# Run no SD alarm
if [ $LOG_FILE == /dev/null ]
then
@ -723,6 +716,13 @@ then
# Boot is complete, inform MAVLink app(s) that the system is now fully up and running
mavlink boot_complete
if [ $EXIT_ON_END == yes ]
then
echo "Exit from nsh"
exit
fi
unset EXIT_ON_END
# End of autostart
fi

4
src/modules/mavlink/mavlink_parameters.cpp
View File

@ -215,6 +215,10 @@ MavlinkParametersManager::send(const hrt_abstime t)
if ((p == PARAM_INVALID) || (_send_all_index >= (int) param_count())) {
_send_all_index = -1;
}
} else if (_send_all_index == 0 && hrt_absolute_time() > 20 * 1000 * 1000) {
/* the boot did not seem to ever complete, warn user and set boot complete */
_mavlink->send_statustext_critical("WARNING: SYSTEM BOOT INCOMPLETE. CHECK CONFIG.");
_mavlink->set_boot_complete();
}
}