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

Revert #9215: Vendor specific displayport initialisation.

Browse source
This commit is contained in:
mikeller 2020-03-15 13:42:56 +13:00
parent b729c3cc99
commit e9cb979cd8
4 changed files with 0 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/cli/settings.c
View file

@ -1449,10 +1449,6 @@ const clivalue_t valueTable[] = {
{ "displayport_msp_serial", VAR_INT8 | MASTER_VALUE, .config.minmax = { SERIAL_PORT_NONE, SERIAL_PORT_IDENTIFIER_MAX }, PG_DISPLAY_PORT_MSP_CONFIG, offsetof(displayPortProfile_t, displayPortSerial) },
{ "displayport_msp_attrs", VAR_UINT8 | MASTER_VALUE | MODE_ARRAY, .config.array.length = 4, PG_DISPLAY_PORT_MSP_CONFIG, offsetof(displayPortProfile_t, attrValues) },
{ "displayport_msp_use_device_blink", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_DISPLAY_PORT_MSP_CONFIG, offsetof(displayPortProfile_t, useDeviceBlink) },
#ifdef USE_DISPLAYPORT_MSP_VENDOR_SPECIFIC
{ "displayport_msp_vendor_init", VAR_UINT8 | MASTER_VALUE | MODE_ARRAY, .config.array.length = 253, PG_DISPLAY_PORT_MSP_CONFIG, offsetof(displayPortProfile_t, vendorInit) },
{ "displayport_msp_vendor_init_length", VAR_UINT8 | MASTER_VALUE, .config.minmaxUnsigned = { 0, 252 }, PG_DISPLAY_PORT_MSP_CONFIG, offsetof(displayPortProfile_t, vendorInitLength) },
#endif // USE_DISPLAYPORT_MSP_VENDOR_SPECIFIC
#endif
// PG_DISPLAY_PORT_MSP_CONFIG

15
src/main/io/displayport_msp.c
View file

@ -172,21 +172,6 @@ static const displayPortVTable_t mspDisplayPortVTable = {
displayPort_t *displayPortMspInit(void)
{
#ifdef USE_DISPLAYPORT_MSP_VENDOR_SPECIFIC
// XXX Should handle the case that a device starts to listen after the init string is sent
// XXX 1. Send the init string periodically while not armed.
// XXX 2. Send the init string in response to device identification message from a device.
// Send vendor specific initialization string.
// The string start with subcommand code.
int initLength = displayPortProfileMsp()->vendorInitLength;
if (initLength) {
output(&mspDisplayPort, MSP_DISPLAYPORT, (uint8_t *)displayPortProfileMsp()->vendorInit, initLength);
}
#endif
displayInit(&mspDisplayPort, &mspDisplayPortVTable);
if (displayPortProfileMsp()->useDeviceBlink) {

4
src/main/pg/displayport_profiles.h
View file

@ -34,10 +34,6 @@ typedef struct displayPortProfile_s {
uint8_t attrValues[4]; // NORMAL, INFORMATIONAL, WARNING, CRITICAL
uint8_t useDeviceBlink; // Use device local blink capability
#ifdef USE_DISPLAYPORT_MSP_VENDOR_SPECIFIC
uint8_t vendorInitLength; // Actual length of vendorInit byte string
uint8_t vendorInit[253]; // Max 253 bytes of vendor specific initialization byte string
#endif
} displayPortProfile_t;
PG_DECLARE(displayPortProfile_t, displayPortProfileMsp);

5
src/main/target/common_defaults_post.h
View file

@ -686,8 +686,3 @@
#define DSHOT_BITBANGED_TIMER_DEFAULT DSHOT_BITBANGED_TIMER_AUTO
#endif
#endif // USE_DSHOT_BITBANG
// XXX Tentative; may be removed
#if defined(USE_MSP_DISPLAYPORT) && defined(USE_OSD_OVER_MSP_DISPLAYPORT)
//#define USE_DISPLAYPORT_MSP_VENDOR_SPECIFIC
#endif