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

Fix lock if RX

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-02-28 01:34:02 +01:00
parent 2287d2f3b8
commit fe69506f31
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ui/status.c
View File

@@ -149,22 +149,15 @@ void UI_DisplayStatus()
if (gEeprom.KEY_LOCK) { if (gEeprom.KEY_LOCK) {
static uint8_t blink = 0; static uint8_t blink = 0;
if(FUNCTION_IsRx()) blink = 0;
if(blink < 5) if(blink < 5)
{ {
memcpy(line + x + 1, gFontKeyLock, sizeof(gFontKeyLock)); memcpy(line + x + 1, gFontKeyLock, sizeof(gFontKeyLock));
blink++;
}
else
{
if(blink < 9)
{
blink++;
}
else
{
blink = 0;
}
} }
blink = (blink++ < 10) ? blink : 0;
x += sizeof(gFontKeyLock); x += sizeof(gFontKeyLock);
x1 = x; x1 = x;
} }
@@ -187,7 +180,6 @@ void UI_DisplayStatus()
{ // battery voltage or percentage { // battery voltage or percentage
char s[8] = ""; char s[8] = "";
unsigned int x2 = LCD_WIDTH - sizeof(BITMAP_BatteryLevel1) - 0; unsigned int x2 = LCD_WIDTH - sizeof(BITMAP_BatteryLevel1) - 0;
if (gChargingWithTypeC) if (gChargingWithTypeC)
x2 -= sizeof(BITMAP_USB_C); // the radio is on charge x2 -= sizeof(BITMAP_USB_C); // the radio is on charge
@@ -198,7 +190,11 @@ void UI_DisplayStatus()
case 1: { // voltage case 1: { // voltage
const uint16_t voltage = (gBatteryVoltageAverage <= 999) ? gBatteryVoltageAverage : 999; // limit to 9.99V const uint16_t voltage = (gBatteryVoltageAverage <= 999) ? gBatteryVoltageAverage : 999; // limit to 9.99V
#ifdef ENABLE_FEAT_F4HWN
sprintf(s, "%u.%02u", voltage / 100, voltage % 100);
#else
sprintf(s, "%u.%02uV", voltage / 100, voltage % 100); sprintf(s, "%u.%02uV", voltage / 100, voltage % 100);
#endif
break; break;
} }

1
ui/welcome.c
View File

@@ -111,7 +111,6 @@ void UI_DisplayWelcome(void)
} }
UI_DrawLineBuffer(gFrameBuffer, 0, 31, 126, 31, 1); UI_DrawLineBuffer(gFrameBuffer, 0, 31, 126, 31, 1);
//UI_DrawLineDottedBuffer(gFrameBuffer, 0, 39, 126, 39, 1);
UI_PrintStringSmallNormal(Based, 0, 127, 5); UI_PrintStringSmallNormal(Based, 0, 127, 5);
UI_PrintStringSmallNormal(Credits, 0, 127, 6); UI_PrintStringSmallNormal(Credits, 0, 127, 6);