Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-02-04 07:13:00 +08:00
Code Issues Projects Releases Wiki Activity

Remove the double empty lines from all source files (#2009)

Browse Source 
* Run dos2unix for all source files

* Remove the trail space from all source files

* Remove the double empty lines from all source files
This commit is contained in:
Xiang Xiao 2021-01-11 07:28:00 -06:00 committed by GitHub
parent 52ba06a228
commit 81b13bf3b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
181 changed files with 515 additions and 1201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.editorconfig
View File

@ -4,4 +4,3 @@ indent_size = 4
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

1
.github/workflows/build_micropython.yml vendored
View File

@ -39,4 +39,3 @@ jobs:
gc.collect();
utime.sleep(5)" |
ports/unix/micropython -i lib/lv_bindings/examples/advanced_demo.py

5
CHANGELOG.md
View File

@ -29,7 +29,6 @@
- fix(layout) stop layout after recursion threshold is reached
- fix(gauge) fix redraw with image needle
## v7.8.1
### Bugfixes
@ -107,7 +106,6 @@
- Fix imgbtn image switching with empty style
- Material theme: do not set the text font to allow easy global font change
## v7.6.0 (22.09.2020)
### New features
@ -191,7 +189,6 @@ The main new features of v7.4 are run-time font loading, style caching and arc k
- gauge: fix image needle drawing
- fix using freed memory in _lv_style_list_remove_style
## v7.2.0 (21.07.2020)
### New features
@ -295,7 +292,6 @@ The name of the project is changed to LVGL and the new website is on https://lvg
LVGL remains free under the same conditions (MIT license) and a company is created to manage LVGL and offer services.
### New drawing system
Complete rework of LVGL's draw engine to use "masks" for more advanced and higher quality graphical effects.
A possible use-case of this system is to remove the overflowing content from the rounded edges.
@ -309,7 +305,6 @@ The API in this regard remained the same but some new functions were added:
- `lv_img_set_angle`: set image object's angle without using canvas
- `lv_img_set_pivot`: set the pivot point of rotation
The new drawing engine brought new drawing features too. They are highlighted in the "style" section.
### New style system

2
docs/ROADMAP.md
View File

@ -47,8 +47,6 @@ Planned to November/December 2020
- Make image transformations more versatile
- Allow snapshoting object to tranfrom them to images
## Ideas
- lv_mem_alloc_aligned(size, align)
- Text node. See [#1701](https://github.com/lvgl/lvgl/issues/1701#issuecomment-699479408)

1
examples/LVGL_Arduino.ino
View File

@ -94,7 +94,6 @@ void setup()
lv_ex_btn_1();
}
void loop()
{

2
examples/porting/lv_port_disp_template.c
View File

@ -91,7 +91,6 @@ void lv_port_disp_init(void)
static lv_color_t draw_buf_3_1[LV_HOR_RES_MAX * LV_VER_RES_MAX]; /*An other screen sized buffer*/
lv_disp_buf_init(&draw_buf_dsc_3, draw_buf_3_1, draw_buf_3_2, LV_HOR_RES_MAX * LV_VER_RES_MAX); /*Initialize the display buffer*/
/*-----------------------------------
* Register the display in LVGL
*----------------------------------*/
@ -157,7 +156,6 @@ static void disp_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_colo
lv_disp_flush_ready(disp_drv);
}
/*OPTIONAL: GPU INTERFACE*/
#if LV_USE_GPU

1
examples/porting/lv_port_disp_template.h
View File

@ -34,7 +34,6 @@ extern "C" {
* MACROS
**********************/
#ifdef __cplusplus
} /* extern "C" */
#endif

2
examples/porting/lv_port_fs_template.c
View File

@ -36,7 +36,6 @@ typedef struct {
uint32_t dummy2;
}dir_t;
/**********************
* STATIC PROTOTYPES
**********************/
@ -157,7 +156,6 @@ static lv_fs_res_t fs_open (lv_fs_drv_t * drv, void * file_p, const char * path,
return res;
}
/**
* Close an opened file
* @param drv pointer to a driver where this function belongs

1
examples/porting/lv_port_fs_template.h
View File

@ -34,7 +34,6 @@ extern "C" {
* MACROS
**********************/
#ifdef __cplusplus
} /* extern "C" */
#endif

5
examples/porting/lv_port_indev_template.c
View File

@ -79,7 +79,6 @@ void lv_port_indev_init(void)
* You should shape them according to your hardware
*/
lv_indev_drv_t indev_drv;
/*------------------
@ -174,8 +173,6 @@ void lv_port_indev_init(void)
* STATIC FUNCTIONS
**********************/
/*------------------
* Touchpad
* -----------------*/
@ -225,7 +222,6 @@ static void touchpad_get_xy(lv_coord_t * x, lv_coord_t * y)
(*y) = 0;
}
/*------------------
* Mouse
* -----------------*/
@ -361,7 +357,6 @@ static void encoder_handler(void)
encoder_state = LV_INDEV_STATE_REL;
}
/*------------------
* Button
* -----------------*/

1
examples/porting/lv_port_indev_template.h
View File

@ -35,7 +35,6 @@ extern "C" {
* MACROS
**********************/
#ifdef __cplusplus
} /* extern "C" */
#endif

2
lv_conf_template.h
View File

