diff options
| author | Andrew Tridgell <tridge@samba.org> | 2014-11-05 21:20:03 +1100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-11-16 21:02:14 +0100 |
| commit | ba811254536b6a080d4b3379106bf0e648a51eb0 (patch) | |
| tree | e2445c6e9af7e6e3e17800075cf11db6471129ed /src/modules/px4iofirmware/registers.c | |
| parent | 6406e235d6f5cb37a914442036111f616b4b3839 (diff) | |
| download | px4-firmware-ba811254536b6a080d4b3379106bf0e648a51eb0.tar.gz px4-firmware-ba811254536b6a080d4b3379106bf0e648a51eb0.tar.bz2 px4-firmware-ba811254536b6a080d4b3379106bf0e648a51eb0.zip | |
px4io: added OVERRIDE_IMMEDIATE arming flag
this allows the flight code to choose whether FMU failure gives
immediate manual pilot control, or waits for the mode switch to go
past the override threshold
Diffstat (limited to 'src/modules/px4iofirmware/registers.c')
| -rw-r--r-- | src/modules/px4iofirmware/registers.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/px4iofirmware/registers.c b/src/modules/px4iofirmware/registers.c index 49c2a9f56..fbfdd35db 100644 --- a/src/modules/px4iofirmware/registers.c +++ b/src/modules/px4iofirmware/registers.c @@ -191,7 +191,8 @@ volatile uint16_t r_page_setup[] = PX4IO_P_SETUP_ARMING_RC_HANDLING_DISABLED | \ PX4IO_P_SETUP_ARMING_LOCKDOWN | \ PX4IO_P_SETUP_ARMING_FORCE_FAILSAFE | \ - PX4IO_P_SETUP_ARMING_TERMINATION_FAILSAFE) + PX4IO_P_SETUP_ARMING_TERMINATION_FAILSAFE | \ + PX4IO_P_SETUP_ARMING_OVERRIDE_IMMEDIATE) #define PX4IO_P_SETUP_RATES_VALID ((1 << PX4IO_SERVO_COUNT) - 1) #define PX4IO_P_SETUP_RELAYS_VALID ((1 << PX4IO_RELAY_CHANNELS) - 1) |