0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-04-28 14:21:25 +03:00

Merge pull request #147 from egzumer/battery_fix

Battery symbol fix of a fix
This commit is contained in:
OneOfEleven 2023-10-10 00:48:37 +01:00 committed by GitHub
commit 6819aca561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 20 deletions

View File

@ -24,12 +24,16 @@
void UI_DrawBattery(uint8_t *bitmap, const unsigned int level, const unsigned int blink)
{
if (blink == 0) {
memset(bitmap, 0, sizeof(BITMAP_BATTERY_LEVEL));
}
else
{
memmove(bitmap, BITMAP_BATTERY_LEVEL, sizeof(BITMAP_BATTERY_LEVEL));
if (level >= 1)
if (level > 1)
{
unsigned int i;
unsigned int bars = (level > 0) ? level - 1 : 0;
unsigned int bars = level - 1;
if (bars > 4)
bars = 4;
for (i = 0; i < bars; i++)
@ -38,20 +42,17 @@ void UI_DrawBattery(uint8_t *bitmap, const unsigned int level, const unsigned in
bitmap[3 + (i * 3) + 0] = 0b01011101;
bitmap[3 + (i * 3) + 1] = 0b01011101;
#else
bitmap[sizeof(bitmap) - 3 - (i * 3) - 0] = 0b01011101;
bitmap[sizeof(bitmap) - 3 - (i * 3) - 1] = 0b01011101;
bitmap[sizeof(BITMAP_BATTERY_LEVEL) - 3 - (i * 3) - 0] = 0b01011101;
bitmap[sizeof(BITMAP_BATTERY_LEVEL) - 3 - (i * 3) - 1] = 0b01011101;
#endif
}
}
else
if (blink == 0)
memset(bitmap, 0, sizeof(bitmap));
}
}
void UI_DisplayBattery(const unsigned int level, const unsigned int blink)
{
uint8_t bitmap[sizeof(BITMAP_BATTERY_LEVEL)];
UI_DrawBattery(bitmap, level, blink);
memmove(bitmap, BITMAP_BATTERY_LEVEL, sizeof(BITMAP_BATTERY_LEVEL));
ST7565_DrawLine(LCD_WIDTH - sizeof(bitmap), 0, sizeof(bitmap), bitmap);
}

View File

@ -216,7 +216,7 @@ void UI_DisplayStatus(const bool test_display)
x += sizeof(BITMAP_USB_C);
// BATTERY LEVEL indicator
UI_DrawBattery(line + x, g_battery_display_level, g_low_battery);
UI_DrawBattery(line + x, g_battery_display_level, g_low_battery_blink);
// **************