mirror of
https://github.com/OneOfEleven/uv-k5-firmware-custom.git
synced 2025-05-18 16:01:18 +03:00
Fix what github did to my files :(
This commit is contained in:
parent
50ebc4e629
commit
350da78bfa
BIN
firmware.bin
BIN
firmware.bin
Binary file not shown.
Binary file not shown.
@ -24,7 +24,8 @@
|
||||
|
||||
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));
|
||||
}
|
||||
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)
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
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);
|
||||
void UI_DisplayBattery(const unsigned int Level, const unsigned int blink);
|
||||
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user