diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-07 00:05:29 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-07 00:05:29 +0200 |
| commit | 5559e568b6e5502ad51ec96fd531876c1191d641 (patch) | |
| tree | bc6356b5bed0481cced4a7d7e7ef99bd225d91a7 /src/drivers/drv_pwm_output.h | |
| parent | 863385dbc4243c8ecb19890a0dfce4a0b7ead9d6 (diff) | |
| parent | d67089b23f58ac152253f58c5deaebbd57db0362 (diff) | |
| download | px4-firmware-5559e568b6e5502ad51ec96fd531876c1191d641.tar.gz px4-firmware-5559e568b6e5502ad51ec96fd531876c1191d641.tar.bz2 px4-firmware-5559e568b6e5502ad51ec96fd531876c1191d641.zip | |
Merged master into safelinksafelink
Diffstat (limited to 'src/drivers/drv_pwm_output.h')
| -rw-r--r-- | src/drivers/drv_pwm_output.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/drivers/drv_pwm_output.h b/src/drivers/drv_pwm_output.h index 7a364d52f..8b623119f 100644 --- a/src/drivers/drv_pwm_output.h +++ b/src/drivers/drv_pwm_output.h @@ -160,7 +160,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 */ +#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) @@ -199,9 +199,12 @@ ORB_DECLARE(output_pwm); /** get the lockdown override flag to enable outputs in HIL */ #define PWM_SERVO_GET_DISABLE_LOCKDOWN _IOC(_PWM_SERVO_BASE, 22) -#define SAFELINK_CONTROL_INPUT _IOC(_PWM_SERVO_BASE, 23) +/** force safety switch off (to disable use of safety switch) */ +#define PWM_SERVO_SET_FORCE_SAFETY_OFF _IOC(_PWM_SERVO_BASE, 23) -#define SAFELINK_CONTROL_OUTPUT _IOC(_PWM_SERVO_BASE, 24) +#define SAFELINK_CONTROL_INPUT _IOC(_PWM_SERVO_BASE, 24) + +#define SAFELINK_CONTROL_OUTPUT _IOC(_PWM_SERVO_BASE, 25) /* * |