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

Fix broken small digits

Browse Source
This commit is contained in:
OneOfEleven 2023-09-24 02:05:22 +01:00
parent 4a46723203
commit 81446c2f70
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui/helper.c
View File

@ -190,7 +190,8 @@ void UI_DisplayFrequency(const char *pDigits, uint8_t X, uint8_t Y, bool bDispla
void UI_DisplayFrequencySmall(const char *pDigits, uint8_t X, uint8_t Y, bool bDisplayLeadingZero) void UI_DisplayFrequencySmall(const char *pDigits, uint8_t X, uint8_t Y, bool bDisplayLeadingZero)
{ {
const unsigned int char_width = 7; const unsigned int char_width = ARRAY_SIZE(gFontSmall[0]);
const unsigned int spacing = 1 + char_width;
uint8_t *pFb = gFrameBuffer[Y] + X; uint8_t *pFb = gFrameBuffer[Y] + X;
bool bCanDisplay = false; bool bCanDisplay = false;
unsigned int i = 0; unsigned int i = 0;
@ -202,12 +203,12 @@ void UI_DisplayFrequencySmall(const char *pDigits, uint8_t X, uint8_t Y, bool bD
if (bDisplayLeadingZero || bCanDisplay || c > 0) if (bDisplayLeadingZero || bCanDisplay || c > 0)
{ {
#if 0 #if 0
memmove(pFb, gFontSmallDigits[c], char_width); memmove(pFb + 1, gFontSmallDigits[c], char_width);
#else #else
const unsigned int index = (c < 10) ? '0' - 32 + c : '-' - 32; const unsigned int index = (c < 10) ? '0' - 32 + c : '-' - 32;
memmove(pFb, gFontSmall[index], char_width); memmove(pFb + 1, gFontSmall[index], char_width);
#endif #endif
pFb += char_width; pFb += spacing;
bCanDisplay = true; bCanDisplay = true;
} }
} }
@ -224,18 +225,19 @@ void UI_DisplayFrequencySmall(const char *pDigits, uint8_t X, uint8_t Y, bool bD
{ {
const unsigned int c = pDigits[i++]; const unsigned int c = pDigits[i++];
#if 0 #if 0
memmove(pFb, gFontSmallDigits[c], char_width); memmove(pFb + 1, gFontSmallDigits[c], char_width);
#else #else
const unsigned int index = (c < 10) ? '0' - 32 + c : '-' - 32; const unsigned int index = (c < 10) ? '0' - 32 + c : '-' - 32;
memmove(pFb, gFontSmall[index], char_width); memmove(pFb + 1, gFontSmall[index], char_width);
#endif #endif
pFb += char_width; pFb += spacing;
} }
} }
void UI_DisplaySmallDigits(const uint8_t size, const char *str, const uint8_t x, const uint8_t y, const bool display_leading_zeros) void UI_DisplaySmallDigits(const uint8_t size, const char *str, const uint8_t x, const uint8_t y, const bool display_leading_zeros)
{ {
const unsigned int char_width = 7; const unsigned int char_width = ARRAY_SIZE(gFontSmall[0]);
const unsigned int spacing = 1 + char_width;
bool display = display_leading_zeros; bool display = display_leading_zeros;
unsigned int xx; unsigned int xx;
unsigned int i; unsigned int i;
@ -250,9 +252,9 @@ void UI_DisplaySmallDigits(const uint8_t size, const char *str, const uint8_t x,
memmove(gFrameBuffer[y] + xx, gFontSmallDigits[c], char_width); memmove(gFrameBuffer[y] + xx, gFontSmallDigits[c], char_width);
#else #else
const unsigned int index = (c < 10) ? '0' - 32 + c : '-' - 32; const unsigned int index = (c < 10) ? '0' - 32 + c : '-' - 32;
memmove(gFrameBuffer[y] + xx, gFontSmall[index], char_width); memmove(gFrameBuffer[y] + xx + 1, gFontSmall[index], char_width);
#endif #endif
xx += char_width; xx += spacing;
} }
} }
} }