Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-14 11:59:58 +03:00
Code Issues Wiki Activity

Added missing GUI box for MSP override.

Browse source
This commit is contained in:
Michael Keller 2021-01-07 14:31:26 +13:00
parent 3df0053d2e
commit d8d15efb98
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/config/config.c
View file

@ -581,6 +581,10 @@ static void validateAndFixConfig(void)
validateAndFixRatesSettings(); // constrain the various rates settings to limits imposed by the rates type validateAndFixRatesSettings(); // constrain the various rates settings to limits imposed by the rates type
#if defined(USE_RX_MSP_OVERRIDE) #if defined(USE_RX_MSP_OVERRIDE)
if (!rxConfig()->msp_override_channels_mask) {
removeModeActivationCondition(BOXMSPOVERRIDE);
}
for (int i = 0; i < MAX_MODE_ACTIVATION_CONDITION_COUNT; i++) { for (int i = 0; i < MAX_MODE_ACTIVATION_CONDITION_COUNT; i++) {
const modeActivationCondition_t *mac = modeActivationConditions(i); const modeActivationCondition_t *mac = modeActivationConditions(i);
if (mac->modeId == BOXMSPOVERRIDE && ((1 << (mac->auxChannelIndex) & (rxConfig()->msp_override_channels_mask)))) { if (mac->modeId == BOXMSPOVERRIDE && ((1 << (mac->auxChannelIndex) & (rxConfig()->msp_override_channels_mask)))) {

6
src/main/msp/msp_box.c
View file

@ -333,6 +333,12 @@ void initActiveBoxIds(void)
BME(BOXLAUNCHCONTROL); BME(BOXLAUNCHCONTROL);
#endif #endif
#if defined(USE_RX_MSP_OVERRIDE)
if (rxConfig()->msp_override_channels_mask) {
BME(BOXMSPOVERRIDE);
}
#endif
BME(BOXSTICKCOMMANDDISABLE); BME(BOXSTICKCOMMANDDISABLE);
#undef BME #undef BME