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

Improve power settings

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-07-16 03:20:51 +02:00
parent 88ef0d9925
commit 697bcb4a2e
12 changed files with 150 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ui/main.c
View File

@@ -1072,9 +1072,13 @@ void UI_DisplayMain(void)
{ // TX power level
switch (gRxVfo->OUTPUT_POWER)
{
case OUTPUT_POWER_LOW: Level = 2; break;
case OUTPUT_POWER_MID: Level = 4; break;
case OUTPUT_POWER_HIGH: Level = 6; break;
case OUTPUT_POWER_LOW1: Level = 2; break;
case OUTPUT_POWER_LOW2: Level = 2; break;
case OUTPUT_POWER_LOW3: Level = 2; break;
case OUTPUT_POWER_LOW4: Level = 2; break;
case OUTPUT_POWER_LOW5: Level = 2; break;
case OUTPUT_POWER_MID: Level = 4; break;
case OUTPUT_POWER_HIGH: Level = 6; break;
}
}
else
@@ -1190,36 +1194,22 @@ void UI_DisplayMain(void)
if (state == VFO_STATE_NORMAL || state == VFO_STATE_ALARM)
{ // show the TX power
int i = vfoInfo->OUTPUT_POWER % 3;
int i = vfoInfo->OUTPUT_POWER % 8;
#if ENABLE_FEAT_F4HWN
if (isMainOnly(true))
{
const char pwr_short[][2] = {"L","M","H"};
if(i == 0)
{
sprintf(String, "%s%d", pwr_short[i], gSetting_set_low + 1);
}
else
{
sprintf(String, "%s", pwr_short[i]);
}
const char pwr_short[][3] = {"U", "L1", "L2", "L3", "L4", "L5", "M", "H"};
sprintf(String, "%s", pwr_short[i]);
UI_PrintStringSmallNormal(String, LCD_WIDTH + 44, 0, line + 1);
}
else
{
const char pwr_long[][5] = {"LOW", "MID", "HIGH"};
if(i == 0)
{
sprintf(String, "%s%d", pwr_long[i], gSetting_set_low + 1);
}
else
{
sprintf(String, "%s", pwr_long[i]);
}
const char pwr_long[][5] = {"USER", "LOW1", "LOW2", "LOW3", "LOW4", "LOW5", "MID", "HIGH"};
sprintf(String, "%s", pwr_long[i]);
GUI_DisplaySmallest(String, 24, line == 0 ? 17 : 49, false, true);
}
#else
const char pwr_list[][2] = {"L","M","H"};
const char pwr_list[][2] = {"U", "L","M","H"};
UI_PrintStringSmallNormal(pwr_list[i], LCD_WIDTH + 46, 0, line + 1);
#endif
}

23
ui/menu.c
View File

@@ -134,7 +134,7 @@ const t_menu_item MenuList[] =
{"RxMode", MENU_TDR },
{"Sql", MENU_SQL },
#ifdef ENABLE_FEAT_F4HWN
{"SetLow", MENU_SET_LOW },
{"SetPwr", MENU_SET_PWR },
{"SetPtt", MENU_SET_PTT },
{"SetTot", MENU_SET_TOT },
{"SetEot", MENU_SET_EOT },
@@ -166,9 +166,14 @@ const t_menu_item MenuList[] =
const uint8_t FIRST_HIDDEN_MENU_ITEM = MENU_F_LOCK;
const char gSubMenu_TXP[][5] =
const char gSubMenu_TXP[][6] =
{
"LOW",
"USER",
"LOW 1",
"LOW 2",
"LOW 3",
"LOW 4",
"LOW 5",
"MID",
"HIGH"
};
@@ -344,13 +349,15 @@ const char gSubMenu_SCRAMBLER[][7] =
#endif
#ifdef ENABLE_FEAT_F4HWN
const char gSubMenu_SET_LOW[][7] =
const char gSubMenu_SET_PWR[][7] =
{
"< 20mW",
"125mW",
"250mW",
"500mW",
"1W"
"1W",
"2W",
"5W"
};
const char gSubMenu_SET_PTT[][8] =
@@ -944,10 +951,10 @@ void UI_DisplayMenu(void)
break;
#ifdef ENABLE_FEAT_F4HWN
case MENU_SET_LOW:
strcpy(String, gSubMenu_SET_LOW[gSubMenuSelection]);
case MENU_SET_PWR:
strcpy(String, gSubMenu_SET_PWR[gSubMenuSelection]);
break;
case MENU_SET_PTT:
strcpy(String, gSubMenu_SET_PTT[gSubMenuSelection]);
break;

6
ui/menu.h
View File

@@ -123,7 +123,7 @@ enum
MENU_F_CALI, // reference xtal calibration
#endif
#ifdef ENABLE_FEAT_F4HWN
MENU_SET_LOW,
MENU_SET_PWR,
MENU_SET_PTT,
MENU_SET_TOT,
MENU_SET_EOT,
@@ -145,7 +145,7 @@ enum
extern const uint8_t FIRST_HIDDEN_MENU_ITEM;
extern const t_menu_item MenuList[];
extern const char gSubMenu_TXP[3][5];
extern const char gSubMenu_TXP[8][6];
extern const char gSubMenu_SFT_D[3][4];
extern const char gSubMenu_W_N[2][7];
extern const char gSubMenu_OFF_ON[2][4];
@@ -166,7 +166,7 @@ extern const char gSubMenu_D_RSP[4][11];
#endif
#ifdef ENABLE_FEAT_F4HWN
extern const char gSubMenu_SET_LOW[5][7];
extern const char gSubMenu_SET_PWR[7][7];
extern const char gSubMenu_SET_PTT[2][8];
extern const char gSubMenu_SET_TOT[4][7];
extern const char gSubMenu_SET_LCK[2][9];