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

Improve power settings UI

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-07-17 03:25:13 +02:00
parent 2740501fec
commit 3018e0617d
3 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bitmaps.c
View File

@@ -272,6 +272,14 @@ const uint8_t BITMAP_Ready[7] =
0b00000010, 0b00000010,
}; };
const uint8_t BITMAP_PowerUser[3] =
{ // 'arrow' symbol
0b00111110,
0b00011100,
0b00001000,
};
#ifndef ENABLE_CUSTOM_MENU_LAYOUT #ifndef ENABLE_CUSTOM_MENU_LAYOUT
const uint8_t BITMAP_CurrentIndicator[8] = { const uint8_t BITMAP_CurrentIndicator[8] = {
0xFF, 0xFF,

1
bitmaps.h
View File

@@ -36,6 +36,7 @@ extern const uint8_t BITMAP_ScanList2[7];
extern const uint8_t BITMAP_ScanList3[7]; extern const uint8_t BITMAP_ScanList3[7];
extern const uint8_t BITMAP_ScanList123[19]; extern const uint8_t BITMAP_ScanList123[19];
extern const uint8_t BITMAP_ScanListAll[19]; extern const uint8_t BITMAP_ScanListAll[19];
extern const uint8_t BITMAP_PowerUser[3];
extern const uint8_t BITMAP_compand[6]; extern const uint8_t BITMAP_compand[6];
#ifndef ENABLE_CUSTOM_MENU_LAYOUT #ifndef ENABLE_CUSTOM_MENU_LAYOUT

43
ui/main.c
View File

@@ -1152,7 +1152,7 @@ void UI_DisplayMain(void)
if (isMainOnly(true)) if (isMainOnly(true))
{ {
UI_PrintStringSmallNormal(s, LCD_WIDTH + 24, 0, line + 1); UI_PrintStringSmallNormal(s, LCD_WIDTH + 22, 0, line + 1);
UI_PrintStringSmallNormal(t, LCD_WIDTH + 2, 0, line + 1); UI_PrintStringSmallNormal(t, LCD_WIDTH + 2, 0, line + 1);
if (isMainOnly(false) && !gDTMF_InputMode) if (isMainOnly(false) && !gDTMF_InputMode)
@@ -1194,24 +1194,39 @@ void UI_DisplayMain(void)
if (state == VFO_STATE_NORMAL || state == VFO_STATE_ALARM) if (state == VFO_STATE_NORMAL || state == VFO_STATE_ALARM)
{ // show the TX power { // show the TX power
int i = vfoInfo->OUTPUT_POWER % 8; uint8_t currentPower = vfoInfo->OUTPUT_POWER % 8;
#if ENABLE_FEAT_F4HWN uint8_t arrowPos = 19;
if (isMainOnly(true)) bool userPower = false;
if(currentPower == OUTPUT_POWER_USER)
{ {
const char pwr_short[][3] = {"U", "L1", "L2", "L3", "L4", "L5", "M", "H"}; currentPower = gSetting_set_pwr;
sprintf(String, "%s", pwr_short[i]); userPower = true;
UI_PrintStringSmallNormal(String, LCD_WIDTH + 44, 0, line + 1);
} }
else else
{ {
const char pwr_long[][5] = {"USER", "LOW1", "LOW2", "LOW3", "LOW4", "LOW5", "MID", "HIGH"}; currentPower--;
sprintf(String, "%s", pwr_long[i]); userPower = false;
}
if (isMainOnly(true))
{
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);
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(String, 24, line == 0 ? 17 : 49, false, true);
} }
#else
const char pwr_list[][2] = {"L","M","H"}; if(userPower == true)
UI_PrintStringSmallNormal(pwr_list[i], LCD_WIDTH + 46, 0, line + 1); {
#endif memcpy(p_line0 + 256 + arrowPos, BITMAP_PowerUser, sizeof(BITMAP_PowerUser));
}
} }
if (vfoInfo->freq_config_RX.Frequency != vfoInfo->freq_config_TX.Frequency) if (vfoInfo->freq_config_RX.Frequency != vfoInfo->freq_config_TX.Frequency)
@@ -1424,7 +1439,7 @@ void UI_DisplayMain(void)
UI_PrintStringSmallBold(String, 92, 0, 6); UI_PrintStringSmallBold(String, 92, 0, 6);
for (uint8_t i = 92; i < 128; i++) for (uint8_t i = 92; i < 128; i++)
{ {
gFrameBuffer[6][i] ^= 0xFF; gFrameBuffer[6][i] ^= 0x7F;
} }
} }
#endif #endif