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

Refactoring on state line

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-02-18 18:02:17 +01:00
parent dd5c50e017
commit a63888b3c3
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ui/main.c
View File

@@ -1075,12 +1075,28 @@ void UI_DisplayMain(void)
if (isMainOnly(true)) if (isMainOnly(true))
{ {
const char pwr_short[][2] = {"L","M","H"}; const char pwr_short[][2] = {"L","M","H"};
UI_PrintStringSmallNormal(pwr_short[i], LCD_WIDTH + 46, 0, line + 1); if(i == 0)
{
sprintf(String, "%s%d", pwr_short[i], gSetting_set_low + 1);
}
else
{
sprintf(String, "%s", pwr_short[i]);
}
UI_PrintStringSmallNormal(String, LCD_WIDTH + 44, 0, line + 1);
} }
else else
{ {
const char pwr_long[][5] = {"LOW", "MID", "HIGH"}; const char pwr_long[][5] = {"LOW", "MID", "HIGH"};
GUI_DisplaySmallest(pwr_long[i], 37, line == 0 ? 17 : 49, false, true); if(i == 0)
{
sprintf(String, "%s %d", pwr_long[i], gSetting_set_low + 1);
}
else
{
sprintf(String, "%s", pwr_long[i]);
}
GUI_DisplaySmallest(String, 37, line == 0 ? 17 : 49, false, true);
} }
#else #else
const char pwr_list[][2] = {"L","M","H"}; const char pwr_list[][2] = {"L","M","H"};
@@ -1095,11 +1111,11 @@ void UI_DisplayMain(void)
#if ENABLE_FEAT_F4HWN #if ENABLE_FEAT_F4HWN
if (isMainOnly(true)) if (isMainOnly(true))
{ {
UI_PrintStringSmallNormal(dir_list[i], LCD_WIDTH + 54, 0, line + 1); UI_PrintStringSmallNormal(dir_list[i], LCD_WIDTH + 60, 0, line + 1);
} }
else else
{ {
UI_PrintStringSmallNormal(dir_list[i], LCD_WIDTH + 60, 0, line + 1); UI_PrintStringSmallNormal(dir_list[i], LCD_WIDTH + 58, 0, line + 1);
} }
#else #else
UI_PrintStringSmallNormal(dir_list[i], LCD_WIDTH + 54, 0, line + 1); UI_PrintStringSmallNormal(dir_list[i], LCD_WIDTH + 54, 0, line + 1);
@@ -1112,7 +1128,7 @@ void UI_DisplayMain(void)
{ {
if (isMainOnly(true)) if (isMainOnly(true))
{ {
UI_PrintStringSmallNormal("R", LCD_WIDTH + 62, 0, line + 1); UI_PrintStringSmallNormal("R", LCD_WIDTH + 68, 0, line + 1);
} }
else else
{ {
@@ -1127,11 +1143,11 @@ void UI_DisplayMain(void)
if (isMainOnly(true)) if (isMainOnly(true))
{ {
if (vfoInfo->CHANNEL_BANDWIDTH == BANDWIDTH_NARROW) if (vfoInfo->CHANNEL_BANDWIDTH == BANDWIDTH_NARROW)
UI_PrintStringSmallNormal("N", LCD_WIDTH + 70, 0, line + 1); UI_PrintStringSmallNormal("N", LCD_WIDTH + 80, 0, line + 1);
} }
else else
{ {
const char *bandWidthNames[] = {"WIDE", "NARROW"}; const char *bandWidthNames[] = {"WIDE", "NAR"};
GUI_DisplaySmallest(bandWidthNames[vfoInfo->CHANNEL_BANDWIDTH], 76, line == 0 ? 17 : 49, false, true); GUI_DisplaySmallest(bandWidthNames[vfoInfo->CHANNEL_BANDWIDTH], 76, line == 0 ? 17 : 49, false, true);
} }
#else #else

4
ui/menu.c
View File

@@ -353,11 +353,11 @@ const char gSubMenu_SCRAMBLER[][7] =
#ifdef ENABLE_FEAT_F4HWN #ifdef ENABLE_FEAT_F4HWN
const char gSubMenu_SET_LOW[][7] = const char gSubMenu_SET_LOW[][7] =
{ {
"< 20mW",
"125mW", "125mW",
"250mW", "250mW",
"500mW", "500mW",
"1W", "1W"
"< 20mW"
}; };
const char gSubMenu_SET_PTT[][8] = const char gSubMenu_SET_PTT[][8] =