From 755617ae1ab7f67db1e42a2af4aa0ea9c216713a Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 12 Feb 2022 07:59:47 +0100 Subject: [PATCH] Moved LVGL to libopenui --- .gitmodules | 4 - radio/src/fonts/CMakeLists.txt | 27 ++- .../EdgeTX/extra.sfd} | 0 .../EdgeTX/extra.svg} | 0 .../EdgeTX/extra.ttf} | Bin .../src/fonts/{ => lvgl}/lv_font_roboto_13.c | 4 +- .../src/fonts/{ => lvgl}/lv_font_roboto_14.c | 4 +- .../src/fonts/{ => lvgl}/lv_font_roboto_15.c | 4 +- .../src/fonts/{ => lvgl}/lv_font_roboto_16.c | 4 +- .../src/fonts/{ => lvgl}/lv_font_roboto_17.c | 4 +- .../src/fonts/{ => lvgl}/lv_font_roboto_24.c | 4 +- .../src/fonts/{ => lvgl}/lv_font_roboto_64.c | 4 +- radio/src/fonts/{ => lvgl}/lv_font_roboto_9.c | 4 +- .../fonts/{ => lvgl}/lv_font_roboto_bold_16.c | 4 +- .../fonts/{ => lvgl}/lv_font_roboto_bold_17.c | 4 +- .../fonts/{ => lvgl}/lv_font_roboto_bold_32.c | 4 +- .../fonts/{ => lvgl}/lv_font_roboto_bold_64.c | 4 +- radio/src/fonts/lvgl/make_fonts.sh | 36 +++ radio/src/fonts/make_fonts.sh | 23 -- radio/src/gui/colorlcd/CMakeLists.txt | 213 ++---------------- radio/src/thirdparty/libopenui | 2 +- radio/src/thirdparty/lvgl | 1 - 22 files changed, 101 insertions(+), 253 deletions(-) rename radio/src/fonts/{EdgeTX_extra.sfd => lvgl/EdgeTX/extra.sfd} (100%) rename radio/src/fonts/{EdgeTX_extra.svg => lvgl/EdgeTX/extra.svg} (100%) rename radio/src/fonts/{EdgeTX_extra.ttf => lvgl/EdgeTX/extra.ttf} (100%) mode change 100755 => 100644 rename radio/src/fonts/{ => lvgl}/lv_font_roboto_13.c (98%) rename radio/src/fonts/{ => lvgl}/lv_font_roboto_14.c (99%) rename radio/src/fonts/{ => lvgl}/lv_font_roboto_15.c (99%) rename radio/src/fonts/{ => lvgl}/lv_font_roboto_16.c (99%) rename radio/src/fonts/{ => lvgl}/lv_font_roboto_17.c (99%) rename radio/src/fonts/{ => lvgl}/lv_font_roboto_24.c (99%) rename radio/src/fonts/{ => lvgl}/lv_font_roboto_64.c (99%) rename radio/src/fonts/{ => lvgl}/lv_font_roboto_9.c (98%) rename radio/src/fonts/{ => lvgl}/lv_font_roboto_bold_16.c (99%) rename radio/src/fonts/{ => lvgl}/lv_font_roboto_bold_17.c (99%) rename radio/src/fonts/{ => lvgl}/lv_font_roboto_bold_32.c (99%) rename radio/src/fonts/{ => lvgl}/lv_font_roboto_bold_64.c (99%) create mode 100755 radio/src/fonts/lvgl/make_fonts.sh delete mode 100755 radio/src/fonts/make_fonts.sh delete mode 160000 radio/src/thirdparty/lvgl diff --git a/.gitmodules b/.gitmodules index 90da66e1e..cf30145b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,7 +12,3 @@ path = radio/src/thirdparty/FreeRTOS url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git shallow = true -[submodule "radio/src/thirdparty/lvgl"] - path = radio/src/thirdparty/lvgl - url = https://github.com/lvgl/lvgl.git - branch = release/v8.2 diff --git a/radio/src/fonts/CMakeLists.txt b/radio/src/fonts/CMakeLists.txt index 7f4b32e2c..517b1edf5 100644 --- a/radio/src/fonts/CMakeLists.txt +++ b/radio/src/fonts/CMakeLists.txt @@ -1,5 +1,9 @@ string(TOLOWER ${TRANSLATIONS} subset) +# +# libopenui fonts +# + if( (${subset} STREQUAL "cn") OR (${subset} STREQUAL "tw")) # Use this font for CJK languages set(FONT "Noto/NotoSansCJKsc-Regular") @@ -18,10 +22,6 @@ else() #set(FONT_BOLD "Ubuntu/Ubuntu-Bold") endif() -if(PCB STREQUAL X10) -# set(FONT_ARGS ${FONT_ARGS} --reverse) -endif() - add_truetype_font_target(9 9 ${subset} none "${FONT_ARGS}") add_truetype_font_target(13 13 ${subset} none "${FONT_ARGS}") add_truetype_font_target(15 15 ${subset} none "${FONT_ARGS}") @@ -42,3 +42,22 @@ endif() add_truetype_font_target(64 64 en bold "${FONT_ARGS}") add_custom_target(truetype_fonts DEPENDS ${truetype_fonts_targets}) + +# +# LVGL fonts +# + +set(LVGL_FONT_DIR fonts/lvgl) +set(LVGL_FONT_SOURCES + ${LVGL_FONT_DIR}/lv_font_roboto_9.c + ${LVGL_FONT_DIR}/lv_font_roboto_13.c + ${LVGL_FONT_DIR}/lv_font_roboto_14.c + ${LVGL_FONT_DIR}/lv_font_roboto_15.c + ${LVGL_FONT_DIR}/lv_font_roboto_16.c + ${LVGL_FONT_DIR}/lv_font_roboto_17.c + ${LVGL_FONT_DIR}/lv_font_roboto_24.c + ${LVGL_FONT_DIR}/lv_font_roboto_bold_16.c + ${LVGL_FONT_DIR}/lv_font_roboto_bold_17.c + ${LVGL_FONT_DIR}/lv_font_roboto_bold_32.c + ${LVGL_FONT_DIR}/lv_font_roboto_bold_64.c + PARENT_SCOPE) diff --git a/radio/src/fonts/EdgeTX_extra.sfd b/radio/src/fonts/lvgl/EdgeTX/extra.sfd similarity index 100% rename from radio/src/fonts/EdgeTX_extra.sfd rename to radio/src/fonts/lvgl/EdgeTX/extra.sfd diff --git a/radio/src/fonts/EdgeTX_extra.svg b/radio/src/fonts/lvgl/EdgeTX/extra.svg similarity index 100% rename from radio/src/fonts/EdgeTX_extra.svg rename to radio/src/fonts/lvgl/EdgeTX/extra.svg diff --git a/radio/src/fonts/EdgeTX_extra.ttf b/radio/src/fonts/lvgl/EdgeTX/extra.ttf old mode 100755 new mode 100644 similarity index 100% rename from radio/src/fonts/EdgeTX_extra.ttf rename to radio/src/fonts/lvgl/EdgeTX/extra.ttf diff --git a/radio/src/fonts/lv_font_roboto_13.c b/radio/src/fonts/lvgl/lv_font_roboto_13.c similarity index 98% rename from radio/src/fonts/lv_font_roboto_13.c rename to radio/src/fonts/lvgl/lv_font_roboto_13.c index c3be3802a..031a79545 100644 --- a/radio/src/fonts/lv_font_roboto_13.c +++ b/radio/src/fonts/lvgl/lv_font_roboto_13.c @@ -1,13 +1,13 @@ /******************************************************************************* * Size: 13 px * Bpp: 4 - * Opts: --no-prefilter --bpp 4 --size 13 --font Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX_extra.ttf -r 0x80-0x94 --font ../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_13.c --force-fast-kern-format --lv-include ../thirdparty/lvgl/src/lvgl.h + * Opts: --no-prefilter --bpp 4 --size 13 --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX/extra.ttf -r 0x80-0x94 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_13.c --force-fast-kern-format ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else -#include "../thirdparty/lvgl/src/lvgl.h" +#include "lvgl/lvgl.h" #endif #ifndef LV_FONT_ROBOTO_13 diff --git a/radio/src/fonts/lv_font_roboto_14.c b/radio/src/fonts/lvgl/lv_font_roboto_14.c similarity index 99% rename from radio/src/fonts/lv_font_roboto_14.c rename to radio/src/fonts/lvgl/lv_font_roboto_14.c index b9e1bd404..8f8afb55b 100644 --- a/radio/src/fonts/lv_font_roboto_14.c +++ b/radio/src/fonts/lvgl/lv_font_roboto_14.c @@ -1,13 +1,13 @@ /******************************************************************************* * Size: 14 px * Bpp: 4 - * Opts: --no-prefilter --bpp 4 --size 14 --font Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX_extra.ttf -r 0x80-0x94 --font ../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_14.c --force-fast-kern-format --lv-include ../thirdparty/lvgl/src/lvgl.h + * Opts: --no-prefilter --bpp 4 --size 14 --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX/extra.ttf -r 0x80-0x94 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_14.c --force-fast-kern-format ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else -#include "../thirdparty/lvgl/src/lvgl.h" +#include "lvgl/lvgl.h" #endif #ifndef LV_FONT_ROBOTO_14 diff --git a/radio/src/fonts/lv_font_roboto_15.c b/radio/src/fonts/lvgl/lv_font_roboto_15.c similarity index 99% rename from radio/src/fonts/lv_font_roboto_15.c rename to radio/src/fonts/lvgl/lv_font_roboto_15.c index 707264cb8..d8e1b4dd6 100644 --- a/radio/src/fonts/lv_font_roboto_15.c +++ b/radio/src/fonts/lvgl/lv_font_roboto_15.c @@ -1,13 +1,13 @@ /******************************************************************************* * Size: 15 px * Bpp: 4 - * Opts: --no-prefilter --bpp 4 --size 15 --font Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX_extra.ttf -r 0x80-0x94 --font ../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_15.c --force-fast-kern-format --lv-include ../thirdparty/lvgl/src/lvgl.h + * Opts: --no-prefilter --bpp 4 --size 15 --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX/extra.ttf -r 0x80-0x94 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_15.c --force-fast-kern-format ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else -#include "../thirdparty/lvgl/src/lvgl.h" +#include "lvgl/lvgl.h" #endif #ifndef LV_FONT_ROBOTO_15 diff --git a/radio/src/fonts/lv_font_roboto_16.c b/radio/src/fonts/lvgl/lv_font_roboto_16.c similarity index 99% rename from radio/src/fonts/lv_font_roboto_16.c rename to radio/src/fonts/lvgl/lv_font_roboto_16.c index 546799967..8be5687bd 100644 --- a/radio/src/fonts/lv_font_roboto_16.c +++ b/radio/src/fonts/lvgl/lv_font_roboto_16.c @@ -1,13 +1,13 @@ /******************************************************************************* * Size: 16 px * Bpp: 4 - * Opts: --no-prefilter --bpp 4 --size 16 --font Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX_extra.ttf -r 0x80-0x94 --font ../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_16.c --force-fast-kern-format --lv-include ../thirdparty/lvgl/src/lvgl.h + * Opts: --no-prefilter --bpp 4 --size 16 --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX/extra.ttf -r 0x80-0x94 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_16.c --force-fast-kern-format ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else -#include "../thirdparty/lvgl/src/lvgl.h" +#include "lvgl/lvgl.h" #endif #ifndef LV_FONT_ROBOTO_16 diff --git a/radio/src/fonts/lv_font_roboto_17.c b/radio/src/fonts/lvgl/lv_font_roboto_17.c similarity index 99% rename from radio/src/fonts/lv_font_roboto_17.c rename to radio/src/fonts/lvgl/lv_font_roboto_17.c index 522de25d8..07d8832bb 100644 --- a/radio/src/fonts/lv_font_roboto_17.c +++ b/radio/src/fonts/lvgl/lv_font_roboto_17.c @@ -1,13 +1,13 @@ /******************************************************************************* * Size: 17 px * Bpp: 4 - * Opts: --no-prefilter --bpp 4 --size 17 --font Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX_extra.ttf -r 0x80-0x94 --font ../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_17.c --force-fast-kern-format --lv-include ../thirdparty/lvgl/src/lvgl.h + * Opts: --no-prefilter --bpp 4 --size 17 --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX/extra.ttf -r 0x80-0x94 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_17.c --force-fast-kern-format ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else -#include "../thirdparty/lvgl/src/lvgl.h" +#include "lvgl/lvgl.h" #endif #ifndef LV_FONT_ROBOTO_17 diff --git a/radio/src/fonts/lv_font_roboto_24.c b/radio/src/fonts/lvgl/lv_font_roboto_24.c similarity index 99% rename from radio/src/fonts/lv_font_roboto_24.c rename to radio/src/fonts/lvgl/lv_font_roboto_24.c index 2f5a81773..3315307a2 100644 --- a/radio/src/fonts/lv_font_roboto_24.c +++ b/radio/src/fonts/lvgl/lv_font_roboto_24.c @@ -1,13 +1,13 @@ /******************************************************************************* * Size: 24 px * Bpp: 4 - * Opts: --no-prefilter --bpp 4 --size 24 --font Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX_extra.ttf -r 0x80-0x94 --font ../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_24.c --force-fast-kern-format --lv-include ../thirdparty/lvgl/src/lvgl.h + * Opts: --no-prefilter --bpp 4 --size 24 --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX/extra.ttf -r 0x80-0x94 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_24.c --force-fast-kern-format ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else -#include "../thirdparty/lvgl/src/lvgl.h" +#include "lvgl/lvgl.h" #endif #ifndef LV_FONT_ROBOTO_24 diff --git a/radio/src/fonts/lv_font_roboto_64.c b/radio/src/fonts/lvgl/lv_font_roboto_64.c similarity index 99% rename from radio/src/fonts/lv_font_roboto_64.c rename to radio/src/fonts/lvgl/lv_font_roboto_64.c index 98b5a6ec2..07e26036e 100644 --- a/radio/src/fonts/lv_font_roboto_64.c +++ b/radio/src/fonts/lvgl/lv_font_roboto_64.c @@ -1,13 +1,13 @@ /******************************************************************************* * Size: 64 px * Bpp: 4 - * Opts: --no-prefilter --bpp 4 --size 64 --font Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX_extra.ttf -r 0x80-0x94 --font ../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_64.c --force-fast-kern-format --lv-include ../thirdparty/lvgl/src/lvgl.h + * Opts: --no-prefilter --bpp 4 --size 64 --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX/extra.ttf -r 0x80-0x94 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_64.c --force-fast-kern-format ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else -#include "../thirdparty/lvgl/src/lvgl.h" +#include "lvgl/lvgl.h" #endif #ifndef LV_FONT_ROBOTO_64 diff --git a/radio/src/fonts/lv_font_roboto_9.c b/radio/src/fonts/lvgl/lv_font_roboto_9.c similarity index 98% rename from radio/src/fonts/lv_font_roboto_9.c rename to radio/src/fonts/lvgl/lv_font_roboto_9.c index 4d1400347..3d2d6a8ed 100644 --- a/radio/src/fonts/lv_font_roboto_9.c +++ b/radio/src/fonts/lvgl/lv_font_roboto_9.c @@ -1,13 +1,13 @@ /******************************************************************************* * Size: 9 px * Bpp: 4 - * Opts: --no-prefilter --bpp 4 --size 9 --font Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX_extra.ttf -r 0x80-0x94 --font ../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_9.c --force-fast-kern-format --lv-include ../thirdparty/lvgl/src/lvgl.h + * Opts: --no-prefilter --bpp 4 --size 9 --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX/extra.ttf -r 0x80-0x94 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_9.c --force-fast-kern-format ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else -#include "../thirdparty/lvgl/src/lvgl.h" +#include "lvgl/lvgl.h" #endif #ifndef LV_FONT_ROBOTO_9 diff --git a/radio/src/fonts/lv_font_roboto_bold_16.c b/radio/src/fonts/lvgl/lv_font_roboto_bold_16.c similarity index 99% rename from radio/src/fonts/lv_font_roboto_bold_16.c rename to radio/src/fonts/lvgl/lv_font_roboto_bold_16.c index d88b87afe..e4f9601bc 100644 --- a/radio/src/fonts/lv_font_roboto_bold_16.c +++ b/radio/src/fonts/lvgl/lv_font_roboto_bold_16.c @@ -1,13 +1,13 @@ /******************************************************************************* * Size: 16 px * Bpp: 4 - * Opts: --no-prefilter --bpp 4 --size 16 --font Roboto/Roboto-Bold.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX_extra.ttf -r 0x80-0x94 --font ../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_bold_16.c --force-fast-kern-format --lv-include ../thirdparty/lvgl/src/lvgl.h + * Opts: --no-prefilter --bpp 4 --size 16 --font ../Roboto/Roboto-Bold.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX/extra.ttf -r 0x80-0x94 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_bold_16.c --force-fast-kern-format ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else -#include "../thirdparty/lvgl/src/lvgl.h" +#include "lvgl/lvgl.h" #endif #ifndef LV_FONT_ROBOTO_BOLD_16 diff --git a/radio/src/fonts/lv_font_roboto_bold_17.c b/radio/src/fonts/lvgl/lv_font_roboto_bold_17.c similarity index 99% rename from radio/src/fonts/lv_font_roboto_bold_17.c rename to radio/src/fonts/lvgl/lv_font_roboto_bold_17.c index 19caa6e91..60008297b 100644 --- a/radio/src/fonts/lv_font_roboto_bold_17.c +++ b/radio/src/fonts/lvgl/lv_font_roboto_bold_17.c @@ -1,13 +1,13 @@ /******************************************************************************* * Size: 17 px * Bpp: 4 - * Opts: --no-prefilter --bpp 4 --size 17 --font Roboto/Roboto-Bold.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX_extra.ttf -r 0x80-0x94 --font ../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_bold_17.c --force-fast-kern-format --lv-include ../thirdparty/lvgl/src/lvgl.h + * Opts: --no-prefilter --bpp 4 --size 17 --font ../Roboto/Roboto-Bold.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX/extra.ttf -r 0x80-0x94 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_bold_17.c --force-fast-kern-format ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else -#include "../thirdparty/lvgl/src/lvgl.h" +#include "lvgl/lvgl.h" #endif #ifndef LV_FONT_ROBOTO_BOLD_17 diff --git a/radio/src/fonts/lv_font_roboto_bold_32.c b/radio/src/fonts/lvgl/lv_font_roboto_bold_32.c similarity index 99% rename from radio/src/fonts/lv_font_roboto_bold_32.c rename to radio/src/fonts/lvgl/lv_font_roboto_bold_32.c index 2da927fe7..373f9f87b 100644 --- a/radio/src/fonts/lv_font_roboto_bold_32.c +++ b/radio/src/fonts/lvgl/lv_font_roboto_bold_32.c @@ -1,13 +1,13 @@ /******************************************************************************* * Size: 32 px * Bpp: 4 - * Opts: --no-prefilter --bpp 4 --size 32 --font Roboto/Roboto-Bold.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX_extra.ttf -r 0x80-0x94 --font ../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_bold_32.c --force-fast-kern-format --lv-include ../thirdparty/lvgl/src/lvgl.h + * Opts: --no-prefilter --bpp 4 --size 32 --font ../Roboto/Roboto-Bold.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX/extra.ttf -r 0x80-0x94 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_bold_32.c --force-fast-kern-format ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else -#include "../thirdparty/lvgl/src/lvgl.h" +#include "lvgl/lvgl.h" #endif #ifndef LV_FONT_ROBOTO_BOLD_32 diff --git a/radio/src/fonts/lv_font_roboto_bold_64.c b/radio/src/fonts/lvgl/lv_font_roboto_bold_64.c similarity index 99% rename from radio/src/fonts/lv_font_roboto_bold_64.c rename to radio/src/fonts/lvgl/lv_font_roboto_bold_64.c index a69d78473..5baff3716 100644 --- a/radio/src/fonts/lv_font_roboto_bold_64.c +++ b/radio/src/fonts/lvgl/lv_font_roboto_bold_64.c @@ -1,13 +1,13 @@ /******************************************************************************* * Size: 64 px * Bpp: 4 - * Opts: --no-prefilter --bpp 4 --size 64 --font Roboto/Roboto-Bold.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX_extra.ttf -r 0x80-0x94 --font ../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_bold_64.c --force-fast-kern-format --lv-include ../thirdparty/lvgl/src/lvgl.h + * Opts: --no-prefilter --bpp 4 --size 64 --font ../Roboto/Roboto-Bold.ttf -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC --font EdgeTX/extra.ttf -r 0x80-0x94 --font ../../thirdparty/libopenui/thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --format lvgl -o lv_font_roboto_bold_64.c --force-fast-kern-format ******************************************************************************/ #ifdef LV_LVGL_H_INCLUDE_SIMPLE #include "lvgl.h" #else -#include "../thirdparty/lvgl/src/lvgl.h" +#include "lvgl/lvgl.h" #endif #ifndef LV_FONT_ROBOTO_BOLD_64 diff --git a/radio/src/fonts/lvgl/make_fonts.sh b/radio/src/fonts/lvgl/make_fonts.sh new file mode 100755 index 000000000..7b641392a --- /dev/null +++ b/radio/src/fonts/lvgl/make_fonts.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +LVGLDIR="../../thirdparty/libopenui/thirdparty/lvgl" +TTF_DIR="../" + +SYMBOLS_FONT="${LVGLDIR}/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff" +SYMBOLS="61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650" + +EXTRA_FONT="EdgeTX/extra.ttf" +EXTRA_SYM="0x80-0x94" + +function make_font() { + local name=$1 + local ttf=$2 + local size=$3 + lv_font_conv --no-prefilter --bpp 4 --size ${size} \ + --font ${TTF_DIR}${ttf} -r 0x20-0x7F,0xB0,0x2022,0xDF,0xE4,0xF6,0xFC,0xC4,0xD6,0xDC \ + --font EdgeTX/extra.ttf -r 0x80-0x94 \ + --font ${SYMBOLS_FONT} -r ${SYMBOLS} \ + --format lvgl -o lv_font_${name}_${size}.c --force-fast-kern-format +} + +make_font "roboto" "Roboto/Roboto-Regular.ttf" 9 +make_font "roboto" "Roboto/Roboto-Regular.ttf" 13 +make_font "roboto" "Roboto/Roboto-Regular.ttf" 14 +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" "Roboto/Roboto-Regular.ttf" 64 +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 + diff --git a/radio/src/fonts/make_fonts.sh b/radio/src/fonts/make_fonts.sh deleted file mode 100755 index c7999190d..000000000 --- a/radio/src/fonts/make_fonts.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/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 --font ../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650 --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" 14 -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" "Roboto/Roboto-Regular.ttf" 64 -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 - diff --git a/radio/src/gui/colorlcd/CMakeLists.txt b/radio/src/gui/colorlcd/CMakeLists.txt index 2ec4f8967..ca8775828 100644 --- a/radio/src/gui/colorlcd/CMakeLists.txt +++ b/radio/src/gui/colorlcd/CMakeLists.txt @@ -2,12 +2,19 @@ include_directories( ${RADIO_SRC_DIR}/gui/colorlcd ${RADIO_SRC_DIR}/gui/colorlcd/layouts ${CMAKE_CURRENT_BINARY_DIR}/fonts + # ${RADIO_SRC_DIR}/fonts/lvgl ${RADIO_SRC_DIR}/thirdparty/libopenui/src + ${RADIO_SRC_DIR}/thirdparty/libopenui/thirdparty ) -file(GLOB THEMES_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd ${RADIO_SRC_DIR}/gui/colorlcd/themes/*.cpp) -file(GLOB LAYOUTS_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd ${RADIO_SRC_DIR}/gui/colorlcd/layouts/*.cpp) -file(GLOB WIDGETS_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd ${RADIO_SRC_DIR}/gui/colorlcd/widgets/*.cpp) +file(GLOB THEMES_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd + ${RADIO_SRC_DIR}/gui/colorlcd/themes/*.cpp) + +file(GLOB LAYOUTS_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd + ${RADIO_SRC_DIR}/gui/colorlcd/layouts/*.cpp) + +file(GLOB WIDGETS_SRC RELATIVE ${RADIO_SRC_DIR}/gui/colorlcd + ${RADIO_SRC_DIR}/gui/colorlcd/widgets/*.cpp) set(GUI_SRC ${GUI_SRC} @@ -126,202 +133,16 @@ if(WINDOWS_INSPECT_BORDERS) endif() # includes libopenui -include(${RADIO_SRC_DIR}/thirdparty/libopenui/src/CMakeLists.txt) -include_directories(gui/libopenui) +set(LIBOPENUI_SRC_DIR thirdparty/libopenui) +set(LVGL_SRC_DIR ${LIBOPENUI_SRC_DIR}/thirdparty/lvgl/src) + +include(${LIBOPENUI_SRC_DIR}/src/CMakeLists.txt) +include(${LIBOPENUI_SRC_DIR}/thirdparty/CMakeLists.txt) + +set(SRC ${SRC} ${LVGL_FONT_SOURCES}) add_definitions(-DLIBOPENUI) -foreach(LIBOPENUI_FILE ${LIBOPENUI_SRC}) - set(SRC ${SRC} thirdparty/libopenui/src/${LIBOPENUI_FILE}) -endforeach() - -set(LVGL_SOURCES - core/lv_group.c - core/lv_obj.c - core/lv_event.c - core/lv_indev.c - core/lv_obj_scroll.c - core/lv_obj_draw.c - core/lv_disp.c - core/lv_obj_style.c - core/lv_theme.c - core/lv_obj_style_gen.c - core/lv_refr.c - core/lv_indev_scroll.c - core/lv_obj_class.c - core/lv_obj_tree.c - core/lv_obj_pos.c - font/lv_font_montserrat_20.c - font/lv_font_unscii_8.c - font/lv_font_montserrat_48.c - font/lv_font_montserrat_28.c - font/lv_font_montserrat_26.c - font/lv_font_montserrat_38.c - font/lv_font_montserrat_18.c - font/lv_font_montserrat_8.c - font/lv_font_montserrat_44.c - font/lv_font_montserrat_40.c - font/lv_font_dejavu_16_persian_hebrew.c - font/lv_font_montserrat_32.c - font/lv_font_montserrat_46.c - font/lv_font_montserrat_14.c - font/lv_font_montserrat_12_subpx.c - font/lv_font_montserrat_34.c - font/lv_font_montserrat_16.c - font/lv_font_montserrat_42.c - font/lv_font_montserrat_12.c - font/lv_font_simsun_16_cjk.c - font/lv_font_montserrat_30.c - font/lv_font_montserrat_22.c - font/lv_font_montserrat_10.c - font/lv_font_fmt_txt.c - font/lv_font_montserrat_24.c - font/lv_font_loader.c - font/lv_font_montserrat_28_compressed.c - font/lv_font.c - font/lv_font_montserrat_36.c - font/lv_font_unscii_16.c - misc/lv_timer.c - misc/lv_txt.c - misc/lv_gc.c - misc/lv_style_gen.c - misc/lv_templ.c - misc/lv_color.c - misc/lv_fs.c - misc/lv_printf.c - misc/lv_style.c - misc/lv_log.c - misc/lv_area.c - misc/lv_math.c - misc/lv_lru.c - misc/lv_tlsf.c - misc/lv_anim_timeline.c - misc/lv_ll.c - misc/lv_bidi.c - misc/lv_mem.c - misc/lv_utils.c - misc/lv_async.c - misc/lv_anim.c - misc/lv_txt_ap.c - draw/lv_draw_mask.c - draw/nxp_pxp/lv_gpu_nxp_pxp_osa.c - draw/nxp_pxp/lv_gpu_nxp_pxp.c - draw/lv_img_cache.c - draw/stm32_dma2d/lv_gpu_stm32_dma2d.c - draw/nxp_vglite/lv_gpu_nxp_vglite.c - draw/sw/lv_draw_sw_gradient.c - draw/sw/lv_draw_sw.c - draw/sw/lv_draw_sw_blend.c - draw/sw/lv_draw_sw_letter.c - draw/sw/lv_draw_sw_arc.c - draw/sw/lv_draw_sw_polygon.c - draw/sw/lv_draw_sw_img.c - draw/sw/lv_draw_sw_line.c - draw/sw/lv_draw_sw_dither.c - draw/sw/lv_draw_sw_rect.c - draw/lv_draw_line.c - draw/sdl/lv_draw_sdl_rect.c - draw/sdl/lv_draw_sdl_arc.c - draw/sdl/lv_draw_sdl.c - draw/sdl/lv_draw_sdl_mask.c - draw/sdl/lv_draw_sdl_polygon.c - draw/sdl/lv_draw_sdl_stack_blur.c - draw/sdl/lv_draw_sdl_utils.c - draw/sdl/lv_draw_sdl_img.c - draw/sdl/lv_draw_sdl_bg.c - draw/sdl/lv_draw_sdl_label.c - draw/sdl/lv_draw_sdl_texture_cache.c - draw/sdl/lv_draw_sdl_line.c - draw/sdl/lv_draw_sdl_composite.c - draw/lv_draw.c - draw/lv_img_buf.c - draw/lv_draw_rect.c - draw/lv_draw_label.c - draw/lv_draw_img.c - draw/lv_draw_arc.c - draw/lv_draw_triangle.c - draw/lv_img_decoder.c - hal/lv_hal_indev.c - hal/lv_hal_disp.c - hal/lv_hal_tick.c - extra/others/monkey/lv_monkey.c - extra/others/gridnav/lv_gridnav.c - extra/others/snapshot/lv_snapshot.c - extra/layouts/grid/lv_grid.c - extra/layouts/flex/lv_flex.c - extra/libs/bmp/lv_bmp.c - extra/libs/ffmpeg/lv_ffmpeg.c - extra/libs/gif/lv_gif.c - extra/libs/gif/gifdec.c - extra/libs/freetype/lv_freetype.c - extra/libs/qrcode/lv_qrcode.c - extra/libs/qrcode/qrcodegen.c - extra/libs/sjpg/tjpgd.c - extra/libs/sjpg/lv_sjpg.c - extra/libs/fsdrv/lv_fs_win32.c - extra/libs/fsdrv/lv_fs_stdio.c - extra/libs/fsdrv/lv_fs_posix.c - extra/libs/fsdrv/lv_fs_fatfs.c - extra/libs/rlottie/lv_rlottie.c - extra/libs/png/lv_png.c - extra/libs/png/lodepng.c - extra/lv_extra.c - extra/widgets/imgbtn/lv_imgbtn.c - extra/widgets/menu/lv_menu.c - extra/widgets/win/lv_win.c - extra/widgets/colorwheel/lv_colorwheel.c - extra/widgets/list/lv_list.c - extra/widgets/chart/lv_chart.c - extra/widgets/calendar/lv_calendar_header_arrow.c - extra/widgets/calendar/lv_calendar.c - extra/widgets/calendar/lv_calendar_header_dropdown.c - extra/widgets/tileview/lv_tileview.c - extra/widgets/led/lv_led.c - extra/widgets/spinner/lv_spinner.c - extra/widgets/tabview/lv_tabview.c - extra/widgets/meter/lv_meter.c - extra/widgets/spinbox/lv_spinbox.c - extra/widgets/animimg/lv_animimg.c - extra/widgets/span/lv_span.c - extra/widgets/keyboard/lv_keyboard.c - extra/widgets/msgbox/lv_msgbox.c - extra/themes/basic/lv_theme_basic.c - extra/themes/default/lv_theme_default.c - extra/themes/mono/lv_theme_mono.c - widgets/lv_line.c - widgets/lv_dropdown.c - widgets/lv_objx_templ.c - widgets/lv_canvas.c - widgets/lv_switch.c - widgets/lv_btnmatrix.c - widgets/lv_bar.c - widgets/lv_roller.c - widgets/lv_img.c - widgets/lv_btn.c - widgets/lv_checkbox.c - widgets/lv_label.c - widgets/lv_table.c - widgets/lv_slider.c - widgets/lv_textarea.c - widgets/lv_arc.c -) - - -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) add_gui_src(confirm_dialog.cpp) diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 844deb6c6..e1b35d747 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 844deb6c612d3d3811486c761341d24bdef9ebe7 +Subproject commit e1b35d747a99c9e9ec219139272d0f210faa4099 diff --git a/radio/src/thirdparty/lvgl b/radio/src/thirdparty/lvgl deleted file mode 160000 index 0b5a1d4b2..000000000 --- a/radio/src/thirdparty/lvgl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b5a1d4b23975b920ff841ea9cd038802f51711b