@ -134,7 +134,6 @@ typedef int16_t lv_coord_t;
* Time between `LV_EVENT_LONG_PRESSED_REPEAT */
#define LV_INDEV_DEF_LONG_PRESS_REP_TIME 100
/* Gesture threshold in pixels */
#define LV_INDEV_DEF_GESTURE_LIMIT 50
@ -731,7 +730,6 @@ typedef void * lv_obj_user_data_t;
# define LV_TABLE_CELL_STYLE_CNT 4
#endif
/*Tab (dependencies: lv_page, lv_btnm)*/
#define LV_USE_TABVIEW 1
# if LV_USE_TABVIEW != 0

2
lvgl.h
View File

@ -10,7 +10,6 @@
extern "C" {
#endif
/***************************
* CURRENT VERSION OF LVGL
***************************/
@ -121,7 +120,6 @@ extern "C" {
* */
#define LV_VERSION_CHECK(x,y,z) (x == LVGL_VERSION_MAJOR && (y < LVGL_VERSION_MINOR || (y == LVGL_VERSION_MINOR && z <= LVGL_VERSION_PATCH)))
#ifdef __cplusplus
}
#endif

2
lvgl.mk
View File

@ -6,5 +6,3 @@ include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_misc/lv_misc.mk
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_themes/lv_themes.mk
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_draw/lv_draw.mk
include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_gpu/lv_gpu.mk

2
scripts/built_in_font/generate_all.py
View File

@ -101,5 +101,3 @@ os.system('sed -i \'s|#include "lvgl/lvgl.h"|#include "../../lvgl.h"|\' lv_font_
print("\nGenerating 16 px Hebrew, Persian")
os.system("./built_in_font_gen.py --size 16 -o lv_font_dejavu_16_persian_hebrew.c --bpp 4 --font DejaVuSans.ttf -r 0x20-0x7f,0x5d0-0x5ea,0x600-0x6FF,0xFB50-0xFDFF,0xFE70-0xFEFF")
os.system('sed -i \'s|#include "lvgl/lvgl.h"|#include "../../lvgl.h"|\' lv_font_dejavu_16_persian_hebrew.c')

1
scripts/code-format.cfg
View File

@ -47,4 +47,3 @@
--exclude=../src/lv_font/lv_font_montserrat_28_compressed.c
--exclude=../src/lv_font/lv_font_simsun_16_cjk.c
--exclude=../src/lv_font/lv_font_dejavu_16_persian_hebrew.c

1
scripts/cppcheck_run.sh
View File

@ -1,2 +1 @@
cppcheck -j8 --template="{severity}\t{file}:{line}\t{id}: {message}" --enable=all ../src/ --output-file=cppcheck_res.txt --suppress=unusedFunction --suppress=preprocessorErrorDirective --force

1
scripts/infer_run.sh
View File

@ -6,5 +6,4 @@
# | sudo tar -C /opt -xJ && \
# sudoln -s "/opt/infer-linux64-v$VERSION/bin/infer" /usr/local/bin/infer
infer run -- make -j8

3
scripts/lv_conf_checker.py
View File

@ -4,7 +4,6 @@
Generates a checker file for lv_conf.h from lv_conf_template.h define all the not defined values
'''
import sys
import re
@ -15,7 +14,6 @@ if sys.version_info < (3,6,0):
fin = open("../lv_conf_template.h", "r")
fout = open("../src/lv_conf_internal.h", "w")
fout.write(
'''/**
* GENERATED FILE, DO NOT EDIT IT!
@ -110,7 +108,6 @@ for i in fin.read().splitlines():
else:
fout.write(f'{i}\n')
fout.write(
'''

1
scripts/release/com.py
View File

@ -108,4 +108,3 @@ def update_version(ver):
define_set("./lvgl.h", "LVGL_VERSION_MINOR", str(ver[1]))
define_set("./lvgl.h", "LVGL_VERSION_PATCH", str(ver[2]))
define_set("./lvgl.h", "LVGL_VERSION_INFO", "\"" + ver[3] + "\"")

2
scripts/release/dev.py
View File

@ -28,7 +28,6 @@ def docs_update_ver(ver, br):
os.chdir("../")
def merge_dev_to_master():
os.chdir("./lvgl")
com.cmd("git checkout master")
@ -43,7 +42,6 @@ def merge_dev_to_master():
com.push("origin latest")
os.chdir("../")
def make(mode):
if(mode == "bugfix"):
ver = com.get_lvgl_version("master")

2
scripts/release/proj.py
View File

@ -7,7 +7,6 @@ import re
import subprocess
import com
def make(repo_path, auto_push = False):
os.chdir("./" + repo_path)
com.cmd('git checkout master')
@ -37,7 +36,6 @@ def make(repo_path, auto_push = False):
(key, val) = line.rstrip().split('\t')
com.define_set("lv_conf.h", str(key), str(val))
if os.path.exists("lv_examples"):
print("Upadte lv_examples");
com.cmd("cd lv_examples; git co " + release_br + "; git pull origin " + release_br)

2
scripts/release/release.py
View File

@ -78,7 +78,6 @@ def lvgl_release(ver):
return release_note
def lv_examples_release(ver):
print("Release lv_examples")
@ -160,7 +159,6 @@ def blog_release(ver, release_note):
os.chdir("../../")
def make():
ver = com.get_lvgl_version("master")
release_note = lvgl_release(ver)

10
src/lv_api_map.h
View File

@ -49,7 +49,6 @@ static inline void lv_task_once(lv_task_t * task)
#endif
#if LV_USE_DROPDOWN
static inline void lv_dropdown_set_draw_arrow(lv_obj_t * ddlist, bool en)
@ -145,10 +144,8 @@ static inline void lv_roller_set_fix_width(lv_obj_t * roller, lv_coord_t w)
lv_obj_set_width(roller, w);
}
#endif
#if LV_USE_PAGE
#define lv_scrlbar_mode_t lv_scrollbar_mode_t
@ -159,7 +156,6 @@ static inline void lv_roller_set_fix_width(lv_obj_t * roller, lv_coord_t w)
#define LV_SCRLBAR_MODE_HIDE LV_SCROLLBAR_MODE_HIDE
#define LV_SCRLBAR_MODE_UNHIDE LV_SCROLLBAR_MODE_UNHIDE
static inline void lv_page_set_scrlbar_mode(lv_obj_t * page, lv_scrlbar_mode_t sb_mode)
{
lv_page_set_scrollbar_mode(page, sb_mode);
@ -169,19 +165,14 @@ static inline lv_scrollbar_mode_t lv_page_get_scrlbar_mode(lv_obj_t * page)
return lv_page_get_scrollbar_mode(page);
}
static inline lv_obj_t * lv_page_get_scrl(lv_obj_t * page)
{
return lv_page_get_scrollable(page);
}
#endif
#endif /*LV_USE_API_EXTENSION_V6*/
/*---------------------
* V7.0 COMPATIBILITY
*--------------------*/
@ -206,7 +197,6 @@ static inline void lv_chart_set_range(lv_obj_t * chart, lv_coord_t ymin, lv_coor
lv_chart_set_y_range(chart, LV_CHART_AXIS_PRIMARY_Y, ymin, ymax);
}
static inline void lv_chart_clear_serie(lv_obj_t * chart, lv_chart_series_t * series)
{
lv_chart_clear_series(chart, series);

5
src/lv_conf_internal.h
View File

@ -349,7 +349,6 @@
# endif
#endif
/* Gesture threshold in pixels */
#ifndef LV_INDEV_DEF_GESTURE_LIMIT
# ifdef CONFIG_LV_INDEV_DEF_GESTURE_LIMIT
@ -749,7 +748,6 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */
#endif
#endif /*LV_TICK_CUSTOM*/
/*================
* Log settings
*===============*/
@ -1928,7 +1926,6 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */
#endif
#endif
/*Tab (dependencies: lv_page, lv_btnm)*/
#ifndef LV_USE_TABVIEW
# ifdef CONFIG_LV_USE_TABVIEW
@ -1990,8 +1987,6 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */
#endif
#endif
/*If running without lv_conf.h add typdesf with default value*/
#if defined(LV_CONF_SKIP)

1
src/lv_conf_kconfig.h
View File

@ -385,7 +385,6 @@ extern "C" {
#endif
#endif
/*------------------
* SPINNER DEF ANIM
*-----------------*/

2
src/lv_core/lv_disp.c
View File

@ -180,7 +180,6 @@ void lv_disp_set_bg_image(lv_disp_t * disp, const void * img_src)
_lv_inv_area(disp, &a);
}
/**
* Opacity of the background
* @param disp pointer to a display
@ -216,7 +215,6 @@ void lv_scr_load_anim(lv_obj_t * new_scr, lv_scr_load_anim_t anim_type, uint32_t
lv_disp_t * d = lv_obj_get_disp(new_scr);
lv_obj_t * act_scr = lv_scr_act();
if(d->del_prev && act_scr != d->scr_to_load && d->scr_to_load) {
lv_obj_del(act_scr);
lv_disp_load_scr(d->scr_to_load);

2
src/lv_core/lv_disp.h
View File

@ -85,7 +85,6 @@ lv_obj_t * lv_disp_get_layer_sys(lv_disp_t * disp);
*/
void lv_disp_assign_screen(lv_disp_t * disp, lv_obj_t * scr);
/**
* Set the background color of a display
* @param disp pointer to a display
@ -207,7 +206,6 @@ static inline void lv_scr_load(lv_obj_t * scr)
#define LV_VER_RES lv_disp_get_ver_res(lv_disp_get_default())
#endif
/**
* Same as Android's DIP. (Different name is chosen to avoid mistype between LV_DPI and LV_DIP)
* 1 dip is 1 px on a 160 DPI screen

5
src/lv_core/lv_indev.c
View File

@ -1263,7 +1263,6 @@ static void indev_drag(lv_indev_proc_t * proc)
if(lv_obj_get_drag(drag_obj) == false) return;
lv_drag_dir_t allowed_dirs = lv_obj_get_drag_dir(drag_obj);
/*Count the movement by drag*/
@ -1469,7 +1468,6 @@ static void indev_drag_throw(lv_indev_proc_t * proc)
}
}
/**
* Get the really dragged object by taking `drag_parent` into account.
* @param obj the start object
@ -1486,7 +1484,6 @@ static lv_obj_t * get_dragged_obj(lv_obj_t * obj)
return drag_obj;
}
/**
* Handle the gesture of indev_proc_p->types.pointer.act_obj
* @param indev pointer to a input device state
@ -1505,7 +1502,6 @@ static void indev_gesture(lv_indev_proc_t * proc)
if(gesture_obj == NULL) return;
if((LV_MATH_ABS(proc->types.pointer.vect.x) < indev_act->driver.gesture_min_velocity) &&
(LV_MATH_ABS(proc->types.pointer.vect.y) < indev_act->driver.gesture_min_velocity)) {
proc->types.pointer.gesture_sum.x = 0;
@ -1541,7 +1537,6 @@ static void indev_gesture(lv_indev_proc_t * proc)
}
}
/**
* Checks if the reset_query flag has been set. If so, perform necessary global indev cleanup actions
* @param proc pointer to an input device 'proc'

1
src/lv_core/lv_indev.h
View File

@ -149,7 +149,6 @@ lv_res_t lv_indev_finish_drag(lv_indev_t * indev);
*/
void lv_indev_wait_release(lv_indev_t * indev);
/**
* Gets a pointer to the currently active object in indev proc functions.
* NULL if no object is currently being handled or if groups aren't used.

26
src/lv_core/lv_obj.c
View File

@ -34,7 +34,6 @@
#include LV_GC_INCLUDE
#endif /* LV_ENABLE_GC */
#if defined(LV_USER_DATA_FREE_INCLUDE)
#include LV_USER_DATA_FREE_INCLUDE
#endif /* LV_USE_USER_DATA_FREE */
@ -341,10 +340,8 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy)
}
}
_lv_ll_init(&(new_obj->child_ll), sizeof(lv_obj_t));
new_obj->ext_draw_pad = 0;
#if LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_FULL
@ -368,7 +365,6 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy)
_lv_memset_00(&new_obj->user_data, sizeof(lv_obj_user_data_t));
#endif
#if LV_USE_GROUP
new_obj->group_p = NULL;
#endif
@ -490,7 +486,6 @@ lv_res_t lv_obj_del(lv_obj_t * obj)
if(disp->act_scr == obj) act_scr_del = true;
}
obj_del_core(obj);
/*Send a signal to the parent to notify it about the child delete*/
@ -694,7 +689,6 @@ void lv_obj_set_parent(lv_obj_t * obj, lv_obj_t * parent)
_lv_ll_chg_list(&obj->parent->child_ll, &parent->child_ll, obj, true);
obj->parent = parent;
if(new_base_dir != LV_BIDI_DIR_RTL) {
lv_obj_set_pos(obj, old_pos.x, old_pos.y);
}
@ -781,7 +775,6 @@ void lv_obj_set_pos(lv_obj_t * obj, lv_coord_t x, lv_coord_t y)
y = y + par->coords.y1;
}
/*Calculate and set the movement*/
lv_point_t diff;
diff.x = x - obj->coords.x1;
@ -1055,7 +1048,6 @@ void lv_obj_align_mid(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, l
LV_ASSERT_OBJ(base, LV_OBJX_NAME);
obj_align_mid_core(obj, base, align, true, true, x_ofs, y_ofs);
#if LV_USE_OBJ_REALIGN
@ -1085,11 +1077,9 @@ void lv_obj_align_mid_x(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align,
LV_ASSERT_OBJ(base, LV_OBJX_NAME);
obj_align_mid_core(obj, base, align, true, false, x_ofs, 0);
}
/**
* Align an object's middle point to an other object vertically.
* @param obj pointer to an object to align
@ -1107,7 +1097,6 @@ void lv_obj_align_mid_y(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align,
LV_ASSERT_OBJ(base, LV_OBJX_NAME);
obj_align_mid_core(obj, base, align, false, true, 0, y_ofs);
}
@ -1149,7 +1138,6 @@ void lv_obj_set_auto_realign(lv_obj_t * obj, bool en)
#endif
}
/**
* Set the size of an extended clickable area
* If TINY mode is used, only the largest of the horizontal and vertical padding
@ -1751,7 +1739,6 @@ void lv_obj_set_state(lv_obj_t * obj, lv_state_t new_state)
else if(cmp_res == STYLE_COMPARE_VISUAL_DIFF) lv_obj_refresh_style(obj, LV_OBJ_PART_ALL, LV_STYLE_PROP_ALL);
#else
for(part = 0; part < _LV_OBJ_PART_REAL_LAST; part++) {
lv_style_list_t * style_list = lv_obj_get_style_list(obj, part);
if(style_list == NULL) break; /*No more style lists*/
@ -1943,7 +1930,6 @@ void lv_event_send_refresh_recursive(lv_obj_t * obj)
}
}
/**
* Call an event function with an object, event, and data.
* @param event_xcb an event callback function. If `NULL` `LV_RES_OK` will return without any actions.
@ -2804,7 +2790,6 @@ lv_opa_t _lv_obj_get_style_opa(const lv_obj_t * obj, uint8_t part, lv_style_prop
}
}
lv_state_t state = lv_obj_get_state(parent, part);
prop = (uint16_t)prop_ori + ((uint16_t)state << LV_STYLE_STATE_POS);
@ -3059,7 +3044,6 @@ bool lv_obj_get_parent_event(const lv_obj_t * obj)
return obj->parent_event == 0 ? false : true;
}
lv_bidi_dir_t lv_obj_get_base_dir(const lv_obj_t * obj)
{
LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
@ -3282,7 +3266,6 @@ bool lv_obj_is_focused(const lv_obj_t * obj)
#endif
}
/*-------------------
* OTHER FUNCTIONS
*------------------*/
@ -3959,7 +3942,6 @@ static lv_design_res_t lv_obj_design(lv_obj_t * obj, const lv_area_t * clip_area
return LV_DESIGN_RES_OK;
}
/**
* Get the really focused object by taking `focus_parent` into account.
* @param obj the start object
@ -4168,7 +4150,6 @@ static void obj_align_mid_core(lv_obj_t * obj, const lv_obj_t * base, lv_align_t
lv_coord_t obj_w_half = lv_obj_get_width(obj) / 2;
lv_coord_t obj_h_half = lv_obj_get_height(obj) / 2;
switch(align) {
case LV_ALIGN_CENTER:
new_x = lv_obj_get_width(base) / 2 - obj_w_half;
@ -4290,8 +4271,6 @@ static void obj_align_mid_core(lv_obj_t * obj, const lv_obj_t * base, lv_align_t
}
#if LV_USE_ANIMATION
/**
@ -4656,7 +4635,6 @@ static void update_style_cache(lv_obj_t * obj, uint8_t part, uint16_t prop)
list->text_space_zero = 0;
}
lv_opa_t bg_opa = lv_obj_get_style_bg_opa(obj, part);
list->bg_opa_transp = bg_opa == LV_OPA_TRANSP ? 1 : 0;
list->bg_opa_cover = bg_opa == LV_OPA_COVER ? 1 : 0;
@ -4672,7 +4650,6 @@ static void update_style_cache(lv_obj_t * obj, uint8_t part, uint16_t prop)
list->shadow_width_zero = lv_obj_get_style_shadow_width(obj, part) == 0 ? 1 : 0;
list->value_txt_str = lv_obj_get_style_value_str(obj, part) == NULL ? 1 : 0;
list->transform_all_zero = 1;
if(lv_obj_get_style_transform_angle(obj, part) != 0 ||
lv_obj_get_style_transform_width(obj, part) != 0 ||
@ -4773,7 +4750,6 @@ static void invalidate_style_cache(lv_obj_t * obj, uint8_t part, lv_style_proper
list->valid_cache = 0;
}
lv_obj_t * child = lv_obj_get_child(obj, NULL);
while(child) {
update_style_cache_children(child);
@ -4799,7 +4775,6 @@ static void style_snapshot(lv_obj_t * obj, uint8_t part, style_snapshot_t * shot
lv_obj_init_draw_img_dsc(obj, part, &shot->img);
lv_obj_init_draw_line_dsc(obj, part, &shot->line);
shot->pad_top = lv_obj_get_style_pad_top(obj, part);
shot->pad_bottom = lv_obj_get_style_pad_bottom(obj, part);
shot->pad_right = lv_obj_get_style_pad_right(obj, part);
@ -4832,7 +4807,6 @@ static style_snapshot_res_t style_snapshot_compare(style_snapshot_t * shot1, sty
{
if(memcmp(shot1, shot2, sizeof(style_snapshot_t)) == 0) return STYLE_COMPARE_SAME;
if(shot1->pad_top != shot2->pad_top) return STYLE_COMPARE_DIFF;
if(shot1->pad_bottom != shot2->pad_bottom) return STYLE_COMPARE_DIFF;
if(shot1->pad_left != shot2->pad_right) return STYLE_COMPARE_DIFF;

16
src/lv_core/lv_obj.h
View File

@ -56,7 +56,6 @@ extern "C" {
struct _lv_obj_t;
/** Design modes */
enum {
LV_DESIGN_DRAW_MAIN, /**< Draw the main portion of the object */
@ -65,7 +64,6 @@ enum {
};
typedef uint8_t lv_design_mode_t;
/** Design results */
enum {
LV_DESIGN_RES_OK, /**< Draw ready */
@ -288,7 +286,6 @@ typedef struct {
*/
void lv_init(void);
/**
* Deinit the 'lv' library
* Currently only implemented when not using custom allocators, or GC is enabled.
@ -339,7 +336,6 @@ void lv_obj_del_async(struct _lv_obj_t * obj);
*/
void lv_obj_clean(lv_obj_t * obj);
/**
* Mark an area of an object as invalid.
* This area will be redrawn by 'lv_refr_task'
@ -354,7 +350,6 @@ void lv_obj_invalidate_area(const lv_obj_t * obj, const lv_area_t * area);
*/
void lv_obj_invalidate(const lv_obj_t * obj);
/**
* Tell whether an area of an object is visible (even partially) now or not
* @param obj pointer to an object
@ -513,7 +508,6 @@ void lv_obj_align_y(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_
*/
void lv_obj_align_mid(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_coord_t x_ofs, lv_coord_t y_ofs);
/**
* Align an object's middle point to an other object horizontally.
* @param obj pointer to an object to align
@ -848,7 +842,6 @@ void lv_obj_set_event_cb(lv_obj_t * obj, lv_event_cb_t event_cb);
*/
lv_res_t lv_event_send(lv_obj_t * obj, lv_event_t event, const void * data);
/**
* Send LV_EVENT_REFRESH event to an object
* @param obj point to an object. (Can NOT be NULL)
@ -888,7 +881,6 @@ const void * lv_event_get_data(void);
*/
void lv_obj_set_signal_cb(lv_obj_t * obj, lv_signal_cb_t signal_cb);
/**
* Send an event to the object
* @param obj pointer to an object
@ -1212,7 +1204,6 @@ const void * _lv_obj_get_style_ptr(const lv_obj_t * obj, uint8_t part, lv_style_
*/
lv_style_t * lv_obj_get_local_style(lv_obj_t * obj, uint8_t part);
#include "lv_obj_style_dec.h"
/*-----------------
@ -1275,7 +1266,6 @@ bool lv_obj_get_drag_throw(const lv_obj_t * obj);
*/
bool lv_obj_get_drag_parent(const lv_obj_t * obj);
/**
* Get the focus parent attribute of an object
* @param obj pointer to an object
@ -1283,7 +1273,6 @@ bool lv_obj_get_drag_parent(const lv_obj_t * obj);
*/
bool lv_obj_get_focus_parent(const lv_obj_t * obj);
/**
* Get the drag parent attribute of an object
* @param obj pointer to an object
@ -1315,7 +1304,6 @@ uint8_t lv_obj_get_protect(const lv_obj_t * obj);
*/
bool lv_obj_is_protected(const lv_obj_t * obj, uint8_t prot);
lv_state_t lv_obj_get_state(const lv_obj_t * obj, uint8_t part);
/**
@ -1489,7 +1477,6 @@ bool lv_debug_check_obj_type(const lv_obj_t * obj, const char * obj_type);
*/
bool lv_debug_check_obj_valid(const lv_obj_t * obj);
/**********************
* MACROS
**********************/
@ -1510,7 +1497,6 @@ bool lv_debug_check_obj_valid(const lv_obj_t * obj);
*/
#define LV_EVENT_CB_DECLARE(name) static void name(lv_obj_t * obj, lv_event_t e)
#if LV_USE_DEBUG
# ifndef LV_DEBUG_IS_OBJ
@ -1519,7 +1505,6 @@ bool lv_debug_check_obj_valid(const lv_obj_t * obj);
lv_debug_check_obj_type(obj_p, obj_type))
# endif
# if LV_USE_ASSERT_OBJ
# ifndef LV_ASSERT_OBJ
# define LV_ASSERT_OBJ(obj_p, obj_type) LV_DEBUG_ASSERT(LV_DEBUG_IS_OBJ(obj_p, obj_type), "Invalid object", obj_p);
@ -1535,7 +1520,6 @@ bool lv_debug_check_obj_valid(const lv_obj_t * obj);
# define LV_ASSERT_OBJ(obj, obj_type)
#endif
#ifdef __cplusplus
} /* extern "C" */
#endif

13
src/lv_core/lv_obj_style_dec.h
View File

@ -200,7 +200,6 @@ _LV_OBJ_STYLE_SET_GET_DECLARE(SCALE_END_COLOR, scale_end_color, lv_color_t, _col
#undef _LV_OBJ_STYLE_SET_GET_DECLARE
static inline void lv_obj_set_style_local_pad_all(lv_obj_t * obj, uint8_t part, lv_state_t state, lv_style_int_t value)
{
lv_obj_set_style_local_pad_top(obj, part, state, value);
@ -209,7 +208,6 @@ static inline void lv_obj_set_style_local_pad_all(lv_obj_t * obj, uint8_t part,
lv_obj_set_style_local_pad_right(obj, part, state, value);
}
static inline void lv_style_set_pad_all(lv_style_t * style, lv_state_t state, lv_style_int_t value)
{
lv_style_set_pad_top(style, state, value);
@ -218,35 +216,30 @@ static inline void lv_style_set_pad_all(lv_style_t * style, lv_state_t state, lv
lv_style_set_pad_right(style, state, value);
}
static inline void lv_obj_set_style_local_pad_hor(lv_obj_t * obj, uint8_t part, lv_state_t state, lv_style_int_t value)
{
lv_obj_set_style_local_pad_left(obj, part, state, value);
lv_obj_set_style_local_pad_right(obj, part, state, value);
}
static inline void lv_style_set_pad_hor(lv_style_t * style, lv_state_t state, lv_style_int_t value)
{
lv_style_set_pad_left(style, state, value);
lv_style_set_pad_right(style, state, value);
}
static inline void lv_obj_set_style_local_pad_ver(lv_obj_t * obj, uint8_t part, lv_state_t state, lv_style_int_t value)
{
lv_obj_set_style_local_pad_top(obj, part, state, value);
lv_obj_set_style_local_pad_bottom(obj, part, state, value);
}
static inline void lv_style_set_pad_ver(lv_style_t * style, lv_state_t state, lv_style_int_t value)
{
lv_style_set_pad_top(style, state, value);
lv_style_set_pad_bottom(style, state, value);
}
static inline void lv_obj_set_style_local_margin_all(lv_obj_t * obj, uint8_t part, lv_state_t state,
lv_style_int_t value)
{
@ -256,7 +249,6 @@ static inline void lv_obj_set_style_local_margin_all(lv_obj_t * obj, uint8_t par
lv_obj_set_style_local_margin_right(obj, part, state, value);
}
static inline void lv_style_set_margin_all(lv_style_t * style, lv_state_t state, lv_style_int_t value)
{
lv_style_set_margin_top(style, state, value);
@ -265,7 +257,6 @@ static inline void lv_style_set_margin_all(lv_style_t * style, lv_state_t state,
lv_style_set_margin_right(style, state, value);
}
static inline void lv_obj_set_style_local_margin_hor(lv_obj_t * obj, uint8_t part, lv_state_t state,
lv_style_int_t value)
{
@ -273,14 +264,12 @@ static inline void lv_obj_set_style_local_margin_hor(lv_obj_t * obj, uint8_t par
lv_obj_set_style_local_margin_right(obj, part, state, value);
}
static inline void lv_style_set_margin_hor(lv_style_t * style, lv_state_t state, lv_style_int_t value)
{
lv_style_set_margin_left(style, state, value);
lv_style_set_margin_right(style, state, value);
}
static inline void lv_obj_set_style_local_margin_ver(lv_obj_t * obj, uint8_t part, lv_state_t state,
lv_style_int_t value)
{
@ -288,14 +277,12 @@ static inline void lv_obj_set_style_local_margin_ver(lv_obj_t * obj, uint8_t par
lv_obj_set_style_local_margin_bottom(obj, part, state, value);
}
static inline void lv_style_set_margin_ver(lv_style_t * style, lv_state_t state, lv_style_int_t value)
{
lv_style_set_margin_top(style, state, value);
lv_style_set_margin_bottom(style, state, value);
}
#ifdef __cplusplus
} /* extern "C" */
#endif

1
src/lv_core/lv_refr.c
View File

@ -564,7 +564,6 @@ static void lv_refr_area_part(const lv_area_t * area_p)
}
if(top_act_scr == NULL) {
top_act_scr = disp_refr->act_scr;
}

4
src/lv_core/lv_style.c
View File

@ -732,7 +732,6 @@ lv_style_t * _lv_style_list_add_trans_style(lv_style_list_t * list)
return trans_style;
}
/**
* Set a local integer typed property in a style list.
* @param list pointer to a style list where the local property should be set
@ -797,8 +796,6 @@ void _lv_style_list_set_local_ptr(lv_style_list_t * list, lv_style_property_t pr
_lv_style_set_ptr(local, prop, value);
}
/**
* Get an integer typed property from a style list.
* It will return the property which match best with given state.
@ -1169,7 +1166,6 @@ static inline uint8_t get_style_prop_attr(const lv_style_t * style, size_t idx)
return ((get_style_prop(style, idx) >> 8) & 0xFFU);
}
/**
* Get property size.
* @param prop_id property id.

3
src/lv_core/lv_style.h
View File

@ -539,7 +539,6 @@ lv_res_t _lv_style_list_get_int(lv_style_list_t * list, lv_style_property_t prop
*/
lv_res_t _lv_style_list_get_color(lv_style_list_t * list, lv_style_property_t prop, lv_color_t * res);
/**
* Get an opacity typed property from a style list.
* It will return the property which match best with given state.
@ -599,8 +598,6 @@ bool lv_debug_check_style_list(const lv_style_list_t * list);
*/
#define LV_STYLE_CREATE(name, copy_p) static lv_style_t name; lv_style_init(&name); lv_style_copy(&name, copy_p);
#if LV_USE_DEBUG
# ifndef LV_DEBUG_IS_STYLE

5
src/lv_draw/lv_draw_arc.c
View File

@ -34,7 +34,6 @@ typedef struct {
const lv_area_t * clip_area;
} quarter_draw_dsc_t;
/**********************
* STATIC PROTOTYPES
**********************/
@ -44,7 +43,6 @@ static void draw_quarter_2(quarter_draw_dsc_t * q);
static void draw_quarter_3(quarter_draw_dsc_t * q);
static void get_rounded_area(int16_t angle, lv_coord_t radius, uint8_t thickness, lv_area_t * res_area);
/**********************
* STATIC VARIABLES
**********************/
@ -331,7 +329,6 @@ static void draw_quarter_2(quarter_draw_dsc_t * q)
}
}
static void draw_quarter_3(quarter_draw_dsc_t * q)
{
lv_area_t quarter_area;
@ -385,7 +382,6 @@ static void draw_quarter_3(quarter_draw_dsc_t * q)
}
}
static void get_rounded_area(int16_t angle, lv_coord_t radius, uint8_t thickness, lv_area_t * res_area)
{
const uint8_t ps = 8;
@ -423,4 +419,3 @@ static void get_rounded_area(int16_t angle, lv_coord_t radius, uint8_t thickness
res_area->y2 = cir_y + thick_half - thick_corr;
}
}

10
src/lv_draw/lv_draw_blend.c
View File

@ -78,7 +78,6 @@ static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_co
* MACROS
**********************/
#define FILL_NORMAL_MASK_PX(out_x, color) \
if(*mask_tmp_x) { \
if(*mask_tmp_x == LV_OPA_COVER) disp_buf_first[out_x] = color; \
@ -86,7 +85,6 @@ static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_co
} \
mask_tmp_x++;
#define FILL_NORMAL_MASK_PX_SCR_TRANSP(out_x, color) \
if(*mask_tmp_x) { \
if(*mask_tmp_x == LV_OPA_COVER) disp_buf_first[out_x] = color; \
@ -96,7 +94,6 @@ static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_co
} \
mask_tmp_x++;
#define MAP_NORMAL_MASK_PX(x) \
if(*mask_tmp_x) { \
if(*mask_tmp_x == LV_OPA_COVER) disp_buf_first[x] = map_buf_first[x]; \
@ -117,7 +114,6 @@ static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_co
* GLOBAL FUNCTIONS
**********************/
/**
* Fill and area in the display buffer.
* @param clip_area clip the fill to this area (absolute coordinates)
@ -252,7 +248,6 @@ LV_ATTRIBUTE_FAST_MEM void _lv_blend_map(const lv_area_t * clip_area, const lv_a
#endif
}
/**********************
* STATIC FUNCTIONS
**********************/
@ -392,7 +387,6 @@ LV_ATTRIBUTE_FAST_MEM static void fill_normal(const lv_area_t * disp_area, lv_co
}
#endif
#if LV_USE_GPU_STM32_DMA2D
if(lv_area_get_size(draw_area) >= 240) {
if(blend_buf[0].full != color.full) lv_color_fill(blend_buf, color, LV_HOR_RES_MAX);
@ -450,7 +444,6 @@ LV_ATTRIBUTE_FAST_MEM static void fill_normal(const lv_area_t * disp_area, lv_co
}
#endif
/*Buffer the result color to avoid recalculating the same color*/
lv_color_t last_dest_color;
lv_color_t last_res_color;
@ -581,7 +574,6 @@ static void fill_blended(const lv_area_t * disp_area, lv_color_t * disp_buf, co
/*Create a temp. disp_buf which always point to current line to draw*/
lv_color_t * disp_buf_tmp = disp_buf + disp_w * draw_area->y1;
lv_color_t (*blend_fp)(lv_color_t, lv_color_t, lv_opa_t);
switch(mode) {
case LV_BLEND_MODE_ADDITIVE:
@ -775,7 +767,6 @@ LV_ATTRIBUTE_FAST_MEM static void map_normal(const lv_area_t * disp_area, lv_col
blit.src_area.x2 = blit.src_area.x1 + draw_area_w;
blit.src_area.y2 = blit.src_area.y1 + draw_area_h;
blit.dst = disp_buf;
blit.dst_width = lv_area_get_width(disp_area);
blit.dst_height = lv_area_get_height(disp_area);
@ -826,7 +817,6 @@ LV_ATTRIBUTE_FAST_MEM static void map_normal(const lv_area_t * disp_area, lv_col
blit.src_area.x2 = blit.src_area.x1 + draw_area_w;
blit.src_area.y2 = blit.src_area.y1 + draw_area_h;
blit.dst = disp_buf;
blit.dst_width = lv_area_get_width(disp_area);
blit.dst_height = lv_area_get_height(disp_area);

1
src/lv_draw/lv_draw_blend.h
View File

@ -42,7 +42,6 @@ typedef uint8_t lv_blend_mode_t;
LV_ATTRIBUTE_FAST_MEM void _lv_blend_fill(const lv_area_t * clip_area, const lv_area_t * fill_area, lv_color_t color,
lv_opa_t * mask, lv_draw_mask_res_t mask_res, lv_opa_t opa, lv_blend_mode_t mode);
LV_ATTRIBUTE_FAST_MEM void _lv_blend_map(const lv_area_t * clip_area, const lv_area_t * map_area,
const lv_color_t * map_buf,
lv_opa_t * mask, lv_draw_mask_res_t mask_res, lv_opa_t opa, lv_blend_mode_t mode);

4
src/lv_draw/lv_draw_img.c
View File

@ -313,7 +313,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_res_t lv_img_draw_core(const lv_area_t * coords,
return LV_RES_INV;
}
lv_draw_map(&line, &mask_line, buf, draw_dsc, chroma_keyed, alpha_byte);
line.y1++;
line.y2++;
@ -512,7 +511,6 @@ LV_ATTRIBUTE_FAST_MEM static void lv_draw_map(const lv_area_t * map_area, const
mask_res = (alpha_byte || chroma_key || draw_dsc->angle ||
draw_dsc->zoom != LV_IMG_ZOOM_NONE) ? LV_DRAW_MASK_RES_CHANGED : LV_DRAW_MASK_RES_FULL_COVER;
/*Prepare the `mask_buf`if there are other masks*/
if(other_mask_cnt) {
_lv_memset_ff(mask_buf, mask_buf_size);
@ -532,7 +530,6 @@ LV_ATTRIBUTE_FAST_MEM static void lv_draw_map(const lv_area_t * map_area, const
#endif
for(x = 0; x < draw_area_w; x++, map_px += px_size_byte, px_i++) {
#if LV_USE_IMG_TRANSFORM
if(transform) {
@ -663,4 +660,3 @@ static void draw_cleanup(lv_img_cache_entry_t * cache)
LV_UNUSED(cache);
#endif
}

1
src/lv_draw/lv_draw_img.h
View File

@ -88,7 +88,6 @@ bool lv_img_cf_is_chroma_keyed(lv_img_cf_t cf);
*/
bool lv_img_cf_has_alpha(lv_img_cf_t cf);
#ifdef __cplusplus
} /* extern "C" */
#endif

9
src/lv_draw/lv_draw_label.c
View File

@ -41,7 +41,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_letter_normal(lv_coord_t pos_x, lv_coord_
static void draw_letter_subpx(lv_coord_t pos_x, lv_coord_t pos_y, lv_font_glyph_dsc_t * g, const lv_area_t * clip_area,
const uint8_t * map_p, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode);
static uint8_t hex_char_to_num(char hex);
/**********************
@ -129,7 +128,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area
bool clip_ok = _lv_area_intersect(&clipped_area, coords, mask);
if(!clip_ok) return;
if((dsc->flag & LV_TXT_FLAG_EXPAND) == 0) {
/*Normally use the label's width as width*/
w = lv_area_get_width(coords);
@ -232,7 +230,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area
lv_color_t recolor;
int32_t letter_w;
lv_draw_rect_dsc_t draw_dsc_sel;
lv_draw_rect_dsc_init(&draw_dsc_sel);
draw_dsc_sel.bg_color = dsc->sel_bg_color;
@ -389,7 +386,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area
* STATIC FUNCTIONS
**********************/
/**
* Draw a letter in the Virtual Display Buffer
* @param pos_p left-top coordinate of the latter
@ -437,7 +433,6 @@ LV_ATTRIBUTE_FAST_MEM static void lv_draw_letter(const lv_point_t * pos_p, const
return;
}
const uint8_t * map_p = lv_font_get_glyph_bitmap(font_p, letter);
if(map_p == NULL) {
LV_LOG_WARN("lv_draw_letter: character's bitmap not found");
@ -452,7 +447,6 @@ LV_ATTRIBUTE_FAST_MEM static void lv_draw_letter(const lv_point_t * pos_p, const
}
}
LV_ATTRIBUTE_FAST_MEM static void draw_letter_normal(lv_coord_t pos_x, lv_coord_t pos_y, lv_font_glyph_dsc_t * g,
const lv_area_t * clip_area,
const uint8_t * map_p, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode)
@ -569,7 +563,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_letter_normal(lv_coord_t pos_x, lv_coord_
mask_p++;
}
/*Apply masks if any*/
if(other_mask_cnt) {
lv_draw_mask_res_t mask_res = lv_draw_mask_apply(mask_buf + mask_p_start, fill_area.x1, fill_area.y2,
@ -647,7 +640,6 @@ static void draw_letter_subpx(lv_coord_t pos_x, lv_coord_t pos_y, lv_font_glyph_
int32_t box_h = g->box_h;
int32_t width_bit = box_w * bpp; /*Letter width in bits*/
/* Calculate the col/row start/end on the map*/
int32_t col_start = pos_x >= clip_area->x1 ? 0 : (clip_area->x1 - pos_x) * 3;
int32_t col_end = pos_x + box_w / 3 <= clip_area->x2 ? box_w : (clip_area->x2 - pos_x + 1) * 3;
@ -817,7 +809,6 @@ static void draw_letter_subpx(lv_coord_t pos_x, lv_coord_t pos_y, lv_font_glyph_
#endif
}
/**
* Convert a hexadecimal characters to a number (0..15)
* @param hex Pointer to a hexadecimal character (0..9, A..F)

3
src/lv_draw/lv_draw_line.c
View File

@ -83,7 +83,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_line(const lv_point_t * point1, const lv_poin
else if(point1->x == point2->x) draw_line_ver(point1, point2, &clip_line, dsc);
else draw_line_skew(point1, point2, &clip_line, dsc);
if(dsc->round_end || dsc->round_start) {
lv_draw_rect_dsc_t cir_dsc;
lv_draw_rect_dsc_init(&cir_dsc);
@ -217,7 +216,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_line_hor(const lv_point_t * point1, const
}
}
LV_ATTRIBUTE_FAST_MEM static void draw_line_ver(const lv_point_t * point1, const lv_point_t * point2,
const lv_area_t * clip,
const lv_draw_line_dsc_t * dsc)
@ -312,7 +310,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_line_ver(const lv_point_t * point1, const
}
}
LV_ATTRIBUTE_FAST_MEM static void draw_line_skew(const lv_point_t * point1, const lv_point_t * point2,
const lv_area_t * clip,
const lv_draw_line_dsc_t * dsc)

1
src/lv_draw/lv_draw_line.h
View File

@ -51,7 +51,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_line(const lv_point_t * point1, const lv_poin
LV_ATTRIBUTE_FAST_MEM void lv_draw_line_dsc_init(lv_draw_line_dsc_t * dsc);
//! @endcond
/**********************

15
src/lv_draw/lv_draw_mask.c
View File

@ -284,7 +284,6 @@ void lv_draw_mask_line_angle_init(lv_draw_mask_line_param_t * param, lv_coord_t
* Find the degree which keeps the origo in place */
if(angle > 180) angle -= 180; /*> 180 will swap the origo*/
int32_t p2x;
int32_t p2y;
@ -294,7 +293,6 @@ void lv_draw_mask_line_angle_init(lv_draw_mask_line_param_t * param, lv_coord_t
lv_draw_mask_line_points_init(param, p1x, py, p2x, p2y, side);
}
/**
* Initialize an angle mask.
* @param param pointer to a `lv_draw_mask_param_t` to initialize
@ -360,7 +358,6 @@ void lv_draw_mask_angle_init(lv_draw_mask_angle_param_t * param, lv_coord_t vert
lv_draw_mask_line_angle_init(&param->end_line, vertex_x, vertex_y, end_angle, end_side);
}
/**
* Initialize a fade mask.
* @param param param pointer to a `lv_draw_mask_param_t` to initialize
@ -385,7 +382,6 @@ void lv_draw_mask_radius_init(lv_draw_mask_radius_param_t * param, const lv_area
param->y_prev_x.i = 0;
}
/**
* Initialize a fade mask.
* @param param pointer to a `lv_draw_mask_param_t` to initialize
@ -408,7 +404,6 @@ void lv_draw_mask_fade_init(lv_draw_mask_fade_param_t * param, const lv_area_t *
param->dsc.type = LV_DRAW_MASK_TYPE_FADE;
}
/**
* Initialize a map mask.
* @param param pointer to a `lv_draw_mask_param_t` to initialize
@ -423,7 +418,6 @@ void lv_draw_mask_map_init(lv_draw_mask_map_param_t * param, const lv_area_t * c
param->dsc.type = LV_DRAW_MASK_TYPE_MAP;
}
/**********************
* STATIC FUNCTIONS
**********************/
@ -573,7 +567,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t line_mask_flat(lv_opa_t * mask_b
if(k >= len) break;
}
if(k < len && k >= 0) {
int32_t x_inters = (px_h * p->xy_steep) >> 10;
m = (x_inters * px_h) >> 9;
@ -582,7 +575,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t line_mask_flat(lv_opa_t * mask_b
mask_buf[k] = mask_mix(mask_buf[k], m);
}
if(p->inv) {
k = xei - abs_x;
if(k > len) {
@ -747,7 +739,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t line_mask_steep(lv_opa_t * mask_
return LV_DRAW_MASK_RES_CHANGED;
}
LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_angle(lv_opa_t * mask_buf, lv_coord_t abs_x,
lv_coord_t abs_y, lv_coord_t len,
lv_draw_mask_angle_param_t * p)
@ -755,7 +746,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_angle(lv_opa_t * ma
int32_t rel_y = abs_y - p->cfg.vertex_p.y;
int32_t rel_x = abs_x - p->cfg.vertex_p.x;
if(p->cfg.start_angle < 180 && p->cfg.end_angle < 180 &&
p->cfg.start_angle != 0 && p->cfg.end_angle != 0 &&
p->cfg.start_angle > p->cfg.end_angle) {
@ -768,7 +758,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_angle(lv_opa_t * ma
int32_t end_angle_first = (rel_y * p->end_line.xy_steep) >> 10;
int32_t start_angle_last = ((rel_y + 1) * p->start_line.xy_steep) >> 10;
/*Do not let the line end cross the vertex else it will affect the opposite part*/
if(p->cfg.start_angle > 270 && p->cfg.start_angle <= 359 && start_angle_last < 0) start_angle_last = 0;
else if(p->cfg.start_angle > 0 && p->cfg.start_angle <= 90 && start_angle_last < 0) start_angle_last = 0;
@ -778,7 +767,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_angle(lv_opa_t * ma
else if(p->cfg.end_angle > 0 && p->cfg.end_angle <= 90 && start_angle_last < 0) start_angle_last = 0;
else if(p->cfg.end_angle > 90 && p->cfg.end_angle < 270 && start_angle_last > 0) start_angle_last = 0;
int32_t dist = (end_angle_first - start_angle_last) >> 1;
lv_draw_mask_res_t res1 = LV_DRAW_MASK_RES_FULL_COVER;
@ -1139,7 +1127,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_radius(lv_opa_t * m
return LV_DRAW_MASK_RES_CHANGED;
}
LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_fade(lv_opa_t * mask_buf, lv_coord_t abs_x,
lv_coord_t abs_y, lv_coord_t len,
lv_draw_mask_fade_param_t * p)
@ -1200,7 +1187,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_map(lv_opa_t * mask
const lv_opa_t * map_tmp = p->cfg.map;
map_tmp += (abs_y - p->cfg.coords.y1) * lv_area_get_width(&p->cfg.coords);
if(abs_x + len > p->cfg.coords.x2) len -= abs_x + len - p->cfg.coords.x2 - 1;
if(abs_x < p->cfg.coords.x1) {
@ -1221,7 +1207,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_map(lv_opa_t * mask
return LV_DRAW_MASK_RES_CHANGED;
}
LV_ATTRIBUTE_FAST_MEM static inline lv_opa_t mask_mix(lv_opa_t mask_act, lv_opa_t mask_new)
{
if(mask_new >= LV_OPA_MAX) return mask_act;

5
src/lv_draw/lv_draw_mask.h
View File

@ -36,7 +36,6 @@ enum {
typedef uint8_t lv_draw_mask_res_t;
enum {
LV_DRAW_MASK_TYPE_LINE,
LV_DRAW_MASK_TYPE_ANGLE,
@ -102,7 +101,6 @@ typedef struct {
/*1: It's a flat line? (Near to horizontal)*/
uint8_t flat : 1;
/* Invert the mask. The default is: Keep the left part.
* It is used to select left/right/top/bottom*/
uint8_t inv: 1;
@ -181,7 +179,6 @@ typedef _lv_draw_mask_saved_t _lv_draw_mask_saved_arr_t[_LV_MASK_MAX_NUM];
*/
int16_t lv_draw_mask_add(void * param, void * custom_id);
//! @cond Doxygen_Suppress
/**
@ -198,7 +195,6 @@ int16_t lv_draw_mask_add(void * param, void * custom_id);
LV_ATTRIBUTE_FAST_MEM lv_draw_mask_res_t lv_draw_mask_apply(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y,
lv_coord_t len);
//! @endcond
/**
@ -225,7 +221,6 @@ void * lv_draw_mask_remove_custom(void * custom_id);
*/
LV_ATTRIBUTE_FAST_MEM uint8_t lv_draw_mask_get_cnt(void);
//! @endcond
/**

8
src/lv_draw/lv_draw_rect.c
View File

@ -245,7 +245,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_bg(const lv_area_t * coords, const lv_are
lv_draw_mask_res_t mask_res = LV_DRAW_MASK_RES_FULL_COVER;
lv_color_t grad_color = dsc->bg_color;
lv_color_t * grad_map = NULL;
/*In case of horizontal gradient pre-compute a line with a gradient*/
if(grad_dir == LV_GRAD_DIR_HOR) {
@ -330,7 +329,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_bg(const lv_area_t * coords, const lv_are
_lv_blend_fill(clip, &fill_area2,
grad_color, mask_buf + mask_ofs, mask_res, opa2, dsc->bg_blend_mode);
}
else {
if(grad_dir == LV_GRAD_DIR_HOR) {
@ -363,7 +361,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_bg(const lv_area_t * coords, const lv_are
if(fill_area.y1 <= fill_area.y2) fill_area.y1 = fill_area.y2 + 1; /*Avoid overdrawing the last line*/
fill_area.y2 = coords_bg.y2;
_lv_blend_fill(clip, &fill_area,
dsc->bg_color, NULL, LV_DRAW_MASK_RES_FULL_COVER, opa, dsc->bg_blend_mode);
@ -589,7 +586,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_shadow(const lv_area_t * coords, const lv
short_side = LV_MATH_MIN(lv_area_get_width(&sh_rect_area), lv_area_get_height(&sh_rect_area));
if(r_sh > short_side >> 1) r_sh = short_side >> 1;
int32_t corner_size = sw + r_sh;
lv_opa_t * sh_buf;
@ -916,7 +912,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_shadow(const lv_area_t * coords, const lv
}
}
/*Fill the bottom side*/
a.x1 = sh_area.x1 + corner_size;
a.x2 = sh_area.x2 - corner_size;
@ -1289,7 +1284,6 @@ static void draw_pattern(const lv_area_t * coords, const lv_area_t * clip, const
}
#endif
#if LV_USE_VALUE_STR
static void draw_value_str(const lv_area_t * coords, const lv_area_t * clip, const lv_draw_rect_dsc_t * dsc)
{
@ -1483,7 +1477,6 @@ static void draw_full_border(const lv_area_t * area_inner, const lv_area_t * are
if(mask_ofs < 0) mask_ofs = 0;
_lv_blend_fill(clip, &fill_area2, color, mask_buf + mask_ofs, mask_res, opa, blend_mode);
fill_area.y1++;
fill_area.y2++;
}
@ -1523,4 +1516,3 @@ static void draw_full_border(const lv_area_t * area_inner, const lv_area_t * are
lv_draw_mask_remove_id(mask_rout_id);
_lv_mem_buf_release(mask_buf);
}

1
src/lv_draw/lv_draw_triangle.c
View File

@ -125,7 +125,6 @@ void lv_draw_polygon(const lv_point_t points[], uint16_t point_cnt, const lv_are
i_next_right = y_min_i + 1;
if(i_next_right > point_cnt - 1) i_next_right = 0;
/* Check if the order of points is inverted or not.
* The normal case is when the left point is on `y_min_i - 1`
* Explanation:

4
src/lv_draw/lv_img_buf.c
View File

@ -38,7 +38,6 @@
* GLOBAL FUNCTIONS
**********************/
/**
* Get the color of an image's pixel
* @param dsc an image descriptor
@ -411,7 +410,6 @@ uint32_t lv_img_buf_get_img_size(lv_coord_t w, lv_coord_t h, lv_img_cf_t cf)
}
}
#if LV_USE_IMG_TRANSFORM
/**
* Initialize a descriptor to transform an image
@ -485,7 +483,6 @@ void _lv_img_buf_get_transformed_area(lv_area_t * res, lv_coord_t w, lv_coord_t
return;
}
res->x1 = (((-pivot->x) * zoom) >> 8) - 1;
res->y1 = (((-pivot->y) * zoom) >> 8) - 1;
res->x2 = (((w - pivot->x) * zoom) >> 8) + 2;
@ -683,4 +680,3 @@ bool _lv_img_buf_transform_anti_alias(lv_img_transform_dsc_t * dsc)
/**********************
* STATIC FUNCTIONS
**********************/

6
src/lv_draw/lv_img_buf.h
View File

@ -17,7 +17,6 @@ extern "C" {
#include "../lv_misc/lv_color.h"
#include "../lv_misc/lv_area.h"
/*********************
* DEFINES
*********************/
@ -101,7 +100,6 @@ enum {
};
typedef uint8_t lv_img_cf_t;
/**
* LVGL image header
*/
@ -120,7 +118,6 @@ typedef struct {
non-printable character*/
uint32_t cf : 5; /* Color format: See `lv_img_color_format_t`*/
} lv_img_header_t;
#else
typedef struct {
@ -163,7 +160,6 @@ typedef struct {
lv_opa_t opa;
} res;
struct {
lv_img_dsc_t img_dsc;
int32_t pivot_x_256;
@ -269,7 +265,6 @@ void lv_img_buf_free(lv_img_dsc_t * dsc);
*/
uint32_t lv_img_buf_get_img_size(lv_coord_t w, lv_coord_t h, lv_img_cf_t cf);
#if LV_USE_IMG_TRANSFORM
/**
* Initialize a descriptor to rotate an image
@ -283,7 +278,6 @@ void _lv_img_buf_transform_init(lv_img_transform_dsc_t * dsc);
*/
bool _lv_img_buf_transform_anti_alias(lv_img_transform_dsc_t * dsc);
/**
* Get which color and opa would come to a pixel if it were rotated
* @param dsc a descriptor initialized by `lv_img_buf_rotate_init`

2
src/lv_draw/lv_img_decoder.c
View File

@ -432,7 +432,6 @@ lv_res_t lv_img_decoder_built_in_open(lv_img_decoder_t * decoder, lv_img_decoder
/*The palette begins in the beginning of the image data. Just point to it.*/
lv_color32_t * palette_p = (lv_color32_t *)((lv_img_dsc_t *)dsc->src)->data;
uint32_t i;
for(i = 0; i < palette_size; i++) {
user_data->palette[i] = lv_color_make(palette_p[i].ch.red, palette_p[i].ch.green, palette_p[i].ch.blue);
@ -537,7 +536,6 @@ void lv_img_decoder_built_in_close(lv_img_decoder_t * decoder, lv_img_decoder_ds
}
}
/**********************
* STATIC FUNCTIONS
**********************/

2
src/lv_font/lv_font.h
View File

@ -43,7 +43,6 @@ typedef struct {
uint8_t bpp; /**< Bit-per-pixel: 1, 2, 4, 8*/
} lv_font_glyph_dsc_t;
/** The bitmaps might be upscaled by 3 to achieve subpixel rendering. */
enum {
LV_FONT_SUBPX_NONE,
@ -75,7 +74,6 @@ typedef struct _lv_font_struct {
lv_font_user_data_t user_data; /**< Custom user data for font. */
#endif
} lv_font_t;
/**********************

5
src/lv_font/lv_font_dejavu_16_persian_hebrew.c
View File

@ -5818,7 +5818,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -6508,8 +6507,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
}
};
/*--------------------
* ALL CUSTOM DATA
*--------------------*/
@ -6527,7 +6524,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -6549,4 +6545,3 @@ lv_font_t lv_font_dejavu_16_persian_hebrew = {
};
#endif /*#if LV_FONT_DEJAVU_16_PERSIAN_HEBREW*/

2
src/lv_font/lv_font_fmt_txt.c
View File

@ -199,7 +199,6 @@ void _lv_font_clean_up_fmt_txt(void)
}
}
/**********************
* STATIC FUNCTIONS
**********************/
@ -557,7 +556,6 @@ static inline uint8_t rle_next(void)
rle_state = RLE_STATE_SINGLE;
}
}
else if(rle_state == RLE_STATE_COUNTER) {
ret = rle_prev_v;

4
src/lv_font/lv_font_fmt_txt.h
View File

@ -45,7 +45,6 @@ typedef struct {
#endif
} lv_font_fmt_txt_glyph_dsc_t;
/** Format of font character map. */
enum {
LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY,
@ -56,7 +55,6 @@ enum {
typedef uint8_t lv_font_fmt_txt_cmap_type_t;
/* Map codepoints to a `glyph_dsc`s
* Several formats are supported to optimize memory usage
* See https://github.com/lvgl/lv_font_conv/blob/master/doc/font_spec.md
@ -145,7 +143,6 @@ typedef struct {
uint8_t right_class_cnt;
} lv_font_fmt_txt_kern_classes_t;
/** Bitmap formats*/
typedef enum {
LV_FONT_FMT_TXT_PLAIN = 0,
@ -153,7 +150,6 @@ typedef enum {
LV_FONT_FMT_TXT_COMPRESSED_NO_PREFILTER = 1,
} lv_font_fmt_txt_bitmap_format_t;
/*Describe store additional data for fonts */
typedef struct {
/*The bitmaps of all glyphs*/

6
src/lv_font/lv_font_loader.c
View File

@ -16,7 +16,6 @@
#if LV_USE_FILESYSTEM
/**********************
* TYPEDEFS
**********************/
@ -61,7 +60,6 @@ typedef struct cmap_table_bin {
uint8_t padding;
} cmap_table_bin_t;
/**********************
* STATIC PROTOTYPES
**********************/
@ -72,7 +70,6 @@ int32_t load_kern(lv_fs_file_t * fp, lv_font_fmt_txt_dsc_t * font_dsc, uint8_t f
static int read_bits_signed(bit_iterator_t * it, int n_bits, lv_fs_res_t * res);
static int read_bits(bit_iterator_t * it, int n_bits, lv_fs_res_t * res);
/**********************
* MACROS
**********************/
@ -116,7 +113,6 @@ lv_font_t * lv_font_load(const char * font_name)
return font;
}
/**
* Frees the memory allocated by the `lv_font_load()` function
* @param font lv_font_t object created by the lv_font_load function
@ -185,7 +181,6 @@ void lv_font_free(lv_font_t * font)
}
}
/**********************
* STATIC FUNCTIONS
**********************/
@ -691,4 +686,3 @@ int32_t load_kern(lv_fs_file_t * fp, lv_font_fmt_txt_dsc_t * font_dsc, uint8_t f
}
#endif /*LV_USE_FILESYSTEM*/

7
src/lv_font/lv_font_montserrat_10.c
View File

@ -947,7 +947,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -1141,7 +1140,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] = {
0, 0, 1, 2, 0, 3, 4, 5,
@ -1568,7 +1566,6 @@ static const int8_t kern_class_values[] = {
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes = {
.class_pair_values = kern_class_values,
@ -1595,7 +1592,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -1616,7 +1612,4 @@ lv_font_t lv_font_montserrat_10 = {
.dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
};
#endif /*#if LV_FONT_MONTSERRAT_10*/

5
src/lv_font/lv_font_montserrat_12.c
View File

@ -1201,7 +1201,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -1396,7 +1395,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -1826,7 +1824,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -1854,7 +1851,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -1876,4 +1872,3 @@ lv_font_t lv_font_montserrat_12 = {
};
#endif /*#if LV_FONT_MONTSERRAT_12*/

5
src/lv_font/lv_font_montserrat_12_subpx.c
View File

@ -1201,7 +1201,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -1396,7 +1395,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -1826,7 +1824,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -1854,7 +1851,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -1876,4 +1872,3 @@ lv_font_t lv_font_montserrat_12_subpx = {
};
#endif /*#if LV_FONT_MONTSERRAT_12_SUBPX*/

5
src/lv_font/lv_font_montserrat_14.c
View File

@ -1470,7 +1470,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -1665,7 +1664,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -2095,7 +2093,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -2123,7 +2120,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -2145,4 +2141,3 @@ lv_font_t lv_font_montserrat_14 = {
};
#endif /*#if LV_FONT_MONTSERRAT_14*/

5
src/lv_font/lv_font_montserrat_16.c
View File

@ -1733,7 +1733,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -1928,7 +1927,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -2358,7 +2356,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -2386,7 +2383,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -2408,4 +2404,3 @@ lv_font_t lv_font_montserrat_16 = {
};
#endif /*#if LV_FONT_MONTSERRAT_16*/

5
src/lv_font/lv_font_montserrat_18.c
View File

@ -2122,7 +2122,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -2317,7 +2316,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -2747,7 +2745,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -2775,7 +2772,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -2797,4 +2793,3 @@ lv_font_t lv_font_montserrat_18 = {
};
#endif /*#if LV_FONT_MONTSERRAT_18*/

5
src/lv_font/lv_font_montserrat_20.c
View File

@ -2468,7 +2468,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -2663,7 +2662,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -3093,7 +3091,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -3121,7 +3118,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -3143,4 +3139,3 @@ lv_font_t lv_font_montserrat_20 = {
};
#endif /*#if LV_FONT_MONTSERRAT_20*/

5
src/lv_font/lv_font_montserrat_22.c
View File

@ -2885,7 +2885,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -3080,7 +3079,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -3510,7 +3508,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -3538,7 +3535,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -3560,4 +3556,3 @@ lv_font_t lv_font_montserrat_22 = {
};
#endif /*#if LV_FONT_MONTSERRAT_22*/

5
src/lv_font/lv_font_montserrat_24.c
View File

@ -3286,7 +3286,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -3481,7 +3480,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -3911,7 +3909,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -3939,7 +3936,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -3961,4 +3957,3 @@ lv_font_t lv_font_montserrat_24 = {
};
#endif /*#if LV_FONT_MONTSERRAT_24*/

5
src/lv_font/lv_font_montserrat_26.c
View File

@ -3806,7 +3806,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -4001,7 +4000,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -4431,7 +4429,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -4459,7 +4456,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -4481,4 +4477,3 @@ lv_font_t lv_font_montserrat_26 = {
};
#endif /*#if LV_FONT_MONTSERRAT_26*/

5
src/lv_font/lv_font_montserrat_28.c
View File

@ -4340,7 +4340,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -4535,7 +4534,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -4965,7 +4963,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -4993,7 +4990,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -5015,4 +5011,3 @@ lv_font_t lv_font_montserrat_28 = {
};
#endif /*#if LV_FONT_MONTSERRAT_28*/

5
src/lv_font/lv_font_montserrat_28_compressed.c
View File

@ -2530,7 +2530,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0xff, 0x3a, 0xba, 0x40, 0x3f, 0xf9, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -2725,7 +2724,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -3155,7 +3153,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -3183,7 +3180,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 1
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -3205,4 +3201,3 @@ lv_font_t lv_font_montserrat_28_compressed = {
};
#endif /*#if LV_FONT_MONTSERRAT_28_COMPRESSED*/

5
src/lv_font/lv_font_montserrat_30.c
View File

@ -4906,7 +4906,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -5101,7 +5100,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -5531,7 +5529,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -5559,7 +5556,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -5581,4 +5577,3 @@ lv_font_t lv_font_montserrat_30 = {
};
#endif /*#if LV_FONT_MONTSERRAT_30*/

5
src/lv_font/lv_font_montserrat_32.c
View File

@ -5383,7 +5383,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -5578,7 +5577,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -6008,7 +6006,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -6036,7 +6033,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -6058,4 +6054,3 @@ lv_font_t lv_font_montserrat_32 = {
};
#endif /*#if LV_FONT_MONTSERRAT_32*/

5
src/lv_font/lv_font_montserrat_34.c
View File

@ -6160,7 +6160,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -6355,7 +6354,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -6785,7 +6783,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -6813,7 +6810,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -6835,4 +6831,3 @@ lv_font_t lv_font_montserrat_34 = {
};
#endif /*#if LV_FONT_MONTSERRAT_34*/

5
src/lv_font/lv_font_montserrat_36.c
View File

@ -6787,7 +6787,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -6982,7 +6981,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -7412,7 +7410,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -7440,7 +7437,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -7462,4 +7458,3 @@ lv_font_t lv_font_montserrat_36 = {
};
#endif /*#if LV_FONT_MONTSERRAT_36*/

5
src/lv_font/lv_font_montserrat_38.c
View File

@ -7510,7 +7510,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -7705,7 +7704,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -8135,7 +8133,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -8163,7 +8160,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -8185,4 +8181,3 @@ lv_font_t lv_font_montserrat_38 = {
};
#endif /*#if LV_FONT_MONTSERRAT_38*/

5
src/lv_font/lv_font_montserrat_40.c
View File

@ -8342,7 +8342,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -8537,7 +8536,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -8967,7 +8965,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -8995,7 +8992,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -9017,4 +9013,3 @@ lv_font_t lv_font_montserrat_40 = {
};
#endif /*#if LV_FONT_MONTSERRAT_40*/

5
src/lv_font/lv_font_montserrat_42.c
View File

@ -9160,7 +9160,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -9355,7 +9354,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -9785,7 +9783,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -9813,7 +9810,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -9835,4 +9831,3 @@ lv_font_t lv_font_montserrat_42 = {
};
#endif /*#if LV_FONT_MONTSERRAT_42*/

5
src/lv_font/lv_font_montserrat_44.c
View File

@ -9960,7 +9960,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -10155,7 +10154,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -10585,7 +10583,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -10613,7 +10610,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -10635,4 +10631,3 @@ lv_font_t lv_font_montserrat_44 = {
};
#endif /*#if LV_FONT_MONTSERRAT_44*/

5
src/lv_font/lv_font_montserrat_46.c
View File

@ -10889,7 +10889,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -11084,7 +11083,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -11514,7 +11512,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -11542,7 +11539,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -11564,4 +11560,3 @@ lv_font_t lv_font_montserrat_46 = {
};
#endif /*#if LV_FONT_MONTSERRAT_46*/

5
src/lv_font/lv_font_montserrat_48.c
View File

@ -11571,7 +11571,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -11766,7 +11765,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] =
{
@ -12196,7 +12194,6 @@ static const int8_t kern_class_values[] =
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes =
{
@ -12224,7 +12221,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -12246,4 +12242,3 @@ lv_font_t lv_font_montserrat_48 = {
};
#endif /*#if LV_FONT_MONTSERRAT_48*/

7
src/lv_font/lv_font_montserrat_8.c
View File

@ -739,7 +739,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -933,7 +932,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
* KERNING
*----------------*/
/*Map glyph_ids to kern left classes*/
static const uint8_t kern_left_class_mapping[] = {
0, 0, 1, 2, 0, 3, 4, 5,
@ -1360,7 +1358,6 @@ static const int8_t kern_class_values[] = {
0, 0, 0, 0, 0
};
/*Collect the kern class' data in one place*/
static const lv_font_fmt_txt_kern_classes_t kern_classes = {
.class_pair_values = kern_class_values,
@ -1387,7 +1384,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -1408,7 +1404,4 @@ lv_font_t lv_font_montserrat_8 = {
.dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
};
#endif /*#if LV_FONT_MONTSERRAT_8*/

5
src/lv_font/lv_font_simsun_16_cjk.c
View File

@ -12639,7 +12639,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0x0, 0x0, 0x0, 0x0, 0x0, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -13559,8 +13558,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
}
};
/*--------------------
* ALL CUSTOM DATA
*--------------------*/
@ -13578,7 +13575,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -13600,4 +13596,3 @@ lv_font_t lv_font_simsun_16_cjk = {
};
#endif /*#if LV_FONT_SIMSUN_16_CJK*/

8
src/lv_font/lv_font_unscii_16.c
View File

@ -471,7 +471,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0xc0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -580,8 +579,6 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
* CHARACTER MAPPING
*--------------------*/
/*Collect the unicode lists and glyph_id offsets*/
static const lv_font_fmt_txt_cmap_t cmaps[] = {
{
@ -590,8 +587,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
}
};
/*--------------------
* ALL CUSTOM DATA
*--------------------*/
@ -609,7 +604,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -630,6 +624,4 @@ lv_font_t lv_font_unscii_16 = {
.dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
};
#endif /*#if LV_FONT_UNSCII_16*/

8
src/lv_font/lv_font_unscii_8.c
View File

@ -307,7 +307,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
0xc1, 0x42, 0xbd, 0x2c, 0x40, 0x81, 0x0
};
/*---------------------
* GLYPH DESCRIPTION
*--------------------*/
@ -416,8 +415,6 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
* CHARACTER MAPPING
*--------------------*/
/*Collect the unicode lists and glyph_id offsets*/
static const lv_font_fmt_txt_cmap_t cmaps[] = {
{
@ -426,8 +423,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
}
};
/*--------------------
* ALL CUSTOM DATA
*--------------------*/
@ -445,7 +440,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bitmap_format = 0
};
/*-----------------
* PUBLIC FONT
*----------------*/
@ -466,6 +460,4 @@ lv_font_t lv_font_unscii_8 = {
.dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
};
#endif /*#if LV_FONT_UNSCII_8*/

6
src/lv_font/lv_symbol_def.h
View File

@ -156,10 +156,4 @@ enum {
} /* extern "C" */
#endif
#endif /*LV_SYMBOL_DEF_H*/

4
src/lv_gpu/lv_gpu_nxp_pxp.c
View File

@ -27,7 +27,6 @@
*
*/
/*********************
* INCLUDES
*********************/
@ -60,7 +59,6 @@
#error Only 16bit color depth is supported. Set LV_COLOR_DEPTH to 16.
#endif
/**********************
* TYPEDEFS
**********************/
@ -136,7 +134,6 @@ void lv_gpu_nxp_pxp_deinit(void)
PXP_Deinit(LV_GPU_NXP_PXP_ID);
}
/**
* Fill area, with optional opacity.
*
@ -283,7 +280,6 @@ void lv_gpu_nxp_pxp_blit(lv_color_t * dest, lv_coord_t dest_width, const lv_colo
}
PXP_EnableAlphaSurfaceOverlayColorKey(LV_GPU_NXP_PXP_ID, colorKeyEnabled);
/* Output buffer. */
outputBufferConfig.pixelFormat = (pxp_output_pixel_format_t)PXP_OUT_PIXEL_FORMAT;
outputBufferConfig.interlacedMode = kPXP_OutputProgressive;

4
src/lv_gpu/lv_gpu_nxp_pxp.h
View File

@ -126,8 +126,6 @@ void lv_gpu_nxp_pxp_deinit(void);
void lv_gpu_nxp_pxp_fill(lv_color_t * dest_buf, lv_coord_t dest_width, const lv_area_t * fill_area, lv_color_t color,
lv_opa_t opa);
/**
* @brief BLock Image Transfer - copy rectangular image from src buffer to dst buffer with effects.
*
@ -147,7 +145,6 @@ void lv_gpu_nxp_pxp_fill(lv_color_t * dest_buf, lv_coord_t dest_width, const lv_
void lv_gpu_nxp_pxp_blit(lv_color_t * dest, lv_coord_t dest_width, const lv_color_t * src, lv_coord_t src_width,
lv_coord_t copy_width, lv_coord_t copy_height, lv_opa_t opa);
/**
* @brief Enable color keying for subsequent calls to lv_gpu_nxp_pxp_blit()
*
@ -161,7 +158,6 @@ void lv_gpu_nxp_pxp_enable_color_key(void);
*/
void lv_gpu_nxp_pxp_disable_color_key(void);
/**
* @brief Enable recolor feature for subsequent calls to lv_gpu_nxp_pxp_blit()
*

1
src/lv_gpu/lv_gpu_nxp_pxp_osa.c
View File

@ -43,7 +43,6 @@
#include "semphr.h"
#endif
/*********************
* DEFINES
*********************/

4
src/lv_gpu/lv_gpu_nxp_vglite.c
View File

@ -41,7 +41,6 @@
#include "fsl_cache.h"
#include "vg_lite.h"
/*********************
* DEFINES
*********************/
@ -117,7 +116,6 @@ lv_res_t lv_gpu_nxp_vglite_fill(lv_color_t * dest_buf, lv_coord_t dest_width, lv
}
else { /* fill with transparency */
vg_lite_path_t path;
lv_color32_t colMix;
int16_t path_data[] = { /* VG rectangular path */
@ -129,7 +127,6 @@ lv_res_t lv_gpu_nxp_vglite_fill(lv_color_t * dest_buf, lv_coord_t dest_width, lv
VLC_OP_END
};
err |= vg_lite_init_path(&path, VG_LITE_S16, VG_LITE_LOW, sizeof(path_data), path_data,
fill_area->x1, fill_area->y1, fill_area->x2 + 1, fill_area->y2 + 1);
if(err != VG_LITE_SUCCESS) {
@ -176,7 +173,6 @@ lv_res_t lv_gpu_nxp_vglite_fill(lv_color_t * dest_buf, lv_coord_t dest_width, lv
}
}
/***
* BLock Image Transfer.
* @param[in] blit Description of the transfer

2
src/lv_gpu/lv_gpu_stm32_dma2d.h
View File

@ -52,7 +52,6 @@ void lv_gpu_stm32_dma2d_init(void);
void lv_gpu_stm32_dma2d_fill(lv_color_t * buf, lv_coord_t buf_w, lv_color_t color, lv_coord_t fill_w,
lv_coord_t fill_h);
/**
* Fill an area in the buffer with a color but take into account a mask which describes the opacity of each pixel
* @param buf a buffer which should be filled using a mask
@ -93,7 +92,6 @@ void lv_gpu_stm32_dma2d_copy(lv_color_t * buf, lv_coord_t buf_w, const lv_color_
void lv_gpu_stm32_dma2d_blend(lv_color_t * buf, lv_coord_t buf_w, const lv_color_t * map, lv_opa_t opa,
lv_coord_t map_w, lv_coord_t copy_w, lv_coord_t copy_h);
/**
* Can be used as `gpu_wait_cb` in display driver to
* let the MCU run while the GPU is working

1
src/lv_hal/lv_hal_disp.c
View File

@ -333,7 +333,6 @@ LV_ATTRIBUTE_FLUSH_READY void lv_disp_flush_ready(lv_disp_drv_t * disp_drv)
disp_drv->buffer->flushing_last = 0;
}
/**
* Tell if it's the last area of the refreshing process.
* Can be called from `flush_cb` to execute some special display refreshing if needed when all areas area flushed.

1
src/lv_hal/lv_hal_disp.h
View File

@ -177,7 +177,6 @@ uint8_t del_prev :
uint32_t last_activity_time; /**< Last time there was activity on this display */
} lv_disp_t;
typedef enum {
LV_DISP_SIZE_SMALL,
LV_DISP_SIZE_MEDIUM,

2
src/lv_hal/lv_hal_indev.h
View File

@ -50,7 +50,6 @@ typedef uint8_t lv_indev_type_t;
enum { LV_INDEV_STATE_REL = 0, LV_INDEV_STATE_PR };
typedef uint8_t lv_indev_state_t;
enum {
LV_DRAG_DIR_HOR = 0x1, /**< Object can be dragged horizontally. */
LV_DRAG_DIR_VER = 0x2, /**< Object can be dragged vertically. */
@ -78,7 +77,6 @@ typedef struct {
lv_indev_state_t state; /**< LV_INDEV_STATE_REL or LV_INDEV_STATE_PR*/
} lv_indev_data_t;
/** Initialized by the user and registered by 'lv_indev_add()'*/
typedef struct _lv_indev_drv_t {

1
src/lv_misc/lv_anim.c
View File

@ -351,7 +351,6 @@ lv_anim_value_t lv_anim_path_overshoot(const lv_anim_path_t * path, const lv_ani
return (lv_anim_value_t)new_value;
}
/**
* Calculate the current value of an animation with 3 bounces
* @param a pointer to an animation

6
src/lv_misc/lv_anim.h
View File

@ -43,7 +43,6 @@ typedef lv_coord_t lv_anim_value_t;
#define LV_ANIM_REPEAT_INFINITE 0xFFFF
struct _lv_anim_t;
struct _lv_anim_path_t;
/** Get the current value during an animation*/
@ -54,8 +53,6 @@ typedef struct _lv_anim_path_t {
void * user_data;
} lv_anim_path_t;
/** Generic prototype of "animator" functions.
* First parameter is the variable to animate.
* Second parameter is the value to set.
@ -101,7 +98,6 @@ typedef struct _lv_anim_t {
uint32_t has_run : 1; /**< Indicates the animation has run in this round*/
} lv_anim_t;
/**********************
* GLOBAL PROTOTYPES
**********************/
@ -202,7 +198,6 @@ static inline void lv_anim_set_path(lv_anim_t * a, const lv_anim_path_t * path)
_lv_memcpy_small(&a->path, path, sizeof(lv_anim_path_t));
}
/**
* Set a function call when the animation really starts (considering `delay`)
* @param a pointer to an initialized `lv_anim_t` variable
@ -317,7 +312,6 @@ static inline int32_t lv_anim_get_delay(lv_anim_t * a)
*/
bool lv_anim_del(void * var, lv_anim_exec_xcb_t exec_cb);
/**
* Get the animation of a variable and its `exec_cb`.
* @param var pointer to variable

4
src/lv_misc/lv_area.h
View File

@ -49,8 +49,6 @@ typedef struct {
lv_coord_t y2;
} lv_area_t;
/** Alignments */
enum {
LV_ALIGN_CENTER = 0,
@ -77,7 +75,6 @@ enum {
};
typedef uint8_t lv_align_t;
/**********************
* GLOBAL PROTOTYPES
**********************/
@ -194,7 +191,6 @@ bool _lv_area_is_on(const lv_area_t * a1_p, const lv_area_t * a2_p);
*/
bool _lv_area_is_in(const lv_area_t * ain_p, const lv_area_t * aholder_p, lv_coord_t radius);
/**
* Align an area to an other
* @param base an are where the other will be aligned

3
src/lv_misc/lv_bidi.c
View File

@ -625,7 +625,6 @@ static lv_bidi_dir_t bracket_process(const char * txt, uint32_t next_pos, uint32
}
}
/*There where a previous strong char which can be used*/
if(bracket_dir != LV_BIDI_DIR_NEUTRAL) break;
@ -636,7 +635,6 @@ static lv_bidi_dir_t bracket_process(const char * txt, uint32_t next_pos, uint32
}
}
/*The letter was an opening bracket*/
if(bracket_left[i] != '\0') {
@ -660,5 +658,4 @@ static lv_bidi_dir_t bracket_process(const char * txt, uint32_t next_pos, uint32
return LV_BIDI_DIR_NEUTRAL;
}
#endif /*LV_USE_BIDI*/

2
src/lv_misc/lv_color.c
View File

@ -127,13 +127,11 @@ LV_ATTRIBUTE_FAST_MEM void lv_color_fill(lv_color_t * buf, lv_color_t color, uin
#endif
}
lv_color_t lv_color_lighten(lv_color_t c, lv_opa_t lvl)
{
return lv_color_mix(LV_COLOR_WHITE, c, lvl);
}
lv_color_t lv_color_darken(lv_color_t c, lv_opa_t lvl)
{
return lv_color_mix(LV_COLOR_BLACK, c, lvl);

8
src/lv_misc/lv_color.h
View File

@ -87,7 +87,6 @@ enum {
#error "Invalid LV_COLOR_DEPTH in lv_conf.h! Set it to 1, 8, 16 or 32!"
#endif
/* Adjust color mix functions rounding.
* GPUs might calculate color mix (blending) differently.
* Should be in range of 0..254
@ -150,7 +149,6 @@ enum {
# define LV_COLOR_GET_B32(c) (c).ch.blue
# define LV_COLOR_GET_A32(c) (c).ch.alpha
/*---------------------------------------
* Macros for the current color depth
* to set/get values of the color channels
@ -280,7 +278,6 @@ typedef lv_color32_t lv_color_t;
#error "Invalid LV_COLOR_DEPTH in lv_conf.h! Set it to 1, 8, 16 or 32!"
#endif
typedef struct {
uint16_t h;
uint8_t s;
@ -449,7 +446,6 @@ static inline uint32_t lv_color_to32(lv_color_t color)
#endif
}
//! @cond Doxygen_Suppress
/**
@ -495,7 +491,6 @@ LV_ATTRIBUTE_FAST_MEM static inline void lv_color_premult(lv_color_t c, uint8_t
}
/**
* Mix two colors with a given ratio. It runs faster then `lv_color_mix` but requires some pre computation.
* @param c1 The first color. Should be preprocessed with `lv_color_premult(c1)`
@ -527,7 +522,6 @@ LV_ATTRIBUTE_FAST_MEM static inline lv_color_t lv_color_mix_premult(uint16_t * p
return ret;
}
/**
* Mix two colors. Both color can have alpha value. It requires ARGB888 colors.
* @param bg_color background color
@ -663,7 +657,6 @@ static inline lv_color_t lv_color_hex3(uint32_t c)
(uint8_t)((c & 0xF) | ((c & 0xF) << 4)));
}
//! @cond Doxygen_Suppress
//!
LV_ATTRIBUTE_FAST_MEM void lv_color_fill(lv_color_t * buf, lv_color_t color, uint32_t px_num);
@ -698,7 +691,6 @@ lv_color_hsv_t lv_color_rgb_to_hsv(uint8_t r8, uint8_t g8, uint8_t b8);
*/
lv_color_hsv_t lv_color_to_hsv(lv_color_t color);
/**********************
* MACROS
**********************/

2
src/lv_misc/lv_debug.c
View File

@ -135,6 +135,4 @@ void lv_debug_log_error(const char * msg, uint64_t value)
* STATIC FUNCTIONS
**********************/
#endif /*LV_USE_DEBUG*/

2
src/lv_misc/lv_debug.h
View File

@ -60,7 +60,6 @@ void lv_debug_log_error(const char * msg, uint64_t value);
#define LV_DEBUG_IS_NULL(p) (lv_debug_check_null(p))
#endif
#ifndef LV_DEBUG_CHECK_MEM_INTEGRITY
#define LV_DEBUG_CHECK_MEM_INTEGRITY() (lv_debug_check_mem_integrity())
#endif
@ -112,7 +111,6 @@ void lv_debug_log_error(const char * msg, uint64_t value);
# endif
#endif
#else /* LV_USE_DEBUG == 0 */
#define LV_DEBUG_ASSERT(expr, msg, value) do{}while(0)

1
src/lv_misc/lv_gc.h
View File

@ -45,7 +45,6 @@ extern "C" {
f(void * , _lv_theme_empty_styles) \
f(uint8_t *, _lv_font_decompr_buf) \
#define LV_DEFINE_ROOT(root_type, root_name) root_type root_name;
#define LV_ROOTS LV_ITERATE_ROOTS(LV_DEFINE_ROOT)

Some files were not shown because too many files have changed in this diff Show More