diff options
| author | Julian Oes <julian@oes.ch> | 2013-09-29 18:31:13 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-09-29 18:31:13 +0200 |
| commit | 9493c7a45c43bf7e8581765e3e2a93503a9f1e09 (patch) | |
| tree | 9fa87b9e362105b3dd564d2062418fc2f03ef381 /src/drivers/drv_pwm_output.h | |
| parent | 8131d28a0faf7d33060cf067f5bd8dee41666fed (diff) | |
| parent | 1b32ba2436848745e0a78c59fffa0a767cab9d3c (diff) | |
| download | px4-firmware-9493c7a45c43bf7e8581765e3e2a93503a9f1e09.tar.gz px4-firmware-9493c7a45c43bf7e8581765e3e2a93503a9f1e09.tar.bz2 px4-firmware-9493c7a45c43bf7e8581765e3e2a93503a9f1e09.zip | |
Merge remote-tracking branch 'px4/master' into pwm_ioctls
Conflicts:
src/drivers/drv_pwm_output.h
Diffstat (limited to 'src/drivers/drv_pwm_output.h')
| -rw-r--r-- | src/drivers/drv_pwm_output.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/drivers/drv_pwm_output.h b/src/drivers/drv_pwm_output.h index 6ed9320cb..fc916b522 100644 --- a/src/drivers/drv_pwm_output.h +++ b/src/drivers/drv_pwm_output.h @@ -119,6 +119,9 @@ ORB_DECLARE(output_pwm); /** start DSM bind */ #define DSM_BIND_START _IOC(_PWM_SERVO_BASE, 7) +#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 */ + /** power up DSM receiver */ #define DSM_BIND_POWER_UP _IOC(_PWM_SERVO_BASE, 8) |