diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-05-06 23:50:23 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-05-06 23:50:23 +0200 |
| commit | 44df8db984b0fcedb246aec0c272b62babefc31f (patch) | |
| tree | 1112e9be17ada4c4b1a371480e35a598c6c0f3c1 /src/drivers/px4fmu/fmu.cpp | |
| parent | eac9e10a83ab2f897e4d0c2c6c8cd9f9f55b29cb (diff) | |
| parent | 078ae23cfa00e2128d08d87dc015a3ca116f342e (diff) | |
| download | px4-firmware-44df8db984b0fcedb246aec0c272b62babefc31f.tar.gz px4-firmware-44df8db984b0fcedb246aec0c272b62babefc31f.tar.bz2 px4-firmware-44df8db984b0fcedb246aec0c272b62babefc31f.zip | |
Merge branch 'master' of github.com:PX4/Firmware into export-build
Diffstat (limited to 'src/drivers/px4fmu/fmu.cpp')
| -rw-r--r-- | src/drivers/px4fmu/fmu.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/drivers/px4fmu/fmu.cpp b/src/drivers/px4fmu/fmu.cpp index e54724536..761a23c42 100644 --- a/src/drivers/px4fmu/fmu.cpp +++ b/src/drivers/px4fmu/fmu.cpp @@ -505,7 +505,11 @@ PX4FMU::task_main() orb_copy(ORB_ID(actuator_armed), _t_armed, &aa); /* update PWM servo armed status if armed and not locked down */ - up_pwm_servo_arm(aa.armed && !aa.lockdown); + bool set_armed = aa.armed && !aa.lockdown; + if (set_armed != _armed) { + _armed = set_armed; + up_pwm_servo_arm(set_armed); + } } // see if we have new PPM input data |