From e17cf1ae68544e4ffd9d15417ff9208ff7372a2e Mon Sep 17 00:00:00 2001 From: p-i-engineer Date: Tue, 28 Jun 2022 12:01:05 -0700 Subject: [PATCH] initial commit to fix PR haslinghuis comment inc comments inc haslinghuis comment inc Revert "haslinghuis comment inc" This reverts commit cbe38ff353cacc041dc1f88bbe59780b9982f9d0. Update src/js/tabs/osd.js Co-authored-by: haslinghuis Update src/js/tabs/osd.js Co-authored-by: haslinghuis clean clean fix clean --- locales/en/messages.json | 8 ++++++++ src/js/tabs/osd.js | 23 ++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/locales/en/messages.json b/locales/en/messages.json index 11a87bba..17d96cda 100644 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -4869,6 +4869,14 @@ "osdDescElementVtxChannel": { "message": "Current VTX channel and power" }, + "osdTextElementVTXchannelVariantPower": { + "message": "VTX power", + "description": "One of the variants of the VTX channel element of the OSD" + }, + "osdTextElementVTXchannelVariantFull": { + "message": "Band:Channel:Pwr:Pit", + "description": "One of the variants of the VTX channel element of the OSD" + }, "osdTextElementVoltageWarning": { "message": "Battery voltage warning", "description": "One of the elements of the OSD" diff --git a/src/js/tabs/osd.js b/src/js/tabs/osd.js index d9945f06..22da0966 100644 --- a/src/js/tabs/osd.js +++ b/src/js/tabs/osd.js @@ -306,6 +306,21 @@ OSD.generateAltitudePreview = function(osdData) { return `${FONT.symbol(SYM.ALTITUDE)}399${variantSelected === 0? '.7' : ''}${unit}`; }; +OSD.generateVTXChannelPreview = function(osdData) { + const variantSelected = OSD.getVariantForPreview(osdData, 'VTX_CHANNEL'); + let value; + switch (variantSelected) { + case 0: + value = 'R:2:200:P'; + break; + + case 1: + value = '200'; + break; + } + return value; +}; + OSD.generateBatteryUsagePreview = function(osdData) { const variantSelected = OSD.getVariantForPreview(osdData, 'MAIN_BATT_USAGE'); @@ -565,7 +580,13 @@ OSD.loadDisplayFields = function() { defaultPosition: 1, draw_order: 120, positionable: true, - preview: 'R:2:200:P', + variants: [ + 'osdTextElementVTXchannelVariantFull', + 'osdTextElementVTXchannelVariantPower', + ], + preview(osdData) { + return OSD.generateVTXChannelPreview(osdData); + }, }, VOLTAGE_WARNING: { name: 'VOLTAGE_WARNING',