forked from Archive/PX4-Autopilot
fix flight termination circuit breaker name, tested
This commit is contained in:
parent
3d528a2c97
commit
5e5322c593
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
Loading…
Reference in New Issue