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

Merge pull request #5769 from iNavFlight/jh-fix-gcc-10-warnings

Browse source 
fix gcc 10 warnings
This commit is contained in:
Konstantin Sharlaimov 2020-05-22 18:00:13 +02:00 • committed by GitHub
commit 2aa184449e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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;
}
if (displayAttributesRequireEmulation(instance, attr)) {
char ec;
if (displayEmulateTextAttributes(instance, &ec, 1, &attr)) {
c = ec;
char ec[2];
if (displayEmulateTextAttributes(instance, ec, 1, &attr)) {
c = ec[0];
}
}
instance->posX = x + 1;
@ -317,4 +317,3 @@ void displayInit(displayPort_t *instance, const displayPortVTable_t *vTable)
instance->maxChar = 0;
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);
frskyOSDSetLineOutlineType(outlineType);
frskyOSDSetLineOutlineType((frskyOSDLineOutlineType_e)outlineType);
}
static void setLineOutlineColor(displayCanvas_t *displayCanvas, displayCanvasColor_e outlineColor)
{
UNUSED(displayCanvas);
frskyOSDSetLineOutlineColor(outlineColor);
frskyOSDSetLineOutlineColor((frskyOSDColor_e)outlineColor);
}
static void clipToRect(displayCanvas_t *displayCanvas, int x, int y, int w, int h)