piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Bertrand Songis
2019-03-31 15:17:11 +02:00
parent 98c3dd9acc
commit eb2b82bf92
8 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/common/stdlcd/radio_power_meter.cpp
+7 -9
View File
@@ -25,12 +25,12 @@ void pxx2ModuleRequiredScreen(event_t event);
void menuRadioPowerMeter(event_t event)
{
if(!isModulePXX2(INTERNAL_MODULE)) {
if (!isModulePXX2(INTERNAL_MODULE)) {
pxx2ModuleRequiredScreen(event);
return;
}
if(TELEMETRY_STREAMING()) {
if (TELEMETRY_STREAMING()) {
lcdDrawCenteredText(LCD_H/2, "Turn off receiver");
return;
}
@@ -46,23 +46,21 @@ void menuRadioPowerMeter(event_t event)
resumePulses();
return;
}
else if (moduleSettings[INTERNAL_MODULE].mode != MODULE_MODE_POWER_METER) {
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.freqBand ? 900: 2400, LEFT|attr|(s_editMode > 0 ? BLINK : 0));
lcdDrawNumber(8*FW, y, reusableBuffer.powerMeter.freq, LEFT|attr|(s_editMode > 0 ? BLINK : 0));
lcdDrawText(lcdNextPos, y, " MHz band");
if (attr) {
CHECK_INCDEC_MODELVAR(event, reusableBuffer.powerMeter.freqBand, 0, 1);
reusableBuffer.powerMeter.freq = checkIncDec(event, reusableBuffer.powerMeter.freq == 900, 0, 1) ? 900 : 2400;
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;
}
radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp
+4 -3
View File
@@ -24,12 +24,12 @@ extern void pxx2ModuleRequiredScreen(event_t event);
void menuRadioSpectrumAnalyser(event_t event)
{
if(!isModulePXX2(INTERNAL_MODULE)) {
if (!isModulePXX2(INTERNAL_MODULE)) {
pxx2ModuleRequiredScreen(event);
return;
}
if(TELEMETRY_STREAMING()) {
if (TELEMETRY_STREAMING()) {
lcdDrawCenteredText(15, "Turn off receiver");
return;
}
@@ -45,7 +45,8 @@ void menuRadioSpectrumAnalyser(event_t event)
resumePulses();
return;
}
else if (moduleSettings[INTERNAL_MODULE].mode != MODULE_MODE_SPECTRUM_ANALYSER) {
if (moduleSettings[INTERNAL_MODULE].mode != MODULE_MODE_SPECTRUM_ANALYSER) {
memclear(reusableBuffer.spectrumAnalyser.bars, sizeof(reusableBuffer.spectrumAnalyser.bars));
moduleSettings[INTERNAL_MODULE].mode = MODULE_MODE_SPECTRUM_ANALYSER;
}
radio/src/gui/common/stdlcd/radio_tools.cpp
+2 -2
View File
@@ -27,7 +27,7 @@ void pxx2ModuleRequiredScreen(event_t event)
lcdDrawCenteredText(30, "ACCESS UPGRADE ON");
lcdDrawCenteredText(45, "YOUR INTERNAL MODULE");
if(event == EVT_KEY_FIRST(KEY_EXIT)) {
if (event == EVT_KEY_FIRST(KEY_EXIT)) {
killEvents(event);
popMenu();
}
@@ -50,7 +50,7 @@ void menuRadioTools(event_t event)
{
SIMPLE_MENU("TOOLS", menuTabGeneral, MENU_RADIO_TOOLS, HEADER_LINE + 2);
#if defined(PXX2) && !(defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBX7) || (defined(PCBXLITE) && !defined(PCBXLITES)))
#if defined(PXX2) && (defined(PCBXLITES) || defined(PCBX3))
addRadioTool(0, "Spectrum Analyser", menuRadioSpectrumAnalyser, event);
addRadioTool(1, "Power Meter", menuRadioPowerMeter, event);
#endif