dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

fix flight termination circuit breaker name, tested

This commit is contained in:
Thomas Gubler 2014-08-26 22:46:09 +02:00
parent 3d528a2c97
commit 5e5322c593
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/px4io/px4io.cpp
View File

@ -1170,7 +1170,7 @@ PX4IO::io_set_arming_state()
} }
/* Do not set failsafe if circuit breaker is enabled */ /* 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; set |= PX4IO_P_SETUP_ARMING_FORCE_FAILSAFE;
} else { } else {
clear |= PX4IO_P_SETUP_ARMING_FORCE_FAILSAFE; clear |= PX4IO_P_SETUP_ARMING_FORCE_FAILSAFE;

2
src/modules/systemlib/circuit_breaker.c
View File

@ -106,7 +106,7 @@ PARAM_DEFINE_INT32(CBRK_AIRSPD_CHK, 0);
* @max 121212 * @max 121212
* @group Circuit Breaker * @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) bool circuit_breaker_enabled(const char* breaker, int32_t magic)
{ {

2
src/modules/systemlib/circuit_breaker.h
View File

@ -53,7 +53,7 @@
#define CBRK_RATE_CTRL_KEY 140253 #define CBRK_RATE_CTRL_KEY 140253
#define CBRK_IO_SAFETY_KEY 22027 #define CBRK_IO_SAFETY_KEY 22027
#define CBRK_AIRSPD_CHK_KEY 162128 #define CBRK_AIRSPD_CHK_KEY 162128
#define CBRK_FLIGHTTERMINATION_KEY 121212 #define CBRK_FLIGHTTERM_KEY 121212
#include <stdbool.h> #include <stdbool.h>