diff options
| author | Julian Oes <julian@oes.ch> | 2013-10-19 11:39:31 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-10-19 11:39:31 +0200 |
| commit | 70ec68ffd07124b32a8957389cd29d837539e561 (patch) | |
| tree | 39d6fa57a2ebd4ebf157c2a07916a800b9b99bd2 /src/modules/px4iofirmware | |
| parent | ba77836000eaa28041969577482e3e4074d11e1b (diff) | |
| parent | 9b22de147c07a5f45f597d7fe1ed0af5cf2d5628 (diff) | |
| download | px4-firmware-70ec68ffd07124b32a8957389cd29d837539e561.tar.gz px4-firmware-70ec68ffd07124b32a8957389cd29d837539e561.tar.bz2 px4-firmware-70ec68ffd07124b32a8957389cd29d837539e561.zip | |
Merge remote-tracking branch 'px4/master' into pwm_ioctls
Conflicts:
src/drivers/px4io/px4io.cpp
Diffstat (limited to 'src/modules/px4iofirmware')
| -rw-r--r-- | src/modules/px4iofirmware/dsm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/px4iofirmware/dsm.c b/src/modules/px4iofirmware/dsm.c index 433976656..fd3b72015 100644 --- a/src/modules/px4iofirmware/dsm.c +++ b/src/modules/px4iofirmware/dsm.c @@ -285,10 +285,10 @@ dsm_bind(uint16_t cmd, int pulses) /*Pulse RX pin a number of times*/ for (int i = 0; i < pulses; i++) { + up_udelay(25); stm32_gpiowrite(usart1RxAsOutp, false); up_udelay(25); stm32_gpiowrite(usart1RxAsOutp, true); - up_udelay(25); } break; |