diff --git a/CHANGELOG.md b/CHANGELOG.md index da1ab0b775..edd6f8f64d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,10 @@ ## v7.9.1 (Planned at 19.01.2020 ### Bugfixes -- fix(cpicker) fix division by zero +- fix(cpicker) fix division by zero - fix(dropdown) fix selecting options after the last one - fix(msgbox) use the animation time provided -- fix(gpu_nxp_pxp) fix incorrent define name +- fix(gpu_nxp_pxp) fix incorrect define name - fix(indev) don't leave edit mode if there is only one object in the group @@ -14,7 +14,7 @@ ### New features - feat(chart) add lv_chart_remove_series and lv_chart_hide_series -- feat(img_cahce) allow disabling image cacheing +- feat(img_cahce) allow disabling image caching - calendar: make get_day_of_week() public - Added support for Zephyr integration @@ -56,7 +56,7 @@ - fix reference to LV_DRAW_BUF_MAX_NUM in lv_mem.c - fix(polygon draw) join adjacent points if they are on the same coordinate - fix(linemeter) fix invalidation when setting new value -- fix(table) add missing invalidation when changeing cell type +- fix(table) add missing invalidation when changing cell type - refactor(roller) rename LV_ROLLER_MODE_INIFINITE -> LV_ROLLER_MODE_INFINITE ## v7.7.2 (17.11.2020) @@ -66,7 +66,7 @@ - fix(arc) fix and improve arc dragging - label: Repair calculate back `dot` character logical error which cause infinite loop. - fix(theme_material): remove the bottom border from tabview header -- fix(imgbtn) guess a the closest availabe state with valid src +- fix(imgbtn) guess a the closest available state with valid src - fix(spinbox) update cursor position in lv_spinbox_set_step ## v7.7.1 (03.11.2020) @@ -83,7 +83,7 @@ - Allow max. 16 cell types for table - Add `lv_table_set_text_fmt()` - Use margin on calendar header to set distances and padding to the size of the header -- Add `text_sel_bg` style proeprty +- Add `text_sel_bg` style property ### Bugfixes - Theme update to support text selection background @@ -123,7 +123,7 @@ - Add 10px and 8ox built in fonts ### Bugfixes -- Fix unexpeted DEFOCUS on lv_page when clicking to bg after the scrollable +- Fix unexpected DEFOCUS on lv_page when clicking to bg after the scrollable - Fix `lv_obj_del` and `lv_obj_clean` if the children list changed during deletion. - Adjust button matrix button width to include padding when spanning multiple units. - Add rounding to btnmatrix line height calculation @@ -138,10 +138,10 @@ The main new features of v7.4 are run-time font loading, style caching and arc k ### New features - Add `lv_font_load()` function - Loads a `lv_font_t` object from a binary font file - Add `lv_font_free()` function - Frees the memory allocated by the `lv_font_load()` function -- Add style caching to reduce acces time of properties with default value +- Add style caching to reduce access time of properties with default value - arc: add set value by click feature - arc: add `LV_ARC_PART_KNOB` similarly to slider -- send gestures even if the the obejct was dragged. User can check dragging with `lv_indev_is_dragging(lv_indev_act())` in the event function. +- send gestures event if the object was dragged. User can check dragging with `lv_indev_is_dragging(lv_indev_act())` in the event function. ### Bugfixes - Fix color bleeding on border drawing @@ -225,7 +225,7 @@ The main new features of v7.4 are run-time font loading, style caching and arc k - Add lv_btnmatrix_set/get_align capability - DMA2D: Remove dependency on ST CubeMX HAL - Added `max_used` propriety to `lv_mem_monitor_t` struct -- In `lv_init` test if the the strings are UTF-8 encoded. +- In `lv_init` test if the strings are UTF-8 encoded. - Add `user_data` to themes - Add LV_BIG_ENDIAN_SYSTEM flag to lv_conf.h in order to fix displaying images on big endian systems. - Add inline function lv_checkbox_get_state(const lv_obj_t * cb) to extend the checkbox functionality. @@ -279,7 +279,7 @@ The main new features of v7.4 are run-time font loading, style caching and arc k - Remove memcpy from `lv_ll` (caused issues with some optimization settings) - `lv_chart` fix X tick drawing - Fix vertical dashed line drawing -- Some additonal minor fixes and formattings +- Some additional minor fixes and formattings ## v7.0.0 (18.05.2020) diff --git a/Kconfig b/Kconfig index 865c42e47c..30fbac0701 100644 --- a/Kconfig +++ b/Kconfig @@ -258,7 +258,7 @@ menu "LVGL configuration" menu "Image decoder and cache" config LV_IMG_CF_INDEXED - bool "Enable indexed (pallete) images." + bool "Enable indexed (palette) images." default y if !LV_CONF_MINIMAL config LV_IMG_CF_ALPHA bool "Enable alpha indexed images." diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md index 93d2846784..06509e40d3 100644 --- a/docs/ROADMAP.md +++ b/docs/ROADMAP.md @@ -27,7 +27,7 @@ Planned to November/December 2020 - Simplified File system interface ([feat/new_fs_api](https://github.com/lvgl/lvgl/tree/feat/new-fs-api) branch) to make porting easier - Work in progress - Remove the align parameter from `lv_canvas_draw_text` -- Make the copy paramter obsolate in create functions +- Make the copy parameter obsolate in create functions - Optimize and simplifie styles [#1832](https://github.com/lvgl/lvgl/issues/1832) - Use a more generic inheritenace [#1919](https://github.com/lvgl/lvgl/issues/1919) @@ -39,7 +39,7 @@ Planned to November/December 2020 ## v9 - Simplify `group`s. Discussion is [here](https://forum.lvgl.io/t/lv-group-tabindex/2927/3). - Consider direct binary font format support -- Optimize line and cirle drawing and masking +- Optimize line and circle drawing and masking - Reconsider color format management for run time color format setting, and custom color format usage. (Also [RGB888](https://github.com/lvgl/lvgl/issues/1722)) - 9-patch support for `lv_imgbtn`. - Handle stride. See [#1858](https://github.com/lvgl/lvgl/issues/1858) @@ -51,10 +51,10 @@ Planned to November/December 2020 - lv_mem_alloc_aligned(size, align) - Text node. See [#1701](https://github.com/lvgl/lvgl/issues/1701#issuecomment-699479408) - CPP binding. See [Forum](https://forum.lvgl.io/t/is-it-possible-to-officially-support-optional-cpp-api/2736) -- Optmize font decompression +- Optimize font decompression - Switch to RGBA colors in styles - Need coverage report for tests -- Need static analize (via coverity.io or somehing else) +- Need static analyze (via coverity.io or somehing else) - Support dot_begin and dot_middle long modes for labels - Add new label alignment modes. [#1656](https://github.com/lvgl/lvgl/issues/1656) - Support larger images: [#1892](https://github.com/lvgl/lvgl/issues/1892) diff --git a/examples/porting/lv_port_disp_template.c b/examples/porting/lv_port_disp_template.c index 7d8b449d9f..a4f95fab40 100644 --- a/examples/porting/lv_port_disp_template.c +++ b/examples/porting/lv_port_disp_template.c @@ -55,7 +55,7 @@ void lv_port_disp_init(void) *----------------------------*/ /* LVGL requires a buffer where it internally draws the widgets. - * Later this buffer will passed your display drivers `flush_cb` to copy its content to your dispay. + * Later this buffer will passed your display drivers `flush_cb` to copy its content to your display. * The buffer has to be greater than 1 display row * * There are three buffering configurations: diff --git a/examples/porting/lv_port_fs_template.c b/examples/porting/lv_port_fs_template.c index 6b376042c2..c8f5fe21be 100644 --- a/examples/porting/lv_port_fs_template.c +++ b/examples/porting/lv_port_fs_template.c @@ -80,7 +80,7 @@ void lv_port_fs_init(void) fs_init(); /*--------------------------------------------------- - * Register the file system interface in LVGL + * Register the file system interface in LVGL *--------------------------------------------------*/ /* Add a simple drive to open images */ @@ -117,7 +117,7 @@ void lv_port_fs_init(void) /* Initialize your Storage device and File system. */ static void fs_init(void) { - /*E.g. for FatFS initalize the SD card and FatFS itself*/ + /*E.g. for FatFS initialize the SD card and FatFS itself*/ /*You code here*/ } @@ -262,7 +262,7 @@ static lv_fs_res_t fs_tell (lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p) * Delete a file * @param drv pointer to a driver where this function belongs * @param path path of the file to delete - * @return LV_FS_RES_OK or any error from lv_fs_res_t enum + * @return LV_FS_RES_OK or any error from lv_fs_res_t enum */ static lv_fs_res_t fs_remove (lv_fs_drv_t * drv, const char *path) { diff --git a/lv_conf_template.h b/lv_conf_template.h index e53e97859d..a8f60092fa 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -335,7 +335,7 @@ typedef void * lv_indev_drv_user_data_t; /*Type of user data in the i * If an invalid parameter is found an error log message is printed and * the MCU halts at the error. (`LV_USE_LOG` should be enabled) * If you are debugging the MCU you can pause - * the debugger to see exactly where the issue is. + * the debugger to see exactly where the issue is. * * The behavior of asserts can be overwritten by redefining them here. * E.g. #define LV_ASSERT_MEM(p) @@ -370,7 +370,7 @@ typedef void * lv_indev_drv_user_data_t; /*Type of user data in the i * FONT USAGE *===================*/ -/* The built-in fonts contains the ASCII range and some Symbols with 4 bit-per-pixel. +/* The built-in fonts contains the ASCII range and some Symbols with 4 bit-per-pixel. * The symbols are available via `LV_SYMBOL_...` defines * More info about fonts: https://docs.lvgl.io/v7/en/html/overview/font.html * To create a new font go to: https://lvgl.com/ttf-font-to-c-array diff --git a/scripts/release/com.py b/scripts/release/com.py index 4126c354dd..8a8f4d79d1 100755 --- a/scripts/release/com.py +++ b/scripts/release/com.py @@ -14,7 +14,7 @@ def cmd(c, ask_on_err = True): if r: print("### Error: " + str(r)) if ask_on_err: - input("Press Enter to continue exectution...") + input("Press Enter to continue execution...") def define_set(fn, name, value): print("In " + fn + " set " + name + " to " + value) diff --git a/scripts/release/main.py b/scripts/release/main.py index d22d322345..ba9ab20434 100755 --- a/scripts/release/main.py +++ b/scripts/release/main.py @@ -47,7 +47,7 @@ if __name__ == '__main__': # if(len(sys.argv) != 2): # print("Missing argument. Usage ./release.py bugfix | minor | major") -# print("Use minor by deafult") +# print("Use minor by default") # else: # dev_prepare = sys.argv[1] diff --git a/scripts/release/proj.py b/scripts/release/proj.py index 732c200e59..c28fd3207d 100755 --- a/scripts/release/proj.py +++ b/scripts/release/proj.py @@ -10,7 +10,7 @@ import com def make(repo_path, auto_push = False): os.chdir("./" + repo_path) com.cmd('git checkout master') - print("Upadte lvgl"); + print("Update lvgl"); os.chdir("./lvgl") com.cmd("git checkout master") com.cmd("git pull origin --tags") @@ -37,11 +37,11 @@ def make(repo_path, auto_push = False): com.define_set("lv_conf.h", str(key), str(val)) if os.path.exists("lv_examples"): - print("Upadte lv_examples"); + print("Update lv_examples"); com.cmd("cd lv_examples; git co " + release_br + "; git pull origin " + release_br) if os.path.exists("lv_drivers"): - print("upadte lv_drivers"); + print("update lv_drivers"); com.cmd("cd lv_drivers " + release_br + "; git pull origin " + release_br) msg = 'Update to ' + ver_str diff --git a/src/lv_conf_kconfig.h b/src/lv_conf_kconfig.h index 3c88c60118..6225ed02a4 100644 --- a/src/lv_conf_kconfig.h +++ b/src/lv_conf_kconfig.h @@ -337,9 +337,9 @@ extern "C" { *-----------------*/ #ifndef LV_TEXT_ENC #ifdef CONFIG_LV_TXT_ENC_UTF8 -#define CONFIG_LV_TXT_ENC LV_TXT_ENC_UTF8 +#define CONFIG_LV_TXT_ENC LV_TXT_ENC_UTF8 #elif defined CONFIG_LV_TXT_ENC_ASCII -#define CONFIG_LV_TXT_ENC LV_TXT_ENC_ASCII +#define CONFIG_LV_TXT_ENC LV_TXT_ENC_ASCII #endif #endif @@ -363,11 +363,11 @@ extern "C" { #ifndef LV_USE_EXT_CLICK_AREA #ifdef CONFIG_LV_USE_EXT_CLICK_AREA_OFF -#define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_OFF +#define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_OFF #elif defined CONFIG_LV_USE_EXT_CLICK_AREA_TINY -#define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_TINY +#define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_TINY #elif defined CONFIG_LV_USE_EXT_CLICK_AREA_FULL -#define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_FULL +#define CONFIG_LV_USE_EXT_CLICK_AREA LV_EXT_CLICK_AREA_FULL #endif #endif diff --git a/src/lv_core/lv_disp.c b/src/lv_core/lv_disp.c index aaa8fb1ae3..c88cc9afb9 100644 --- a/src/lv_core/lv_disp.c +++ b/src/lv_core/lv_disp.c @@ -106,7 +106,7 @@ lv_obj_t * lv_disp_get_layer_top(lv_disp_t * disp) /** * Return with the sys. layer. (Same on every screen and it is above the normal screen and the top * layer) - * @param disp pointer to display which sys. layer should be get. (NULL to use the default screen) + * @param disp pointer to display which sys. layer should be get. (NULL to use the default screen) * @return pointer to the sys layer object (transparent screen sized lv_obj) */ lv_obj_t * lv_disp_get_layer_sys(lv_disp_t * disp) diff --git a/src/lv_core/lv_disp.h b/src/lv_core/lv_disp.h index 6353315ece..2206b2f4f7 100644 --- a/src/lv_core/lv_disp.h +++ b/src/lv_core/lv_disp.h @@ -73,7 +73,7 @@ lv_obj_t * lv_disp_get_layer_top(lv_disp_t * disp); /** * Return with the sys. layer. (Same on every screen and it is above the normal screen and the top * layer) - * @param disp pointer to display which sys. layer should be get. (NULL to use the default screen) + * @param disp pointer to display which sys. layer should be get. (NULL to use the default screen) * @return pointer to the sys layer object (transparent screen sized lv_obj) */ lv_obj_t * lv_disp_get_layer_sys(lv_disp_t * disp); @@ -161,7 +161,7 @@ static inline lv_obj_t * lv_scr_act(void) } /** - * Get the top layer of the default display + * Get the top layer of the default display * @return pointer to the top layer */ static inline lv_obj_t * lv_layer_top(void) @@ -171,7 +171,7 @@ static inline lv_obj_t * lv_layer_top(void) /** * Get the active screen of the default display - * @return pointer to the sys layer + * @return pointer to the sys layer */ static inline lv_obj_t * lv_layer_sys(void) { diff --git a/src/lv_core/lv_group.c b/src/lv_core/lv_group.c index ca91a39682..f47494cee1 100644 --- a/src/lv_core/lv_group.c +++ b/src/lv_core/lv_group.c @@ -81,7 +81,7 @@ lv_group_t * lv_group_create(void) */ void lv_group_del(lv_group_t * group) { - /*Defocus the the currently focused object*/ + /*Defocus the currently focused object*/ if(group->obj_focus != NULL) { (*group->obj_focus)->signal_cb(*group->obj_focus, LV_SIGNAL_DEFOCUS, NULL); lv_obj_invalidate(*group->obj_focus); @@ -185,7 +185,7 @@ void lv_group_remove_obj(lv_obj_t * obj) */ void lv_group_remove_all_objs(lv_group_t * group) { - /*Defocus the the currently focused object*/ + /*Defocus the currently focused object*/ if(group->obj_focus != NULL) { (*group->obj_focus)->signal_cb(*group->obj_focus, LV_SIGNAL_DEFOCUS, NULL); lv_obj_invalidate(*group->obj_focus); diff --git a/src/lv_core/lv_indev.c b/src/lv_core/lv_indev.c index 336b377ea6..ed0d3a1523 100644 --- a/src/lv_core/lv_indev.c +++ b/src/lv_core/lv_indev.c @@ -597,7 +597,7 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data) } /* Save the last keys before anything else. - * They need to be already saved if the the function returns for any reason*/ + * They need to be already saved if the function returns for any reason*/ lv_indev_state_t last_state = i->proc.types.keypad.last_state; i->proc.types.keypad.last_state = data->state; i->proc.types.keypad.last_key = data->key; @@ -803,7 +803,7 @@ static void indev_button_proc(lv_indev_t * i, lv_indev_data_t * data) { /* Die gracefully if i->btn_points is NULL */ if(i->btn_points == NULL) { - LV_LOG_WARN("indev_button_proc: btn_points was NULL"); + LV_LOG_WARN("indev_button_proc: btn_points was NULL"); return; } diff --git a/src/lv_core/lv_obj.c b/src/lv_core/lv_obj.c index a03e5cdab9..4efebbb5df 100644 --- a/src/lv_core/lv_obj.c +++ b/src/lv_core/lv_obj.c @@ -385,7 +385,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy) lv_style_list_init(&new_obj->style_list); if(copy == NULL) { if(parent != NULL) lv_theme_apply(new_obj, LV_THEME_OBJ); - else lv_theme_apply(new_obj, LV_THEME_SCR); + else lv_theme_apply(new_obj, LV_THEME_SCR); } else { lv_style_list_copy(&new_obj->style_list, ©->style_list); @@ -1222,7 +1222,7 @@ void lv_obj_remove_style(lv_obj_t * obj, uint8_t part, lv_style_t * style) * Release all used memories and cancel pending related transitions. * Typically used in `LV_SIGN_CLEAN_UP. * @param obj pointer to an object - * @param part the part of the object which style list should be reseted. + * @param part the part of the object which style list should be reset. * E.g. `LV_OBJ_PART_MAIN`, `LV_BTN_PART_MAIN`, `LV_SLIDER_PART_KNOB` */ void lv_obj_clean_style_list(lv_obj_t * obj, uint8_t part) @@ -1244,7 +1244,7 @@ void lv_obj_clean_style_list(lv_obj_t * obj, uint8_t part) * Release all used memories and cancel pending related transitions. * Also notifies the object about the style change. * @param obj pointer to an object - * @param part the part of the object which style list should be reseted. + * @param part the part of the object which style list should be reset. * E.g. `LV_OBJ_PART_MAIN`, `LV_BTN_PART_MAIN`, `LV_SLIDER_PART_KNOB` */ void lv_obj_reset_style_list(lv_obj_t * obj, uint8_t part) @@ -2388,7 +2388,7 @@ lv_coord_t lv_obj_get_width_margin(lv_obj_t * obj) * Set that width reduced by the left and right padding of the parent. * @param obj pointer to an object * @param div indicates how many columns are assumed. - * If 1 the width will be set the the parent's width + * If 1 the width will be set the parent's width * If 2 only half parent width - inner padding of the parent * If 3 only third parent width - 2 * inner padding of the parent * @param span how many columns are combined @@ -2409,7 +2409,7 @@ lv_coord_t lv_obj_get_width_grid(lv_obj_t * obj, uint8_t div, uint8_t span) * Get that height reduced by the top and bottom padding of the parent. * @param obj pointer to an object * @param div indicates how many rows are assumed. - * If 1 the height will be set the the parent's height + * If 1 the height will be set the parent's height * If 2 only half parent height - inner padding of the parent * If 3 only third parent height - 2 * inner padding of the parent * @param span how many rows are combined @@ -2429,7 +2429,7 @@ lv_coord_t lv_obj_get_height_grid(lv_obj_t * obj, uint8_t div, uint8_t span) /** * Get the automatic realign property of the object. * @param obj pointer to an object - * @return true: auto realign is enabled; false: auto realign is disabled + * @return true: auto realign is enabled; false: auto realign is disabled */ bool lv_obj_get_auto_realign(const lv_obj_t * obj) { @@ -3860,7 +3860,7 @@ static lv_design_res_t lv_obj_design(lv_obj_t * obj, const lv_area_t * clip_area if(lv_obj_get_style_border_blend_mode(obj, LV_OBJ_PART_MAIN) != LV_BLEND_MODE_NORMAL) return LV_DESIGN_RES_NOT_COVER; if(lv_obj_get_style_opa_scale(obj, LV_OBJ_PART_MAIN) < LV_OPA_MAX) return LV_DESIGN_RES_NOT_COVER; - return LV_DESIGN_RES_COVER; + return LV_DESIGN_RES_COVER; } else if(mode == LV_DESIGN_DRAW_MAIN) { diff --git a/src/lv_core/lv_obj.h b/src/lv_core/lv_obj.h index 9551f1c625..c6afb93177 100644 --- a/src/lv_core/lv_obj.h +++ b/src/lv_core/lv_obj.h @@ -43,9 +43,9 @@ extern "C" { #define LV_MAX_ANCESTOR_NUM 8 -#define LV_EXT_CLICK_AREA_OFF 0 -#define LV_EXT_CLICK_AREA_TINY 1 -#define LV_EXT_CLICK_AREA_FULL 2 +#define LV_EXT_CLICK_AREA_OFF 0 +#define LV_EXT_CLICK_AREA_TINY 1 +#define LV_EXT_CLICK_AREA_FULL 2 #define _LV_OBJ_PART_VIRTUAL_FIRST 0x01 #define _LV_OBJ_PART_REAL_FIRST 0x40 @@ -203,7 +203,7 @@ typedef struct _lv_obj_t { lv_design_cb_t design_cb; /**< Object type specific design function*/ void * ext_attr; /**< Object type specific extended data*/ - lv_style_list_t style_list; + lv_style_list_t style_list; #if LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_TINY uint8_t ext_click_pad_hor; /**< Extra click padding in horizontal direction */ @@ -577,7 +577,7 @@ void lv_obj_remove_style(lv_obj_t * obj, uint8_t part, lv_style_t * style); * Release all used memories and cancel pending related transitions. * Typically used in `LV_SIGN_CLEAN_UP. * @param obj pointer to an object - * @param part the part of the object which style list should be reseted. + * @param part the part of the object which style list should be reset. * E.g. `LV_OBJ_PART_MAIN`, `LV_BTN_PART_MAIN`, `LV_SLIDER_PART_KNOB` */ void lv_obj_clean_style_list(lv_obj_t * obj, uint8_t part); @@ -587,7 +587,7 @@ void lv_obj_clean_style_list(lv_obj_t * obj, uint8_t part); * Release all used memories and cancel pending related transitions. * Also notifies the object about the style change. * @param obj pointer to an object - * @param part the part of the object which style list should be reseted. + * @param part the part of the object which style list should be reset. * E.g. `LV_OBJ_PART_MAIN`, `LV_BTN_PART_MAIN`, `LV_SLIDER_PART_KNOB` */ void lv_obj_reset_style_list(lv_obj_t * obj, uint8_t part); @@ -676,7 +676,7 @@ void _lv_obj_set_style_local_ptr(lv_obj_t * obj, uint8_t type, lv_style_property bool lv_obj_remove_style_local_prop(lv_obj_t * obj, uint8_t part, lv_style_property_t prop); /** - * Enable/disable the use of style cahche for an object + * Enable/disable the use of style cache for an object * @param obj pointer to an object * @param dis true: disable; false: enable (re-enable) */ @@ -1055,7 +1055,7 @@ lv_coord_t lv_obj_get_width_margin(lv_obj_t * obj); * Take paddings into account. * @param obj pointer to an object * @param div indicates how many columns are assumed. - * If 1 the width will be set the the parent's width + * If 1 the width will be set the parent's width * If 2 only half parent width - inner padding of the parent * If 3 only third parent width - 2 * inner padding of the parent * @param span how many columns are combined @@ -1068,7 +1068,7 @@ lv_coord_t lv_obj_get_width_grid(lv_obj_t * obj, uint8_t div, uint8_t span); * Take paddings into account. * @param obj pointer to an object * @param div indicates how many rows are assumed. - * If 1 the height will be set the the parent's height + * If 1 the height will be set the parent's height * If 2 only half parent height - inner padding of the parent * If 3 only third parent height - 2 * inner padding of the parent * @param span how many rows are combined @@ -1079,7 +1079,7 @@ lv_coord_t lv_obj_get_height_grid(lv_obj_t * obj, uint8_t div, uint8_t span); /** * Get the automatic realign property of the object. * @param obj pointer to an object - * @return true: auto realign is enabled; false: auto realign is disabled + * @return true: auto realign is enabled; false: auto realign is disabled */ bool lv_obj_get_auto_realign(const lv_obj_t * obj); diff --git a/src/lv_core/lv_refr.c b/src/lv_core/lv_refr.c index e8502431ba..a84a3d9174 100644 --- a/src/lv_core/lv_refr.c +++ b/src/lv_core/lv_refr.c @@ -74,7 +74,7 @@ void _lv_refr_init(void) /** * Redraw the invalidated areas now. * Normally the redrawing is periodically executed in `lv_task_handler` but a long blocking process - * can prevent the call of `lv_task_handler`. In this case if the the GUI is updated in the process + * can prevent the call of `lv_task_handler`. In this case if the GUI is updated in the process * (e.g. progress bar) this function can be called when the screen should be updated. * @param disp pointer to display to refresh. NULL to refresh all displays. */ @@ -406,7 +406,7 @@ static void lv_refr_areas(void) /** * Refresh an area if there is Virtual Display Buffer - * @param area_p pointer to an area to refresh + * @param area_p pointer to an area to refresh */ static void lv_refr_area(const lv_area_t * area_p) { diff --git a/src/lv_core/lv_refr.h b/src/lv_core/lv_refr.h index b4c9a85a52..25b598f98d 100644 --- a/src/lv_core/lv_refr.h +++ b/src/lv_core/lv_refr.h @@ -50,7 +50,7 @@ void _lv_refr_init(void); /** * Redraw the invalidated areas now. * Normally the redrawing is periodically executed in `lv_task_handler` but a long blocking process - * can prevent the call of `lv_task_handler`. In this case if the the GUI is updated in the process + * can prevent the call of `lv_task_handler`. In this case if the GUI is updated in the process * (e.g. progress bar) this function can be called when the screen should be updated. * @param disp pointer to display to refresh. NULL to refresh all displays. */ diff --git a/src/lv_core/lv_style.c b/src/lv_core/lv_style.c index 2ee6017c95..2e3dcec58b 100644 --- a/src/lv_core/lv_style.c +++ b/src/lv_core/lv_style.c @@ -93,7 +93,7 @@ void lv_style_copy(lv_style_t * style_dest, const lv_style_t * style_src) /** * Remove a property from a style * @param style pointer to a style - * @param prop a style property ORed with a state. + * @param prop a style property ORed with a state. * E.g. `LV_STYLE_BORDER_WIDTH | (LV_STATE_PRESSED << LV_STYLE_STATE_POS)` * @return true: the property was found and removed; false: the property wasn't found */ @@ -188,7 +188,7 @@ void lv_style_list_copy(lv_style_list_t * list_dest, const lv_style_list_t * lis /** * Add a style to a style list. - * Only the the style pointer will be saved so the shouldn't be a local variable. + * Only the style pointer will be saved so the shouldn't be a local variable. * (It should be static, global or dynamically allocated) * @param list pointer to a style list * @param style pointer to a style to add diff --git a/src/lv_core/lv_style.h b/src/lv_core/lv_style.h index 6f62bb1b46..1ff7b3b4db 100644 --- a/src/lv_core/lv_style.h +++ b/src/lv_core/lv_style.h @@ -29,8 +29,8 @@ extern "C" { #define LV_RADIUS_CIRCLE (0x7FFF) /**< A very big radius to always draw as circle*/ LV_EXPORT_CONST_INT(LV_RADIUS_CIRCLE); -#define LV_DEBUG_STYLE_SENTINEL_VALUE 0x2288AAEE -#define LV_DEBUG_STYLE_LIST_SENTINEL_VALUE 0x9977CCBB +#define LV_DEBUG_STYLE_SENTINEL_VALUE 0x2288AAEE +#define LV_DEBUG_STYLE_LIST_SENTINEL_VALUE 0x9977CCBB #define LV_STYLE_PROP_INIT(name, group, id, attr) name = (((group << 4) + id) | ((attr) << 8)) @@ -287,7 +287,7 @@ void lv_style_list_copy(lv_style_list_t * list_dest, const lv_style_list_t * lis /** * Add a style to a style list. - * Only the the style pointer will be saved so the shouldn't be a local variable. + * Only the style pointer will be saved so the shouldn't be a local variable. * (It should be static, global or dynamically allocated) * @param list pointer to a style list * @param style pointer to a style to add @@ -338,7 +338,7 @@ void lv_style_copy(lv_style_t * dest, const lv_style_t * src); /** * Remove a property from a style * @param style pointer to a style - * @param prop a style property ORed with a state. + * @param prop a style property ORed with a state. * E.g. `LV_STYLE_BORDER_WIDTH | (LV_STATE_PRESSED << LV_STYLE_STATE_POS)` * @return true: the property was found and removed; false: the property wasn't found */ diff --git a/src/lv_draw/lv_draw_blend.c b/src/lv_draw/lv_draw_blend.c index 71fd09e8dc..9634e08a40 100644 --- a/src/lv_draw/lv_draw_blend.c +++ b/src/lv_draw/lv_draw_blend.c @@ -191,7 +191,7 @@ LV_ATTRIBUTE_FAST_MEM void _lv_blend_fill(const lv_area_t * clip_area, const lv_ * @param mask_res LV_MASK_RES_COVER: the mask has only 0xff values (no mask), * LV_MASK_RES_TRANSP: the mask has only 0x00 values (full transparent), * LV_MASK_RES_CHANGED: the mask has mixed values - * @param opa overall opacity in 0x00..0xff range + * @param opa overall opacity in 0x00..0xff range * @param mode blend mode from `lv_blend_mode_t` */ LV_ATTRIBUTE_FAST_MEM void _lv_blend_map(const lv_area_t * clip_area, const lv_area_t * map_area, diff --git a/src/lv_draw/lv_draw_img.c b/src/lv_draw/lv_draw_img.c index 3a07bde4ac..a36df449ca 100644 --- a/src/lv_draw/lv_draw_img.c +++ b/src/lv_draw/lv_draw_img.c @@ -553,7 +553,7 @@ LV_ATTRIBUTE_FAST_MEM static void lv_draw_map(const lv_area_t * map_area, const lv_opa_t px_opa = map_px[LV_IMG_PX_SIZE_ALPHA_BYTE - 1]; mask_buf[px_i] = px_opa; if(px_opa == 0) { -#if LV_COLOR_DEPTH == 32 +#if LV_COLOR_DEPTH == 32 map2[px_i].full = 0; #endif continue; @@ -576,7 +576,7 @@ LV_ATTRIBUTE_FAST_MEM static void lv_draw_map(const lv_area_t * map_area, const if(chroma_key) { if(c.full == chroma_keyed_color.full) { mask_buf[px_i] = LV_OPA_TRANSP; -#if LV_COLOR_DEPTH == 32 +#if LV_COLOR_DEPTH == 32 map2[px_i].full = 0; #endif continue; diff --git a/src/lv_draw/lv_draw_label.c b/src/lv_draw/lv_draw_label.c index 8fb92444c1..970791ffcb 100644 --- a/src/lv_draw/lv_draw_label.c +++ b/src/lv_draw/lv_draw_label.c @@ -411,7 +411,7 @@ LV_ATTRIBUTE_FAST_MEM static void lv_draw_letter(const lv_point_t * pos_p, const lv_font_glyph_dsc_t g; bool g_ret = lv_font_get_glyph_dsc(font_p, &g, letter, '\0'); if(g_ret == false) { - /* Add waring if the dsc is not found + /* Add warning if the dsc is not found * but do not print warning for non printable ASCII chars (e.g. '\n')*/ if(letter >= 0x20) { LV_LOG_WARN("lv_draw_letter: glyph dsc. not found"); diff --git a/src/lv_draw/lv_draw_mask.c b/src/lv_draw/lv_draw_mask.c index b74f2b4b25..7fb01ee01a 100644 --- a/src/lv_draw/lv_draw_mask.c +++ b/src/lv_draw/lv_draw_mask.c @@ -451,7 +451,7 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_line(lv_opa_t * mas int32_t k = - abs_x; if(k < 0) return LV_DRAW_MASK_RES_TRANSP; if(k >= 0 && k < len) _lv_memset_00(&mask_buf[k], len - k); - return LV_DRAW_MASK_RES_CHANGED; + return LV_DRAW_MASK_RES_CHANGED; } } else { @@ -461,7 +461,7 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_line(lv_opa_t * mas if(k < 0) k = 0; if(k >= len) return LV_DRAW_MASK_RES_TRANSP; else if(k >= 0 && k < len) _lv_memset_00(&mask_buf[0], k); - return LV_DRAW_MASK_RES_CHANGED; + return LV_DRAW_MASK_RES_CHANGED; } } } diff --git a/src/lv_draw/lv_draw_rect.c b/src/lv_draw/lv_draw_rect.c index d81f1a6fa9..b502f8c439 100644 --- a/src/lv_draw/lv_draw_rect.c +++ b/src/lv_draw/lv_draw_rect.c @@ -1027,7 +1027,7 @@ LV_ATTRIBUTE_FAST_MEM static void shadow_draw_corner_buf(const lv_area_t * coord sh_ups_tmp_buf[0] = (mask_line[0] << SHADOW_UPSCALE_SHIFT) / sw; for(i = 1; i < size; i++) { if(mask_line[i] == mask_line[i - 1]) sh_ups_tmp_buf[i] = sh_ups_tmp_buf[i - 1]; - else sh_ups_tmp_buf[i] = (mask_line[i] << SHADOW_UPSCALE_SHIFT) / sw; + else sh_ups_tmp_buf[i] = (mask_line[i] << SHADOW_UPSCALE_SHIFT) / sw; } } @@ -1060,7 +1060,7 @@ LV_ATTRIBUTE_FAST_MEM static void shadow_draw_corner_buf(const lv_area_t * coord sh_buf[0] = (sh_buf[0] << SHADOW_UPSCALE_SHIFT) / sw; for(i = 1; i < (uint32_t) size * size; i++) { if(sh_buf[i] == sh_buf[i - 1]) sh_buf[i] = sh_buf[i - 1]; - else sh_buf[i] = (sh_buf[i] << SHADOW_UPSCALE_SHIFT) / sw; + else sh_buf[i] = (sh_buf[i] << SHADOW_UPSCALE_SHIFT) / sw; } shadow_blur_corner(size, sw, sh_buf); @@ -1113,7 +1113,7 @@ LV_ATTRIBUTE_FAST_MEM static void shadow_blur_corner(lv_coord_t size, lv_coord_t sh_ups_buf[0] = sh_ups_buf[0] / sw; for(i = 1; i < (uint32_t)size * size; i++) { if(sh_ups_buf[i] == sh_ups_buf[i - 1]) sh_ups_buf[i] = sh_ups_buf[i - 1]; - else sh_ups_buf[i] = sh_ups_buf[i] / sw; + else sh_ups_buf[i] = sh_ups_buf[i] / sw; } for(x = 0; x < size; x++) { diff --git a/src/lv_draw/lv_img_buf.h b/src/lv_draw/lv_img_buf.h index 93974b9928..908b255e87 100644 --- a/src/lv_draw/lv_img_buf.h +++ b/src/lv_draw/lv_img_buf.h @@ -111,7 +111,7 @@ typedef uint8_t lv_img_cf_t; #if LV_BIG_ENDIAN_SYSTEM typedef struct { - uint32_t h : 11; /*Height of the image map*/ + uint32_t h : 11; /*Height of the image map*/ uint32_t w : 11; /*Width of the image map*/ uint32_t reserved : 2; /*Reserved to be used later*/ uint32_t always_zero : 3; /*It the upper bits of the first byte. Always zero to look like a @@ -129,7 +129,7 @@ typedef struct { uint32_t reserved : 2; /*Reserved to be used later*/ uint32_t w : 11; /*Width of the image map*/ - uint32_t h : 11; /*Height of the image map*/ + uint32_t h : 11; /*Height of the image map*/ } lv_img_header_t; #endif diff --git a/src/lv_font/lv_font.c b/src/lv_font/lv_font.c index 6e6d0ea364..9e3ec2201c 100644 --- a/src/lv_font/lv_font.c +++ b/src/lv_font/lv_font.c @@ -43,7 +43,7 @@ * Return with the bitmap of a font. * @param font_p pointer to a font * @param letter an UNICODE character code - * @return pointer to the bitmap of the letter + * @return pointer to the bitmap of the letter */ const uint8_t * lv_font_get_glyph_bitmap(const lv_font_t * font_p, uint32_t letter) { diff --git a/src/lv_font/lv_font.h b/src/lv_font/lv_font.h index d8c69f3f78..04ab308649 100644 --- a/src/lv_font/lv_font.h +++ b/src/lv_font/lv_font.h @@ -55,7 +55,7 @@ typedef uint8_t lv_font_subpx_t; /** Describe the properties of a font*/ typedef struct _lv_font_struct { - /** Get a glyph's descriptor from a font*/ + /** Get a glyph's descriptor from a font*/ bool (*get_glyph_dsc)(const struct _lv_font_struct *, lv_font_glyph_dsc_t *, uint32_t letter, uint32_t letter_next); /** Get a glyph's bitmap from a font*/ @@ -67,7 +67,7 @@ typedef struct _lv_font_struct { uint8_t subpx : 2; /**< An element of `lv_font_subpx_t`*/ int8_t underline_position; /**< Distance between the top of the underline and base line (< 0 means below the base line)*/ - int8_t underline_thickness; /**< Thickness of the underline*/ + int8_t underline_thickness; /**< Thickness of the underline*/ void * dsc; /**< Store implementation specific or run_time data or caching here*/ #if LV_USE_USER_DATA @@ -84,7 +84,7 @@ typedef struct _lv_font_struct { * Return with the bitmap of a font. * @param font_p pointer to a font * @param letter an UNICODE character code - * @return pointer to the bitmap of the letter + * @return pointer to the bitmap of the letter */ const uint8_t * lv_font_get_glyph_bitmap(const lv_font_t * font_p, uint32_t letter); diff --git a/src/lv_font/lv_font_fmt_txt.h b/src/lv_font/lv_font_fmt_txt.h index 99d5ec0aaf..1538c2fa69 100644 --- a/src/lv_font/lv_font_fmt_txt.h +++ b/src/lv_font/lv_font_fmt_txt.h @@ -115,7 +115,7 @@ typedef struct { typedef struct { /*To get a kern value of two code points: 1. Get the `glyph_id_left` and `glyph_id_right` from `lv_font_fmt_txt_cmap_t - 2 for(i = 0; i < pair_cnt * 2; i+2) + 2. for(i = 0; i < pair_cnt * 2; i+2) if(gylph_ids[i] == glyph_id_left && gylph_ids[i+1] == glyph_id_right) return values[i / 2]; @@ -130,7 +130,7 @@ typedef struct { typedef struct { /*To get a kern value of two code points: 1. Get the `glyph_id_left` and `glyph_id_right` from `lv_font_fmt_txt_cmap_t - 2 Get the class of the left and right glyphs as `left_class` and `right_class` + 2. Get the class of the left and right glyphs as `left_class` and `right_class` left_class = left_class_mapping[glyph_id_left]; right_class = right_class_mapping[glyph_id_right]; 3. value = class_pair_values[(left_class-1)*right_class_cnt + (right_class-1)] diff --git a/src/lv_gpu/lv_gpu_nxp_pxp.c b/src/lv_gpu/lv_gpu_nxp_pxp.c index c97b068d22..4e4d8ccfde 100644 --- a/src/lv_gpu/lv_gpu_nxp_pxp.c +++ b/src/lv_gpu/lv_gpu_nxp_pxp.c @@ -211,7 +211,7 @@ void lv_gpu_nxp_pxp_fill(lv_color_t * dest_buf, lv_coord_t dest_width, const lv_ * * By default, image is copied directly, with optional opacity configured by \p opa. * Color keying can be enabled by calling lv_gpu_nxp_pxp_enable_color_key() before calling this function. - * Recoloring can be enabled by calling lv_gpu_nxp_pxp_enable_recolor() before calling this function. + * Recoloring can be enabled by calling lv_gpu_nxp_pxp_enable_recolor() before calling this function. * Note that color keying and recoloring at the same time is not supported and black rectangle is rendered. * * @param[in/out] dest destination buffer diff --git a/src/lv_gpu/lv_gpu_nxp_pxp.h b/src/lv_gpu/lv_gpu_nxp_pxp.h index e68d5a1b15..c91d80fd36 100644 --- a/src/lv_gpu/lv_gpu_nxp_pxp.h +++ b/src/lv_gpu/lv_gpu_nxp_pxp.h @@ -131,7 +131,7 @@ void lv_gpu_nxp_pxp_fill(lv_color_t * dest_buf, lv_coord_t dest_width, const lv_ * * By default, image is copied directly, with optional opacity configured by \p opa. * Color keying can be enabled by calling lv_gpu_nxp_pxp_enable_color_key() before calling this function. - * Recoloring can be enabled by calling lv_gpu_nxp_pxp_enable_recolor() before calling this function. + * Recoloring can be enabled by calling lv_gpu_nxp_pxp_enable_recolor() before calling this function. * Note that color keying and recoloring at the same time is not supported and black rectangle is rendered. * * @param[in/out] dest destination buffer diff --git a/src/lv_gpu/lv_gpu_stm32_dma2d.c b/src/lv_gpu/lv_gpu_stm32_dma2d.c index d94e87abfa..21fb3001e9 100644 --- a/src/lv_gpu/lv_gpu_stm32_dma2d.c +++ b/src/lv_gpu/lv_gpu_stm32_dma2d.c @@ -65,7 +65,7 @@ void lv_gpu_stm32_dma2d_init(void) /* Enable DMA2D clock */ #if defined(STM32F4) || defined(STM32F7) RCC->AHB1ENR |= RCC_AHB1ENR_DMA2DEN; -#elif defined(STM32H7) +#elif defined(STM32H7) RCC->AHB3ENR |= RCC_AHB3ENR_DMA2DEN; #else # warning "LVGL can't enable the clock of DMA2D" diff --git a/src/lv_hal/lv_hal_disp.h b/src/lv_hal/lv_hal_disp.h index cd77c30379..5eba4e2664 100644 --- a/src/lv_hal/lv_hal_disp.h +++ b/src/lv_hal/lv_hal_disp.h @@ -78,7 +78,7 @@ typedef struct _disp_drv_t { uint32_t rotated : 1; /**< 1: turn the display by 90 degree. @warning Does not update coordinates for you!*/ #if LV_COLOR_SCREEN_TRANSP - /**Handle if the the screen doesn't have a solid (opa == LV_OPA_COVER) background. + /**Handle if the screen doesn't have a solid (opa == LV_OPA_COVER) background. * Use only if required because it's slower.*/ uint32_t screen_transp : 1; #endif diff --git a/src/lv_hal/lv_hal_indev.c b/src/lv_hal/lv_hal_indev.c index 2c088f7e43..aa706684bd 100644 --- a/src/lv_hal/lv_hal_indev.c +++ b/src/lv_hal/lv_hal_indev.c @@ -135,7 +135,7 @@ bool _lv_indev_read(lv_indev_t * indev, lv_indev_data_t * data) data->point.x = indev->proc.types.pointer.act_point.x; data->point.y = indev->proc.types.pointer.act_point.y; } - /*Similarly set at least the last key in case of the the user doesn't set it on release*/ + /*Similarly set at least the last key in case of the user doesn't set it on release*/ else if(indev->driver.type == LV_INDEV_TYPE_KEYPAD) { data->key = indev->proc.types.keypad.last_key; } diff --git a/src/lv_misc/lv_anim.c b/src/lv_misc/lv_anim.c index e22487aa5e..4b01b80516 100644 --- a/src/lv_misc/lv_anim.c +++ b/src/lv_misc/lv_anim.c @@ -88,7 +88,7 @@ void lv_anim_init(lv_anim_t * a) void lv_anim_start(lv_anim_t * a) { LV_LOG_TRACE("animation create started") - /* Do not let two animations for the same 'var' with the same 'fp'*/ + /* Do not let two animations for the same 'var' with the same 'fp'*/ if(a->exec_cb != NULL) lv_anim_del(a->var, a->exec_cb); /*fp == NULL would delete all animations of var*/ /*If the list is empty the anim task was suspended and it's last run measure is invalid*/ @@ -456,7 +456,7 @@ static void anim_task(lv_task_t * param) anim_list_changed = false; if(!a->has_run) { - a->has_run = 1; /*The list readying might be reseted so need to know which anim has run already*/ + a->has_run = 1; /*The list readying might be reset so need to know which anim has run already*/ /*The animation will run now for the first time. Call `start_cb`*/ int32_t new_act_time = a->act_time + elaps; diff --git a/src/lv_misc/lv_bidi.c b/src/lv_misc/lv_bidi.c index ea1ab33540..caa463a8c6 100644 --- a/src/lv_misc/lv_bidi.c +++ b/src/lv_misc/lv_bidi.c @@ -131,7 +131,7 @@ lv_bidi_dir_t _lv_bidi_detect_base_dir(const char * txt) * @param len length of the line in character count * @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL` * @param visual_pos the visual character position which logical position should be get - * @param is_rtl tell the the char at `visual_pos` is RTL or LTR context + * @param is_rtl tell the char at `visual_pos` is RTL or LTR context * @return the logical character position */ uint16_t _lv_bidi_get_logical_pos(const char * str_in, char ** bidi_txt, uint32_t len, lv_bidi_dir_t base_dir, @@ -168,7 +168,7 @@ uint16_t _lv_bidi_get_logical_pos(const char * str_in, char ** bidi_txt, uint32_ * @param len length of the line in character count * @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL` * @param logical_pos the logical character position which visual position should be get - * @param is_rtl tell the the char at `logical_pos` is RTL or LTR context + * @param is_rtl tell the char at `logical_pos` is RTL or LTR context * @return the visual character position */ uint16_t _lv_bidi_get_visual_pos(const char * str_in, char ** bidi_txt, uint16_t len, lv_bidi_dir_t base_dir, diff --git a/src/lv_misc/lv_bidi.h b/src/lv_misc/lv_bidi.h index fd98009e5c..8b2f765dbb 100644 --- a/src/lv_misc/lv_bidi.h +++ b/src/lv_misc/lv_bidi.h @@ -21,7 +21,7 @@ extern "C" { /********************* * DEFINES *********************/ -/* Special non printable strong characters. +/* Special non printable strong characters. * They can be inserted to texts to affect the run's direction*/ #define LV_BIDI_LRO "\xE2\x80\xAD" /*U+202D*/ #define LV_BIDI_RLO "\xE2\x80\xAE" /*U+202E*/ @@ -72,7 +72,7 @@ lv_bidi_dir_t _lv_bidi_detect_base_dir(const char * txt); * @param len length of the line in character count * @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL` * @param visual_pos the visual character position which logical position should be get - * @param is_rtl tell the the char at `visual_pos` is RTL or LTR context + * @param is_rtl tell the char at `visual_pos` is RTL or LTR context * @return the logical character position */ uint16_t _lv_bidi_get_logical_pos(const char * str_in, char ** bidi_txt, uint32_t len, lv_bidi_dir_t base_dir, @@ -87,7 +87,7 @@ uint16_t _lv_bidi_get_logical_pos(const char * str_in, char ** bidi_txt, uint32_ * @param len length of the line in character count * @param base_dir base direction of the text: `LV_BIDI_DIR_LTR` or `LV_BIDI_DIR_RTL` * @param logical_pos the logical character position which visual position should be get - * @param is_rtl tell the the char at `logical_pos` is RTL or LTR context + * @param is_rtl tell the char at `logical_pos` is RTL or LTR context * @return the visual character position */ uint16_t _lv_bidi_get_visual_pos(const char * str_in, char ** bidi_txt, uint16_t len, lv_bidi_dir_t base_dir, diff --git a/src/lv_misc/lv_color.h b/src/lv_misc/lv_color.h index 74bd5256c0..d0271b0d30 100644 --- a/src/lv_misc/lv_color.h +++ b/src/lv_misc/lv_color.h @@ -104,7 +104,7 @@ enum { #endif /*--------------------------------------- - * Macros for all existing color depths + * Macros for all existing color depths * to set/get values of the color channels *------------------------------------------*/ # define LV_COLOR_SET_R1(c, v) (c).ch.red = (uint8_t)((v) & 0x1) diff --git a/src/lv_misc/lv_debug.c b/src/lv_misc/lv_debug.c index fd5bd86b5c..24fc78ff0f 100644 --- a/src/lv_misc/lv_debug.c +++ b/src/lv_misc/lv_debug.c @@ -17,11 +17,11 @@ * DEFINES *********************/ #ifndef LV_DEBUG_STR_MAX_LENGTH - #define LV_DEBUG_STR_MAX_LENGTH (1024 * 8) + #define LV_DEBUG_STR_MAX_LENGTH (1024 * 8) #endif #ifndef LV_DEBUG_STR_MAX_REPEAT - #define LV_DEBUG_STR_MAX_REPEAT 8 + #define LV_DEBUG_STR_MAX_REPEAT 8 #endif /********************** * TYPEDEFS diff --git a/src/lv_misc/lv_fs.c b/src/lv_misc/lv_fs.c index 772f1468b4..8be49028e2 100644 --- a/src/lv_misc/lv_fs.c +++ b/src/lv_misc/lv_fs.c @@ -134,7 +134,7 @@ lv_fs_res_t lv_fs_open(lv_fs_file_t * file_p, const char * path, lv_fs_mode_t mo /** * Close an already opened file * @param file_p pointer to a lv_fs_file_t variable - * @return LV_FS_RES_OK or any error from lv_fs_res_t enum + * @return LV_FS_RES_OK or any error from lv_fs_res_t enum */ lv_fs_res_t lv_fs_close(lv_fs_file_t * file_p) { @@ -158,7 +158,7 @@ lv_fs_res_t lv_fs_close(lv_fs_file_t * file_p) /** * Delete a file * @param path path of the file to delete - * @return LV_FS_RES_OK or any error from lv_fs_res_t enum + * @return LV_FS_RES_OK or any error from lv_fs_res_t enum */ lv_fs_res_t lv_fs_remove(const char * path) { diff --git a/src/lv_misc/lv_fs.h b/src/lv_misc/lv_fs.h index 2a8e5fcbba..633606ed04 100644 --- a/src/lv_misc/lv_fs.h +++ b/src/lv_misc/lv_fs.h @@ -148,14 +148,14 @@ lv_fs_res_t lv_fs_open(lv_fs_file_t * file_p, const char * path, lv_fs_mode_t mo /** * Close an already opened file * @param file_p pointer to a lv_fs_file_t variable - * @return LV_FS_RES_OK or any error from lv_fs_res_t enum + * @return LV_FS_RES_OK or any error from lv_fs_res_t enum */ lv_fs_res_t lv_fs_close(lv_fs_file_t * file_p); /** * Delete a file * @param path path of the file to delete - * @return LV_FS_RES_OK or any error from lv_fs_res_t enum + * @return LV_FS_RES_OK or any error from lv_fs_res_t enum */ lv_fs_res_t lv_fs_remove(const char * path); diff --git a/src/lv_misc/lv_ll.c b/src/lv_misc/lv_ll.c index 9f25b8f7f9..560136826d 100644 --- a/src/lv_misc/lv_ll.c +++ b/src/lv_misc/lv_ll.c @@ -150,7 +150,7 @@ void * _lv_ll_ins_tail(lv_ll_t * ll_p) /** * Remove the node 'node_p' from 'll_p' linked list. - * It does not free the the memory of node. + * It does not free the memory of node. * @param ll_p pointer to the linked list of 'node_p' * @param node_p pointer to node in 'll_p' linked list */ @@ -167,7 +167,7 @@ void _lv_ll_remove(lv_ll_t * ll_p, void * node_p) } } else if(_lv_ll_get_tail(ll_p) == node_p) { - /*The new tail will be the node before 'n_act'*/ + /*The new tail will be the node before 'n_act'*/ ll_p->tail = _lv_ll_get_prev(ll_p, node_p); if(ll_p->tail == NULL) { ll_p->head = NULL; diff --git a/src/lv_misc/lv_ll.h b/src/lv_misc/lv_ll.h index a4ce8c64ce..9ccc11009a 100644 --- a/src/lv_misc/lv_ll.h +++ b/src/lv_misc/lv_ll.h @@ -71,7 +71,7 @@ void * _lv_ll_ins_tail(lv_ll_t * ll_p); /** * Remove the node 'node_p' from 'll_p' linked list. - * It does not free the the memory of node. + * It does not free the memory of node. * @param ll_p pointer to the linked list of 'node_p' * @param node_p pointer to node in 'll_p' linked list */ diff --git a/src/lv_misc/lv_log.h b/src/lv_misc/lv_log.h index 99633a8a26..fe46cf4493 100644 --- a/src/lv_misc/lv_log.h +++ b/src/lv_misc/lv_log.h @@ -108,7 +108,7 @@ void _lv_log_add(lv_log_level_t level, const char * file, int line, const char * #else /*LV_USE_LOG*/ -/*Do nothing if `LV_USE_LOG 0`*/ +/*Do nothing if `LV_USE_LOG 0`*/ #define _lv_log_add(level, file, line, ...) #define LV_LOG_TRACE(...) #define LV_LOG_INFO(...) diff --git a/src/lv_misc/lv_mem.c b/src/lv_misc/lv_mem.c index 0bcda313c7..7a7f9e8c89 100644 --- a/src/lv_misc/lv_mem.c +++ b/src/lv_misc/lv_mem.c @@ -57,9 +57,9 @@ typedef struct { #endif /* LV_ENABLE_GC */ #ifdef LV_ARCH_64 - #define ALIGN_MASK 0x7 + #define ALIGN_MASK 0x7 #else - #define ALIGN_MASK 0x3 + #define ALIGN_MASK 0x3 #endif #define MEM_BUF_SMALL_SIZE 16 diff --git a/src/lv_misc/lv_printf.c b/src/lv_misc/lv_printf.c index 525788f5b0..bb6f3430bb 100644 --- a/src/lv_misc/lv_printf.c +++ b/src/lv_misc/lv_printf.c @@ -68,13 +68,13 @@ // define the default floating point precision // default: 6 digits #ifndef PRINTF_DEFAULT_FLOAT_PRECISION - #define PRINTF_DEFAULT_FLOAT_PRECISION 6U + #define PRINTF_DEFAULT_FLOAT_PRECISION 6U #endif // define the largest float suitable to print with %f // default: 1e9 #ifndef PRINTF_MAX_FLOAT - #define PRINTF_MAX_FLOAT 1e9 + #define PRINTF_MAX_FLOAT 1e9 #endif // support for the long long types (%llu or %p) diff --git a/src/lv_misc/lv_task.c b/src/lv_misc/lv_task.c index 2c2223f5cc..c54c418177 100644 --- a/src/lv_misc/lv_task.c +++ b/src/lv_misc/lv_task.c @@ -60,7 +60,7 @@ void _lv_task_core_init(void) } /** - * Call it periodically to handle lv_tasks. + * Call it periodically to handle lv_tasks. * @return the time after which it must be called again */ LV_ATTRIBUTE_TASK_HANDLER uint32_t lv_task_handler(void) diff --git a/src/lv_misc/lv_task.h b/src/lv_misc/lv_task.h index d3dfc4adba..f9546ab63f 100644 --- a/src/lv_misc/lv_task.h +++ b/src/lv_misc/lv_task.h @@ -80,7 +80,7 @@ void _lv_task_core_init(void); //! @cond Doxygen_Suppress /** - * Call it periodically to handle lv_tasks. + * Call it periodically to handle lv_tasks. * @return time till it needs to be run next (in ms) */ LV_ATTRIBUTE_TASK_HANDLER uint32_t lv_task_handler(void); @@ -154,7 +154,7 @@ void lv_task_set_repeat_count(lv_task_t * task, int32_t repeat_count); void lv_task_reset(lv_task_t * task); /** - * Enable or disable the whole lv_task handling + * Enable or disable the whole lv_task handling * @param en: true: lv_task handling is running, false: lv_task handling is suspended */ void lv_task_enable(bool en); diff --git a/src/lv_misc/lv_txt.c b/src/lv_misc/lv_txt.c index 0521aab3af..fcb9a7d229 100644 --- a/src/lv_misc/lv_txt.c +++ b/src/lv_misc/lv_txt.c @@ -121,7 +121,7 @@ void _lv_txt_get_size(lv_point_t * size_res, const char * text, const lv_font_t size_res->y += line_space; } - /*Calculate the the longest line*/ + /*Calculate the longest line*/ lv_coord_t act_line_length = _lv_txt_get_width(&text[line_start], new_line_start - line_start, font, letter_space, flag); @@ -225,7 +225,7 @@ static uint32_t lv_txt_get_next_word(const char * txt, const lv_font_t * font, /*Check for new line chars and breakchars*/ if(letter == '\n' || letter == '\r' || is_break_char(letter)) { /* Update the output width on the first character if it fits. - * Must do this here incase first letter is a break character. */ + * Must do this here in case first letter is a break character. */ if(i == 0 && break_index == NO_BREAK_FOUND && word_w_ptr != NULL) *word_w_ptr = cur_w; word_len--; break; @@ -581,7 +581,7 @@ static uint32_t lv_txt_unicode_to_utf8(uint32_t letter_uni) /** * Convert a wide character, e.g. 'Á' little endian to be UTF-8 compatible - * @param c a wide character or a Little endian number + * @param c a wide character or a Little endian number * @return `c` in big endian */ static uint32_t lv_txt_utf8_conv_wc(uint32_t c) diff --git a/src/lv_misc/lv_txt_ap.c b/src/lv_misc/lv_txt_ap.c index 673babeeec..6bd7124ac8 100644 --- a/src/lv_misc/lv_txt_ap.c +++ b/src/lv_misc/lv_txt_ap.c @@ -114,7 +114,7 @@ uint32_t _lv_txt_ap_calc_bytes_cnt(const char * txt) chars_cnt++; else if(ch_enc < 0x0800) chars_cnt += 2; - else if(ch_enc < 0x010000) + else if(ch_enc < 0x010000) chars_cnt += 3; else chars_cnt += 4; @@ -210,7 +210,7 @@ static uint32_t lv_ap_get_char_index(uint16_t c) if(c == (ap_chars_map[i].char_offset + LV_AP_ALPHABET_BASE_CODE)) return i; else if(c == ap_chars_map[i].char_end_form //is it an End form - || c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_begining_form_offset) //is it a Begining form + || c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_begining_form_offset) //is it a Beginning form || c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_middle_form_offset) //is it a middle form || c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_isolated_form_offset)) { //is it an isolated form return i; diff --git a/src/lv_themes/lv_theme_material.c b/src/lv_themes/lv_theme_material.c index 6b71dc9f2d..129ac6693e 100644 --- a/src/lv_themes/lv_theme_material.c +++ b/src/lv_themes/lv_theme_material.c @@ -680,7 +680,7 @@ static void page_init(void) lv_style_set_pad_right(&styles->sb, LV_STATE_DEFAULT, LV_DPX(7)); lv_style_set_pad_bottom(&styles->sb, LV_STATE_DEFAULT, LV_DPX(7)); -#if LV_USE_ANIMATION +#if LV_USE_ANIMATION style_init_reset(&styles->edge_flash); lv_style_set_bg_opa(&styles->edge_flash, LV_STATE_DEFAULT, LV_OPA_COVER); lv_style_set_bg_color(&styles->edge_flash, LV_STATE_DEFAULT, lv_color_hex3(0x888)); diff --git a/src/lv_widgets/lv_arc.c b/src/lv_widgets/lv_arc.c index 50b5ba248c..f78c8606c3 100644 --- a/src/lv_widgets/lv_arc.c +++ b/src/lv_widgets/lv_arc.c @@ -173,7 +173,7 @@ void lv_arc_set_start_angle(lv_obj_t * arc, uint16_t start) LV_ARC_PART_INDIC); } /*Only a smaller incremental move*/ - else if(ext->arc_angle_start < ext->arc_angle_end && start < ext->arc_angle_end) { + else if(ext->arc_angle_start < ext->arc_angle_end && start < ext->arc_angle_end) { inv_arc_area(arc, LV_MATH_MIN(ext->arc_angle_start, start), LV_MATH_MAX(ext->arc_angle_start, start), LV_ARC_PART_INDIC); } @@ -207,7 +207,7 @@ void lv_arc_set_end_angle(lv_obj_t * arc, uint16_t end) inv_arc_area(arc, LV_MATH_MIN(ext->arc_angle_end, end), LV_MATH_MAX(ext->arc_angle_end, end), LV_ARC_PART_INDIC); } /*Only a smaller incremental move*/ - else if(ext->arc_angle_end < ext->arc_angle_start && end < ext->arc_angle_start) { + else if(ext->arc_angle_end < ext->arc_angle_start && end < ext->arc_angle_start) { inv_arc_area(arc, LV_MATH_MIN(ext->arc_angle_end, end), LV_MATH_MAX(ext->arc_angle_end, end), LV_ARC_PART_INDIC); } /*Crossing the end angle makes the whole arc change*/ @@ -263,7 +263,7 @@ void lv_arc_set_bg_start_angle(lv_obj_t * arc, uint16_t start) inv_arc_area(arc, LV_MATH_MIN(ext->bg_angle_start, start), LV_MATH_MAX(ext->bg_angle_start, start), LV_ARC_PART_BG); } /*Only a smaller incremental move*/ - else if(ext->bg_angle_start < ext->bg_angle_end && start < ext->bg_angle_end) { + else if(ext->bg_angle_start < ext->bg_angle_end && start < ext->bg_angle_end) { inv_arc_area(arc, LV_MATH_MIN(ext->bg_angle_start, start), LV_MATH_MAX(ext->bg_angle_start, start), LV_ARC_PART_BG); } /*Crossing the start angle makes the whole arc change*/ @@ -298,7 +298,7 @@ void lv_arc_set_bg_end_angle(lv_obj_t * arc, uint16_t end) inv_arc_area(arc, LV_MATH_MIN(ext->bg_angle_end, end), LV_MATH_MAX(ext->bg_angle_end, end), LV_ARC_PART_BG); } /*Only a smaller incremental move*/ - else if(ext->bg_angle_end < ext->bg_angle_start && end < ext->bg_angle_start) { + else if(ext->bg_angle_end < ext->bg_angle_start && end < ext->bg_angle_start) { inv_arc_area(arc, LV_MATH_MIN(ext->bg_angle_end, end), LV_MATH_MAX(ext->bg_angle_end, end), LV_ARC_PART_BG); } /*Crossing the end angle makes the whole arc change*/ diff --git a/src/lv_widgets/lv_bar.c b/src/lv_widgets/lv_bar.c index 5545f1019f..1b18b54c29 100644 --- a/src/lv_widgets/lv_bar.c +++ b/src/lv_widgets/lv_bar.c @@ -23,7 +23,7 @@ *********************/ #define LV_OBJX_NAME "lv_bar" -#define LV_BAR_SIZE_MIN 4 /*hor. pad and ver. pad cannot make the indicator smaller then this [px]*/ +#define LV_BAR_SIZE_MIN 4 /*hor. pad and ver. pad cannot make the indicator smaller then this [px]*/ #if LV_USE_ANIMATION #define LV_BAR_IS_ANIMATING(anim_struct) (((anim_struct).anim_state) != LV_BAR_ANIM_STATE_INV) @@ -109,7 +109,7 @@ lv_obj_t * lv_bar_create(lv_obj_t * par, const lv_obj_t * copy) lv_obj_set_signal_cb(bar, lv_bar_signal); lv_obj_set_design_cb(bar, lv_bar_design); - /*Init the new bar object*/ + /*Init the new bar object*/ if(copy == NULL) { lv_obj_set_click(bar, false); diff --git a/src/lv_widgets/lv_btn.h b/src/lv_widgets/lv_btn.h index 34f72f6365..84d1848ba4 100644 --- a/src/lv_widgets/lv_btn.h +++ b/src/lv_widgets/lv_btn.h @@ -19,7 +19,7 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_CONT == 0 -#error "lv_btn: lv_cont is required. Enable it in lv_conf.h (LV_USE_CONT 1) " +#error "lv_btn: lv_cont is required. Enable it in lv_conf.h (LV_USE_CONT 1)" #endif #include "lv_cont.h" diff --git a/src/lv_widgets/lv_btnmatrix.c b/src/lv_widgets/lv_btnmatrix.c index 783fc96ed7..aa03242027 100644 --- a/src/lv_widgets/lv_btnmatrix.c +++ b/src/lv_widgets/lv_btnmatrix.c @@ -268,7 +268,7 @@ void lv_btnmatrix_set_map(lv_obj_t * btnm, const char * map[]) * the number and order of the individual buttons (i.e. excludes * newline entries). * An element of the map should look like e.g.: - * `ctrl_map[0] = width | LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_TGL_ENABLE` + * `ctrl_map[0] = width | LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_TGL_ENABLE` */ void lv_btnmatrix_set_ctrl_map(lv_obj_t * btnm, const lv_btnmatrix_ctrl_t ctrl_map[]) { @@ -476,9 +476,9 @@ bool lv_btnmatrix_get_recolor(const lv_obj_t * btnm) /** * Get the index of the lastly "activated" button by the user (pressed, released etc) - * Useful in the the `event_cb` to get the text of the button, check if hidden etc. + * Useful in the `event_cb` to get the text of the button, check if hidden etc. * @param btnm pointer to button matrix object - * @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset) + * @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset) */ uint16_t lv_btnmatrix_get_active_btn(const lv_obj_t * btnm) { @@ -490,7 +490,7 @@ uint16_t lv_btnmatrix_get_active_btn(const lv_obj_t * btnm) /** * Get the text of the lastly "activated" button by the user (pressed, released etc) - * Useful in the the `event_cb` + * Useful in the `event_cb` * @param btnm pointer to button matrix object * @return text of the last released button (NULL: if unset) */ @@ -511,7 +511,7 @@ const char * lv_btnmatrix_get_active_btn_text(const lv_obj_t * btnm) * Get the pressed button's index. * The button be really pressed by the user or manually set to pressed with `lv_btnmatrix_set_pressed` * @param btnm pointer to button matrix object - * @return index of the pressed button (LV_BTNMATRIX_BTN_NONE: if unset) + * @return index of the pressed button (LV_BTNMATRIX_BTN_NONE: if unset) */ uint16_t lv_btnmatrix_get_focused_btn(const lv_obj_t * btnm) { @@ -526,7 +526,7 @@ uint16_t lv_btnmatrix_get_focused_btn(const lv_obj_t * btnm) * @param btnm pointer to button matrix object * @param btn_id the index a button not counting new line characters. (The return value of * lv_btnmatrix_get_pressed/released) - * @return text of btn_index` button + * @return text of btn_index` button */ const char * lv_btnmatrix_get_btn_text(const lv_obj_t * btnm, uint16_t btn_id) { @@ -1037,7 +1037,7 @@ static lv_res_t lv_btnmatrix_signal(lv_obj_t * btnm, lv_signal_t sign, void * pa } else if(c == LV_KEY_DOWN) { lv_style_int_t pad_inner = lv_obj_get_style_pad_inner(btnm, LV_BTNMATRIX_PART_BG); - /*Find the area below the the current*/ + /*Find the area below the current*/ if(ext->btn_id_focused == LV_BTNMATRIX_BTN_NONE) { ext->btn_id_focused = 0; } @@ -1063,7 +1063,7 @@ static lv_res_t lv_btnmatrix_signal(lv_obj_t * btnm, lv_signal_t sign, void * pa } else if(c == LV_KEY_UP) { lv_style_int_t pad_inner = lv_obj_get_style_pad_inner(btnm, LV_BTNMATRIX_PART_BG); - /*Find the area below the the current*/ + /*Find the area below the current*/ if(ext->btn_id_focused == LV_BTNMATRIX_BTN_NONE) { ext->btn_id_focused = 0; } diff --git a/src/lv_widgets/lv_btnmatrix.h b/src/lv_widgets/lv_btnmatrix.h index 4fa0f849c3..a47e824016 100644 --- a/src/lv_widgets/lv_btnmatrix.h +++ b/src/lv_widgets/lv_btnmatrix.h @@ -104,7 +104,7 @@ void lv_btnmatrix_set_map(lv_obj_t * btnm, const char * map[]); * the number and order of the individual buttons (i.e. excludes * newline entries). * An element of the map should look like e.g.: - * `ctrl_map[0] = width | LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_TGL_ENABLE` + * `ctrl_map[0] = width | LV_BTNMATRIX_CTRL_NO_REPEAT | LV_BTNMATRIX_CTRL_TGL_ENABLE` */ void lv_btnmatrix_set_ctrl_map(lv_obj_t * btnm, const lv_btnmatrix_ctrl_t ctrl_map[]); @@ -198,15 +198,15 @@ bool lv_btnmatrix_get_recolor(const lv_obj_t * btnm); /** * Get the index of the lastly "activated" button by the user (pressed, released etc) - * Useful in the the `event_cb` to get the text of the button, check if hidden etc. + * Useful in the `event_cb` to get the text of the button, check if hidden etc. * @param btnm pointer to button matrix object - * @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset) + * @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset) */ uint16_t lv_btnmatrix_get_active_btn(const lv_obj_t * btnm); /** * Get the text of the lastly "activated" button by the user (pressed, released etc) - * Useful in the the `event_cb` + * Useful in the `event_cb` * @param btnm pointer to button matrix object * @return text of the last released button (NULL: if unset) */ @@ -215,7 +215,7 @@ const char * lv_btnmatrix_get_active_btn_text(const lv_obj_t * btnm); /** * Get the focused button's index. * @param btnm pointer to button matrix object - * @return index of the focused button (LV_BTNMATRIX_BTN_NONE: if unset) + * @return index of the focused button (LV_BTNMATRIX_BTN_NONE: if unset) */ uint16_t lv_btnmatrix_get_focused_btn(const lv_obj_t * btnm); @@ -224,7 +224,7 @@ uint16_t lv_btnmatrix_get_focused_btn(const lv_obj_t * btnm); * @param btnm pointer to button matrix object * @param btn_id the index a button not counting new line characters. (The return value of * lv_btnmatrix_get_pressed/released) - * @return text of btn_index` button + * @return text of btn_index` button */ const char * lv_btnmatrix_get_btn_text(const lv_obj_t * btnm, uint16_t btn_id); @@ -247,7 +247,7 @@ bool lv_btnmatrix_get_one_check(const lv_obj_t * btnm); /** * Get the align attribute - * @param btnm pointer to a btnmatrix object + * @param btnm pointer to a btnmatrix object * @return LV_LABEL_ALIGN_LEFT, LV_LABEL_ALIGN_RIGHT or LV_LABEL_ALIGN_CENTER */ lv_label_align_t lv_btnmatrix_get_align(const lv_obj_t * btnm); diff --git a/src/lv_widgets/lv_calendar.c b/src/lv_widgets/lv_calendar.c index 9346ca6534..c1643a8562 100644 --- a/src/lv_widgets/lv_calendar.c +++ b/src/lv_widgets/lv_calendar.c @@ -215,7 +215,7 @@ void lv_calendar_set_showed_date(lv_obj_t * calendar, lv_calendar_date_t * showe } /** - * Set the the highlighted dates + * Set the highlighted dates * @param calendar pointer to a calendar object * @param highlighted pointer to an `lv_calendar_date_t` array containing the dates. ONLY A POINTER * WILL BE SAVED! CAN'T BE LOCAL ARRAY. @@ -298,7 +298,7 @@ lv_calendar_date_t * lv_calendar_get_showed_date(const lv_obj_t * calendar) } /** - * Get the the pressed date. + * Get the pressed date. * @param calendar pointer to a calendar object * @return pointer to an `lv_calendar_date_t` variable containing the pressed date. * `NULL` if not date pressed (e.g. the header) @@ -312,7 +312,7 @@ lv_calendar_date_t * lv_calendar_get_pressed_date(const lv_obj_t * calendar) } /** - * Get the the highlighted dates + * Get the highlighted dates * @param calendar pointer to a calendar object * @return pointer to an `lv_calendar_date_t` array containing the dates. */ @@ -366,7 +366,7 @@ const char ** lv_calendar_get_month_names(const lv_obj_t * calendar) /** * Get the day of the week * @param year a year - * @param month a month (1..12) + * @param month a month (1..12) * @param day a day (1..31) * @return [0..6] which means [Sun..Sat] or [Mon..Sun] depending on LV_CALENDAR_WEEK_STARTS_MONDAY */ @@ -960,7 +960,7 @@ static void draw_dates(lv_obj_t * calendar, const lv_area_t * clip_area) * @param calendar pointer to a calendar object * @param draw_state which month is drawn (previous, active, next) * @param year a year - * @param month a month [1..12] + * @param month a month [1..12] * @param day a day [1..31] * @return true: highlighted */ @@ -993,7 +993,7 @@ static bool is_highlighted(lv_obj_t * calendar, day_draw_state_t draw_state, int * @param calendar pointer to a calendar object * @param draw_state which month is drawn (previous, active, next) * @param year a year - * @param month a month [1..12] + * @param month a month [1..12] * @param day a day [1..31] * @return true: highlighted */ diff --git a/src/lv_widgets/lv_calendar.h b/src/lv_widgets/lv_calendar.h index 66f2b24caa..c6489b0d8c 100644 --- a/src/lv_widgets/lv_calendar.h +++ b/src/lv_widgets/lv_calendar.h @@ -102,7 +102,7 @@ void lv_calendar_set_today_date(lv_obj_t * calendar, lv_calendar_date_t * today) void lv_calendar_set_showed_date(lv_obj_t * calendar, lv_calendar_date_t * showed); /** - * Set the the highlighted dates + * Set the highlighted dates * @param calendar pointer to a calendar object * @param highlighted pointer to an `lv_calendar_date_t` array containing the dates. ONLY A POINTER * WILL BE SAVED! CAN'T BE LOCAL ARRAY. @@ -147,7 +147,7 @@ lv_calendar_date_t * lv_calendar_get_today_date(const lv_obj_t * calendar); lv_calendar_date_t * lv_calendar_get_showed_date(const lv_obj_t * calendar); /** - * Get the the pressed date. + * Get the pressed date. * @param calendar pointer to a calendar object * @return pointer to an `lv_calendar_date_t` variable containing the pressed date. * `NULL` if not date pressed (e.g. the header) @@ -155,7 +155,7 @@ lv_calendar_date_t * lv_calendar_get_showed_date(const lv_obj_t * calendar); lv_calendar_date_t * lv_calendar_get_pressed_date(const lv_obj_t * calendar); /** - * Get the the highlighted dates + * Get the highlighted dates * @param calendar pointer to a calendar object * @return pointer to an `lv_calendar_date_t` array containing the dates. */ @@ -185,7 +185,7 @@ const char ** lv_calendar_get_month_names(const lv_obj_t * calendar); /** * Get the day of the week * @param year a year - * @param month a month (1..12) + * @param month a month (1..12) * @param day a day (1..31) * @return [0..6] which means [Sun..Sat] or [Mon..Sun] depending on LV_CALENDAR_WEEK_STARTS_MONDAY */ diff --git a/src/lv_widgets/lv_canvas.c b/src/lv_widgets/lv_canvas.c index 4203779c68..a5ecf7946a 100644 --- a/src/lv_widgets/lv_canvas.c +++ b/src/lv_widgets/lv_canvas.c @@ -1025,7 +1025,7 @@ void lv_canvas_draw_polygon(lv_obj_t * canvas, const lv_point_t points[], uint32 /** * Draw an arc on the canvas * @param canvas pointer to a canvas object - * @param x origo x of the arc + * @param x origo x of the arc * @param y origo y of the arc * @param r radius of the arc * @param start_angle start angle in degrees diff --git a/src/lv_widgets/lv_canvas.h b/src/lv_widgets/lv_canvas.h index 0c9ca80da1..13b503b969 100644 --- a/src/lv_widgets/lv_canvas.h +++ b/src/lv_widgets/lv_canvas.h @@ -232,7 +232,7 @@ void lv_canvas_draw_polygon(lv_obj_t * canvas, const lv_point_t points[], uint32 /** * Draw an arc on the canvas * @param canvas pointer to a canvas object - * @param x origo x of the arc + * @param x origo x of the arc * @param y origo y of the arc * @param r radius of the arc * @param start_angle start angle in degrees diff --git a/src/lv_widgets/lv_chart.c b/src/lv_widgets/lv_chart.c index b6ed55ce74..edff8aaebe 100644 --- a/src/lv_widgets/lv_chart.c +++ b/src/lv_widgets/lv_chart.c @@ -424,7 +424,7 @@ void lv_chart_set_point_count(lv_obj_t * chart, uint16_t point_cnt) * Initialize all data points with a value * @param chart pointer to chart object * @param ser pointer to a data series on 'chart' - * @param y the new value for all points + * @param y the new value for all points */ void lv_chart_init_points(lv_obj_t * chart, lv_chart_series_t * ser, lv_coord_t y) { @@ -901,8 +901,8 @@ lv_coord_t lv_chart_get_y_from_index(lv_obj_t * chart, lv_chart_series_t * ser, /** * Get the series area of a chart. - * @param chart pointer to a chart object - * @param series_area pointer to an area variable that the result will be put in. + * @param chart pointer to a chart object + * @param series_area pointer to an area variable that the result will be put in. */ void lv_chart_get_series_area(lv_obj_t * chart, lv_area_t * series_area) { diff --git a/src/lv_widgets/lv_chart.h b/src/lv_widgets/lv_chart.h index df75a6d362..2b1ea07aff 100644 --- a/src/lv_widgets/lv_chart.h +++ b/src/lv_widgets/lv_chart.h @@ -223,7 +223,7 @@ void lv_chart_set_point_count(lv_obj_t * chart, uint16_t point_cnt); * Initialize all data points with a value * @param chart pointer to chart object * @param ser pointer to a data series on 'chart' - * @param y the new value for all points + * @param y the new value for all points */ void lv_chart_init_points(lv_obj_t * chart, lv_chart_series_t * ser, lv_coord_t y); diff --git a/src/lv_widgets/lv_checkbox.h b/src/lv_widgets/lv_checkbox.h index 0ea2ecf379..7e301615fb 100644 --- a/src/lv_widgets/lv_checkbox.h +++ b/src/lv_widgets/lv_checkbox.h @@ -19,11 +19,11 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_BTN == 0 -#error "lv_cb: lv_btn is required. Enable it in lv_conf.h (LV_USE_BTN 1) " +#error "lv_cb: lv_btn is required. Enable it in lv_conf.h (LV_USE_BTN 1)" #endif #if LV_USE_LABEL == 0 -#error "lv_cb: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1) " +#error "lv_cb: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)" #endif #include "../lv_core/lv_obj.h" diff --git a/src/lv_widgets/lv_cont.c b/src/lv_widgets/lv_cont.c index 7a21bc2b38..679576a146 100644 --- a/src/lv_widgets/lv_cont.c +++ b/src/lv_widgets/lv_cont.c @@ -508,7 +508,7 @@ static void lv_cont_layout_pretty(lv_obj_t * cont) lv_coord_t pright = lv_obj_get_style_pad_right(cont, LV_CONT_PART_MAIN); lv_coord_t pinner = lv_obj_get_style_pad_inner(cont, LV_CONT_PART_MAIN); - child_rc = child_rs; /*Initially the the row starter and closer is the same*/ + child_rc = child_rs; /*Initially the row starter and closer is the same*/ while(child_rs != NULL) { lv_coord_t h_row = 0; lv_coord_t w_row = pleft + pright; /*The width is at least the left+right pad*/ diff --git a/src/lv_widgets/lv_dropdown.c b/src/lv_widgets/lv_dropdown.c index f33cd3d738..84664e2810 100644 --- a/src/lv_widgets/lv_dropdown.c +++ b/src/lv_widgets/lv_dropdown.c @@ -1105,7 +1105,7 @@ static lv_res_t lv_dropdown_page_scrl_signal(lv_obj_t * scrl, lv_signal_t sign, ext->pr_opt_id = LV_DROPDOWN_PR_NONE; lv_obj_invalidate(page); } - else if(sign == LV_SIGNAL_REFR_EXT_DRAW_PAD) { + else if(sign == LV_SIGNAL_REFR_EXT_DRAW_PAD) { /* Make possible to draw on the full width of the background to redraw the selected rectangle * when the ddlist is scrolled in fix height mode. * (The scrollable is scrolled then "select rectangle" is drawn on the bg too)*/ diff --git a/src/lv_widgets/lv_dropdown.h b/src/lv_widgets/lv_dropdown.h index 05c6bb553b..7676d29184 100644 --- a/src/lv_widgets/lv_dropdown.h +++ b/src/lv_widgets/lv_dropdown.h @@ -19,11 +19,11 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_PAGE == 0 -#error "lv_ddlist: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1) " +#error "lv_ddlist: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1)" #endif #if LV_USE_LABEL == 0 -#error "lv_ddlist: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1) " +#error "lv_ddlist: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)" #endif #include "../lv_widgets/lv_page.h" @@ -123,7 +123,7 @@ void lv_dropdown_set_options_static(lv_obj_t * ddlist, const char * options); * Add an options to a drop down list from a string. Only works for dynamic options. * @param ddlist pointer to drop down list object * @param option a string without '\n'. E.g. "Four" - * @param pos the insert position, indexed from 0, LV_DROPDOWN_POS_LAST = end of string + * @param pos the insert position, indexed from 0, LV_DROPDOWN_POS_LAST = end of string */ void lv_dropdown_add_option(lv_obj_t * ddlist, const char * option, uint32_t pos); diff --git a/src/lv_widgets/lv_gauge.h b/src/lv_widgets/lv_gauge.h index c2293dd819..7194757795 100644 --- a/src/lv_widgets/lv_gauge.h +++ b/src/lv_widgets/lv_gauge.h @@ -19,7 +19,7 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_LINEMETER == 0 -#error "lv_gauge: lv_linemeter is required. Enable it in lv_conf.h (LV_USE_LINEMETER 1) " +#error "lv_gauge: lv_linemeter is required. Enable it in lv_conf.h (LV_USE_LINEMETER 1)" #endif #include "../lv_core/lv_obj.h" diff --git a/src/lv_widgets/lv_img.c b/src/lv_widgets/lv_img.c index ab77125aa9..a85346607f 100644 --- a/src/lv_widgets/lv_img.c +++ b/src/lv_widgets/lv_img.c @@ -11,7 +11,7 @@ /*Testing of dependencies*/ #if LV_USE_LABEL == 0 - #error "lv_img: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1) " + #error "lv_img: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)" #endif #include "../lv_misc/lv_debug.h" diff --git a/src/lv_widgets/lv_imgbtn.c b/src/lv_widgets/lv_imgbtn.c index 76b9be8818..a52bdec080 100644 --- a/src/lv_widgets/lv_imgbtn.c +++ b/src/lv_widgets/lv_imgbtn.c @@ -195,7 +195,7 @@ void lv_imgbtn_toggle(lv_obj_t * imgbtn) *====================*/ /** - * Get the images in a given state + * Get the images in a given state * @param imgbtn pointer to an image button object * @param state the state where to get the image (from `lv_btn_state_t`) ` * @return pointer to an image source (a C array or path to a file) @@ -521,7 +521,7 @@ static void refr_img(lv_obj_t * imgbtn) if(info_res == LV_RES_OK) { ext->act_cf = header.cf; if(ext->tiled) lv_obj_set_height(imgbtn, header.h); /*Keep the sure defined width*/ - else lv_obj_set_size(imgbtn, header.w, header.h); + else lv_obj_set_size(imgbtn, header.w, header.h); } else { ext->act_cf = LV_IMG_CF_UNKNOWN; diff --git a/src/lv_widgets/lv_imgbtn.h b/src/lv_widgets/lv_imgbtn.h index 1f939f934d..1f3130dff3 100644 --- a/src/lv_widgets/lv_imgbtn.h +++ b/src/lv_widgets/lv_imgbtn.h @@ -19,7 +19,7 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_BTN == 0 -#error "lv_imgbtn: lv_btn is required. Enable it in lv_conf.h (LV_USE_BTN 1) " +#error "lv_imgbtn: lv_btn is required. Enable it in lv_conf.h (LV_USE_BTN 1)" #endif #include "../lv_core/lv_obj.h" @@ -127,7 +127,7 @@ static inline void lv_imgbtn_set_checkable(lv_obj_t * imgbtn, bool tgl) #if LV_IMGBTN_TILED == 0 /** - * Get the images in a given state + * Get the images in a given state * @param imgbtn pointer to an image button object * @param state the state where to get the image (from `lv_btn_state_t`) ` * @return pointer to an image source (a C array or path to a file) diff --git a/src/lv_widgets/lv_keyboard.c b/src/lv_widgets/lv_keyboard.c index ae40b4deb6..589a5e17e3 100644 --- a/src/lv_widgets/lv_keyboard.c +++ b/src/lv_widgets/lv_keyboard.c @@ -329,7 +329,7 @@ bool lv_keyboard_get_cursor_manage(const lv_obj_t * kb) * Default keyboard event to add characters to the Text area and change the map. * If a custom `event_cb` is added to the keyboard this function be called from it to handle the * button clicks - * @param kb pointer to a keyboard + * @param kb pointer to a keyboard * @param event the triggering event */ void lv_keyboard_def_event_cb(lv_obj_t * kb, lv_event_t event) @@ -372,7 +372,7 @@ void lv_keyboard_def_event_cb(lv_obj_t * kb, lv_event_t event) if(res != LV_RES_OK) return; } else { - lv_keyboard_set_textarea(kb, NULL); /*De-assign the text area to hide it cursor if needed*/ + lv_keyboard_set_textarea(kb, NULL); /*De-assign the text area to hide it cursor if needed*/ lv_obj_del(kb); return; } diff --git a/src/lv_widgets/lv_keyboard.h b/src/lv_widgets/lv_keyboard.h index 3edd344b09..626a4d5434 100644 --- a/src/lv_widgets/lv_keyboard.h +++ b/src/lv_widgets/lv_keyboard.h @@ -19,11 +19,11 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_BTNMATRIX == 0 -#error "lv_kb: lv_btnm is required. Enable it in lv_conf.h (LV_USE_BTNMATRIX 1) " +#error "lv_kb: lv_btnm is required. Enable it in lv_conf.h (LV_USE_BTNMATRIX 1)" #endif #if LV_USE_TEXTAREA == 0 -#error "lv_kb: lv_ta is required. Enable it in lv_conf.h (LV_USE_TEXTAREA 1) " +#error "lv_kb: lv_ta is required. Enable it in lv_conf.h (LV_USE_TEXTAREA 1)" #endif #include "../lv_core/lv_obj.h" @@ -162,7 +162,7 @@ static inline const char ** lv_keyboard_get_map_array(const lv_obj_t * kb) * Default keyboard event to add characters to the Text area and change the map. * If a custom `event_cb` is added to the keyboard this function be called from it to handle the * button clicks - * @param kb pointer to a keyboard + * @param kb pointer to a keyboard * @param event the triggering event */ void lv_keyboard_def_event_cb(lv_obj_t * kb, lv_event_t event); diff --git a/src/lv_widgets/lv_label.c b/src/lv_widgets/lv_label.c index 4f43782ddb..112143b88e 100644 --- a/src/lv_widgets/lv_label.c +++ b/src/lv_widgets/lv_label.c @@ -738,7 +738,7 @@ uint32_t lv_label_get_letter_on(const lv_obj_t * label, lv_point_t * pos_in) lv_coord_t gw = lv_font_get_glyph_width(font, letter, letter_next); /*Finish if the x position or the last char of the next line is reached*/ - if(pos.x < x + gw || i + line_start == new_line_start || txt[i_act + line_start] == '\0') { + if(pos.x < x + gw || i + line_start == new_line_start || txt[i_act + line_start] == '\0') { i = i_act; break; } @@ -765,7 +765,7 @@ uint32_t lv_label_get_letter_on(const lv_obj_t * label, lv_point_t * pos_in) logical_pos = _lv_txt_encoded_get_char_id(bidi_txt, i); #endif - return logical_pos + _lv_txt_encoded_get_char_id(txt, line_start); + return logical_pos + _lv_txt_encoded_get_char_id(txt, line_start); } /** diff --git a/src/lv_widgets/lv_list.h b/src/lv_widgets/lv_list.h index f78cd3cf97..4afe245cbf 100644 --- a/src/lv_widgets/lv_list.h +++ b/src/lv_widgets/lv_list.h @@ -19,15 +19,15 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_PAGE == 0 -#error "lv_list: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1) " +#error "lv_list: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1)" #endif #if LV_USE_BTN == 0 -#error "lv_list: lv_btn is required. Enable it in lv_conf.h (LV_USE_BTN 1) " +#error "lv_list: lv_btn is required. Enable it in lv_conf.h (LV_USE_BTN 1)" #endif #if LV_USE_LABEL == 0 -#error "lv_list: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1) " +#error "lv_list: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)" #endif #include "../lv_core/lv_obj.h" diff --git a/src/lv_widgets/lv_msgbox.c b/src/lv_widgets/lv_msgbox.c index 203c8d0073..d5669865ed 100644 --- a/src/lv_widgets/lv_msgbox.c +++ b/src/lv_widgets/lv_msgbox.c @@ -233,7 +233,7 @@ void lv_msgbox_set_text_fmt(lv_obj_t * mbox, const char * fmt, ...) /** * Set animation duration * @param mbox pointer to a message box object - * @param anim_time animation length in milliseconds (0: no animation) + * @param anim_time animation length in milliseconds (0: no animation) */ void lv_msgbox_set_anim_time(lv_obj_t * mbox, uint16_t anim_time) { @@ -344,9 +344,9 @@ const char * lv_msgbox_get_text(const lv_obj_t * mbox) /** * Get the index of the lastly "activated" button by the user (pressed, released etc) - * Useful in the the `event_cb`. + * Useful in the `event_cb`. * @param mbox pointer to message box object - * @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset) + * @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset) */ uint16_t lv_msgbox_get_active_btn(lv_obj_t * mbox) { @@ -365,7 +365,7 @@ uint16_t lv_msgbox_get_active_btn(lv_obj_t * mbox) /** * Get the text of the lastly "activated" button by the user (pressed, released etc) - * Useful in the the `event_cb`. + * Useful in the `event_cb`. * @param mbox pointer to message box object * @return text of the last released button (NULL: if unset) */ @@ -383,7 +383,7 @@ const char * lv_msgbox_get_active_btn_text(lv_obj_t * mbox) /** * Get the animation duration (close animation time) * @param mbox pointer to a message box object - * @return animation length in milliseconds (0: no animation) + * @return animation length in milliseconds (0: no animation) */ uint16_t lv_msgbox_get_anim_time(const lv_obj_t * mbox) { diff --git a/src/lv_widgets/lv_msgbox.h b/src/lv_widgets/lv_msgbox.h index 263a442f97..18c3f1246d 100644 --- a/src/lv_widgets/lv_msgbox.h +++ b/src/lv_widgets/lv_msgbox.h @@ -19,15 +19,15 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_CONT == 0 -#error "lv_mbox: lv_cont is required. Enable it in lv_conf.h (LV_USE_CONT 1) " +#error "lv_mbox: lv_cont is required. Enable it in lv_conf.h (LV_USE_CONT 1)" #endif #if LV_USE_BTNMATRIX == 0 -#error "lv_mbox: lv_btnm is required. Enable it in lv_conf.h (LV_USE_BTNMATRIX 1) " +#error "lv_mbox: lv_btnm is required. Enable it in lv_conf.h (LV_USE_BTNMATRIX 1)" #endif #if LV_USE_LABEL == 0 -#error "lv_mbox: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1) " +#error "lv_mbox: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)" #endif #include "../lv_core/lv_obj.h" @@ -109,7 +109,7 @@ void lv_msgbox_set_text_fmt(lv_obj_t * mbox, const char * fmt, ...); /** * Set animation duration * @param mbox pointer to a message box object - * @param anim_time animation length in milliseconds (0: no animation) + * @param anim_time animation length in milliseconds (0: no animation) */ void lv_msgbox_set_anim_time(lv_obj_t * mbox, uint16_t anim_time); @@ -146,15 +146,15 @@ const char * lv_msgbox_get_text(const lv_obj_t * mbox); /** * Get the index of the lastly "activated" button by the user (pressed, released etc) - * Useful in the the `event_cb`. + * Useful in the `event_cb`. * @param mbox pointer to message box object - * @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset) + * @return index of the last released button (LV_BTNMATRIX_BTN_NONE: if unset) */ uint16_t lv_msgbox_get_active_btn(lv_obj_t * mbox); /** * Get the text of the lastly "activated" button by the user (pressed, released etc) - * Useful in the the `event_cb`. + * Useful in the `event_cb`. * @param mbox pointer to message box object * @return text of the last released button (NULL: if unset) */ @@ -163,7 +163,7 @@ const char * lv_msgbox_get_active_btn_text(lv_obj_t * mbox); /** * Get the animation duration (close animation time) * @param mbox pointer to a message box object - * @return animation length in milliseconds (0: no animation) + * @return animation length in milliseconds (0: no animation) */ uint16_t lv_msgbox_get_anim_time(const lv_obj_t * mbox); diff --git a/src/lv_widgets/lv_page.c b/src/lv_widgets/lv_page.c index 85cf212531..d044676671 100644 --- a/src/lv_widgets/lv_page.c +++ b/src/lv_widgets/lv_page.c @@ -383,7 +383,7 @@ lv_coord_t lv_page_get_height_fit(lv_obj_t * page) * Take into account the paddings of the background and scrollable too. * @param page pointer to an object * @param div indicates how many columns are assumed. - * If 1 the width will be set the the parent's width + * If 1 the width will be set the parent's width * If 2 only half parent width - inner padding of the parent * If 3 only third parent width - 2 * inner padding of the parent * @param span how many columns are combined @@ -406,7 +406,7 @@ lv_coord_t lv_page_get_width_grid(lv_obj_t * page, uint8_t div, uint8_t span) * Take into account the paddings of the background and scrollable too. * @param obj pointer to an object * @param div indicates how many rows are assumed. - * If 1 the height will be set the the parent's height + * If 1 the height will be set the parent's height * If 2 only half parent height - inner padding of the parent * If 3 only third parent height - 2 * inner padding of the parent * @param span how many rows are combined @@ -536,7 +536,7 @@ void lv_page_focus(lv_obj_t * page, const lv_obj_t * obj, lv_anim_enable_t anim_ scrlable_x = -(obj_x - scrl_left - bg_left); scrlable_x += scrl_left; } - /*Out of the page on the rigth*/ + /*Out of the page on the right*/ else if((obj_w <= page_w && right_err > 0) || (obj_w > page_w && left_err >= right_err)) { /*Calculate a new position and let some space on the side*/ scrlable_x = -(obj_x + scrl_right + bg_right); diff --git a/src/lv_widgets/lv_page.h b/src/lv_widgets/lv_page.h index 051dce5093..0894572e86 100644 --- a/src/lv_widgets/lv_page.h +++ b/src/lv_widgets/lv_page.h @@ -19,7 +19,7 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_CONT == 0 -#error "lv_page: lv_cont is required. Enable it in lv_conf.h (LV_USE_CONT 1) " +#error "lv_page: lv_cont is required. Enable it in lv_conf.h (LV_USE_CONT 1)" #endif #include "lv_cont.h" @@ -273,7 +273,7 @@ lv_coord_t lv_page_get_height_fit(lv_obj_t * page); * Take into account the paddings of the background and scrollable too. * @param page pointer to an object * @param div indicates how many columns are assumed. - * If 1 the width will be set the the parent's width + * If 1 the width will be set the parent's width * If 2 only half parent width - inner padding of the parent * If 3 only third parent width - 2 * inner padding of the parent * @param span how many columns are combined @@ -286,7 +286,7 @@ lv_coord_t lv_page_get_width_grid(lv_obj_t * page, uint8_t div, uint8_t span); * Take into account the paddings of the background and scrollable too. * @param page pointer to an object * @param div indicates how many rows are assumed. - * If 1 the height will be set the the parent's height + * If 1 the height will be set the parent's height * If 2 only half parent height - inner padding of the parent * If 3 only third parent height - 2 * inner padding of the parent * @param span how many rows are combined diff --git a/src/lv_widgets/lv_roller.c b/src/lv_widgets/lv_roller.c index ba8440762f..1b20332a32 100644 --- a/src/lv_widgets/lv_roller.c +++ b/src/lv_widgets/lv_roller.c @@ -522,7 +522,7 @@ static lv_design_res_t lv_roller_label_design(lv_obj_t * label, const lv_area_t } /*Draw the object*/ else if(mode == LV_DESIGN_DRAW_MAIN) { - /* Split the drawing of the label into an upper (above the selected area) + /* Split the drawing of the label into an upper (above the selected area) * and a lower (below the selected area)*/ lv_obj_t * roller = lv_obj_get_parent(lv_obj_get_parent(label)); const lv_font_t * font = lv_obj_get_style_text_font(roller, LV_ROLLER_PART_BG); diff --git a/src/lv_widgets/lv_roller.h b/src/lv_widgets/lv_roller.h index 06e9e73839..727dc9dab0 100644 --- a/src/lv_widgets/lv_roller.h +++ b/src/lv_widgets/lv_roller.h @@ -19,7 +19,7 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_PAGE == 0 -#error "lv_roller: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1) " +#error "lv_roller: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1)" #endif #include "../lv_core/lv_obj.h" diff --git a/src/lv_widgets/lv_slider.h b/src/lv_widgets/lv_slider.h index 2f0d86a44e..b2797507fc 100644 --- a/src/lv_widgets/lv_slider.h +++ b/src/lv_widgets/lv_slider.h @@ -19,7 +19,7 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_BAR == 0 -#error "lv_slider: lv_bar is required. Enable it in lv_conf.h (LV_USE_BAR 1) " +#error "lv_slider: lv_bar is required. Enable it in lv_conf.h (LV_USE_BAR 1)" #endif #include "../lv_core/lv_obj.h" diff --git a/src/lv_widgets/lv_spinbox.h b/src/lv_widgets/lv_spinbox.h index 83c057f58a..93c665d27d 100644 --- a/src/lv_widgets/lv_spinbox.h +++ b/src/lv_widgets/lv_spinbox.h @@ -19,7 +19,7 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_TEXTAREA == 0 -#error "lv_spinbox: lv_ta is required. Enable it in lv_conf.h (LV_USE_TEXTAREA 1) " +#error "lv_spinbox: lv_ta is required. Enable it in lv_conf.h (LV_USE_TEXTAREA 1)" #endif #include "../lv_core/lv_obj.h" diff --git a/src/lv_widgets/lv_spinner.c b/src/lv_widgets/lv_spinner.c index 8e0e2dcd00..b7677d3fa0 100644 --- a/src/lv_widgets/lv_spinner.c +++ b/src/lv_widgets/lv_spinner.c @@ -121,7 +121,7 @@ lv_obj_t * lv_spinner_create(lv_obj_t * par, const lv_obj_t * copy) *=====================*/ /** - * Set the length of the spinning arc in degrees + * Set the length of the spinning arc in degrees * @param spinner pointer to a spinner object * @param deg length of the arc */ diff --git a/src/lv_widgets/lv_spinner.h b/src/lv_widgets/lv_spinner.h index 6649202e45..dea0088192 100644 --- a/src/lv_widgets/lv_spinner.h +++ b/src/lv_widgets/lv_spinner.h @@ -19,11 +19,11 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_ARC == 0 -#error "lv_spinner: lv_arc is required. Enable it in lv_conf.h (LV_USE_ARC 1) " +#error "lv_spinner: lv_arc is required. Enable it in lv_conf.h (LV_USE_ARC 1)" #endif #if LV_USE_ANIMATION == 0 -#error "lv_spinner: animations are required. Enable it in lv_conf.h (LV_USE_ANIMATION 1) " +#error "lv_spinner: animations are required. Enable it in lv_conf.h (LV_USE_ANIMATION 1)" #endif #include "../lv_core/lv_obj.h" @@ -95,7 +95,7 @@ lv_obj_t * lv_spinner_create(lv_obj_t * par, const lv_obj_t * copy); *=====================*/ /** - * Set the length of the spinning arc in degrees + * Set the length of the spinning arc in degrees * @param spinner pointer to a spinner object * @param deg length of the arc */ diff --git a/src/lv_widgets/lv_switch.c b/src/lv_widgets/lv_switch.c index 0a43def6f7..9561b7bf76 100644 --- a/src/lv_widgets/lv_switch.c +++ b/src/lv_widgets/lv_switch.c @@ -12,7 +12,7 @@ /*Testing of dependencies*/ #if LV_USE_SLIDER == 0 - #error "lv_sw: lv_slider is required. Enable it in lv_conf.h (LV_USE_SLIDER 1) " + #error "lv_sw: lv_slider is required. Enable it in lv_conf.h (LV_USE_SLIDER 1)" #endif #include "../lv_misc/lv_debug.h" diff --git a/src/lv_widgets/lv_switch.h b/src/lv_widgets/lv_switch.h index 868951cc72..4869100a13 100644 --- a/src/lv_widgets/lv_switch.h +++ b/src/lv_widgets/lv_switch.h @@ -19,7 +19,7 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_SLIDER == 0 -#error "lv_sw: lv_slider is required. Enable it in lv_conf.h (LV_USE_SLIDER 1)" +#error "lv_sw: lv_slider is required. Enable it in lv_conf.h (LV_USE_SLIDER 1)" #endif #include "../lv_core/lv_obj.h" @@ -91,7 +91,7 @@ bool lv_switch_toggle(lv_obj_t * sw, lv_anim_enable_t anim); /** * Set the animation time of the switch - * @param sw pointer to a switch object + * @param sw pointer to a switch object * @param anim_time animation time * @return style pointer to a style */ @@ -116,7 +116,7 @@ static inline bool lv_switch_get_state(const lv_obj_t * sw) /** * Get the animation time of the switch - * @param sw pointer to a switch object + * @param sw pointer to a switch object * @return style pointer to a style */ static inline uint16_t lv_switch_get_anim_time(const lv_obj_t * sw) diff --git a/src/lv_widgets/lv_table.h b/src/lv_widgets/lv_table.h index ea00c45ed8..a5b0ab5753 100644 --- a/src/lv_widgets/lv_table.h +++ b/src/lv_widgets/lv_table.h @@ -19,7 +19,7 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_LABEL == 0 -#error "lv_table: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1) " +#error "lv_table: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)" #endif #include "../lv_core/lv_obj.h" @@ -56,7 +56,7 @@ typedef union { struct { uint8_t align : 2; uint8_t right_merge : 1; - uint8_t type : 4; // upto 16 values + uint8_t type : 4; // up to 16 values uint8_t crop : 1; } s; uint8_t format_byte; @@ -78,7 +78,7 @@ uint16_t cell_types : /*Parts of the table*/ enum { LV_TABLE_PART_BG, /* Because of this member, LV_PART.*CELL1 has enum value of 1, */ - LV_TABLE_PART_CELL1, /* LV_PART.*CELL2 has an enum value of 2 and so on upto the maximum */ + LV_TABLE_PART_CELL1, /* LV_PART.*CELL2 has an enum value of 2 and so on up to the maximum */ LV_TABLE_PART_CELL2, /* number of styles specified by LV_TABLE_CELL_STYLE_CNT */ LV_TABLE_PART_CELL3, LV_TABLE_PART_CELL4, /* CELL 5-16 are not needed to be defined, the values in this enum diff --git a/src/lv_widgets/lv_tabview.c b/src/lv_widgets/lv_tabview.c index b7345c1f19..325dbae8c2 100644 --- a/src/lv_widgets/lv_tabview.c +++ b/src/lv_widgets/lv_tabview.c @@ -223,7 +223,7 @@ lv_obj_t * lv_tabview_add_tab(lv_obj_t * tabview, const char * name) /*Extend the button matrix map with the new name*/ char * name_dm; - name_dm = lv_mem_alloc(strlen(name) + 1); /*+1 for the the closing '\0' */ + name_dm = lv_mem_alloc(strlen(name) + 1); /*+1 for the closing '\0' */ LV_ASSERT_MEM(name_dm); if(name_dm == NULL) return NULL; strcpy(name_dm, name); @@ -747,15 +747,15 @@ static lv_res_t tabview_scrl_signal(lv_obj_t * tabview_scrl, lv_signal_t sign, v if(tab_page == NULL) return LV_RES_OK; lv_coord_t page_x1 = tab_page->coords.x1 - tabview->coords.x1 + x_predict; lv_coord_t page_x2 = page_x1 + lv_obj_get_width(tabview); - lv_coord_t treshold = lv_obj_get_width(tabview) / 2; + lv_coord_t threshold = lv_obj_get_width(tabview) / 2; lv_bidi_dir_t base_dir = lv_obj_get_base_dir(tabview); int16_t tab_cur = ext->tab_cur; - if(page_x1 > treshold) { + if(page_x1 > threshold) { if(base_dir != LV_BIDI_DIR_RTL) tab_cur--; else tab_cur ++; } - else if(page_x2 < treshold) { + else if(page_x2 < threshold) { if(base_dir != LV_BIDI_DIR_RTL) tab_cur++; else tab_cur --; } diff --git a/src/lv_widgets/lv_tabview.h b/src/lv_widgets/lv_tabview.h index 6970d8e18e..4254d29df1 100644 --- a/src/lv_widgets/lv_tabview.h +++ b/src/lv_widgets/lv_tabview.h @@ -19,11 +19,11 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_BTNMATRIX == 0 -#error "lv_tabview: lv_btnm is required. Enable it in lv_conf.h (LV_USE_BTNMATRIX 1) " +#error "lv_tabview: lv_btnm is required. Enable it in lv_conf.h (LV_USE_BTNMATRIX 1)" #endif #if LV_USE_PAGE == 0 -#error "lv_tabview: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1) " +#error "lv_tabview: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1)" #endif #include "../lv_core/lv_obj.h" diff --git a/src/lv_widgets/lv_textarea.c b/src/lv_widgets/lv_textarea.c index 4b231f07a0..58b1df001f 100644 --- a/src/lv_widgets/lv_textarea.c +++ b/src/lv_widgets/lv_textarea.c @@ -688,7 +688,7 @@ void lv_textarea_set_cursor_hidden(lv_obj_t * ta, bool hide) } /** - * Enable/Disable the positioning of the the cursor by clicking the text on the text area. + * Enable/Disable the positioning of the cursor by clicking the text on the text area. * @param ta pointer to a text area object * @param en true: enable click positions; false: disable */ @@ -816,7 +816,7 @@ void lv_textarea_set_text_align(lv_obj_t * ta, lv_label_align_t align) /** * Set a list of characters. Only these characters will be accepted by the text area - * @param ta pointer to Text Area + * @param ta pointer to Text Area * @param list list of characters. Only the pointer is saved. E.g. "+-.,0123456789" */ void lv_textarea_set_accepted_chars(lv_obj_t * ta, const char * list) @@ -830,7 +830,7 @@ void lv_textarea_set_accepted_chars(lv_obj_t * ta, const char * list) /** * Set max length of a Text Area. - * @param ta pointer to Text Area + * @param ta pointer to Text Area * @param num the maximal number of characters can be added (`lv_textarea_set_text` ignores it) */ void lv_textarea_set_max_length(lv_obj_t * ta, uint32_t num) @@ -1058,7 +1058,7 @@ bool lv_textarea_get_one_line(const lv_obj_t * ta) /** * Get a list of accepted characters. - * @param ta pointer to Text Area + * @param ta pointer to Text Area * @return list of accented characters. */ const char * lv_textarea_get_accepted_chars(lv_obj_t * ta) @@ -1072,7 +1072,7 @@ const char * lv_textarea_get_accepted_chars(lv_obj_t * ta) /** * Set max length of a Text Area. - * @param ta pointer to Text Area + * @param ta pointer to Text Area * @return the maximal number of characters to be add */ uint32_t lv_textarea_get_max_length(lv_obj_t * ta) @@ -1301,7 +1301,7 @@ static lv_design_res_t lv_textarea_design(lv_obj_t * ta, const lv_area_t * clip_ /** * An extended scrollable design of the page. Calls the normal design function and draws a cursor. * @param scrl pointer to the scrollable part of the Text area - * @param clip_area the object will be drawn only in this area + * @param clip_area the object will be drawn only in this area * @param mode LV_DESIGN_COVER_CHK: only check if the object fully covers the 'mask_p' area * (return 'true' if yes) * LV_DESIGN_DRAW_MAIN: draw the object (always return 'true') diff --git a/src/lv_widgets/lv_textarea.h b/src/lv_widgets/lv_textarea.h index 5ccb8ac9a4..258fb2c415 100644 --- a/src/lv_widgets/lv_textarea.h +++ b/src/lv_widgets/lv_textarea.h @@ -19,11 +19,11 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_PAGE == 0 -#error "lv_ta: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1) " +#error "lv_ta: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1)" #endif #if LV_USE_LABEL == 0 -#error "lv_ta: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1) " +#error "lv_ta: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)" #endif #include "../lv_core/lv_obj.h" @@ -166,7 +166,7 @@ void lv_textarea_set_cursor_pos(lv_obj_t * ta, int32_t pos); void lv_textarea_set_cursor_hidden(lv_obj_t * ta, bool hide); /** - * Enable/Disable the positioning of the the cursor by clicking the text on the text area. + * Enable/Disable the positioning of the cursor by clicking the text on the text area. * @param ta pointer to a text area object * @param en true: enable click positions; false: disable */ @@ -197,14 +197,14 @@ void lv_textarea_set_text_align(lv_obj_t * ta, lv_label_align_t align); /** * Set a list of characters. Only these characters will be accepted by the text area - * @param ta pointer to Text Area + * @param ta pointer to Text Area * @param list list of characters. Only the pointer is saved. E.g. "+-.,0123456789" */ void lv_textarea_set_accepted_chars(lv_obj_t * ta, const char * list); /** * Set max length of a Text Area. - * @param ta pointer to Text Area + * @param ta pointer to Text Area * @param num the maximal number of characters can be added (`lv_textarea_set_text` ignores it) */ void lv_textarea_set_max_length(lv_obj_t * ta, uint32_t num); @@ -333,14 +333,14 @@ bool lv_textarea_get_one_line(const lv_obj_t * ta); /** * Get a list of accepted characters. - * @param ta pointer to Text Area + * @param ta pointer to Text Area * @return list of accented characters. */ const char * lv_textarea_get_accepted_chars(lv_obj_t * ta); /** * Get max length of a Text Area. - * @param ta pointer to Text Area + * @param ta pointer to Text Area * @return the maximal number of characters to be add */ uint32_t lv_textarea_get_max_length(lv_obj_t * ta); diff --git a/src/lv_widgets/lv_win.c b/src/lv_widgets/lv_win.c index e744a915e2..83ba6973de 100644 --- a/src/lv_widgets/lv_win.c +++ b/src/lv_widgets/lv_win.c @@ -439,7 +439,7 @@ lv_coord_t lv_win_get_btn_width(lv_obj_t * win) } /** - * Get the pointer of a widow from one of its control button. + * Get the pointer of a widow from one of its control button. * It is useful in the action of the control buttons where only button is known. * @param ctrl_btn pointer to a control button of a window * @return pointer to the window of 'ctrl_btn' diff --git a/src/lv_widgets/lv_win.h b/src/lv_widgets/lv_win.h index ac1f7b1cba..09236d1ccf 100644 --- a/src/lv_widgets/lv_win.h +++ b/src/lv_widgets/lv_win.h @@ -19,19 +19,19 @@ extern "C" { /*Testing of dependencies*/ #if LV_USE_BTN == 0 -#error "lv_win: lv_btn is required. Enable it in lv_conf.h (LV_USE_BTN 1) " +#error "lv_win: lv_btn is required. Enable it in lv_conf.h (LV_USE_BTN 1)" #endif #if LV_USE_LABEL == 0 -#error "lv_win: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1) " +#error "lv_win: lv_label is required. Enable it in lv_conf.h (LV_USE_LABEL 1)" #endif #if LV_USE_IMG == 0 -#error "lv_win: lv_img is required. Enable it in lv_conf.h (LV_USE_IMG 1) " +#error "lv_win: lv_img is required. Enable it in lv_conf.h (LV_USE_IMG 1)" #endif #if LV_USE_PAGE == 0 -#error "lv_win: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1) " +#error "lv_win: lv_page is required. Enable it in lv_conf.h (LV_USE_PAGE 1)" #endif #include "../lv_core/lv_obj.h" @@ -216,7 +216,7 @@ lv_coord_t lv_win_get_header_height(const lv_obj_t * win); lv_coord_t lv_win_get_btn_width(lv_obj_t * win); /** - * Get the pointer of a widow from one of its control button. + * Get the pointer of a widow from one of its control button. * It is useful in the action of the control buttons where only button is known. * @param ctrl_btn pointer to a control button of a window * @return pointer to the window of 'ctrl_btn' diff --git a/tests/build.py b/tests/build.py index 2f54b29328..43b6134473 100755 --- a/tests/build.py +++ b/tests/build.py @@ -34,7 +34,7 @@ def build(name, defines): print("---------------------------") ret = os.system(cmd) if(ret != 0): - print("BUILD ERROR! (error code " + str(ret) + ")") + print("BUILD ERROR! (error code " + str(ret) + ")") exit(1) print("---------------------------") @@ -42,7 +42,7 @@ def build(name, defines): print("---------------------------") ret = os.system("./test.bin") if(ret != 0): - print("RUN ERROR! (error code " + str(ret) + ")") + print("RUN ERROR! (error code " + str(ret) + ")") exit(1) print("---------------------------") diff --git a/tests/lv_test_core/lv_test_style.c b/tests/lv_test_core/lv_test_style.c index d36676670f..f0ddf7b6dd 100644 --- a/tests/lv_test_core/lv_test_style.c +++ b/tests/lv_test_core/lv_test_style.c @@ -147,7 +147,7 @@ static void add_remove_read_prop(void) lv_test_assert_int_eq(LV_RES_OK, found, "Get an existing 'color' property"); lv_test_assert_color_eq(LV_COLOR_RED, color, "Get the value of a 'color' property"); - lv_test_print("Reset the the style"); + lv_test_print("Reset the style"); lv_style_reset(&style); found = _lv_style_list_get_int(&style_list, LV_STYLE_TEXT_LINE_SPACE, &value); lv_test_assert_int_eq(LV_RES_INV, found, "Get an 'int' property from a reseted style"); @@ -414,7 +414,7 @@ static void mem_leak(void) { lv_test_print(""); - lv_test_print("Test style set, add, remove memory leak"); + lv_test_print("Test style set, add, remove memory leak"); lv_test_print("----------------------------------------"); lv_mem_monitor_t mon_start;