1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 17:55:30 +03:00

Do not go into failsafe when the correct roll/pitch/yaw/throttle are sent via MSP_OVERRIDE (#13380)

* Override failsafe when MSP_OVERRIDE active

Fixes #13374

Set `rxSignalReceived = true` If MSP_OVERRIDE is active, so that it can be checked later. Otherwise, MSP controls are not considered in failsafe checks.

* Do override only if BOXMOODEOVERRIDE box is active as well

* Update msp.h

* Update msp.c

* Make sure that failsafe works when there is no signal from MSP

* Introduce rxMspOverrideFrameStatus to make a clear separation from rxMspFrameStatus

* Update src/main/rx/msp.c

Co-authored-by: Mark Haslinghuis <mark@numloq.nl>

* add msp_override_failsafe

* Update src/main/pg/rx.h

Co-authored-by: Mark Haslinghuis <mark@numloq.nl>

* Update src/main/rx/rx.c

Co-authored-by: Mark Haslinghuis <mark@numloq.nl>

---------

Co-authored-by: Mark Haslinghuis <mark@numloq.nl>
This commit is contained in:
Yura Kriachko 2024-03-05 09:59:34 +01:00 committed by GitHub
parent ddc81cb4fa
commit a0c0e191e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 27 additions and 0 deletions

View file

@ -789,6 +789,7 @@ const clivalue_t valueTable[] = {
{ "serialrx_halfduplex", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_RX_CONFIG, offsetof(rxConfig_t, halfDuplex) },
#if defined(USE_RX_MSP_OVERRIDE)
{ "msp_override_channels_mask", VAR_UINT32 | MASTER_VALUE, .config.u32Max = (1 << MAX_SUPPORTED_RC_CHANNEL_COUNT) - 1, PG_RX_CONFIG, offsetof(rxConfig_t, msp_override_channels_mask)},
{ "msp_override_failsafe", VAR_UINT8 | HARDWARE_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_RX_CONFIG, offsetof(rxConfig_t, msp_override_failsafe)},
#endif
#ifdef USE_RX_SPI
{ "rx_spi_protocol", VAR_UINT8 | HARDWARE_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_RX_SPI }, PG_RX_SPI_CONFIG, offsetof(rxSpiConfig_t, rx_spi_protocol) },