diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-11-23 12:06:46 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-11-23 12:06:46 +0100 |
| commit | 461e9889b334865f1eec0c1d7a20067ff5a647ea (patch) | |
| tree | 2ebcd3c57679153676a6674f60911c28f40c6031 /src/modules/px4iofirmware/protocol.h | |
| parent | 4030b20de7921d5e9673ce18215f76f0820c1ec7 (diff) | |
| parent | 138c25ec74f08db6f6759053d0200058a794c196 (diff) | |
| download | px4-firmware-461e9889b334865f1eec0c1d7a20067ff5a647ea.tar.gz px4-firmware-461e9889b334865f1eec0c1d7a20067ff5a647ea.tar.bz2 px4-firmware-461e9889b334865f1eec0c1d7a20067ff5a647ea.zip | |
Merged master
Diffstat (limited to 'src/modules/px4iofirmware/protocol.h')
| -rw-r--r-- | src/modules/px4iofirmware/protocol.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/modules/px4iofirmware/protocol.h b/src/modules/px4iofirmware/protocol.h index 9b2e047cb..c7e9ae3eb 100644 --- a/src/modules/px4iofirmware/protocol.h +++ b/src/modules/px4iofirmware/protocol.h @@ -183,6 +183,7 @@ #define PX4IO_P_SETUP_ARMING_LOCKDOWN (1 << 7) /* If set, the system operates normally, but won't actuate any servos */ #define PX4IO_P_SETUP_ARMING_FORCE_FAILSAFE (1 << 8) /* If set, the system will always output the failsafe values */ #define PX4IO_P_SETUP_ARMING_TERMINATION_FAILSAFE (1 << 9) /* If set, the system will never return from a failsafe, but remain in failsafe once triggered. */ +#define PX4IO_P_SETUP_ARMING_OVERRIDE_IMMEDIATE (1 << 10) /* If set then on FMU failure override is immediate. Othewise it waits for the mode switch to go past the override thrshold */ #define PX4IO_P_SETUP_PWM_RATES 2 /* bitmask, 0 = low rate, 1 = high rate */ #define PX4IO_P_SETUP_PWM_DEFAULTRATE 3 /* 'low' PWM frame output rate in Hz */ |