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

Merge branch 'master' of github.com:PX4/Firmware into unit_tests

Browse Source
This commit is contained in:
Lorenz Meier
2014-01-01 23:44:06 +01:00
parent 7f14f1f7de 1d9e8a7b72
commit e35598eb6b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ROMFS/px4fmu_common/init.d/rcS
+3 -2
View File
@@ -176,7 +176,7 @@ then
tone_alarm MBABGP tone_alarm MBABGP
if px4io forceupdate 14662 $io_file if px4io forceupdate 14662 $io_file
then then
usleep 200000 usleep 500000
if px4io start if px4io start
then then
echo "PX4IO restart OK" echo "PX4IO restart OK"
@@ -186,7 +186,8 @@ then
echo "PX4IO restart failed" echo "PX4IO restart failed"
echo "PX4IO restart failed" >> $logfile echo "PX4IO restart failed" >> $logfile
tone_alarm MNGGG tone_alarm MNGGG
sh /etc/init.d/rc.error sleep 10
reboot
fi fi
else else
echo "PX4IO update failed" echo "PX4IO update failed"
src/modules/fw_att_control/fw_att_control_main.cpp
+2 -1
View File
@@ -479,7 +479,8 @@ FixedwingAttitudeControl::task_main()
/* rate limit vehicle status updates to 5Hz */ /* rate limit vehicle status updates to 5Hz */
orb_set_interval(_vcontrol_mode_sub, 200); orb_set_interval(_vcontrol_mode_sub, 200);
orb_set_interval(_att_sub, 100); /* rate limit attitude control to 50 Hz (with some margin, so 17 ms) */
orb_set_interval(_att_sub, 17);
parameters_update(); parameters_update();