diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-27 21:34:07 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-27 21:34:07 +0200 |
| commit | 92c3e52fec8945cede585da1e1236ab2ec5183f4 (patch) | |
| tree | 660bfec8d26dec556a8063b3b5869eed5e4b0e10 /src/modules/px4iofirmware/protocol.h | |
| parent | 05027617996c86005fb8ec4d68fae798b9fbef35 (diff) | |
| parent | 91d50301c61cf495e83cab59621ef83cff24da3a (diff) | |
| download | px4-firmware-92c3e52fec8945cede585da1e1236ab2ec5183f4.tar.gz px4-firmware-92c3e52fec8945cede585da1e1236ab2ec5183f4.tar.bz2 px4-firmware-92c3e52fec8945cede585da1e1236ab2ec5183f4.zip | |
Merge remote-tracking branch 'upstream/termination_failsafe' into obcfailsafe
Diffstat (limited to 'src/modules/px4iofirmware/protocol.h')
| -rw-r--r-- | src/modules/px4iofirmware/protocol.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/px4iofirmware/protocol.h b/src/modules/px4iofirmware/protocol.h index 050783687..eae7f9567 100644 --- a/src/modules/px4iofirmware/protocol.h +++ b/src/modules/px4iofirmware/protocol.h @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2012, 2013 PX4 Development Team. All rights reserved. + * Copyright (c) 2012-2014 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -180,6 +180,7 @@ #define PX4IO_P_SETUP_ARMING_RC_HANDLING_DISABLED (1 << 6) /* Disable the IO-internal evaluation of the RC */ #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_PWM_RATES 2 /* bitmask, 0 = low rate, 1 = high rate */ #define PX4IO_P_SETUP_PWM_DEFAULTRATE 3 /* 'low' PWM frame output rate in Hz */ |