0
mirror of https://github.com/OneOfEleven/uv-k5-firmware-custom.git synced 2025-05-19 00:11:18 +03:00

Fix what github did to my files :(

This commit is contained in:
OneOfEleven 2023-10-10 00:59:45 +01:00
parent 50ebc4e629
commit 350da78bfa
4 changed files with 3 additions and 8 deletions

Binary file not shown.

Binary file not shown.

View File

@ -24,7 +24,8 @@
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)
{ {
if (blink == 0) { if (blink == 0)
{
memset(bitmap, 0, sizeof(BITMAP_BATTERY_LEVEL)); memset(bitmap, 0, sizeof(BITMAP_BATTERY_LEVEL));
} }
else else
@ -48,12 +49,6 @@ void UI_DrawBattery(uint8_t *bitmap, const unsigned int level, const unsigned in
} }
} }
} }
<<<<<<< HEAD
else
if (blink == 0)
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)