Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00
Code Issues Wiki Activity

Merge pull request #11275 from P-I-Engineer/VTX-power-OSD

Browse source
This commit is contained in:
J Blackman 2022-09-18 09:09:02 +10:00 • committed by GitHub
commit c50372019d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main/osd/osd_elements.c
View file

@ -96,6 +96,10 @@
type 2: Graphical bar showing battery used (grows as used) type 2: Graphical bar showing battery used (grows as used)
type 3: Numeric % of remaining battery type 3: Numeric % of remaining battery
type 4: Numeric % or used battery type 4: Numeric % or used battery
VTX_CHANNEL
type 1: Contains Band:Channel:Power:Pit
type 2: Contains only Power
*/ */
#include <stdbool.h> #include <stdbool.h>
@ -1442,12 +1446,20 @@ static void osdElementVtxChannel(osdElementParms_t *element)
vtxStatusIndicator = 'P'; vtxStatusIndicator = 'P';
} }
if (vtxStatus & VTX_STATUS_LOCKED) { switch (element->type) {
tfp_sprintf(element->buff, "-:-:-:L"); case OSD_ELEMENT_TYPE_2:
} else if (vtxStatusIndicator) { tfp_sprintf(element->buff, "%s", vtxPowerLabel);
tfp_sprintf(element->buff, "%c:%s:%s:%c", vtxBandLetter, vtxChannelName, vtxPowerLabel, vtxStatusIndicator); break;
} else {
tfp_sprintf(element->buff, "%c:%s:%s", vtxBandLetter, vtxChannelName, vtxPowerLabel); default:
if (vtxStatus & VTX_STATUS_LOCKED) {
tfp_sprintf(element->buff, "-:-:-:L");
} else if (vtxStatusIndicator) {
tfp_sprintf(element->buff, "%c:%s:%s:%c", vtxBandLetter, vtxChannelName, vtxPowerLabel, vtxStatusIndicator);
} else {
tfp_sprintf(element->buff, "%c:%s:%s", vtxBandLetter, vtxChannelName, vtxPowerLabel);
}
break;
} }
} }
#endif // USE_VTX_COMMON #endif // USE_VTX_COMMON