chore: update to LVGL 8.4 (#5038)

This commit is contained in:
philmoz
2025-05-05 11:39:38 +10:00
committed by GitHub
parent c8c62737d5
commit 75fb538663
19 changed files with 1452 additions and 1800 deletions
+129 -48
View File
@@ -1,42 +1,41 @@
set(LVGL_SOURCES_MINIMAL
core/lv_refr.c
draw/lv_draw_img.c
draw/lv_draw_label.c
draw/lv_draw_line.c
draw/lv_draw_mask.c
draw/lv_draw_rect.c
draw/lv_draw.c
draw/lv_draw_img.c
draw/lv_img_buf.c
draw/lv_img_cache.c
draw/lv_img_decoder.c
draw/lv_draw_label.c
draw/lv_draw_line.c
draw/lv_draw_rect.c
draw/lv_draw_transform.c
draw/sw/lv_draw_sw.c
draw/sw/lv_draw_sw_arc.c
draw/sw/lv_draw_sw_blend.c
draw/sw/lv_draw_sw_img.c
draw/sw/lv_draw_sw_layer.c
draw/sw/lv_draw_sw_letter.c
draw/sw/lv_draw_sw_line.c
draw/sw/lv_draw_sw_polygon.c
draw/sw/lv_draw_sw_rect.c
draw/sw/lv_draw_sw.c
draw/sw/lv_draw_sw_transform.c
# STM32 specific
draw/stm32_dma2d/lv_gpu_stm32_dma2d.c
hal/lv_hal_disp.c
hal/lv_hal_tick.c
font/lv_font.c
font/lv_font_fmt_txt.c
hal/lv_hal_disp.c
hal/lv_hal_tick.c
misc/lv_area.c
misc/lv_async.c
misc/lv_color.c
misc/lv_gc.c
misc/lv_ll.c
misc/lv_math.c
misc/lv_mem.c
misc/lv_timer.c
misc/lv_txt.c
misc/lv_utils.c
)
@@ -44,70 +43,152 @@ set(LVGL_SOURCES_MINIMAL
set(LVGL_SOURCES
${LVGL_SOURCES_MINIMAL}
core/lv_disp.c
core/lv_event.c
core/lv_group.c
core/lv_indev_scroll.c
core/lv_indev.c
core/lv_obj_class.c
core/lv_obj_draw.c
core/lv_obj_pos.c
core/lv_obj_scroll.c
core/lv_obj_style_gen.c
core/lv_obj_style.c
core/lv_obj_tree.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_indev_scroll.c
core/lv_obj_class.c
core/lv_obj_tree.c
core/lv_obj_pos.c
draw/lv_draw_mask.c
draw/sw/lv_draw_sw_gradient.c
draw/sw/lv_draw_sw_dither.c
draw/lv_draw_layer.c
draw/lv_draw_arc.c
draw/lv_draw_triangle.c
draw/sw/lv_draw_sw_gradient.c
# SDL specific
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
font/lv_font_loader.c
hal/lv_hal_indev.c
misc/lv_anim.c
misc/lv_bidi.c
misc/lv_fs.c
misc/lv_log.c
misc/lv_lru.c
misc/lv_printf.c
misc/lv_timer.c
misc/lv_style_gen.c
misc/lv_style.c
misc/lv_templ.c
misc/lv_fs.c
misc/lv_printf.c
misc/lv_style.c
misc/lv_log.c
misc/lv_math.c
misc/lv_lru.c
misc/lv_tlsf.c
misc/lv_anim_timeline.c
misc/lv_bidi.c
misc/lv_async.c
misc/lv_txt_ap.c
widgets/lv_arc.c
widgets/lv_bar.c
widgets/lv_btn.c
widgets/lv_btnmatrix.c
widgets/lv_canvas.c
widgets/lv_checkbox.c
widgets/lv_img.c
widgets/lv_label.c
# font/lv_font_unscii_8.c
# font/lv_font_unscii_16.c
# font/lv_font_simsun_16_cjk.c
# font/lv_font_dejavu_16_persian_hebrew.c
# font/lv_font_montserrat_8.c
# font/lv_font_montserrat_10.c
# font/lv_font_montserrat_12.c
# font/lv_font_montserrat_12_subpx.c
# font/lv_font_montserrat_14.c
# font/lv_font_montserrat_16.c
# font/lv_font_montserrat_18.c
# font/lv_font_montserrat_20.c
# font/lv_font_montserrat_22.c
# font/lv_font_montserrat_24.c
# font/lv_font_montserrat_26.c
# font/lv_font_montserrat_28.c
# font/lv_font_montserrat_28_compressed.c
# font/lv_font_montserrat_30.c
# font/lv_font_montserrat_32.c
# font/lv_font_montserrat_34.c
# font/lv_font_montserrat_36.c
# font/lv_font_montserrat_38.c
# font/lv_font_montserrat_40.c
# font/lv_font_montserrat_42.c
# font/lv_font_montserrat_44.c
# font/lv_font_montserrat_46.c
# font/lv_font_montserrat_48.c
widgets/lv_line.c
widgets/lv_dropdown.c
widgets/lv_objx_templ.c
widgets/lv_slider.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
extra/lv_extra.c
extra/layouts/flex/lv_flex.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/libs/fsdrv/lv_fs_fatfs.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/others/snapshot/lv_snapshot.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/widgets/imgbtn/lv_imgbtn.c
extra/widgets/keyboard/lv_keyboard.c
extra/widgets/list/lv_list.c
extra/widgets/menu/lv_menu.c
extra/widgets/tabview/lv_tabview.c
extra/widgets/tileview/lv_tileview.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
)
set(LVGL_SRC_DIR thirdparty/lvgl/src)
+2 -2
View File
@@ -154,8 +154,8 @@ lv_color_t makeLvColor(uint32_t colorFlags);
constexpr uint32_t RGB888_FLAG = 0x1000000;
enum COLOR_EDITOR_FMT {
RGB565 = 0,
RGB888
ETX_RGB565 = 0,
ETX_RGB888
};
#define RGB32(r, g, b) \
@@ -462,7 +462,7 @@ ColorEditor::ColorEditor(Window* parent, const rect_t& rect, uint32_t color,
Window(parent, rect), _setValue(std::move(setValue)), _preview(std::move(preview)),
format(fmt)
{
if (format == RGB565) {
if (format == ETX_RGB565) {
if (color & RGB_FLAG) {
color = COLOR_VAL(color);
auto r = GET_RED(color);
@@ -510,7 +510,7 @@ void ColorEditor::setText()
_colorType->setText();
if (_setValue != nullptr) {
uint32_t c = _color;
if (format == RGB565) {
if (format == ETX_RGB565) {
if (c & RGB888_FLAG) {
auto r = GET_RED32(c);
auto g = GET_GREEN32(c);
@@ -40,7 +40,7 @@ class ColorEditor : public Window
ColorEditor(Window* parent, const rect_t& rect, uint32_t color,
std::function<void(uint32_t rgb)> setValue = nullptr,
std::function<void(uint32_t rgb)> preview = nullptr,
COLOR_EDITOR_FMT fmt = RGB565, COLOR_EDITOR_TYPE typ = HSV_COLOR_EDITOR);
COLOR_EDITOR_FMT fmt = ETX_RGB565, COLOR_EDITOR_TYPE typ = HSV_COLOR_EDITOR);
#if defined(DEBUG_WINDOWS)
std::string getName() const override { return "ColorEditor"; }
@@ -53,7 +53,7 @@ class ColorEditorPopup : public BaseDialog
uint8_t r, g, b;
if (format == RGB565) {
if (format == ETX_RGB565) {
auto rgb = COLOR_VAL(colorToRGB(m_color));
r = GET_RED(rgb); g = GET_GREEN(rgb); b = GET_BLUE(rgb);
} else {
@@ -208,7 +208,7 @@ void ColorPicker::updateColor(uint32_t c)
uint8_t r, g, b;
if (format == RGB565) {
if (format == ETX_RGB565) {
auto rgb = COLOR_VAL(colorToRGB(color));
r = GET_RED(rgb); g = GET_GREEN(rgb); b = GET_BLUE(rgb);
} else {
@@ -38,7 +38,7 @@ public:
std::function<uint32_t()> getValue,
std::function<void(uint32_t)> setValue = nullptr,
std::function<void(uint32_t)> preview = nullptr,
COLOR_EDITOR_FMT fmt = RGB565);
COLOR_EDITOR_FMT fmt = ETX_RGB565);
void setColor(uint32_t c);
uint32_t getColor() const { return color; }
+3 -27
View File
@@ -97,33 +97,6 @@ static void flushLcd(lv_disp_drv_t* disp_drv, const lv_area_t* area,
area->y2 - area->y1 + 1};
lcd_flush_cb(disp_drv, (uint16_t*)color_p, copy_area);
#if (!defined(LCD_VERTICAL_INVERT) || defined(RADIO_F16)) && !defined(BOOT)
#if defined(RADIO_F16)
if (hardwareOptions.pcbrev > 0)
#endif
{
uint16_t* src = (uint16_t*)color_p;
uint16_t* dst = nullptr;
if ((uint16_t*)color_p == LCD_FIRST_FRAME_BUFFER)
dst = LCD_SECOND_FRAME_BUFFER;
else
dst = LCD_FIRST_FRAME_BUFFER;
lv_disp_t* disp = _lv_refr_get_disp_refreshing();
for (int i = 0; i < disp->inv_p; i++) {
if (disp->inv_area_joined[i]) continue;
const lv_area_t& refr_area = disp->inv_areas[i];
auto area_w = refr_area.x2 - refr_area.x1 + 1;
auto area_h = refr_area.y2 - refr_area.y1 + 1;
DMACopyBitmap(dst, LCD_W, LCD_H, refr_area.x1, refr_area.y1, src, LCD_W,
LCD_H, refr_area.x1, refr_area.y1, area_w, area_h);
}
}
#endif
}
lv_disp_flush_ready(disp_drv);
@@ -150,10 +123,13 @@ static void init_lvgl_disp_drv()
disp_drv.full_refresh = 0;
#if !defined(LCD_VERTICAL_INVERT)
disp_drv.full_refresh = 1;
disp_drv.direct_mode = 1;
#elif defined(RADIO_F16)
disp_drv.full_refresh = 1;
disp_drv.direct_mode = (hardwareOptions.pcbrev > 0) ? 1 : 0;
#else
disp_drv.full_refresh = 0;
disp_drv.direct_mode = 0;
#endif
}
+2 -4
View File
@@ -203,7 +203,6 @@ void etx_img_color(lv_obj_t* obj, LcdColorIndex colorIdx,
#define LV_STYLE_CONST_SINGLE_INIT(var_name, prop, value) \
const lv_style_t var_name = {.v_p = {.value1 = {.num = value}}, \
.prop1 = prop, \
.is_const = 0, \
.has_group = 1 << ((prop & 0x1FF) >> 4), \
.prop_cnt = 1}
@@ -211,10 +210,9 @@ void etx_img_color(lv_obj_t* obj, LcdColorIndex colorIdx,
// Copied from lv_style.h and modified to compile with ARM GCC C++
#define LV_STYLE_CONST_MULTI_INIT(var_name, prop_array) \
const lv_style_t var_name = {.v_p = {.const_props = prop_array}, \
.prop1 = 0, \
.is_const = 1, \
.prop1 = LV_STYLE_PROP_ANY, \
.has_group = 0xFF, \
.prop_cnt = 0}
.prop_cnt = (sizeof(prop_array) / sizeof((prop_array)[0]))}
extern const lv_obj_class_t window_base_class;
extern const lv_obj_class_t field_edit_class;
+149 -80
View File
@@ -1,27 +1,21 @@
/*
* Copyright (C) EdgeTX
*
* Based on code named
* opentx - https://github.com/opentx/opentx
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
/**
* @file lv_conf.h
* Configuration file for v8.4.0
*/
#pragma once
/*
* Copy this file as `lv_conf.h`
* 1. simply next to the `lvgl` folder
* 2. or any other places and
* - define `LV_CONF_INCLUDE_SIMPLE`
* - add the path as include path
*/
/* clang-format off */
#if 1 /*Set it to "1" to enable content*/
#ifndef LV_CONF_H
#define LV_CONF_H
#include <stdint.h>
#if !defined(LV_SKIP_DEFINES)
@@ -39,14 +33,14 @@
/*Swap the 2 bytes of RGB565 color. Useful if the display has an 8-bit interface (e.g. SPI)*/
#define LV_COLOR_16_SWAP 0
/*Enable more complex drawing routines to manage screens transparency.
*Can be used if the UI is above another layer, e.g. an OSD menu or video player.
*Requires `LV_COLOR_DEPTH = 32` colors and the screen's `bg_opa` should be set to non LV_OPA_COVER value*/
/*Enable features to draw on transparent background.
*It's required if opa, and transform_* style properties are used.
*Can be also used if the UI is above another layer, e.g. an OSD menu or video player.*/
#define LV_COLOR_SCREEN_TRANSP 0
/* Adjust color mix functions rounding. GPUs might calculate color mix (blending) differently.
* 0: round down, 64: round up from x.75, 128: round up from half, 192: round up from x.25, 254: round up */
#define LV_COLOR_MIX_ROUND_OFS (LV_COLOR_DEPTH == 32 ? 0: 128)
#define LV_COLOR_MIX_ROUND_OFS 0
/*Images pixels with this color will not be drawn if they are chroma keyed)*/
#define LV_COLOR_CHROMA_KEY lv_color_hex(0x00ff00) /*pure green*/
@@ -71,8 +65,8 @@
#if LV_MEM_ADR == 0
//#define LV_MEM_POOL_INCLUDE your_alloc_library /* Uncomment if using an external allocator*/
//#define LV_MEM_POOL_ALLOC your_alloc /* Uncomment if using an external allocator*/
#define LV_MEM_POOL_INCLUDE <stdlib.h>
#define LV_MEM_POOL_ALLOC malloc
#define LV_MEM_POOL_INCLUDE <unistd.h>
#define LV_MEM_POOL_ALLOC sbrk
#endif
#else /*LV_MEM_CUSTOM*/
@@ -105,6 +99,9 @@
#if LV_TICK_CUSTOM
#define LV_TICK_CUSTOM_INCLUDE "Arduino.h" /*Header for the system time function*/
#define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis()) /*Expression evaluating to current system time in ms*/
/*If using lvgl as ESP32 component*/
// #define LV_TICK_CUSTOM_INCLUDE "esp_timer.h"
// #define LV_TICK_CUSTOM_SYS_TIME_EXPR ((esp_timer_get_time() / 1000LL))
#endif /*LV_TICK_CUSTOM*/
/*Default Dot Per Inch. Used to initialize default sizes such as widgets sized, style paddings.
@@ -142,33 +139,49 @@
#define LV_CIRCLE_CACHE_SIZE 4
#endif /*LV_DRAW_COMPLEX*/
/**
* "Simple layers" are used when a widget has `style_opa < 255` to buffer the widget into a layer
* and blend it as an image with the given opacity.
* Note that `bg_opa`, `text_opa` etc don't require buffering into layer)
* The widget can be buffered in smaller chunks to avoid using large buffers.
*
* - LV_LAYER_SIMPLE_BUF_SIZE: [bytes] the optimal target buffer size. LVGL will try to allocate it
* - LV_LAYER_SIMPLE_FALLBACK_BUF_SIZE: [bytes] used if `LV_LAYER_SIMPLE_BUF_SIZE` couldn't be allocated.
*
* Both buffer sizes are in bytes.
* "Transformed layers" (where transform_angle/zoom properties are used) use larger buffers
* and can't be drawn in chunks. So these settings affects only widgets with opacity.
*/
#define LV_LAYER_SIMPLE_BUF_SIZE (24 * 1024)
#define LV_LAYER_SIMPLE_FALLBACK_BUF_SIZE (3 * 1024)
/*Default image cache size. Image caching keeps the images opened.
*If only the built-in image formats are used there is no real advantage of caching. (I.e. if no new image decoder is added)
*With complex image decoders (e.g. PNG or JPG) caching can save the continuous open/decode of images.
*However the opened images might consume additional RAM.
*0: to disable caching*/
#define LV_IMG_CACHE_DEF_SIZE 8
#define LV_IMG_CACHE_DEF_SIZE 8
/*Number of stops allowed per gradient. Increase this to allow more stops.
*This adds (sizeof(lv_color_t) + 1) bytes per additional stop*/
#define LV_GRADIENT_MAX_STOPS 2
#define LV_GRADIENT_MAX_STOPS 2
/*Default gradient buffer size.
*When LVGL calculates the gradient "maps" it can save them into a cache to avoid calculating them again.
*LV_GRAD_CACHE_DEF_SIZE sets the size of this cache in bytes.
*If the cache is too small the map will be allocated only while it's required for the drawing.
*0 mean no caching.*/
#define LV_GRAD_CACHE_DEF_SIZE 0
#define LV_GRAD_CACHE_DEF_SIZE 0
/*Allow dithering the gradients (to achieve visual smooth color gradients on limited color depth display)
*LV_DITHER_GRADIENT implies allocating one or two more lines of the object's rendering surface
*The increase in memory consumption is (32 bits * object width) plus 24 bits * object width if using error diffusion */
#define LV_DITHER_GRADIENT 0
#define LV_DITHER_GRADIENT 0
#if LV_DITHER_GRADIENT
/*Add support for error diffusion dithering.
*Error diffusion dithering gets a much better visual result, but implies more CPU consumption and memory when drawing.
*The increase in memory consumption is (24 bits * object's width)*/
#define LV_DITHER_ERROR_DIFFUSION 0
#define LV_DITHER_ERROR_DIFFUSION 0
#endif
/*Maximum buffer size to allocate for rotation.
@@ -179,6 +192,12 @@
* GPU
*-----------*/
/*Use TSi's (aka Think Silicon) acceleration library NemaGFX */
#define LV_USE_NEMA_GFX 0
/*Use Arm's 2D acceleration library Arm-2D */
#define LV_USE_GPU_ARM2D 0
/*Use STM32's DMA2D (aka Chrom Art) GPU*/
#if defined(SIMU)
#define LV_USE_GPU_STM32_DMA2D 0
@@ -196,21 +215,20 @@
#else
#define LV_GPU_DMA2D_CMSIS_INCLUDE "stm32f4xx.h"
#endif
// #if !defined(DMA2D_NLR_PL_Pos)
// #define DMA2D_NLR_PL_Pos 16
// #endif
// #if !defined(DMA2D_NLR_NL_Pos)
// #define DMA2D_NLR_NL_Pos 0
// #endif
// #if !defined(DMA2D_CR_START_Msk)
// #define DMA2D_CR_START_Msk DMA2D_CR_START
// #endif
// #if !defined(DMA2D_FGPFCCR_AM_Pos)
// #define DMA2D_FGPFCCR_AM_Pos 16
// #endif
// #if !defined(DMA2D_FGPFCCR_ALPHA_Pos)
// #define DMA2D_FGPFCCR_ALPHA_Pos 24
// #endif
/*Enable RA6M3 G2D GPU*/
#define LV_USE_GPU_RA6M3_G2D 0
#if LV_USE_GPU_RA6M3_G2D
/*include path of target processor
e.g. "hal_data.h"*/
#define LV_GPU_RA6M3_G2D_INCLUDE "hal_data.h"
#endif
/*Use SWM341's DMA2D GPU*/
#define LV_USE_GPU_SWM341_DMA2D 0
#if LV_USE_GPU_SWM341_DMA2D
#define LV_GPU_SWM341_DMA2D_INCLUDE "SWM341.h"
#endif
#endif
/*Use NXP's PXP GPU iMX RTxxx platforms*/
@@ -359,7 +377,8 @@
#define LV_ATTRIBUTE_LARGE_RAM_ARRAY
/*Place performance critical functions into a faster memory (e.g RAM)*/
#define LV_ATTRIBUTE_FAST_MEM __IRAM
// #define LV_ATTRIBUTE_FAST_MEM __IRAM // !!! Does not work with LVGL 8.4 - compile errors
#define LV_ATTRIBUTE_FAST_MEM
/*Prefix variables that are used in GPU accelerated operations, often these need to be placed in RAM sections that are DMA accessible*/
#define LV_ATTRIBUTE_DMA __DMA
@@ -450,11 +469,7 @@
#define LV_FONT_FMT_TXT_LARGE 0
/*Enables/disables support for compressed fonts.*/
#if defined(BOOT)
#define LV_USE_FONT_COMPRESSED 1
#else
#define LV_USE_FONT_COMPRESSED 0
#endif
/*Enable subpixel rendering*/
#define LV_USE_FONT_SUBPX 0
@@ -463,6 +478,9 @@
#define LV_FONT_SUBPX_BGR 0 /*0: RGB; 1:BGR order*/
#endif
/*Enable drawing placeholders when glyph dsc is not found*/
#define LV_USE_FONT_PLACEHOLDER 0
/*=================
* TEXT SETTINGS
*=================*/
@@ -518,8 +536,6 @@
#if !defined(BOOT)
#define LV_USE_ARC 1
#define LV_USE_ANIMIMG 0
#define LV_USE_BAR 1
#define LV_USE_BTN 1
@@ -565,6 +581,8 @@
/*-----------
* Widgets
*----------*/
#define LV_USE_ANIMIMG 0
#define LV_USE_CALENDAR 0
#if LV_USE_CALENDAR
#define LV_CALENDAR_WEEK_STARTS_MONDAY 0
@@ -597,6 +615,12 @@
#define LV_USE_MSGBOX 0
#define LV_USE_SPAN 0
#if LV_USE_SPAN
/*A line text can contain maximum num of span descriptor */
#define LV_SPAN_SNIPPET_STACK_SIZE 64
#endif
#define LV_USE_SPINBOX 0
#define LV_USE_SPINNER 0
@@ -607,12 +631,6 @@
#define LV_USE_WIN 0
#define LV_USE_SPAN 0
#if LV_USE_SPAN
/*A line text can contain maximum num of span descriptor */
#define LV_SPAN_SNIPPET_STACK_SIZE 64
#endif
/*-----------
* Themes
*----------*/
@@ -649,7 +667,6 @@
#else
#define LV_USE_ARC 0
#define LV_USE_ANIMIMG 0
#define LV_USE_BAR 0
#define LV_USE_BTN 0
#define LV_USE_BTNMATRIX 0
@@ -664,6 +681,7 @@
#define LV_USE_SWITCH 0
#define LV_USE_TEXTAREA 0 /*Requires: lv_label*/
#define LV_USE_TABLE 0
#define LV_USE_ANIMIMG 0
#define LV_USE_CALENDAR 0
#define LV_USE_CHART 0
#define LV_USE_COLORWHEEL 0
@@ -674,12 +692,12 @@
#define LV_USE_MENU 0
#define LV_USE_METER 0
#define LV_USE_MSGBOX 0
#define LV_USE_SPAN 0
#define LV_USE_SPINBOX 0
#define LV_USE_SPINNER 0
#define LV_USE_TABVIEW 0
#define LV_USE_TILEVIEW 0
#define LV_USE_WIN 0
#define LV_USE_SPAN 0
#define LV_USE_THEME_DEFAULT 0
#define LV_USE_THEME_BASIC 0
#define LV_USE_THEME_MONO 0
@@ -697,7 +715,7 @@
#if LV_USE_FS_STDIO
#define LV_FS_STDIO_LETTER '\0' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
#define LV_FS_STDIO_PATH "" /*Set the working directory. File/directory paths will be appended to it.*/
#define LV_FS_STDIO_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/
#define LV_FS_STDIO_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/
#endif
/*API for open, read, etc*/
@@ -705,20 +723,20 @@
#if LV_USE_FS_POSIX
#define LV_FS_POSIX_LETTER '\0' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
#define LV_FS_POSIX_PATH "" /*Set the working directory. File/directory paths will be appended to it.*/
#define LV_FS_POSIX_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/
#define LV_FS_POSIX_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/
#endif
/*API for CreateFile, ReadFile, etc*/
#define LV_USE_FS_WIN32 0
#if LV_USE_FS_WIN32
#define LV_FS_WIN32_LETTER '\0' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
#define LV_FS_WIN32_LETTER '\0' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
#define LV_FS_WIN32_PATH "" /*Set the working directory. File/directory paths will be appended to it.*/
#define LV_FS_WIN32_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/
#endif
/*API for FATFS (needs to be added separately). Uses f_open, f_read, etc*/
#if defined(BOOT)
#define LV_USE_FS_FATFS 0
#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()*/
@@ -731,6 +749,13 @@
#endif
#endif
/*API for LittleFS (library needs to be added separately). Uses lfs_file_open, lfs_file_read, etc*/
#define LV_USE_FS_LITTLEFS 0
#if LV_USE_FS_LITTLEFS
#define LV_FS_LITTLEFS_LETTER '\0' /*Set an upper cased letter on which the drive will accessible (e.g. 'A')*/
#define LV_FS_LITTLEFS_CACHE_SIZE 0 /*>0 to cache this number of bytes in lv_fs_read()*/
#endif
/*PNG decoder library*/
#define LV_USE_PNG 0
@@ -769,15 +794,22 @@
#endif
#endif
/*Tiny TTF library*/
#define LV_USE_TINY_TTF 0
#if LV_USE_TINY_TTF
/*Load TTF data from files*/
#define LV_TINY_TTF_FILE_SUPPORT 0
#endif
/*Rlottie library*/
#define LV_USE_RLOTTIE 0
/*FFmpeg library for image decoding and playing videos
*Supports all major image formats so do not enable other image decoder with it*/
#define LV_USE_FFMPEG 0
#define LV_USE_FFMPEG 0
#if LV_USE_FFMPEG
/*Dump input information to stderr*/
#define LV_FFMPEG_AV_DUMP_FORMAT 0
#define LV_FFMPEG_DUMP_FORMAT 0
#endif
/*-----------
@@ -788,10 +820,37 @@
#define LV_USE_SNAPSHOT 1
/*1: Enable Monkey test*/
#define LV_USE_MONKEY 0
#define LV_USE_MONKEY 0
/*1: Enable grid navigation*/
#define LV_USE_GRIDNAV 0
#define LV_USE_GRIDNAV 0
/*1: Enable lv_obj fragment*/
#define LV_USE_FRAGMENT 0
/*1: Support using images as font in label or span widgets */
#define LV_USE_IMGFONT 0
/*1: Enable a published subscriber based messaging system */
#define LV_USE_MSG 0
/*1: Enable Pinyin input method*/
/*Requires: lv_keyboard*/
#define LV_USE_IME_PINYIN 0
#if LV_USE_IME_PINYIN
/*1: Use default thesaurus*/
/*If you do not use the default thesaurus, be sure to use `lv_ime_pinyin` after setting the thesauruss*/
#define LV_IME_PINYIN_USE_DEFAULT_DICT 1
/*Set the maximum number of candidate panels that can be displayed*/
/*This needs to be adjusted according to the size of the screen*/
#define LV_IME_PINYIN_CAND_TEXT_NUM 6
/*Use 9 key input(k9)*/
#define LV_IME_PINYIN_USE_K9_MODE 1
#if LV_IME_PINYIN_USE_K9_MODE == 1
#define LV_IME_PINYIN_K9_CAND_TEXT_NUM 3
#endif // LV_IME_PINYIN_USE_K9_MODE
#endif
/*==================
* EXAMPLES
@@ -805,26 +864,36 @@
====================*/
/*Show some widget. It might be required to increase `LV_MEM_SIZE` */
#define LV_USE_DEMO_WIDGETS 0
#define LV_USE_DEMO_WIDGETS 0
#if LV_USE_DEMO_WIDGETS
#define LV_DEMO_WIDGETS_SLIDESHOW 0
#define LV_DEMO_WIDGETS_SLIDESHOW 0
#endif
/*Demonstrate the usage of encoder and keyboard*/
#define LV_USE_DEMO_KEYPAD_AND_ENCODER 0
#define LV_USE_DEMO_KEYPAD_AND_ENCODER 0
/*Benchmark your system*/
#define LV_USE_DEMO_BENCHMARK 0
#define LV_USE_DEMO_BENCHMARK 0
#if LV_USE_DEMO_BENCHMARK
/*Use RGB565A8 images with 16 bit color depth instead of ARGB8565*/
#define LV_DEMO_BENCHMARK_RGB565A8 0
#endif
/*Stress test for LVGL*/
#define LV_USE_DEMO_STRESS 0
#define LV_USE_DEMO_STRESS 0
/*Music player demo*/
#define LV_USE_DEMO_MUSIC 0
#define LV_USE_DEMO_MUSIC 0
#if LV_USE_DEMO_MUSIC
# define LV_DEMO_MUSIC_SQUARE 0
# define LV_DEMO_MUSIC_LANDSCAPE 0
# define LV_DEMO_MUSIC_ROUND 0
# define LV_DEMO_MUSIC_LARGE 0
# define LV_DEMO_MUSIC_AUTO_PLAY 0
#define LV_DEMO_MUSIC_SQUARE 0
#define LV_DEMO_MUSIC_LANDSCAPE 0
#define LV_DEMO_MUSIC_ROUND 0
#define LV_DEMO_MUSIC_LARGE 0
#define LV_DEMO_MUSIC_AUTO_PLAY 0
#endif
/*--END OF LV_CONF_H--*/
#endif /*LV_CONF_H*/
#endif /*End of "Content enable"*/
@@ -144,7 +144,7 @@ class FunctionSwitch : public Window
offValue = g_model.functionSwitchLedOFFColor[switchIndex];
SET_DIRTY();
},
[=](int newValue) { previewColor(newValue); }, RGB888);
[=](int newValue) { previewColor(newValue); }, ETX_RGB888);
onColor = new ColorPicker(
this, {C2_X, 0, C2_W, 0},
@@ -162,7 +162,7 @@ class FunctionSwitch : public Window
onValue = g_model.functionSwitchLedONColor[switchIndex];
SET_DIRTY();
},
[=](int newValue) { previewColor(newValue); }, RGB888);
[=](int newValue) { previewColor(newValue); }, ETX_RGB888);
#endif //FUNCTION_SWITCHES_RGB_LEDS
setState();