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

Merge pull request #11913 from SteveCEvans/msp_dp

Browse source 
Enable MSP Displayport on a serial port using FUNCTION_MSP_DISPLAYPORT
This commit is contained in:
haslinghuis 2022-10-25 12:52:34 +02:00 • committed by GitHub
commit b8bacc47f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 61 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

70
docs/Serial.md
View file

@ -76,21 +76,21 @@ Note: for Identifier see serialPortIdentifier_e in the source; for Function bitm
| Identifier | Value |
| -------------------------- | ----- |
| SERIAL_PORT_NONE | -1 |
| SERIAL_PORT_USART1 | 0 |
| SERIAL_PORT_USART2 | 1 |
| SERIAL_PORT_USART3 | 2 |
| SERIAL_PORT_UART4 | 3 |
| SERIAL_PORT_UART5 | 4 |
| SERIAL_PORT_USART6 | 5 |
| SERIAL_PORT_USART7 | 6 |
| SERIAL_PORT_USART8 | 7 |
| SERIAL_PORT_UART9 | 8 |
| SERIAL_PORT_USART10 | 9 |
| SERIAL_PORT_USB_VCP | 20 |
| SERIAL_PORT_SOFTSERIAL1 | 30 |
| SERIAL_PORT_SOFTSERIAL2 | 31 |
| SERIAL_PORT_LPUART1 | 40 |
| SERIAL\_PORT\_NONE | -1 |
| SERIAL\_PORT\_USART1 | 0 |
| SERIAL\_PORT\_USART2 | 1 |
| SERIAL\_PORT\_USART3 | 2 |
| SERIAL\_PORT\_UART4 | 3 |
| SERIAL\_PORT\_UART5 | 4 |
| SERIAL\_PORT\_USART6 | 5 |
| SERIAL\_PORT\_USART7 | 6 |
| SERIAL\_PORT\_USART8 | 7 |
| SERIAL\_PORT\_UART9 | 8 |
| SERIAL\_PORT\_USART10 | 9 |
| SERIAL\_PORT\_USB\_VCP | 20 |
| SERIAL\_PORT\_SOFTSERIAL1 | 30 |
| SERIAL\_PORT\_SOFTSERIAL2 | 31 |
| SERIAL\_PORT\_LPUART1 | 40 |
ID's 0-19 reserved for UARTS 1-20
ID's 20-29 reserved for USB 1-10
@ -102,25 +102,26 @@ Other devices can be added starting from id 50.
| Function | Value | Bit |
| ---------------------------- | ------ | --- |
| FUNCTION_NONE | 0 | 0 |
| FUNCTION_MSP | 1 | 1 << 0 |
| FUNCTION_GPS | 2 | 1 << 1 |
| FUNCTION_TELEMETRY_FRSKY_HUB | 4 | 1 << 2 |
| FUNCTION_TELEMETRY_HOTT | 8 | 1 << 3 |
| FUNCTION_TELEMETRY_LTM | 16 | 1 << 4 |
| FUNCTION_TELEMETRY_SMARTPORT | 32 | 1 << 5 |
| FUNCTION_RX_SERIAL | 64 | 1 << 6 |
| FUNCTION_BLACKBOX | 128 | 1 << 7 |
| NOT USED | 256 | 1 << 8 |
| FUNCTION_TELEMETRY_MAVLINK | 512 | 1 << 9 |
| FUNCTION_ESC_SENSOR | 1024 | 1 << 10 |
| FUNCTION_VTX_SMARTAUDIO | 2048 | 1 << 11 |
| FUNCTION_TELEMETRY_IBUS | 4096 | 1 << 12 |
| FUNCTION_VTX_TRAMP | 8192 | 1 << 13 |
| FUNCTION_RCDEVICE | 16384 | 1 << 14 |
| FUNCTION_LIDAR_TF | 32768 | 1 << 15 |
| FUNCTION_FRSKY_OSD | 65536 | 1 << 16 |
| FUNCTION_VTX_MSP | 131072 | 1 << 17 |
| FUNCTION\_NONE | 0 | 0 |
| FUNCTION\_MSP | 1 | 1 << 0 |
| FUNCTION\_GPS | 2 | 1 << 1 |
| FUNCTION\_TELEMETRY\_FRSKY_HUB | 4 | 1 << 2 |
| FUNCTION\_TELEMETRY\_HOTT | 8 | 1 << 3 |
| FUNCTION\_TELEMETRY\_LTM | 16 | 1 << 4 |
| FUNCTION\_TELEMETRY\_SMARTPORT | 32 | 1 << 5 |
| FUNCTION\_RX_SERIAL | 64 | 1 << 6 |
| FUNCTION\_BLACKBOX | 128 | 1 << 7 |
| NOT USED | 256 | 1 << 8 |
| FUNCTION\_TELEMETRY\_MAVLINK | 512 | 1 << 9 |
| FUNCTION\_ESC\_SENSOR | 1024 | 1 << 10 |
| FUNCTION\_VTX\_SMARTAUDIO | 2048 | 1 << 11 |
| FUNCTION\_TELEMETRY\_IBUS | 4096 | 1 << 12 |
| FUNCTION\_VTX\_TRAMP | 8192 | 1 << 13 |
| FUNCTION\_RCDEVICE | 16384 | 1 << 14 |
| FUNCTION\_LIDAR\_TF | 32768 | 1 << 15 |
| FUNCTION\_FRSKY\_OSD | 65536 | 1 << 16 |
| FUNCTION\_VTX\_MSP | 131072 | 1 << 17 |
| FUNCTION\_MSP\_DISPLAYPORT | 262145 | (1 << 18) \| FUNCTION\_MSP |
Note: `FUNCTION_FRSKY_OSD` = `(1<<16)` requires 17 bits.
Note2: We can use up to 32 bits (1<<32) here.
@ -204,7 +205,6 @@ The Serial Port baudrates are defined as follows:
| 14 | 2000000 |
| 15 | 2470000 |
### Passthrough
Betaflight can enter a special passthrough mode whereby it passes serial data through to a device connected to a UART/SoftSerial port. This is useful to change the configuration of a Betaflight peripheral such as an OSD, bluetooth dongle, serial RX etc.

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

