diff --git a/.editorconfig b/.editorconfig index 28a8b011a..f22bee256 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,4 +4,3 @@ indent_size = 4 end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true - diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index b3356e07f..9d9f05d8b 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -7,7 +7,7 @@ assignees: '' --- - @@ -18,13 +18,13 @@ Issues that don't use this template will be ignored and closed. - [ ] Reproduce the issue in a [Simulator](https://docs.lvgl.io/latest/en/html/get-started/pc-simulator.html) ### Describe the bug - ### To Reproduce ### Expected behavior - ### Screenshots or video diff --git a/.github/ISSUE_TEMPLATE/dev-discussion.md b/.github/ISSUE_TEMPLATE/dev-discussion.md index 69b0b97c5..017583012 100644 --- a/.github/ISSUE_TEMPLATE/dev-discussion.md +++ b/.github/ISSUE_TEMPLATE/dev-discussion.md @@ -6,7 +6,7 @@ labels: '' assignees: '' --- - ### Introcude the problem - ### Examples and cases - ### Suggested solution diff --git a/.github/auto-comment.yml b/.github/auto-comment.yml index 8ff0cf1e6..a141fb548 100644 --- a/.github/auto-comment.yml +++ b/.github/auto-comment.yml @@ -1,12 +1,12 @@ # Comment to a new issue. pullRequestOpened: | Thank you for raising your pull request. - - To ensure that all licensing criteria is met all repositories of the LVGL project apply a process called DCO (Developer's Certificate of Origin). - + + To ensure that all licensing criteria is met all repositories of the LVGL project apply a process called DCO (Developer's Certificate of Origin). + The text of DCO can be read here: https://developercertificate.org/ For a more detailed description see the [Documentation](https://docs.lvgl.io/latest/en/html/contributing/index.html#developer-certification-of-origin-dco) site. - + By contributing to any repositories of the LVGL project you state that your contribution corresponds with the DCO. - - No further action is required if your contribution fulfills the DCO. If you are not sure about it feel free to ask us in a comment. + + No further action is required if your contribution fulfills the DCO. If you are not sure about it feel free to ask us in a comment. diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index c53888a24..e4e0cf8f9 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -5,4 +5,4 @@ A clear and concise description of what the bug or new feature is. ### Checkpoints - [ ] Follow the [styling guide](https://github.com/lvgl/lvgl/blob/master/docs/CODING_STYLE.md) - [ ] Update CHANGELOG.md -- [ ] Update the documentation +- [ ] Update the documentation diff --git a/.github/stale.yml b/.github/stale.yml index ea1179b76..c3d60ea60 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -7,7 +7,7 @@ exemptLabels: - architecture - pinned # Label to use when marking an issue as stale -staleLabel: stale +staleLabel: stale # Comment to post when marking an issue as stale. Set to `false` to disable markComment: > This issue or pull request has been automatically marked as stale because it has not had diff --git a/.github/workflows/build_micropython.yml b/.github/workflows/build_micropython.yml index 3f8e56b43..bbc33f7b5 100644 --- a/.github/workflows/build_micropython.yml +++ b/.github/workflows/build_micropython.yml @@ -37,6 +37,5 @@ jobs: echo "import gc,utime; utime.sleep(5); gc.collect(); - utime.sleep(5)" | + utime.sleep(5)" | ports/unix/micropython -i lib/lv_bindings/examples/advanced_demo.py - diff --git a/CHANGELOG.md b/CHANGELOG.md index 09c0a5ced..da1ab0b77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Bugfixes - fix(cpicker) fix division by zero -- fix(dropdown) fix selecting options after the last one +- 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(indev) don't leave edit mode if there is only one object in the group @@ -17,7 +17,7 @@ - feat(img_cahce) allow disabling image cacheing - calendar: make get_day_of_week() public - Added support for Zephyr integration - + ### Bugfixes - fix(draw_rect) free buffer used for arabic processing - fix(win) arabic process the title of the window @@ -29,7 +29,6 @@ - fix(layout) stop layout after recursion threshold is reached - fix(gauge) fix redraw with image needle - ## v7.8.1 ### Bugfixes @@ -39,7 +38,7 @@ ## v7.8.0 (01.12.2020) ### New features -- make DMA2D non blocking +- make DMA2D non blocking - add unscii-16 built-in font - add KConfig - add lv_refr_get_fps_avg() @@ -56,7 +55,7 @@ - fix(slider) adjusting the left knob too with encoder - 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(linemeter) fix invalidation when setting new value - fix(table) add missing invalidation when changeing cell type - refactor(roller) rename LV_ROLLER_MODE_INIFINITE -> LV_ROLLER_MODE_INFINITE @@ -68,7 +67,7 @@ - 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(spinbox) update cursor position in lv_spinbox_set_step +- fix(spinbox) update cursor position in lv_spinbox_set_step ## v7.7.1 (03.11.2020) ### Bugfixes @@ -107,14 +106,13 @@ - Fix imgbtn image switching with empty style - Material theme: do not set the text font to allow easy global font change - ## v7.6.0 (22.09.2020) ### New features - Check whether any style property has changed on a state change to decide if any redraw is required ### Bugfixes -- Fix selection of options with non-ASCII letters in dropdown list +- Fix selection of options with non-ASCII letters in dropdown list - Fix font loader to support LV_FONT_FMT_TXT_LARGE ## v7.5.0 (15.09.2020) @@ -143,7 +141,7 @@ The main new features of v7.4 are run-time font loading, style caching and arc k - Add style caching to reduce acces 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 even if the the obejct 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 @@ -161,7 +159,7 @@ The main new features of v7.4 are run-time font loading, style caching and arc k - Rename `lv_chart_clear_serie` to `lv_chart_clear_series` and `lv_obj_align_origo` to `lv_obj_align_mid` - Add linemeter's mirror feature again - Fix text decor (udnerline strikethrough) with older versions of font converter -- Fix setting local style property multiple times +- Fix setting local style property multiple times - Add missing background drawing and radius handling to image button - Allow adding extra label to list buttons - Fix crash if `lv_table_set_col_cnt` is called before `lv_table_set_row_cnt` for the first time @@ -191,7 +189,6 @@ The main new features of v7.4 are run-time font loading, style caching and arc k - gauge: fix image needle drawing - fix using freed memory in _lv_style_list_remove_style - ## v7.2.0 (21.07.2020) ### New features @@ -214,7 +211,7 @@ The main new features of v7.4 are run-time font loading, style caching and arc k ### Bugfixes - `tileview` fix navigation when not screen sized -- Use 14px font by default to for better compatibility with smaller displays +- Use 14px font by default to for better compatibility with smaller displays - `linemeter` fix conversation of current value to "level" - Fix drawing on right border - Set the cursor image non clickable by default @@ -271,7 +268,7 @@ The main new features of v7.4 are run-time font loading, style caching and arc k ### Bugfixes - Make the Microptyhon working by adding the required variables as GC_ROOT -- Prefix some internal API functions with `_` to reduce the API of LVGL +- Prefix some internal API functions with `_` to reduce the API of LVGL - Fix built-in SimSun CJK font - Fix UTF-8 encoding when `LV_USE_ARABIC_PERSIAN_CHARS` is enabled - Fix DMA2D usage when 32 bit images directly blended @@ -295,30 +292,28 @@ The name of the project is changed to LVGL and the new website is on https://lvg LVGL remains free under the same conditions (MIT license) and a company is created to manage LVGL and offer services. - ### New drawing system -Complete rework of LVGL's draw engine to use "masks" for more advanced and higher quality graphical effects. +Complete rework of LVGL's draw engine to use "masks" for more advanced and higher quality graphical effects. A possible use-case of this system is to remove the overflowing content from the rounded edges. It also allows drawing perfectly anti-aliased circles, lines, and arcs. -Internally, the drawings happen by defining masks (such as rounded rectangle, line, angle). -When something is drawn the currently active masks can make some pixels transparent. -For example, rectangle borders are drawn by using 2 rectangle masks: one mask removes the inner part and another the outer part. +Internally, the drawings happen by defining masks (such as rounded rectangle, line, angle). +When something is drawn the currently active masks can make some pixels transparent. +For example, rectangle borders are drawn by using 2 rectangle masks: one mask removes the inner part and another the outer part. The API in this regard remained the same but some new functions were added: - `lv_img_set_zoom`: set image object's zoom factor - `lv_img_set_angle`: set image object's angle without using canvas - `lv_img_set_pivot`: set the pivot point of rotation - The new drawing engine brought new drawing features too. They are highlighted in the "style" section. ### New style system -The old style system is replaced with a new more flexible and lightweighted one. -It uses an approach similar to CSS: support cascading styles, inheriting properties and local style properties per object. -As part of these updates, a lot of objects were reworked and the APIs have been changed. +The old style system is replaced with a new more flexible and lightweighted one. +It uses an approach similar to CSS: support cascading styles, inheriting properties and local style properties per object. +As part of these updates, a lot of objects were reworked and the APIs have been changed. - more shadows options: *offset* and *spread* -- gradient stop position to shift the gradient area and horizontal gradient +- gradient stop position to shift the gradient area and horizontal gradient - `LV_BLEND_MODE_NORMAL/ADDITIVE/SUBTRACTIVE` blending modes - *clip corner*: crop the content on the rounded corners - *text underline* and *strikethrough* @@ -362,16 +357,16 @@ The following object types are renamed: - `linemeter`, `gauge`: can have background if the related style properties are set. Padding makes the scale/lines smaller. scale_border_width and scale_end_border_width allow to draw an arc on the outer part of the scale lines. - `gauge`: `lv_gauge_set_needle_img` allows use image as needle - `canvas`: allow drawing to true color alpha and alpha only canvas, add `lv_canvas_blur_hor/ver` and rename `lv_canvas_rotate` to `lv_canvas_transform` -- `textarea`: If available in the font use bullet (`U+2022`) character in text area password +- `textarea`: If available in the font use bullet (`U+2022`) character in text area password ### New object types -- `lv_objmask`: masks can be added to it. The children will be masked accordingly. +- `lv_objmask`: masks can be added to it. The children will be masked accordingly. ### Others - Change the built-in fonts to [Montserrat](https://fonts.google.com/specimen/Montserrat) and add built-in fonts from 12 px to 48 px for every 2nd size. - Add example CJK and Arabic/Persian/Hebrew built-in font - Add ° and "bullet" to the built-in fonts -- Add Arabic/Persian script support: change the character according to its position in the text. +- Add Arabic/Persian script support: change the character according to its position in the text. - Add `playback_time` to animations. - Add `repeat_count` to animations instead of the current "repeat forever". - Replace `LV_LAYOUT_PRETTY` with `LV_LAYOUT_PRETTY_TOP/MID/BOTTOM` @@ -388,4 +383,4 @@ The following object types are renamed: - First and foremost, create a new `lv_conf.h` based on `lv_conf_template.h`. - To try the new version it suggested using a simulator project and see the examples. - If you have a running project, the most difficult part of the migration is updating to the new style system. Unfortunately, there is no better way than manually updating to the new format. -- The other parts are mainly minor renames and refactoring as described above. +- The other parts are mainly minor renames and refactoring as described above. diff --git a/README.md b/README.md index 1eff0d1c8..7324fa9f1 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ -

LVGL - Light and Versatile Graphics Library

+

LVGL - Light and Versatile Graphics Library

-LVGL provides everything you need to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. +LVGL provides everything you need to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint.

-Website · -Online demo · -Nightly demos · -Docs · +Website · +Online demo · +Nightly demos · +Docs · Forum

@@ -53,37 +53,37 @@ Basically, every modern controller (which is able to drive a display) is suitabl > 16 MHz > 48 MHz - + Flash/ROM > 64 kB > 180 kB - + Static RAM > 2 kB > 4 kB - + Stack > 2 kB > 8 kB - + Heap > 2 kB > 8 kB - + Display buffer > 1 × hor. res. pixels > 10 × hor. res. pixels - + Compiler C99 or newer @@ -114,9 +114,9 @@ This list shows the recommended way of learning the library: 7. Read the [Overview](https://docs.lvgl.io/latest/en/html/overview/index.html) page to get a better understanding of the library (2-3 hours) 8. Check the documentation of the [Widgets](https://docs.lvgl.io/latest/en/html/widgets/index.html) to see their features and usage 9. If you have questions go to the [Forum](http://forum.lvgl.io/) -10. Read the [Contributing](https://docs.lvgl.io/latest/en/html/contributing/index.html) guide to see how you can help to improve LVGL (15 minutes) +10. Read the [Contributing](https://docs.lvgl.io/latest/en/html/contributing/index.html) guide to see how you can help to improve LVGL (15 minutes) -## Examples +## Examples For more examples see the [lv_examples](https://github.com/lvgl/lv_examples) repository. diff --git a/docs/CODING_STYLE.md b/docs/CODING_STYLE.md index 1f7b590e9..46bc63757 100644 --- a/docs/CODING_STYLE.md +++ b/docs/CODING_STYLE.md @@ -11,19 +11,19 @@ Use [lv_misc/lv_templ.c](https://github.com/lvgl/lvgl/blob/master/src/lv_misc/lv * starts with *lv* * followed by module name: *btn*, *label*, *style* etc. * followed by the action (for functions): *set*, *get*, *refr* etc. - * closed with the subject: *name*, *size*, *state* etc. + * closed with the subject: *name*, *size*, *state* etc. * Typedefs * prefer `typedef struct` and `typedef enum` instead of `struct name` and `enum name` * always end `typedef struct` and `typedef enum` type names with `_t` * Abbreviations: - * Only words longer or equal than 6 characters can be abbreviated. + * Only words longer or equal than 6 characters can be abbreviated. * Abbreviate only if it makes the word at least half as long - * Use only very straightforward and well-known abbreviations (e.g. pos: position, def: default, btn: button) + * Use only very straightforward and well-known abbreviations (e.g. pos: position, def: default, btn: button) ## Coding guide * Functions: - * Try to write function shorter than is 50 lines - * Always shorter than 200 lines (except very straightforwards) + * Try to write function shorter than is 50 lines + * Always shorter than 200 lines (except very straightforwards) * Variables: * One line, one declaration (BAD: char x, y;) * Use `` (*uint8_t*, *int32_t* etc) @@ -41,16 +41,16 @@ Before every function have a comment like this: * @param obj pointer to an object * @return pointer to a screen */ -lv_obj_t * lv_obj_get_scr(lv_obj_t * obj); +lv_obj_t * lv_obj_get_scr(lv_obj_t * obj); ``` Always use `/* Something */` format and NOT `//Something` -Write readable code to avoid descriptive comments like: -`x++; /* Add 1 to x */`. +Write readable code to avoid descriptive comments like: +`x++; /* Add 1 to x */`. The code should show clearly what you are doing. -You should write **why** have you done this: +You should write **why** have you done this: `x++; /*Because of closing '\0' of the string */` Short "code summaries" of a few lines are accepted. E.g. `/*Calculate the new coordinates*/` @@ -67,19 +67,19 @@ Here is example to show bracket placing and using of white spaces: */ void lv_label_set_text(lv_obj_t * label, const char * text) { /* Main brackets of functions in new line*/ - + if(label == NULL) return; /*No bracket only if the command is inline with the if statement*/ - + lv_obj_inv(label); - + lv_label_ext_t * ext = lv_obj_get_ext(label); /*Comment before a section */ if(text == ext->txt || text == NULL) { /*Bracket of statements start inline*/ lv_label_refr_text(label); - return; + return; } - + ... } ``` diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 1a3941f42..553cfa51f 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -1,5 +1,5 @@ # Contributing to LVGL -Thank you for considering contributing to LVGL. +Thank you for considering contributing to LVGL. For a detailed description of contribution opportunities, please visit the [Contributing](https://docs.lvgl.io/latest/en/html/contributing/index.html) section of the documentation. diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md index efddec095..93d284678 100644 --- a/docs/ROADMAP.md +++ b/docs/ROADMAP.md @@ -1,6 +1,6 @@ # Roadmap -This is a summary for thenew fatures of the major releases and a collection of ideas. +This is a summary for thenew fatures of the major releases and a collection of ideas. This list indicates only the current intention and can be changed. @@ -47,8 +47,6 @@ Planned to November/December 2020 - Make image transformations more versatile - Allow snapshoting object to tranfrom them to images - - ## Ideas - lv_mem_alloc_aligned(size, align) - Text node. See [#1701](https://github.com/lvgl/lvgl/issues/1701#issuecomment-699479408) diff --git a/examples/LVGL_Arduino.ino b/examples/LVGL_Arduino.ino index 658fd9d8e..6e76e15dc 100644 --- a/examples/LVGL_Arduino.ino +++ b/examples/LVGL_Arduino.ino @@ -40,14 +40,14 @@ bool my_touchpad_read(lv_indev_drv_t * indev_driver, lv_indev_data_t * data) data->state = LV_INDEV_STATE_REL; } else { data->state = LV_INDEV_STATE_PR; - + /*Set the coordinates*/ data->point.x = touchX; data->point.y = touchY; - + Serial.print("Data x"); Serial.println(touchX); - + Serial.print("Data y"); Serial.println(touchY); } @@ -70,7 +70,7 @@ void setup() uint16_t calData[5] = { 275, 3620, 264, 3532, 1 }; tft.setTouch(calData); - + lv_disp_buf_init(&disp_buf, buf, NULL, LV_HOR_RES_MAX * 10); /*Initialize the display*/ @@ -94,7 +94,6 @@ void setup() lv_ex_btn_1(); } - void loop() { diff --git a/examples/porting/lv_port_disp_template.c b/examples/porting/lv_port_disp_template.c index 7bb9c3d70..7d8b449d9 100644 --- a/examples/porting/lv_port_disp_template.c +++ b/examples/porting/lv_port_disp_template.c @@ -59,16 +59,16 @@ void lv_port_disp_init(void) * The buffer has to be greater than 1 display row * * There are three buffering configurations: - * 1. Create ONE buffer with some rows: + * 1. Create ONE buffer with some rows: * LVGL will draw the display's content here and writes it to your display - * - * 2. Create TWO buffer with some rows: + * + * 2. Create TWO buffer with some rows: * LVGL will draw the display's content to a buffer and writes it your display. * You should use DMA to write the buffer's content to the display. * It will enable LVGL to draw the next part of the screen to the other buffer while * the data is being sent form the first buffer. It makes rendering and flushing parallel. - * - * 3. Create TWO screen-sized buffer: + * + * 3. Create TWO screen-sized buffer: * Similar to 2) but the buffer have to be screen sized. When LVGL is ready it will give the * whole frame to display. This way you only need to change the frame buffer's address instead of * copying the pixels. @@ -91,7 +91,6 @@ void lv_port_disp_init(void) static lv_color_t draw_buf_3_1[LV_HOR_RES_MAX * LV_VER_RES_MAX]; /*An other screen sized buffer*/ lv_disp_buf_init(&draw_buf_dsc_3, draw_buf_3_1, draw_buf_3_2, LV_HOR_RES_MAX * LV_VER_RES_MAX); /*Initialize the display buffer*/ - /*----------------------------------- * Register the display in LVGL *----------------------------------*/ @@ -157,7 +156,6 @@ static void disp_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_colo lv_disp_flush_ready(disp_drv); } - /*OPTIONAL: GPU INTERFACE*/ #if LV_USE_GPU diff --git a/examples/porting/lv_port_disp_template.h b/examples/porting/lv_port_disp_template.h index eeca802b0..93e51cc26 100644 --- a/examples/porting/lv_port_disp_template.h +++ b/examples/porting/lv_port_disp_template.h @@ -34,7 +34,6 @@ extern "C" { * MACROS **********************/ - #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/examples/porting/lv_port_fs_template.c b/examples/porting/lv_port_fs_template.c index 27c1ca903..6b376042c 100644 --- a/examples/porting/lv_port_fs_template.c +++ b/examples/porting/lv_port_fs_template.c @@ -36,7 +36,6 @@ typedef struct { uint32_t dummy2; }dir_t; - /********************** * STATIC PROTOTYPES **********************/ @@ -157,7 +156,6 @@ static lv_fs_res_t fs_open (lv_fs_drv_t * drv, void * file_p, const char * path, return res; } - /** * Close an opened file * @param drv pointer to a driver where this function belongs diff --git a/examples/porting/lv_port_fs_template.h b/examples/porting/lv_port_fs_template.h index 7db06f658..d18f736f6 100644 --- a/examples/porting/lv_port_fs_template.h +++ b/examples/porting/lv_port_fs_template.h @@ -34,7 +34,6 @@ extern "C" { * MACROS **********************/ - #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/examples/porting/lv_port_indev_template.c b/examples/porting/lv_port_indev_template.c index 1910b74ee..98788da43 100644 --- a/examples/porting/lv_port_indev_template.c +++ b/examples/porting/lv_port_indev_template.c @@ -79,7 +79,6 @@ void lv_port_indev_init(void) * You should shape them according to your hardware */ - lv_indev_drv_t indev_drv; /*------------------ @@ -174,8 +173,6 @@ void lv_port_indev_init(void) * STATIC FUNCTIONS **********************/ - - /*------------------ * Touchpad * -----------------*/ @@ -225,7 +222,6 @@ static void touchpad_get_xy(lv_coord_t * x, lv_coord_t * y) (*y) = 0; } - /*------------------ * Mouse * -----------------*/ @@ -361,7 +357,6 @@ static void encoder_handler(void) encoder_state = LV_INDEV_STATE_REL; } - /*------------------ * Button * -----------------*/ diff --git a/examples/porting/lv_port_indev_template.h b/examples/porting/lv_port_indev_template.h index ca0274e80..b235d3093 100644 --- a/examples/porting/lv_port_indev_template.h +++ b/examples/porting/lv_port_indev_template.h @@ -35,7 +35,6 @@ extern "C" { * MACROS **********************/ - #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/lv_conf_template.h b/lv_conf_template.h index 38e4bef06..e53e97859 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -134,7 +134,6 @@ typedef int16_t lv_coord_t; * Time between `LV_EVENT_LONG_PRESSED_REPEAT */ #define LV_INDEV_DEF_LONG_PRESS_REP_TIME 100 - /* Gesture threshold in pixels */ #define LV_INDEV_DEF_GESTURE_LIMIT 50 @@ -731,7 +730,6 @@ typedef void * lv_obj_user_data_t; # define LV_TABLE_CELL_STYLE_CNT 4 #endif - /*Tab (dependencies: lv_page, lv_btnm)*/ #define LV_USE_TABVIEW 1 # if LV_USE_TABVIEW != 0 diff --git a/lvgl.h b/lvgl.h index 8cfe3f4eb..283013150 100644 --- a/lvgl.h +++ b/lvgl.h @@ -2,7 +2,7 @@ * @file lvgl.h * Include all LittleV GL related headers */ - + #ifndef LVGL_H #define LVGL_H @@ -10,7 +10,6 @@ extern "C" { #endif - /*************************** * CURRENT VERSION OF LVGL ***************************/ @@ -121,7 +120,6 @@ extern "C" { * */ #define LV_VERSION_CHECK(x,y,z) (x == LVGL_VERSION_MAJOR && (y < LVGL_VERSION_MINOR || (y == LVGL_VERSION_MINOR && z <= LVGL_VERSION_PATCH))) - #ifdef __cplusplus } #endif diff --git a/lvgl.mk b/lvgl.mk index bbea98d35..1479c217a 100644 --- a/lvgl.mk +++ b/lvgl.mk @@ -6,5 +6,3 @@ include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_misc/lv_misc.mk include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_themes/lv_themes.mk include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_draw/lv_draw.mk include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_gpu/lv_gpu.mk - - diff --git a/scripts/built_in_font/built_in_font_gen.py b/scripts/built_in_font/built_in_font_gen.py index b3206506f..1a0526464 100755 --- a/scripts/built_in_font/built_in_font_gen.py +++ b/scripts/built_in_font/built_in_font_gen.py @@ -7,40 +7,40 @@ import sys parser = argparse.ArgumentParser(description="""Create fonts for LittelvGL including the built-in symbols. lv_font_conv needs to be installed. See https://github.com/littlevgl/lv_font_conv Example: python built_in_font_gen.py --size 16 -o lv_font_roboto_16.c --bpp 4 -r 0x20-0x7F""", formatter_class=RawTextHelpFormatter) -parser.add_argument('-s', '--size', - type=int, - metavar = 'px', - nargs='?', +parser.add_argument('-s', '--size', + type=int, + metavar = 'px', + nargs='?', help='Size of the font in px') -parser.add_argument('--bpp', - type=int, - metavar = '1,2,4', - nargs='?', +parser.add_argument('--bpp', + type=int, + metavar = '1,2,4', + nargs='?', help='Bit per pixel') -parser.add_argument('-r', '--range', - nargs='+', - metavar = 'start-end', - default=['0x20-0x7F,0xB0,0x2022'], +parser.add_argument('-r', '--range', + nargs='+', + metavar = 'start-end', + default=['0x20-0x7F,0xB0,0x2022'], help='Ranges and/or characters to include. Default is 0x20-7F (ASCII). E.g. -r 0x20-0x7F, 0x200, 324') -parser.add_argument('--symbols', - nargs='+', - metavar = 'sym', +parser.add_argument('--symbols', + nargs='+', + metavar = 'sym', default=[''], help=u'Symbols to include. E.g. -s ÁÉŐ'.encode('utf-8')) -parser.add_argument('--font', - metavar = 'file', - nargs='?', - default='Montserrat-Medium.ttf', +parser.add_argument('--font', + metavar = 'file', + nargs='?', + default='Montserrat-Medium.ttf', help='A TTF or WOFF file') -parser.add_argument('-o', '--output', - nargs='?', - metavar='file', +parser.add_argument('-o', '--output', + nargs='?', + metavar='file', help='Output file name. E.g. my_font_20.c') parser.add_argument('--compressed', action='store_true', help='Compress the bitmaps') parser.add_argument('--subpx', action='store_true', help='3 times wider letters for sub pixel rendering') - + args = parser.parse_args() if args.compressed == False: diff --git a/scripts/built_in_font/generate_all.py b/scripts/built_in_font/generate_all.py index 348b95120..dab551f67 100755 --- a/scripts/built_in_font/generate_all.py +++ b/scripts/built_in_font/generate_all.py @@ -101,5 +101,3 @@ os.system('sed -i \'s|#include "lvgl/lvgl.h"|#include "../../lvgl.h"|\' lv_font_ print("\nGenerating 16 px Hebrew, Persian") os.system("./built_in_font_gen.py --size 16 -o lv_font_dejavu_16_persian_hebrew.c --bpp 4 --font DejaVuSans.ttf -r 0x20-0x7f,0x5d0-0x5ea,0x600-0x6FF,0xFB50-0xFDFF,0xFE70-0xFEFF") os.system('sed -i \'s|#include "lvgl/lvgl.h"|#include "../../lvgl.h"|\' lv_font_dejavu_16_persian_hebrew.c') - - diff --git a/scripts/code-format.cfg b/scripts/code-format.cfg index 9b0a35e17..0d786927c 100644 --- a/scripts/code-format.cfg +++ b/scripts/code-format.cfg @@ -23,7 +23,7 @@ --suffix=none --preserve-date --formatted ---exclude=lv_conf_internal.h +--exclude=lv_conf_internal.h --exclude=../src/lv_font/lv_font_montserrat_12.c --exclude=../src/lv_font/lv_font_montserrat_14.c --exclude=../src/lv_font/lv_font_montserrat_16.c @@ -47,4 +47,3 @@ --exclude=../src/lv_font/lv_font_montserrat_28_compressed.c --exclude=../src/lv_font/lv_font_simsun_16_cjk.c --exclude=../src/lv_font/lv_font_dejavu_16_persian_hebrew.c - diff --git a/scripts/cppcheck_run.sh b/scripts/cppcheck_run.sh index 98e594cb9..3916c7672 100755 --- a/scripts/cppcheck_run.sh +++ b/scripts/cppcheck_run.sh @@ -1,2 +1 @@ cppcheck -j8 --template="{severity}\t{file}:{line}\t{id}: {message}" --enable=all ../src/ --output-file=cppcheck_res.txt --suppress=unusedFunction --suppress=preprocessorErrorDirective --force - diff --git a/scripts/infer_run.sh b/scripts/infer_run.sh index 2d33d5b84..f1d12235a 100755 --- a/scripts/infer_run.sh +++ b/scripts/infer_run.sh @@ -1,10 +1,9 @@ # https://github.com/facebook/infer # -# Install: +# Install: # VERSION=0.17.0; \ # curl -sSL "https://github.com/facebook/infer/releases/download/v$VERSION/infer-linux64-v$VERSION.tar.xz" \ # | sudo tar -C /opt -xJ && \ # sudoln -s "/opt/infer-linux64-v$VERSION/bin/infer" /usr/local/bin/infer - infer run -- make -j8 diff --git a/scripts/lv_conf_checker.py b/scripts/lv_conf_checker.py index 357c528a3..d52004208 100755 --- a/scripts/lv_conf_checker.py +++ b/scripts/lv_conf_checker.py @@ -4,7 +4,6 @@ Generates a checker file for lv_conf.h from lv_conf_template.h define all the not defined values ''' - import sys import re @@ -15,7 +14,6 @@ if sys.version_info < (3,6,0): fin = open("../lv_conf_template.h", "r") fout = open("../src/lv_conf_internal.h", "w") - fout.write( '''/** * GENERATED FILE, DO NOT EDIT IT! @@ -82,7 +80,7 @@ for i in fin.read().splitlines(): if '/*--END OF LV_CONF_H--*/' in i: break r = re.search(r'^ *# *define ([^\s]+).*$', i) - + #ifndef LV_USE_BTN /*Only if not defined in lv_conf.h*/ # ifdef CONFIG_LV_USE_BTN /*Use KConfig value if set*/ # define LV_USE_BTN CONFIG_LV_USE_BTN @@ -90,7 +88,7 @@ for i in fin.read().splitlines(): # define LV_USE_BTN 1 /*Use default value*/ # endif #endif - + if r: line = re.sub('\(.*?\)', '', r[1], 1) #remove parentheses from macros dr = re.sub('.*# *define', '', i, 1) @@ -110,7 +108,6 @@ for i in fin.read().splitlines(): else: fout.write(f'{i}\n') - fout.write( ''' diff --git a/scripts/release/com.py b/scripts/release/com.py index bb3fd7ddd..4126c354d 100755 --- a/scripts/release/com.py +++ b/scripts/release/com.py @@ -10,32 +10,32 @@ import com def cmd(c, ask_on_err = True): print("\n" + c) - r = os.system(c) + r = os.system(c) if r: print("### Error: " + str(r)) - if ask_on_err: + if ask_on_err: input("Press Enter to continue exectution...") - -def define_set(fn, name, value): + +def define_set(fn, name, value): print("In " + fn + " set " + name + " to " + value) - - new_content = "" + + new_content = "" s = r'^ *# *define +' + str(name).rstrip() + ' +' - + f = open(fn, "r") for i in f.read().splitlines(): r = re.search(s, i) - if r: + if r: d = i.split("define") - i = d[0] + "define " + name + " " + value + i = d[0] + "define " + name + " " + value new_content += i + '\n' - + f.close() - + f = open(fn, "w") f.write(new_content) f.close() - + def ver_format(ver): s = "v" + str(ver[0]) + "." + str(ver[1]) + "." + str(ver[2]) if(ver[3] != ""): s = s + "-" + ver[3] @@ -43,69 +43,68 @@ def ver_format(ver): def get_lvgl_version(br): print("Get LVGL's version") - - ver = [0, 0, 0, ""] - + + ver = [0, 0, 0, ""] + os.chdir("./lvgl") - + com.cmd("git checkout " + br) - + f = open("./lvgl.h", "r") - + lastNum = re.compile(r'(?:[^\d]*(\d+)[^\d]*)+') for i in f.read().splitlines(): r = re.search(r'^#define LVGL_VERSION_MAJOR ', i) - if r: + if r: m = lastNum.search(i) if m: ver[0] = m.group(1) r = re.search(r'^#define LVGL_VERSION_MINOR ', i) - if r: + if r: m = lastNum.search(i) if m: ver[1] = m.group(1) - + r = re.search(r'^#define LVGL_VERSION_PATCH ', i) - if r: + if r: m = lastNum.search(i) if m: ver[2] = m.group(1) - + f.close() - + com.cmd("git checkout master") - + os.chdir("../") return ver - + def push(c): cmd("git push " + c) - + def update_version(ver): ver_str = ver_format(ver) ver_num = ver[0] + "." + ver[1] + "." + ver[2] - + templ = fnmatch.filter(os.listdir('.'), '*_templ*.h') - + if len(templ) > 0 and templ[0]: print("Updating version in " + templ[0]) cmd("sed -i -r 's/v[0-9]+\.[0-9]+\.[0-9]+.*/"+ "v" + ver_num + "/' " + templ[0]) - if os.path.exists("library.json"): + if os.path.exists("library.json"): print("Updating version in library.json") cmd("sed -i -r 's/[0-9]+\.[0-9]+\.[0-9]+/"+ ver_num +"/' library.json") - - if path.exists("library.properties"): + + if path.exists("library.properties"): print("Updating version in library.properties") cmd("sed -i -r 's/version=[0-9]+\.[0-9]+\.[0-9]+/"+ "version=" + ver_num + "/' library.properties") - - if path.exists("conf.py"): - cmd("sed -i -r \"s/'v[0-9]+\.[0-9]+\.[0-9]+.*'/\'" + ver_str + "'/\" conf.py") - + + if path.exists("conf.py"): + cmd("sed -i -r \"s/'v[0-9]+\.[0-9]+\.[0-9]+.*'/\'" + ver_str + "'/\" conf.py") + if path.exists("Kconfig"): cmd("sed -i -r \"s/'v[0-9]+\.[0-9]+\.[0-9]+.*'/\'" + ver_str + "'/\" Kconfig") - if path.exists("lvgl.h"): + if path.exists("lvgl.h"): define_set("./lvgl.h", "LVGL_VERSION_MAJOR", str(ver[0])) define_set("./lvgl.h", "LVGL_VERSION_MINOR", str(ver[1])) define_set("./lvgl.h", "LVGL_VERSION_PATCH", str(ver[2])) define_set("./lvgl.h", "LVGL_VERSION_INFO", "\"" + ver[3] + "\"") - diff --git a/scripts/release/dev.py b/scripts/release/dev.py index 38c342e31..7b53fe530 100755 --- a/scripts/release/dev.py +++ b/scripts/release/dev.py @@ -15,7 +15,7 @@ def lvgl_update_ver(ver, br): com.cmd("git commit -am 'Update " + br + " version'") com.push("origin " + br) com.cmd("git checkout master") - + os.chdir("../") def docs_update_ver(ver, br): @@ -25,10 +25,9 @@ def docs_update_ver(ver, br): com.cmd("git commit -am 'Update " + br + " version'") com.push("origin " + br) com.cmd("git checkout master --") - + os.chdir("../") - - + def merge_dev_to_master(): os.chdir("./lvgl") com.cmd("git checkout master") @@ -42,8 +41,7 @@ def merge_dev_to_master(): com.cmd("git merge dev -X theirs --no-edit;") com.push("origin latest") os.chdir("../") - - + def make(mode): if(mode == "bugfix"): ver = com.get_lvgl_version("master") @@ -58,14 +56,14 @@ def make(mode): if(mode == "major"): ver[0] = str(int(ver[0]) + 1) ver[1] = '0' - ver[2] = '0' + ver[2] = '0' if(mode == "minor"): ver[1] = str(int(ver[1]) + 1) - ver[2] = '0' - + ver[2] = '0' + lvgl_update_ver(ver, "dev") docs_update_ver(ver, "dev") - + if __name__ == '__main__': if(len(sys.argv) != 2): print("Missing argument. Usage ./dev.py major | minor | bugfix") diff --git a/scripts/release/main.py b/scripts/release/main.py index a96d11fc3..d22d32234 100755 --- a/scripts/release/main.py +++ b/scripts/release/main.py @@ -15,7 +15,7 @@ proj_list = [ "lv_sim_eclipse_sdl", "lv_sim_emscripten"] def upstream(repo): return upstream_org_url + repo + ".git" - + def clone(repo): com.cmd("git clone --recurse-submodules " + upstream(repo)) os.chdir("./" + repo) @@ -23,7 +23,7 @@ def clone(repo): com.cmd("git remote update origin --prune") com.cmd("git pull origin --tags") os.chdir("..") - + def clone_repos(): com.cmd("rm -fr " + workdir) com.cmd("mkdir " + workdir) @@ -36,30 +36,30 @@ def clone_repos(): for p in proj_list: clone(p) - + def cleanup(): os.chdir("../") com.cmd("rm -fr " + workdir) if __name__ == '__main__': prepare_type = ['major', 'minor', 'bugfix'] - dev_prepare = 'minor' + dev_prepare = 'minor' # if(len(sys.argv) != 2): # print("Missing argument. Usage ./release.py bugfix | minor | major") # print("Use minor by deafult") -# else: +# else: # dev_prepare = sys.argv[1] - - if not (dev_prepare in prepare_type): - print("Invalid argument. Usage ./release.py bugfix | minor | major") + + if not (dev_prepare in prepare_type): + print("Invalid argument. Usage ./release.py bugfix | minor | major") exit(1) - + #os.chdir(workdir) clone_repos() release.make() for p in proj_list: proj.make(p, True) - - dev.make(dev_prepare) + + dev.make(dev_prepare) #cleanup() diff --git a/scripts/release/proj.py b/scripts/release/proj.py index db02cd537..732c200e5 100755 --- a/scripts/release/proj.py +++ b/scripts/release/proj.py @@ -7,7 +7,6 @@ import re import subprocess import com - def make(repo_path, auto_push = False): os.chdir("./" + repo_path) com.cmd('git checkout master') @@ -15,34 +14,33 @@ def make(repo_path, auto_push = False): os.chdir("./lvgl") com.cmd("git checkout master") com.cmd("git pull origin --tags") - - out = subprocess.Popen(['git', 'tag', '--sort=-creatordate'], - stdout=subprocess.PIPE, + + out = subprocess.Popen(['git', 'tag', '--sort=-creatordate'], + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) stdout,stderr = out.communicate() - + ver_str = stdout.decode("utf-8").split('\n')[0] release_br = ver_str[1:] #trim "v" release_br = release_br.split('.')[0] # get the first number release_br = "release/v" + release_br - + com.cmd("git checkout " + release_br + "; git pull origin " + release_br) - + os.chdir("..") - + com.cmd("cp -f lvgl/lv_conf_template.h lv_conf.h") com.cmd("sed -i -r 's/#if 0/#if 1/' lv_conf.h") # Enable lv_conf.h with open("confdef.txt") as f: for line in f: (key, val) = line.rstrip().split('\t') - com.define_set("lv_conf.h", str(key), str(val)) + com.define_set("lv_conf.h", str(key), str(val)) - - if os.path.exists("lv_examples"): + if os.path.exists("lv_examples"): print("Upadte lv_examples"); com.cmd("cd lv_examples; git co " + release_br + "; git pull origin " + release_br) - - if os.path.exists("lv_drivers"): + + if os.path.exists("lv_drivers"): print("upadte lv_drivers"); com.cmd("cd lv_drivers " + release_br + "; git pull origin " + release_br) @@ -53,7 +51,7 @@ def make(repo_path, auto_push = False): if auto_push: com.push("origin --tags") com.push("origin master") - + os.chdir("../") if __name__ == '__main__': diff --git a/scripts/release/release.py b/scripts/release/release.py index e45acbe4b..fb7b7e7a8 100755 --- a/scripts/release/release.py +++ b/scripts/release/release.py @@ -8,21 +8,21 @@ import com import re def update_release_branch(release_br, master_br = "master"): - com.cmd("git checkout " + release_br) - com.cmd("git pull origin " + release_br) - com.cmd("git merge "+ master_br +" -X ours"); - com.push("origin " + release_br); - com.cmd("git checkout master"); - + com.cmd("git checkout " + release_br) + com.cmd("git pull origin " + release_br) + com.cmd("git merge "+ master_br +" -X ours"); + com.push("origin " + release_br); + com.cmd("git checkout master"); + def lvgl_release(ver): print("Release lvgl") - + ver_str = com.ver_format(ver) release_br = "release/v" + str(ver[0]) - + os.chdir("./lvgl") com.define_set("./lvgl.h", "LVGL_VERSION_INFO", '\"\"') - + # Run some scripts os.chdir("./scripts") com.cmd("./code-format.sh") @@ -35,132 +35,130 @@ def lvgl_release(ver): #update CHANGLELOG new_content = "" f = open("./CHANGELOG.md", "r") - + release_note = "" - note_state = 0 + note_state = 0 for i in f.read().splitlines(): if note_state == 0: r = re.search(r'^## ' + ver_str, i) - if r: - i = i.replace("planned on ", "") + if r: + i = i.replace("planned on ", "") note_state+=1 - - elif note_state == 1: + + elif note_state == 1: r = re.search(r'^## ', i) if r: note_state+=1 else: release_note += i + '\n' - + new_content += i + '\n' - + f.close() - + f = open("./CHANGELOG.md", "w") f.write(new_content) f.close() - + com.cmd('git commit -am "Release ' + ver_str + '"') - + com.cmd('git checkout dev') com.cmd("git merge master -X ours") com.cmd("git add .") com.cmd("git commit -am 'Merge master'", False) com.push('origin dev') com.cmd('git checkout master') - com.cmd("git tag -a " + ver_str + " -m 'Release " + ver_str + "' ") + com.cmd("git tag -a " + ver_str + " -m 'Release " + ver_str + "' ") com.push('origin master') com.push('origin --tags') - + update_release_branch(release_br) - + os.chdir("../") - + return release_note - - + def lv_examples_release(ver): print("Release lv_examples") - + os.chdir("./lv_examples") release_br = "release/v" + str(ver[0]) ver_str = com.ver_format(ver) - + com.update_version(ver) - + com.cmd("sed -i -r 's/LV_VERSION_CHECK\([0-9]+, *[0-9]+, *[0-9]+\)/"+ "LV_VERSION_CHECK\(" + str(ver[0]) + ", " + str(ver[1]) + ", " + str(ver[2]) + ")/' lv_examples.h") - + com.cmd('git commit -am "Release ' + ver_str + '"') - com.cmd("git tag -a " + ver_str + " -m 'Release " + ver_str + "' ") + com.cmd("git tag -a " + ver_str + " -m 'Release " + ver_str + "' ") com.push('origin master') com.push('origin --tags') - + os.chdir("../") - + def lv_drivers_release(ver): print("Release lv_drivers") - + os.chdir("./lv_drivers") release_br = "release/v" + str(ver[0]) ver_str = com.ver_format(ver) - + com.update_version(ver) - + com.cmd('git commit -am "Release ' + ver_str + '"') - com.cmd("git tag -a " + ver_str + " -m 'Release " + ver_str + "' ") + com.cmd("git tag -a " + ver_str + " -m 'Release " + ver_str + "' ") com.push('origin master') com.push('origin --tags') - + update_release_branch(release_br) os.chdir("../") - + def docs_release(ver): print("Release docs") - + os.chdir("./docs") release_br = "release/v" + str(ver[0]) ver_str = com.ver_format(ver) - - com.cmd("git co latest --") - com.cmd("rm -rf xml"); - com.cmd("cp -r ../lvgl/docs/api_doc/xml ."); + + com.cmd("git co latest --") + com.cmd("rm -rf xml"); + com.cmd("cp -r ../lvgl/docs/api_doc/xml ."); com.cmd("git add xml"); - + com.update_version(ver) com.cmd('git commit -am "Release ' + ver_str + '"') - com.cmd("git tag -a " + ver_str + " -m 'Release " + ver_str + "' ") + com.cmd("git tag -a " + ver_str + " -m 'Release " + ver_str + "' ") com.push('origin master') com.push('origin --tags') - + update_release_branch(release_br, "latest") os.chdir("../") - + def blog_release(ver, release_note): - + os.chdir("./blog/_posts") - + ver_str = com.ver_format(ver) - + post = "---\nlayout: post\ntitle: " + ver_str + " is released\nauthor: \"kisvegabor\"\ncover: /assets/release_cover.png\n---\n\n" post += release_note - + today = date.today() d = today.strftime("%Y-%m-%d") - + f = open(d + "-release_" + ver_str + ".md", "w") f.write(post) f.close() - + com.cmd("git add .") com.cmd("git commit -am 'Add " + ver_str + " release post'") com.push('origin master') - + os.chdir("../../") - - + def make(): ver = com.get_lvgl_version("master") release_note = lvgl_release(ver) @@ -168,6 +166,6 @@ def make(): lv_drivers_release(ver) docs_release(ver) blog_release(ver, release_note) - + if __name__ == '__main__': make() diff --git a/src/lv_api_map.h b/src/lv_api_map.h index f86a4c6d6..bd58d1aa2 100644 --- a/src/lv_api_map.h +++ b/src/lv_api_map.h @@ -49,7 +49,6 @@ static inline void lv_task_once(lv_task_t * task) #endif - #if LV_USE_DROPDOWN static inline void lv_dropdown_set_draw_arrow(lv_obj_t * ddlist, bool en) @@ -145,10 +144,8 @@ static inline void lv_roller_set_fix_width(lv_obj_t * roller, lv_coord_t w) lv_obj_set_width(roller, w); } - #endif - #if LV_USE_PAGE #define lv_scrlbar_mode_t lv_scrollbar_mode_t @@ -159,7 +156,6 @@ static inline void lv_roller_set_fix_width(lv_obj_t * roller, lv_coord_t w) #define LV_SCRLBAR_MODE_HIDE LV_SCROLLBAR_MODE_HIDE #define LV_SCRLBAR_MODE_UNHIDE LV_SCROLLBAR_MODE_UNHIDE - static inline void lv_page_set_scrlbar_mode(lv_obj_t * page, lv_scrlbar_mode_t sb_mode) { lv_page_set_scrollbar_mode(page, sb_mode); @@ -169,19 +165,14 @@ static inline lv_scrollbar_mode_t lv_page_get_scrlbar_mode(lv_obj_t * page) return lv_page_get_scrollbar_mode(page); } - static inline lv_obj_t * lv_page_get_scrl(lv_obj_t * page) { return lv_page_get_scrollable(page); } #endif - #endif /*LV_USE_API_EXTENSION_V6*/ - - - /*--------------------- * V7.0 COMPATIBILITY *--------------------*/ @@ -206,7 +197,6 @@ static inline void lv_chart_set_range(lv_obj_t * chart, lv_coord_t ymin, lv_coor lv_chart_set_y_range(chart, LV_CHART_AXIS_PRIMARY_Y, ymin, ymax); } - static inline void lv_chart_clear_serie(lv_obj_t * chart, lv_chart_series_t * series) { lv_chart_clear_series(chart, series); diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index 0e5da5898..fb75f7031 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -349,7 +349,6 @@ # endif #endif - /* Gesture threshold in pixels */ #ifndef LV_INDEV_DEF_GESTURE_LIMIT # ifdef CONFIG_LV_INDEV_DEF_GESTURE_LIMIT @@ -749,7 +748,6 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */ #endif #endif /*LV_TICK_CUSTOM*/ - /*================ * Log settings *===============*/ @@ -1928,7 +1926,6 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */ #endif #endif - /*Tab (dependencies: lv_page, lv_btnm)*/ #ifndef LV_USE_TABVIEW # ifdef CONFIG_LV_USE_TABVIEW @@ -1990,8 +1987,6 @@ e.g. "stm32f769xx.h" or "stm32f429xx.h" */ #endif #endif - - /*If running without lv_conf.h add typdesf with default value*/ #if defined(LV_CONF_SKIP) diff --git a/src/lv_conf_kconfig.h b/src/lv_conf_kconfig.h index 3387eb599..648edfa0e 100644 --- a/src/lv_conf_kconfig.h +++ b/src/lv_conf_kconfig.h @@ -385,7 +385,6 @@ extern "C" { #endif #endif - /*------------------ * SPINNER DEF ANIM *-----------------*/ diff --git a/src/lv_core/lv_disp.c b/src/lv_core/lv_disp.c index 4e319dfdf..aaa8fb1ae 100644 --- a/src/lv_core/lv_disp.c +++ b/src/lv_core/lv_disp.c @@ -180,7 +180,6 @@ void lv_disp_set_bg_image(lv_disp_t * disp, const void * img_src) _lv_inv_area(disp, &a); } - /** * Opacity of the background * @param disp pointer to a display @@ -216,7 +215,6 @@ void lv_scr_load_anim(lv_obj_t * new_scr, lv_scr_load_anim_t anim_type, uint32_t lv_disp_t * d = lv_obj_get_disp(new_scr); lv_obj_t * act_scr = lv_scr_act(); - if(d->del_prev && act_scr != d->scr_to_load && d->scr_to_load) { lv_obj_del(act_scr); lv_disp_load_scr(d->scr_to_load); diff --git a/src/lv_core/lv_disp.h b/src/lv_core/lv_disp.h index d733ad756..6353315ec 100644 --- a/src/lv_core/lv_disp.h +++ b/src/lv_core/lv_disp.h @@ -85,7 +85,6 @@ lv_obj_t * lv_disp_get_layer_sys(lv_disp_t * disp); */ void lv_disp_assign_screen(lv_disp_t * disp, lv_obj_t * scr); - /** * Set the background color of a display * @param disp pointer to a display @@ -207,7 +206,6 @@ static inline void lv_scr_load(lv_obj_t * scr) #define LV_VER_RES lv_disp_get_ver_res(lv_disp_get_default()) #endif - /** * Same as Android's DIP. (Different name is chosen to avoid mistype between LV_DPI and LV_DIP) * 1 dip is 1 px on a 160 DPI screen diff --git a/src/lv_core/lv_indev.c b/src/lv_core/lv_indev.c index f37c4495d..336b377ea 100644 --- a/src/lv_core/lv_indev.c +++ b/src/lv_core/lv_indev.c @@ -1263,7 +1263,6 @@ static void indev_drag(lv_indev_proc_t * proc) if(lv_obj_get_drag(drag_obj) == false) return; - lv_drag_dir_t allowed_dirs = lv_obj_get_drag_dir(drag_obj); /*Count the movement by drag*/ @@ -1469,7 +1468,6 @@ static void indev_drag_throw(lv_indev_proc_t * proc) } } - /** * Get the really dragged object by taking `drag_parent` into account. * @param obj the start object @@ -1486,7 +1484,6 @@ static lv_obj_t * get_dragged_obj(lv_obj_t * obj) return drag_obj; } - /** * Handle the gesture of indev_proc_p->types.pointer.act_obj * @param indev pointer to a input device state @@ -1505,7 +1502,6 @@ static void indev_gesture(lv_indev_proc_t * proc) if(gesture_obj == NULL) return; - if((LV_MATH_ABS(proc->types.pointer.vect.x) < indev_act->driver.gesture_min_velocity) && (LV_MATH_ABS(proc->types.pointer.vect.y) < indev_act->driver.gesture_min_velocity)) { proc->types.pointer.gesture_sum.x = 0; @@ -1541,7 +1537,6 @@ static void indev_gesture(lv_indev_proc_t * proc) } } - /** * Checks if the reset_query flag has been set. If so, perform necessary global indev cleanup actions * @param proc pointer to an input device 'proc' diff --git a/src/lv_core/lv_indev.h b/src/lv_core/lv_indev.h index 403081f22..15f0f89cf 100644 --- a/src/lv_core/lv_indev.h +++ b/src/lv_core/lv_indev.h @@ -149,7 +149,6 @@ lv_res_t lv_indev_finish_drag(lv_indev_t * indev); */ void lv_indev_wait_release(lv_indev_t * indev); - /** * Gets a pointer to the currently active object in indev proc functions. * NULL if no object is currently being handled or if groups aren't used. diff --git a/src/lv_core/lv_obj.c b/src/lv_core/lv_obj.c index a549db952..fb409ea16 100644 --- a/src/lv_core/lv_obj.c +++ b/src/lv_core/lv_obj.c @@ -34,7 +34,6 @@ #include LV_GC_INCLUDE #endif /* LV_ENABLE_GC */ - #if defined(LV_USER_DATA_FREE_INCLUDE) #include LV_USER_DATA_FREE_INCLUDE #endif /* LV_USE_USER_DATA_FREE */ @@ -341,10 +340,8 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy) } } - _lv_ll_init(&(new_obj->child_ll), sizeof(lv_obj_t)); - new_obj->ext_draw_pad = 0; #if LV_USE_EXT_CLICK_AREA == LV_EXT_CLICK_AREA_FULL @@ -368,7 +365,6 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const lv_obj_t * copy) _lv_memset_00(&new_obj->user_data, sizeof(lv_obj_user_data_t)); #endif - #if LV_USE_GROUP new_obj->group_p = NULL; #endif @@ -490,7 +486,6 @@ lv_res_t lv_obj_del(lv_obj_t * obj) if(disp->act_scr == obj) act_scr_del = true; } - obj_del_core(obj); /*Send a signal to the parent to notify it about the child delete*/ @@ -694,7 +689,6 @@ void lv_obj_set_parent(lv_obj_t * obj, lv_obj_t * parent) _lv_ll_chg_list(&obj->parent->child_ll, &parent->child_ll, obj, true); obj->parent = parent; - if(new_base_dir != LV_BIDI_DIR_RTL) { lv_obj_set_pos(obj, old_pos.x, old_pos.y); } @@ -781,7 +775,6 @@ void lv_obj_set_pos(lv_obj_t * obj, lv_coord_t x, lv_coord_t y) y = y + par->coords.y1; } - /*Calculate and set the movement*/ lv_point_t diff; diff.x = x - obj->coords.x1; @@ -1055,7 +1048,6 @@ void lv_obj_align_mid(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, l LV_ASSERT_OBJ(base, LV_OBJX_NAME); - obj_align_mid_core(obj, base, align, true, true, x_ofs, y_ofs); #if LV_USE_OBJ_REALIGN @@ -1085,11 +1077,9 @@ void lv_obj_align_mid_x(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, LV_ASSERT_OBJ(base, LV_OBJX_NAME); - obj_align_mid_core(obj, base, align, true, false, x_ofs, 0); } - /** * Align an object's middle point to an other object vertically. * @param obj pointer to an object to align @@ -1107,7 +1097,6 @@ void lv_obj_align_mid_y(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, LV_ASSERT_OBJ(base, LV_OBJX_NAME); - obj_align_mid_core(obj, base, align, false, true, 0, y_ofs); } @@ -1149,7 +1138,6 @@ void lv_obj_set_auto_realign(lv_obj_t * obj, bool en) #endif } - /** * Set the size of an extended clickable area * If TINY mode is used, only the largest of the horizontal and vertical padding @@ -1751,7 +1739,6 @@ void lv_obj_set_state(lv_obj_t * obj, lv_state_t new_state) else if(cmp_res == STYLE_COMPARE_VISUAL_DIFF) lv_obj_refresh_style(obj, LV_OBJ_PART_ALL, LV_STYLE_PROP_ALL); #else - for(part = 0; part < _LV_OBJ_PART_REAL_LAST; part++) { lv_style_list_t * style_list = lv_obj_get_style_list(obj, part); if(style_list == NULL) break; /*No more style lists*/ @@ -1943,7 +1930,6 @@ void lv_event_send_refresh_recursive(lv_obj_t * obj) } } - /** * Call an event function with an object, event, and data. * @param event_xcb an event callback function. If `NULL` `LV_RES_OK` will return without any actions. @@ -2804,7 +2790,6 @@ lv_opa_t _lv_obj_get_style_opa(const lv_obj_t * obj, uint8_t part, lv_style_prop } } - lv_state_t state = lv_obj_get_state(parent, part); prop = (uint16_t)prop_ori + ((uint16_t)state << LV_STYLE_STATE_POS); @@ -3059,7 +3044,6 @@ bool lv_obj_get_parent_event(const lv_obj_t * obj) return obj->parent_event == 0 ? false : true; } - lv_bidi_dir_t lv_obj_get_base_dir(const lv_obj_t * obj) { LV_ASSERT_OBJ(obj, LV_OBJX_NAME); @@ -3282,7 +3266,6 @@ bool lv_obj_is_focused(const lv_obj_t * obj) #endif } - /*------------------- * OTHER FUNCTIONS *------------------*/ @@ -3959,7 +3942,6 @@ static lv_design_res_t lv_obj_design(lv_obj_t * obj, const lv_area_t * clip_area return LV_DESIGN_RES_OK; } - /** * Get the really focused object by taking `focus_parent` into account. * @param obj the start object @@ -4168,7 +4150,6 @@ static void obj_align_mid_core(lv_obj_t * obj, const lv_obj_t * base, lv_align_t lv_coord_t obj_w_half = lv_obj_get_width(obj) / 2; lv_coord_t obj_h_half = lv_obj_get_height(obj) / 2; - switch(align) { case LV_ALIGN_CENTER: new_x = lv_obj_get_width(base) / 2 - obj_w_half; @@ -4290,8 +4271,6 @@ static void obj_align_mid_core(lv_obj_t * obj, const lv_obj_t * base, lv_align_t } - - #if LV_USE_ANIMATION /** @@ -4656,7 +4635,6 @@ static void update_style_cache(lv_obj_t * obj, uint8_t part, uint16_t prop) list->text_space_zero = 0; } - lv_opa_t bg_opa = lv_obj_get_style_bg_opa(obj, part); list->bg_opa_transp = bg_opa == LV_OPA_TRANSP ? 1 : 0; list->bg_opa_cover = bg_opa == LV_OPA_COVER ? 1 : 0; @@ -4672,7 +4650,6 @@ static void update_style_cache(lv_obj_t * obj, uint8_t part, uint16_t prop) list->shadow_width_zero = lv_obj_get_style_shadow_width(obj, part) == 0 ? 1 : 0; list->value_txt_str = lv_obj_get_style_value_str(obj, part) == NULL ? 1 : 0; - list->transform_all_zero = 1; if(lv_obj_get_style_transform_angle(obj, part) != 0 || lv_obj_get_style_transform_width(obj, part) != 0 || @@ -4773,7 +4750,6 @@ static void invalidate_style_cache(lv_obj_t * obj, uint8_t part, lv_style_proper list->valid_cache = 0; } - lv_obj_t * child = lv_obj_get_child(obj, NULL); while(child) { update_style_cache_children(child); @@ -4799,7 +4775,6 @@ static void style_snapshot(lv_obj_t * obj, uint8_t part, style_snapshot_t * shot lv_obj_init_draw_img_dsc(obj, part, &shot->img); lv_obj_init_draw_line_dsc(obj, part, &shot->line); - shot->pad_top = lv_obj_get_style_pad_top(obj, part); shot->pad_bottom = lv_obj_get_style_pad_bottom(obj, part); shot->pad_right = lv_obj_get_style_pad_right(obj, part); @@ -4832,7 +4807,6 @@ static style_snapshot_res_t style_snapshot_compare(style_snapshot_t * shot1, sty { if(memcmp(shot1, shot2, sizeof(style_snapshot_t)) == 0) return STYLE_COMPARE_SAME; - if(shot1->pad_top != shot2->pad_top) return STYLE_COMPARE_DIFF; if(shot1->pad_bottom != shot2->pad_bottom) return STYLE_COMPARE_DIFF; if(shot1->pad_left != shot2->pad_right) return STYLE_COMPARE_DIFF; diff --git a/src/lv_core/lv_obj.h b/src/lv_core/lv_obj.h index 2328d9df0..9551f1c62 100644 --- a/src/lv_core/lv_obj.h +++ b/src/lv_core/lv_obj.h @@ -56,7 +56,6 @@ extern "C" { struct _lv_obj_t; - /** Design modes */ enum { LV_DESIGN_DRAW_MAIN, /**< Draw the main portion of the object */ @@ -65,7 +64,6 @@ enum { }; typedef uint8_t lv_design_mode_t; - /** Design results */ enum { LV_DESIGN_RES_OK, /**< Draw ready */ @@ -288,7 +286,6 @@ typedef struct { */ void lv_init(void); - /** * Deinit the 'lv' library * Currently only implemented when not using custom allocators, or GC is enabled. @@ -339,7 +336,6 @@ void lv_obj_del_async(struct _lv_obj_t * obj); */ void lv_obj_clean(lv_obj_t * obj); - /** * Mark an area of an object as invalid. * This area will be redrawn by 'lv_refr_task' @@ -354,7 +350,6 @@ void lv_obj_invalidate_area(const lv_obj_t * obj, const lv_area_t * area); */ void lv_obj_invalidate(const lv_obj_t * obj); - /** * Tell whether an area of an object is visible (even partially) now or not * @param obj pointer to an object @@ -513,7 +508,6 @@ void lv_obj_align_y(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_ */ void lv_obj_align_mid(lv_obj_t * obj, const lv_obj_t * base, lv_align_t align, lv_coord_t x_ofs, lv_coord_t y_ofs); - /** * Align an object's middle point to an other object horizontally. * @param obj pointer to an object to align @@ -848,7 +842,6 @@ void lv_obj_set_event_cb(lv_obj_t * obj, lv_event_cb_t event_cb); */ lv_res_t lv_event_send(lv_obj_t * obj, lv_event_t event, const void * data); - /** * Send LV_EVENT_REFRESH event to an object * @param obj point to an object. (Can NOT be NULL) @@ -888,7 +881,6 @@ const void * lv_event_get_data(void); */ void lv_obj_set_signal_cb(lv_obj_t * obj, lv_signal_cb_t signal_cb); - /** * Send an event to the object * @param obj pointer to an object @@ -1212,7 +1204,6 @@ const void * _lv_obj_get_style_ptr(const lv_obj_t * obj, uint8_t part, lv_style_ */ lv_style_t * lv_obj_get_local_style(lv_obj_t * obj, uint8_t part); - #include "lv_obj_style_dec.h" /*----------------- @@ -1275,7 +1266,6 @@ bool lv_obj_get_drag_throw(const lv_obj_t * obj); */ bool lv_obj_get_drag_parent(const lv_obj_t * obj); - /** * Get the focus parent attribute of an object * @param obj pointer to an object @@ -1283,7 +1273,6 @@ bool lv_obj_get_drag_parent(const lv_obj_t * obj); */ bool lv_obj_get_focus_parent(const lv_obj_t * obj); - /** * Get the drag parent attribute of an object * @param obj pointer to an object @@ -1315,7 +1304,6 @@ uint8_t lv_obj_get_protect(const lv_obj_t * obj); */ bool lv_obj_is_protected(const lv_obj_t * obj, uint8_t prot); - lv_state_t lv_obj_get_state(const lv_obj_t * obj, uint8_t part); /** @@ -1489,7 +1477,6 @@ bool lv_debug_check_obj_type(const lv_obj_t * obj, const char * obj_type); */ bool lv_debug_check_obj_valid(const lv_obj_t * obj); - /********************** * MACROS **********************/ @@ -1510,7 +1497,6 @@ bool lv_debug_check_obj_valid(const lv_obj_t * obj); */ #define LV_EVENT_CB_DECLARE(name) static void name(lv_obj_t * obj, lv_event_t e) - #if LV_USE_DEBUG # ifndef LV_DEBUG_IS_OBJ @@ -1519,7 +1505,6 @@ bool lv_debug_check_obj_valid(const lv_obj_t * obj); lv_debug_check_obj_type(obj_p, obj_type)) # endif - # if LV_USE_ASSERT_OBJ # ifndef LV_ASSERT_OBJ # define LV_ASSERT_OBJ(obj_p, obj_type) LV_DEBUG_ASSERT(LV_DEBUG_IS_OBJ(obj_p, obj_type), "Invalid object", obj_p); @@ -1535,7 +1520,6 @@ bool lv_debug_check_obj_valid(const lv_obj_t * obj); # define LV_ASSERT_OBJ(obj, obj_type) #endif - #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/lv_core/lv_obj_style_dec.h b/src/lv_core/lv_obj_style_dec.h index 28cbe52ce..7c3d051b3 100644 --- a/src/lv_core/lv_obj_style_dec.h +++ b/src/lv_core/lv_obj_style_dec.h @@ -200,7 +200,6 @@ _LV_OBJ_STYLE_SET_GET_DECLARE(SCALE_END_COLOR, scale_end_color, lv_color_t, _col #undef _LV_OBJ_STYLE_SET_GET_DECLARE - static inline void lv_obj_set_style_local_pad_all(lv_obj_t * obj, uint8_t part, lv_state_t state, lv_style_int_t value) { lv_obj_set_style_local_pad_top(obj, part, state, value); @@ -209,7 +208,6 @@ static inline void lv_obj_set_style_local_pad_all(lv_obj_t * obj, uint8_t part, lv_obj_set_style_local_pad_right(obj, part, state, value); } - static inline void lv_style_set_pad_all(lv_style_t * style, lv_state_t state, lv_style_int_t value) { lv_style_set_pad_top(style, state, value); @@ -218,35 +216,30 @@ static inline void lv_style_set_pad_all(lv_style_t * style, lv_state_t state, lv lv_style_set_pad_right(style, state, value); } - static inline void lv_obj_set_style_local_pad_hor(lv_obj_t * obj, uint8_t part, lv_state_t state, lv_style_int_t value) { lv_obj_set_style_local_pad_left(obj, part, state, value); lv_obj_set_style_local_pad_right(obj, part, state, value); } - static inline void lv_style_set_pad_hor(lv_style_t * style, lv_state_t state, lv_style_int_t value) { lv_style_set_pad_left(style, state, value); lv_style_set_pad_right(style, state, value); } - static inline void lv_obj_set_style_local_pad_ver(lv_obj_t * obj, uint8_t part, lv_state_t state, lv_style_int_t value) { lv_obj_set_style_local_pad_top(obj, part, state, value); lv_obj_set_style_local_pad_bottom(obj, part, state, value); } - static inline void lv_style_set_pad_ver(lv_style_t * style, lv_state_t state, lv_style_int_t value) { lv_style_set_pad_top(style, state, value); lv_style_set_pad_bottom(style, state, value); } - static inline void lv_obj_set_style_local_margin_all(lv_obj_t * obj, uint8_t part, lv_state_t state, lv_style_int_t value) { @@ -256,7 +249,6 @@ static inline void lv_obj_set_style_local_margin_all(lv_obj_t * obj, uint8_t par lv_obj_set_style_local_margin_right(obj, part, state, value); } - static inline void lv_style_set_margin_all(lv_style_t * style, lv_state_t state, lv_style_int_t value) { lv_style_set_margin_top(style, state, value); @@ -265,7 +257,6 @@ static inline void lv_style_set_margin_all(lv_style_t * style, lv_state_t state, lv_style_set_margin_right(style, state, value); } - static inline void lv_obj_set_style_local_margin_hor(lv_obj_t * obj, uint8_t part, lv_state_t state, lv_style_int_t value) { @@ -273,14 +264,12 @@ static inline void lv_obj_set_style_local_margin_hor(lv_obj_t * obj, uint8_t par lv_obj_set_style_local_margin_right(obj, part, state, value); } - static inline void lv_style_set_margin_hor(lv_style_t * style, lv_state_t state, lv_style_int_t value) { lv_style_set_margin_left(style, state, value); lv_style_set_margin_right(style, state, value); } - static inline void lv_obj_set_style_local_margin_ver(lv_obj_t * obj, uint8_t part, lv_state_t state, lv_style_int_t value) { @@ -288,14 +277,12 @@ static inline void lv_obj_set_style_local_margin_ver(lv_obj_t * obj, uint8_t par lv_obj_set_style_local_margin_bottom(obj, part, state, value); } - static inline void lv_style_set_margin_ver(lv_style_t * style, lv_state_t state, lv_style_int_t value) { lv_style_set_margin_top(style, state, value); lv_style_set_margin_bottom(style, state, value); } - #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/lv_core/lv_refr.c b/src/lv_core/lv_refr.c index 0c25671ee..7572412e4 100644 --- a/src/lv_core/lv_refr.c +++ b/src/lv_core/lv_refr.c @@ -564,7 +564,6 @@ static void lv_refr_area_part(const lv_area_t * area_p) } - if(top_act_scr == NULL) { top_act_scr = disp_refr->act_scr; } diff --git a/src/lv_core/lv_style.c b/src/lv_core/lv_style.c index c4ff92276..2ee6017c9 100644 --- a/src/lv_core/lv_style.c +++ b/src/lv_core/lv_style.c @@ -732,7 +732,6 @@ lv_style_t * _lv_style_list_add_trans_style(lv_style_list_t * list) return trans_style; } - /** * Set a local integer typed property in a style list. * @param list pointer to a style list where the local property should be set @@ -797,8 +796,6 @@ void _lv_style_list_set_local_ptr(lv_style_list_t * list, lv_style_property_t pr _lv_style_set_ptr(local, prop, value); } - - /** * Get an integer typed property from a style list. * It will return the property which match best with given state. @@ -1169,7 +1166,6 @@ static inline uint8_t get_style_prop_attr(const lv_style_t * style, size_t idx) return ((get_style_prop(style, idx) >> 8) & 0xFFU); } - /** * Get property size. * @param prop_id property id. diff --git a/src/lv_core/lv_style.h b/src/lv_core/lv_style.h index cc6d6937a..6f62bb1b4 100644 --- a/src/lv_core/lv_style.h +++ b/src/lv_core/lv_style.h @@ -539,7 +539,6 @@ lv_res_t _lv_style_list_get_int(lv_style_list_t * list, lv_style_property_t prop */ lv_res_t _lv_style_list_get_color(lv_style_list_t * list, lv_style_property_t prop, lv_color_t * res); - /** * Get an opacity typed property from a style list. * It will return the property which match best with given state. @@ -599,8 +598,6 @@ bool lv_debug_check_style_list(const lv_style_list_t * list); */ #define LV_STYLE_CREATE(name, copy_p) static lv_style_t name; lv_style_init(&name); lv_style_copy(&name, copy_p); - - #if LV_USE_DEBUG # ifndef LV_DEBUG_IS_STYLE diff --git a/src/lv_draw/lv_draw_arc.c b/src/lv_draw/lv_draw_arc.c index 837bef350..c00be7aab 100644 --- a/src/lv_draw/lv_draw_arc.c +++ b/src/lv_draw/lv_draw_arc.c @@ -34,7 +34,6 @@ typedef struct { const lv_area_t * clip_area; } quarter_draw_dsc_t; - /********************** * STATIC PROTOTYPES **********************/ @@ -44,7 +43,6 @@ static void draw_quarter_2(quarter_draw_dsc_t * q); static void draw_quarter_3(quarter_draw_dsc_t * q); static void get_rounded_area(int16_t angle, lv_coord_t radius, uint8_t thickness, lv_area_t * res_area); - /********************** * STATIC VARIABLES **********************/ @@ -331,7 +329,6 @@ static void draw_quarter_2(quarter_draw_dsc_t * q) } } - static void draw_quarter_3(quarter_draw_dsc_t * q) { lv_area_t quarter_area; @@ -385,7 +382,6 @@ static void draw_quarter_3(quarter_draw_dsc_t * q) } } - static void get_rounded_area(int16_t angle, lv_coord_t radius, uint8_t thickness, lv_area_t * res_area) { const uint8_t ps = 8; @@ -423,4 +419,3 @@ static void get_rounded_area(int16_t angle, lv_coord_t radius, uint8_t thickness res_area->y2 = cir_y + thick_half - thick_corr; } } - diff --git a/src/lv_draw/lv_draw_blend.c b/src/lv_draw/lv_draw_blend.c index c10acffe2..71fd09e8d 100644 --- a/src/lv_draw/lv_draw_blend.c +++ b/src/lv_draw/lv_draw_blend.c @@ -78,7 +78,6 @@ static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_co * MACROS **********************/ - #define FILL_NORMAL_MASK_PX(out_x, color) \ if(*mask_tmp_x) { \ if(*mask_tmp_x == LV_OPA_COVER) disp_buf_first[out_x] = color; \ @@ -86,7 +85,6 @@ static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_co } \ mask_tmp_x++; - #define FILL_NORMAL_MASK_PX_SCR_TRANSP(out_x, color) \ if(*mask_tmp_x) { \ if(*mask_tmp_x == LV_OPA_COVER) disp_buf_first[out_x] = color; \ @@ -96,7 +94,6 @@ static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_co } \ mask_tmp_x++; - #define MAP_NORMAL_MASK_PX(x) \ if(*mask_tmp_x) { \ if(*mask_tmp_x == LV_OPA_COVER) disp_buf_first[x] = map_buf_first[x]; \ @@ -117,7 +114,6 @@ static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_co * GLOBAL FUNCTIONS **********************/ - /** * Fill and area in the display buffer. * @param clip_area clip the fill to this area (absolute coordinates) @@ -252,7 +248,6 @@ LV_ATTRIBUTE_FAST_MEM void _lv_blend_map(const lv_area_t * clip_area, const lv_a #endif } - /********************** * STATIC FUNCTIONS **********************/ @@ -392,7 +387,6 @@ LV_ATTRIBUTE_FAST_MEM static void fill_normal(const lv_area_t * disp_area, lv_co } #endif - #if LV_USE_GPU_STM32_DMA2D if(lv_area_get_size(draw_area) >= 240) { if(blend_buf[0].full != color.full) lv_color_fill(blend_buf, color, LV_HOR_RES_MAX); @@ -450,7 +444,6 @@ LV_ATTRIBUTE_FAST_MEM static void fill_normal(const lv_area_t * disp_area, lv_co } #endif - /*Buffer the result color to avoid recalculating the same color*/ lv_color_t last_dest_color; lv_color_t last_res_color; @@ -581,7 +574,6 @@ static void fill_blended(const lv_area_t * disp_area, lv_color_t * disp_buf, co /*Create a temp. disp_buf which always point to current line to draw*/ lv_color_t * disp_buf_tmp = disp_buf + disp_w * draw_area->y1; - lv_color_t (*blend_fp)(lv_color_t, lv_color_t, lv_opa_t); switch(mode) { case LV_BLEND_MODE_ADDITIVE: @@ -775,7 +767,6 @@ LV_ATTRIBUTE_FAST_MEM static void map_normal(const lv_area_t * disp_area, lv_col blit.src_area.x2 = blit.src_area.x1 + draw_area_w; blit.src_area.y2 = blit.src_area.y1 + draw_area_h; - blit.dst = disp_buf; blit.dst_width = lv_area_get_width(disp_area); blit.dst_height = lv_area_get_height(disp_area); @@ -826,7 +817,6 @@ LV_ATTRIBUTE_FAST_MEM static void map_normal(const lv_area_t * disp_area, lv_col blit.src_area.x2 = blit.src_area.x1 + draw_area_w; blit.src_area.y2 = blit.src_area.y1 + draw_area_h; - blit.dst = disp_buf; blit.dst_width = lv_area_get_width(disp_area); blit.dst_height = lv_area_get_height(disp_area); diff --git a/src/lv_draw/lv_draw_blend.h b/src/lv_draw/lv_draw_blend.h index a5f57ed88..3dcf2c045 100644 --- a/src/lv_draw/lv_draw_blend.h +++ b/src/lv_draw/lv_draw_blend.h @@ -42,7 +42,6 @@ typedef uint8_t lv_blend_mode_t; LV_ATTRIBUTE_FAST_MEM void _lv_blend_fill(const lv_area_t * clip_area, const lv_area_t * fill_area, lv_color_t color, lv_opa_t * mask, lv_draw_mask_res_t mask_res, lv_opa_t opa, lv_blend_mode_t mode); - LV_ATTRIBUTE_FAST_MEM void _lv_blend_map(const lv_area_t * clip_area, const lv_area_t * map_area, const lv_color_t * map_buf, lv_opa_t * mask, lv_draw_mask_res_t mask_res, lv_opa_t opa, lv_blend_mode_t mode); diff --git a/src/lv_draw/lv_draw_img.c b/src/lv_draw/lv_draw_img.c index 57610af08..3a07bde4a 100644 --- a/src/lv_draw/lv_draw_img.c +++ b/src/lv_draw/lv_draw_img.c @@ -313,7 +313,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_res_t lv_img_draw_core(const lv_area_t * coords, return LV_RES_INV; } - lv_draw_map(&line, &mask_line, buf, draw_dsc, chroma_keyed, alpha_byte); line.y1++; line.y2++; @@ -512,7 +511,6 @@ LV_ATTRIBUTE_FAST_MEM static void lv_draw_map(const lv_area_t * map_area, const mask_res = (alpha_byte || chroma_key || draw_dsc->angle || draw_dsc->zoom != LV_IMG_ZOOM_NONE) ? LV_DRAW_MASK_RES_CHANGED : LV_DRAW_MASK_RES_FULL_COVER; - /*Prepare the `mask_buf`if there are other masks*/ if(other_mask_cnt) { _lv_memset_ff(mask_buf, mask_buf_size); @@ -532,7 +530,6 @@ LV_ATTRIBUTE_FAST_MEM static void lv_draw_map(const lv_area_t * map_area, const #endif for(x = 0; x < draw_area_w; x++, map_px += px_size_byte, px_i++) { - #if LV_USE_IMG_TRANSFORM if(transform) { @@ -663,4 +660,3 @@ static void draw_cleanup(lv_img_cache_entry_t * cache) LV_UNUSED(cache); #endif } - diff --git a/src/lv_draw/lv_draw_img.h b/src/lv_draw/lv_draw_img.h index 168b7fffc..a9c699092 100644 --- a/src/lv_draw/lv_draw_img.h +++ b/src/lv_draw/lv_draw_img.h @@ -88,7 +88,6 @@ bool lv_img_cf_is_chroma_keyed(lv_img_cf_t cf); */ bool lv_img_cf_has_alpha(lv_img_cf_t cf); - #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/src/lv_draw/lv_draw_label.c b/src/lv_draw/lv_draw_label.c index c57848ebd..8fb92444c 100644 --- a/src/lv_draw/lv_draw_label.c +++ b/src/lv_draw/lv_draw_label.c @@ -41,7 +41,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_letter_normal(lv_coord_t pos_x, lv_coord_ static void draw_letter_subpx(lv_coord_t pos_x, lv_coord_t pos_y, lv_font_glyph_dsc_t * g, const lv_area_t * clip_area, const uint8_t * map_p, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode); - static uint8_t hex_char_to_num(char hex); /********************** @@ -129,7 +128,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area bool clip_ok = _lv_area_intersect(&clipped_area, coords, mask); if(!clip_ok) return; - if((dsc->flag & LV_TXT_FLAG_EXPAND) == 0) { /*Normally use the label's width as width*/ w = lv_area_get_width(coords); @@ -232,7 +230,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area lv_color_t recolor; int32_t letter_w; - lv_draw_rect_dsc_t draw_dsc_sel; lv_draw_rect_dsc_init(&draw_dsc_sel); draw_dsc_sel.bg_color = dsc->sel_bg_color; @@ -389,7 +386,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(const lv_area_t * coords, const lv_area * STATIC FUNCTIONS **********************/ - /** * Draw a letter in the Virtual Display Buffer * @param pos_p left-top coordinate of the latter @@ -437,7 +433,6 @@ LV_ATTRIBUTE_FAST_MEM static void lv_draw_letter(const lv_point_t * pos_p, const return; } - const uint8_t * map_p = lv_font_get_glyph_bitmap(font_p, letter); if(map_p == NULL) { LV_LOG_WARN("lv_draw_letter: character's bitmap not found"); @@ -452,7 +447,6 @@ LV_ATTRIBUTE_FAST_MEM static void lv_draw_letter(const lv_point_t * pos_p, const } } - LV_ATTRIBUTE_FAST_MEM static void draw_letter_normal(lv_coord_t pos_x, lv_coord_t pos_y, lv_font_glyph_dsc_t * g, const lv_area_t * clip_area, const uint8_t * map_p, lv_color_t color, lv_opa_t opa, lv_blend_mode_t blend_mode) @@ -569,7 +563,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_letter_normal(lv_coord_t pos_x, lv_coord_ mask_p++; } - /*Apply masks if any*/ if(other_mask_cnt) { lv_draw_mask_res_t mask_res = lv_draw_mask_apply(mask_buf + mask_p_start, fill_area.x1, fill_area.y2, @@ -647,7 +640,6 @@ static void draw_letter_subpx(lv_coord_t pos_x, lv_coord_t pos_y, lv_font_glyph_ int32_t box_h = g->box_h; int32_t width_bit = box_w * bpp; /*Letter width in bits*/ - /* Calculate the col/row start/end on the map*/ int32_t col_start = pos_x >= clip_area->x1 ? 0 : (clip_area->x1 - pos_x) * 3; int32_t col_end = pos_x + box_w / 3 <= clip_area->x2 ? box_w : (clip_area->x2 - pos_x + 1) * 3; @@ -817,7 +809,6 @@ static void draw_letter_subpx(lv_coord_t pos_x, lv_coord_t pos_y, lv_font_glyph_ #endif } - /** * Convert a hexadecimal characters to a number (0..15) * @param hex Pointer to a hexadecimal character (0..9, A..F) diff --git a/src/lv_draw/lv_draw_line.c b/src/lv_draw/lv_draw_line.c index 1ae458f3f..130c71448 100644 --- a/src/lv_draw/lv_draw_line.c +++ b/src/lv_draw/lv_draw_line.c @@ -83,7 +83,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_line(const lv_point_t * point1, const lv_poin else if(point1->x == point2->x) draw_line_ver(point1, point2, &clip_line, dsc); else draw_line_skew(point1, point2, &clip_line, dsc); - if(dsc->round_end || dsc->round_start) { lv_draw_rect_dsc_t cir_dsc; lv_draw_rect_dsc_init(&cir_dsc); @@ -217,7 +216,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_line_hor(const lv_point_t * point1, const } } - LV_ATTRIBUTE_FAST_MEM static void draw_line_ver(const lv_point_t * point1, const lv_point_t * point2, const lv_area_t * clip, const lv_draw_line_dsc_t * dsc) @@ -312,7 +310,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_line_ver(const lv_point_t * point1, const } } - LV_ATTRIBUTE_FAST_MEM static void draw_line_skew(const lv_point_t * point1, const lv_point_t * point2, const lv_area_t * clip, const lv_draw_line_dsc_t * dsc) diff --git a/src/lv_draw/lv_draw_line.h b/src/lv_draw/lv_draw_line.h index eb4bbaf58..9a1da4e55 100644 --- a/src/lv_draw/lv_draw_line.h +++ b/src/lv_draw/lv_draw_line.h @@ -51,7 +51,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_line(const lv_point_t * point1, const lv_poin LV_ATTRIBUTE_FAST_MEM void lv_draw_line_dsc_init(lv_draw_line_dsc_t * dsc); - //! @endcond /********************** diff --git a/src/lv_draw/lv_draw_mask.c b/src/lv_draw/lv_draw_mask.c index f7b8bc1ff..130c449f0 100644 --- a/src/lv_draw/lv_draw_mask.c +++ b/src/lv_draw/lv_draw_mask.c @@ -284,7 +284,6 @@ void lv_draw_mask_line_angle_init(lv_draw_mask_line_param_t * param, lv_coord_t * Find the degree which keeps the origo in place */ if(angle > 180) angle -= 180; /*> 180 will swap the origo*/ - int32_t p2x; int32_t p2y; @@ -294,7 +293,6 @@ void lv_draw_mask_line_angle_init(lv_draw_mask_line_param_t * param, lv_coord_t lv_draw_mask_line_points_init(param, p1x, py, p2x, p2y, side); } - /** * Initialize an angle mask. * @param param pointer to a `lv_draw_mask_param_t` to initialize @@ -360,7 +358,6 @@ void lv_draw_mask_angle_init(lv_draw_mask_angle_param_t * param, lv_coord_t vert lv_draw_mask_line_angle_init(¶m->end_line, vertex_x, vertex_y, end_angle, end_side); } - /** * Initialize a fade mask. * @param param param pointer to a `lv_draw_mask_param_t` to initialize @@ -385,7 +382,6 @@ void lv_draw_mask_radius_init(lv_draw_mask_radius_param_t * param, const lv_area param->y_prev_x.i = 0; } - /** * Initialize a fade mask. * @param param pointer to a `lv_draw_mask_param_t` to initialize @@ -408,7 +404,6 @@ void lv_draw_mask_fade_init(lv_draw_mask_fade_param_t * param, const lv_area_t * param->dsc.type = LV_DRAW_MASK_TYPE_FADE; } - /** * Initialize a map mask. * @param param pointer to a `lv_draw_mask_param_t` to initialize @@ -423,7 +418,6 @@ void lv_draw_mask_map_init(lv_draw_mask_map_param_t * param, const lv_area_t * c param->dsc.type = LV_DRAW_MASK_TYPE_MAP; } - /********************** * STATIC FUNCTIONS **********************/ @@ -573,7 +567,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t line_mask_flat(lv_opa_t * mask_b if(k >= len) break; } - if(k < len && k >= 0) { int32_t x_inters = (px_h * p->xy_steep) >> 10; m = (x_inters * px_h) >> 9; @@ -582,7 +575,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t line_mask_flat(lv_opa_t * mask_b mask_buf[k] = mask_mix(mask_buf[k], m); } - if(p->inv) { k = xei - abs_x; if(k > len) { @@ -747,7 +739,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t line_mask_steep(lv_opa_t * mask_ return LV_DRAW_MASK_RES_CHANGED; } - LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_angle(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y, lv_coord_t len, lv_draw_mask_angle_param_t * p) @@ -755,7 +746,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_angle(lv_opa_t * ma int32_t rel_y = abs_y - p->cfg.vertex_p.y; int32_t rel_x = abs_x - p->cfg.vertex_p.x; - if(p->cfg.start_angle < 180 && p->cfg.end_angle < 180 && p->cfg.start_angle != 0 && p->cfg.end_angle != 0 && p->cfg.start_angle > p->cfg.end_angle) { @@ -768,7 +758,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_angle(lv_opa_t * ma int32_t end_angle_first = (rel_y * p->end_line.xy_steep) >> 10; int32_t start_angle_last = ((rel_y + 1) * p->start_line.xy_steep) >> 10; - /*Do not let the line end cross the vertex else it will affect the opposite part*/ if(p->cfg.start_angle > 270 && p->cfg.start_angle <= 359 && start_angle_last < 0) start_angle_last = 0; else if(p->cfg.start_angle > 0 && p->cfg.start_angle <= 90 && start_angle_last < 0) start_angle_last = 0; @@ -778,7 +767,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_angle(lv_opa_t * ma else if(p->cfg.end_angle > 0 && p->cfg.end_angle <= 90 && start_angle_last < 0) start_angle_last = 0; else if(p->cfg.end_angle > 90 && p->cfg.end_angle < 270 && start_angle_last > 0) start_angle_last = 0; - int32_t dist = (end_angle_first - start_angle_last) >> 1; lv_draw_mask_res_t res1 = LV_DRAW_MASK_RES_FULL_COVER; @@ -1139,7 +1127,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_radius(lv_opa_t * m return LV_DRAW_MASK_RES_CHANGED; } - LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_fade(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y, lv_coord_t len, lv_draw_mask_fade_param_t * p) @@ -1200,7 +1187,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_map(lv_opa_t * mask const lv_opa_t * map_tmp = p->cfg.map; map_tmp += (abs_y - p->cfg.coords.y1) * lv_area_get_width(&p->cfg.coords); - if(abs_x + len > p->cfg.coords.x2) len -= abs_x + len - p->cfg.coords.x2 - 1; if(abs_x < p->cfg.coords.x1) { @@ -1221,7 +1207,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_mask_res_t lv_draw_mask_map(lv_opa_t * mask return LV_DRAW_MASK_RES_CHANGED; } - LV_ATTRIBUTE_FAST_MEM static inline lv_opa_t mask_mix(lv_opa_t mask_act, lv_opa_t mask_new) { if(mask_new >= LV_OPA_MAX) return mask_act; diff --git a/src/lv_draw/lv_draw_mask.h b/src/lv_draw/lv_draw_mask.h index dc40ce0f4..adb9a050a 100644 --- a/src/lv_draw/lv_draw_mask.h +++ b/src/lv_draw/lv_draw_mask.h @@ -36,7 +36,6 @@ enum { typedef uint8_t lv_draw_mask_res_t; - enum { LV_DRAW_MASK_TYPE_LINE, LV_DRAW_MASK_TYPE_ANGLE, @@ -102,7 +101,6 @@ typedef struct { /*1: It's a flat line? (Near to horizontal)*/ uint8_t flat : 1; - /* Invert the mask. The default is: Keep the left part. * It is used to select left/right/top/bottom*/ uint8_t inv: 1; @@ -181,7 +179,6 @@ typedef _lv_draw_mask_saved_t _lv_draw_mask_saved_arr_t[_LV_MASK_MAX_NUM]; */ int16_t lv_draw_mask_add(void * param, void * custom_id); - //! @cond Doxygen_Suppress /** @@ -198,7 +195,6 @@ int16_t lv_draw_mask_add(void * param, void * custom_id); LV_ATTRIBUTE_FAST_MEM lv_draw_mask_res_t lv_draw_mask_apply(lv_opa_t * mask_buf, lv_coord_t abs_x, lv_coord_t abs_y, lv_coord_t len); - //! @endcond /** @@ -225,7 +221,6 @@ void * lv_draw_mask_remove_custom(void * custom_id); */ LV_ATTRIBUTE_FAST_MEM uint8_t lv_draw_mask_get_cnt(void); - //! @endcond /** diff --git a/src/lv_draw/lv_draw_rect.c b/src/lv_draw/lv_draw_rect.c index 350178a93..d81f1a6fa 100644 --- a/src/lv_draw/lv_draw_rect.c +++ b/src/lv_draw/lv_draw_rect.c @@ -245,7 +245,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_bg(const lv_area_t * coords, const lv_are lv_draw_mask_res_t mask_res = LV_DRAW_MASK_RES_FULL_COVER; lv_color_t grad_color = dsc->bg_color; - lv_color_t * grad_map = NULL; /*In case of horizontal gradient pre-compute a line with a gradient*/ if(grad_dir == LV_GRAD_DIR_HOR) { @@ -330,7 +329,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_bg(const lv_area_t * coords, const lv_are _lv_blend_fill(clip, &fill_area2, grad_color, mask_buf + mask_ofs, mask_res, opa2, dsc->bg_blend_mode); - } else { if(grad_dir == LV_GRAD_DIR_HOR) { @@ -363,7 +361,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_bg(const lv_area_t * coords, const lv_are if(fill_area.y1 <= fill_area.y2) fill_area.y1 = fill_area.y2 + 1; /*Avoid overdrawing the last line*/ fill_area.y2 = coords_bg.y2; - _lv_blend_fill(clip, &fill_area, dsc->bg_color, NULL, LV_DRAW_MASK_RES_FULL_COVER, opa, dsc->bg_blend_mode); @@ -589,7 +586,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_shadow(const lv_area_t * coords, const lv short_side = LV_MATH_MIN(lv_area_get_width(&sh_rect_area), lv_area_get_height(&sh_rect_area)); if(r_sh > short_side >> 1) r_sh = short_side >> 1; - int32_t corner_size = sw + r_sh; lv_opa_t * sh_buf; @@ -916,7 +912,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_shadow(const lv_area_t * coords, const lv } } - /*Fill the bottom side*/ a.x1 = sh_area.x1 + corner_size; a.x2 = sh_area.x2 - corner_size; @@ -1289,7 +1284,6 @@ static void draw_pattern(const lv_area_t * coords, const lv_area_t * clip, const } #endif - #if LV_USE_VALUE_STR static void draw_value_str(const lv_area_t * coords, const lv_area_t * clip, const lv_draw_rect_dsc_t * dsc) { @@ -1483,7 +1477,6 @@ static void draw_full_border(const lv_area_t * area_inner, const lv_area_t * are if(mask_ofs < 0) mask_ofs = 0; _lv_blend_fill(clip, &fill_area2, color, mask_buf + mask_ofs, mask_res, opa, blend_mode); - fill_area.y1++; fill_area.y2++; } @@ -1523,4 +1516,3 @@ static void draw_full_border(const lv_area_t * area_inner, const lv_area_t * are lv_draw_mask_remove_id(mask_rout_id); _lv_mem_buf_release(mask_buf); } - diff --git a/src/lv_draw/lv_draw_triangle.c b/src/lv_draw/lv_draw_triangle.c index e5775a7e2..a8fabfcaf 100644 --- a/src/lv_draw/lv_draw_triangle.c +++ b/src/lv_draw/lv_draw_triangle.c @@ -125,7 +125,6 @@ void lv_draw_polygon(const lv_point_t points[], uint16_t point_cnt, const lv_are i_next_right = y_min_i + 1; if(i_next_right > point_cnt - 1) i_next_right = 0; - /* Check if the order of points is inverted or not. * The normal case is when the left point is on `y_min_i - 1` * Explanation: diff --git a/src/lv_draw/lv_img_buf.c b/src/lv_draw/lv_img_buf.c index f18a6fd6c..ff454b73f 100644 --- a/src/lv_draw/lv_img_buf.c +++ b/src/lv_draw/lv_img_buf.c @@ -38,7 +38,6 @@ * GLOBAL FUNCTIONS **********************/ - /** * Get the color of an image's pixel * @param dsc an image descriptor @@ -411,7 +410,6 @@ uint32_t lv_img_buf_get_img_size(lv_coord_t w, lv_coord_t h, lv_img_cf_t cf) } } - #if LV_USE_IMG_TRANSFORM /** * Initialize a descriptor to transform an image @@ -485,7 +483,6 @@ void _lv_img_buf_get_transformed_area(lv_area_t * res, lv_coord_t w, lv_coord_t return; } - res->x1 = (((-pivot->x) * zoom) >> 8) - 1; res->y1 = (((-pivot->y) * zoom) >> 8) - 1; res->x2 = (((w - pivot->x) * zoom) >> 8) + 2; @@ -683,4 +680,3 @@ bool _lv_img_buf_transform_anti_alias(lv_img_transform_dsc_t * dsc) /********************** * STATIC FUNCTIONS **********************/ - diff --git a/src/lv_draw/lv_img_buf.h b/src/lv_draw/lv_img_buf.h index 5b43456ac..93974b992 100644 --- a/src/lv_draw/lv_img_buf.h +++ b/src/lv_draw/lv_img_buf.h @@ -17,7 +17,6 @@ extern "C" { #include "../lv_misc/lv_color.h" #include "../lv_misc/lv_area.h" - /********************* * DEFINES *********************/ @@ -101,7 +100,6 @@ enum { }; typedef uint8_t lv_img_cf_t; - /** * LVGL image header */ @@ -120,7 +118,6 @@ typedef struct { non-printable character*/ uint32_t cf : 5; /* Color format: See `lv_img_color_format_t`*/ - } lv_img_header_t; #else typedef struct { @@ -163,7 +160,6 @@ typedef struct { lv_opa_t opa; } res; - struct { lv_img_dsc_t img_dsc; int32_t pivot_x_256; @@ -269,7 +265,6 @@ void lv_img_buf_free(lv_img_dsc_t * dsc); */ uint32_t lv_img_buf_get_img_size(lv_coord_t w, lv_coord_t h, lv_img_cf_t cf); - #if LV_USE_IMG_TRANSFORM /** * Initialize a descriptor to rotate an image @@ -283,7 +278,6 @@ void _lv_img_buf_transform_init(lv_img_transform_dsc_t * dsc); */ bool _lv_img_buf_transform_anti_alias(lv_img_transform_dsc_t * dsc); - /** * Get which color and opa would come to a pixel if it were rotated * @param dsc a descriptor initialized by `lv_img_buf_rotate_init` diff --git a/src/lv_draw/lv_img_decoder.c b/src/lv_draw/lv_img_decoder.c index 895c064bb..c70f32fbe 100644 --- a/src/lv_draw/lv_img_decoder.c +++ b/src/lv_draw/lv_img_decoder.c @@ -432,7 +432,6 @@ lv_res_t lv_img_decoder_built_in_open(lv_img_decoder_t * decoder, lv_img_decoder /*The palette begins in the beginning of the image data. Just point to it.*/ lv_color32_t * palette_p = (lv_color32_t *)((lv_img_dsc_t *)dsc->src)->data; - uint32_t i; for(i = 0; i < palette_size; i++) { user_data->palette[i] = lv_color_make(palette_p[i].ch.red, palette_p[i].ch.green, palette_p[i].ch.blue); @@ -537,7 +536,6 @@ void lv_img_decoder_built_in_close(lv_img_decoder_t * decoder, lv_img_decoder_ds } } - /********************** * STATIC FUNCTIONS **********************/ diff --git a/src/lv_font/lv_font.h b/src/lv_font/lv_font.h index 6a72f02cf..d8c69f3f7 100644 --- a/src/lv_font/lv_font.h +++ b/src/lv_font/lv_font.h @@ -43,7 +43,6 @@ typedef struct { uint8_t bpp; /**< Bit-per-pixel: 1, 2, 4, 8*/ } lv_font_glyph_dsc_t; - /** The bitmaps might be upscaled by 3 to achieve subpixel rendering. */ enum { LV_FONT_SUBPX_NONE, @@ -75,7 +74,6 @@ typedef struct _lv_font_struct { lv_font_user_data_t user_data; /**< Custom user data for font. */ #endif - } lv_font_t; /********************** diff --git a/src/lv_font/lv_font_dejavu_16_persian_hebrew.c b/src/lv_font/lv_font_dejavu_16_persian_hebrew.c index 8a32111a7..4c4181806 100644 --- a/src/lv_font/lv_font_dejavu_16_persian_hebrew.c +++ b/src/lv_font/lv_font_dejavu_16_persian_hebrew.c @@ -5818,7 +5818,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -6508,8 +6507,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = } }; - - /*-------------------- * ALL CUSTOM DATA *--------------------*/ @@ -6527,7 +6524,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -6549,4 +6545,3 @@ lv_font_t lv_font_dejavu_16_persian_hebrew = { }; #endif /*#if LV_FONT_DEJAVU_16_PERSIAN_HEBREW*/ - diff --git a/src/lv_font/lv_font_fmt_txt.c b/src/lv_font/lv_font_fmt_txt.c index 011f55e86..75a084772 100644 --- a/src/lv_font/lv_font_fmt_txt.c +++ b/src/lv_font/lv_font_fmt_txt.c @@ -199,7 +199,6 @@ void _lv_font_clean_up_fmt_txt(void) } } - /********************** * STATIC FUNCTIONS **********************/ @@ -557,7 +556,6 @@ static inline uint8_t rle_next(void) rle_state = RLE_STATE_SINGLE; } - } else if(rle_state == RLE_STATE_COUNTER) { ret = rle_prev_v; diff --git a/src/lv_font/lv_font_fmt_txt.h b/src/lv_font/lv_font_fmt_txt.h index 863b19269..99d5ec0aa 100644 --- a/src/lv_font/lv_font_fmt_txt.h +++ b/src/lv_font/lv_font_fmt_txt.h @@ -45,7 +45,6 @@ typedef struct { #endif } lv_font_fmt_txt_glyph_dsc_t; - /** Format of font character map. */ enum { LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY, @@ -56,7 +55,6 @@ enum { typedef uint8_t lv_font_fmt_txt_cmap_type_t; - /* Map codepoints to a `glyph_dsc`s * Several formats are supported to optimize memory usage * See https://github.com/lvgl/lv_font_conv/blob/master/doc/font_spec.md @@ -145,7 +143,6 @@ typedef struct { uint8_t right_class_cnt; } lv_font_fmt_txt_kern_classes_t; - /** Bitmap formats*/ typedef enum { LV_FONT_FMT_TXT_PLAIN = 0, @@ -153,7 +150,6 @@ typedef enum { LV_FONT_FMT_TXT_COMPRESSED_NO_PREFILTER = 1, } lv_font_fmt_txt_bitmap_format_t; - /*Describe store additional data for fonts */ typedef struct { /*The bitmaps of all glyphs*/ diff --git a/src/lv_font/lv_font_loader.c b/src/lv_font/lv_font_loader.c index 7cde8370d..27f4c1030 100644 --- a/src/lv_font/lv_font_loader.c +++ b/src/lv_font/lv_font_loader.c @@ -16,7 +16,6 @@ #if LV_USE_FILESYSTEM - /********************** * TYPEDEFS **********************/ @@ -61,7 +60,6 @@ typedef struct cmap_table_bin { uint8_t padding; } cmap_table_bin_t; - /********************** * STATIC PROTOTYPES **********************/ @@ -72,7 +70,6 @@ int32_t load_kern(lv_fs_file_t * fp, lv_font_fmt_txt_dsc_t * font_dsc, uint8_t f static int read_bits_signed(bit_iterator_t * it, int n_bits, lv_fs_res_t * res); static int read_bits(bit_iterator_t * it, int n_bits, lv_fs_res_t * res); - /********************** * MACROS **********************/ @@ -116,7 +113,6 @@ lv_font_t * lv_font_load(const char * font_name) return font; } - /** * Frees the memory allocated by the `lv_font_load()` function * @param font lv_font_t object created by the lv_font_load function @@ -185,7 +181,6 @@ void lv_font_free(lv_font_t * font) } } - /********************** * STATIC FUNCTIONS **********************/ @@ -691,4 +686,3 @@ int32_t load_kern(lv_fs_file_t * fp, lv_font_fmt_txt_dsc_t * font_dsc, uint8_t f } #endif /*LV_USE_FILESYSTEM*/ - diff --git a/src/lv_font/lv_font_montserrat_10.c b/src/lv_font/lv_font_montserrat_10.c index 3f42da8b1..6d1dbfa54 100644 --- a/src/lv_font/lv_font_montserrat_10.c +++ b/src/lv_font/lv_font_montserrat_10.c @@ -947,7 +947,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -1141,7 +1140,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -1568,7 +1566,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -1595,7 +1592,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -1616,7 +1612,4 @@ lv_font_t lv_font_montserrat_10 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_10*/ - diff --git a/src/lv_font/lv_font_montserrat_12.c b/src/lv_font/lv_font_montserrat_12.c index 209eea93e..dd1ef8f70 100644 --- a/src/lv_font/lv_font_montserrat_12.c +++ b/src/lv_font/lv_font_montserrat_12.c @@ -1201,7 +1201,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -1396,7 +1395,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -1826,7 +1824,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -1854,7 +1851,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -1876,4 +1872,3 @@ lv_font_t lv_font_montserrat_12 = { }; #endif /*#if LV_FONT_MONTSERRAT_12*/ - diff --git a/src/lv_font/lv_font_montserrat_12_subpx.c b/src/lv_font/lv_font_montserrat_12_subpx.c index 2bd1fc68d..2dddd60a8 100644 --- a/src/lv_font/lv_font_montserrat_12_subpx.c +++ b/src/lv_font/lv_font_montserrat_12_subpx.c @@ -1201,7 +1201,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -1396,7 +1395,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -1826,7 +1824,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -1854,7 +1851,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -1876,4 +1872,3 @@ lv_font_t lv_font_montserrat_12_subpx = { }; #endif /*#if LV_FONT_MONTSERRAT_12_SUBPX*/ - diff --git a/src/lv_font/lv_font_montserrat_14.c b/src/lv_font/lv_font_montserrat_14.c index 978742d5e..095073323 100644 --- a/src/lv_font/lv_font_montserrat_14.c +++ b/src/lv_font/lv_font_montserrat_14.c @@ -1470,7 +1470,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -1665,7 +1664,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -2095,7 +2093,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -2123,7 +2120,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -2145,4 +2141,3 @@ lv_font_t lv_font_montserrat_14 = { }; #endif /*#if LV_FONT_MONTSERRAT_14*/ - diff --git a/src/lv_font/lv_font_montserrat_16.c b/src/lv_font/lv_font_montserrat_16.c index eeaed4f80..2336c9c43 100644 --- a/src/lv_font/lv_font_montserrat_16.c +++ b/src/lv_font/lv_font_montserrat_16.c @@ -1733,7 +1733,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -1928,7 +1927,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -2358,7 +2356,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -2386,7 +2383,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -2408,4 +2404,3 @@ lv_font_t lv_font_montserrat_16 = { }; #endif /*#if LV_FONT_MONTSERRAT_16*/ - diff --git a/src/lv_font/lv_font_montserrat_18.c b/src/lv_font/lv_font_montserrat_18.c index c1850de0f..209d80ed0 100644 --- a/src/lv_font/lv_font_montserrat_18.c +++ b/src/lv_font/lv_font_montserrat_18.c @@ -2122,7 +2122,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -2317,7 +2316,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -2747,7 +2745,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -2775,7 +2772,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -2797,4 +2793,3 @@ lv_font_t lv_font_montserrat_18 = { }; #endif /*#if LV_FONT_MONTSERRAT_18*/ - diff --git a/src/lv_font/lv_font_montserrat_20.c b/src/lv_font/lv_font_montserrat_20.c index 6403288da..5b8762e25 100644 --- a/src/lv_font/lv_font_montserrat_20.c +++ b/src/lv_font/lv_font_montserrat_20.c @@ -2468,7 +2468,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -2663,7 +2662,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -3093,7 +3091,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -3121,7 +3118,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -3143,4 +3139,3 @@ lv_font_t lv_font_montserrat_20 = { }; #endif /*#if LV_FONT_MONTSERRAT_20*/ - diff --git a/src/lv_font/lv_font_montserrat_22.c b/src/lv_font/lv_font_montserrat_22.c index e1c1e42af..7308e6ea1 100644 --- a/src/lv_font/lv_font_montserrat_22.c +++ b/src/lv_font/lv_font_montserrat_22.c @@ -2885,7 +2885,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -3080,7 +3079,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -3510,7 +3508,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -3538,7 +3535,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -3560,4 +3556,3 @@ lv_font_t lv_font_montserrat_22 = { }; #endif /*#if LV_FONT_MONTSERRAT_22*/ - diff --git a/src/lv_font/lv_font_montserrat_24.c b/src/lv_font/lv_font_montserrat_24.c index 22f5f3a7e..e182ee73d 100644 --- a/src/lv_font/lv_font_montserrat_24.c +++ b/src/lv_font/lv_font_montserrat_24.c @@ -3286,7 +3286,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -3481,7 +3480,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -3911,7 +3909,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -3939,7 +3936,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -3961,4 +3957,3 @@ lv_font_t lv_font_montserrat_24 = { }; #endif /*#if LV_FONT_MONTSERRAT_24*/ - diff --git a/src/lv_font/lv_font_montserrat_26.c b/src/lv_font/lv_font_montserrat_26.c index 6d4e9db0c..9dacec475 100644 --- a/src/lv_font/lv_font_montserrat_26.c +++ b/src/lv_font/lv_font_montserrat_26.c @@ -3806,7 +3806,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -4001,7 +4000,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -4431,7 +4429,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -4459,7 +4456,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -4481,4 +4477,3 @@ lv_font_t lv_font_montserrat_26 = { }; #endif /*#if LV_FONT_MONTSERRAT_26*/ - diff --git a/src/lv_font/lv_font_montserrat_28.c b/src/lv_font/lv_font_montserrat_28.c index 59c381519..5e740fed6 100644 --- a/src/lv_font/lv_font_montserrat_28.c +++ b/src/lv_font/lv_font_montserrat_28.c @@ -4340,7 +4340,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -4535,7 +4534,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -4965,7 +4963,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -4993,7 +4990,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -5015,4 +5011,3 @@ lv_font_t lv_font_montserrat_28 = { }; #endif /*#if LV_FONT_MONTSERRAT_28*/ - diff --git a/src/lv_font/lv_font_montserrat_28_compressed.c b/src/lv_font/lv_font_montserrat_28_compressed.c index ef74c0a54..96e415365 100644 --- a/src/lv_font/lv_font_montserrat_28_compressed.c +++ b/src/lv_font/lv_font_montserrat_28_compressed.c @@ -2530,7 +2530,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0xff, 0x3a, 0xba, 0x40, 0x3f, 0xf9, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -2725,7 +2724,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -3155,7 +3153,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -3183,7 +3180,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 1 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -3205,4 +3201,3 @@ lv_font_t lv_font_montserrat_28_compressed = { }; #endif /*#if LV_FONT_MONTSERRAT_28_COMPRESSED*/ - diff --git a/src/lv_font/lv_font_montserrat_30.c b/src/lv_font/lv_font_montserrat_30.c index 93e024b01..bde5a9032 100644 --- a/src/lv_font/lv_font_montserrat_30.c +++ b/src/lv_font/lv_font_montserrat_30.c @@ -4906,7 +4906,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -5101,7 +5100,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -5531,7 +5529,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -5559,7 +5556,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -5581,4 +5577,3 @@ lv_font_t lv_font_montserrat_30 = { }; #endif /*#if LV_FONT_MONTSERRAT_30*/ - diff --git a/src/lv_font/lv_font_montserrat_32.c b/src/lv_font/lv_font_montserrat_32.c index 9a4485bec..a9fb7bd04 100644 --- a/src/lv_font/lv_font_montserrat_32.c +++ b/src/lv_font/lv_font_montserrat_32.c @@ -5383,7 +5383,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -5578,7 +5577,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -6008,7 +6006,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -6036,7 +6033,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -6058,4 +6054,3 @@ lv_font_t lv_font_montserrat_32 = { }; #endif /*#if LV_FONT_MONTSERRAT_32*/ - diff --git a/src/lv_font/lv_font_montserrat_34.c b/src/lv_font/lv_font_montserrat_34.c index 71f1ee64a..10fc05a4a 100644 --- a/src/lv_font/lv_font_montserrat_34.c +++ b/src/lv_font/lv_font_montserrat_34.c @@ -6160,7 +6160,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -6355,7 +6354,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -6785,7 +6783,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -6813,7 +6810,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -6835,4 +6831,3 @@ lv_font_t lv_font_montserrat_34 = { }; #endif /*#if LV_FONT_MONTSERRAT_34*/ - diff --git a/src/lv_font/lv_font_montserrat_36.c b/src/lv_font/lv_font_montserrat_36.c index 3c4104f2d..ef6c397c8 100644 --- a/src/lv_font/lv_font_montserrat_36.c +++ b/src/lv_font/lv_font_montserrat_36.c @@ -6787,7 +6787,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -6982,7 +6981,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -7412,7 +7410,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -7440,7 +7437,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -7462,4 +7458,3 @@ lv_font_t lv_font_montserrat_36 = { }; #endif /*#if LV_FONT_MONTSERRAT_36*/ - diff --git a/src/lv_font/lv_font_montserrat_38.c b/src/lv_font/lv_font_montserrat_38.c index 5f3cb1a8f..f86dfd9da 100644 --- a/src/lv_font/lv_font_montserrat_38.c +++ b/src/lv_font/lv_font_montserrat_38.c @@ -7510,7 +7510,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -7705,7 +7704,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -8135,7 +8133,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -8163,7 +8160,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -8185,4 +8181,3 @@ lv_font_t lv_font_montserrat_38 = { }; #endif /*#if LV_FONT_MONTSERRAT_38*/ - diff --git a/src/lv_font/lv_font_montserrat_40.c b/src/lv_font/lv_font_montserrat_40.c index a26745b21..815e8572c 100644 --- a/src/lv_font/lv_font_montserrat_40.c +++ b/src/lv_font/lv_font_montserrat_40.c @@ -8342,7 +8342,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -8537,7 +8536,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -8967,7 +8965,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -8995,7 +8992,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -9017,4 +9013,3 @@ lv_font_t lv_font_montserrat_40 = { }; #endif /*#if LV_FONT_MONTSERRAT_40*/ - diff --git a/src/lv_font/lv_font_montserrat_42.c b/src/lv_font/lv_font_montserrat_42.c index f386e40b1..d83dff5cb 100644 --- a/src/lv_font/lv_font_montserrat_42.c +++ b/src/lv_font/lv_font_montserrat_42.c @@ -9160,7 +9160,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -9355,7 +9354,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -9785,7 +9783,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -9813,7 +9810,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -9835,4 +9831,3 @@ lv_font_t lv_font_montserrat_42 = { }; #endif /*#if LV_FONT_MONTSERRAT_42*/ - diff --git a/src/lv_font/lv_font_montserrat_44.c b/src/lv_font/lv_font_montserrat_44.c index c87339779..feb6b21ce 100644 --- a/src/lv_font/lv_font_montserrat_44.c +++ b/src/lv_font/lv_font_montserrat_44.c @@ -9960,7 +9960,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -10155,7 +10154,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -10585,7 +10583,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -10613,7 +10610,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -10635,4 +10631,3 @@ lv_font_t lv_font_montserrat_44 = { }; #endif /*#if LV_FONT_MONTSERRAT_44*/ - diff --git a/src/lv_font/lv_font_montserrat_46.c b/src/lv_font/lv_font_montserrat_46.c index 01c1d6877..d6d9f06f2 100644 --- a/src/lv_font/lv_font_montserrat_46.c +++ b/src/lv_font/lv_font_montserrat_46.c @@ -10889,7 +10889,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -11084,7 +11083,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -11514,7 +11512,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -11542,7 +11539,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -11564,4 +11560,3 @@ lv_font_t lv_font_montserrat_46 = { }; #endif /*#if LV_FONT_MONTSERRAT_46*/ - diff --git a/src/lv_font/lv_font_montserrat_48.c b/src/lv_font/lv_font_montserrat_48.c index 1d24b1692..9a801ae59 100644 --- a/src/lv_font/lv_font_montserrat_48.c +++ b/src/lv_font/lv_font_montserrat_48.c @@ -11571,7 +11571,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -11766,7 +11765,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -12196,7 +12194,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -12224,7 +12221,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -12246,4 +12242,3 @@ lv_font_t lv_font_montserrat_48 = { }; #endif /*#if LV_FONT_MONTSERRAT_48*/ - diff --git a/src/lv_font/lv_font_montserrat_8.c b/src/lv_font/lv_font_montserrat_8.c index ae766a7d2..34f6d4cc9 100644 --- a/src/lv_font/lv_font_montserrat_8.c +++ b/src/lv_font/lv_font_montserrat_8.c @@ -739,7 +739,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -933,7 +932,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -1360,7 +1358,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -1387,7 +1384,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -1408,7 +1404,4 @@ lv_font_t lv_font_montserrat_8 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_8*/ - diff --git a/src/lv_font/lv_font_simsun_16_cjk.c b/src/lv_font/lv_font_simsun_16_cjk.c index 8d57f1e53..7e8a38a0b 100644 --- a/src/lv_font/lv_font_simsun_16_cjk.c +++ b/src/lv_font/lv_font_simsun_16_cjk.c @@ -12639,7 +12639,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -13559,8 +13558,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = } }; - - /*-------------------- * ALL CUSTOM DATA *--------------------*/ @@ -13578,7 +13575,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -13600,4 +13596,3 @@ lv_font_t lv_font_simsun_16_cjk = { }; #endif /*#if LV_FONT_SIMSUN_16_CJK*/ - diff --git a/src/lv_font/lv_font_unscii_16.c b/src/lv_font/lv_font_unscii_16.c index 16bfc255d..1ce0bf719 100644 --- a/src/lv_font/lv_font_unscii_16.c +++ b/src/lv_font/lv_font_unscii_16.c @@ -471,7 +471,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0xc0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -580,8 +579,6 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { * CHARACTER MAPPING *--------------------*/ - - /*Collect the unicode lists and glyph_id offsets*/ static const lv_font_fmt_txt_cmap_t cmaps[] = { { @@ -590,8 +587,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { } }; - - /*-------------------- * ALL CUSTOM DATA *--------------------*/ @@ -609,7 +604,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -630,6 +624,4 @@ lv_font_t lv_font_unscii_16 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_UNSCII_16*/ diff --git a/src/lv_font/lv_font_unscii_8.c b/src/lv_font/lv_font_unscii_8.c index 4438d82e5..714f5486a 100644 --- a/src/lv_font/lv_font_unscii_8.c +++ b/src/lv_font/lv_font_unscii_8.c @@ -307,7 +307,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0xc1, 0x42, 0xbd, 0x2c, 0x40, 0x81, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -416,8 +415,6 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { * CHARACTER MAPPING *--------------------*/ - - /*Collect the unicode lists and glyph_id offsets*/ static const lv_font_fmt_txt_cmap_t cmaps[] = { { @@ -426,8 +423,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { } }; - - /*-------------------- * ALL CUSTOM DATA *--------------------*/ @@ -445,7 +440,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -466,6 +460,4 @@ lv_font_t lv_font_unscii_8 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_UNSCII_8*/ diff --git a/src/lv_font/lv_symbol_def.h b/src/lv_font/lv_symbol_def.h index 4ca5d54fa..bc32ec26f 100644 --- a/src/lv_font/lv_symbol_def.h +++ b/src/lv_font/lv_symbol_def.h @@ -156,10 +156,4 @@ enum { } /* extern "C" */ #endif - #endif /*LV_SYMBOL_DEF_H*/ - - - - - diff --git a/src/lv_gpu/lv_gpu_nxp_pxp.c b/src/lv_gpu/lv_gpu_nxp_pxp.c index ccb720297..c97b068d2 100644 --- a/src/lv_gpu/lv_gpu_nxp_pxp.c +++ b/src/lv_gpu/lv_gpu_nxp_pxp.c @@ -27,7 +27,6 @@ * */ - /********************* * INCLUDES *********************/ @@ -60,7 +59,6 @@ #error Only 16bit color depth is supported. Set LV_COLOR_DEPTH to 16. #endif - /********************** * TYPEDEFS **********************/ @@ -136,7 +134,6 @@ void lv_gpu_nxp_pxp_deinit(void) PXP_Deinit(LV_GPU_NXP_PXP_ID); } - /** * Fill area, with optional opacity. * @@ -283,7 +280,6 @@ void lv_gpu_nxp_pxp_blit(lv_color_t * dest, lv_coord_t dest_width, const lv_colo } PXP_EnableAlphaSurfaceOverlayColorKey(LV_GPU_NXP_PXP_ID, colorKeyEnabled); - /* Output buffer. */ outputBufferConfig.pixelFormat = (pxp_output_pixel_format_t)PXP_OUT_PIXEL_FORMAT; outputBufferConfig.interlacedMode = kPXP_OutputProgressive; diff --git a/src/lv_gpu/lv_gpu_nxp_pxp.h b/src/lv_gpu/lv_gpu_nxp_pxp.h index e3f10a445..e68d5a1b1 100644 --- a/src/lv_gpu/lv_gpu_nxp_pxp.h +++ b/src/lv_gpu/lv_gpu_nxp_pxp.h @@ -126,8 +126,6 @@ void lv_gpu_nxp_pxp_deinit(void); void lv_gpu_nxp_pxp_fill(lv_color_t * dest_buf, lv_coord_t dest_width, const lv_area_t * fill_area, lv_color_t color, lv_opa_t opa); - - /** * @brief BLock Image Transfer - copy rectangular image from src buffer to dst buffer with effects. * @@ -147,7 +145,6 @@ void lv_gpu_nxp_pxp_fill(lv_color_t * dest_buf, lv_coord_t dest_width, const lv_ void lv_gpu_nxp_pxp_blit(lv_color_t * dest, lv_coord_t dest_width, const lv_color_t * src, lv_coord_t src_width, lv_coord_t copy_width, lv_coord_t copy_height, lv_opa_t opa); - /** * @brief Enable color keying for subsequent calls to lv_gpu_nxp_pxp_blit() * @@ -161,7 +158,6 @@ void lv_gpu_nxp_pxp_enable_color_key(void); */ void lv_gpu_nxp_pxp_disable_color_key(void); - /** * @brief Enable recolor feature for subsequent calls to lv_gpu_nxp_pxp_blit() * diff --git a/src/lv_gpu/lv_gpu_nxp_pxp_osa.c b/src/lv_gpu/lv_gpu_nxp_pxp_osa.c index 19b4a12f1..81163c10a 100644 --- a/src/lv_gpu/lv_gpu_nxp_pxp_osa.c +++ b/src/lv_gpu/lv_gpu_nxp_pxp_osa.c @@ -43,7 +43,6 @@ #include "semphr.h" #endif - /********************* * DEFINES *********************/ diff --git a/src/lv_gpu/lv_gpu_nxp_vglite.c b/src/lv_gpu/lv_gpu_nxp_vglite.c index 8db4bce7a..3ac384c85 100644 --- a/src/lv_gpu/lv_gpu_nxp_vglite.c +++ b/src/lv_gpu/lv_gpu_nxp_vglite.c @@ -41,7 +41,6 @@ #include "fsl_cache.h" #include "vg_lite.h" - /********************* * DEFINES *********************/ @@ -117,7 +116,6 @@ lv_res_t lv_gpu_nxp_vglite_fill(lv_color_t * dest_buf, lv_coord_t dest_width, lv } else { /* fill with transparency */ - vg_lite_path_t path; lv_color32_t colMix; int16_t path_data[] = { /* VG rectangular path */ @@ -129,7 +127,6 @@ lv_res_t lv_gpu_nxp_vglite_fill(lv_color_t * dest_buf, lv_coord_t dest_width, lv VLC_OP_END }; - err |= vg_lite_init_path(&path, VG_LITE_S16, VG_LITE_LOW, sizeof(path_data), path_data, fill_area->x1, fill_area->y1, fill_area->x2 + 1, fill_area->y2 + 1); if(err != VG_LITE_SUCCESS) { @@ -176,7 +173,6 @@ lv_res_t lv_gpu_nxp_vglite_fill(lv_color_t * dest_buf, lv_coord_t dest_width, lv } } - /*** * BLock Image Transfer. * @param[in] blit Description of the transfer diff --git a/src/lv_gpu/lv_gpu_stm32_dma2d.h b/src/lv_gpu/lv_gpu_stm32_dma2d.h index f3d468049..59b14c00f 100644 --- a/src/lv_gpu/lv_gpu_stm32_dma2d.h +++ b/src/lv_gpu/lv_gpu_stm32_dma2d.h @@ -52,7 +52,6 @@ void lv_gpu_stm32_dma2d_init(void); void lv_gpu_stm32_dma2d_fill(lv_color_t * buf, lv_coord_t buf_w, lv_color_t color, lv_coord_t fill_w, lv_coord_t fill_h); - /** * Fill an area in the buffer with a color but take into account a mask which describes the opacity of each pixel * @param buf a buffer which should be filled using a mask @@ -93,7 +92,6 @@ void lv_gpu_stm32_dma2d_copy(lv_color_t * buf, lv_coord_t buf_w, const lv_color_ void lv_gpu_stm32_dma2d_blend(lv_color_t * buf, lv_coord_t buf_w, const lv_color_t * map, lv_opa_t opa, lv_coord_t map_w, lv_coord_t copy_w, lv_coord_t copy_h); - /** * Can be used as `gpu_wait_cb` in display driver to * let the MCU run while the GPU is working diff --git a/src/lv_hal/lv_hal_disp.c b/src/lv_hal/lv_hal_disp.c index d87afb55f..a79987cb6 100644 --- a/src/lv_hal/lv_hal_disp.c +++ b/src/lv_hal/lv_hal_disp.c @@ -333,7 +333,6 @@ LV_ATTRIBUTE_FLUSH_READY void lv_disp_flush_ready(lv_disp_drv_t * disp_drv) disp_drv->buffer->flushing_last = 0; } - /** * Tell if it's the last area of the refreshing process. * Can be called from `flush_cb` to execute some special display refreshing if needed when all areas area flushed. diff --git a/src/lv_hal/lv_hal_disp.h b/src/lv_hal/lv_hal_disp.h index 87b020843..cd77c3037 100644 --- a/src/lv_hal/lv_hal_disp.h +++ b/src/lv_hal/lv_hal_disp.h @@ -177,7 +177,6 @@ uint8_t del_prev : uint32_t last_activity_time; /**< Last time there was activity on this display */ } lv_disp_t; - typedef enum { LV_DISP_SIZE_SMALL, LV_DISP_SIZE_MEDIUM, diff --git a/src/lv_hal/lv_hal_indev.h b/src/lv_hal/lv_hal_indev.h index 1d4f77e7a..cb559f694 100644 --- a/src/lv_hal/lv_hal_indev.h +++ b/src/lv_hal/lv_hal_indev.h @@ -50,7 +50,6 @@ typedef uint8_t lv_indev_type_t; enum { LV_INDEV_STATE_REL = 0, LV_INDEV_STATE_PR }; typedef uint8_t lv_indev_state_t; - enum { LV_DRAG_DIR_HOR = 0x1, /**< Object can be dragged horizontally. */ LV_DRAG_DIR_VER = 0x2, /**< Object can be dragged vertically. */ @@ -78,7 +77,6 @@ typedef struct { lv_indev_state_t state; /**< LV_INDEV_STATE_REL or LV_INDEV_STATE_PR*/ } lv_indev_data_t; - /** Initialized by the user and registered by 'lv_indev_add()'*/ typedef struct _lv_indev_drv_t { diff --git a/src/lv_misc/lv_anim.c b/src/lv_misc/lv_anim.c index f813c9197..ed54cf635 100644 --- a/src/lv_misc/lv_anim.c +++ b/src/lv_misc/lv_anim.c @@ -351,7 +351,6 @@ lv_anim_value_t lv_anim_path_overshoot(const lv_anim_path_t * path, const lv_ani return (lv_anim_value_t)new_value; } - /** * Calculate the current value of an animation with 3 bounces * @param a pointer to an animation diff --git a/src/lv_misc/lv_anim.h b/src/lv_misc/lv_anim.h index e48dae50f..54baf5969 100644 --- a/src/lv_misc/lv_anim.h +++ b/src/lv_misc/lv_anim.h @@ -43,7 +43,6 @@ typedef lv_coord_t lv_anim_value_t; #define LV_ANIM_REPEAT_INFINITE 0xFFFF - struct _lv_anim_t; struct _lv_anim_path_t; /** Get the current value during an animation*/ @@ -54,8 +53,6 @@ typedef struct _lv_anim_path_t { void * user_data; } lv_anim_path_t; - - /** Generic prototype of "animator" functions. * First parameter is the variable to animate. * Second parameter is the value to set. @@ -101,7 +98,6 @@ typedef struct _lv_anim_t { uint32_t has_run : 1; /**< Indicates the animation has run in this round*/ } lv_anim_t; - /********************** * GLOBAL PROTOTYPES **********************/ @@ -202,7 +198,6 @@ static inline void lv_anim_set_path(lv_anim_t * a, const lv_anim_path_t * path) _lv_memcpy_small(&a->path, path, sizeof(lv_anim_path_t)); } - /** * Set a function call when the animation really starts (considering `delay`) * @param a pointer to an initialized `lv_anim_t` variable @@ -317,7 +312,6 @@ static inline int32_t lv_anim_get_delay(lv_anim_t * a) */ bool lv_anim_del(void * var, lv_anim_exec_xcb_t exec_cb); - /** * Get the animation of a variable and its `exec_cb`. * @param var pointer to variable diff --git a/src/lv_misc/lv_area.h b/src/lv_misc/lv_area.h index 879a9c03a..6394b73c9 100644 --- a/src/lv_misc/lv_area.h +++ b/src/lv_misc/lv_area.h @@ -49,8 +49,6 @@ typedef struct { lv_coord_t y2; } lv_area_t; - - /** Alignments */ enum { LV_ALIGN_CENTER = 0, @@ -77,7 +75,6 @@ enum { }; typedef uint8_t lv_align_t; - /********************** * GLOBAL PROTOTYPES **********************/ @@ -194,7 +191,6 @@ bool _lv_area_is_on(const lv_area_t * a1_p, const lv_area_t * a2_p); */ bool _lv_area_is_in(const lv_area_t * ain_p, const lv_area_t * aholder_p, lv_coord_t radius); - /** * Align an area to an other * @param base an are where the other will be aligned diff --git a/src/lv_misc/lv_bidi.c b/src/lv_misc/lv_bidi.c index e3cf51463..ea1ab3354 100644 --- a/src/lv_misc/lv_bidi.c +++ b/src/lv_misc/lv_bidi.c @@ -625,7 +625,6 @@ static lv_bidi_dir_t bracket_process(const char * txt, uint32_t next_pos, uint32 } } - /*There where a previous strong char which can be used*/ if(bracket_dir != LV_BIDI_DIR_NEUTRAL) break; @@ -636,7 +635,6 @@ static lv_bidi_dir_t bracket_process(const char * txt, uint32_t next_pos, uint32 } } - /*The letter was an opening bracket*/ if(bracket_left[i] != '\0') { @@ -660,5 +658,4 @@ static lv_bidi_dir_t bracket_process(const char * txt, uint32_t next_pos, uint32 return LV_BIDI_DIR_NEUTRAL; } - #endif /*LV_USE_BIDI*/ diff --git a/src/lv_misc/lv_color.c b/src/lv_misc/lv_color.c index c0f3c0d23..f48bff581 100644 --- a/src/lv_misc/lv_color.c +++ b/src/lv_misc/lv_color.c @@ -127,13 +127,11 @@ LV_ATTRIBUTE_FAST_MEM void lv_color_fill(lv_color_t * buf, lv_color_t color, uin #endif } - lv_color_t lv_color_lighten(lv_color_t c, lv_opa_t lvl) { return lv_color_mix(LV_COLOR_WHITE, c, lvl); } - lv_color_t lv_color_darken(lv_color_t c, lv_opa_t lvl) { return lv_color_mix(LV_COLOR_BLACK, c, lvl); diff --git a/src/lv_misc/lv_color.h b/src/lv_misc/lv_color.h index 42f2c413e..74bd5256c 100644 --- a/src/lv_misc/lv_color.h +++ b/src/lv_misc/lv_color.h @@ -87,7 +87,6 @@ enum { #error "Invalid LV_COLOR_DEPTH in lv_conf.h! Set it to 1, 8, 16 or 32!" #endif - /* Adjust color mix functions rounding. * GPUs might calculate color mix (blending) differently. * Should be in range of 0..254 @@ -150,7 +149,6 @@ enum { # define LV_COLOR_GET_B32(c) (c).ch.blue # define LV_COLOR_GET_A32(c) (c).ch.alpha - /*--------------------------------------- * Macros for the current color depth * to set/get values of the color channels @@ -280,7 +278,6 @@ typedef lv_color32_t lv_color_t; #error "Invalid LV_COLOR_DEPTH in lv_conf.h! Set it to 1, 8, 16 or 32!" #endif - typedef struct { uint16_t h; uint8_t s; @@ -449,7 +446,6 @@ static inline uint32_t lv_color_to32(lv_color_t color) #endif } - //! @cond Doxygen_Suppress /** @@ -495,7 +491,6 @@ LV_ATTRIBUTE_FAST_MEM static inline void lv_color_premult(lv_color_t c, uint8_t } - /** * Mix two colors with a given ratio. It runs faster then `lv_color_mix` but requires some pre computation. * @param c1 The first color. Should be preprocessed with `lv_color_premult(c1)` @@ -527,7 +522,6 @@ LV_ATTRIBUTE_FAST_MEM static inline lv_color_t lv_color_mix_premult(uint16_t * p return ret; } - /** * Mix two colors. Both color can have alpha value. It requires ARGB888 colors. * @param bg_color background color @@ -663,7 +657,6 @@ static inline lv_color_t lv_color_hex3(uint32_t c) (uint8_t)((c & 0xF) | ((c & 0xF) << 4))); } - //! @cond Doxygen_Suppress //! LV_ATTRIBUTE_FAST_MEM void lv_color_fill(lv_color_t * buf, lv_color_t color, uint32_t px_num); @@ -698,7 +691,6 @@ lv_color_hsv_t lv_color_rgb_to_hsv(uint8_t r8, uint8_t g8, uint8_t b8); */ lv_color_hsv_t lv_color_to_hsv(lv_color_t color); - /********************** * MACROS **********************/ diff --git a/src/lv_misc/lv_debug.c b/src/lv_misc/lv_debug.c index 80229bb94..fd5bd86b5 100644 --- a/src/lv_misc/lv_debug.c +++ b/src/lv_misc/lv_debug.c @@ -135,6 +135,4 @@ void lv_debug_log_error(const char * msg, uint64_t value) * STATIC FUNCTIONS **********************/ - #endif /*LV_USE_DEBUG*/ - diff --git a/src/lv_misc/lv_debug.h b/src/lv_misc/lv_debug.h index 9160ceee8..82c92fe09 100644 --- a/src/lv_misc/lv_debug.h +++ b/src/lv_misc/lv_debug.h @@ -60,7 +60,6 @@ void lv_debug_log_error(const char * msg, uint64_t value); #define LV_DEBUG_IS_NULL(p) (lv_debug_check_null(p)) #endif - #ifndef LV_DEBUG_CHECK_MEM_INTEGRITY #define LV_DEBUG_CHECK_MEM_INTEGRITY() (lv_debug_check_mem_integrity()) #endif @@ -112,7 +111,6 @@ void lv_debug_log_error(const char * msg, uint64_t value); # endif #endif - #else /* LV_USE_DEBUG == 0 */ #define LV_DEBUG_ASSERT(expr, msg, value) do{}while(0) diff --git a/src/lv_misc/lv_gc.h b/src/lv_misc/lv_gc.h index c59ca5704..e1d7f4526 100644 --- a/src/lv_misc/lv_gc.h +++ b/src/lv_misc/lv_gc.h @@ -45,7 +45,6 @@ extern "C" { f(void * , _lv_theme_empty_styles) \ f(uint8_t *, _lv_font_decompr_buf) \ - #define LV_DEFINE_ROOT(root_type, root_name) root_type root_name; #define LV_ROOTS LV_ITERATE_ROOTS(LV_DEFINE_ROOT) diff --git a/src/lv_misc/lv_log.c b/src/lv_misc/lv_log.c index d3cd8215d..42b3b0251 100644 --- a/src/lv_misc/lv_log.c +++ b/src/lv_misc/lv_log.c @@ -53,7 +53,6 @@ void lv_log_register_print_cb(lv_log_print_g_cb_t print_cb) custom_print_cb = print_cb; } - /** * Add a log * @param level the level of log. (From `lv_log_level_t` enum) diff --git a/src/lv_misc/lv_math.c b/src/lv_misc/lv_math.c index b0ecfaad7..b66f75002 100644 --- a/src/lv_misc/lv_math.c +++ b/src/lv_misc/lv_math.c @@ -35,8 +35,6 @@ static const int16_t sin0_90_table[] = { 32269, 32364, 32448, 32523, 32587, 32642, 32687, 32722, 32747, 32762, 32767 }; - - /********************** * MACROS **********************/ diff --git a/src/lv_misc/lv_math.h b/src/lv_misc/lv_math.h index 3c5600d2b..f734f7b44 100644 --- a/src/lv_misc/lv_math.h +++ b/src/lv_misc/lv_math.h @@ -51,7 +51,6 @@ typedef struct { uint16_t f; } lv_sqrt_res_t; - /********************** * GLOBAL PROTOTYPES **********************/ @@ -85,7 +84,6 @@ int32_t _lv_bezier3(uint32_t t, int32_t u0, int32_t u1, int32_t u2, int32_t u3); */ uint16_t _lv_atan2(int x, int y); - //! @cond Doxygen_Suppress /** diff --git a/src/lv_misc/lv_mem.c b/src/lv_misc/lv_mem.c index a2cfd3489..33539391b 100644 --- a/src/lv_misc/lv_mem.c +++ b/src/lv_misc/lv_mem.c @@ -265,7 +265,6 @@ void lv_mem_free(const void * data) } - #endif /*LV_MEM_AUTO_DEFRAG*/ #else /*Use custom, user defined free function*/ #if LV_ENABLE_GC == 0 @@ -332,7 +331,6 @@ void * lv_mem_realloc(void * data_p, size_t new_size) } } - return new_p; } @@ -521,7 +519,6 @@ void * _lv_mem_buf_get(uint32_t size) return LV_GC_ROOT(_lv_mem_buf[i_guess]).p; } - /*Reallocate a free buffer*/ for(i = 0; i < LV_MEM_BUF_MAX_NUM; i++) { if(LV_GC_ROOT(_lv_mem_buf[i]).used == 0) { @@ -617,7 +614,6 @@ LV_ATTRIBUTE_FAST_MEM void * _lv_memcpy(void * dst, const void * src, size_t len return dst; } - /*Make the memories aligned*/ if(d_align) { d_align = ALIGN_MASK + 1 - d_align; @@ -650,7 +646,6 @@ LV_ATTRIBUTE_FAST_MEM void * _lv_memcpy(void * dst, const void * src, size_t len return dst; } - /** * Same as `memset` but optimized for 4 byte operation. * @param dst pointer to the destination buffer @@ -696,7 +691,6 @@ LV_ATTRIBUTE_FAST_MEM void _lv_memset(void * dst, uint8_t v, size_t len) len -= 4; } - d8 = (uint8_t *)d32; while(len) { *d8 = v; @@ -715,7 +709,6 @@ LV_ATTRIBUTE_FAST_MEM void _lv_memset_00(void * dst, size_t len) uint8_t * d8 = (uint8_t *) dst; uintptr_t d_align = (lv_uintptr_t) d8 & ALIGN_MASK; - /*Make the address aligned*/ if(d_align) { d_align = ALIGN_MASK + 1 - d_align; @@ -745,7 +738,6 @@ LV_ATTRIBUTE_FAST_MEM void _lv_memset_00(void * dst, size_t len) len -= 4; } - d8 = (uint8_t *)d32; while(len) { *d8 = 0; @@ -764,7 +756,6 @@ LV_ATTRIBUTE_FAST_MEM void _lv_memset_ff(void * dst, size_t len) uint8_t * d8 = (uint8_t *) dst; uintptr_t d_align = (lv_uintptr_t) d8 & ALIGN_MASK; - /*Make the address aligned*/ if(d_align) { d_align = ALIGN_MASK + 1 - d_align; @@ -794,7 +785,6 @@ LV_ATTRIBUTE_FAST_MEM void _lv_memset_ff(void * dst, size_t len) len -= 4; } - d8 = (uint8_t *)d32; while(len) { *d8 = 0xFF; diff --git a/src/lv_misc/lv_mem.h b/src/lv_misc/lv_mem.h index f3ca9c6f2..9c20a23f4 100644 --- a/src/lv_misc/lv_mem.h +++ b/src/lv_misc/lv_mem.h @@ -138,7 +138,6 @@ void _lv_mem_buf_release(void * p); */ void _lv_mem_buf_free_all(void); - //! @cond Doxygen_Suppress #if LV_MEMCPY_MEMSET_STD @@ -252,7 +251,6 @@ LV_ATTRIBUTE_FAST_MEM void _lv_memset_ff(void * dst, size_t len); #endif - /********************** * MACROS **********************/ diff --git a/src/lv_misc/lv_printf.c b/src/lv_misc/lv_printf.c index c8281038c..525788f5b 100644 --- a/src/lv_misc/lv_printf.c +++ b/src/lv_misc/lv_printf.c @@ -37,7 +37,6 @@ #include #include - #define PRINTF_DISABLE_SUPPORT_FLOAT LV_SPRINTF_DISABLE_FLOAT // 'ntoa' conversion buffer size, this must be big enough to hold one converted @@ -107,24 +106,20 @@ #define FLAGS_PRECISION (1U << 10U) #define FLAGS_ADAPT_EXP (1U << 11U) - // import float.h for DBL_MAX #if defined(PRINTF_SUPPORT_FLOAT) #include #endif - // output function type typedef void (*out_fct_type)(char character, void * buffer, size_t idx, size_t maxlen); - // wrapper (used as buffer) for output function type typedef struct { void (*fct)(char character, void * arg); void * arg; } out_fct_wrap_type; - // internal buffer output static inline void _out_buffer(char character, void * buffer, size_t idx, size_t maxlen) { @@ -133,7 +128,6 @@ static inline void _out_buffer(char character, void * buffer, size_t idx, size_t } } - // internal null output static inline void _out_null(char character, void * buffer, size_t idx, size_t maxlen) { @@ -143,8 +137,6 @@ static inline void _out_null(char character, void * buffer, size_t idx, size_t m (void)maxlen; } - - // internal secure strlen // \return The length of the string (excluding the terminating 0) limited by 'maxsize' static inline unsigned int _strnlen_s(const char * str, size_t maxsize) @@ -154,7 +146,6 @@ static inline unsigned int _strnlen_s(const char * str, size_t maxsize) return (unsigned int)(s - str); } - // internal test if char is a digit (0-9) // \return true if char is a digit static inline bool _is_digit(char ch) @@ -162,7 +153,6 @@ static inline bool _is_digit(char ch) return (ch >= '0') && (ch <= '9'); } - // internal ASCII string to unsigned int conversion static unsigned int _atoi(const char ** str) { @@ -173,7 +163,6 @@ static unsigned int _atoi(const char ** str) return i; } - // output the specified string in reverse, taking care of any zero-padding static size_t _out_rev(out_fct_type out, char * buffer, size_t idx, size_t maxlen, const char * buf, size_t len, unsigned int width, unsigned int flags) @@ -203,7 +192,6 @@ static size_t _out_rev(out_fct_type out, char * buffer, size_t idx, size_t maxle return idx; } - // internal itoa format static size_t _ntoa_format(out_fct_type out, char * buffer, size_t idx, size_t maxlen, char * buf, size_t len, bool negative, unsigned int base, unsigned int prec, unsigned int width, unsigned int flags) @@ -258,7 +246,6 @@ static size_t _ntoa_format(out_fct_type out, char * buffer, size_t idx, size_t m return _out_rev(out, buffer, idx, maxlen, buf, len, width, flags); } - // internal itoa for 'long' type static size_t _ntoa_long(out_fct_type out, char * buffer, size_t idx, size_t maxlen, unsigned long value, bool negative, unsigned long base, unsigned int prec, unsigned int width, unsigned int flags) @@ -283,7 +270,6 @@ static size_t _ntoa_long(out_fct_type out, char * buffer, size_t idx, size_t max return _ntoa_format(out, buffer, idx, maxlen, buf, len, negative, (unsigned int)base, prec, width, flags); } - // internal itoa for 'long long' type #if defined(PRINTF_SUPPORT_LONG_LONG) static size_t _ntoa_long_long(out_fct_type out, char * buffer, size_t idx, size_t maxlen, unsigned long long value, @@ -310,7 +296,6 @@ static size_t _ntoa_long_long(out_fct_type out, char * buffer, size_t idx, size_ } #endif // PRINTF_SUPPORT_LONG_LONG - #if defined(PRINTF_SUPPORT_FLOAT) #if defined(PRINTF_SUPPORT_EXPONENTIAL) @@ -319,7 +304,6 @@ static size_t _etoa(out_fct_type out, char * buffer, size_t idx, size_t maxlen, unsigned int width, unsigned int flags); #endif - // internal ftoa for fixed decimal floating point static size_t _ftoa(out_fct_type out, char * buffer, size_t idx, size_t maxlen, double value, unsigned int prec, unsigned int width, unsigned int flags) @@ -448,7 +432,6 @@ static size_t _ftoa(out_fct_type out, char * buffer, size_t idx, size_t maxlen, return _out_rev(out, buffer, idx, maxlen, buf, len, width, flags); } - #if defined(PRINTF_SUPPORT_EXPONENTIAL) // internal ftoa variant for exponential floating-point type, contributed by Martijn Jasperse static size_t _etoa(out_fct_type out, char * buffer, size_t idx, size_t maxlen, double value, unsigned int prec, @@ -562,7 +545,6 @@ static size_t _etoa(out_fct_type out, char * buffer, size_t idx, size_t maxlen, #endif // PRINTF_SUPPORT_EXPONENTIAL #endif // PRINTF_SUPPORT_FLOAT - // internal vsnprintf static int _vsnprintf(out_fct_type out, char * buffer, const size_t maxlen, const char * format, va_list va) { @@ -873,7 +855,6 @@ static int _vsnprintf(out_fct_type out, char * buffer, const size_t maxlen, cons return (int)idx; } - /////////////////////////////////////////////////////////////////////////////// int lv_snprintf(char * buffer, size_t count, const char * format, ...) @@ -891,4 +872,3 @@ int lv_vsnprintf(char * buffer, size_t count, const char * format, va_list va) } #endif /*LV_SPRINTF_CUSTOM*/ - diff --git a/src/lv_misc/lv_printf.h b/src/lv_misc/lv_printf.h index 9aa7073b3..1f9879f5c 100644 --- a/src/lv_misc/lv_printf.h +++ b/src/lv_misc/lv_printf.h @@ -32,7 +32,6 @@ #ifndef _LV_PRINTF_H_ #define _LV_PRINTF_H_ - #ifdef __cplusplus extern "C" { #endif @@ -61,10 +60,8 @@ int lv_vsnprintf(char * buffer, size_t count, const char * format, va_list va); #include LV_SPRINTF_INCLUDE #endif - #ifdef __cplusplus } #endif - #endif // _PRINTF_H_ diff --git a/src/lv_misc/lv_task.c b/src/lv_misc/lv_task.c index c051d9faa..04a240b88 100644 --- a/src/lv_misc/lv_task.c +++ b/src/lv_misc/lv_task.c @@ -70,7 +70,6 @@ void _lv_task_core_init(void) LV_ATTRIBUTE_TASK_HANDLER uint32_t lv_task_handler(void) { - LV_LOG_TRACE("lv_task_handler started"); /*Avoid concurrent running of the task handler*/ diff --git a/src/lv_misc/lv_txt.c b/src/lv_misc/lv_txt.c index 619545367..0521aab3a 100644 --- a/src/lv_misc/lv_txt.c +++ b/src/lv_misc/lv_txt.c @@ -234,7 +234,6 @@ static uint32_t lv_txt_get_next_word(const char * txt, const lv_font_t * font, /* Update the output width */ if(word_w_ptr != NULL && break_index == NO_BREAK_FOUND) *word_w_ptr = cur_w; - i = i_next; i_next = i_next_next; letter = letter_next; diff --git a/src/lv_misc/lv_txt_ap.c b/src/lv_misc/lv_txt_ap.c index 1bf68207d..673babeee 100644 --- a/src/lv_misc/lv_txt_ap.c +++ b/src/lv_misc/lv_txt_ap.c @@ -12,7 +12,6 @@ #include "lv_txt_ap.h" #include "../lv_draw/lv_draw.h" - /********************* * DEFINES *********************/ @@ -126,7 +125,6 @@ uint32_t _lv_txt_ap_calc_bytes_cnt(const char * txt) return chars_cnt + 1; } - void _lv_txt_ap_proc(const char * txt, char * txt_out) { uint32_t txt_length = 0; diff --git a/src/lv_misc/lv_types.h b/src/lv_misc/lv_types.h index 92c75ee39..5f49a0e6c 100644 --- a/src/lv_misc/lv_types.h +++ b/src/lv_misc/lv_types.h @@ -22,7 +22,6 @@ extern "C" { #include #endif - // If __UINTPTR_MAX__ or UINTPTR_MAX are available, use them to determine arch size #if defined(__UINTPTR_MAX__) && __UINTPTR_MAX__ > 0xFFFFFFFF #define LV_ARCH_64 @@ -36,7 +35,6 @@ extern "C" { #endif - /********************** * TYPEDEFS **********************/ @@ -51,8 +49,6 @@ enum { }; typedef uint8_t lv_res_t; - - #if defined(__cplusplus) || __STDC_VERSION__ >= 199901L // If c99 or newer, use the definition of uintptr_t directly from typedef uintptr_t lv_uintptr_t; @@ -68,7 +64,6 @@ typedef uint32_t lv_uintptr_t; #endif - /********************** * GLOBAL PROTOTYPES **********************/ @@ -84,4 +79,3 @@ typedef uint32_t lv_uintptr_t; #endif #endif /*LV_TYPES_H*/ - diff --git a/src/lv_themes/lv_theme.c b/src/lv_themes/lv_theme.c index 2c36b4f08..faed5e4f3 100644 --- a/src/lv_themes/lv_theme.c +++ b/src/lv_themes/lv_theme.c @@ -357,7 +357,6 @@ static void clear_styles(lv_obj_t * obj, lv_theme_style_t name) break; #endif - #if LV_USE_ROLLER case LV_THEME_ROLLER: lv_obj_clean_style_list(obj, LV_ROLLER_PART_BG); @@ -365,7 +364,6 @@ static void clear_styles(lv_obj_t * obj, lv_theme_style_t name) break; #endif - #if LV_USE_OBJMASK case LV_THEME_OBJMASK: lv_obj_clean_style_list(obj, LV_OBJMASK_PART_MAIN); @@ -432,7 +430,6 @@ static void clear_styles(lv_obj_t * obj, lv_theme_style_t name) break; #endif - #if LV_USE_SPINBOX case LV_THEME_SPINBOX: lv_obj_clean_style_list(obj, LV_SPINBOX_PART_BG); diff --git a/src/lv_themes/lv_theme_empty.c b/src/lv_themes/lv_theme_empty.c index 6900ef23c..7d565e475 100644 --- a/src/lv_themes/lv_theme_empty.c +++ b/src/lv_themes/lv_theme_empty.c @@ -77,7 +77,6 @@ lv_theme_t * lv_theme_empty_init(lv_color_t color_primary, lv_color_t color_seco styles = (theme_styles_t *)LV_GC_ROOT(_lv_theme_empty_styles); } - theme.color_primary = color_primary; theme.color_secondary = color_secondary; theme.font_small = font_small; @@ -94,7 +93,6 @@ lv_theme_t * lv_theme_empty_init(lv_color_t color_primary, lv_color_t color_seco return &theme; } - static void theme_apply(lv_theme_t * th, lv_obj_t * obj, lv_theme_style_t name) { LV_UNUSED(th); diff --git a/src/lv_themes/lv_theme_empty.h b/src/lv_themes/lv_theme_empty.h index c12fdf12c..6611fad33 100644 --- a/src/lv_themes/lv_theme_empty.h +++ b/src/lv_themes/lv_theme_empty.h @@ -29,7 +29,6 @@ extern "C" { * GLOBAL PROTOTYPES **********************/ - /** * Initialize the default * @param color_primary the primary color of the theme diff --git a/src/lv_themes/lv_theme_material.c b/src/lv_themes/lv_theme_material.c index 43c3d4927..73d2e618d 100644 --- a/src/lv_themes/lv_theme_material.c +++ b/src/lv_themes/lv_theme_material.c @@ -875,7 +875,6 @@ static void tabview_win_shared_init(void) #endif } - /********************** * GLOBAL FUNCTIONS **********************/ @@ -955,7 +954,6 @@ lv_theme_t * lv_theme_material_init(lv_color_t color_primary, lv_color_t color_s return &theme; } - static void theme_apply(lv_theme_t * th, lv_obj_t * obj, lv_theme_style_t name) { LV_UNUSED(th); @@ -1187,7 +1185,6 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj, lv_theme_style_t name) break; #endif - #if LV_USE_ROLLER case LV_THEME_ROLLER: list = lv_obj_get_style_list(obj, LV_ROLLER_PART_BG); @@ -1211,7 +1208,6 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj, lv_theme_style_t name) _lv_style_list_add_style(list, &styles->bg); _lv_style_list_add_style(list, &styles->list_bg); - list = lv_obj_get_style_list(obj, LV_LIST_PART_SCROLLBAR); _lv_style_list_add_style(list, &styles->sb); break; @@ -1315,7 +1311,6 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj, lv_theme_style_t name) #endif - #if LV_USE_SPINBOX case LV_THEME_SPINBOX: list = lv_obj_get_style_list(obj, LV_SPINBOX_PART_BG); diff --git a/src/lv_themes/lv_theme_mono.c b/src/lv_themes/lv_theme_mono.c index bfd12652b..0f2b1d233 100644 --- a/src/lv_themes/lv_theme_mono.c +++ b/src/lv_themes/lv_theme_mono.c @@ -173,11 +173,9 @@ static void basic_init(void) style_init_reset(&styles->no_radius); lv_style_set_radius(&styles->no_radius, LV_STATE_DEFAULT, 0); - style_init_reset(&styles->border_none); lv_style_set_border_width(&styles->border_none, LV_STATE_DEFAULT, 0); - style_init_reset(&styles->fg_color); lv_style_set_bg_color(&styles->fg_color, LV_STATE_DEFAULT, FG_COLOR); lv_style_set_text_color(&styles->fg_color, LV_STATE_DEFAULT, BG_COLOR); @@ -242,7 +240,6 @@ static void btn_init(void) #endif } - static void btnmatrix_init(void) { #if LV_USE_BTNMATRIX @@ -250,7 +247,6 @@ static void btnmatrix_init(void) #endif } - static void calendar_init(void) { #if LV_USE_CALENDAR @@ -283,7 +279,6 @@ static void chart_init(void) #endif } - static void cpicker_init(void) { #if LV_USE_CPICKER @@ -298,7 +293,6 @@ static void checkbox_init(void) #endif } - static void cont_init(void) { #if LV_USE_CONT != 0 @@ -306,7 +300,6 @@ static void cont_init(void) #endif } - static void gauge_init(void) { #if LV_USE_GAUGE != 0 @@ -342,7 +335,6 @@ static void label_init(void) #endif } - static void linemeter_init(void) { #if LV_USE_LINEMETER != 0 @@ -393,7 +385,6 @@ static void switch_init(void) #endif } - static void spinbox_init(void) { #if LV_USE_SPINBOX @@ -401,7 +392,6 @@ static void spinbox_init(void) #endif } - static void spinner_init(void) { #if LV_USE_SPINNER != 0 @@ -492,7 +482,6 @@ static void win_init(void) #endif } - /********************** * GLOBAL FUNCTIONS **********************/ @@ -567,7 +556,6 @@ lv_theme_t * lv_theme_mono_init(lv_color_t color_primary, lv_color_t color_secon return &theme; } - static void theme_apply(lv_theme_t * th, lv_obj_t * obj, lv_theme_style_t name) { LV_UNUSED(th); @@ -812,7 +800,6 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj, lv_theme_style_t name) break; #endif - #if LV_USE_ROLLER case LV_THEME_ROLLER: list = lv_obj_get_style_list(obj, LV_ROLLER_PART_BG); @@ -826,7 +813,6 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj, lv_theme_style_t name) break; #endif - #if LV_USE_OBJMASK case LV_THEME_OBJMASK: list = lv_obj_get_style_list(obj, LV_OBJMASK_PART_MAIN); @@ -940,7 +926,6 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj, lv_theme_style_t name) break; #endif - #if LV_USE_SPINBOX case LV_THEME_SPINBOX: list = lv_obj_get_style_list(obj, LV_SPINBOX_PART_BG); @@ -1019,10 +1004,8 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj, lv_theme_style_t name) break; } - lv_obj_refresh_style(obj, LV_OBJ_PART_ALL, LV_STYLE_PROP_ALL); - } /********************** diff --git a/src/lv_themes/lv_theme_mono.h b/src/lv_themes/lv_theme_mono.h index 7d252e3b0..3a9044d64 100644 --- a/src/lv_themes/lv_theme_mono.h +++ b/src/lv_themes/lv_theme_mono.h @@ -29,7 +29,6 @@ extern "C" { * GLOBAL PROTOTYPES **********************/ - /** * Initialize the mono theme. * @param color_primary the primary color of the theme diff --git a/src/lv_themes/lv_theme_template.c b/src/lv_themes/lv_theme_template.c index 18a47a1ca..5efa05018 100644 --- a/src/lv_themes/lv_theme_template.c +++ b/src/lv_themes/lv_theme_template.c @@ -57,7 +57,6 @@ static bool inited; **********************/ static void style_init_reset(lv_style_t * style); - static void basic_init(void) { style_init_reset(&styles->bg); @@ -131,7 +130,6 @@ static void btn_init(void) #endif } - static void btnmatrix_init(void) { #if LV_USE_BTNMATRIX @@ -139,7 +137,6 @@ static void btnmatrix_init(void) #endif } - static void calendar_init(void) { #if LV_USE_CALENDAR @@ -154,7 +151,6 @@ static void chart_init(void) #endif } - static void cpicker_init(void) { #if LV_USE_CPICKER @@ -169,7 +165,6 @@ static void checkbox_init(void) #endif } - static void cont_init(void) { #if LV_USE_CONT != 0 @@ -177,7 +172,6 @@ static void cont_init(void) #endif } - static void gauge_init(void) { #if LV_USE_GAUGE != 0 @@ -199,7 +193,6 @@ static void label_init(void) #endif } - static void linemeter_init(void) { #if LV_USE_LINEMETER != 0 @@ -242,7 +235,6 @@ static void switch_init(void) #endif } - static void spinbox_init(void) { #if LV_USE_SPINBOX @@ -250,7 +242,6 @@ static void spinbox_init(void) #endif } - static void spinner_init(void) { #if LV_USE_SPINNER != 0 @@ -327,7 +318,6 @@ static void win_init(void) #endif } - /********************** * GLOBAL FUNCTIONS **********************/ @@ -407,7 +397,6 @@ lv_theme_t * lv_theme_template_init(lv_color_t color_primary, lv_color_t color_s return &theme; } - void theme_apply(lv_theme_t * th, lv_obj_t * obj, lv_theme_style_t name) { LV_UNUSED(th); @@ -658,7 +647,6 @@ void theme_apply(lv_theme_t * th, lv_obj_t * obj, lv_theme_style_t name) break; #endif - #if LV_USE_ROLLER case LV_THEME_ROLLER: list = lv_obj_get_style_list(obj, LV_ROLLER_PART_BG); @@ -670,7 +658,6 @@ void theme_apply(lv_theme_t * th, lv_obj_t * obj, lv_theme_style_t name) break; #endif - #if LV_USE_OBJMASK case LV_THEME_OBJMASK: list = lv_obj_get_style_list(obj, LV_OBJMASK_PART_MAIN); @@ -782,7 +769,6 @@ void theme_apply(lv_theme_t * th, lv_obj_t * obj, lv_theme_style_t name) break; #endif - #if LV_USE_SPINBOX case LV_THEME_SPINBOX: list = lv_obj_get_style_list(obj, LV_SPINBOX_PART_BG); diff --git a/src/lv_themes/lv_theme_template.h b/src/lv_themes/lv_theme_template.h index afefc958e..c71a265c8 100644 --- a/src/lv_themes/lv_theme_template.h +++ b/src/lv_themes/lv_theme_template.h @@ -29,7 +29,6 @@ extern "C" { * GLOBAL PROTOTYPES **********************/ - /** * Initialize the default * @param color_primary the primary color of the theme diff --git a/src/lv_widgets/lv_arc.c b/src/lv_widgets/lv_arc.c index 95e7557b8..50b5ba248 100644 --- a/src/lv_widgets/lv_arc.c +++ b/src/lv_widgets/lv_arc.c @@ -218,7 +218,6 @@ void lv_arc_set_end_angle(lv_obj_t * arc, uint16_t end) ext->arc_angle_end = end; } - /** * Set the start and end angles * @param arc pointer to an arc object @@ -353,7 +352,6 @@ void lv_arc_set_rotation(lv_obj_t * arc, uint16_t rotation_angle) lv_obj_invalidate(arc); } - /** * Set the type of arc. * @param arc pointer to arc object @@ -529,7 +527,6 @@ uint16_t lv_arc_get_bg_angle_end(lv_obj_t * arc) return ext->bg_angle_end; } - /** * Get the value of a arc * @param arc pointer to a arc object @@ -661,7 +658,6 @@ static lv_design_res_t lv_arc_design(lv_obj_t * arc, const lv_area_t * clip_area &arc_dsc); } - /*make the indicator arc smaller or larger according to its greatest padding value*/ lv_coord_t left_indic = lv_obj_get_style_pad_left(arc, LV_ARC_PART_INDIC); lv_coord_t right_indic = lv_obj_get_style_pad_right(arc, LV_ARC_PART_INDIC); @@ -768,7 +764,6 @@ static lv_res_t lv_arc_signal(lv_obj_t * arc, lv_signal_t sign, void * param) bg_end = ext->bg_angle_end + 360; } - angle = _lv_atan2(p.y, p.x); angle -= ext->rotation_angle; angle -= ext->bg_angle_start; /*Make the angle relative to the start angle*/ @@ -1044,7 +1039,6 @@ static void get_center(lv_obj_t * arc, lv_point_t * center, lv_coord_t * arc_r) center->x = arc->coords.x1 + r + left_bg; center->y = arc->coords.y1 + r + top_bg; - lv_coord_t indic_width = lv_obj_get_style_line_width(arc, LV_ARC_PART_INDIC); r -= indic_width; } diff --git a/src/lv_widgets/lv_arc.h b/src/lv_widgets/lv_arc.h index 55494a8d7..5f379219a 100644 --- a/src/lv_widgets/lv_arc.h +++ b/src/lv_widgets/lv_arc.h @@ -138,7 +138,6 @@ void lv_arc_set_bg_angles(lv_obj_t * arc, uint16_t start, uint16_t end); */ void lv_arc_set_rotation(lv_obj_t * arc, uint16_t rotation_angle); - /** * Set the type of arc. * @param arc pointer to arc object diff --git a/src/lv_widgets/lv_bar.c b/src/lv_widgets/lv_bar.c index 37112fdce..5545f1019 100644 --- a/src/lv_widgets/lv_bar.c +++ b/src/lv_widgets/lv_bar.c @@ -109,7 +109,6 @@ 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*/ if(copy == NULL) { @@ -162,7 +161,6 @@ void lv_bar_set_value(lv_obj_t * bar, int16_t value, lv_anim_enable_t anim) new_value = new_value < ext->min_value ? ext->min_value : new_value; new_value = new_value < ext->start_value ? ext->start_value : new_value; - if(ext->cur_value == new_value) return; #if LV_USE_ANIMATION == 0 LV_UNUSED(anim); @@ -355,7 +353,6 @@ uint16_t lv_bar_get_anim_time(const lv_obj_t * bar) #endif } - /********************** * STATIC FUNCTIONS **********************/ diff --git a/src/lv_widgets/lv_btnmatrix.c b/src/lv_widgets/lv_btnmatrix.c index 8829b7107..783fc96ed 100644 --- a/src/lv_widgets/lv_btnmatrix.c +++ b/src/lv_widgets/lv_btnmatrix.c @@ -299,7 +299,6 @@ void lv_btnmatrix_set_focused_btn(lv_obj_t * btnm, uint16_t id) lv_obj_invalidate(btnm); } - /** * Enable recoloring of button's texts * @param btnm pointer to button matrix object @@ -401,7 +400,6 @@ void lv_btnmatrix_set_btn_width(lv_obj_t * btnm, uint16_t btn_id, uint8_t width) { LV_ASSERT_OBJ(btnm, LV_OBJX_NAME); - lv_btnmatrix_ext_t * ext = lv_obj_get_ext_attr(btnm); if(btn_id >= ext->btn_cnt) return; ext->ctrl_bits[btn_id] &= (~LV_BTNMATRIX_WIDTH_MASK); @@ -571,7 +569,6 @@ bool lv_btnmatrix_get_btn_ctrl(lv_obj_t * btnm, uint16_t btn_id, lv_btnmatrix_ct return (ext->ctrl_bits[btn_id] & ctrl) ? true : false; } - /** * Find whether "one check" mode is enabled. * @param btnm Button matrix object @@ -955,7 +952,6 @@ static lv_res_t lv_btnmatrix_signal(lv_obj_t * btnm, lv_signal_t sign, void * pa invalidate_button_area(btnm, ext->btn_id_pr); invalidate_button_area(btnm, ext->btn_id_focused); - lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_get_act()); if(indev_type == LV_INDEV_TYPE_KEYPAD || indev_type == LV_INDEV_TYPE_ENCODER) { ext->btn_id_focused = ext->btn_id_pr; @@ -1151,7 +1147,6 @@ static void allocate_btn_areas_and_controls(const lv_obj_t * btnm, const char ** /*Do not allocate memory for the same amount of buttons*/ if(btn_cnt == ext->btn_cnt) return; - if(ext->button_areas != NULL) { lv_mem_free(ext->button_areas); ext->button_areas = NULL; diff --git a/src/lv_widgets/lv_calendar.c b/src/lv_widgets/lv_calendar.c index 0ec2e8811..9346ca653 100644 --- a/src/lv_widgets/lv_calendar.c +++ b/src/lv_widgets/lv_calendar.c @@ -119,7 +119,6 @@ lv_obj_t * lv_calendar_create(lv_obj_t * par, const lv_obj_t * copy) ext->btn_pressing = 0; - lv_style_list_init(&ext->style_date_nums); lv_style_list_init(&ext->style_day_names); lv_style_list_init(&ext->style_header); @@ -581,7 +580,6 @@ static lv_style_list_t * lv_calendar_get_style(lv_obj_t * calendar, uint8_t part lv_calendar_ext_t * ext = lv_obj_get_ext_attr(calendar); lv_style_list_t * style_dsc_p; - switch(part) { case LV_CALENDAR_PART_BG: style_dsc_p = &calendar->style_list; @@ -942,7 +940,6 @@ static void draw_dates(lv_obj_t * calendar, const lv_area_t * clip_area) box_area.x1 = label_area.x1; box_area.x2 = label_area.x2; - lv_draw_rect(&box_area, clip_area, &rect_dsc); /*Write the day's number*/ @@ -956,7 +953,6 @@ static void draw_dates(lv_obj_t * calendar, const lv_area_t * clip_area) calendar->state = state_ori; _lv_obj_disable_style_caching(calendar, false); - } /** @@ -972,7 +968,6 @@ static bool is_highlighted(lv_obj_t * calendar, day_draw_state_t draw_state, int { lv_calendar_ext_t * ext = lv_obj_get_ext_attr(calendar); - if(draw_state == DAY_DRAW_PREV_MONTH) { year -= month == 1 ? 1 : 0; month = month == 1 ? 12 : month - 1; @@ -1006,7 +1001,6 @@ static bool is_pressed(lv_obj_t * calendar, day_draw_state_t draw_state, int32_t { lv_calendar_ext_t * ext = lv_obj_get_ext_attr(calendar); - if(draw_state == DAY_DRAW_PREV_MONTH) { year -= month == 1 ? 1 : 0; month = month == 1 ? 12 : month - 1; diff --git a/src/lv_widgets/lv_canvas.c b/src/lv_widgets/lv_canvas.c index a098e1bac..4203779c6 100644 --- a/src/lv_widgets/lv_canvas.c +++ b/src/lv_widgets/lv_canvas.c @@ -44,7 +44,6 @@ static void set_px_cb_alpha2(lv_disp_drv_t * disp_drv, uint8_t * buf, lv_coord_t static void set_px_cb_alpha4(lv_disp_drv_t * disp_drv, uint8_t * buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y, lv_color_t color, lv_opa_t opa); - static void set_px_cb_alpha8(lv_disp_drv_t * disp_drv, uint8_t * buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y, lv_color_t color, lv_opa_t opa); @@ -377,7 +376,6 @@ void lv_canvas_transform(lv_obj_t * canvas, lv_img_dsc_t * img, int16_t angle, u #endif } - /** * Apply horizontal blur on the canvas * @param canvas pointer to a canvas object @@ -440,7 +438,6 @@ void lv_canvas_blur_hor(lv_obj_t * canvas, const lv_area_t * area, uint16_t r) lv_opa_t opa = LV_OPA_TRANSP; _lv_memcpy(line_buf, &ext->dsc.data[y * line_w], line_w); - for(x = a.x1 - r_back; x <= a.x1 + r_front; x++) { x_safe = x < 0 ? 0 : x; x_safe = x_safe > ext->dsc.header.w - 1 ? ext->dsc.header.w - 1 : x_safe; @@ -513,7 +510,6 @@ void lv_canvas_blur_hor(lv_obj_t * canvas, const lv_area_t * area, uint16_t r) _lv_mem_buf_release(line_buf); } - /** * Apply vertical blur on the canvas * @param canvas pointer to a canvas object @@ -1210,7 +1206,6 @@ static void set_px_alpha_generic(lv_img_dsc_t * d, lv_coord_t x, lv_coord_t y, l lv_img_buf_set_px_alpha(d, x, y, br); } - static void set_px_true_color_alpha(lv_disp_drv_t * disp_drv, uint8_t * buf, lv_coord_t buf_w, lv_coord_t x, lv_coord_t y, lv_color_t color, lv_opa_t opa) @@ -1233,7 +1228,6 @@ static void set_px_true_color_alpha(lv_disp_drv_t * disp_drv, uint8_t * buf, lv_ lv_color_mix_with_alpha(bg_color, bg_opa, color, opa, &res_color, &res_opa); - lv_img_buf_set_px_alpha(&d, x, y, res_opa); lv_img_buf_set_px_color(&d, x, y, res_color); } diff --git a/src/lv_widgets/lv_canvas.h b/src/lv_widgets/lv_canvas.h index de1a26bf4..0c9ca80da 100644 --- a/src/lv_widgets/lv_canvas.h +++ b/src/lv_widgets/lv_canvas.h @@ -148,8 +148,6 @@ void lv_canvas_transform(lv_obj_t * canvas, lv_img_dsc_t * img, int16_t angle, u lv_coord_t offset_y, int32_t pivot_x, int32_t pivot_y, bool antialias); - - /** * Apply horizontal blur on the canvas * @param canvas pointer to a canvas object diff --git a/src/lv_widgets/lv_chart.c b/src/lv_widgets/lv_chart.c index 47609d3e3..b6ed55ce7 100644 --- a/src/lv_widgets/lv_chart.c +++ b/src/lv_widgets/lv_chart.c @@ -289,7 +289,6 @@ void lv_chart_hide_series(lv_obj_t * chart, lv_chart_series_t * series, bool hid lv_chart_refresh(chart); } - /*===================== * Setter functions *====================*/ @@ -710,7 +709,6 @@ void lv_chart_set_cursor_point(lv_obj_t * chart, lv_chart_cursor_t * cursor, lv_ lv_chart_refresh(chart); } - /*===================== * Getter functions *====================*/ @@ -848,7 +846,6 @@ lv_coord_t lv_chart_get_x_from_index(lv_obj_t * chart, lv_chart_series_t * ser, lv_coord_t x = 0; - if(ext->type & LV_CHART_TYPE_LINE) { x = (w * id) / (ext->point_cnt - 1); } @@ -963,7 +960,6 @@ static lv_design_res_t lv_chart_design(lv_obj_t * chart, const lv_area_t * clip_ draw_series_bg(chart, &series_area, clip_area); draw_axes(chart, &series_area, clip_area); - lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart); if(ext->type & LV_CHART_TYPE_LINE) draw_series_line(chart, &series_area, clip_area); if(ext->type & LV_CHART_TYPE_COLUMN) draw_series_column(chart, &series_area, clip_area); @@ -1016,7 +1012,6 @@ static lv_res_t lv_chart_signal(lv_obj_t * chart, lv_signal_t sign, void * param return res; } - /** * Get the style descriptor of a part of the object * @param chart pointer the object @@ -1172,7 +1167,6 @@ static void draw_series_line(lv_obj_t * chart, const lv_area_t * series_area, co point_dsc.bg_opa = line_dsc.opa; point_dsc.radius = LV_RADIUS_CIRCLE; - lv_coord_t point_radius = lv_obj_get_style_size(chart, LV_CHART_PART_SERIES); /*Do not bother with line ending is the point will over it*/ @@ -1710,7 +1704,6 @@ static void draw_x_ticks(lv_obj_t * chart, const lv_area_t * series_area, const lv_draw_label_dsc_init(&label_dsc); lv_obj_init_draw_label_dsc(chart, LV_CHART_PART_BG, &label_dsc); - /* calculate the size of tick marks */ if(ext->x_axis.major_tick_len == LV_CHART_TICK_LENGTH_AUTO) major_tick_len = (int32_t)w * LV_CHART_AXIS_MAJOR_TICK_LEN_COE; @@ -1835,7 +1828,6 @@ static void invalidate_lines(lv_obj_t * chart, uint16_t i) } } - /** * invalid area of the new column data lines on a chart * @param chart pointer to chart object diff --git a/src/lv_widgets/lv_chart.h b/src/lv_widgets/lv_chart.h index 0234b411d..df75a6d36 100644 --- a/src/lv_widgets/lv_chart.h +++ b/src/lv_widgets/lv_chart.h @@ -52,7 +52,6 @@ enum { }; typedef uint8_t lv_chart_update_mode_t; - enum { LV_CHART_AXIS_PRIMARY_Y, LV_CHART_AXIS_SECONDARY_Y, @@ -185,12 +184,10 @@ void lv_chart_clear_series(lv_obj_t * chart, lv_chart_series_t * series); */ void lv_chart_hide_series(lv_obj_t * chart, lv_chart_series_t * series, bool hide); - /*===================== * Setter functions *====================*/ - /** * Set the number of horizontal and vertical division lines * @param chart pointer to a graph background object @@ -359,7 +356,6 @@ void lv_chart_set_series_axis(lv_obj_t * chart, lv_chart_series_t * ser, lv_char */ void lv_chart_set_cursor_point(lv_obj_t * chart, lv_chart_cursor_t * cursor, lv_point_t * point); - /*===================== * Getter functions *====================*/ diff --git a/src/lv_widgets/lv_checkbox.c b/src/lv_widgets/lv_checkbox.c index 93f2b4b21..a9a7a386f 100644 --- a/src/lv_widgets/lv_checkbox.c +++ b/src/lv_widgets/lv_checkbox.c @@ -160,7 +160,6 @@ void lv_checkbox_set_checked(lv_obj_t * cb, bool checked) #endif } - /** * Make the check box inactive (disabled) * @param cb pointer to a check box object @@ -270,7 +269,6 @@ static lv_res_t lv_checkbox_signal(lv_obj_t * cb, lv_signal_t sign, void * param return res; } - static lv_style_list_t * lv_checkbox_get_style(lv_obj_t * cb, uint8_t type) { lv_style_list_t * style_dsc_p; diff --git a/src/lv_widgets/lv_cont.c b/src/lv_widgets/lv_cont.c index 94ab41894..7a21bc2b3 100644 --- a/src/lv_widgets/lv_cont.c +++ b/src/lv_widgets/lv_cont.c @@ -104,7 +104,6 @@ lv_obj_t * lv_cont_create(lv_obj_t * par, const lv_obj_t * copy) lv_theme_apply(cont, LV_THEME_CONT); } - } /*Copy an existing object*/ else { @@ -292,7 +291,6 @@ static lv_res_t lv_cont_signal(lv_obj_t * cont, lv_signal_t sign, void * param) return res; } - static lv_style_list_t * lv_cont_get_style(lv_obj_t * cont, uint8_t type) { lv_style_list_t * style_dsc_p; diff --git a/src/lv_widgets/lv_cont.h b/src/lv_widgets/lv_cont.h index 6fc6a2a52..a65d040d2 100644 --- a/src/lv_widgets/lv_cont.h +++ b/src/lv_widgets/lv_cont.h @@ -54,7 +54,6 @@ enum { LV_LAYOUT_ROW_MID, /**< Row middle align*/ LV_LAYOUT_ROW_BOTTOM, /**< Row bottom align*/ - /** * PRETTY: * - Place the object next to each other diff --git a/src/lv_widgets/lv_cpicker.c b/src/lv_widgets/lv_cpicker.c index 70cd3aeff..3d54303c0 100644 --- a/src/lv_widgets/lv_cpicker.c +++ b/src/lv_widgets/lv_cpicker.c @@ -434,7 +434,6 @@ bool lv_cpicker_get_knob_colored(lv_obj_t * cpicker) * STATIC FUNCTIONS **********************/ - /** * Handle the drawing related tasks of the color_picker * @param cpicker pointer to an object @@ -876,7 +875,6 @@ static lv_res_t lv_cpicker_signal(lv_obj_t * cpicker, lv_signal_t sign, void * p return res; } - /** * Get the style_list descriptor of a part of the object * @param cpicker pointer the object @@ -914,7 +912,6 @@ static bool lv_cpicker_hit(lv_obj_t * cpicker, const lv_point_t * p) if(ext->type == LV_CPICKER_TYPE_RECT) return true; - /*Valid clicks can be only in the circle*/ if(_lv_area_is_point_on(&cpicker->coords, p, LV_RADIUS_CIRCLE)) return true; else return false; diff --git a/src/lv_widgets/lv_cpicker.h b/src/lv_widgets/lv_cpicker.h index 2aef0d732..66da3a8ba 100644 --- a/src/lv_widgets/lv_cpicker.h +++ b/src/lv_widgets/lv_cpicker.h @@ -40,8 +40,6 @@ enum { }; typedef uint8_t lv_cpicker_color_mode_t; - - /*Data of colorpicker*/ typedef struct { lv_color_hsv_t hsv; @@ -67,7 +65,6 @@ enum { _LV_CPICKER_PART_REAL_LAST = _LV_OBJ_PART_REAL_LAST, }; - /********************** * GLOBAL PROTOTYPES **********************/ diff --git a/src/lv_widgets/lv_dropdown.c b/src/lv_widgets/lv_dropdown.c index 31eae4589..f33cd3d73 100644 --- a/src/lv_widgets/lv_dropdown.c +++ b/src/lv_widgets/lv_dropdown.c @@ -1117,7 +1117,6 @@ static lv_res_t lv_dropdown_page_scrl_signal(lv_obj_t * scrl, lv_signal_t sign, return res; } - /** * Get the style descriptor of a part of the object * @param page pointer the object @@ -1187,8 +1186,6 @@ static void draw_box(lv_obj_t * ddlist, const lv_area_t * clip_area, uint16_t id _lv_obj_disable_style_caching(ddlist, false); } - - static void draw_box_label(lv_obj_t * ddlist, const lv_area_t * clip_area, uint16_t id, lv_state_t state) { lv_dropdown_ext_t * ext = lv_obj_get_ext_attr(ddlist); @@ -1339,8 +1336,6 @@ static void position_to_selected(lv_obj_t * ddlist) lv_obj_invalidate(ext->page); } - - static lv_obj_t * get_label(const lv_obj_t * ddlist) { lv_dropdown_ext_t * ext = lv_obj_get_ext_attr(ddlist); diff --git a/src/lv_widgets/lv_dropdown.h b/src/lv_widgets/lv_dropdown.h index 87cae4387..05c6bb553 100644 --- a/src/lv_widgets/lv_dropdown.h +++ b/src/lv_widgets/lv_dropdown.h @@ -134,7 +134,6 @@ void lv_dropdown_add_option(lv_obj_t * ddlist, const char * option, uint32_t pos */ void lv_dropdown_set_selected(lv_obj_t * ddlist, uint16_t sel_opt); - /** * Set the direction of the a drop down list * @param ddlist pointer to a drop down list object diff --git a/src/lv_widgets/lv_gauge.c b/src/lv_widgets/lv_gauge.c index ad3bcb066..0aafc5fcd 100644 --- a/src/lv_widgets/lv_gauge.c +++ b/src/lv_widgets/lv_gauge.c @@ -240,7 +240,6 @@ void lv_gauge_set_value(lv_obj_t * gauge, uint8_t needle_id, int32_t value) a.y2 = LV_MATH_MAX(p_mid.y, p_end.y) + needle_w; lv_obj_invalidate_area(gauge, &a); - } /** @@ -390,7 +389,6 @@ lv_coord_t lv_gauge_get_needle_img_pivot_y(lv_obj_t * gauge) return ext->needle_img_pivot.y; } - /********************** * STATIC FUNCTIONS **********************/ diff --git a/src/lv_widgets/lv_img.c b/src/lv_widgets/lv_img.c index bb5850848..ab77125aa 100644 --- a/src/lv_widgets/lv_img.c +++ b/src/lv_widgets/lv_img.c @@ -624,7 +624,6 @@ static lv_design_res_t lv_img_design(lv_obj_t * img, const lv_area_t * clip_area bg_dsc.border_opa = LV_OPA_TRANSP; } - int32_t zoom_final = lv_obj_get_style_transform_zoom(img, LV_IMG_PART_MAIN); zoom_final = (zoom_final * ext->zoom) >> 8; @@ -839,7 +838,6 @@ static lv_res_t lv_img_signal(lv_obj_t * img, lv_signal_t sign, void * param) img->ext_draw_pad = LV_MATH_MAX(img->ext_draw_pad, top); img->ext_draw_pad = LV_MATH_MAX(img->ext_draw_pad, bottom); - } else if(sign == LV_SIGNAL_HIT_TEST) { lv_hit_test_info_t * info = param; @@ -872,7 +870,6 @@ static lv_res_t lv_img_signal(lv_obj_t * img, lv_signal_t sign, void * param) return res; } - static lv_style_list_t * lv_img_get_style(lv_obj_t * img, uint8_t type) { lv_style_list_t * style_dsc_p; diff --git a/src/lv_widgets/lv_imgbtn.c b/src/lv_widgets/lv_imgbtn.c index f987b3de8..76b9be881 100644 --- a/src/lv_widgets/lv_imgbtn.c +++ b/src/lv_widgets/lv_imgbtn.c @@ -12,7 +12,6 @@ #include "lv_imgbtn.h" #include "lv_label.h" - #if LV_USE_IMGBTN != 0 /********************* diff --git a/src/lv_widgets/lv_imgbtn.h b/src/lv_widgets/lv_imgbtn.h index d205800e2..1f939f934 100644 --- a/src/lv_widgets/lv_imgbtn.h +++ b/src/lv_widgets/lv_imgbtn.h @@ -121,7 +121,6 @@ static inline void lv_imgbtn_set_checkable(lv_obj_t * imgbtn, bool tgl) lv_btn_set_checkable(imgbtn, tgl); } - /*===================== * Getter functions *====================*/ diff --git a/src/lv_widgets/lv_label.c b/src/lv_widgets/lv_label.c index 6c0429a1d..4f43782dd 100644 --- a/src/lv_widgets/lv_label.c +++ b/src/lv_widgets/lv_label.c @@ -119,7 +119,6 @@ lv_obj_t * lv_label_create(lv_obj_t * par, const lv_obj_t * copy) ext->dot.tmp_ptr = NULL; ext->dot_tmp_alloc = 0; - lv_obj_set_design_cb(new_label, lv_label_design); lv_obj_set_signal_cb(new_label, lv_label_signal); @@ -612,7 +611,6 @@ void lv_label_get_letter_pos(const lv_obj_t * label, uint32_t char_id, lv_point_ visual_byte_pos = byte_id - line_start; #endif - /*Calculate the x coordinate*/ lv_coord_t x = _lv_txt_get_width(bidi_txt, visual_byte_pos, font, letter_space, flag); if(char_id != line_start) x += letter_space; @@ -1183,7 +1181,6 @@ void lv_label_refr_text(lv_obj_t * label) uint32_t letter_id = lv_label_get_letter_on(label, &p); - /*Be sure there is space for the dots*/ size_t txt_len = strlen(ext->text); uint32_t byte_id = _lv_txt_encoded_get_byte_id(ext->text, letter_id); diff --git a/src/lv_widgets/lv_label.h b/src/lv_widgets/lv_label.h index 2226326af..c4e4a0236 100644 --- a/src/lv_widgets/lv_label.h +++ b/src/lv_widgets/lv_label.h @@ -265,7 +265,6 @@ uint32_t lv_label_get_text_sel_start(const lv_obj_t * label); */ uint32_t lv_label_get_text_sel_end(const lv_obj_t * label); - lv_style_list_t * lv_label_get_style(lv_obj_t * label, uint8_t type); /*===================== diff --git a/src/lv_widgets/lv_line.h b/src/lv_widgets/lv_line.h index 430a9da01..1f04aebf2 100644 --- a/src/lv_widgets/lv_line.h +++ b/src/lv_widgets/lv_line.h @@ -87,7 +87,6 @@ void lv_line_set_y_invert(lv_obj_t * line, bool en); lv_line_set_y_invert /*The name was inconsistent. In v.6.0 only `lv_line_set_y_invert`will \ work */ - /*===================== * Getter functions *====================*/ diff --git a/src/lv_widgets/lv_linemeter.c b/src/lv_widgets/lv_linemeter.c index 0648b0f86..253137309 100644 --- a/src/lv_widgets/lv_linemeter.c +++ b/src/lv_widgets/lv_linemeter.c @@ -349,7 +349,6 @@ void lv_linemeter_draw_scale(lv_obj_t * lmeter, const lv_area_t * clip_area, uin int16_t mask_in_id = lv_draw_mask_add(&mask_in_param, 0); #endif - #if LV_LINEMETER_PRECISE > 1 mask_area.x1 = x_ofs - r_out; mask_area.x2 = x_ofs + r_out - 1; @@ -490,7 +489,6 @@ void lv_linemeter_draw_scale(lv_obj_t * lmeter, const lv_area_t * clip_area, uin } } - } /********************** diff --git a/src/lv_widgets/lv_linemeter.h b/src/lv_widgets/lv_linemeter.h index c33bffb27..9ced938a0 100644 --- a/src/lv_widgets/lv_linemeter.h +++ b/src/lv_widgets/lv_linemeter.h @@ -147,7 +147,6 @@ uint16_t lv_linemeter_get_scale_angle(const lv_obj_t * lmeter); */ uint16_t lv_linemeter_get_angle_offset(lv_obj_t * lmeter); - void lv_linemeter_draw_scale(lv_obj_t * lmeter, const lv_area_t * clip_area, uint8_t part); /** diff --git a/src/lv_widgets/lv_list.c b/src/lv_widgets/lv_list.c index 8294968a1..a80c454ab 100644 --- a/src/lv_widgets/lv_list.c +++ b/src/lv_widgets/lv_list.c @@ -51,7 +51,6 @@ static lv_signal_cb_t label_signal; static lv_signal_cb_t ancestor_page_signal; static lv_signal_cb_t ancestor_btn_signal; - /********************** * MACROS **********************/ @@ -189,11 +188,9 @@ lv_obj_t * lv_list_add_btn(lv_obj_t * list, const void * img_src, const char * t lv_obj_set_width(btn, w); } - lv_obj_add_protect(btn, LV_PROTECT_PRESS_LOST); lv_obj_set_signal_cb(btn, lv_list_btn_signal); - #if LV_USE_IMG != 0 lv_obj_t * img = NULL; if(img_src) { diff --git a/src/lv_widgets/lv_objmask.c b/src/lv_widgets/lv_objmask.c index ed22bb30b..76e7cd405 100644 --- a/src/lv_widgets/lv_objmask.c +++ b/src/lv_widgets/lv_objmask.c @@ -177,18 +177,14 @@ void lv_objmask_remove_mask(lv_obj_t * objmask, lv_objmask_mask_t * mask) lv_obj_invalidate(objmask); } - - /*===================== * Setter functions *====================*/ - /*===================== * Getter functions *====================*/ - /*===================== * Other functions *====================*/ @@ -287,14 +283,12 @@ static lv_design_res_t lv_objmask_design(lv_obj_t * objmask, const lv_area_t * c lv_draw_mask_add(p_new, m->param); } - } } /*Post draw when the children are drawn*/ else if(mode == LV_DESIGN_DRAW_POST) { lv_objmask_ext_t * ext = lv_obj_get_ext_attr(objmask); - lv_objmask_mask_t * m; _LV_LL_READ(ext->mask_ll, m) { diff --git a/src/lv_widgets/lv_page.c b/src/lv_widgets/lv_page.c index 936537c0a..85cf21253 100644 --- a/src/lv_widgets/lv_page.c +++ b/src/lv_widgets/lv_page.c @@ -155,7 +155,6 @@ lv_obj_t * lv_page_create(lv_obj_t * par, const lv_obj_t * copy) lv_page_set_scrollbar_mode(page, copy_ext->scrlbar.mode); } - scrlbar_refresh(page); LV_LOG_INFO("page created"); @@ -489,7 +488,6 @@ void lv_page_focus(lv_obj_t * page, const lv_obj_t * obj, lv_anim_enable_t anim_ /*if using focus mode, change target to parent*/ obj = lv_obj_get_focused_obj(obj); - /*If obj is higher then the page focus where the "error" is smaller*/ lv_coord_t obj_y = obj->coords.y1 - ext->scrl->coords.y1; lv_coord_t obj_h = lv_obj_get_height(obj); @@ -518,7 +516,6 @@ void lv_page_focus(lv_obj_t * page, const lv_obj_t * obj, lv_anim_enable_t anim_ scrlable_y += page_h - obj_h; } - /*If obj is wider then the page focus where the "error" is smaller*/ lv_coord_t obj_x = obj->coords.x1 - ext->scrl->coords.x1; lv_coord_t obj_w = lv_obj_get_width(obj); @@ -724,7 +721,6 @@ static lv_design_res_t lv_page_design(lv_obj_t * page, const lv_area_t * clip_ar #if LV_USE_ANIMATION { - if(ext->edge_flash.left_ip || ext->edge_flash.right_ip || ext->edge_flash.top_ip || ext->edge_flash.bottom_ip) { lv_area_t flash_area; diff --git a/src/lv_widgets/lv_roller.c b/src/lv_widgets/lv_roller.c index 08477ab11..ba8440762 100644 --- a/src/lv_widgets/lv_roller.c +++ b/src/lv_widgets/lv_roller.c @@ -157,7 +157,6 @@ void lv_roller_set_options(lv_obj_t * roller, const char * options, lv_roller_mo LV_ASSERT_OBJ(roller, LV_OBJX_NAME); LV_ASSERT_STR(options); - lv_roller_ext_t * ext = lv_obj_get_ext_attr(roller); lv_obj_t * label = get_label(roller); @@ -311,7 +310,6 @@ uint16_t lv_roller_get_selected(const lv_obj_t * roller) } } - /** * Get the current selected option as a string * @param ddlist pointer to ddlist object @@ -399,7 +397,6 @@ const char * lv_roller_get_options(const lv_obj_t * roller) return lv_label_get_text(get_label(roller)); } - /********************** * STATIC FUNCTIONS **********************/ @@ -508,7 +505,6 @@ static lv_design_res_t lv_roller_design(lv_obj_t * roller, const lv_area_t * cli return LV_DESIGN_RES_OK; } - /** * Handle the drawing related tasks of the roller's label * @param roller pointer to an object @@ -828,7 +824,6 @@ static void draw_bg(lv_obj_t * roller, const lv_area_t * clip_area) } } - /** * Refresh the position of the roller. It uses the id stored in: ext->ddlist.selected_option_id * @param roller pointer to a roller object @@ -880,7 +875,6 @@ static void refr_position(lv_obj_t * roller, lv_anim_enable_t anim_en) } } - static lv_res_t release_handler(lv_obj_t * roller) { @@ -955,7 +949,6 @@ static void refr_width(lv_obj_t * roller) break; } - if(lv_roller_get_auto_fit(roller) == false) return; lv_coord_t label_w = lv_obj_get_width(label); diff --git a/src/lv_widgets/lv_roller.h b/src/lv_widgets/lv_roller.h index 55dd1fb63..06e9e7383 100644 --- a/src/lv_widgets/lv_roller.h +++ b/src/lv_widgets/lv_roller.h @@ -42,8 +42,6 @@ enum { typedef uint8_t lv_roller_mode_t; - - /*Data of roller*/ typedef struct { lv_page_ext_t page; /*Ext. of ancestor*/ @@ -183,7 +181,6 @@ static inline uint16_t lv_roller_get_anim_time(const lv_obj_t * roller) return lv_page_get_anim_time(roller); } - /********************** * MACROS **********************/ diff --git a/src/lv_widgets/lv_slider.c b/src/lv_widgets/lv_slider.c index 5c77f1ef1..77840e35e 100644 --- a/src/lv_widgets/lv_slider.c +++ b/src/lv_widgets/lv_slider.c @@ -470,7 +470,6 @@ static lv_res_t lv_slider_signal(lv_obj_t * slider, lv_signal_t sign, void * par return res; } - static lv_style_list_t * lv_slider_get_style(lv_obj_t * slider, uint8_t part) { LV_ASSERT_OBJ(slider, LV_OBJX_NAME); diff --git a/src/lv_widgets/lv_spinbox.c b/src/lv_widgets/lv_spinbox.c index dcd847af9..ebeddcc35 100644 --- a/src/lv_widgets/lv_spinbox.c +++ b/src/lv_widgets/lv_spinbox.c @@ -80,7 +80,6 @@ lv_obj_t * lv_spinbox_create(lv_obj_t * par, const lv_obj_t * copy) ext->range_min = -99999; ext->rollover = false; - /*The signal and design functions are not copied so set them here*/ lv_obj_set_signal_cb(spinbox, lv_spinbox_signal); lv_obj_set_design_cb(spinbox, ancestor_design); /*Leave the Text area's design function*/ @@ -397,7 +396,6 @@ static lv_res_t lv_spinbox_signal(lv_obj_t * spinbox, lv_signal_t sign, void * p } if(sign == LV_SIGNAL_GET_TYPE) return lv_obj_handle_get_type_signal(param, LV_OBJX_NAME); - if(sign == LV_SIGNAL_CLEANUP) { /*Nothing to cleanup. (No dynamically allocated memory in 'ext')*/ } @@ -461,8 +459,6 @@ static lv_res_t lv_spinbox_signal(lv_obj_t * spinbox, lv_signal_t sign, void * p uint16_t i; for(i = 0; i < pos; i++) ext->step *= 10; - - } } else if(sign == LV_SIGNAL_CONTROL) { diff --git a/src/lv_widgets/lv_switch.c b/src/lv_widgets/lv_switch.c index 58e9f0cbf..0a43def6f 100644 --- a/src/lv_widgets/lv_switch.c +++ b/src/lv_widgets/lv_switch.c @@ -254,7 +254,6 @@ static lv_design_res_t lv_switch_design(lv_obj_t * sw, const lv_area_t * clip_ar return LV_DESIGN_RES_OK; } - /** * Signal function of the switch * @param sw pointer to a switch object diff --git a/src/lv_widgets/lv_table.c b/src/lv_widgets/lv_table.c index fb20980eb..fec47276a 100644 --- a/src/lv_widgets/lv_table.c +++ b/src/lv_widgets/lv_table.c @@ -191,7 +191,6 @@ void lv_table_set_cell_value(lv_obj_t * table, uint16_t row, uint16_t col, const refr_size(table); } - /** * Set the value of a cell. Memory will be allocated to store the text by the table. * @param table pointer to a Table object @@ -1055,7 +1054,6 @@ static lv_res_t lv_table_signal(lv_obj_t * table, lv_signal_t sign, void * param return res; } - /** * Get the style descriptor of a part of the object * @param table pointer the object @@ -1115,7 +1113,6 @@ static void refr_size(lv_obj_t * table) font[i] = lv_obj_get_style_text_font(table, LV_TABLE_PART_CELL1 + i); } - for(i = 0; i < ext->row_cnt; i++) { ext->row_h[i] = get_row_height(table, i, font, letter_space, line_space, cell_left, cell_right, cell_top, cell_bottom); diff --git a/src/lv_widgets/lv_tabview.c b/src/lv_widgets/lv_tabview.c index 96200ec0a..b7345c1f1 100644 --- a/src/lv_widgets/lv_tabview.c +++ b/src/lv_widgets/lv_tabview.c @@ -810,7 +810,6 @@ static lv_style_list_t * lv_tabview_get_style(lv_obj_t * tabview, uint8_t part) return style_dsc_p; } - /** * Called when a tab button is clicked * @param tab_btnm pointer to the tab's button matrix object @@ -911,7 +910,6 @@ static void refr_indic_size(lv_obj_t * tabview) lv_obj_set_height(ext->indic, indic_h); } - static void refr_btns_size(lv_obj_t * tabview) { lv_tabview_ext_t * ext = lv_obj_get_ext_attr(tabview); diff --git a/src/lv_widgets/lv_textarea.c b/src/lv_widgets/lv_textarea.c index a207050ba..4b231f07a 100644 --- a/src/lv_widgets/lv_textarea.c +++ b/src/lv_widgets/lv_textarea.c @@ -425,7 +425,6 @@ void lv_textarea_del_char(lv_obj_t * ta) lv_label_set_text(ext->label, label_txt); lv_textarea_clear_selection(ta); - /*If the textarea became empty, invalidate it to hide the placeholder*/ if(ext->placeholder_txt) { const char * txt = lv_label_get_text(ext->label); @@ -504,7 +503,6 @@ void lv_textarea_set_text(lv_obj_t * ta, const char * txt) lv_textarea_set_cursor_pos(ta, LV_TEXTAREA_CURSOR_LAST); } - /*If the textarea is empty, invalidate it to hide the placeholder*/ if(ext->placeholder_txt) { const char * txt_act = lv_label_get_text(ext->label); @@ -1708,7 +1706,6 @@ static bool char_is_accepted(lv_obj_t * ta, uint32_t c) } } - static void refr_cursor_area(lv_obj_t * ta) { lv_textarea_ext_t * ext = lv_obj_get_ext_attr(ta); diff --git a/src/lv_widgets/lv_tileview.c b/src/lv_widgets/lv_tileview.c index 3fa01503c..5265442d4 100644 --- a/src/lv_widgets/lv_tileview.c +++ b/src/lv_widgets/lv_tileview.c @@ -240,7 +240,6 @@ void lv_tileview_set_tile_act(lv_obj_t * tileview, lv_coord_t x, lv_coord_t y, l lv_anim_set_exec_cb(&a, (lv_anim_exec_xcb_t)lv_obj_set_x); lv_anim_set_time(&a, ext->anim_time); - if(x_coord != x_act) { lv_anim_set_values(&a, x_act, x_coord); lv_anim_start(&a); diff --git a/src/lv_widgets/lv_win.c b/src/lv_widgets/lv_win.c index 332bbc5e1..e744a915e 100644 --- a/src/lv_widgets/lv_win.c +++ b/src/lv_widgets/lv_win.c @@ -516,7 +516,6 @@ uint8_t lv_win_title_get_alignment(lv_obj_t * win) return ext->title_txt_align; } - /*===================== * Other functions *====================*/ @@ -532,7 +531,6 @@ void lv_win_focus(lv_obj_t * win, lv_obj_t * obj, lv_anim_enable_t anim_en) LV_ASSERT_OBJ(win, LV_OBJX_NAME); LV_ASSERT_OBJ(obj, ""); - lv_win_ext_t * ext = lv_obj_get_ext_attr(win); lv_page_focus(ext->page, obj, anim_en); } diff --git a/src/lv_widgets/lv_win.h b/src/lv_widgets/lv_win.h index a0e599f49..ac1f7b1cb 100644 --- a/src/lv_widgets/lv_win.h +++ b/src/lv_widgets/lv_win.h @@ -208,7 +208,6 @@ lv_obj_t * lv_win_get_content(const lv_obj_t * win); */ lv_coord_t lv_win_get_header_height(const lv_obj_t * win); - /** * Get the width of the control buttons on the header * @param win pointer to a window object diff --git a/tests/Makefile b/tests/Makefile index 70a44c1a6..bd7fe3738 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -11,16 +11,14 @@ WARNINGS = -Werror -Wall -Wextra \ -Wempty-body -Wshift-negative-value -Wstack-usage=2048 \ -Wtype-limits -Wsizeof-pointer-memaccess -#-Wno-unused-value -Wno-unused-parameter +#-Wno-unused-value -Wno-unused-parameter OPTIMIZATION ?= -O3 -g0 - CFLAGS ?= -I$(LVGL_DIR)/ $(DEFINES) $(WARNINGS) $(OPTIMIZATION) -I$(LVGL_DIR) -I. LDFLAGS ?= -lpng BIN ?= demo - #Collect the files to compile MAINSRC = ./lv_test_main.c @@ -53,10 +51,9 @@ all: default %.o: %.c @$(CC) $(CFLAGS) -c $< -o $@ @echo "CC $<" - + default: $(AOBJS) $(COBJS) $(MAINOBJ) $(CC) -o $(BIN) $(MAINOBJ) $(AOBJS) $(COBJS) $(LDFLAGS) -clean: +clean: rm -f $(BIN) $(AOBJS) $(COBJS) $(MAINOBJ) - diff --git a/tests/build.py b/tests/build.py index 96e5bb2b8..2f54b2932 100755 --- a/tests/build.py +++ b/tests/build.py @@ -9,22 +9,21 @@ lvgldirname = '"' + lvgldirname + '"' base_defines = '"-DLV_CONF_PATH=' + lvgldirname +'/tests/lv_test_conf.h -DLV_BUILD_TEST"' optimization = '"-O3 -g0"' - def build(name, defines): global base_defines, optimization print("=============================") print(name) print("=============================") - + d_all = base_defines[:-1] + " "; - + for d in defines: d_all += " -D" + d + "=" + str(defines[d]) - + d_all += '"' cmd = "make -j8 BIN=test.bin LVGL_DIR_NAME=" + lvgldirname + " DEFINES=" + d_all + " OPTIMIZATION=" + optimization - + print("---------------------------") print("Clean") print("---------------------------") @@ -34,23 +33,22 @@ def build(name, defines): print("Build") print("---------------------------") ret = os.system(cmd) - if(ret != 0): + if(ret != 0): print("BUILD ERROR! (error code " + str(ret) + ")") exit(1) - + print("---------------------------") print("Run") print("---------------------------") ret = os.system("./test.bin") - if(ret != 0): + if(ret != 0): print("RUN ERROR! (error code " + str(ret) + ")") exit(1) - + print("---------------------------") print("Finished") print("---------------------------") - minimal_monochrome = { "LV_DPI":40, "LV_MEM_SIZE":4*1024, @@ -67,10 +65,10 @@ minimal_monochrome = { "LV_USE_USER_DATA":0, "LV_USE_USER_DATA_FREE":0, "LV_USE_LOG":0, - "LV_USE_THEME_EMPTY":0, - "LV_USE_THEME_MATERIAL":0, - "LV_USE_THEME_MONO":1, - "LV_USE_THEME_TEMPLATE":0, + "LV_USE_THEME_EMPTY":0, + "LV_USE_THEME_MATERIAL":0, + "LV_USE_THEME_MONO":1, + "LV_USE_THEME_TEMPLATE":0, "LV_THEME_DEFAULT_INIT": "\\\"lv_theme_mono_init\\\"", "LV_THEME_DEFAULT_COLOR_PRIMARY": "\\\"LV_COLOR_RED\\\"", "LV_THEME_DEFAULT_COLOR_SECONDARY": "\\\"LV_COLOR_BLUE\\\"", @@ -127,7 +125,7 @@ minimal_monochrome = { "LV_USE_TABLE":0, "LV_USE_TABVIEW":0, "LV_USE_TILEVIEW":0, - "LV_USE_WIN":0 + "LV_USE_WIN":0 } all_obj_minimal_features = { @@ -146,7 +144,7 @@ all_obj_minimal_features = { "LV_USE_USER_DATA":0, "LV_USE_USER_DATA_FREE":0, "LV_USE_LOG":0, - "LV_USE_THEME_MATERIAL":1, + "LV_USE_THEME_MATERIAL":1, "LV_THEME_DEFAULT_INIT": "\\\"lv_theme_material_init\\\"", "LV_THEME_DEFAULT_COLOR_PRIMARY": "\\\"LV_COLOR_RED\\\"", "LV_THEME_DEFAULT_COLOR_SECONDARY": "\\\"LV_COLOR_BLUE\\\"", @@ -203,7 +201,7 @@ all_obj_minimal_features = { "LV_USE_TABLE":1, "LV_USE_TABVIEW":1, "LV_USE_TILEVIEW":1, - "LV_USE_WIN":1 + "LV_USE_WIN":1 } all_obj_all_features = { @@ -223,10 +221,10 @@ all_obj_all_features = { "LV_USE_USER_DATA":1, "LV_USE_USER_DATA_FREE":0, "LV_USE_LOG":1, - "LV_USE_THEME_MATERIAL":1, - "LV_USE_THEME_EMPTY":1, - "LV_USE_THEME_MONO":1, - "LV_USE_THEME_TEMPLATE":1, + "LV_USE_THEME_MATERIAL":1, + "LV_USE_THEME_EMPTY":1, + "LV_USE_THEME_MONO":1, + "LV_USE_THEME_TEMPLATE":1, "LV_THEME_DEFAULT_INIT": "\\\"lv_theme_material_init\\\"", "LV_THEME_DEFAULT_COLOR_PRIMARY": "\\\"LV_COLOR_RED\\\"", "LV_THEME_DEFAULT_COLOR_SECONDARY": "\\\"LV_COLOR_BLUE\\\"", @@ -234,7 +232,7 @@ all_obj_all_features = { "LV_THEME_DEFAULT_FONT_SMALL" : "\\\"&lv_font_montserrat_12\\\"", "LV_THEME_DEFAULT_FONT_NORMAL" : "\\\"&lv_font_montserrat_16\\\"", "LV_THEME_DEFAULT_FONT_SUBTITLE" : "\\\"&lv_font_montserrat_22\\\"", - "LV_THEME_DEFAULT_FONT_TITLE" : "\\\"&lv_font_montserrat_28\\\"", + "LV_THEME_DEFAULT_FONT_TITLE" : "\\\"&lv_font_montserrat_28\\\"", "LV_LOG_PRINTF":0, "LV_USE_DEBUG":0, "LV_USE_ASSERT_NULL":0, @@ -281,10 +279,9 @@ all_obj_all_features = { "LV_USE_TABLE":1, "LV_USE_TABVIEW":1, "LV_USE_TILEVIEW":1, - "LV_USE_WIN":1 + "LV_USE_WIN":1 } - advanced_features = { "LV_DPI":100, "LV_MEM_SIZE":4*1024*1024, @@ -304,9 +301,9 @@ advanced_features = { "LV_USE_USER_DATA":1, "LV_IMG_CACHE_DEF_SIZE":32, "LV_USE_LOG":1, - "LV_USE_THEME_MATERIAL":1, - "LV_USE_THEME_EMPTY":1, - "LV_USE_THEME_TEMPLATE":1, + "LV_USE_THEME_MATERIAL":1, + "LV_USE_THEME_EMPTY":1, + "LV_USE_THEME_TEMPLATE":1, "LV_THEME_DEFAULT_INIT": "\\\"lv_theme_material_init\\\"", "LV_THEME_DEFAULT_COLOR_PRIMARY": "\\\"LV_COLOR_RED\\\"", "LV_THEME_DEFAULT_COLOR_SECONDARY": "\\\"LV_COLOR_BLUE\\\"", @@ -314,7 +311,7 @@ advanced_features = { "LV_THEME_DEFAULT_FONT_SMALL" : "\\\"&lv_font_montserrat_12\\\"", "LV_THEME_DEFAULT_FONT_NORMAL" : "\\\"&lv_font_montserrat_16\\\"", "LV_THEME_DEFAULT_FONT_SUBTITLE" : "\\\"&lv_font_montserrat_22\\\"", - "LV_THEME_DEFAULT_FONT_TITLE" : "\\\"&lv_font_montserrat_28\\\"", + "LV_THEME_DEFAULT_FONT_TITLE" : "\\\"&lv_font_montserrat_28\\\"", "LV_LOG_PRINTF":1, "LV_USE_DEBUG":1, "LV_USE_ASSERT_NULL":1, @@ -369,15 +366,10 @@ advanced_features = { "LV_USE_TABLE":1, "LV_USE_TABVIEW":1, "LV_USE_TILEVIEW":1, - "LV_USE_WIN":1 + "LV_USE_WIN":1 } - build("Minimal monochrome", minimal_monochrome) build("All objects, minimal features", all_obj_minimal_features) build("All objects, all common features", all_obj_all_features) build("All objects, with advanced features", advanced_features) - - - - diff --git a/tests/lv_test_assert.c b/tests/lv_test_assert.c index ce0d7a5ff..3b8dfefb6 100644 --- a/tests/lv_test_assert.c +++ b/tests/lv_test_assert.c @@ -24,7 +24,6 @@ #define PNG_DEBUG 3 #include - /********************* * DEFINES *********************/ @@ -65,7 +64,6 @@ static void png_release(png_img_t * p); * GLOBAL FUNCTIONS **********************/ - void lv_test_print(const char * s, ...) { va_list args; @@ -75,7 +73,6 @@ void lv_test_print(const char * s, ...) va_end(args); } - void lv_test_exit(const char * s, ...) { va_list args; @@ -87,7 +84,6 @@ void lv_test_exit(const char * s, ...) exit(1); } - void lv_test_error(const char * s, ...) { va_list args; @@ -134,7 +130,6 @@ void lv_test_assert_int_lt(int32_t n_ref, int32_t n_act, const char * s) } } - void lv_test_assert_str_eq(const char * s_ref, const char * s_act, const char * s) { if(strcmp(s_ref, s_act) != 0) { @@ -144,7 +139,6 @@ void lv_test_assert_str_eq(const char * s_ref, const char * s_act, const char * } } - void lv_test_assert_array_eq(const uint8_t *p_ref, const uint8_t *p_act, int32_t size, const char * s) { if(memcmp(p_ref, p_act, size) != 0) { @@ -154,7 +148,6 @@ void lv_test_assert_array_eq(const uint8_t *p_ref, const uint8_t *p_act, int32_t } } - void lv_test_assert_ptr_eq(const void * p_ref, const void * p_act, const char * s) { if(p_ref != p_act) { @@ -281,7 +274,6 @@ static void read_png_file(png_img_t * p, const char* file_name) p->number_of_passes = png_set_interlace_handling(p->png_ptr); png_read_update_info(p->png_ptr, p->info_ptr); - /* read file */ if (setjmp(png_jmpbuf(p->png_ptr))) lv_test_exit("[read_png_file] Error during read_image"); @@ -382,4 +374,3 @@ static void png_release(png_img_t * p) // } //} #endif - diff --git a/tests/lv_test_core/lv_test_core.c b/tests/lv_test_core/lv_test_core.c index 37f65464b..d500211ea 100644 --- a/tests/lv_test_core/lv_test_core.c +++ b/tests/lv_test_core/lv_test_core.c @@ -50,7 +50,6 @@ void lv_test_core(void) lv_test_font_loader(); } - /********************** * STATIC FUNCTIONS **********************/ diff --git a/tests/lv_test_core/lv_test_font_loader.c b/tests/lv_test_core/lv_test_font_loader.c index 56a42c2d8..ebc1750d6 100644 --- a/tests/lv_test_core/lv_test_font_loader.c +++ b/tests/lv_test_core/lv_test_font_loader.c @@ -1,215 +1,214 @@ -/** - * @file lv_test_font_loader.c - * - */ - -/********************* - * INCLUDES - *********************/ - -#include "../../lvgl.h" -#if LV_BUILD_TEST -#include "../lv_test_assert.h" -#include "../src/lv_font/lv_font_fmt_txt.h" -#include "../src/lv_font/lv_font.h" -#include "../src/lv_font/lv_font_loader.h" - -#include "lv_test_font_loader.h" - -/********************* - * DEFINES - *********************/ - -/********************** - * TYPEDEFS - **********************/ - -/********************** - * STATIC PROTOTYPES - **********************/ - -#if LV_USE_FILESYSTEM -static int compare_fonts(lv_font_t * f1, lv_font_t * f2); -#endif - -/********************** - * STATIC VARIABLES - **********************/ - -/********************** - * MACROS - **********************/ - -/********************** - * GLOBAL FUNCTIONS - **********************/ - -extern lv_font_t font_1; -extern lv_font_t font_2; -extern lv_font_t font_3; - -void lv_test_font_loader(void) -{ -#if LV_USE_FILESYSTEM - lv_font_t * font_1_bin = lv_font_load("f:font_1.fnt"); - lv_font_t * font_2_bin = lv_font_load("f:font_2.fnt"); - lv_font_t * font_3_bin = lv_font_load("f:font_3.fnt"); - - compare_fonts(&font_1, font_1_bin); - compare_fonts(&font_2, font_2_bin); - compare_fonts(&font_3, font_3_bin); - - lv_font_free(font_1_bin); - lv_font_free(font_2_bin); - lv_font_free(font_3_bin); -#else - lv_test_print("SKIP: font load test because it requires LV_USE_FILESYSTEM 1 and LV_FONT_FMT_TXT_LARGE 0"); -#endif -} - -#if LV_USE_FILESYSTEM -static int compare_fonts(lv_font_t * f1, lv_font_t * f2) -{ - lv_test_assert_true(f1 != NULL && f2 != NULL, "font not null"); - - lv_test_assert_ptr_eq(f1->get_glyph_dsc, f2->get_glyph_dsc, "glyph_dsc"); - lv_test_assert_ptr_eq(f1->get_glyph_bitmap, f2->get_glyph_bitmap, "glyph_bitmap"); - lv_test_assert_int_eq(f1->line_height, f2->line_height, "line_height"); - lv_test_assert_int_eq(f1->base_line, f2->base_line, "base_line"); -#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) - lv_test_assert_int_eq(f1->subpx, f2->subpx, "subpx"); -#endif - lv_font_fmt_txt_dsc_t * dsc1 = (lv_font_fmt_txt_dsc_t *) f1->dsc; - lv_font_fmt_txt_dsc_t * dsc2 = (lv_font_fmt_txt_dsc_t *) f2->dsc; - - lv_test_assert_int_eq(dsc1->kern_scale, dsc2->kern_scale, "kern_scale"); - lv_test_assert_int_eq(dsc1->cmap_num, dsc2->cmap_num, "cmap_num"); - lv_test_assert_int_eq(dsc1->bpp, dsc2->bpp, "bpp"); - lv_test_assert_int_eq(dsc1->kern_classes, dsc2->kern_classes, "kern_classes"); - lv_test_assert_int_eq(dsc1->bitmap_format, dsc2->bitmap_format, "bitmap_format"); - - // cmaps - int total_glyphs = 0; - for(int i = 0; i < dsc1->cmap_num; ++i) { - lv_font_fmt_txt_cmap_t * cmaps1 = (lv_font_fmt_txt_cmap_t *) &dsc1->cmaps[i]; - lv_font_fmt_txt_cmap_t * cmaps2 = (lv_font_fmt_txt_cmap_t *) &dsc2->cmaps[i]; - - lv_test_assert_int_eq(cmaps1->range_start, cmaps2->range_start, "range_start"); - lv_test_assert_int_eq(cmaps1->range_length, cmaps2->range_length, "range_length"); - lv_test_assert_int_eq(cmaps1->glyph_id_start, cmaps2->glyph_id_start, "glyph_id_start"); - lv_test_assert_int_eq(cmaps1->type, cmaps2->type, "type"); - lv_test_assert_int_eq(cmaps1->list_length, cmaps2->list_length, "list_length"); - - if(cmaps1->unicode_list != NULL && cmaps2->unicode_list != NULL) { - lv_test_assert_true(cmaps1->unicode_list && cmaps2->unicode_list, "unicode_list"); - - lv_test_assert_array_eq( - (uint8_t *) cmaps1->unicode_list, - (uint8_t *) cmaps2->unicode_list, - sizeof(uint16_t) * cmaps1->list_length, - "unicode_list"); - total_glyphs += cmaps1->list_length; - } - else { - total_glyphs += cmaps1->range_length; - lv_test_assert_ptr_eq(cmaps1->unicode_list, cmaps2->unicode_list, "unicode_list"); - } - - if(cmaps1->glyph_id_ofs_list != NULL && cmaps2->glyph_id_ofs_list != NULL) { - uint8_t * ids1 = (uint8_t *) cmaps1->glyph_id_ofs_list; - uint8_t * ids2 = (uint8_t *) cmaps2->glyph_id_ofs_list; - - lv_test_assert_array_eq(ids1, ids2, cmaps1->list_length, "glyph_id_ofs_list"); - } - else { - lv_test_assert_ptr_eq(cmaps1->glyph_id_ofs_list, cmaps2->glyph_id_ofs_list, "glyph_id_ofs_list"); - } - } - - // kern_dsc - if (dsc1->kern_classes == 1 && dsc2->kern_classes == 1) { - lv_font_fmt_txt_kern_classes_t * kern1 = (lv_font_fmt_txt_kern_classes_t *) dsc1->kern_dsc; - lv_font_fmt_txt_kern_classes_t * kern2 = (lv_font_fmt_txt_kern_classes_t *) dsc2->kern_dsc; - if (kern1 != NULL && kern2 != NULL) { - lv_test_assert_int_eq(kern1->right_class_cnt, kern2->right_class_cnt, "right_class_cnt"); - lv_test_assert_int_eq(kern1->left_class_cnt, kern2->left_class_cnt, "left_class_cnt"); - - lv_test_assert_array_eq( - (uint8_t *) kern1->left_class_mapping, - (uint8_t *) kern2->left_class_mapping, - kern1->left_class_cnt, - "left_class_mapping"); - - lv_test_assert_array_eq( - (uint8_t *) kern1->right_class_mapping, - (uint8_t *) kern2->right_class_mapping, - kern1->right_class_cnt, - "right_class_mapping"); - - lv_test_assert_array_eq( - (uint8_t *) kern1->class_pair_values, - (uint8_t *) kern2->class_pair_values, - kern1->right_class_cnt * kern1->left_class_cnt, - "class_pair_values"); - } - else { - lv_test_assert_ptr_eq(kern1, kern2, "kern"); - } - } - else if (dsc1->kern_classes == 0 && dsc2->kern_classes == 0) { - lv_font_fmt_txt_kern_pair_t * kern1 = (lv_font_fmt_txt_kern_pair_t *) dsc1->kern_dsc; - lv_font_fmt_txt_kern_pair_t * kern2 = (lv_font_fmt_txt_kern_pair_t *) dsc2->kern_dsc; - if (kern1 != NULL && kern2 != NULL) { - lv_test_assert_int_eq(kern1->glyph_ids_size, kern2->glyph_ids_size, "glyph_ids_size"); - lv_test_assert_int_eq(kern1->pair_cnt, kern2->pair_cnt, "pair_cnt"); - - int ids_size; - - if (kern1->glyph_ids_size == 0) { - ids_size = sizeof(int8_t) * 2 * kern1->pair_cnt; - } - else { - ids_size = sizeof(int16_t) * 2 * kern1->pair_cnt; - } - - lv_test_assert_array_eq(kern1->glyph_ids, kern2->glyph_ids, ids_size, "glyph_ids"); - lv_test_assert_array_eq( - (uint8_t * ) kern1->values, - (uint8_t * ) kern2->values, - kern1->pair_cnt, - "glyph_values"); - } - } - - lv_font_fmt_txt_glyph_dsc_t * glyph_dsc1 = (lv_font_fmt_txt_glyph_dsc_t *) dsc1->glyph_dsc; - lv_font_fmt_txt_glyph_dsc_t * glyph_dsc2 = (lv_font_fmt_txt_glyph_dsc_t *) dsc2->glyph_dsc; - - for(int i = 0; i < total_glyphs; ++i) { - if (i < total_glyphs - 1) { - int size1 = glyph_dsc1[i+1].bitmap_index - glyph_dsc1[i].bitmap_index; - - if (size1 > 0) { - lv_test_assert_array_eq( - dsc1->glyph_bitmap + glyph_dsc1[i].bitmap_index, - dsc2->glyph_bitmap + glyph_dsc2[i].bitmap_index, - size1 - 1, "glyph_bitmap"); - } - } - lv_test_assert_int_eq(glyph_dsc1[i].adv_w, glyph_dsc2[i].adv_w, "adv_w"); - lv_test_assert_int_eq(glyph_dsc1[i].box_w, glyph_dsc2[i].box_w, "box_w"); - lv_test_assert_int_eq(glyph_dsc1[i].box_h, glyph_dsc2[i].box_h, "box_h"); - lv_test_assert_int_eq(glyph_dsc1[i].ofs_x, glyph_dsc2[i].ofs_x, "ofs_x"); - lv_test_assert_int_eq(glyph_dsc1[i].ofs_y, glyph_dsc2[i].ofs_y, "ofs_y"); - } - - LV_LOG_INFO("No differences found!"); - return 0; -} -#endif - -/********************** - * STATIC FUNCTIONS - **********************/ - -#endif // LV_BUILD_TEST - +/** + * @file lv_test_font_loader.c + * + */ + +/********************* + * INCLUDES + *********************/ + +#include "../../lvgl.h" +#if LV_BUILD_TEST +#include "../lv_test_assert.h" +#include "../src/lv_font/lv_font_fmt_txt.h" +#include "../src/lv_font/lv_font.h" +#include "../src/lv_font/lv_font_loader.h" + +#include "lv_test_font_loader.h" + +/********************* + * DEFINES + *********************/ + +/********************** + * TYPEDEFS + **********************/ + +/********************** + * STATIC PROTOTYPES + **********************/ + +#if LV_USE_FILESYSTEM +static int compare_fonts(lv_font_t * f1, lv_font_t * f2); +#endif + +/********************** + * STATIC VARIABLES + **********************/ + +/********************** + * MACROS + **********************/ + +/********************** + * GLOBAL FUNCTIONS + **********************/ + +extern lv_font_t font_1; +extern lv_font_t font_2; +extern lv_font_t font_3; + +void lv_test_font_loader(void) +{ +#if LV_USE_FILESYSTEM + lv_font_t * font_1_bin = lv_font_load("f:font_1.fnt"); + lv_font_t * font_2_bin = lv_font_load("f:font_2.fnt"); + lv_font_t * font_3_bin = lv_font_load("f:font_3.fnt"); + + compare_fonts(&font_1, font_1_bin); + compare_fonts(&font_2, font_2_bin); + compare_fonts(&font_3, font_3_bin); + + lv_font_free(font_1_bin); + lv_font_free(font_2_bin); + lv_font_free(font_3_bin); +#else + lv_test_print("SKIP: font load test because it requires LV_USE_FILESYSTEM 1 and LV_FONT_FMT_TXT_LARGE 0"); +#endif +} + +#if LV_USE_FILESYSTEM +static int compare_fonts(lv_font_t * f1, lv_font_t * f2) +{ + lv_test_assert_true(f1 != NULL && f2 != NULL, "font not null"); + + lv_test_assert_ptr_eq(f1->get_glyph_dsc, f2->get_glyph_dsc, "glyph_dsc"); + lv_test_assert_ptr_eq(f1->get_glyph_bitmap, f2->get_glyph_bitmap, "glyph_bitmap"); + lv_test_assert_int_eq(f1->line_height, f2->line_height, "line_height"); + lv_test_assert_int_eq(f1->base_line, f2->base_line, "base_line"); +#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) + lv_test_assert_int_eq(f1->subpx, f2->subpx, "subpx"); +#endif + lv_font_fmt_txt_dsc_t * dsc1 = (lv_font_fmt_txt_dsc_t *) f1->dsc; + lv_font_fmt_txt_dsc_t * dsc2 = (lv_font_fmt_txt_dsc_t *) f2->dsc; + + lv_test_assert_int_eq(dsc1->kern_scale, dsc2->kern_scale, "kern_scale"); + lv_test_assert_int_eq(dsc1->cmap_num, dsc2->cmap_num, "cmap_num"); + lv_test_assert_int_eq(dsc1->bpp, dsc2->bpp, "bpp"); + lv_test_assert_int_eq(dsc1->kern_classes, dsc2->kern_classes, "kern_classes"); + lv_test_assert_int_eq(dsc1->bitmap_format, dsc2->bitmap_format, "bitmap_format"); + + // cmaps + int total_glyphs = 0; + for(int i = 0; i < dsc1->cmap_num; ++i) { + lv_font_fmt_txt_cmap_t * cmaps1 = (lv_font_fmt_txt_cmap_t *) &dsc1->cmaps[i]; + lv_font_fmt_txt_cmap_t * cmaps2 = (lv_font_fmt_txt_cmap_t *) &dsc2->cmaps[i]; + + lv_test_assert_int_eq(cmaps1->range_start, cmaps2->range_start, "range_start"); + lv_test_assert_int_eq(cmaps1->range_length, cmaps2->range_length, "range_length"); + lv_test_assert_int_eq(cmaps1->glyph_id_start, cmaps2->glyph_id_start, "glyph_id_start"); + lv_test_assert_int_eq(cmaps1->type, cmaps2->type, "type"); + lv_test_assert_int_eq(cmaps1->list_length, cmaps2->list_length, "list_length"); + + if(cmaps1->unicode_list != NULL && cmaps2->unicode_list != NULL) { + lv_test_assert_true(cmaps1->unicode_list && cmaps2->unicode_list, "unicode_list"); + + lv_test_assert_array_eq( + (uint8_t *) cmaps1->unicode_list, + (uint8_t *) cmaps2->unicode_list, + sizeof(uint16_t) * cmaps1->list_length, + "unicode_list"); + total_glyphs += cmaps1->list_length; + } + else { + total_glyphs += cmaps1->range_length; + lv_test_assert_ptr_eq(cmaps1->unicode_list, cmaps2->unicode_list, "unicode_list"); + } + + if(cmaps1->glyph_id_ofs_list != NULL && cmaps2->glyph_id_ofs_list != NULL) { + uint8_t * ids1 = (uint8_t *) cmaps1->glyph_id_ofs_list; + uint8_t * ids2 = (uint8_t *) cmaps2->glyph_id_ofs_list; + + lv_test_assert_array_eq(ids1, ids2, cmaps1->list_length, "glyph_id_ofs_list"); + } + else { + lv_test_assert_ptr_eq(cmaps1->glyph_id_ofs_list, cmaps2->glyph_id_ofs_list, "glyph_id_ofs_list"); + } + } + + // kern_dsc + if (dsc1->kern_classes == 1 && dsc2->kern_classes == 1) { + lv_font_fmt_txt_kern_classes_t * kern1 = (lv_font_fmt_txt_kern_classes_t *) dsc1->kern_dsc; + lv_font_fmt_txt_kern_classes_t * kern2 = (lv_font_fmt_txt_kern_classes_t *) dsc2->kern_dsc; + if (kern1 != NULL && kern2 != NULL) { + lv_test_assert_int_eq(kern1->right_class_cnt, kern2->right_class_cnt, "right_class_cnt"); + lv_test_assert_int_eq(kern1->left_class_cnt, kern2->left_class_cnt, "left_class_cnt"); + + lv_test_assert_array_eq( + (uint8_t *) kern1->left_class_mapping, + (uint8_t *) kern2->left_class_mapping, + kern1->left_class_cnt, + "left_class_mapping"); + + lv_test_assert_array_eq( + (uint8_t *) kern1->right_class_mapping, + (uint8_t *) kern2->right_class_mapping, + kern1->right_class_cnt, + "right_class_mapping"); + + lv_test_assert_array_eq( + (uint8_t *) kern1->class_pair_values, + (uint8_t *) kern2->class_pair_values, + kern1->right_class_cnt * kern1->left_class_cnt, + "class_pair_values"); + } + else { + lv_test_assert_ptr_eq(kern1, kern2, "kern"); + } + } + else if (dsc1->kern_classes == 0 && dsc2->kern_classes == 0) { + lv_font_fmt_txt_kern_pair_t * kern1 = (lv_font_fmt_txt_kern_pair_t *) dsc1->kern_dsc; + lv_font_fmt_txt_kern_pair_t * kern2 = (lv_font_fmt_txt_kern_pair_t *) dsc2->kern_dsc; + if (kern1 != NULL && kern2 != NULL) { + lv_test_assert_int_eq(kern1->glyph_ids_size, kern2->glyph_ids_size, "glyph_ids_size"); + lv_test_assert_int_eq(kern1->pair_cnt, kern2->pair_cnt, "pair_cnt"); + + int ids_size; + + if (kern1->glyph_ids_size == 0) { + ids_size = sizeof(int8_t) * 2 * kern1->pair_cnt; + } + else { + ids_size = sizeof(int16_t) * 2 * kern1->pair_cnt; + } + + lv_test_assert_array_eq(kern1->glyph_ids, kern2->glyph_ids, ids_size, "glyph_ids"); + lv_test_assert_array_eq( + (uint8_t * ) kern1->values, + (uint8_t * ) kern2->values, + kern1->pair_cnt, + "glyph_values"); + } + } + + lv_font_fmt_txt_glyph_dsc_t * glyph_dsc1 = (lv_font_fmt_txt_glyph_dsc_t *) dsc1->glyph_dsc; + lv_font_fmt_txt_glyph_dsc_t * glyph_dsc2 = (lv_font_fmt_txt_glyph_dsc_t *) dsc2->glyph_dsc; + + for(int i = 0; i < total_glyphs; ++i) { + if (i < total_glyphs - 1) { + int size1 = glyph_dsc1[i+1].bitmap_index - glyph_dsc1[i].bitmap_index; + + if (size1 > 0) { + lv_test_assert_array_eq( + dsc1->glyph_bitmap + glyph_dsc1[i].bitmap_index, + dsc2->glyph_bitmap + glyph_dsc2[i].bitmap_index, + size1 - 1, "glyph_bitmap"); + } + } + lv_test_assert_int_eq(glyph_dsc1[i].adv_w, glyph_dsc2[i].adv_w, "adv_w"); + lv_test_assert_int_eq(glyph_dsc1[i].box_w, glyph_dsc2[i].box_w, "box_w"); + lv_test_assert_int_eq(glyph_dsc1[i].box_h, glyph_dsc2[i].box_h, "box_h"); + lv_test_assert_int_eq(glyph_dsc1[i].ofs_x, glyph_dsc2[i].ofs_x, "ofs_x"); + lv_test_assert_int_eq(glyph_dsc1[i].ofs_y, glyph_dsc2[i].ofs_y, "ofs_y"); + } + + LV_LOG_INFO("No differences found!"); + return 0; +} +#endif + +/********************** + * STATIC FUNCTIONS + **********************/ + +#endif // LV_BUILD_TEST diff --git a/tests/lv_test_core/lv_test_font_loader.h b/tests/lv_test_core/lv_test_font_loader.h index fe29926bf..ffe077e4b 100644 --- a/tests/lv_test_core/lv_test_font_loader.h +++ b/tests/lv_test_core/lv_test_font_loader.h @@ -1,39 +1,38 @@ -/** - * @file lv_font_loader.h - * - */ - -#ifndef LV_TEST_FONT_LOADER_H -#define LV_TEST_FONT_LOADER_H - -#ifdef __cplusplus -extern "C" { -#endif - -/********************* - * INCLUDES - *********************/ - -/********************* - * DEFINES - *********************/ - -/********************** - * TYPEDEFS - **********************/ - -/********************** - * GLOBAL PROTOTYPES - **********************/ -void lv_test_font_loader(void); - -/********************** - * MACROS - **********************/ - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*LV_TEST_FONT_LOADER_H*/ - +/** + * @file lv_font_loader.h + * + */ + +#ifndef LV_TEST_FONT_LOADER_H +#define LV_TEST_FONT_LOADER_H + +#ifdef __cplusplus +extern "C" { +#endif + +/********************* + * INCLUDES + *********************/ + +/********************* + * DEFINES + *********************/ + +/********************** + * TYPEDEFS + **********************/ + +/********************** + * GLOBAL PROTOTYPES + **********************/ +void lv_test_font_loader(void); + +/********************** + * MACROS + **********************/ + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*LV_TEST_FONT_LOADER_H*/ diff --git a/tests/lv_test_core/lv_test_obj.c b/tests/lv_test_core/lv_test_obj.c index 455646823..e4708a18b 100644 --- a/tests/lv_test_core/lv_test_obj.c +++ b/tests/lv_test_core/lv_test_obj.c @@ -47,7 +47,6 @@ void lv_test_obj(void) create_delete_change_parent(); } - /********************** * STATIC FUNCTIONS **********************/ @@ -59,7 +58,6 @@ static void create_delete_change_parent(void) lv_test_print("Create, delete, change parent of a simple object:"); lv_test_print("-------------------------------------------------"); - lv_test_print("Create an object on the default screen"); lv_test_assert_int_eq(0, lv_obj_count_children(lv_scr_act()), "Screen's children count before creation"); diff --git a/tests/lv_test_core/lv_test_style.c b/tests/lv_test_core/lv_test_style.c index 0d1f3a5ed..d36676670 100644 --- a/tests/lv_test_core/lv_test_style.c +++ b/tests/lv_test_core/lv_test_style.c @@ -57,7 +57,6 @@ void lv_test_style(void) mem_leak(); } - /********************** * STATIC FUNCTIONS **********************/ @@ -166,7 +165,6 @@ static void add_remove_read_prop(void) _lv_style_list_reset(&style_list); } - static void cascade(void) { lv_test_print(""); @@ -236,7 +234,6 @@ static void cascade(void) lv_test_assert_int_eq(LV_RES_OK, found, "Get an overwritten 'color' property"); lv_test_assert_color_eq(LV_COLOR_BLUE, color, "Get the value of an overwritten 'color' property"); - lv_test_print("Overwrite the properties with the local style"); _lv_style_list_set_local_int(&style_list, LV_STYLE_TEXT_LINE_SPACE, 20); _lv_style_list_set_local_opa(&style_list, LV_STYLE_BG_OPA, LV_OPA_70); @@ -259,7 +256,6 @@ static void cascade(void) lv_test_assert_int_eq(LV_RES_OK, found, "Get a local 'color' property"); lv_test_assert_color_eq(LV_COLOR_LIME, color, "Get the value of a local'color' property"); - /*Clean-up*/ _lv_style_list_reset(&style_list); } @@ -270,7 +266,6 @@ static void copy(void) lv_test_print("Copy styles and style lists"); lv_test_print("---------------------------"); - lv_test_print("Copy a style"); lv_style_t style_src; lv_style_init(&style_src); @@ -362,7 +357,6 @@ static void states(void) _lv_style_set_opa(&style_first, LV_STYLE_BG_OPA, LV_OPA_50); _lv_style_set_opa(&style_first, LV_STYLE_BG_OPA | (LV_STATE_CHECKED | LV_STATE_PRESSED) << LV_STYLE_STATE_POS, LV_OPA_60); - lv_opa_t opa; found = _lv_style_list_get_opa(&style_list, LV_STYLE_BG_OPA , &opa); lv_test_assert_int_eq(LV_RES_OK, found, "Get an 'opa' property in normal state"); @@ -380,7 +374,6 @@ static void states(void) lv_test_assert_int_eq(LV_RES_OK, found, "Get an 'opa' property in checked pressed hovered state"); lv_test_assert_int_eq(LV_OPA_60, opa, "Get the value of an 'int' in checked pressed hovered state"); - lv_test_print("Test state precedence in 2 styles"); _lv_style_set_color(&style_first, LV_STYLE_BG_COLOR, LV_COLOR_YELLOW); _lv_style_set_color(&style_first, LV_STYLE_BG_COLOR | (LV_STATE_HOVERED) << LV_STYLE_STATE_POS, LV_COLOR_RED); @@ -417,7 +410,6 @@ static void states(void) _lv_style_list_reset(&style_list); } - static void mem_leak(void) { @@ -491,7 +483,6 @@ static void mem_leak(void) lv_mem_monitor(&mon_end); lv_test_assert_int_lt(sizeof(void*) * 8, mon_start.free_size - mon_end.free_size, "Style memory leak"); - lv_test_print("Add styles"); lv_mem_monitor(&mon_start); for(i = 0; i < 100; i++) { @@ -537,7 +528,6 @@ static void mem_leak(void) _lv_style_list_remove_style(&style_list, &style2); _lv_style_list_add_style(&style_list, &style1); - if(i % 2 != 0) _lv_style_list_set_local_color(&style_list, LV_STYLE_LINE_COLOR, LV_COLOR_RED); _lv_style_list_reset(&style_list); @@ -551,8 +541,6 @@ static void mem_leak(void) lv_mem_monitor(&mon_end); lv_test_assert_int_lt(sizeof(void*) * 8, mon_start.free_size - mon_end.free_size, "Style memory leak"); - - lv_test_print("Complex test"); lv_mem_monitor(&mon_start); @@ -569,7 +557,6 @@ static void mem_leak(void) _lv_style_list_add_style(&style_list, &style1); - if(i % 4 == 0) { _lv_style_list_set_local_ptr(&style_list, LV_STYLE_PATTERN_IMAGE, LV_SYMBOL_CLOSE); } diff --git a/tests/lv_test_fonts/font_1.c b/tests/lv_test_fonts/font_1.c index cb26d658d..6ac794b30 100644 --- a/tests/lv_test_fonts/font_1.c +++ b/tests/lv_test_fonts/font_1.c @@ -709,7 +709,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0xe2, 0xdb, 0xbb, 0x80, 0xb2, 0x88, 0xb0, 0x80 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -904,7 +903,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -1334,7 +1332,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -1362,7 +1359,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 1 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -1380,4 +1376,3 @@ lv_font_t font_1 = { }; #endif /*#if FONT_1*/ - diff --git a/tests/lv_test_fonts/font_2.c b/tests/lv_test_fonts/font_2.c index cb20ac794..9d9c30218 100644 --- a/tests/lv_test_fonts/font_2.c +++ b/tests/lv_test_fonts/font_2.c @@ -739,7 +739,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -934,7 +933,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { @@ -1364,7 +1362,6 @@ static const int8_t kern_class_values[] = 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { @@ -1392,7 +1389,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -1410,4 +1406,3 @@ lv_font_t font_2 = { }; #endif /*#if FONT_2*/ - diff --git a/tests/lv_test_fonts/font_3.c b/tests/lv_test_fonts/font_3.c index c0dd3cfbb..d028e8ec5 100644 --- a/tests/lv_test_fonts/font_3.c +++ b/tests/lv_test_fonts/font_3.c @@ -794,7 +794,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { 0xc1, 0x64, 0xa1, 0x0, 0x54, 0x9a, 0x96, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -902,8 +901,6 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { * CHARACTER MAPPING *--------------------*/ - - /*Collect the unicode lists and glyph_id offsets*/ static const lv_font_fmt_txt_cmap_t cmaps[] = { @@ -913,8 +910,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = } }; - - /*-------------------- * ALL CUSTOM DATA *--------------------*/ @@ -932,7 +927,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 1 }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -950,4 +944,3 @@ lv_font_t font_3 = { }; #endif /*#if FONT_3*/ - diff --git a/tests/lv_test_main.c b/tests/lv_test_main.c index e910f4891..c590c62fe 100644 --- a/tests/lv_test_main.c +++ b/tests/lv_test_main.c @@ -26,7 +26,6 @@ int main(void) return 0; } - #if LV_USE_FILESYSTEM static lv_fs_res_t open_cb(struct _lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode) { @@ -144,4 +143,3 @@ uint32_t custom_tick_get(void) } #endif - diff --git a/tests/lv_test_widgets/lv_test_label.c b/tests/lv_test_widgets/lv_test_label.c index 3d0435a2e..586ebd286 100644 --- a/tests/lv_test_widgets/lv_test_label.c +++ b/tests/lv_test_widgets/lv_test_label.c @@ -51,7 +51,6 @@ void lv_test_label(void) #endif } - /********************** * STATIC FUNCTIONS **********************/