Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00
Code Issues Wiki Activity

Merge pull request #10584 from knoopx/fix-dp-msp-linking

Browse source 
fix: linking error when USE_MSP_DISPLAYPORT is undefined
This commit is contained in:
Michael Keller 2021-03-28 18:23:30 +13:00 • committed by GitHub
commit 3a6b1a9ca4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -599,6 +599,7 @@ static void validateAndFixConfig(void)
batteryConfigMutable()->vbatmaxcellvoltage = VBAT_CELL_VOLTAGE_DEFAULT_MAX; batteryConfigMutable()->vbatmaxcellvoltage = VBAT_CELL_VOLTAGE_DEFAULT_MAX;
} }
#ifdef USE_MSP_DISPLAYPORT
// validate that displayport_msp_serial is referencing a valid UART that actually has MSP enabled // validate that displayport_msp_serial is referencing a valid UART that actually has MSP enabled
if (displayPortProfileMsp()->displayPortSerial != SERIAL_PORT_NONE) { if (displayPortProfileMsp()->displayPortSerial != SERIAL_PORT_NONE) {
const serialPortConfig_t *portConfig = serialFindPortConfiguration(displayPortProfileMsp()->displayPortSerial); const serialPortConfig_t *portConfig = serialFindPortConfiguration(displayPortProfileMsp()->displayPortSerial);
@ -610,6 +611,7 @@ static void validateAndFixConfig(void)
displayPortProfileMspMutable()->displayPortSerial = SERIAL_PORT_NONE; displayPortProfileMspMutable()->displayPortSerial = SERIAL_PORT_NONE;
} }
} }
#endif
#if defined(TARGET_VALIDATECONFIG) #if defined(TARGET_VALIDATECONFIG)
// This should be done at the end of the validation // This should be done at the end of the validation