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

FIX #21: Battery symbol fix of a fix

Browse Source
This commit is contained in:
Krzysiek Egzmont
2023-10-10 01:37:29 +02:00
parent 063dc61e65
commit 8d17f5922c
3 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -25,7 +25,7 @@ ENABLE_F_CAL_MENU := 0
ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1 ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1
ENABLE_BOOT_BEEPS := 0 ENABLE_BOOT_BEEPS := 0
ENABLE_SHOW_CHARGE_LEVEL := 1 ENABLE_SHOW_CHARGE_LEVEL := 1
ENABLE_REVERSE_BAT_SYMBOL := 1 ENABLE_REVERSE_BAT_SYMBOL := 0
ENABLE_CODE_SCAN_TIMEOUT := 0 ENABLE_CODE_SCAN_TIMEOUT := 0
ENABLE_AM_FIX := 1 ENABLE_AM_FIX := 1
ENABLE_AM_FIX_SHOW_DATA := 0 ENABLE_AM_FIX_SHOW_DATA := 0

43
ui/battery.c
View File

@@ -24,34 +24,33 @@
void UI_DrawBattery(uint8_t* bitmap, uint8_t level, uint8_t blink) void UI_DrawBattery(uint8_t* bitmap, uint8_t level, uint8_t blink)
{ {
memmove(bitmap, BITMAP_BatteryLevel1, sizeof(BITMAP_BatteryLevel1)); if (level < 2 && blink == 1) {
memset(bitmap, 0, sizeof(BITMAP_BatteryLevel1));
if (level >= 1) }
else
{ {
unsigned int i; memmove(bitmap, BITMAP_BatteryLevel1, sizeof(BITMAP_BatteryLevel1));
uint8_t bars = level > 0 ? level - 1 : 0; if (level > 1)
if(bars>4) bars = 4;
for (i = 0; i < bars; i++)
{ {
#ifndef ENABLE_REVERSE_BAT_SYMBOL unsigned int i;
memcpy(bitmap + sizeof(bitmap) - 4 - (i * 3), BITMAP_BatteryLevel, 2); uint8_t bars = level - 1;
#else if (bars > 4)
memcpy(bitmap + 3 + (i * 3) + 0, BITMAP_BatteryLevel, 2); bars = 4;
#endif for (i = 0; i < bars; i++)
{
#ifndef ENABLE_REVERSE_BAT_SYMBOL
memcpy(bitmap + sizeof(BITMAP_BatteryLevel1) - 4 - (i * 3), BITMAP_BatteryLevel, 2);
#else
memcpy(bitmap + 3 + (i * 3) + 0, BITMAP_BatteryLevel, 2);
#endif
}
} }
} }
else
if (blink == 0)
memset(bitmap, 0, sizeof(bitmap));
} }
void UI_DisplayBattery(uint8_t level, uint8_t blink) void UI_DisplayBattery(uint8_t level, uint8_t blink)
{ {
if (gCurrentFunction != FUNCTION_TRANSMIT) { uint8_t bitmap[sizeof(BITMAP_BatteryLevel1)];
uint8_t bitmap[sizeof(BITMAP_BatteryLevel1)]; UI_DrawBattery(bitmap, level, blink);
ST7565_DrawLine(LCD_WIDTH - sizeof(bitmap), 0, sizeof(bitmap), bitmap);
UI_DrawBattery(bitmap, level, blink);
memmove(bitmap, BITMAP_BatteryLevel1, sizeof(BITMAP_BatteryLevel1));
ST7565_DrawLine(LCD_WIDTH - sizeof(bitmap), 0, sizeof(bitmap), bitmap);
}
} }

2
ui/status.c
View File

@@ -218,7 +218,7 @@ void UI_DisplayStatus(const bool test_display)
x += sizeof(BITMAP_USB_C); x += sizeof(BITMAP_USB_C);
// BATTERY LEVEL indicator // BATTERY LEVEL indicator
UI_DrawBattery(line + x, gBatteryDisplayLevel, gLowBattery); UI_DrawBattery(line + x, gBatteryDisplayLevel, gLowBatteryBlink);
// ************** // **************