diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-26 22:46:09 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-26 22:46:09 +0200 |
| commit | 5e5322c593c6bd8ccd894f47ab8fd88b72e51677 (patch) | |
| tree | 0a386a9842de967e1b27acf691e054ea34704c8a | |
| parent | 3d528a2c979e7d0df1171afc1f038759c7b01383 (diff) | |
| download | px4-firmware-5e5322c593c6bd8ccd894f47ab8fd88b72e51677.tar.gz px4-firmware-5e5322c593c6bd8ccd894f47ab8fd88b72e51677.tar.bz2 px4-firmware-5e5322c593c6bd8ccd894f47ab8fd88b72e51677.zip | |
fix flight termination circuit breaker name, tested
| -rw-r--r-- | src/drivers/px4io/px4io.cpp | 2 | ||||
| -rw-r--r-- | src/modules/systemlib/circuit_breaker.c | 2 | ||||
| -rw-r--r-- | src/modules/systemlib/circuit_breaker.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index d5f569d71..b5c5ef17c 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -1170,7 +1170,7 @@ PX4IO::io_set_arming_state() } /* Do not set failsafe if circuit breaker is enabled */ - if (armed.force_failsafe && !circuit_breaker_enabled("CBRK_FLIGHTTERMINATION", CBRK_FLIGHTTERMINATION_KEY)) { + if (armed.force_failsafe && !circuit_breaker_enabled("CBRK_FLIGHTTERM", CBRK_FLIGHTTERM_KEY)) { set |= PX4IO_P_SETUP_ARMING_FORCE_FAILSAFE; } else { clear |= PX4IO_P_SETUP_ARMING_FORCE_FAILSAFE; diff --git a/src/modules/systemlib/circuit_breaker.c b/src/modules/systemlib/circuit_breaker.c index 8a0b51b71..b0f95aedf 100644 --- a/src/modules/systemlib/circuit_breaker.c +++ b/src/modules/systemlib/circuit_breaker.c @@ -106,7 +106,7 @@ PARAM_DEFINE_INT32(CBRK_AIRSPD_CHK, 0); * @max 121212 * @group Circuit Breaker */ -PARAM_DEFINE_INT32(CBRK_FLIGHTTERMINATION, 0); +PARAM_DEFINE_INT32(CBRK_FLIGHTTERM, 0); bool circuit_breaker_enabled(const char* breaker, int32_t magic) { diff --git a/src/modules/systemlib/circuit_breaker.h b/src/modules/systemlib/circuit_breaker.h index 54c4fced6..445a89d3a 100644 --- a/src/modules/systemlib/circuit_breaker.h +++ b/src/modules/systemlib/circuit_breaker.h @@ -53,7 +53,7 @@ #define CBRK_RATE_CTRL_KEY 140253 #define CBRK_IO_SAFETY_KEY 22027 #define CBRK_AIRSPD_CHK_KEY 162128 -#define CBRK_FLIGHTTERMINATION_KEY 121212 +#define CBRK_FLIGHTTERM_KEY 121212 #include <stdbool.h> |