fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 06:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensured that the mixer output obeys the FMU and IO armed state

Browse Source
This commit is contained in:
Lorenz Meier
2013-02-12 22:19:53 +01:00
parent 4af4d1cf21
commit d4ca6a29a1
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/px4io/mixer.cpp
+3 -2
View File
@@ -231,8 +231,9 @@ mixer_tick(void)
* XXX correct behaviour for failsafe may require an additional case * XXX correct behaviour for failsafe may require an additional case
* here. * here.
*/ */
bool should_arm = ((r_status_flags & PX4IO_P_STATUS_FLAGS_ARMED) && bool should_arm = (/* FMU is armed */ (r_setup_arming & PX4IO_P_SETUP_ARMING_ARM_OK) &&
(r_status_flags & (PX4IO_P_STATUS_FLAGS_RAW_PWM | PX4IO_P_STATUS_FLAGS_MIXER_OK))); /* IO is armed */ (r_status_flags & PX4IO_P_STATUS_FLAGS_ARMED) &&
/* there is valid input */ (r_status_flags & (PX4IO_P_STATUS_FLAGS_RAW_PWM | PX4IO_P_STATUS_FLAGS_MIXER_OK)));
if (should_arm && !mixer_servos_armed) { if (should_arm && !mixer_servos_armed) {
/* need to arm, but not armed */ /* need to arm, but not armed */