@ -1509,7 +1509,6 @@ const clivalue_t valueTable[] = {
#ifdef USE_MSP_DISPLAYPORT
{ "displayport_msp_col_adjust", VAR_INT8 | MASTER_VALUE, .config.minmax = { -6, 0 }, PG_DISPLAY_PORT_MSP_CONFIG, offsetof(displayPortProfile_t, colAdjust) },
{ "displayport_msp_row_adjust", VAR_INT8 | MASTER_VALUE, .config.minmax = { -3, 0 }, PG_DISPLAY_PORT_MSP_CONFIG, offsetof(displayPortProfile_t, rowAdjust) },
{ "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) },
#endif

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

@ -57,6 +57,7 @@
#include "flight/position.h"
#include "io/beeper.h"
#include "io/displayport_msp.h"
#include "io/gps.h"
#include "io/ledstrip.h"
#include "io/serial.h"
@ -577,15 +578,17 @@ static void validateAndFixConfig(void)
}
#ifdef USE_MSP_DISPLAYPORT
// 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;
// Find the first serial port on which MSP Displayport is enabled
displayPortMspSetSerial(SERIAL_PORT_NONE);
for (uint8_t serialPort = 0; serialPort < SERIAL_PORT_COUNT; serialPort++) {
const serialPortConfig_t *portConfig = &serialConfig()->portConfigs[serialPort];
if (portConfig &&
(portConfig->identifier != SERIAL_PORT_USB_VCP) &&
((portConfig->functionMask & FUNCTION_MSP_DISPLAYPORT) == FUNCTION_MSP_DISPLAYPORT)) {
displayPortMspSetSerial(portConfig->identifier);
break;
}
}
#endif

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

@ -43,6 +43,7 @@
#include "pg/vcd.h"
static displayPort_t mspDisplayPort;
static serialPortIdentifier_e displayPortSerial;
static int output(displayPort_t *displayPort, uint8_t cmd, uint8_t *buf, int len)
{
@ -54,7 +55,7 @@ static int output(displayPort_t *displayPort, uint8_t cmd, uint8_t *buf, int len
return 0;
}
#endif
return mspSerialPush(displayPortProfileMsp()->displayPortSerial, cmd, buf, len, MSP_DIRECTION_REPLY, MSP_V1);
return mspSerialPush(displayPortSerial, cmd, buf, len, MSP_DIRECTION_REPLY, MSP_V1);
}
static int heartbeat(displayPort_t *displayPort)
@ -191,4 +192,8 @@ displayPort_t *displayPortMspInit(void)
redraw(&mspDisplayPort);
return &mspDisplayPort;
}
void displayPortMspSetSerial(serialPortIdentifier_e serialPort) {
displayPortSerial = serialPort;
}
#endif // USE_MSP_DISPLAYPORT

