Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Code Issues Wiki Activity

Merge pull request #10489 from etracer65/msp_displayport_serial_validation

Browse source 
Fix incorrect displayport_msp_serial default and add validation
This commit is contained in:
Michael Keller 2021-02-14 15:31:46 +13:00 • committed by GitHub
commit bd5c813bb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -68,6 +68,7 @@
#include "pg/adc.h"
#include "pg/beeper.h"
#include "pg/beeper_dev.h"
#include "pg/displayport_profiles.h"
#include "pg/gyrodev.h"
#include "pg/motor.h"
#include "pg/pg.h"
@ -598,6 +599,18 @@ static void validateAndFixConfig(void)
batteryConfigMutable()->vbatmaxcellvoltage = VBAT_CELL_VOLTAGE_DEFAULT_MAX;
}
// validate that displayport_msp_serial is referencing a valid UART that actually has MSP enabled
if (displayPortProfileMsp()->displayPortSerial != SERIAL_PORT_NONE) {
const serialPortConfig_t *portConfig = serialFindPortConfiguration(displayPortProfileMsp()->displayPortSerial);
if (!portConfig || !(portConfig->functionMask & FUNCTION_MSP)
#ifndef USE_MSP_PUSH_OVER_VCP
|| (portConfig->identifier == SERIAL_PORT_USB_VCP)
#endif
) {
displayPortProfileMspMutable()->displayPortSerial = SERIAL_PORT_NONE;
}
}
#if defined(TARGET_VALIDATECONFIG)
// This should be done at the end of the validation
targetValidateConfiguration();

9
src/main/pg/displayport_profiles.c
View file

@ -22,13 +22,20 @@
#include "platform.h"
#include "io/serial.h"
#include "pg/displayport_profiles.h"
#include "pg/pg.h"
#include "pg/pg_ids.h"
#if defined(USE_MSP_DISPLAYPORT)
PG_REGISTER(displayPortProfile_t, displayPortProfileMsp, PG_DISPLAY_PORT_MSP_CONFIG, 0);
PG_REGISTER_WITH_RESET_FN(displayPortProfile_t, displayPortProfileMsp, PG_DISPLAY_PORT_MSP_CONFIG, 0);
void pgResetFn_displayPortProfileMsp(displayPortProfile_t *displayPortProfile)
{
displayPortProfile->displayPortSerial = SERIAL_PORT_NONE;
}
#endif