From 98c3dd9acc46b17f1958633b383d9debaaf97c46 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 31 Mar 2019 12:38:59 +0200 Subject: [PATCH] Power meter is either 2.4GHz or 900Mhz --- radio/src/gui/common/stdlcd/radio_power_meter.cpp | 11 +++++++---- radio/src/opentx.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/common/stdlcd/radio_power_meter.cpp b/radio/src/gui/common/stdlcd/radio_power_meter.cpp index 12379e9d1..86f00a8b9 100644 --- a/radio/src/gui/common/stdlcd/radio_power_meter.cpp +++ b/radio/src/gui/common/stdlcd/radio_power_meter.cpp @@ -48,18 +48,21 @@ void menuRadioPowerMeter(event_t event) } else if (moduleSettings[INTERNAL_MODULE].mode != MODULE_MODE_POWER_METER) { memclear(&reusableBuffer.powerMeter, sizeof(reusableBuffer.powerMeter)); - reusableBuffer.powerMeter.freq = 2400; moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_POWER_METER; } coord_t y = MENU_HEADER_HEIGHT + 1 + FH; LcdFlags attr = (menuVerticalPosition == 0 ? INVERS : 0); lcdDrawText(0, y, "Freq."); - lcdDrawNumber(8*FW, y, reusableBuffer.powerMeter.freq, LEFT|attr|(s_editMode > 0 ? BLINK : 0)); - lcdDrawText(lcdNextPos, y, "MHz"); + lcdDrawNumber(8*FW, y, reusableBuffer.powerMeter.freqBand ? 900: 2400, LEFT|attr|(s_editMode > 0 ? BLINK : 0)); + lcdDrawText(lcdNextPos, y, " MHz band"); if (attr) { - CHECK_INCDEC_MODELVAR(event, reusableBuffer.powerMeter.freq, 2300, 2500); + CHECK_INCDEC_MODELVAR(event, reusableBuffer.powerMeter.freqBand, 0, 1); if (checkIncDec_Ret) { + if(reusableBuffer.powerMeter.freqBand == 0) + reusableBuffer.powerMeter.freq = 900; //TODO fine tune to region ? (866/900/915) + else + reusableBuffer.powerMeter.freq = 2400; reusableBuffer.powerMeter.power = 0; reusableBuffer.powerMeter.peak = 0; } diff --git a/radio/src/opentx.h b/radio/src/opentx.h index acfc457e4..1bdb2bd8e 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -1220,6 +1220,7 @@ union ReusableBuffer uint32_t freq; int16_t power; int16_t peak; + uint8_t freqBand; } powerMeter; struct