4
src/main/io/displayport_msp.h
View file

@ -22,6 +22,8 @@
#include "drivers/display.h"
#include "io/serial.h"
#include "pg/displayport_profiles.h"
// MSP Display Port commands
@ -36,3 +38,5 @@
#define DISPLAYPORT_MSP_ATTR_MASK (~(DISPLAYPORT_MSP_ATTR_VERSION|DISPLAYPORT_MSP_ATTR_BLINK))
struct displayPort_s *displayPortMspInit(void);
void displayPortMspSetSerial(serialPortIdentifier_e serialPort);

4
src/main/io/serial.c
View file

@ -272,9 +272,9 @@ serialPort_t *findSharedSerialPort(uint16_t functionMask, serialPortFunction_e s
}
#ifdef USE_TELEMETRY
#define ALL_FUNCTIONS_SHARABLE_WITH_MSP (FUNCTION_BLACKBOX | TELEMETRY_PORT_FUNCTIONS_MASK | FUNCTION_VTX_MSP)
#define ALL_FUNCTIONS_SHARABLE_WITH_MSP (FUNCTION_BLACKBOX | TELEMETRY_PORT_FUNCTIONS_MASK | FUNCTION_VTX_MSP | FUNCTION_MSP_DISPLAYPORT)
#else
#define ALL_FUNCTIONS_SHARABLE_WITH_MSP (FUNCTION_BLACKBOX | FUNCTION_VTX_MSP)
#define ALL_FUNCTIONS_SHARABLE_WITH_MSP (FUNCTION_BLACKBOX | FUNCTION_VTX_MSP | FUNCTION_MSP_DISPLAYPORT)
#endif
bool isSerialConfigValid(const serialConfig_t *serialConfigToCheck)

1
src/main/io/serial.h
View file

@ -51,6 +51,7 @@ typedef enum {
FUNCTION_LIDAR_TF = (1 << 15), // 32768
FUNCTION_FRSKY_OSD = (1 << 16), // 65536
FUNCTION_VTX_MSP = (1 << 17), // 131072
FUNCTION_MSP_DISPLAYPORT = (1 << 18) | FUNCTION_MSP, // 262145
} serialPortFunction_e;
#define TELEMETRY_SHAREABLE_PORT_FUNCTIONS_MASK (FUNCTION_TELEMETRY_FRSKY_HUB | FUNCTION_TELEMETRY_LTM | FUNCTION_TELEMETRY_MAVLINK)

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

@ -30,12 +30,7 @@
#if defined(USE_MSP_DISPLAYPORT)
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;
}
PG_REGISTER(displayPortProfile_t, displayPortProfileMsp, PG_DISPLAY_PORT_MSP_CONFIG, 1);
#endif

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

@ -28,7 +28,6 @@ typedef struct displayPortProfile_s {
bool invert;
uint8_t blackBrightness;
uint8_t whiteBrightness;
int8_t displayPortSerial; // serialPortIdentifier_e
// For attribute-rich OSDs