Do some stuff
All checks were successful
Build Firmware / build (push) Successful in 3m32s

This commit is contained in:
2025-03-04 16:46:02 +01:00
parent fabf38f1bc
commit 72558f93f3
34 changed files with 937 additions and 1248 deletions

322
ui/main.c
View File

@@ -115,51 +115,19 @@ static void DrawLevelBar(uint8_t xpos, uint8_t line, uint8_t level, uint8_t bars
level = MIN(level, bars);
for (uint8_t i = 0; i < level; i++) {
#ifdef ENABLE_FEAT_F4HWN
if (gSetting_set_met) {
const char hollowBar[] = {
0b01111111,
0b01000001,
0b01000001,
0b01111111
};
const char hollowBar[] = {
0b01111111,
0b01000001,
0b01000001,
0b01111111
};
if (i < bars - 4) {
for (uint8_t j = 0; j < 4; j++)
p_line[xpos + i * 5 + j] = (~(0x7F >> (i + 1))) & 0x7F;
} else {
memcpy(p_line + (xpos + i * 5), &hollowBar, ARRAY_SIZE(hollowBar));
}
if (i < bars - 4) {
for (uint8_t j = 0; j < 4; j++)
p_line[xpos + i * 5 + j] = (~(0x7F >> (i + 1))) & 0x7F;
} else {
const char hollowBar[] = {
0b00111110,
0b00100010,
0b00100010,
0b00111110
};
const char simpleBar[] = {
0b00111110,
0b00111110,
0b00111110,
0b00111110
};
if (i < bars - 4) {
memcpy(p_line + (xpos + i * 5), &simpleBar, ARRAY_SIZE(simpleBar));
} else {
memcpy(p_line + (xpos + i * 5), &hollowBar, ARRAY_SIZE(hollowBar));
}
}
#else
if(i < bars - 4) {
for(uint8_t j = 0; j < 4; j++)
p_line[xpos + i * 5 + j] = (~(0x7F >> (i+1))) & 0x7F;
}
else {
memcpy(p_line + (xpos + i * 5), &hollowBar, ARRAY_SIZE(hollowBar));
}
#endif
}
}
@@ -197,7 +165,7 @@ void UI_DisplayAudioBar(void) {
if (gCurrentFunction != FUNCTION_TRANSMIT ||
gScreenToDisplay != DISPLAY_MAIN
#ifdef ENABLE_DTMF_CALLING
#ifdef ENABLE_DTMF_CALLING
|| gDTMF_CallState != DTMF_CALL_STATE_NONE
#endif
) {
@@ -237,7 +205,7 @@ void UI_DisplayAudioBar(void) {
void DisplayRSSIBar(const bool now) {
#if defined(ENABLE_RSSI_BAR)
const unsigned int txt_width = 7 * 8; // 8 text chars
const unsigned int txt_width = 7 * 10; // 8 text chars
const unsigned int bar_x = 2 + txt_width + 4; // X coord of bar graph
#ifdef ENABLE_FEAT_F4HWN
@@ -266,7 +234,7 @@ void DisplayRSSIBar(const bool now) {
if (RxLine >= 0 && center_line != CENTER_LINE_IN_USE) {
if (RxBlink == 0 || RxBlink == 1) {
UI_PrintStringSmallBold("RX", 8, 0, RxLine);
UI_PrintStringSmallBold("RX", 24, 0, RxLine);
if (RxBlink == 1) RxBlink = 2;
} else {
for (uint8_t i = 8; i < 24; i++) {
@@ -299,7 +267,7 @@ void DisplayRSSIBar(const bool now) {
if (gCurrentFunction == FUNCTION_TRANSMIT ||
gScreenToDisplay != DISPLAY_MAIN
#ifdef ENABLE_DTMF_CALLING
#ifdef ENABLE_DTMF_CALLING
|| gDTMF_CallState != DTMF_CALL_STATE_NONE
#endif
)
@@ -348,24 +316,19 @@ void DisplayRSSIBar(const bool now) {
#endif
#ifdef ENABLE_FEAT_F4HWN
if (gSetting_set_gui) {
sprintf(str, "%3d", -rssi_dBm);
UI_PrintStringSmallNormal(str, LCD_WIDTH + 8, 0, line - 1);
} else {
sprintf(str, "% 4d %s", -rssi_dBm, "dBm");
if (isMainOnly())
GUI_DisplaySmallest(str, 2, 41, false, true);
else
GUI_DisplaySmallest(str, 2, 25, false, true);
}
char tempStr[4];
if (overS9Bars == 0) {
sprintf(str, "S%d", s_level);
sprintf(tempStr, "S%d", s_level);
} else {
sprintf(str, "+%02d", overS9dBm);
sprintf(tempStr, "+%02d", overS9dBm);
}
UI_PrintStringSmallNormal(str, LCD_WIDTH + 38, 0, line - 1);
sprintf(str, "%4ddBm%3s", -rssi_dBm, tempStr);
if (isMainOnly())
UI_PrintStringSmallNormal(str, 2, 0, 4);
else
UI_PrintStringSmallNormal(str, 2, 0, 3);
#else
if(overS9Bars == 0) {
sprintf(str, "% 4d S%d", -rssi_dBm, s_level);
@@ -377,7 +340,7 @@ void DisplayRSSIBar(const bool now) {
UI_PrintStringSmallNormal(str, 2, 0, line);
#endif
DrawLevelBar(bar_x, line, s_level + overS9Bars, 13);
DrawLevelBar(bar_x, line, s_level + overS9Bars, 10);
if (now)
ST7565_BlitLine(line);
#else
@@ -507,7 +470,7 @@ void UI_DisplayMain(void) {
UI_DisplayClear();
if (gLowBattery && !gLowBatteryConfirmed) {
UI_DisplayPopup("LOW BATTERY");
UI_DisplayPopup("LOW BATT");
ST7565_BlitFullScreen();
return;
}
@@ -515,8 +478,8 @@ void UI_DisplayMain(void) {
#ifndef ENABLE_FEAT_F4HWN
if (gEeprom.KEY_LOCK && gKeypadLocked > 0)
{ // tell user how to unlock the keyboard
UI_PrintString("Long press #", 0, LCD_WIDTH, 1, 8);
UI_PrintString("to unlock", 0, LCD_WIDTH, 3, 8);
UI_PrintString("Long press #", 0, LCD_WIDTH, 1 /*, 8 */);
UI_PrintString("to unlock", 0, LCD_WIDTH, 3 /*, 8 */);
ST7565_BlitFullScreen();
return;
}
@@ -535,7 +498,7 @@ void UI_DisplayMain(void) {
shift = 5;
}
//memcpy(gFrameBuffer[shift] + 2, gFontKeyLock, sizeof(gFontKeyLock));
UI_PrintStringSmallBold("UNLOCK KEYBOARD", 12, 0, shift);
UI_PrintStringSmallBold("KEYLOCK", 12, 0, shift);
//memcpy(gFrameBuffer[shift] + 120, gFontKeyLock, sizeof(gFontKeyLock));
/*
@@ -600,7 +563,7 @@ void UI_DisplayMain(void) {
shift = 3;
}
UI_PrintString("ScnRng", 5, 0, line + shift, 8);
UI_PrintString("ScnRng", 5, 0, line + shift /*, 8 */);
sprintf(String, "%3u.%05u", gScanRangeStart / 100000, gScanRangeStart % 100000);
UI_PrintStringSmallNormal(String, 56, 0, line + shift);
sprintf(String, "%3u.%05u", gScanRangeStop / 100000, gScanRangeStop % 100000);
@@ -612,7 +575,7 @@ void UI_DisplayMain(void) {
gScanRangeStart = 0;
}
#else
UI_PrintString("ScnRng", 5, 0, line, 8);
UI_PrintString("ScnRng", 5, 0, line /*, 8 */);
sprintf(String, "%3u.%05u", gScanRangeStart / 100000, gScanRangeStart % 100000);
UI_PrintStringSmallNormal(String, 56, 0, line);
sprintf(String, "%3u.%05u", gScanRangeStop / 100000, gScanRangeStop % 100000);
@@ -624,21 +587,21 @@ void UI_DisplayMain(void) {
if (gEnteringSMS == SMS_ENTERING_DEST) {
UI_PrintString("SMS Dst", 0, 0, line - 1, 8);
UI_PrintString("SMS Dst", 0, 0, line - 1 /*, 8 */);
sprintf(String, "%d", dataPacket.dest);
UI_PrintStringSmallNormal(String, 0, 0, line);
continue;
}
if (gEnteringSMS == SMS_ENTERING_MESSAGE) {
UI_PrintString("SMS Dat", 0, 0, line - 1, 8);
UI_PrintString("SMS Dat", 0, 0, line - 1 /*, 8 */);
sprintf(String, "%s", dataPacket.data);
UI_PrintStringSmallNormal(String, 0, 0, line);
continue;
}
if (gDTMF_InputMode
#ifdef ENABLE_DTMF_CALLING
#ifdef ENABLE_DTMF_CALLING
|| gDTMF_CallState != DTMF_CALL_STATE_NONE || gDTMF_IsTx
#endif
) {
@@ -657,7 +620,7 @@ void UI_DisplayMain(void) {
}
}
UI_PrintString(pPrintStr, 2, 0, 2 + (vfo_num * 3), 8);
UI_PrintString(pPrintStr, 2, 0, 2 + (vfo_num * 3) /*, 8 */);
pPrintStr = "";
if (!gDTMF_InputMode) {
@@ -680,17 +643,17 @@ void UI_DisplayMain(void) {
#ifdef ENABLE_FEAT_F4HWN
if (isMainOnly()) {
UI_PrintString(pPrintStr, 2, 0, 5, 8);
UI_PrintString(pPrintStr, 2, 0, 5 /*, 8 */);
isMainOnlyInputDTMF = true;
center_line = CENTER_LINE_IN_USE;
} else {
UI_PrintString(pPrintStr, 2, 0, 0 + (vfo_num * 3), 8);
UI_PrintString(pPrintStr, 2, 0, 0 + (vfo_num * 3) /*, 8 */);
isMainOnlyInputDTMF = false;
center_line = CENTER_LINE_IN_USE;
continue;
}
#else
UI_PrintString(pPrintStr, 2, 0, 0 + (vfo_num * 3), 8);
UI_PrintString(pPrintStr, 2, 0, 0 + (vfo_num * 3) /*, 8 */);
center_line = CENTER_LINE_IN_USE;
continue;
#endif
@@ -709,11 +672,11 @@ void UI_DisplayMain(void) {
uint32_t frequency = gEeprom.VfoInfo[vfo_num].pRX->Frequency;
if (TX_freq_check(frequency) != 0 && gEeprom.VfoInfo[vfo_num].TX_LOCK == true) {
if (TX_freq_check(frequency) != 0) {
if (isMainOnly())
memcpy(p_line0 + 14, BITMAP_VFO_Lock, sizeof(BITMAP_VFO_Lock));
memcpy(p_line0 + 5, gFontKeyLock, sizeof(gFontKeyLock));
else
memcpy(p_line0 + 24, BITMAP_VFO_Lock, sizeof(BITMAP_VFO_Lock));
memcpy(p_line0 + 10, gFontKeyLock, sizeof(gFontKeyLock));
}
if (gCurrentFunction == FUNCTION_TRANSMIT) { // transmitting
@@ -750,7 +713,7 @@ void UI_DisplayMain(void) {
#ifdef ENABLE_FEAT_F4HWN
else {
if (RxOnVfofrequency == frequency && !isMainOnly()) {
UI_PrintStringSmallNormal(">>", 8, 0, line);
UI_PrintStringSmallNormal(">>", 24, 0, line);
//memcpy(p_line0 + 14, BITMAP_VFO_Default, sizeof(BITMAP_VFO_Default));
}
@@ -761,7 +724,7 @@ void UI_DisplayMain(void) {
}
if (IS_MR_CHANNEL(gEeprom.ScreenChannel[vfo_num])) { // channel mode
const unsigned int x = 2;
const unsigned int x = 20;
const bool inputting = gInputBoxIndex != 0 && gEeprom.TX_VFO == vfo_num;
if (!inputting)
sprintf(String, "M%u", gEeprom.ScreenChannel[vfo_num] + 1);
@@ -770,7 +733,7 @@ void UI_DisplayMain(void) {
UI_PrintStringSmallNormal(String, x, 0, line + 1);
} else if (IS_FREQ_CHANNEL(gEeprom.ScreenChannel[vfo_num])) { // frequency mode
// show the frequency band number
const unsigned int x = 2;
const unsigned int x = 0;
char *buf = gEeprom.VfoInfo[vfo_num].pRX->Frequency < _1GHz_in_KHz ? "" : "+";
sprintf(String, "F%u%s", 1 + gEeprom.ScreenChannel[vfo_num] - FREQ_CHANNEL_FIRST, buf);
UI_PrintStringSmallNormal(String, x, 0, line + 1);
@@ -802,24 +765,15 @@ void UI_DisplayMain(void) {
#endif
if (state != VFO_STATE_NORMAL) {
if (state < ARRAY_SIZE(VfoStateStr))
UI_PrintString(VfoStateStr[state], 31, 0, line, 8);
UI_PrintString(VfoStateStr[state], 31, 0, line /*, 8 */);
} else if (gInputBoxIndex > 0 && IS_FREQ_CHANNEL(gEeprom.ScreenChannel[vfo_num]) &&
gEeprom.TX_VFO == vfo_num) { // user entering a frequency
const char *ascii = INPUTBOX_GetAscii();
bool isGigaF = frequency >= _1GHz_in_KHz;
sprintf(String, "%.*s.%.3s", 3 + isGigaF, ascii, ascii + 3 + isGigaF);
#ifdef ENABLE_BIG_FREQ
if (!isGigaF) {
// show the remaining 2 small frequency digits
UI_PrintStringSmallNormal(String + 7, 113, 0, line + 1);
String[7] = 0;
// show the main large frequency digits
UI_DisplayFrequency(String, 32, line, false);
} else
#endif
{
// show the frequency in the main font
UI_PrintString(String, 32, 0, line, 8);
UI_PrintString(String, 45, 0, line /*, 8 */);
}
continue;
@@ -888,19 +842,19 @@ void UI_DisplayMain(void) {
UI_PrintStringSmallNormal(String + 7, 113, 0, line + 1);
String[7] = 0;
// show the main large frequency digits
UI_DisplayFrequency(String, 32, line, false);
UI_DisplayFrequency(String, 20, line, false);
} else
#endif
{
// show the frequency in the main font
UI_PrintString(String, 32, 0, line, 8);
UI_PrintStringSmallBold(String, 40, 0, line /*, 8 */);
}
break;
case MDF_CHANNEL: // show the channel number
sprintf(String, "CH-%03u", gEeprom.ScreenChannel[vfo_num] + 1);
UI_PrintString(String, 32, 0, line, 8);
UI_PrintStringSmallBold(String, 40, 0, line /*, 8 */);
break;
case MDF_NAME: // show the channel name
@@ -912,20 +866,20 @@ void UI_DisplayMain(void) {
}
if (gEeprom.CHANNEL_DISPLAY_MODE == MDF_NAME) {
UI_PrintString(String, 32, 0, line, 8);
UI_PrintStringSmallBold(String, 40, 0, line /*, 8 */);
} else {
#ifdef ENABLE_FEAT_F4HWN
if (isMainOnly()) {
UI_PrintString(String, 32, 0, line, 8);
UI_PrintStringSmallBold(String, 40, 0, line /*, 8 */);
} else {
if (activeTxVFO == vfo_num) {
UI_PrintStringSmallBold(String, 32 + 4, 0, line);
UI_PrintStringSmallBold(String, 40 + 4, 0, line);
} else {
UI_PrintStringSmallNormal(String, 32 + 4, 0, line);
UI_PrintStringSmallNormal(String, 40 + 4, 0, line);
}
}
#else
UI_PrintStringSmallBold(String, 32 + 4, 0, line);
UI_PrintStringSmallBold(String, 20 + 4, 0, line);
#endif
#ifdef ENABLE_FEAT_F4HWN
@@ -936,19 +890,19 @@ void UI_DisplayMain(void) {
UI_PrintStringSmallNormal(String + 7, 113, 0, line + 4);
String[7] = 0;
// show the main large frequency digits
//UI_DisplayFrequency(String, 32, line + 3, false);
UI_PrintStringSmallNormal(String, 0, 20, line + 3);
//UI_DisplayFrequency(String, 20, line + 3, false);
UI_PrintStringSmallBold(String, 20, 20, line + 3);
} else {
// show the frequency in the main font
UI_PrintString(String, 32, 0, line + 3, 8);
UI_PrintString(String, 40, 0, line + 3 /*, 8 */);
}
} else {
sprintf(String, "%03u.%05u", frequency / 100000, frequency % 100000);
UI_PrintStringSmallNormal(String, 32 + 4, 0, line + 1);
UI_PrintStringSmallBold(String, 40 + 4, 0, line + 1);
}
#else // show the channel frequency below the channel number/name
sprintf(String, "%03u.%05u", frequency / 100000, frequency % 100000);
UI_PrintStringSmallNormal(String, 32 + 4, 0, line + 1);
UI_PrintStringSmallNormal(String, 20 + 4, 0, line + 1);
#endif
}
@@ -963,12 +917,12 @@ void UI_DisplayMain(void) {
UI_PrintStringSmallNormal(String + 7, 113, 0, line + 1);
String[7] = 0;
// show the main large frequency digits
UI_DisplayFrequency(String, 32, line, false);
UI_DisplayFrequency(String, 20, line, false);
} else
#endif
{
// show the frequency in the main font
UI_PrintString(String, 32, 0, line, 8);
UI_PrintStringSmallBold(String, 40, 0, line /*, 8 */);
}
// show the channel symbols
@@ -1075,70 +1029,28 @@ void UI_DisplayMain(void) {
shift = -10;
}
if (gSetting_set_gui) {
UI_PrintStringSmallNormal(s, LCD_WIDTH + 22, 0, line + 1);
UI_PrintStringSmallNormal(t, LCD_WIDTH + 2, 0, line + 1);
UI_PrintStringSmallNormal(s, 50, 0, line + 2);
UI_PrintStringSmallNormal(t, 2, 0, line + 2);
if (isMainOnly() && !gDTMF_InputMode) {
if (shift == 0) {
UI_PrintStringSmallNormal(String, 2, 0, 6);
}
if ((vfoInfo->StepFrequency / 100) < 100) {
sprintf(String, "%d.%02uK", vfoInfo->StepFrequency / 100, vfoInfo->StepFrequency % 100);
} else {
sprintf(String, "%dK", vfoInfo->StepFrequency / 100);
}
UI_PrintStringSmallNormal(String, 46, 0, 6);
}
} else {
if ((s != NULL) && (s[0] != '\0')) {
GUI_DisplaySmallest(s, 58, line == 0 ? 17 : 49, false, true);
}
if ((t != NULL) && (t[0] != '\0')) {
GUI_DisplaySmallest(t, 3, line == 0 ? 17 : 49, false, true);
}
GUI_DisplaySmallest(String, 68 + shift, line == 0 ? 17 : 49, false, true);
//sprintf(String, "%d.%02u", vfoInfo->StepFrequency / 100, vfoInfo->StepFrequency % 100);
//GUI_DisplaySmallest(String, 91, line == 0 ? 2 : 34, false, true);
if (shift == 0) {
UI_PrintStringSmallNormal(String, 65, 0, line + 2);
}
if ((vfoInfo->StepFrequency / 100) < 100) {
sprintf(String, "%d.%02uK", vfoInfo->StepFrequency / 100, vfoInfo->StepFrequency % 100);
} else {
sprintf(String, "%dK", vfoInfo->StepFrequency / 100);
}
UI_PrintStringSmallNormal(String, 55, 0, line + 1);
#else
UI_PrintStringSmallNormal(s, LCD_WIDTH + 24, 0, line + 1);
#endif
if (state == VFO_STATE_NORMAL || state == VFO_STATE_ALARM) { // show the TX power
uint8_t currentPower = vfoInfo->OUTPUT_POWER % 8;
uint8_t arrowPos = 19;
bool userPower = false;
if (currentPower == OUTPUT_POWER_USER) {
currentPower = gSetting_set_pwr;
userPower = true;
} else {
currentPower--;
userPower = false;
}
if (gSetting_set_gui) {
const char pwr_short[][3] = {"L1", "L2", "L3", "L4", "L5", "M", "H"};
//sprintf(String, "%s", pwr_short[currentPower]);
//UI_PrintStringSmallNormal(String, LCD_WIDTH + 42, 0, line + 1);
UI_PrintStringSmallNormal(pwr_short[currentPower], LCD_WIDTH + 42, 0, line + 1);
arrowPos = 38;
} else {
const char pwr_long[][5] = {"LOW1", "LOW2", "LOW3", "LOW4", "LOW5", "MID", "HIGH"};
//sprintf(String, "%s", pwr_long[currentPower]);
//GUI_DisplaySmallest(String, 24, line == 0 ? 17 : 49, false, true);
GUI_DisplaySmallest(pwr_long[currentPower], 24, line == 0 ? 17 : 49, false, true);
}
if (userPower == true) {
memcpy(p_line0 + 256 + arrowPos, BITMAP_PowerUser, sizeof(BITMAP_PowerUser));
}
const char pwr_short[][3] = {"L1", "L2", "L3", "L4", "L5", "ME",
"HI"};
UI_PrintStringSmallNormal(pwr_short[currentPower], LCD_WIDTH + 25, 0, line + 1);
}
if (vfoInfo->freq_config_RX.Frequency != vfoInfo->freq_config_TX.Frequency) { // show the TX offset symbol
@@ -1156,22 +1068,7 @@ void UI_DisplayMain(void) {
#endif
#if ENABLE_FEAT_F4HWN
if (gSetting_set_gui) {
UI_PrintStringSmallNormal(dir_list[i], LCD_WIDTH + 60, 0, line + 1);
} else {
#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
if(i == 3)
{
GUI_DisplaySmallest(dir_list[i], 43, line == 0 ? 17 : 49, false, true);
}
else
{
#endif
UI_PrintStringSmallNormal(dir_list[i], LCD_WIDTH + 41, 0, line + 1);
#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
}
#endif
}
UI_PrintStringSmallNormal(dir_list[i], LCD_WIDTH + 60, 0, line + 1);
#else
UI_PrintStringSmallNormal(dir_list[i], LCD_WIDTH + 54, 0, line + 1);
#endif
@@ -1181,11 +1078,7 @@ void UI_DisplayMain(void) {
if (vfoInfo->FrequencyReverse)
#if ENABLE_FEAT_F4HWN
{
if (gSetting_set_gui) {
UI_PrintStringSmallNormal("R", LCD_WIDTH + 68, 0, line + 1);
} else {
GUI_DisplaySmallest("R", 51, line == 0 ? 17 : 49, false, true);
}
UI_PrintStringSmallNormal("R", LCD_WIDTH + 68, 0, line + 1);
}
#else
UI_PrintStringSmallNormal("R", LCD_WIDTH + 62, 0, line + 1);
@@ -1198,16 +1091,9 @@ void UI_DisplayMain(void) {
if (vfoInfo->CHANNEL_BANDWIDTH == BANDWIDTH_NARROW && gSetting_set_nfm == 1) {
narrower = 1;
}
if (gSetting_set_gui) {
const char *bandWidthNames[] = {"W", "N", "N+"};
UI_PrintStringSmallNormal(bandWidthNames[vfoInfo->CHANNEL_BANDWIDTH + narrower], LCD_WIDTH + 80, 0,
line + 1);
} else {
const char *bandWidthNames[] = {"WIDE", "NAR", "NAR+"};
GUI_DisplaySmallest(bandWidthNames[vfoInfo->CHANNEL_BANDWIDTH + narrower], 91, line == 0 ? 17 : 49, false,
true);
}
const char *bandWidthNames[] = {"WID", "NAR", "NR+"};
UI_PrintStringSmallNormal(bandWidthNames[vfoInfo->CHANNEL_BANDWIDTH + narrower], LCD_WIDTH + 30, 0,
line);
#else
if (gSetting_set_gui)
{
@@ -1232,49 +1118,21 @@ void UI_DisplayMain(void) {
#endif
// show the audio scramble symbol
if (vfoInfo->SCRAMBLING_TYPE > 0)
UI_PrintStringSmallNormal("S", LCD_WIDTH + 106, 0, line);
if (vfoInfo->SCRAMBLING_TYPE > 0) {
sprintf(String, "S%d", vfoInfo->SCRAMBLING_TYPE + 25);
UI_PrintStringSmallNormal(String, 105, 0, line + 2);
}
#ifdef ENABLE_FEAT_F4HWN
/*
if(isMainVFO)
{
if(gMonitor)
{
sprintf(String, "%s", "MONI");
}
if (gSetting_set_gui)
{
if(!gMonitor)
{
sprintf(String, "SQL%d", gEeprom.SQUELCH_LEVEL);
}
UI_PrintStringSmallNormal(String, LCD_WIDTH + 98, 0, line + 1);
}
else
{
if(!gMonitor)
{
sprintf(String, "SQL%d", gEeprom.SQUELCH_LEVEL);
}
GUI_DisplaySmallest(String, 110, line == 0 ? 17 : 49, false, true);
}
}
*/
if (isMainVFO) {
if (gMonitor) {
strcpy(String, "MONI");
} else {
sprintf(String, "SQL%d", gEeprom.SQUELCH_LEVEL);
}
if (isMainVFO && gMonitor) {
strcpy(String, "MONI");
if (gSetting_set_gui) {
UI_PrintStringSmallNormal(String, LCD_WIDTH + 98, 0, line + 1);
} else {
GUI_DisplaySmallest(String, 110, line == 0 ? 17 : 49, false, true);
}
} else {
sprintf(String, "SQL%d", gEeprom.SQUELCH_LEVEL);
}
UI_PrintStringSmallNormal(String, LCD_WIDTH + 98, 0, line);
#endif
}
@@ -1324,7 +1182,7 @@ void UI_DisplayMain(void) {
const unsigned int idx = (len > (17 - 5)) ? len - (17 - 5) : 0; // limit to last 'n' chars
if (gScreenToDisplay != DISPLAY_MAIN
#ifdef ENABLE_DTMF_CALLING
#ifdef ENABLE_DTMF_CALLING
|| gDTMF_CallState != DTMF_CALL_STATE_NONE
#endif
)
@@ -1402,4 +1260,4 @@ void UI_DisplayMain(void) {
ST7565_BlitFullScreen();
}
// ***************************************************************************
// ***************************************************************************