diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-15 18:04:02 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-15 18:04:02 +0200 |
| commit | 089c4f0fd5a837b98634da1a66a170ad3834e7ca (patch) | |
| tree | 53fcb27e6bbb21d6796b89fa87645e84cac82c79 | |
| parent | e14d3b654b55d81ca1190050311575e98ec931df (diff) | |
| parent | 8dbe6a6dc0d753a0f092fc2d4be508e48429c008 (diff) | |
| download | px4-firmware-089c4f0fd5a837b98634da1a66a170ad3834e7ca.tar.gz px4-firmware-089c4f0fd5a837b98634da1a66a170ad3834e7ca.tar.bz2 px4-firmware-089c4f0fd5a837b98634da1a66a170ad3834e7ca.zip | |
Merge remote-tracking branch 'upstream/obcfailsafe' into obcfailsafe
| -rw-r--r-- | src/drivers/px4io/px4io.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index 32069cf09..afb03789f 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -1169,7 +1169,8 @@ PX4IO::io_set_arming_state() clear |= PX4IO_P_SETUP_ARMING_LOCKDOWN; } - if (armed.force_failsafe) { + /* Do not set failsafe if circuit breaker is enabled */ + if (armed.force_failsafe && !circuit_breaker_enabled("CBRK_FLIGHTTERMINATION", CBRK_FLIGHTTERMINATION_KEY)) { set |= PX4IO_P_SETUP_ARMING_FORCE_FAILSAFE; } else { clear |= PX4IO_P_SETUP_ARMING_FORCE_FAILSAFE; |