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

fix gcc 10 warnings

Browse source
This commit is contained in:
Jonathan Hudson 2020-05-22 15:52:24 +01:00
parent 2501949e98
commit 16d331df42
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/drivers/display.c
View file

@ -192,9 +192,9 @@ int displayWriteCharWithAttr(displayPort_t *instance, uint8_t x, uint8_t y, uint
return -1; return -1;
} }
if (displayAttributesRequireEmulation(instance, attr)) { if (displayAttributesRequireEmulation(instance, attr)) {
char ec; char ec[2];
if (displayEmulateTextAttributes(instance, &ec, 1, &attr)) { if (displayEmulateTextAttributes(instance, ec, 1, &attr)) {
c = ec; c = ec[0];
} }
} }
instance->posX = x + 1; instance->posX = x + 1;
@ -317,4 +317,3 @@ void displayInit(displayPort_t *instance, const displayPortVTable_t *vTable)
instance->maxChar = 0; instance->maxChar = 0;
displayUpdateMaxChar(instance); displayUpdateMaxChar(instance);
} }

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

@ -259,14 +259,14 @@ static void setLineOutlineType(displayCanvas_t *displayCanvas, displayCanvasOutl
{ {
UNUSED(displayCanvas); UNUSED(displayCanvas);
frskyOSDSetLineOutlineType(outlineType); frskyOSDSetLineOutlineType((frskyOSDLineOutlineType_e)outlineType);
} }
static void setLineOutlineColor(displayCanvas_t *displayCanvas, displayCanvasColor_e outlineColor) static void setLineOutlineColor(displayCanvas_t *displayCanvas, displayCanvasColor_e outlineColor)
{ {
UNUSED(displayCanvas); UNUSED(displayCanvas);
frskyOSDSetLineOutlineColor(outlineColor); frskyOSDSetLineOutlineColor((frskyOSDColor_e)outlineColor);
} }
static void clipToRect(displayCanvas_t *displayCanvas, int x, int y, int w, int h) static void clipToRect(displayCanvas_t *displayCanvas, int x, int y, int w, int h)