diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index 1be9f9836d..e6095430c5 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -1032,7 +1032,7 @@ PX4IO::task_main() /* Check if the flight termination circuit breaker has been updated */ _cb_flighttermination = circuit_breaker_enabled("CBRK_FLIGHTTERM", CBRK_FLIGHTTERM_KEY); /* Tell IO that it can terminate the flight if FMU is not responding or if a failure has been reported by the FailureDetector logic */ - (void)io_reg_set(PX4IO_PAGE_SETUP, PX4IO_P_SETUP_ENABLE_FLIGHTTERM, !_cb_flighttermination); + (void)io_reg_set(PX4IO_PAGE_SETUP, PX4IO_P_SETUP_ENABLE_FLIGHTTERMINATION, !_cb_flighttermination); param_get(param_find("RC_RSSI_PWM_CHAN"), &_rssi_pwm_chan); param_get(param_find("RC_RSSI_PWM_MAX"), &_rssi_pwm_max); diff --git a/src/modules/px4iofirmware/mixer.cpp b/src/modules/px4iofirmware/mixer.cpp index 2a87ccc2cc..a01003a867 100644 --- a/src/modules/px4iofirmware/mixer.cpp +++ b/src/modules/px4iofirmware/mixer.cpp @@ -228,7 +228,7 @@ mixer_tick(void) * failsafe condition. */ if ( /* Flight termination is allowed */ - REG_TO_BOOL(r_setup_flightterm) && + REG_TO_BOOL(r_setup_flighttermination) && /* If we ended up not changing the default mixer */ (source == MIX_DISARMED) && /* and we should be armed, so we intended to provide outputs */ diff --git a/src/modules/px4iofirmware/protocol.h b/src/modules/px4iofirmware/protocol.h index 7fe2d0d369..2ca5eb6492 100644 --- a/src/modules/px4iofirmware/protocol.h +++ b/src/modules/px4iofirmware/protocol.h @@ -240,7 +240,7 @@ enum { /* DSM bind states */ #define PX4IO_P_SETUP_AIRMODE 27 /* air-mode */ -#define PX4IO_P_SETUP_ENABLE_FLIGHTTERM 28 /* flight termination circuit breaker */ +#define PX4IO_P_SETUP_ENABLE_FLIGHTTERMINATION 28 /* flight termination circuit breaker */ #define PX4IO_THERMAL_IGNORE UINT16_MAX #define PX4IO_THERMAL_OFF 0 diff --git a/src/modules/px4iofirmware/px4io.h b/src/modules/px4iofirmware/px4io.h index 8f021f847f..0b3d0634d7 100644 --- a/src/modules/px4iofirmware/px4io.h +++ b/src/modules/px4iofirmware/px4io.h @@ -133,7 +133,7 @@ extern uint16_t r_page_servo_disarmed[]; /* PX4IO_PAGE_DISARMED_PWM */ #define r_setup_thr_fac r_page_setup[PX4IO_P_SETUP_THR_MDL_FAC] #define r_setup_slew_max r_page_setup[PX4IO_P_SETUP_MOTOR_SLEW_MAX] #define r_setup_airmode r_page_setup[PX4IO_P_SETUP_AIRMODE] -#define r_setup_flightterm r_page_setup[PX4IO_P_SETUP_ENABLE_FLIGHTTERM] +#define r_setup_flighttermination r_page_setup[PX4IO_P_SETUP_ENABLE_FLIGHTTERMINATION] #define r_control_values (&r_page_controls[0]) diff --git a/src/modules/px4iofirmware/registers.c b/src/modules/px4iofirmware/registers.c index 2e0f19eb9d..8cd9d909e1 100644 --- a/src/modules/px4iofirmware/registers.c +++ b/src/modules/px4iofirmware/registers.c @@ -182,7 +182,7 @@ volatile uint16_t r_page_setup[] = { [PX4IO_P_SETUP_AIRMODE] = 0, [PX4IO_P_SETUP_THR_MDL_FAC] = 0, [PX4IO_P_SETUP_THERMAL] = PX4IO_THERMAL_IGNORE, - [PX4IO_P_SETUP_ENABLE_FLIGHTTERM] = 0 + [PX4IO_P_SETUP_ENABLE_FLIGHTTERMINATION] = 0 }; #define PX4IO_P_SETUP_FEATURES_VALID (PX4IO_P_SETUP_FEATURES_SBUS1_OUT | \ @@ -713,7 +713,7 @@ registers_set_one(uint8_t page, uint8_t offset, uint16_t value) case PX4IO_P_SETUP_MOTOR_SLEW_MAX: case PX4IO_P_SETUP_AIRMODE: case PX4IO_P_SETUP_THERMAL: - case PX4IO_P_SETUP_ENABLE_FLIGHTTERM: + case PX4IO_P_SETUP_ENABLE_FLIGHTTERMINATION: r_page_setup[offset] = value; break;