mirrors/uv-k5-firmware-custom
0
Fork 0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-05-03 00:31:26 +03:00
Code Issues Releases Activity

Merge branch 'main' of https://github.com/OneOfEleven/uv-k5-firmware-custom

Browse Source 
# Conflicts:
#	ui/battery.c
This commit is contained in:
OneOfEleven 2023-10-10 00:57:37 +01:00
commit 50ebc4e629
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ui/battery.c
View File

@ -24,34 +24,41 @@
void UI_DrawBattery(uint8_t *bitmap, const unsigned int level, const unsigned int blink) void UI_DrawBattery(uint8_t *bitmap, const unsigned int level, const unsigned int blink)
{ {
memmove(bitmap, BITMAP_BATTERY_LEVEL, sizeof(BITMAP_BATTERY_LEVEL)); if (blink == 0) {
memset(bitmap, 0, sizeof(BITMAP_BATTERY_LEVEL));
if (level >= 1) }
else
{ {
unsigned int i; memmove(bitmap, BITMAP_BATTERY_LEVEL, sizeof(BITMAP_BATTERY_LEVEL));
unsigned int bars = (level > 0) ? level - 1 : 0; if (level > 1)
if (bars > 4)
bars = 4;
for (i = 0; i < bars; i++)
{ {
#ifdef ENABLE_REVERSE_BAT_SYMBOL unsigned int i;
bitmap[3 + (i * 3) + 0] = 0b01011101; unsigned int bars = level - 1;
bitmap[3 + (i * 3) + 1] = 0b01011101; if (bars > 4)
#else bars = 4;
bitmap[sizeof(bitmap) - 3 - (i * 3) - 0] = 0b01011101; for (i = 0; i < bars; i++)
bitmap[sizeof(bitmap) - 3 - (i * 3) - 1] = 0b01011101; {
#endif #ifdef ENABLE_REVERSE_BAT_SYMBOL
bitmap[3 + (i * 3) + 0] = 0b01011101;
bitmap[3 + (i * 3) + 1] = 0b01011101;
#else
bitmap[sizeof(BITMAP_BATTERY_LEVEL) - 3 - (i * 3) - 0] = 0b01011101;
bitmap[sizeof(BITMAP_BATTERY_LEVEL) - 3 - (i * 3) - 1] = 0b01011101;
#endif
}
} }
} }
<<<<<<< HEAD
else else
if (blink == 0) if (blink == 0)
memset(bitmap, 0, sizeof(BITMAP_BATTERY_LEVEL)); memset(bitmap, 0, sizeof(BITMAP_BATTERY_LEVEL));
=======
>>>>>>> 6819aca561858ec310a18cf21769411a69cd01d7
} }
void UI_DisplayBattery(const unsigned int level, const unsigned int blink) void UI_DisplayBattery(const unsigned int level, const unsigned int blink)
{ {
uint8_t bitmap[sizeof(BITMAP_BATTERY_LEVEL)]; uint8_t bitmap[sizeof(BITMAP_BATTERY_LEVEL)];
UI_DrawBattery(bitmap, level, blink); UI_DrawBattery(bitmap, level, blink);
memmove(bitmap, BITMAP_BATTERY_LEVEL, sizeof(BITMAP_BATTERY_LEVEL));
ST7565_DrawLine(LCD_WIDTH - sizeof(bitmap), 0, sizeof(bitmap), bitmap); ST7565_DrawLine(LCD_WIDTH - sizeof(bitmap), 0, sizeof(bitmap), bitmap);
} }

2
ui/status.c
View File

@ -216,7 +216,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, g_battery_display_level, g_low_battery); UI_DrawBattery(line + x, g_battery_display_level, g_low_battery_blink);
// ************** // **************