update libopenui
This commit is contained in:
committed by
Raphael Coeffic
parent
39b2a40f4e
commit
6999e30171
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
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
Executable
+21
@@ -0,0 +1,21 @@
|
||||
#!/bin/bash
|
||||
|
||||
function make_font() {
|
||||
local name=$1
|
||||
local ttf=$2
|
||||
local size=$3
|
||||
lv_font_conv --no-prefilter --bpp 4 --size ${size} --font ${ttf} -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX_extra.ttf -r 0x80-0x94 --format lvgl -o lv_font_${name}_${size}.c --force-fast-kern-format --lv-include ../thirdparty/lvgl/src/lvgl.h
|
||||
}
|
||||
|
||||
make_font "roboto" "Roboto/Roboto-Regular.ttf" 9
|
||||
make_font "roboto" "Roboto/Roboto-Regular.ttf" 13
|
||||
make_font "roboto" "Roboto/Roboto-Regular.ttf" 15
|
||||
make_font "roboto" "Roboto/Roboto-Regular.ttf" 16
|
||||
make_font "roboto" "Roboto/Roboto-Regular.ttf" 17
|
||||
make_font "roboto" "Roboto/Roboto-Regular.ttf" 24
|
||||
make_font "roboto_bold" "Roboto/Roboto-Bold.ttf" 16
|
||||
make_font "roboto_bold" "Roboto/Roboto-Bold.ttf" 17
|
||||
make_font "roboto_bold" "Roboto/Roboto-Bold.ttf" 16
|
||||
make_font "roboto_bold" "Roboto/Roboto-Bold.ttf" 32
|
||||
make_font "roboto_bold" "Roboto/Roboto-Bold.ttf" 64
|
||||
|
||||
@@ -310,6 +310,17 @@ set(LVGL_SOURCES
|
||||
foreach(LVGL_FILE ${LVGL_SOURCES})
|
||||
set(SRC ${SRC} thirdparty/lvgl/src/${LVGL_FILE})
|
||||
endforeach()
|
||||
set(SRC ${SRC} fonts/lv_font_roboto_9.c)
|
||||
set(SRC ${SRC} fonts/lv_font_roboto_13.c)
|
||||
set(SRC ${SRC} fonts/lv_font_roboto_14.c)
|
||||
set(SRC ${SRC} fonts/lv_font_roboto_15.c)
|
||||
set(SRC ${SRC} fonts/lv_font_roboto_16.c)
|
||||
set(SRC ${SRC} fonts/lv_font_roboto_17.c)
|
||||
set(SRC ${SRC} fonts/lv_font_roboto_24.c)
|
||||
set(SRC ${SRC} fonts/lv_font_roboto_bold_16.c)
|
||||
set(SRC ${SRC} fonts/lv_font_roboto_bold_17.c)
|
||||
set(SRC ${SRC} fonts/lv_font_roboto_bold_32.c)
|
||||
set(SRC ${SRC} fonts/lv_font_roboto_bold_64.c)
|
||||
|
||||
add_gui_src(fullscreen_dialog.cpp)
|
||||
add_gui_src(message_dialog.cpp)
|
||||
|
||||
+19
-8
@@ -334,11 +334,11 @@
|
||||
|
||||
/*Montserrat fonts with ASCII range and some symbols using bpp = 4
|
||||
*https://fonts.google.com/specimen/Montserrat*/
|
||||
#define LV_FONT_MONTSERRAT_8 1
|
||||
#define LV_FONT_MONTSERRAT_10 1
|
||||
#define LV_FONT_MONTSERRAT_12 1
|
||||
#define LV_FONT_MONTSERRAT_14 1
|
||||
#define LV_FONT_MONTSERRAT_16 1
|
||||
#define LV_FONT_MONTSERRAT_8 0
|
||||
#define LV_FONT_MONTSERRAT_10 0
|
||||
#define LV_FONT_MONTSERRAT_12 0
|
||||
#define LV_FONT_MONTSERRAT_14 0
|
||||
#define LV_FONT_MONTSERRAT_16 0
|
||||
#define LV_FONT_MONTSERRAT_18 0
|
||||
#define LV_FONT_MONTSERRAT_20 0
|
||||
#define LV_FONT_MONTSERRAT_22 0
|
||||
@@ -369,10 +369,21 @@
|
||||
/*Optionally declare custom fonts here.
|
||||
*You can use these fonts as default font too and they will be available globally.
|
||||
*E.g. #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(my_font_1) LV_FONT_DECLARE(my_font_2)*/
|
||||
#define LV_FONT_CUSTOM_DECLARE
|
||||
#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(lv_font_roboto_14) \
|
||||
LV_FONT_DECLARE(lv_font_roboto_13) \
|
||||
LV_FONT_DECLARE(lv_font_roboto_15) \
|
||||
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_9) \
|
||||
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)
|
||||
|
||||
/*Always set a default font*/
|
||||
#define LV_FONT_DEFAULT &lv_font_montserrat_14
|
||||
#define LV_FONT_DEFAULT &lv_font_roboto_14
|
||||
|
||||
/*Enable handling large font and/or fonts with a lot of characters.
|
||||
*The limit depends on the font size, font face and bpp.
|
||||
@@ -380,7 +391,7 @@
|
||||
#define LV_FONT_FMT_TXT_LARGE 0
|
||||
|
||||
/*Enables/disables support for compressed fonts.*/
|
||||
#define LV_USE_FONT_COMPRESSED 0
|
||||
#define LV_USE_FONT_COMPRESSED 1
|
||||
|
||||
/*Enable subpixel rendering*/
|
||||
#define LV_USE_FONT_SUBPX 0
|
||||
|
||||
Vendored
+1
-1
Submodule radio/src/thirdparty/libopenui updated: 4565122115...9fd291d24d
Reference in New Issue
Block a user