diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-16 16:22:38 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-16 16:22:38 +0200 |
commit | 52d15ac7b1a90ededd0079ec17f0bc709947d7de (patch) | |
tree | 0773a9a9252d810c692fc0759feb1910ac801b89 /src/modules/px4iofirmware | |
parent | 0dc240688dcae83e34f9001072ac151f4a3df140 (diff) | |
parent | 6113be111e84a57715f3f3bfe81077bf1b267e52 (diff) | |
download | px4-firmware-52d15ac7b1a90ededd0079ec17f0bc709947d7de.tar.gz px4-firmware-52d15ac7b1a90ededd0079ec17f0bc709947d7de.tar.bz2 px4-firmware-52d15ac7b1a90ededd0079ec17f0bc709947d7de.zip |
Merged public master
Diffstat (limited to 'src/modules/px4iofirmware')
-rw-r--r-- | src/modules/px4iofirmware/controls.c | 2 | ||||
-rw-r--r-- | src/modules/px4iofirmware/dsm.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/modules/px4iofirmware/controls.c b/src/modules/px4iofirmware/controls.c index 74037d1c2..796c6cd9f 100644 --- a/src/modules/px4iofirmware/controls.c +++ b/src/modules/px4iofirmware/controls.c @@ -300,6 +300,8 @@ controls_tick() { } else { r_status_flags &= ~PX4IO_P_STATUS_FLAGS_OVERRIDE; } + } else { + r_status_flags &= ~PX4IO_P_STATUS_FLAGS_OVERRIDE; } } diff --git a/src/modules/px4iofirmware/dsm.c b/src/modules/px4iofirmware/dsm.c index 598bcee34..4925ced54 100644 --- a/src/modules/px4iofirmware/dsm.c +++ b/src/modules/px4iofirmware/dsm.c @@ -129,9 +129,9 @@ dsm_bind(uint16_t cmd, int pulses) case dsm_bind_send_pulses: for (int i = 0; i < pulses; i++) { stm32_gpiowrite(usart1RxAsOutp, false); - up_udelay(50); + up_udelay(25); stm32_gpiowrite(usart1RxAsOutp, true); - up_udelay(50); + up_udelay(25); } break; case dsm_bind_reinit_uart: |