From 5cf79f0b2b02baf64d035d85d47f028b2dc74ff7 Mon Sep 17 00:00:00 2001 From: p-i-engineer Date: Tue, 11 Jan 2022 08:08:55 -0800 Subject: [PATCH] added vtx osd channel variant element --- src/main/osd/osd_elements.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/osd/osd_elements.c b/src/main/osd/osd_elements.c index 4561cd6f39..370e0e423a 100644 --- a/src/main/osd/osd_elements.c +++ b/src/main/osd/osd_elements.c @@ -96,6 +96,10 @@ type 2: Graphical bar showing battery used (grows as used) type 3: Numeric % of remaining battery type 4: Numeric % or used battery + + VTX_CHANNEL + type 1: Contains Band:Channel:Power:Pit + type 2: Contains only Power */ #include @@ -1454,12 +1458,20 @@ static void osdElementVtxChannel(osdElementParms_t *element) vtxStatusIndicator = 'P'; } - 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); +switch (element->type) { + case OSD_ELEMENT_TYPE_2: + tfp_sprintf(element->buff, "%s", vtxPowerLabel); + break; + + 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