fix power bug
All checks were successful
Build Firmware / build (push) Successful in 37s

This commit is contained in:
2025-03-31 11:51:11 +02:00
parent 85fb527020
commit 101bde7463
11 changed files with 118 additions and 55 deletions

View File

@@ -89,6 +89,7 @@ const char *VfoStateStr[] = {
// ***************************************************************************
static void DrawSmallAntennaAndBars(uint8_t *p, unsigned int level) {
level++;
if (level > 6)
level = 6;
@@ -925,7 +926,7 @@ void UI_DisplayMain(void) {
Level = 2;
}
*/
Level = gRxVfo->OUTPUT_POWER - 1;
Level = gRxVfo->OUTPUT_POWER;
} else if (mode == VFO_MODE_RX) { // RX signal level
#ifndef ENABLE_RSSI_BAR
// bar graph
@@ -1012,7 +1013,7 @@ void UI_DisplayMain(void) {
if (state == VFO_STATE_NORMAL || state == VFO_STATE_ALARM) { // show the TX power
const char pwr_short[][3] = {"L1", "L2", "L3", "L4", "L5", "ME",
"HI", "UN"};
"HI"};
UI_PrintStringSmallNormal(pwr_short[vfoInfo->OUTPUT_POWER], LCD_WIDTH + 25, 0, line + 1);
}

65
ui/messages.c Normal file
View File

@@ -0,0 +1,65 @@
//
// Created by bruno on 3/30/25.
//
#include "messages.h"
void UI_DisplayMessages(void)
{
char String[19] = {0};
char *pPrintStr = String;
sprintf("FRM:%d %d/%d", )
bool bCentered;
uint8_t Start;
UI_DisplayClear();
if (gScanSingleFrequency || (gScanCssState != SCAN_CSS_STATE_OFF && gScanCssState != SCAN_CSS_STATE_FAILED)) {
sprintf(String, "FREQ:%u.%05u", gScanFrequency / 100000, gScanFrequency % 100000);
pPrintStr = String;
} else {
pPrintStr = "FREQ:**.*****";
}
UI_PrintString(pPrintStr, 2, 0, 1 /*, 8 */);
if (gScanCssState < SCAN_CSS_STATE_FOUND || !gScanUseCssResult) {
pPrintStr = "CTC:******";
} else if (gScanCssResultType == CODE_TYPE_CONTINUOUS_TONE) {
sprintf(String, "CTC:%u.%uHz", CTCSS_Options[gScanCssResultCode] / 10, CTCSS_Options[gScanCssResultCode] % 10);
pPrintStr = String;
} else {
sprintf(String, "DCS:D%03oN", DCS_Options[gScanCssResultCode]);
pPrintStr = String;
}
UI_PrintString(pPrintStr, 2, 0, 3 /*, 8 */);
memset(String, 0, sizeof(String));
if (gScannerSaveState == SCAN_SAVE_CHANNEL) {
pPrintStr = "SAV?";
Start = 0;
bCentered = 1;
} else {
Start = 2;
bCentered = 0;
if (gScannerSaveState == SCAN_SAVE_CHAN_SEL) {
strcpy(String, "SAV:");
UI_GenerateChannelStringEx(String + 5, gShowChPrefix, gScanChannel);
pPrintStr = String;
} else if (gScanCssState < SCAN_CSS_STATE_FOUND) {
strcpy(String, "SCN");
memset(String + 4, '.', (gScanProgressIndicator & 7) + 1);
pPrintStr = String;
} else if (gScanCssState == SCAN_CSS_STATE_FOUND) {
pPrintStr = "SCN CMP.";
} else {
pPrintStr = "SCN FAIL.";
}
}
UI_PrintString(pPrintStr, Start, bCentered ? 127 : 0, 5 /*, 8 */);
ST7565_BlitFullScreen();
}

10
ui/messages.h Normal file
View File

@@ -0,0 +1,10 @@
//
// Created by bruno on 3/30/25.
//
#ifndef BRNQUANFW_MESSAGES_H
#define BRNQUANFW_MESSAGES_H
void UI_DisplayMessages(void);
#endif //BRNQUANFW_MESSAGES_H

View File

@@ -25,6 +25,7 @@ enum GUI_DisplayType_t
DISPLAY_MAIN = 0,
DISPLAY_MENU,
DISPLAY_SCANNER,
DISPLAY_MESSAGES
#ifdef ENABLE_FMRADIO
DISPLAY_FM,