diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-26 17:45:11 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-26 17:50:14 +0100 |
| commit | 11b0242f551dea2c67ae3306737a74ddd8edbe20 (patch) | |
| tree | 05f914001a4590d7d0402429ec4a85bbc2a827ce /apps/drivers/px4fmu/fmu.cpp | |
| parent | 4298f68fcd39aa9820f9b522c38869ff0eb8bb0a (diff) | |
| download | px4-firmware-11b0242f551dea2c67ae3306737a74ddd8edbe20.tar.gz px4-firmware-11b0242f551dea2c67ae3306737a74ddd8edbe20.tar.bz2 px4-firmware-11b0242f551dea2c67ae3306737a74ddd8edbe20.zip | |
Not arming FMU in HIL mode
Diffstat (limited to 'apps/drivers/px4fmu/fmu.cpp')
| -rw-r--r-- | apps/drivers/px4fmu/fmu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/drivers/px4fmu/fmu.cpp b/apps/drivers/px4fmu/fmu.cpp index 3eb4a9ef2..61dd418f8 100644 --- a/apps/drivers/px4fmu/fmu.cpp +++ b/apps/drivers/px4fmu/fmu.cpp @@ -382,8 +382,8 @@ PX4FMU::task_main() /* get new value */ orb_copy(ORB_ID(actuator_armed), _t_armed, &aa); - /* update PWM servo armed status */ - up_pwm_servo_arm(aa.armed); + /* update PWM servo armed status if armed and not locked down */ + up_pwm_servo_arm(aa.armed && !aa.lockdown); } } |