piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compiler warning

Browse Source
This commit is contained in:
Raphael Coeffic
2021-05-09 16:30:11 +02:00
parent a698e0c607
commit 955fa3d6bd
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/fonts.cpp
+9 -1
View File
@@ -29,6 +29,8 @@ const unsigned char font_xxs[] = {
};
#if LCD_H > 272
#if defined(BOOT)
const uint16_t font_std_en_specs[] = {
#include "font_17en.specs"
};
@@ -36,6 +38,7 @@ const uint16_t font_std_en_specs[] = {
const unsigned char font_std_en[] = {
#include "font_17en.lbm"
};
#endif
const uint16_t font_xs_specs[] = {
#include "font_15.specs"
@@ -60,7 +63,10 @@ const uint16_t font_bold_specs[] = {
const unsigned char font_bold[] = {
#include "font_bold17.lbm"
};
#else
#else // LCD_H <= 272
#if defined(BOOT)
const uint16_t font_std_en_specs[] = {
#include "font_16en.specs"
};
@@ -68,6 +74,7 @@ const uint16_t font_std_en_specs[] = {
const unsigned char font_std_en[] = {
#include "font_16en.lbm"
};
#endif
const uint16_t font_xs_specs[] = {
#include "font_13.specs"
@@ -92,6 +99,7 @@ const uint16_t font_bold_specs[] = {
const unsigned char font_bold[] = {
#include "font_bold16.lbm"
};
#endif // LCD_H > 272
const uint16_t font_l_specs[] = {
radio/src/gui/colorlcd/lcd.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ int getTextWidth(const char * s, int len, LcdFlags flags)
c += CJK_FIRST_LETTER_INDEX;
result += getFontPatternWidth(specs, c) + 1;
}
else if ((c >= 0x20) && (c < fontCharactersTable[FONT_INDEX(flags)] + 0x20)) { // debug
else if ((c >= 0x20u) && (c < fontCharactersTable[FONT_INDEX(flags)] + 0x20u)) {
result += getCharWidth(c, specs);
}
else {