Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 11:29:58 +03:00
Code Issues Wiki Activity

refactor to packed struct

Browse source
This commit is contained in:
Eike Ahmels 2025-05-19 07:56:15 +02:00
parent 2fcd9c632c
commit 369e87a694
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,6 +47,14 @@
static displayPort_t mspDisplayPort; static displayPort_t mspDisplayPort;
static serialPortIdentifier_e displayPortSerial; static serialPortIdentifier_e displayPortSerial;
typedef struct displayPortMspCommand_s {
uint8_t command;
uint8_t row;
uint8_t col;
uint8_t attribute;
uint8_t data[OSD_CHAR_BYTES];
} __attribute__((packed)) displayPortMspCommand_t;
static int output(displayPort_t *displayPort, uint8_t cmd, uint8_t *buf, int len) static int output(displayPort_t *displayPort, uint8_t cmd, uint8_t *buf, int len)
{ {
UNUSED(displayPort); UNUSED(displayPort);
@ -171,21 +179,20 @@ static uint32_t txBytesFree(const displayPort_t *displayPort)
#ifdef USE_MSP_DISPLAYPORT_FONT #ifdef USE_MSP_DISPLAYPORT_FONT
static bool writeFontCharacter(displayPort_t *displayPort, uint16_t addr, const osdCharacter_t *chr) static bool writeFontCharacter(displayPort_t *displayPort, uint16_t addr, const osdCharacter_t *chr)
{ {
uint8_t buf[OSD_CHAR_BYTES + 4]; displayPortMspCommand_t displayPortCommand;
if (!chr) { if (!chr) {
return false; return false;
} }
uint8_t *p = buf; displayPortCommand.command = MSP_DP_FONTCHAR_WRITE;
*p++ = MSP_DP_FONTCHAR_WRITE; // command (index 0) displayPortCommand.row = addr & 0xff;
*p++ = addr & 0xff; // address low (index 1) displayPortCommand.col = (addr >> 8) & 0xff;
*p++ = (addr >> 8) & 0xff; // address high (index 2) displayPortCommand.attribute = 0;
*p++ = 0; // padding (index 3)
memcpy(p, chr->data, OSD_CHAR_BYTES); // write font char data (index >= 4 < len(buf)) memcpy(displayPortCommand.data, chr->data, OSD_CHAR_BYTES);
p += OSD_CHAR_BYTES;
int res = output(displayPort, MSP_DISPLAYPORT, buf, p - buf); int res = output(displayPort, MSP_DISPLAYPORT, (uint8_t*)&displayPortCommand, OSD_CHAR_BYTES + 4);
// 80ms delay needed to ensure the MSP display has enough time to process the font data // 80ms delay needed to ensure the MSP display has enough time to process the font data
delay(80); delay(80);