diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-26 21:30:05 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-26 21:30:05 +0100 |
| commit | a35d214d9860f92880cdecc783b17d96169aab92 (patch) | |
| tree | 8489ebcf3a5304dac7e32e147817ecb18ccf0be7 /apps | |
| parent | c848fd1d6327fd3aaea4f1fa3ceb0b45d7f54ee5 (diff) | |
| parent | dee0a30e16e3d4d9725eb16f7205cb1dfa1063cd (diff) | |
| download | px4-firmware-a35d214d9860f92880cdecc783b17d96169aab92.tar.gz px4-firmware-a35d214d9860f92880cdecc783b17d96169aab92.tar.bz2 px4-firmware-a35d214d9860f92880cdecc783b17d96169aab92.zip | |
Merge branch 'master' of github.com:PX4/Firmware into px4io-i2c
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/drivers/stm32/drv_pwm_servo.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/drivers/stm32/drv_pwm_servo.c b/apps/drivers/stm32/drv_pwm_servo.c index 954b458f5..2b8641f00 100644 --- a/apps/drivers/stm32/drv_pwm_servo.c +++ b/apps/drivers/stm32/drv_pwm_servo.c @@ -299,8 +299,12 @@ up_pwm_servo_arm(bool armed) rCR1(i) |= GTIM_CR1_CEN | GTIM_CR1_ARPE; } else { - /* on disarm, just stop auto-reload so we don't generate runts */ - rCR1(i) &= ~GTIM_CR1_ARPE; + // XXX This leads to FMU PWM being still active + // but uncontrollable. Just disable the timer + // and risk a runt. + ///* on disarm, just stop auto-reload so we don't generate runts */ + //rCR1(i) &= ~GTIM_CR1_ARPE; + rCR1(i) = 0; } } } |