diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-14 22:53:42 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-14 22:53:42 +0200 |
| commit | aebdd6e05969e415db2f7f939229163dddc35f23 (patch) | |
| tree | 874008b07d83ed81acb09cfa1015d8a60e87a821 /src/modules/px4iofirmware | |
| parent | 27d0885453711a3d3ab6abf3cf227afc837e14bd (diff) | |
| parent | d2f19c7d84030ad6ed1f6c17538fa96864c5dcef (diff) | |
| download | px4-firmware-aebdd6e05969e415db2f7f939229163dddc35f23.tar.gz px4-firmware-aebdd6e05969e415db2f7f939229163dddc35f23.tar.bz2 px4-firmware-aebdd6e05969e415db2f7f939229163dddc35f23.zip | |
Merged 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 43d96fb06..fbd82a4c6 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 ab6e3fec4..b2c0db425 100644 --- a/src/modules/px4iofirmware/dsm.c +++ b/src/modules/px4iofirmware/dsm.c @@ -125,9 +125,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: |