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

Merge pull request #5222 from mikeller/fix_osd_name

Browse source 
Fixed problem with craft name overwriting elements in OSD.
This commit is contained in:
Michael Keller 2018-02-19 03:04:52 +13:00 • committed by GitHub
commit 552ca4c33b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/main/io/osd.c
View file

@ -518,17 +518,23 @@ static bool osdDrawSingleElement(uint8_t item)
}
case OSD_CRAFT_NAME:
// This does not strictly support iterative updating if the craft name changes at run time. But since the craft name is not supposed to be changing this should not matter, and blanking the entire length of the craft name string on update will make it impossible to configure elements to be displayed on the right hand side of the craft name.
//TODO: When iterative updating is implemented, change this so the craft name is only printed once whenever the OSD 'flight' screen is entered.
if (strlen(pilotConfig()->name) == 0) {
strcpy(buff, "CRAFT_NAME");
} else {
for (unsigned int i = 0; i < MAX_NAME_LENGTH; i++) {
buff[i] = toupper((unsigned char)pilotConfig()->name[i]);
if (pilotConfig()->name[i] == 0) {
buff[i] = SYM_BLANK;
}
}
buff[MAX_NAME_LENGTH] = '\0';
unsigned i;
for (i = 0; i < MAX_NAME_LENGTH; i++) {
if (pilotConfig()->name[i]) {
buff[i] = toupper((unsigned char)pilotConfig()->name[i]);
} else {
break;
}
}
buff[i] = '\0';
}
break;
case OSD_THROTTLE_POS:
@ -788,6 +794,7 @@ static bool osdDrawSingleElement(uint8_t item)
}
displayWrite(osdDisplayPort, elemPosX + elemOffsetX, elemPosY, buff);
return true;
}