BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-12-24 04:56:17 +01:00
parent b4099fc1e7
commit 44674a8a52
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compile-with-docker.sh
View File

@@ -32,7 +32,6 @@ bandscope() {
ENABLE_AIRCOPY=1 \ ENABLE_AIRCOPY=1 \
ENABLE_NOAA=0 \ ENABLE_NOAA=0 \
ENABLE_FEAT_F4HWN_RESCUE_OPS=0 \ ENABLE_FEAT_F4HWN_RESCUE_OPS=0 \
ENABLE_FEAT_F4HWN_CHARGING_C=0 \
EDITION_STRING=Bandscope \ EDITION_STRING=Bandscope \
TARGET=f4hwn.bandscope \ TARGET=f4hwn.bandscope \
&& cp f4hwn.bandscope* compiled-firmware/" && cp f4hwn.bandscope* compiled-firmware/"

30
ui/main.c
View File

@@ -1056,10 +1056,11 @@ void UI_DisplayMain(void)
// ************ // ************
{ // show the TX/RX level { // show the TX/RX level
uint8_t Level = 0; int8_t Level = -1;
if (mode == VFO_MODE_TX) if (mode == VFO_MODE_TX)
{ // TX power level { // TX power level
/*
switch (gRxVfo->OUTPUT_POWER) switch (gRxVfo->OUTPUT_POWER)
{ {
case OUTPUT_POWER_LOW1: Level = 2; break; case OUTPUT_POWER_LOW1: Level = 2; break;
@@ -1070,6 +1071,16 @@ void UI_DisplayMain(void)
case OUTPUT_POWER_MID: Level = 4; break; case OUTPUT_POWER_MID: Level = 4; break;
case OUTPUT_POWER_HIGH: Level = 6; break; case OUTPUT_POWER_HIGH: Level = 6; break;
} }
if (gRxVfo->OUTPUT_POWER == OUTPUT_POWER_MID) {
Level = 4;
} else if (gRxVfo->OUTPUT_POWER == OUTPUT_POWER_HIGH) {
Level = 6;
} else {
Level = 2;
}
*/
Level = gRxVfo->OUTPUT_POWER - 1;
} }
else else
if (mode == VFO_MODE_RX) if (mode == VFO_MODE_RX)
@@ -1080,7 +1091,7 @@ void UI_DisplayMain(void)
Level = gVFO_RSSI_bar_level[vfo_num]; Level = gVFO_RSSI_bar_level[vfo_num];
#endif #endif
} }
if(Level) if(Level >= 0)
DrawSmallAntennaAndBars(p_line1 + LCD_WIDTH, Level); DrawSmallAntennaAndBars(p_line1 + LCD_WIDTH, Level);
} }
@@ -1325,6 +1336,7 @@ void UI_DisplayMain(void)
#endif #endif
#ifdef ENABLE_FEAT_F4HWN #ifdef ENABLE_FEAT_F4HWN
/*
if(isMainVFO) if(isMainVFO)
{ {
if(gMonitor) if(gMonitor)
@@ -1349,6 +1361,20 @@ void UI_DisplayMain(void)
GUI_DisplaySmallest(String, 110, line == 0 ? 17 : 49, false, true); GUI_DisplaySmallest(String, 110, line == 0 ? 17 : 49, false, true);
} }
} }
*/
if (isMainVFO) {
if (gMonitor) {
sprintf(String, "MONI");
} else {
sprintf(String, "SQL%d", gEeprom.SQUELCH_LEVEL);
}
if (gSetting_set_gui) {
UI_PrintStringSmallNormal(String, LCD_WIDTH + 98, 0, line + 1);
} else {
GUI_DisplaySmallest(String, 110, line == 0 ? 17 : 49, false, true);
}
}
#endif #endif
} }