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/drivers/drv_pwm_output.h | |
| 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/drivers/drv_pwm_output.h')
| -rw-r--r-- | src/drivers/drv_pwm_output.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/drivers/drv_pwm_output.h b/src/drivers/drv_pwm_output.h index f0dd713b2..efd6afb4b 100644 --- a/src/drivers/drv_pwm_output.h +++ b/src/drivers/drv_pwm_output.h @@ -150,6 +150,7 @@ ORB_DECLARE(output_pwm); #define DSM2_BIND_PULSES 3 /* DSM_BIND_START ioctl parameter, pulses required to start dsm2 pairing */ #define DSMX_BIND_PULSES 7 /* DSM_BIND_START ioctl parameter, pulses required to start dsmx pairing */ +#define DSMX8_BIND_PULSES 10 /* DSM_BIND_START ioctl parameter, pulses required to start 8 or more channel dsmx pairing */ /** power up DSM receiver */ #define DSM_BIND_POWER_UP _IOC(_PWM_SERVO_BASE, 11) |