Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-25 09:15:21 +03:00
Code Activity

Improve power meter (#6393)

Browse source 
Improve power meter
This commit is contained in:
3djc 2019-04-17 11:58:30 +02:00 • committed by Bertrand Songis
parent da69083bce
commit 930a3690ad
3 changed files with 65 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

87
radio/src/gui/common/stdlcd/radio_power_meter.cpp
View file

@ -22,9 +22,20 @@
extern uint8_t g_moduleIdx; extern uint8_t g_moduleIdx;
enum PowerMeterFields {
POWER_METER_FREQ_RANGE,
POWER_METER_ATTENUATOR,
POWER_METER_POWER,
POWER_METER_PEAK,
POWER_METER_WARNING,
POWER_METER_FIELDS_MAX
};
void menuRadioPowerMeter(event_t event) void menuRadioPowerMeter(event_t event)
{ {
SIMPLE_SUBMENU("POWER METER", 1);
SUBMENU("POWER METER", POWER_METER_FIELDS_MAX-1, {0, 0, READONLY_ROW, READONLY_ROW, READONLY_ROW});
if (TELEMETRY_STREAMING()) { if (TELEMETRY_STREAMING()) {
lcdDrawCenteredText(LCD_H/2, "Turn off receiver"); lcdDrawCenteredText(LCD_H/2, "Turn off receiver");
@ -56,30 +67,56 @@ void menuRadioPowerMeter(event_t event)
moduleSettings[g_moduleIdx].mode = MODULE_MODE_POWER_METER; moduleSettings[g_moduleIdx].mode = MODULE_MODE_POWER_METER;
} }
coord_t y = MENU_HEADER_HEIGHT + 1 + FH; for (uint8_t i=0; i<POWER_METER_FIELDS_MAX; i++) {
LcdFlags attr = (menuVerticalPosition == 0 ? INVERS : 0); LcdFlags attr = (menuVerticalPosition == i ? (s_editMode > 0 ? INVERS | BLINK : INVERS) : 0);
lcdDrawText(0, y, "Freq."); coord_t y = MENU_HEADER_HEIGHT + FH + i * FH;
lcdDrawNumber(8*FW, y, reusableBuffer.powerMeter.freq / 1000000, LEFT|attr|(s_editMode > 0 ? BLINK : 0));
lcdDrawText(lcdNextPos, y, " MHz band"); switch (i) {
if (attr) { case POWER_METER_FREQ_RANGE:
reusableBuffer.powerMeter.freq = checkIncDec(event, reusableBuffer.powerMeter.freq == 900000000, 0, 1) ? 900000000 : 2400000000; lcdDrawText(0, y, "Freq.");
if (checkIncDec_Ret) { lcdDrawNumber(8 * FW, y, reusableBuffer.powerMeter.freq / 1000000, LEFT | attr);
reusableBuffer.powerMeter.power = 0; lcdDrawText(lcdNextPos, y, " MHz band");
reusableBuffer.powerMeter.peak = 0; if (attr) {
reusableBuffer.powerMeter.freq = checkIncDec(event, reusableBuffer.powerMeter.freq == 900000000, 0, 1) ? 900000000 : 2400000000;
if (checkIncDec_Ret) {
reusableBuffer.powerMeter.power = 0;
reusableBuffer.powerMeter.peak = 0;
}
}
break;
case POWER_METER_ATTENUATOR:
{
lcdDrawText(0, y, "Attn");
lcdDrawNumber(8 * FW, y, -10 * reusableBuffer.powerMeter.attn, LEFT | attr);
lcdDrawText(lcdNextPos, y, " dB");
if (attr) {
reusableBuffer.powerMeter.attn = checkIncDec(event, reusableBuffer.powerMeter.attn, 0, 5, 0);
}
break;
}
case POWER_METER_POWER:
lcdDrawText(0, y, "Power");
if (reusableBuffer.powerMeter.power) {
lcdDrawNumber(8 * FW, y, reusableBuffer.powerMeter.power + reusableBuffer.powerMeter.attn * 1000, LEFT | PREC2);
lcdDrawText(lcdNextPos, y, "dBm");
}
break;
case POWER_METER_PEAK:
lcdDrawText(0, y, "Peak");
if (reusableBuffer.powerMeter.peak) {
lcdDrawNumber(8 * FW, y, reusableBuffer.powerMeter.peak + reusableBuffer.powerMeter.attn * 1000, LEFT | PREC2);
lcdDrawText(lcdNextPos, y, "dBm");
}
break;
case POWER_METER_WARNING:
lcdDrawText(0, y, "WARNING : Max ");
lcdDrawNumber(lcdNextPos, y, -10 + 10 * reusableBuffer.powerMeter.attn, LEFT | BOLD);
lcdDrawText(lcdNextPos+3, y, "dBm", BOLD);
break;
} }
} }
y += FH + 1;
lcdDrawText(0, y, "Power");
if (reusableBuffer.powerMeter.power) {
lcdDrawNumber(8 * FW, y, reusableBuffer.powerMeter.power, LEFT | PREC2);
lcdDrawText(lcdNextPos, y, "dBm");
}
y += FH + 1;
lcdDrawText(0, y, "Peak");
if (reusableBuffer.powerMeter.peak) {
lcdDrawNumber(8 * FW, y, reusableBuffer.powerMeter.peak, LEFT | PREC2);
lcdDrawText(lcdNextPos, y, "dBm");
}
} }

4
radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp
View file

@ -22,7 +22,7 @@
extern uint8_t g_moduleIdx; extern uint8_t g_moduleIdx;
enum SpektrumFields { enum SpectrumFields {
SPECTRUM_FREQUENCY, SPECTRUM_FREQUENCY,
SPECTRUM_SPAN, SPECTRUM_SPAN,
SPECTRUM_FIELDS_MAX SPECTRUM_FIELDS_MAX
@ -64,7 +64,7 @@ void menuRadioSpectrumAnalyser(event_t event)
moduleSettings[g_moduleIdx].mode = MODULE_MODE_SPECTRUM_ANALYSER; moduleSettings[g_moduleIdx].mode = MODULE_MODE_SPECTRUM_ANALYSER;
} }
for (uint8_t i=0; i<SPECTRUM_FIELDS_MAX+1; i++) { for (uint8_t i=0; i<SPECTRUM_FIELDS_MAX; i++) {
LcdFlags attr = (menuHorizontalPosition == i ? (s_editMode>0 ? INVERS|BLINK : INVERS) : 0); LcdFlags attr = (menuHorizontalPosition == i ? (s_editMode>0 ? INVERS|BLINK : INVERS) : 0);
switch (i) { switch (i) {

1
radio/src/opentx.h
View file

@ -1232,6 +1232,7 @@ union ReusableBuffer
uint32_t freq; uint32_t freq;
int16_t power; int16_t power;
int16_t peak; int16_t peak;
uint8_t attn;
} powerMeter; } powerMeter;
struct struct