Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-24 08:45:31 +03:00
Code Issues Wiki Activity

Rename HDzero to MSP displayport

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2022-10-01 11:22:04 +02:00
parent cdbd2b390a
commit 285a0f8180
8 changed files with 45 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/Cli.md
View file

@ -156,7 +156,7 @@ A shorter form is also supported to enable and disable a single function using `
| SERVO_SERIAL | 22 | 4194304 |
| TELEMETRY_SMARTPORT_MASTER | 23 | 8388608 |
| IMU2 | 24 | 16777216 |
| HDZERO | 25 | 33554432 |
| MSP_DISPLAYPORT | 25 | 33554432 |
Thus, to enable MSP and LTM on a port, one would use the function **value** of 17 (1 << 0)+(1<<4), aka 1+16, aka 17.

4
src/main/CMakeLists.txt
View file

@ -482,8 +482,8 @@ main_sources(COMMON_SRC
io/displayport_msp.h
io/displayport_oled.c
io/displayport_oled.h
io/displayport_hdzero_osd.c
io/displayport_hdzero_osd.h
io/displayport_msp_osd.c
io/displayport_msp_osd.h
io/displayport_srxl.c
io/displayport_srxl.h
io/displayport_hott.c

6
src/main/fc/fc_init.c
View file

@ -106,7 +106,7 @@
#include "io/displayport_frsky_osd.h"
#include "io/displayport_msp.h"
#include "io/displayport_max7456.h"
#include "io/displayport_hdzero_osd.h"
#include "io/displayport_msp_osd.h"
#include "io/displayport_srxl.h"
#include "io/flashfs.h"
#include "io/gps.h"
@ -547,9 +547,9 @@ void init(void)
osdDisplayPort = frskyOSDDisplayPortInit(osdConfig()->video_system);
}
#endif
#ifdef USE_HDZERO_OSD
#ifdef USE_MSP_OSD
if (!osdDisplayPort) {
osdDisplayPort = hdzeroOsdDisplayPortInit();
osdDisplayPort = mspOsdDisplayPortInit();
}
#endif
#if defined(USE_MAX7456)

8
src/main/fc/fc_tasks.c
View file

@ -66,7 +66,7 @@
#include "io/smartport_master.h"
#include "io/vtx.h"
#include "io/osd_dji_hd.h"
#include "io/displayport_hdzero_osd.h"
#include "io/displayport_msp_osd.h"
#include "io/servo_sbus.h"
#include "msp/msp_serial.h"
@ -107,9 +107,9 @@ void taskHandleSerial(timeUs_t currentTimeUs)
djiOsdSerialProcess();
#endif
#ifdef USE_HDZERO_OSD
// Capture HDZero messages to determine if VTX is connected
hdzeroOsdSerialProcess(mspFcProcessCommand);
#ifdef USE_MSP_OSD
// Capture MSP Displayport messages to determine if VTX is connected
mspOsdSerialProcess(mspFcProcessCommand);
#endif
}

62
src/main/io/displayport_hdzero_osd.c → src/main/io/displayport_msp_osd.c
View file

@ -30,9 +30,9 @@
FILE_COMPILE_FOR_SPEED
//#define HDZERO_STATS
//#define MSP_DISPLAYPORT_STATS
#if defined(USE_OSD) && defined(USE_HDZERO_OSD)
#if defined(USE_OSD) && defined(USE_MSP_OSD)
#include "common/utils.h"
#include "common/printf.h"
@ -46,7 +46,7 @@ FILE_COMPILE_FOR_SPEED
#include "msp/msp_protocol.h"
#include "msp/msp_serial.h"
#include "displayport_hdzero_osd.h"
#include "displayport_msp_osd.h"
#define FONT_VERSION 3
@ -59,8 +59,8 @@ FILE_COMPILE_FOR_SPEED
#define VTX_TIMEOUT 1000 // 1 second timer
static mspProcessCommandFnPtr mspProcessCommand;
static mspPort_t hdZeroMspPort;
static displayPort_t hdZeroOsdDisplayPort;
static mspPort_t mspPort;
static displayPort_t mspOsdDisplayPort;
static bool vtxSeen, vtxActive, vtxReset;
static timeMs_t vtxHeartbeat;
@ -75,7 +75,7 @@ static bool screenCleared;
extern uint8_t cliMode;
#ifdef HDZERO_STATS
#ifdef MSP_DISPLAYPORT_STATS
static uint32_t dataSent;
static uint8_t resetCount;
#endif
@ -87,10 +87,10 @@ static int output(displayPort_t *displayPort, uint8_t cmd, uint8_t *subcmd, int
int sent = 0;
if (!cliMode && vtxActive) {
sent = mspSerialPushPort(cmd, subcmd, len, &hdZeroMspPort, MSP_V1);
sent = mspSerialPushPort(cmd, subcmd, len, &mspPort, MSP_V1);
}
#ifdef HDZERO_STATS
#ifdef MSP_DISPLAYPORT_STATS
dataSent += sent;
#endif
@ -111,7 +111,7 @@ static int setHdMode(displayPort_t *displayPort)
return output(displayPort, MSP_DISPLAYPORT, subcmd, sizeof(subcmd));
}
static void hdZeroInit(void)
static void init(void)
{
memset(screen, SYM_BLANK, sizeof(screen));
BITARRAY_CLR_ALL(fontPage);
@ -122,7 +122,7 @@ static int clearScreen(displayPort_t *displayPort)
{
uint8_t subcmd[] = { MSP_CLEAR_SCREEN };
hdZeroInit();
init();
setHdMode(displayPort);
screenCleared = true;
return output(displayPort, MSP_DISPLAYPORT, subcmd, sizeof(subcmd));
@ -183,7 +183,7 @@ static int writeString(displayPort_t *displayPort, uint8_t col, uint8_t row, con
return 0;
}
#ifdef HDZERO_STATS
#ifdef MSP_DISPLAYPORT_STATS
static void printStats(displayPort_t *displayPort, uint32_t updates)
{
static timeMs_t lastTime;
@ -195,7 +195,7 @@ static void printStats(displayPort_t *displayPort, uint32_t updates)
maxUpdates = updates; // updates sent per displayWrite
}
uint32_t bufferUsed = TX_BUFFER_SIZE - serialTxBytesFree(hdZeroMspPort.port);
uint32_t bufferUsed = TX_BUFFER_SIZE - serialTxBytesFree(mspPort.port);
if (bufferUsed > maxBufferUsed) {
maxBufferUsed = bufferUsed; // serial buffer used after displayWrite
}
@ -212,7 +212,7 @@ static void printStats(displayPort_t *displayPort, uint32_t updates)
tfp_sprintf(lineBuffer, "R:%2d %4ld %5ld(%5ld) U:%2ld(%2ld) B:%3ld(%4ld,%4ld)", resetCount, (millis()-vtxHeartbeat),
dataSent, maxDataSent, updates, maxUpdates, bufferUsed, maxBufferUsed, hdZeroMspPort.port->txBufferSize);
dataSent, maxDataSent, updates, maxUpdates, bufferUsed, maxBufferUsed, mspPort.port->txBufferSize);
writeString(displayPort, 0, 17, lineBuffer, 0);
}
#endif
@ -264,13 +264,13 @@ static int drawScreen(displayPort_t *displayPort) // 250Hz
output(displayPort, MSP_DISPLAYPORT, subcmd, 1);
}
#ifdef HDZERO_STATS
#ifdef MSP_DISPLAYPORT_STATS
printStats(displayPort, updateCount);
#endif
checkVtxPresent();
if (vtxReset) {
#ifdef HDZERO_STATS
#ifdef MSP_DISPLAYPORT_STATS
resetCount++;
#endif
clearScreen(displayPort);
@ -344,7 +344,7 @@ static int release(displayPort_t *displayPort)
return 0;
}
static const displayPortVTable_t hdzeroOsdVTable = {
static const displayPortVTable_t mspOsdVTable = {
.grab = grab,
.release = release,
.clearScreen = clearScreen,
@ -362,14 +362,14 @@ static const displayPortVTable_t hdzeroOsdVTable = {
.isReady = isReady,
};
bool hdzeroOsdSerialInit(void)
bool mspOsdSerialInit(void)
{
static volatile uint8_t txBuffer[TX_BUFFER_SIZE];
memset(&hdZeroMspPort, 0, sizeof(mspPort_t));
memset(&mspPort, 0, sizeof(mspPort_t));
serialPortConfig_t *portConfig = findSerialPortConfig(FUNCTION_HDZERO_OSD);
serialPortConfig_t *portConfig = findSerialPortConfig(FUNCTION_MSP_OSD);
if (portConfig) {
serialPort_t *port = openSerialPort(portConfig->identifier, FUNCTION_HDZERO_OSD, NULL, NULL,
serialPort_t *port = openSerialPort(portConfig->identifier, FUNCTION_MSP_OSD, NULL, NULL,
baudRates[portConfig->peripheral_baudrateIndex], MODE_RXTX, SERIAL_NOT_INVERTED);
if (port) {
@ -379,7 +379,7 @@ bool hdzeroOsdSerialInit(void)
port->txBufferTail = 0;
port->txBufferHead = 0;
resetMspPort(&hdZeroMspPort, port);
resetMspPort(&mspPort, port);
return true;
}
@ -388,12 +388,12 @@ bool hdzeroOsdSerialInit(void)
return false;
}
displayPort_t* hdzeroOsdDisplayPortInit(void)
displayPort_t* mspOsdDisplayPortInit(void)
{
if (hdzeroOsdSerialInit()) {
hdZeroInit();
displayInit(&hdZeroOsdDisplayPort, &hdzeroOsdVTable);
return &hdZeroOsdDisplayPort;
if (mspOsdSerialInit()) {
init();
displayInit(&osdDisplayPort, &mspOsdVTable);
return &osdDisplayPort;
}
return NULL;
}
@ -403,7 +403,7 @@ displayPort_t* hdzeroOsdDisplayPortInit(void)
* VTX sends an MSP command every 125ms or so.
* VTX will have be marked as not ready if no commands received within VTX_TIMEOUT.
*/
static mspResult_e hdZeroProcessMspCommand(mspPacket_t *cmd, mspPacket_t *reply, mspPostProcessFnPtr *mspPostProcessFn)
static mspResult_e processMspCommand(mspPacket_t *cmd, mspPacket_t *reply, mspPostProcessFnPtr *mspPostProcessFn)
{
if (vtxSeen && !vtxActive) {
vtxReset = true;
@ -416,12 +416,12 @@ static mspResult_e hdZeroProcessMspCommand(mspPacket_t *cmd, mspPacket_t *reply,
return mspProcessCommand(cmd, reply, mspPostProcessFn);
}
void hdzeroOsdSerialProcess(mspProcessCommandFnPtr mspProcessCommandFn)
void mspOsdSerialProcess(mspProcessCommandFnPtr mspProcessCommandFn)
{
if (hdZeroMspPort.port) {
if (mspPort.port) {
mspProcessCommand = mspProcessCommandFn;
mspSerialProcessOnePort(&hdZeroMspPort, MSP_SKIP_NON_MSP_DATA, hdZeroProcessMspCommand);
mspSerialProcessOnePort(&mspPort, MSP_SKIP_NON_MSP_DATA, processMspCommand);
}
}
#endif // USE_HDZERO_OSD
#endif // USE_MSP_OSD

4
src/main/io/displayport_hdzero_osd.h → src/main/io/displayport_msp_osd.h
View file

@ -29,5 +29,5 @@
typedef struct displayPort_s displayPort_t;
displayPort_t *hdzeroOsdDisplayPortInit(void);
void hdzeroOsdSerialProcess(mspProcessCommandFnPtr mspProcessCommandFn);
displayPort_t *mspOsdDisplayPortInit(void);
void mspOsdSerialProcess(mspProcessCommandFnPtr mspProcessCommandFn);

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

@ -56,7 +56,7 @@ typedef enum {
FUNCTION_SERVO_SERIAL = (1 << 22), // 4194304
FUNCTION_TELEMETRY_SMARTPORT_MASTER = (1 << 23), // 8388608
FUNCTION_IMU2 = (1 << 24), // 16777216
FUNCTION_HDZERO_OSD = (1 << 25), // 33554432
FUNCTION_MSP_OSD = (1 << 25), // 33554432
} serialPortFunction_e;
typedef enum {

2
src/main/target/common.h
View file

@ -114,7 +114,7 @@
#define USE_OSD
#define USE_FRSKYOSD
#define USE_DJI_HD_OSD
#define USE_HDZERO_OSD
#define USE_MSP_OSD
#define USE_SMARTPORT_MASTER
#define NAV_NON_VOLATILE_WAYPOINT_CLI