chore(color): Reduce font FLASH storage (#3881)

This commit is contained in:
philmoz
2023-10-29 11:29:14 +10:00
committed by GitHub
parent b0267573b0
commit 58573d3315
68 changed files with 45290 additions and 328155 deletions
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
Binary file not shown.
File diff suppressed because it is too large Load Diff
+68 -19
View File
@@ -39,10 +39,11 @@ function make_font() {
local name=$1
local ttf=$2
local size=$3
local chars=$4
local arg=$5
local bpp=$4
local chars=$5
local arg=$6
lv_font_conv --no-prefilter --bpp 4 --size ${size} \
lv_font_conv --no-prefilter --bpp ${bpp} --size ${size} \
--font ${TTF_DIR}${ttf} -r ${ASCII},${DEGREE},${BULLET},${COMPARE}${chars} \
--font EdgeTX/extra.ttf -r ${EXTRA_SYM} \
--font ${ARROWS_FONT} -r ${ARROWS} \
@@ -50,29 +51,76 @@ function make_font() {
--format lvgl -o lv_font_${name}_${size}.c --force-fast-kern-format ${arg}
}
function make_font_bin() {
local name=$1
local ttf=$2
local size=$3
local bpp=$4
local chars=$5
local arg=$6
lv_font_conv --no-prefilter --bpp ${bpp} --size ${size} \
--font ${TTF_DIR}${ttf} -r ${ASCII},${DEGREE},${BULLET},${COMPARE}${chars} \
--font EdgeTX/extra.ttf -r ${EXTRA_SYM} \
--font ${ARROWS_FONT} -r ${ARROWS} \
--font ${SYMBOLS_FONT} -r ${SYMBOLS} \
--format bin -o lv_font_${name}_${size}.bin --force-fast-kern-format --no-compress ${arg}
}
function make_font_w_extra_sym() {
local name=$1
local ttf=$2
local size=$3
local chars=$4
local arg=$5
lv_font_conv --no-prefilter --bpp 4 --size ${size} \
local bpp=$4
local chars=$5
local arg=$6
lv_font_conv --no-prefilter --bpp ${bpp} --size ${size} \
--font ${TTF_DIR}${ttf} -r ${ASCII},${DEGREE}${chars} \
--font EdgeTX/extra.ttf -r ${EXTRA_SYM} \
--format lvgl -o lv_font_${name}_${size}.c --force-fast-kern-format ${arg}
}
function make_font_w_extra_sym_bin() {
local name=$1
local ttf=$2
local size=$3
local bpp=$4
local chars=$5
local arg=$6
lv_font_conv --no-prefilter --bpp ${bpp} --size ${size} \
--font ${TTF_DIR}${ttf} -r ${ASCII},${DEGREE}${chars} \
--font EdgeTX/extra.ttf -r ${EXTRA_SYM} \
--format bin -o lv_font_${name}_${size}.bin --force-fast-kern-format --no-compress ${arg}
}
function make_font_no_sym() {
local name=$1
local ttf=$2
local size=$3
local chars=$4
local arg=$5
lv_font_conv --no-prefilter --bpp 4 --size ${size} \
local bpp=$4
local chars=$5
local arg=$6
lv_font_conv --no-prefilter --bpp ${bpp} --size ${size} \
--font ${TTF_DIR}${ttf} -r ${ASCII},${DEGREE}${chars} \
--format lvgl -o lv_font_${name}_${size}.c --force-fast-kern-format ${arg}
}
function make_font_no_sym_bin() {
local name=$1
local ttf=$2
local size=$3
local bpp=$4
local chars=$5
local arg=$6
lv_font_conv --no-prefilter --bpp ${bpp} --size ${size} \
--font ${TTF_DIR}${ttf} -r ${ASCII},${DEGREE}${chars} \
--format bin -o lv_font_${name}_${size}.bin --force-fast-kern-format --no-compress ${arg}
}
# LV_SYMBOL_CHARGE, LV_SYMBOL_NEW_LINE, LV_SYMBOL_SD_CARD, LV_SYMBOL_CLOSE
# LV_SYMBOL_FILE, LV_SYMBOL_OK, LV_SYMBOL_WIFI
BL_SYMBOLS="61671,63650,63426,61453,61787,61452,61931"
@@ -93,15 +141,16 @@ function make_font_set() {
local ttf_bold=$3
local chars=$4
make_font "${name}" "${ttf_normal}" 9 ${chars} --no-compress
make_font "${name}" "${ttf_normal}" 13 ${chars} --no-compress
make_font "${name}" "${ttf_normal}" 16 ${chars} --no-compress
make_font "${name}" "${ttf_normal}" 17 ${chars} --no-compress
make_font "${name}_bold" "${ttf_bold}" 16 ${chars}
make_font "${name}_bold" "${ttf_bold}" 17 ${chars}
make_font_w_extra_sym "${name}" "${ttf_normal}" 24 ${chars}
make_font_no_sym "${name}_bold" "${ttf_bold}" 32 ${chars}
make_font_no_sym "${name}_bold" "${ttf_bold}" 64
make_font "${name}" "${ttf_normal}" 9 4 ${chars} --no-compress
make_font "${name}" "${ttf_normal}" 13 4 ${chars} --no-compress
make_font "${name}" "${ttf_normal}" 16 4 ${chars} --no-compress
make_font "${name}_bold" "${ttf_bold}" 16 4 ${chars} --no-compress
# make_font_w_extra_sym "${name}" "${ttf_normal}" 24 2 ${chars}
# make_font_no_sym "${name}_bold" "${ttf_bold}" 32 2 ${chars}
# make_font_no_sym "${name}_bold" "${ttf_bold}" 64 2
make_font_bin "${name}" "${ttf_normal}" 24 4 ${chars}
make_font_bin "${name}_bold" "${ttf_bold}" 32 4 ${chars}
make_font_bin "${name}_bold" "${ttf_bold}" 64 4 ${chars}
}
# Regular fonts
@@ -115,4 +164,4 @@ make_font_set "noto_tw" "Noto/NotoSansCJKsc-Regular.otf" "Noto/NotoSansCJKsc-Bol
make_font_set "noto_cn" "Noto/NotoSansCJKsc-Regular.otf" "Noto/NotoSansCJKsc-Bold.otf" ",${CN_SYMBOLS}"
make_font_set "noto_jp" "Noto/NotoSansCJKsc-Regular.otf" "Noto/NotoSansCJKsc-Bold.otf" ",${JP_SYMBOLS}"
make_font_set "arimo_he" "Arimo/Arimo-Regular.ttf" "Arimo/Arimo-Bold.ttf" ",${HE_SYMBOLS}"
make_font_set "Arimo_ru" "Arimo/Arimo-Regular.ttf" "Arimo/Arimo-Bold.ttf" ",${RU_SYMBOLS}"
make_font_set "arimo_ru" "Arimo/Arimo-Regular.ttf" "Arimo/Arimo-Bold.ttf" ",${RU_SYMBOLS}"
+46 -3
View File
@@ -30,25 +30,67 @@
&lv_font_ ## name ## _bold_16, /* FONT_BOLD_INDEX */ \
&lv_font_ ## name ## _9, /* FONT_XXS_INDEX */ \
&lv_font_ ## name ## _13, /* FONT_XS_INDEX */ \
&lv_font_ ## name ## _24, /* FONT_L_INDEX */ \
&lv_font_ ## name ## _bold_32, /* FONT_XL_INDEX */ \
&lv_font_ ## name ## _bold_64, /* FONT_XXL_INDEX */ \
nullptr, /* FONT_L_INDEX */ \
nullptr, /* FONT_XL_INDEX */ \
nullptr, /* FONT_XXL_INDEX */ \
}
#if defined(TRANSLATIONS_CN)
FONT_TABLE(noto_cn);
#define XXL_FONT "F/FONTS/lv_font_noto_cn_bold_64.bin"
#define XL_FONT "F/FONTS/lv_font_noto_cn_bold_32.bin"
#define L_FONT "F/FONTS/lv_font_noto_cn_24.bin"
#elif defined(TRANSLATIONS_TW)
FONT_TABLE(noto_tw);
#define XXL_FONT "F/FONTS/lv_font_noto_tw_bold_64.bin"
#define XL_FONT "F/FONTS/lv_font_noto_tw_bold_32.bin"
#define L_FONT "F/FONTS/lv_font_noto_tw_24.bin"
#elif defined(TRANSLATIONS_JP)
FONT_TABLE(noto_jp);
#define XXL_FONT "F/FONTS/lv_font_noto_jp_bold_64.bin"
#define XL_FONT "F/FONTS/lv_font_noto_jp_bold_32.bin"
#define L_FONT "F/FONTS/lv_font_noto_jp_24.bin"
#elif defined(TRANSLATIONS_HE)
FONT_TABLE(arimo_he);
#define XXL_FONT "F/FONTS/lv_font_arimo_he_bold_64.bin"
#define XL_FONT "F/FONTS/lv_font_arimo_he_bold_32.bin"
#define L_FONT "F/FONTS/lv_font_arimo_he_24.bin"
#elif defined(TRANSLATIONS_RU)
FONT_TABLE(arimo_ru);
#define XXL_FONT "F/FONTS/lv_font_arimo_ru_bold_64.bin"
#define XL_FONT "F/FONTS/lv_font_arimo_ru_bold_32.bin"
#define L_FONT "F/FONTS/lv_font_arimo_ru_24.bin"
#else
FONT_TABLE(roboto);
#define XXL_FONT "F/FONTS/lv_font_roboto_bold_64.bin"
#define XL_FONT "F/FONTS/lv_font_roboto_bold_32.bin"
#define L_FONT "F/FONTS/lv_font_roboto_24.bin"
#endif
void initFont(uint8_t font)
{
if (font >= FONT_L_INDEX && lvglFontTable[FONT_L_INDEX] == nullptr) {
const lv_font_t* lvFont = lv_font_load(L_FONT);
if (lvFont == nullptr)
lvFont = lvglFontTable[FONT_STD_INDEX];
lvglFontTable[FONT_L_INDEX] = lvFont;
}
if (font >= FONT_XL_INDEX && lvglFontTable[FONT_XL_INDEX] == nullptr) {
const lv_font_t* lvFont = lv_font_load(XL_FONT);
if (lvFont == nullptr)
lvFont = lvglFontTable[FONT_L_INDEX];
lvglFontTable[FONT_XL_INDEX] = lvFont;
}
if (font == FONT_XXL_INDEX && lvglFontTable[font] == nullptr) {
const lv_font_t* lvFont = lv_font_load(XXL_FONT);
if (lvFont == nullptr)
lvFont = lvglFontTable[font-1];
lvglFontTable[font] = lvFont;
}
}
#endif // BOOT
// used to set the line height to the line heights used in Edgetx < 2.7 and OpenTX
@@ -68,6 +110,7 @@ const lv_font_t* getFont(LcdFlags flags)
return LV_FONT_DEFAULT;
#else
auto fontIndex = FONT_INDEX(flags);
initFont(fontIndex);
if (fontIndex >= FONTS_COUNT) return LV_FONT_DEFAULT;
return lvglFontTable[fontIndex];
#endif
+8 -18
View File
@@ -397,11 +397,8 @@
LV_FONT_DECLARE(lv_font_noto_cn_9) \
LV_FONT_DECLARE(lv_font_noto_cn_13) \
LV_FONT_DECLARE(lv_font_noto_cn_16) \
LV_FONT_DECLARE(lv_font_noto_cn_17) \
LV_FONT_DECLARE(lv_font_noto_cn_24) \
LV_FONT_DECLARE(lv_font_noto_cn_64) \
LV_FONT_DECLARE(lv_font_noto_cn_bold_16) \
LV_FONT_DECLARE(lv_font_noto_cn_bold_17) \
LV_FONT_DECLARE(lv_font_noto_cn_bold_32) \
LV_FONT_DECLARE(lv_font_noto_cn_bold_64)
@@ -413,11 +410,8 @@
LV_FONT_DECLARE(lv_font_noto_tw_9) \
LV_FONT_DECLARE(lv_font_noto_tw_13) \
LV_FONT_DECLARE(lv_font_noto_tw_16) \
LV_FONT_DECLARE(lv_font_noto_tw_17) \
LV_FONT_DECLARE(lv_font_noto_tw_24) \
LV_FONT_DECLARE(lv_font_noto_tw_64) \
LV_FONT_DECLARE(lv_font_noto_tw_bold_16) \
LV_FONT_DECLARE(lv_font_noto_tw_bold_17) \
LV_FONT_DECLARE(lv_font_noto_tw_bold_32) \
LV_FONT_DECLARE(lv_font_noto_tw_bold_64)
@@ -429,11 +423,8 @@
LV_FONT_DECLARE(lv_font_arimo_ru_9) \
LV_FONT_DECLARE(lv_font_arimo_ru_13) \
LV_FONT_DECLARE(lv_font_arimo_ru_16) \
LV_FONT_DECLARE(lv_font_arimo_ru_17) \
LV_FONT_DECLARE(lv_font_arimo_ru_24) \
LV_FONT_DECLARE(lv_font_arimo_ru_64) \
LV_FONT_DECLARE(lv_font_arimo_ru_bold_16) \
LV_FONT_DECLARE(lv_font_arimo_ru_bold_17) \
LV_FONT_DECLARE(lv_font_arimo_ru_bold_32) \
LV_FONT_DECLARE(lv_font_arimo_ru_bold_64)
@@ -445,11 +436,8 @@
LV_FONT_DECLARE(lv_font_noto_jp_9) \
LV_FONT_DECLARE(lv_font_noto_jp_13) \
LV_FONT_DECLARE(lv_font_noto_jp_16) \
LV_FONT_DECLARE(lv_font_noto_jp_17) \
LV_FONT_DECLARE(lv_font_noto_jp_24) \
LV_FONT_DECLARE(lv_font_noto_jp_64) \
LV_FONT_DECLARE(lv_font_noto_jp_bold_16) \
LV_FONT_DECLARE(lv_font_noto_jp_bold_17) \
LV_FONT_DECLARE(lv_font_noto_jp_bold_32) \
LV_FONT_DECLARE(lv_font_noto_jp_bold_64)
@@ -461,11 +449,8 @@
LV_FONT_DECLARE(lv_font_arimo_he_9) \
LV_FONT_DECLARE(lv_font_arimo_he_13) \
LV_FONT_DECLARE(lv_font_arimo_he_16) \
LV_FONT_DECLARE(lv_font_arimo_he_17) \
LV_FONT_DECLARE(lv_font_arimo_he_24) \
LV_FONT_DECLARE(lv_font_arimo_he_64) \
LV_FONT_DECLARE(lv_font_arimo_he_bold_16) \
LV_FONT_DECLARE(lv_font_arimo_he_bold_17) \
LV_FONT_DECLARE(lv_font_arimo_he_bold_32) \
LV_FONT_DECLARE(lv_font_arimo_he_bold_64)
@@ -477,11 +462,8 @@
LV_FONT_DECLARE(lv_font_roboto_9) \
LV_FONT_DECLARE(lv_font_roboto_13) \
LV_FONT_DECLARE(lv_font_roboto_16) \
LV_FONT_DECLARE(lv_font_roboto_17) \
LV_FONT_DECLARE(lv_font_roboto_24) \
LV_FONT_DECLARE(lv_font_roboto_64) \
LV_FONT_DECLARE(lv_font_roboto_bold_16) \
LV_FONT_DECLARE(lv_font_roboto_bold_17) \
LV_FONT_DECLARE(lv_font_roboto_bold_32) \
LV_FONT_DECLARE(lv_font_roboto_bold_64)
@@ -764,11 +746,19 @@
#endif
/*API for FATFS (needs to be added separately). Uses f_open, f_read, etc*/
#if defined(BOOT)
#define LV_USE_FS_FATFS 0
#if LV_USE_FS_FATFS
#define LV_FS_FATFS_LETTER '\0' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
#define LV_FS_FATFS_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/
#endif
#else
#define LV_USE_FS_FATFS 1
#if LV_USE_FS_FATFS
#define LV_FS_FATFS_LETTER 'F' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
#define LV_FS_FATFS_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/
#endif
#endif
/*PNG decoder library*/
#if !defined(BOOT)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB