astyle code formatting

Update lv_ta_signal in lv_ta.c

.gitignore

@@ -0,0 +1 @@
+**/*.o

README.md

@@ -0,0 +1,69 @@
+# Littlev Graphics Library
+
+![LittlevGL cover](https://littlevgl.com/docs/themes/lv_theme_intro.png)
+
+**LittlevGL provides everything you need to create a Graphical User Interface (GUI) on embedded systems with easy-to-use graphical elements, beautiful visual effects and low memory footprint.**  
+https://littlevgl.com
+
+## Key features
+* **Powerful building blocks** buttons, charts, lists, sliders, images, etc.
+* **Advanced graphics** with animations, anti-aliasing, opacity, smooth scrolling
+* **Various input devices** touch pad, mouse, keyboard, encoder, buttons, etc.
+* **Multi-language support** with UTF-8 encoding
+* **Fully customizable** graphical elements
+* **Hardware independent** to use with any microcontroller or display
+* **Scalable** to operate with little memory (50 kB Flash, 10 kB RAM)
+* **OS, External memory and GPU** supported but not required
+* **Single frame buffer** operation even with advances graphical effects
+* **Written in C** for maximal compatibility
+* **Simulator** to develop on PC without embedded hardware
+* **Tutorials, examples, themes** for rapid development
+* **Documentation** and API references online
+
+## Porting
+In the simplest case you need 5 things:
+1. Call `lv_tick_inc(x)` every `x` milliseconds in a Timer or Task (`x` should be between 1 and 10)
+2. Register a function which can **copy a pixel array** to an area of the screen.
+3. Register a function which can **read an input device**. (E.g. touch pad)
+4. Copy `lv_conf_templ.h` as `lv_conf.h` and set at least `LV_HOR_RES`, `LV_VER_RES` and `LV_COLOR_DEPTH`. 
+5. Call `lv_task_handler()` periodically every few milliseconds.
+For a detailed description visit https://littlevgl.com/porting
+Or check the [Porting tutorial](https://github.com/littlevgl/lv_examples/blob/master/lv_tutorial/0_porting/lv_tutorial_porting.c)
+ 
+## Project set-up
+1. **Clone** or [Download](https://littlevgl.com/download) the lvgl repository: `git clone  https://github.com/littlevgl/lvgl.git`
+2. **Create project** with your preferred IDE and add the *lvgl* folder
+3. Copy **lvgl/lv_conf_templ.h** as **lv_conf.h** next to the *lvgl* folder
+4. In the lv_conf.h delete the first `#if 0` and its `#endif`. Leave the default configuration for the first try.
+5. In your *main.c*: #include "lvgl/lvgl.h"   
+6. In your *main function*:
+   * lvgl_init();
+   * tick, display and input device initialization (see above)
+7. To **test** create a label: `lv_obj_t * label = lv_label_create(lv_scr_act(), NULL);`  
+8. In the main *while(1)* call `lv_task_handler();` and make a few milliseconds delay (e.g. `my_delay_ms(5);`) 
+9. Compile the code and load it to your embedded hardware
+
+## PC Simulator
+You can test the graphics library in a PC simulator, if you don't have an embedded hardware. The simulator uses [SDL2](https://www.libsdl.org/) library to emulate a display on your monitor and a touch pad with your mouse.
+
+There is a pre-configured PC project for **Eclipse CDT** in this repository: https://github.com/littlevgl/pc_simulator
+
+## Related repositories
+* PC simulator: https://github.com/littlevgl/pc_simulator
+* Projects: https://github.com/littlevgl/lv_projects
+* Examples: https://github.com/littlevgl/lv_examples
+* Drivers: https://github.com/littlevgl/lv_drivers
+
+## Screenshots
+![TFT material](http://www.gl.littlev.hu/github_res/tft_material.png)
+![TFT zen](http://www.gl.littlev.hu/github_res/tft_zen.png)
+![TFT alien](http://www.gl.littlev.hu/github_res/tft_alien.png)
+![TFT night](http://www.gl.littlev.hu/github_res/tft_night.png)
+
+## Contributing
+See [CONTRIBUTING.md](https://github.com/littlevgl/lvgl/blob/master/docs/CONTRIBUTING.md)
+
+## Donate
+If you are pleased with this graphics library, found it useful, or are happy with the support you got, please help its further development:
+
+[![Donate](https://littlevgl.com/donate_dir/donate_btn.png)](https://littlevgl.com/donate)

docs/CONTRIBUTING.md

@@ -1,136 +1,124 @@
 # Contributing to Littlev Graphics Library
-First of all thank you for reading these guide before contributing!
+It's glad to see that you are interested in Contributing to LittlevGL! 
 
-In this guide you can read how can you help in developing the Littlev Graphic Library. These are not strict rules rather just suggestions. If you have a constructive idea just create pull request on this document!
+In this guide you can learn how can you help to develop  LittlevGL. 
 
 ### Table Of Content
 * [Who can contribute?](#who-can-contribute)
-* [How to report an issue?](#how-to-report-an-issue)
-  * [Simple issue](#simple-issue)
-  * [Complex issue](#complex-issue)
+* [How to report an issue?](#how-to-report-a-bug)
 * [How to suggest a feature?](#how-to-suggest-a-feature)
 * [How to implement a feature?](#how-to-implement-a-feature)
 * [Styling guide](#styling-guide)
-  * [Git Commit Messages](#Git-commit-messages)
-  * [File format](#file-format)
-  * [Functions](#functions)
-  * [Variables](#variables)
-  * [Defines](#defines)
-  * [Comments](#comments)
-  * [Formatting](#formatting)
-
 
 ## Who can contribute?
-Everybody is welcome in contributing independently from skills, programming level or any personal attribute. 
-
-There are several ways to contribute in the graphics library like:
+As graphical interfaces for embedded systems has an increasing relevance today you also might find important to work with a good graphics library. Now - independently from skills, programming level or any personal attributes - you can influence and help the development of Littlev Graphics Library with:
 * Report an issue
 * Suggest feature
 * Fix an issue
 * Implement a feature
+* Help with testing bugfixes and new features
 
 Please, take a look at [CODE_OF_CONDUCT](https://github.com/littlevgl/lvgl/blob/master/docs/CODE_OF_CONDUCT.md)
 
-## How to report an issue?
-There are 3 permanent branches:
- * `master` for stable, released versions
- * `beta` for developers, all feature branches merged here first
- * `bugfix` for hotfixes, not new features
+There are few **general rules**
+* We use [GitHub's issue tracker](https://github.com/littlevgl/lvgl/issues)
+* Be kind and respectful. Starting with "Hi" is always a good idea :)
+* If somebody helped you give a feedback.
+* One issue should be about one topic. If you have other questions please open a new issue.
+* Always create an issue before creating a [Pull request](https://help.github.com/articles/about-pull-requests/) to discuss the idea first
+* Create small, "digestible" Pull requests.  
+* Tell your remarks in a structured way. Use paragraphs and the [Markdown](https://guides.github.com/features/mastering-markdown/) support of GitHub.
+* Be sure you are using the latest version (from `master` branch)
+* Keep in mind LittlevGL should be and should remain:
+  - usable on small MCUs as well (think about memory footprint)
+  - compilable with "non-standard" tools like Arduino (no gcc specific options) 
+  - C compatible (no C++ specific code and features)
+  - all configuration should be in `lv_conf.h`. (Instead of modifying the library)
+  - the API clean and easiy to understand
+  
+## How to report a bug?
+If you found a **simple and straightforward bug** like:
+* misspelling (in comments function/variable names or grammatical issues in comments)
+* not handled error cases (negative array index, overflow etc)
+* anything else which can be fixed locally with a few lines of code
+* or defective documentation
 
-### Simple issue
-If you find an issue which is very simple to fix, and you fixed it, please send a pull request against `beta` branch. 
-A simple issue could be:
-* Misspelled names
-  * Comment: misspelling or grammatical error in comments
-  * Variable: misspelled variable name (e.g. ***ojb**_next* instead of ***obj**_next*)
-  * Define: only local defines in files because global defines affect API
-  * Function: only static function name because global functions affect API
-* Not handled error case:
-  * A parameter can be NULL (during normal usage)
-  * Negative index in array or over indexing
-  * Overflow in variable
-  * Anything which is local an can be fixed with a few lines of code  
+then tell:
+* where you found the bug (which file/function/variable)
+* how can it cause problem
+* what is your suggested solution if you have 
 
-### Complex issue
-If you find a complex issue which:
+If you faced with **something more complex** like:
 * might be simple but you don't know its origin
 * affects a whole file, module or even the architecture
 * needs deeper discussion
 
-please create a **new issue** and describe
-* what you experience
-* how to reproduce the issue (maybe with example code)
-* version you are using (lvgl.h)
-* misc library version (misc.h)
+then please
+* tell what do you experience
+* tell what do you expect to happen
+* tell how to reproduce the issue 
+* provide a simplified code example (better if can be tested with copy-paste)
+* attache your lv_conf.h (if you feel it's important)
+* logs and long codes should be attached in a file (instead of copying into a comment)
 
 ## How to suggest a feature?
-If you have a good and useful idea you can use GitHub issues to suggest a new feature. Please note the followings on feature requests:
+If you have a good and useful idea open issue to tell it! Please note the followings on suggesting new features:
 * What the new feature is about?
 * Why/Where/In which case is it useful/helpful/relevant?
+* Can you mention real life usecases/examples for the use this feature?
 * Can you help in implementing it?
 
-After a discussion we figure out the specification of the new feature and the technical details/implementation possibilities. 
-With the knowledge of how to do it somebody can implement the new feature.
+Your suggestion can have 4 possible outcomes:
+1. This feature is already exists. In this case you will learn how to achieve your goal.
+2. You can simply realize it with the current functionality.
+3. Although it's a new feature but it would break LittlevGL's platform independent and/or resource minimalist nature.
+4. It's really a new feature which would be good to be in LittlevGL. Hurray! In a discussion we figure out the technical details and implementation options. With the knowledge of how to do it somebody can implement the new feature.
+
+Keep in mind if you wouldn't like to do the implementation there is no guarantee that it will be ready in the near future. 
+However, if you would like to force it, take a look at this page: [Feature request service](http://www.gl.littlev.hu/services#feature)
+
+## How to implement a feature?
+In [docs/TODO_MINOR.md](https://github.com/littlevgl/lvgl/blob/master/docs/TODO_MINOR.md) and [docs/TODO_PATCH.md](https://github.com/littlevgl/lvgl/blob/master/docs/TODO_PATCH.md) you can see some ideas which are waiting for somebody to realize them! If want to deal with a feature from these files, please start an issue and discuss the details.
 
 The new feature should be in a new branch.
 
-Keep in mind if you wouldn't like to do the implementation there is no guarantee that it will be ready in the new future. 
-However if you would like to force it, take a look at this page: [Feature request service](http://www.gl.littlev.hu/services#feature)
-
-## How to implement a feature?
-In [docs/TODO_MINOR.md](https://github.com/littlevgl/lvgl/blob/master/docs/TODO_MINOR.md) and [docs/TODO_PATCH.md](https://github.com/littlevgl/lvgl/blob/master/docs/TODO_PATCH.md) you can see some ideas which are waiting for somebody to realize them! If want to deal with a feature from this files, please start an issue and discusse the details.
-
 ## Styling guide
 
-### Git Commit Messages
-* Use the present tense ("Add feature" not "Added feature")
-* Use the imperative mood ("Move cursor to..." not "Moves cursor to...")
-* Limit the first line to 72 characters or less
-* Reference issues and pull requests liberally after the first line
-
 ### File format
-Use [misc/templ/templ.c](https://github.com/littlevgl/misc/blob/master/templ/templ.c) and [misc/templ/templ.h](https://github.com/littlevgl/misc/blob/master/templ/templ.h)
+Use [lv_misc/lv_templ.c](https://github.com/littlevgl/lvgl/blob/master/lv_misc/lv_templ.c) and [lv_misc/lv_templ.h](https://github.com/littlevgl/lvgl/blob/master/lv_misc/lv_templ.h)
 
-### Functions
-* try to write function shorter then is 40 lines 
-* always shorter then 100 lines (except very straightforwards) 
-* in function names: 
-  * words sparated by '_'
-  * only lower case letters
-  * only clear abbreviation (OK: *lv_xy_get_title_txt*, BAD: *lv_xy_get_ttxt*)
+### Naming conventions
+* Words are separated by '_'
+* In variable and function names use only lower case letters (e.g. *height_tmp*)
+* In enums and defines use only upper case letters (e.g. *e.g. MAX_LINE_NUM*)
+* Global names (API):
+  * 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. 
+* Typedefs
+  * prefer `typedef struct` and `typedef enum` instead of  `struct name` and `enum name`
+  * always add a closing *..._t*
+* Abbreviations:
+  * Use abbreviations on public names only if they become longer than 32 characters 
+  * Use only very straightforward (e.g. pos: position) or well-established (e.g. pr: press) abbreviations 
 
-#### Global functions names (API)
-An example: *lv_btn_set_state()*
-* starts with *lv*
-* followed by module name: *btn*, *label*, *style* etc.
-* followed by the action: *set*, *get*, *refr* etc.
-* closed with subject: *name*, *size*, *state* etc. 
-  * optional like in *lv_obj_del()* it is missing
-  * could contain more words: *long_mode*, *point_all* 
-
-#### Static functions names
-Names can be used freely.
-
-### Variables
-* words sparated by '_'
-* always lower case
-* one line one declaration (BAD: char x, y;)
-* use `<stdint.h>` (*uint8_t*, *int32_t* etc)
-* declare variables when needed (not all at function start)
-* use the smallest required scope
-* variables in a file (outside functions) are always *static*
-* do not use global variables (use functions to set/get static variables)
-
-### Defines 
-* always upper case
-* starts with *LV_*
-* followed by the modul: *OBJ*, *BTN* etc.
-* closed by the subject: *ANIM_TIME*, *VALUE_MIN*, *WIDTH_DEF*
+### Coding guide
+* Functions:
+  * Try to write function shorter than is 50 lines 
+  * Always shorter than 100 lines (except very straightforwards) 
+* Variables:
+  * One line, one declaration (BAD: char x, y;)
+  * Use `<stdint.h>` (*uint8_t*, *int32_t* etc)
+  * Declare variables when needed (not all at function start)
+  * Use the smallest required scope
+  * Variables in a file (outside functions) are always *static*
+  * Do not use global variables (use functions to set/get static variables)
 
 ### Comments
 Before every function have a comment like this:
 
-```
+```c
 /**
  * Return with the screen of an object
  * @param obj pointer to an object
@@ -148,16 +136,20 @@ The code should show clearly what you are doing.
 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*/`
+
+In comments use \` \` when referring to a variable. E.g. ``/*Update the value of `x_act`*/``
+
 ### Formatting
 Here is example to show bracket placing and using of white spaces:
-```
+```c
 /**
  * Set a new text for a label. Memory will be allocated to store the text by the label.
  * @param label pointer to a label object
  * @param text '\0' terminated character string. NULL to refresh with the current text.
  */
 void lv_label_set_text(lv_obj_t * label, const char * text)
-{   /*Main bracket in new line*/
+{   /* Main brackets of functions in new line*/
     
     if(label == NULL) return; /*No bracket only if the command is inline with the if statement*/
     
@@ -166,15 +158,24 @@ void lv_label_set_text(lv_obj_t * label, const char * text)
     lv_label_ext_t * ext = lv_obj_get_ext(label);
 
     /*Comment before a section */
-    if(text == ext->txt || text == NULL) {  /*Bracket start inline*/
+    if(text == ext->txt || text == NULL) {  /*Bracket of statements start inline*/
         lv_label_refr_text(label);
         return;   
     }
     
-    .
-    .
-    .
+    ...
 }
 ```
 
 Use 4 spaces indentation instead of tab.
+
+You can use **astyle** to format the code. The required config flies are: `docs/astyle_c` and `docs/astyle_h`.
+To format the source files: 
+ `$ find . -type f -name "*.c" | xargs astyle --options=docs/astyle_c`
+ 
+To format the header files:
+ `$ find . -type f -name "*.h" | xargs astyle --options=docs/astyle_h`
+ 
+Append `-n` to the end to skip creation of backup file OR use `$ find . -type f -name "*.bak"  -delete` (for source file's backups) and `find . -type f -name "*.orig" -delete` (for header file's backups)
+
+

docs/README.md

@@ -1,83 +0,0 @@
-# LittleV Graphics Libraray
-
-![LittlevGL cover](http://www.gl.littlev.hu/home/main_cover_small.png)
-
-LittlevGL is a graphics library to create Graphical User Interfaces (GUI) on TFT, LCD or monochrome displays using microcontroller based embedded systems.
-
-Transparency, anti-aliassing and smooth animations can be used with no double buffering so typically no external memories are required.
-
-The graphics library is written in C and it is completely hardware independent. You can even run it in a PC simulator without any embedded hardware.
-
-Homepage: http://gl.littlev.hu
-
-## Key features
-* Hardware independent, support any modern microcontroller
-* High resolution TFTs, monochrome or any type of display supported (24/16/8/1 bit color depth)
-* External RAM, FPU or GPU not required just optional
-* Build GUI from simple graphical objects
-  * Buttons, Labels, Images
-  * Charts, Lists, Bars, Sliders, Text areas etc.
-* High level graphical features without double buffering
-  * Antialiassing (font or full screen)
-  * Animations
-  * Transparency
-  * Gradient colors
-  * Smooth dragging and scrolling
-  * Layers
-* Customizable appearance with styles
-* Applications for complex tasks
-* Can run in a PC simulator
-* Modular and well-structured source code
-* Actively developed
-
-## Porting
-The following functions has to be provided
-* hal/disp `disp_fill(x1, y1, x2, y2, color)` to fill area with a color
-* hal/disp `disp_map(x1, y1, x2, y2, &color_array)` copy a color map to an area
-* hal/disp `disp_color_cpy(dest, src, length, opa)` copy pixel, optional for GPU
-* hal/indev `indev_get(id, &x, &y)` get the *x* and *y* coordinates from an input device (e.g. touch pad)
-* hal/systick `systick_get()` get a system tick with 1 ms resolution
-* hal/systick `systick_elapse(prev_time)` get the elapsed milliseconds sience *prev_time*
-
-See the [example HAL](https://github.com/littlevgl/hal) repository!
-
-## Requirements
-* [Misc. library](https://github.com/littlevgl/misc) is used by the graphics library
-
-## Project set-up
-1. Clone or download the following repositories:
-   * lvgl:`git clone https://github.com/littlevgl/lvgl.git`  
-   * misc: `git clone https://github.com/littlevgl/misc.git` 
-   * hal: `git clone https://github.com/littlevgl/hal.git`
-2. Create project with your prefered IDE and add the **lvgl**, **misc** and **hal** folders 
-3. Add your projects **root directory as include path** 
-4. Write your display, touch pad and system tick **drivers in hal**
-5. Copy *lvgl/lv_conf_templ.h* as **lv_conf.h** and *misc/misc_conf_templ.h* as **misc_conf.h** to the projects root folder
-6. In the *_conf.h files delete the first `#if 0` and its `#endif`. Let the default configurations at first.
-7. In your *main.c* include: 
-   * #include "misc/misc.h" 
-   * #include "misc/os/ptask.h"
-   * #include "lvgl/lvgl.h"   
-8. In your *main.c* intialize:
-   * **misc_init()**;
-   * your_systick_init();
-   * your_disp_init();
-   * your_indev_init();
-   * **lv_init()**;
-10. To **test** create a label: `lv_obj_t * label = lv_label_create(lv_scr_act(), NULL);`  
-11. In the main *while(1)* call `ptask_handler();` and make a few milliseconds delay (e.g. `your_delay_ms(5);`) 
-12. Compile the code and load it to your embedded hardware
-
-## PC Simulator
-If you don't have got an embedded hardware you can test the graphics library in a PC simulator. The simulator uses [SDL2](https://www.libsdl.org/) to emulate a display on your monitor and a touch pad with your mouse.
-
-There is a pre-configured PC project for **Eclipse CDT** in this repository: https://github.com/littlevgl/proj_pc
-
-## Contributing
-See [CONTRIBUTING.md](https://github.com/littlevgl/lvgl/blob/master/docs/CONTRIBUTING.md)
-
-## Donate
-If you are pleased with the graphics library and found it useful please support its further development:
-
-[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=GJV3SC5EHDANS)
-

docs/TODO_MAJOR.md

@@ -1,12 +0,0 @@
-# TODOs for major versions
-Major versions released typically when API changes are required
-
-## Contributing
-Please create an issue to suggest a new feature instead of adding pull request to this file.
-
-## v5 
-- [ ] rename repository from *lvgl* to *littlevgl*
-- [ ] define renames: e.g. *USE_LV_BTN* to *LV_BTN_USE*
-- [ ] Remove LV_DOWNSCALE (LV_ANTIALIAS will be used instead)
-- [ ] *lv_ta_get_txt* rename to *lv_ta_get_text* 
-- [ ] btnm_action pass text instead of text_id

docs/TODO_MINOR.md

@@ -1,30 +0,0 @@
-# TODOs for minor versions
-Minor versions (x.1.0, x.2.0 ...) released when one or more new feature is addded without changing the API. New features can be added with major versions (1.0.0, 2.0.0 ...) too. 
-
-## Contributing
-Please create an issue to suggest a new feature instead of adding pull request to this file.
-
-## Ideas
-Here are ideas which are not assigned to a minor version yet:
-- label: add a horzintal line (e.g. underline or line through). 
-- label long mode: dot begin
-- music player app
-- files app update: show content as text
-- GUI remote control
-- automatically build GUI from file (e.g. XML, JSON or HTML)
-- lv_split: new object type, a hor. or ver. line for decoration purpose
-- lv_valset: new object type, a label with "+" and "-" buttons
-- lv_tabview: new object type to organise content with tabs
-- lv_btngrp: new object type to display more buttons to choose an option from them
-- lv_switch: new object type, turn on/off by tap (a little slider)
-- lv_roller: new object type, a roller to select a value (like on smartphones) 
-
-## v4.2
-- [x] Double VDB support: one for rendering, another to transfer former rendered image to frame buffer in the background (e.g. with DMA) [#15](https://github.com/littlevgl/lvgl/issues/15)
-- [x] lv_group: to control without touch pad. Issue [#14](https://github.com/littlevgl/lvgl/issues/14)
-- [x] lv_page: scrl def fit modification: hor:false, ver:true, and always set width to parent width
-- [x] lv_btn: add lv_btn_get_..._action
-- [x] lv_list: add lv_list_get_element_label/img
-- [x] lv_ta: lv_ta_set_one_line to configure the Text area to one lined input field
-- [x] style animations add
-- [x] lv_btnm:  besides 0. byte (width dsc) 1. byte: hidden (\177, 0x7F, delete)

docs/TODO_PATCH.md

@@ -1,13 +0,0 @@
-# TODOs for patch versions
-Patch versions (x.y.1, x.y.2) contain bugfixes without changing the API but they can apppear in minor (x.1.0, x.2.0) or major (1.0.0, 2.0.0) versions too.
-
-Bugfixes are done in `bugfix` branche.
-
-The bugfixes of the still not released version are in `beta` branche.
-
-## Contributing
-Please create an issue to introduce a bug instead of adding pull request to this file.
-
-## Next release
-- [x] lv_slider: don't let indicator or bar to disappear because of hpad/vpad
-- [x] lv_ta: memory leak if deleted in password mode

docs/astyle_c

@@ -0,0 +1 @@
+--style=kr --convert-tabs --indent=spaces=4 --indent-switches   --pad-oper --unpad-paren  --align-pointer=middle --suffix=.bak --lineend=linux --min-conditional-indent=

docs/astyle_h

@@ -0,0 +1 @@
+--convert-tabs --indent=spaces=4

img_conf_templ.h

@@ -1,41 +0,0 @@
-/**
- * @file img_conf.h
- *
- */
-
-#if 0 /*Remove this to enable the content (Delete the last #endif too!)*/
-
-#ifndef IMG_CONF_H
-#define IMG_CONF_H
-
-/*********************
- *      INCLUDES
- *********************/
-
-/*********************
- *      DEFINES
- *********************/
-
-/* Enable here the used images
- * For example:
- * #define USE_IMG_EXAMPLE       1
- *
- * This is compatible with the images
- * generated by the image converter utility
- * For more information see: www.littlev.hu */
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-
-#endif
-
-#endif /*Remove this to enable the content*/

lv_app/lv_app.h

@@ -1,270 +0,0 @@
-/**
- * @file lv_app.h
- *
- */
-
-#ifndef LV_APP_H
-#define LV_APP_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-
-#include "lvgl/lvgl.h"
-
-#if LV_APP_ENABLE != 0
-
-/*********************
- *      DEFINES
- *********************/
-/*Check dependencies*/
-#if LV_OBJ_FREE_P == 0
-#error "lv_app: Free pointer is required for application. Enable it lv_conf.h: LV_OBJ_FREE_P 1"
-#endif
-
-#if LV_OBJ_FREE_NUM == 0
-#error "lv_app: Free number is required for application. Enable it lv_conf.h: LV_OBJ_FREE_NUM 1"
-#endif
-
-#if DM_CUSTOM == 0 && DM_MEM_SIZE < (2 * 1024)
-#error "lv_app: not enough dynamic memory. Increase it in misc_conf.h: DM_MEM_SIZE"
-#endif
-
-/**********************
- *      TYPEDEFS
- **********************/
-typedef enum
-{
-	LV_APP_MODE_NONE 	 = 0x0000,
-	LV_APP_MODE_NOT_LIST = 0x0001,		/*Do not list the application*/
-	LV_APP_MODE_NO_SC_TITLE = 0x0002,	/*No short cut title*/
-}lv_app_mode_t;
-
-typedef enum
-{
-	LV_APP_COM_TYPE_CHAR,   /*Stream of characters. Not '\0' terminated*/
-	LV_APP_COM_TYPE_INT,    /*Stream of 'int32_t' numbers*/
-	LV_APP_COM_TYPE_LOG,    /*String about an event to log*/
-    LV_APP_COM_TYPE_TRIG,   /*A trigger to do some specific action (data is ignored)*/
-    LV_APP_COM_TYPE_INV,    /*Invalid type*/
-    LV_APP_COM_TYPE_NUM,    /*Indicates the number of com. types*/
-}lv_app_com_type_t;
-
-struct __LV_APP_DSC_T;
-
-typedef struct
-{
-	const struct __LV_APP_DSC_T * dsc;
-	char * name;
-	lv_obj_t * sc;
-	lv_obj_t * sc_title;
-	lv_obj_t * win;
-    lv_obj_t * conf_win;
-	void * app_data;
-	void * sc_data;
-	void * win_data;
-}lv_app_inst_t;
-
-typedef struct __LV_APP_DSC_T
-{
-	const char * name;
-	lv_app_mode_t mode;
-	void (*app_run)(lv_app_inst_t *, void *);
-	void (*app_close) (lv_app_inst_t *);
-	void (*com_rec) (lv_app_inst_t *, lv_app_inst_t *, lv_app_com_type_t, const void *, uint32_t);
-	void (*sc_open) (lv_app_inst_t *, lv_obj_t *);
-	void (*sc_close) (lv_app_inst_t *);
-	void (*win_open) (lv_app_inst_t *, lv_obj_t *);
-	void (*win_close) (lv_app_inst_t *);
-    void (*conf_open) (lv_app_inst_t *, lv_obj_t * );
-	uint16_t app_data_size;
-	uint16_t sc_data_size;
-	uint16_t win_data_size;
-}lv_app_dsc_t;
-
-typedef struct {
-	lv_style_t menu;
-    lv_style_t menu_btn_rel;
-    lv_style_t menu_btn_pr;
-    lv_style_t sc_rel;
-    lv_style_t sc_pr;
-    lv_style_t sc_send_rel;
-    lv_style_t sc_send_pr;
-    lv_style_t sc_rec_rel;
-    lv_style_t sc_rec_pr;
-    lv_style_t sc_title;
-    lv_style_t win_header;
-    lv_style_t win_scrl;
-    lv_style_t win_cbtn_rel;
-    lv_style_t win_cbtn_pr;
-}lv_app_style_t;
-
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-/**
- * Initialize the application system
- */
-void lv_app_init(void);
-
-/**
- * Get screen of the applications
- */
-lv_obj_t * lv_scr_app(void);
-
-/**
- * Allocate a new application descriptor
- * @return pointer to an lv_app_dsc_t pointer. Save here a pointer to an app. dsc.
- * E.g. *dsc = &my_app_dsc;
- */
-lv_app_dsc_t ** lv_app_add_dsc(void);
-
-/**
- * Run an application according to 'app_dsc'
- * @param app_dsc pointer to an application descriptor
- * @param conf pointer to an application specific configuration structure or NULL if unused
- * @return pointer to the opened application or NULL if any error occurred
- */
-lv_app_inst_t * lv_app_run(const lv_app_dsc_t * app_dsc, void * conf);
-
-/**
- * Close a running application. Close the Window and the Shortcut too if opened.
- * @param app pointer to an application
- */
-void lv_app_close(lv_app_inst_t * app);
-
-/**
- * Open a shortcut for an application
- * @param app pointer to an application
- * @return pointer to the shortcut
- */
-lv_obj_t * lv_app_sc_open(lv_app_inst_t * app);
-
-/**
- * Close the shortcut of an application
- * @param app pointer to an application
- */
-void lv_app_sc_close(lv_app_inst_t * app);
-
-/**
- * Open the application in a window
- * @param app pointer to an application
- * @return pointer to the shortcut
- */
-lv_obj_t * lv_app_win_open(lv_app_inst_t * app);
-
-/**
- * Close the window of an application
- * @param app pointer to an application
- */
-void lv_app_win_close(lv_app_inst_t * app);
-
-/**
- * Send data to other applications
- * @param app_send pointer to the application which is sending the message
- * @param type type of data from 'lv_app_com_type_t' enum
- * @param data pointer to the sent data
- * @param size length of 'data' in bytes
- * @return number application which were received the message
- */
-uint16_t lv_app_com_send(lv_app_inst_t * app_send, lv_app_com_type_t type , const void * data, uint32_t size);
-
-/**
- * Test an application communication connection
- * @param sender pointer to an application which sends data
- * @param receiver pointer to an application which receives data
- * @return false: no connection, true: there is connection
- */
-bool lv_app_con_check(lv_app_inst_t * sender, lv_app_inst_t * receiver);
-
-/**
- * Create a new connection between two applications
- * @param sender pointer to a data sender application
- * @param receiver pointer to a data receiver application
- */
-void lv_app_con_set(lv_app_inst_t * sender, lv_app_inst_t * receiver);
-
-/**
- * Delete a communication connection
- * @param sender pointer to a data sender application or NULL to be true for all sender
- * @param receiver pointer to a data receiver application  or NULL to be true for all receiver
- */
-void lv_app_con_del(lv_app_inst_t * sender, lv_app_inst_t * receiver);
-
-/**
- * Get the application descriptor from its name
- * @param name name of the app. dsc.
- * @return pointer to the app. dsc.
- */
-const lv_app_dsc_t * lv_app_dsc_get(const char * name);
-
-/**
- * Rename an application
- * @param app pointer to an application
- * @param name a string with the new name
- */
-void lv_app_rename(lv_app_inst_t * app, const char * name);
-
-/**
- * Get the window object from an object located on the window
- * @param obj pointer to an object on the window
- * @return pointer to the window of 'obj'
- */
-lv_obj_t * lv_app_win_get_from_obj(lv_obj_t * obj);
-
-/**
- * Read the list of the running applications. (Get he next element)
- * @param prev the previous application (at the first call give NULL to get the first application)
- * @param dsc pointer to an application descriptor to filer the applications (NULL to do not filter)
- * @return pointer to the next running application or NULL if no more
- */
-lv_app_inst_t * lv_app_get_next(lv_app_inst_t * prev, lv_app_dsc_t * dsc);
-
-/**
- * Read the list of applications descriptors. (Get he next element)
- * @param prev the previous application descriptors(at the first call give NULL to get the first)
- * @return pointer to the next application descriptors or NULL if no more
- */
-lv_app_dsc_t ** lv_app_dsc_get_next(lv_app_dsc_t ** prev);
-
-
-/**
- * Get a pointer to the application style structure. If modified then 'lv_app_refr_style' should be called
- * @return pointer to the application style structure
- */
-lv_app_style_t * lv_app_style_get(void);
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   POST-INCLUDES
- *********************/
-#include "lvgl/lv_app/lv_app_util/lv_app_kb.h"
-#include "lvgl/lv_app/lv_app_util/lv_app_fsel.h"
-#include "lvgl/lv_app/lv_app_util/lv_app_notice.h"
-
-#include "lvgl/lv_appx/lv_app_example.h"
-#include "lvgl/lv_appx/lv_app_phantom.h"
-#include "lvgl/lv_appx/lv_app_sysmon.h"
-#include "lvgl/lv_appx/lv_app_terminal.h"
-#include "lvgl/lv_appx/lv_app_files.h"
-#include "lvgl/lv_appx/lv_app_wifi.h"
-#include "lvgl/lv_appx/lv_app_gsm.h"
-#include "lvgl/lv_appx/lv_app_ethernet.h"
-#include "lvgl/lv_appx/lv_app_benchmark.h"
-
-#endif /*LV_APP_ENABLE*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /*LV_APP_H*/

lv_app/lv_app_util/lv_app_fsel.c

@@ -1,381 +0,0 @@
-/**
- * @file lv_app_fsel.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_app_fsel.h"
-#if USE_LV_APP_FSEL != 0
-
-#include <stdio.h>
-#include "lv_app_notice.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-static void fsel_refr(void);
-static lv_action_res_t fsel_close_action(lv_obj_t * close, lv_dispi_t * dispi);
-static lv_action_res_t fsel_up_action(lv_obj_t * up, lv_dispi_t * dispi);
-static lv_action_res_t fsel_next_action(lv_obj_t * next, lv_dispi_t * dispi);
-static lv_action_res_t fsel_prev_action(lv_obj_t * prev, lv_dispi_t * dispi);
-static lv_action_res_t fsel_drv_action(lv_obj_t * drv, lv_dispi_t * dispi);
-static lv_action_res_t fsel_drv_lpr_action(lv_obj_t * drv, lv_dispi_t * dispi);
-static lv_action_res_t fsel_folder_action(lv_obj_t * folder, lv_dispi_t * dispi);
-static lv_action_res_t fsel_folder_lpr_action(lv_obj_t * folder, lv_dispi_t * dispi);
-static lv_action_res_t fsel_file_action(lv_obj_t * file, lv_dispi_t * dispi);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-static const char * fsel_filter;
-static char fsel_path[LV_APP_FSEL_PATH_MAX_LEN];
-static uint16_t fsel_file_cnt;
-static lv_obj_t * fsel_win;
-static lv_obj_t * fsel_list;
-static void *  fsel_param;
-static void (*fsel_ok_action)(void *, const char *);
-static lv_style_t style_btn_symbol;
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Initialize the File selector utility
- */
-void lv_app_fsel_init(void)
-{
-    lv_style_get(LV_STYLE_BTN_REL, &style_btn_symbol);
-    style_btn_symbol.font = font_get(LV_IMG_DEF_SYMBOL_FONT);
-}
-
-/**
- * Open the File selector
- * @param path start path
- * @param filter show only files with a specific extension, e.g. "wav".
- *               "/" means filter to folders.
- * @param param a free parameter which will be added to 'ok_action'
- * @param ok_action an action to call when a file or folder is chosen
- */
-void lv_app_fsel_open(const char * path, const char * filter, void * param, void (*ok_action)(void *, const char *))
-{
-    /*Save the parameters*/
-    strcpy(fsel_path, path);
-    fsel_filter = filter;
-    fsel_file_cnt = 0;
-    fsel_param = param;
-    fsel_ok_action = ok_action;
-
-    /*Trim the extra '\' or '/' from the end of path*/
-    uint16_t i;
-    for(i = strlen(fsel_path) -1 ; fsel_path[i] == '/' || fsel_path[i] == '\\'; i--) {
-        fsel_path[i] = '\0';
-    }
-
-    /*Check filter: NULL and "" mean no filtering*/
-    if(fsel_filter == NULL) fsel_filter = "";
-
-    lv_app_style_t * app_style = lv_app_style_get();
-
-    /*Create a window for the File selector*/
-    fsel_win = lv_win_create(lv_scr_act(), NULL);
-    lv_obj_set_size(fsel_win, LV_HOR_RES, LV_VER_RES);
-    lv_win_set_styles_cbtn(fsel_win, &app_style->win_cbtn_rel, &app_style->win_cbtn_pr);
-    lv_obj_set_style(lv_win_get_header(fsel_win), &app_style->menu);
-
-    lv_win_add_cbtn(fsel_win, SYMBOL_CLOSE, fsel_close_action);
-
-    fsel_refr(); /*Refresh the list*/
-
-    /*Show instruction when first open with folder filter*/
-    static bool first_folder_call = false;
-    if(first_folder_call == false && fsel_filter[0] == '/') {
-        lv_app_notice_add("Press a folder long\nto choose it!");
-        first_folder_call = true;
-    }
-}
-
-/**
- * Close the File selector
- */
-void lv_app_fsel_close(void)
-{
-    if(fsel_win != NULL) {
-            lv_obj_del(fsel_win);
-    }
-
-    fsel_win = NULL;
-    fsel_list = NULL;
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-/**
- * Refresh the file list according to the current path and filter
- */
-static void fsel_refr(void)
-{
-    /*Delete the previous list*/
-    if(fsel_list != NULL) {
-        lv_obj_del(fsel_list);
-    }
-
-    lv_win_set_title(fsel_win, fsel_path);
-
-    /*Create a new list*/
-    fsel_list = lv_list_create(fsel_win, NULL);
-    lv_obj_set_width(fsel_list, lv_win_get_width(fsel_win));
-    lv_list_set_style_img(fsel_list, &style_btn_symbol);
-    lv_obj_set_style(lv_page_get_scrl(fsel_list), lv_style_get(LV_STYLE_TRANSP_TIGHT, NULL));
-    lv_obj_set_drag_parent(fsel_list, true);
-    lv_obj_set_drag_parent(lv_page_get_scrl(fsel_list), true);
-    lv_cont_set_fit(fsel_list, false, true);
-
-    fs_res_t res = FS_RES_OK;
-    lv_obj_t * liste;
-
-    /*At empty path show the drivers */
-    if(fsel_path[0] == '\0') {
-        char drv[16];
-        char buf[2];
-        fs_get_letters(drv);
-        uint8_t i;
-        for(i = 0; drv[i] != '\0'; i++) {
-            buf[0] = drv[i];
-            buf[1] = '\0';
-            liste = lv_list_add(fsel_list, SYMBOL_DRIVE, buf, fsel_drv_action);
-            /*Add long press action to choose the driver as a folder*/
-            if(fsel_filter[0] == '/') lv_btn_set_lpr_action(liste, fsel_drv_lpr_action);
-        }
-    }
-    /*List the files/folders with fs interface*/
-    else {
-        liste = lv_list_add(fsel_list, SYMBOL_UP, "Up", fsel_up_action);
-
-        fs_readdir_t rd;
-        res = fs_readdir_init(&rd, fsel_path);
-        if(res != FS_RES_OK) {
-            lv_app_notice_add("Can not read the path\nin File selector");
-            return;
-        }
-
-        /*At not first page add prev. page button */
-        if(fsel_file_cnt != 0) {
-            liste = lv_list_add(fsel_list, SYMBOL_LEFT, "Previous page", fsel_prev_action);
-        }
-
-        char fn[LV_APP_FSEL_FN_MAX_LEN];
-
-        /*Read the files from the previous pages*/
-        uint16_t file_cnt = 0;
-        while(file_cnt <= fsel_file_cnt) {
-            res = fs_readdir(&rd, fn);
-            if(res != FS_RES_OK){
-                lv_app_notice_add("Can not read the path\nin File selector");
-                return;
-            }
-            file_cnt ++;
-        }
-
-        /*Add list elements from the files and folders*/
-        while(res == FS_RES_OK && fn[0] != '\0') {
-            if(fn[0] == '/') { /*Add a folder*/
-                lv_obj_t * liste;
-                liste = lv_list_add(fsel_list, SYMBOL_FOLDER, &fn[1], fsel_folder_action);
-                /*Add long press action to choose a folder*/
-                if(fsel_filter[0] == '/') lv_btn_set_lpr_action(liste, fsel_folder_lpr_action);
-
-                fsel_file_cnt ++;
-                file_cnt ++;
-            }
-            /*Add a file if it is not filtered*/
-            else if(fsel_filter[0] == '\0' || /*No filtering or ...*/
-                    (strcmp(fs_get_ext(fn), fsel_filter) == 0 && /*.. the filter matches*/
-                     fsel_filter[0] != '/')) {
-                liste = lv_list_add(fsel_list, SYMBOL_FILE, fn, fsel_file_action);
-                fsel_file_cnt ++;
-                file_cnt ++;
-            }
-
-            /*Get the next element*/
-            res = fs_readdir(&rd, fn);
-
-            /*Show only LV_APP_FSEL_MAX_FILE elements and add a Next page button*/
-            if(fsel_file_cnt != 0 && fsel_file_cnt % LV_APP_FSEL_PAGE_SIZE == 0) {
-                liste = lv_list_add(fsel_list, SYMBOL_RIGHT, "Next page", fsel_next_action);
-                break;
-            }
-        }
-
-        /*Close the read directory*/
-        fs_readdir_close(&rd);
-    }
-
-    if(res != FS_RES_OK) {
-        lv_app_notice_add("Can not read the path\nin File selector");
-    }
-
-    /*Focus to the top of the list*/
-    lv_obj_set_y(lv_page_get_scrl(fsel_list), 0);
-}
-
-/**
- * Called when the File selector window close button is released
- * @param close pointer to the close button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the window is deleted in the function
- */
-static lv_action_res_t fsel_close_action(lv_obj_t * close, lv_dispi_t * dispi)
-{
-    lv_app_fsel_close();
-    return LV_ACTION_RES_INV;
-}
-
-/**
- * Called when the Up list element is released to step one level
- * @param up pointer to the Up button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the list is deleted in the function
- */
-static lv_action_res_t fsel_up_action(lv_obj_t * up, lv_dispi_t * dispi)
-{
-    fs_up(fsel_path);
-    fsel_file_cnt = 0;
-    fsel_refr();
-    return LV_ACTION_RES_INV;
-}
-
-/**
- * Called when the Next list element is released to go to the next page
- * @param next pointer to the Next button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the list is deleted in the function
- */
-static lv_action_res_t fsel_next_action(lv_obj_t * next, lv_dispi_t * dispi)
-{
-    fsel_refr();
-    return LV_ACTION_RES_INV;
-}
-
-/**
- * Called when the Prev list element is released to previous page
- * @param prev pointer to the Prev button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the list is deleted in the function
- */
-static lv_action_res_t fsel_prev_action(lv_obj_t * prev, lv_dispi_t * dispi)
-{
-    if(fsel_file_cnt <= 2 * LV_APP_FSEL_PAGE_SIZE) fsel_file_cnt = 0;
-    else if(fsel_file_cnt % LV_APP_FSEL_PAGE_SIZE == 0) {
-        fsel_file_cnt -= 2 * LV_APP_FSEL_PAGE_SIZE;
-    } else {
-        fsel_file_cnt = ((fsel_file_cnt / LV_APP_FSEL_PAGE_SIZE) - 1) * LV_APP_FSEL_PAGE_SIZE;
-    }
-
-    fsel_refr();
-    return LV_ACTION_RES_INV;
-}
-
-
-/**
- * Called when the Driver list element is released to step into a driver
- * @param drv pointer to the Driver button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the list is deleted in the function
- */
-static lv_action_res_t fsel_drv_action(lv_obj_t * drv, lv_dispi_t * dispi)
-{
-    sprintf(fsel_path, "%s:", lv_list_get_element_text(drv));
-    fsel_file_cnt = 0;
-    fsel_refr();
-    return LV_ACTION_RES_INV;
-}
-
-/**
- * Called when the Driver list element is long pressed to choose it
- * @param drv pointer to the Driver button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the list is deleted in the function
- */
-static lv_action_res_t fsel_drv_lpr_action(lv_obj_t * drv, lv_dispi_t * dispi)
-{
-    sprintf(fsel_path, "%s:", lv_list_get_element_text(drv));
-
-    if(fsel_ok_action != NULL) {
-        fsel_ok_action(fsel_param, fsel_path);
-    }
-
-    lv_app_fsel_close();
-
-    return LV_ACTION_RES_INV;
-}
-
-/**
- * Called when a folder list element is released to enter into it
- * @param folder pointer to a folder button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the list is deleted in the function
- */
-static lv_action_res_t fsel_folder_action(lv_obj_t * folder, lv_dispi_t * dispi)
-{
-    sprintf(fsel_path, "%s/%s", fsel_path, lv_list_get_element_text(folder));
-    fsel_file_cnt = 0;
-    fsel_refr();
-    return LV_ACTION_RES_INV;
-}
-
-/**
- * Called when a folder list element is long pressed to choose it
- * @param folder pointer to a folder button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the list is deleted in the function
- */
-static lv_action_res_t fsel_folder_lpr_action(lv_obj_t * folder, lv_dispi_t * dispi)
-{
-    sprintf(fsel_path, "%s/%s", fsel_path, lv_list_get_element_text(folder));
-
-    if(fsel_ok_action != NULL) {
-        fsel_ok_action(fsel_param, fsel_path);
-    }
-
-    lv_app_fsel_close();
-
-    return LV_ACTION_RES_INV;
-}
-
-/**
- * Called when a file list element is released to choose it
- * @param file pointer to a file button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the list is deleted in the function
- */
-static lv_action_res_t fsel_file_action(lv_obj_t * file, lv_dispi_t * dispi)
-{
-    sprintf(fsel_path, "%s/%s", fsel_path, lv_list_get_element_text(file));
-
-    if(fsel_ok_action != NULL) {
-        fsel_ok_action(fsel_param, fsel_path);
-    }
-
-    lv_app_fsel_close();
-
-    return LV_ACTION_RES_INV;
-}
-
-#endif /*LV_APP_ENABLE != 0*/

lv_app/lv_app_util/lv_app_fsel.h

@@ -1,75 +0,0 @@
-/**
- * @file lv_app_fsel.h
- *
- */
-
-#ifndef LV_APP_FSEL_H
-#define LV_APP_FSEL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "../lv_app.h"
-#if USE_LV_APP_FSEL != 0
-
-/*********************
- *      DEFINES
- *********************/
-/*Add the required configurations*/
-#ifndef LV_APP_FSEL_FN_MAX_LEN
-#define LV_APP_FSEL_FN_MAX_LEN    128
-#endif
-
-#ifndef LV_APP_FSEL_PATH_MAX_LEN
-#define LV_APP_FSEL_PATH_MAX_LEN  256
-#endif
-
-#ifndef LV_APP_FSEL_PAGE_SIZE
-#define LV_APP_FSEL_PAGE_SIZE     8
-#endif
-
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-/**
- * Initialize the File selector utility
- */
-void lv_app_fsel_init(void);
-
-/**
- * Open the File selector
- * @param path start path
- * @param filter show only files with a specific extension, e.g. "wav".
- *               "/" means filter to folders.
- * @param param a free parameter which will be added to 'ok_action'
- * @param ok_action an action to call when a file or folder is chosen (give 'param' and the path as parameters)
- */
-void lv_app_fsel_open(const char * path, const char * filter, void * param,
-                       void (*ok_action)(void *, const char *));
-
-/**
- * Close the File selector
- */
-void lv_app_fsel_close(void);
-
-/**********************
- *      MACROS
- **********************/
-
-#endif /*LV_APP_ENABLE*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /*LV_APP_FSEL_H*/

lv_app/lv_app_util/lv_app_kb.c

@@ -1,278 +0,0 @@
-/**
- * @file lv_app_kb.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_app_kb.h"
-#if USE_LV_APP_KB != 0
-
-#include "lvgl/lv_objx/lv_btnm.h"
-#include "lvgl/lv_objx/lv_ta.h"
-
-/*********************
- *      DEFINES
- *********************/
-#ifndef LV_APP_KB_ANIM_TIME
-#define LV_APP_KB_ANIM_TIME     300     /*ms*/
-#endif
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-static lv_action_res_t lv_app_kb_action(lv_obj_t * btnm, uint16_t i);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-static lv_obj_t * kb_btnm;
-static lv_obj_t * kb_win;
-static lv_obj_t * kb_ta;
-static const char * kb_map_lc[] = {
-"\0051#", "\004q", "\004w", "\004e", "\004r", "\004t", "\004y", "\004u", "\004i", "\004o", "\004p", "\007Del", "\n",
-"\006ABC", "\003a", "\003s", "\003d", "\003f", "\003g", "\003h", "\003j", "\003k", "\003l", "\010Enter", "\n",
-"_", "-", "z", "x", "c", "v", "b", "n", "m", ".", ",", ":", "\n",
-"\003Hide", "\003Left", "\006 ", "\003Right", "\003Ok", ""
-};
-
-static const char * kb_map_uc[] = {
-"\0051#", "\004Q", "\004W", "\004E", "\004R", "\004T", "\004Y", "\004U", "\004I", "\004O", "\004P", "\007Del", "\n",
-"\006abc", "\003A", "\003S", "\003D", "\003F", "\003G", "\003H", "\003J", "\003K", "\003L", "\010Enter", "\n",
-"_", "-", "Z", "X", "C", "V", "B", "N", "M", ".", ",", ":", "\n",
-"\003Hide", "\003Left", "\006 ", "\003Right", "\003Ok", ""
-};
-
-static const char * kb_map_spec[] = {
-"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "\002Del", "\n",
-"\002abc", "+", "-", "/", "*", "=", "%", "!", "?", "#", "<", ">", "\n",
-"\\", "@", "$", "(", ")", "{", "}", "[", "]", ";", "\"", "'", "\n",
-"\003Hide", "\003Left", "\006 ", "\003Right", "\003Ok", ""
-};
-
-static const char * kb_map_num[] = {
-"1", "2", "3", "\002Hide","\n",
-"4", "5", "6", "\002Ok", "\n",
-"7", "8", "9", "\002Del", "\n",
-"+/-", "0", ".", "Left", "Right", ""
-};
-
-static cord_t kb_ta_ori_size;
-static uint8_t kb_mode;
-static void (*kb_close_action)(lv_obj_t *);
-static void (*kb_ok_action)(lv_obj_t *);
-static lv_style_t style_bg;
-static lv_style_t style_btn_rel;
-static lv_style_t style_btn_pr;
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Initialize the application keyboard
- */
-void lv_app_kb_init(void)
-{
-    lv_app_style_t * app_style = lv_app_style_get();
-
-    memcpy(&style_bg, &app_style->menu, sizeof(lv_style_t));
-    style_bg.opa = OPA_COVER;
-    style_bg.hpad = 0;
-    style_bg.vpad = 0;
-    style_bg.opad = 0;
-
-    memcpy(&style_btn_rel, &app_style->menu_btn_rel, sizeof(lv_style_t));
-    style_btn_rel.radius = 0;
-    style_btn_rel.bwidth = 1;
-
-    memcpy(&style_btn_pr, &app_style->menu_btn_pr, sizeof(lv_style_t));
-    style_btn_pr.radius = 0;
-    style_btn_pr.bwidth = 1;
-}
-
-/**
- * Open a keyboard for a text area object
- * @param ta pointer to a text area object
- * @param mode 'OR'd values of 'lv_app_kb_mode_t' enum
- * @param close a function to call when the keyboard is closed
- * @param ok a function to called when the "Ok" button is pressed
- * @return the created button matrix objects
- */
-lv_obj_t * lv_app_kb_open(lv_obj_t * ta, lv_app_kb_mode_t mode, void (*close)(lv_obj_t *), void (*ok)(lv_obj_t *))
-{
-	/*Close the previous keyboard*/
-    if(kb_btnm != NULL) {
-        lv_app_kb_close(false);
-    }
-
-    /*Save some parameters*/
-    kb_ta = ta;
-    kb_mode = mode;
-    kb_close_action = close;
-    kb_ok_action = ok;
-
-    /*Create a button matrix for the keyboard  */
-    kb_btnm = lv_btnm_create(lv_scr_act(), NULL);
-    lv_obj_set_style(kb_btnm, &style_bg);
-    lv_obj_set_size(kb_btnm, LV_HOR_RES, LV_VER_RES / 2);
-    lv_obj_align(kb_btnm, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
-    lv_btnm_set_action(kb_btnm, lv_app_kb_action);
-    if(mode & LV_APP_KB_MODE_TXT) {
-        style_btn_rel.font = font_get(LV_APP_FONT_MEDIUM);
-        style_btn_pr.font = font_get(LV_APP_FONT_MEDIUM);
-    	lv_btnm_set_map(kb_btnm, kb_map_lc);
-    }
-    else if(mode & LV_APP_KB_MODE_NUM) {
-        style_btn_rel.font = font_get(LV_APP_FONT_LARGE);
-        style_btn_pr.font = font_get(LV_APP_FONT_LARGE);
-    	lv_btnm_set_map(kb_btnm, kb_map_num);
-    }
-    lv_btnm_set_styles_btn(kb_btnm, &style_btn_rel, &style_btn_pr);
-
-    kb_win = NULL;
-    kb_ta_ori_size = 0;
-    if(mode & LV_APP_KB_MODE_WIN_RESIZE) {
-        /*Reduce the size of the window and align it to the top*/
-        kb_win = lv_app_win_get_from_obj(kb_ta);
-        lv_obj_set_height(kb_win, LV_VER_RES / 2);
-        lv_obj_set_y(kb_win, 0);
-
-        /*If the text area is higher then the new size of the window reduce its size too*/
-        cord_t cont_h = lv_obj_get_height(kb_win) - lv_obj_get_height(lv_win_get_header(kb_win));
-        kb_ta_ori_size = lv_obj_get_height(kb_ta);
-        if(lv_obj_get_height(kb_ta)  > cont_h - LV_DPI / 10) {
-            lv_obj_set_height(kb_ta, cont_h - LV_DPI / 10);
-        }
-        lv_page_focus(lv_win_get_page(kb_win), kb_ta, 0);
-    }
-
-    lv_ta_set_cursor_pos(kb_ta, LV_TA_CUR_LAST);
-    if(kb_mode & LV_APP_KB_MODE_CUR_MANAGE) {
-        lv_ta_set_cursor_show(kb_ta, true);
-    }
-
-    if(kb_mode & LV_APP_KB_MODE_ANIM_IN) {
-        lv_obj_anim(kb_btnm, LV_ANIM_FLOAT_BOTTOM | ANIM_IN, LV_APP_KB_ANIM_TIME, 0, NULL);
-    }
-
-
-    return kb_btnm;
-
-}
-
-/**
- * Close the keyboard
- * @param ok true: call the ok function, false: call the close function
- */
-void lv_app_kb_close(bool ok)
-{
-	if(kb_btnm == NULL) return;
-
-	if(ok == false) {
-		if(kb_close_action != NULL) kb_close_action(kb_ta);
-	} else {
-		if(kb_ok_action != NULL) kb_ok_action(kb_ta);
-	}
-
-	/*Reset the modified sizes*/
-	if((kb_mode & LV_APP_KB_MODE_WIN_RESIZE) && kb_win != NULL) {
-        lv_obj_set_height(kb_ta, kb_ta_ori_size);
-        lv_obj_set_size(kb_win, LV_HOR_RES, LV_VER_RES);
-        kb_win = NULL;
-	}
-    
-    if(kb_mode & LV_APP_KB_MODE_CUR_MANAGE) {
-        lv_ta_set_cursor_show(kb_ta, false);
-    }
-
-    if(kb_mode & LV_APP_KB_MODE_ANIM_OUT) {
-        lv_obj_anim(kb_btnm, LV_ANIM_FLOAT_BOTTOM | ANIM_OUT, LV_APP_KB_ANIM_TIME, 0, lv_obj_del);
-    } else {
-        lv_obj_del(kb_btnm);
-    }
-
-    kb_btnm = NULL;
-    kb_ta = NULL;
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-/**
- * Called when a button of 'kb_btnm' is released
- * @param btnm pointer to 'kb_btnm'
- * @param i the index of the released button from the current btnm map
- * @return LV_ACTION_RES_INV if the btnm is deleted else LV_ACTION_RES_OK
- */
-static lv_action_res_t lv_app_kb_action(lv_obj_t * btnm, uint16_t i)
-{
-    const char ** map = lv_btnm_get_map(btnm);
-    const char * txt = map[i];
-
-    /*Ignore the unit size number of the text*/
-    if(txt[0] <= '\011') txt++;
-
-    /*Do the corresponding action according to the text of the button*/
-    if(strcmp(txt, "abc") == 0) {
-        lv_btnm_set_map(btnm, kb_map_lc);
-    } else if(strcmp(txt, "ABC") == 0) {
-        lv_btnm_set_map(btnm, kb_map_uc);
-    } else if(strcmp(txt, "1#") == 0) {
-        lv_btnm_set_map(btnm, kb_map_spec);
-    }  else if(strcmp(txt, "Enter") == 0) {
-        lv_ta_add_char(kb_ta, '\n');
-    } else if(strcmp(txt, "Left") == 0) {
-        lv_ta_cursor_left(kb_ta);
-    } else if(strcmp(txt, "Right") == 0) {
-        lv_ta_cursor_right(kb_ta);
-    } else if(strcmp(txt, "Del") == 0) {
-        lv_ta_del(kb_ta);
-    } else if(strcmp(txt, "+/-") == 0) {
-        uint16_t cur = lv_ta_get_cursor_pos(kb_ta);
-        const char * ta_txt = lv_ta_get_txt(kb_ta);
-        if(ta_txt[0] == '-') {
-            lv_ta_set_cursor_pos(kb_ta, 1);
-            lv_ta_del(kb_ta);
-            lv_ta_add_char(kb_ta, '+');
-            lv_ta_set_cursor_pos(kb_ta, cur);
-        } else if(ta_txt[0] == '+') {
-            lv_ta_set_cursor_pos(kb_ta, 1);
-            lv_ta_del(kb_ta);
-            lv_ta_add_char(kb_ta, '-');
-            lv_ta_set_cursor_pos(kb_ta, cur);
-        } else {
-            lv_ta_set_cursor_pos(kb_ta, 0);
-            lv_ta_add_char(kb_ta, '-');
-            lv_ta_set_cursor_pos(kb_ta, cur + 1);
-        }
-    } else if(strcmp(txt, "Hide") == 0) {
-        lv_app_kb_close(false);
-        return LV_ACTION_RES_INV;
-    } else if(strcmp(txt, "Ok") == 0) {
-        lv_app_kb_close(true);
-        return LV_ACTION_RES_INV;
-    } else {
-        lv_ta_add_text(kb_ta, txt);
-    }
-
-    if(kb_mode & LV_APP_KB_MODE_WIN_RESIZE) {
-#if LV_APP_ANIM_LEVEL != 0
-        lv_page_focus(lv_win_get_content(kb_win), kb_ta, true);
-#else
-        lv_page_focus(lv_win_get_page(kb_win), kb_ta, 0);
-#endif
-    }
-    return LV_ACTION_RES_OK;
-}
-
-#endif /*LV_APP_ENABLE != 0*/

lv_app/lv_app_util/lv_app_kb.h

@@ -1,71 +0,0 @@
-/**
- * @file lv_app_kb.h
- *
- */
-
-#ifndef LV_APP_KB_H
-#define LV_APP_KB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "../lv_app.h"
-#if USE_LV_APP_KB != 0
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-typedef enum
-{
-	LV_APP_KB_MODE_TXT =            0x0001,
-	LV_APP_KB_MODE_NUM =            0x0002,
-    LV_APP_KB_MODE_WIN_RESIZE =     0x0004,
-    LV_APP_KB_MODE_CUR_MANAGE =     0x0008,
-    LV_APP_KB_MODE_ANIM_IN =        0x0010,
-    LV_APP_KB_MODE_ANIM_OUT =       0x0020,
-}lv_app_kb_mode_t;
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-/**
- * Initialize the application keyboard
- */
-void lv_app_kb_init(void);
-
-/**
- * Open a keyboard for a text area object
- * @param ta pointer to a text area object
- * @param mode 'OR'd values of 'lv_app_kb_mode_t' enum
- * @param close a function to call when the keyboard is closed
- * @param ok a function to called when the "Ok" button is pressed
- * @return the created button matrix objects
- */
-lv_obj_t * lv_app_kb_open(lv_obj_t * ta, lv_app_kb_mode_t mode, void (*close)(lv_obj_t *), void (*ok)(lv_obj_t *));
-
-/**
- * Close the keyboard
- * @param ok true: call the ok function, false: call the close function
- */
-void lv_app_kb_close(bool ok);
-
-/**********************
- *      MACROS
- **********************/
-
-#endif /*LV_APP_ENABLE*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /*LV_APP_KB_H*/

lv_app/lv_app_util/lv_app_notice.c

@@ -1,95 +0,0 @@
-/**
- * @file lv_app_notice.c
- * 
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_app_notice.h"
-#if USE_LV_APP_NOTICE != 0
-
-#include <lvgl/lv_objx/lv_cont.h>
-#include "lvgl/lv_objx/lv_label.h"
-
-#include "misc/gfx/anim.h"
-#include <stdio.h>
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-static lv_obj_t * notice_h;
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-/**
- * Initialize the Notifications
- */
-void lv_app_notice_init(void)
-{
-    notice_h = lv_cont_create(lv_scr_act(), NULL);
-    lv_obj_set_size(notice_h, LV_HOR_RES, LV_VER_RES - LV_DPI / 8);
-    lv_obj_set_y(notice_h, LV_DPI / 8);
-    lv_obj_set_click(notice_h, false);
-    lv_obj_set_style(notice_h, lv_style_get(LV_STYLE_TRANSP, NULL));
-    lv_cont_set_layout(notice_h, LV_CONT_LAYOUT_COL_R);
-}
-
-/**
- * Add a notification with a given text
- * @param format pritntf-like format string
- * @return pointer the notice which is a message box (lv_mbox) object
- */
-lv_obj_t *  lv_app_notice_add(const char * format, ...)
-{
-    char txt[LV_APP_NOTICE_MAX_LEN];
-
-    va_list va;
-    va_start(va, format);
-    vsprintf(txt,format, va);
-    va_end(va);
-
-    lv_obj_t * mbox;
-    mbox = lv_mbox_create(notice_h, NULL);
-    lv_mbox_set_text(mbox, txt);
-    lv_mbox_set_anim_close_time(mbox, LV_APP_NOTICE_CLOSE_ANIM_TIME);
-
-#if LV_APP_NOTICE_SHOW_TIME != 0
-    lv_mbox_start_auto_close(mbox, LV_APP_NOTICE_SHOW_TIME);
-#endif
-
-    /*Delete the last children if there are too many*/
-    uint32_t child_num = lv_obj_get_child_num(notice_h);
-    if(child_num > LV_APP_NOTICE_MAX_NUM) {
-        lv_obj_t * last_child = ll_get_tail(&notice_h->child_ll);
-        lv_obj_del(last_child);
-    }
-
-    /*make sure the notices are on the top*/
-    lv_obj_set_parent(notice_h, lv_scr_act());
-
-    return mbox;
-
-}
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-#endif

lv_app/lv_app_util/lv_app_notice.h

@@ -1,72 +0,0 @@
-/**
- * @file lv_app_notice.h
- * 
- */
-
-#ifndef LV_APP_NOTICE_H
-#define LV_APP_NOTICE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "../lv_app.h"
-#include <stdarg.h>
-#if USE_LV_APP_NOTICE != 0
-
-/*********************
- *      DEFINES
- *********************/
-/*Add the required configurations*/
-#ifndef LV_APP_NOTICE_SHOW_TIME
-#define LV_APP_NOTICE_SHOW_TIME   4000
-#endif
-
-#ifndef LV_APP_NOTICE_CLOSE_ANIM_TIME
-#define LV_APP_NOTICE_CLOSE_ANIM_TIME   300
-#endif
-
-#ifndef LV_APP_NOTICE_MAX_NUM
-#define LV_APP_NOTICE_MAX_NUM   6
-#endif
-
-#ifndef LV_APP_NOTICE_MAX_LEN
-#define LV_APP_NOTICE_MAX_LEN   256
-#endif
-
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-
-/**
- * Initialize the Notifications
- */
-void lv_app_notice_init(void);
-
-/**
- * Add a notification with a given text
- * @param format pritntf-like format string
- * @return pointer the notice which is a message box (lv_mbox) object
- */
-lv_obj_t *  lv_app_notice_add(const char * format, ...);
-
-/**********************
- *      MACROS
- **********************/
-
-#endif  /*LV_APP_ENABLE*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /*LV_APP_NOTICE_H*/
-

lv_appx/lv_app_benchmark.c

@@ -1,698 +0,0 @@
-/**
- * @file lv_app_benchmark.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_app_benchmark.h"
-#if LV_APP_ENABLE != 0 && USE_LV_APP_BENCHMARK != 0
-
-#include "../lv_app/lv_app_util/lv_app_kb.h"
-#include "lvgl/lv_obj/lv_refr.h"
-#include <stdio.h>
-
-/*********************
- *      DEFINES
- *********************/
-#define SHADOW_WIDTH    (LV_DPI / 8)
-#define IMG_RECOLOR     OPA_30
-#define OPACITY         OPA_60
-
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/*Application specific data for an instance of this application*/
-typedef struct
-{
-    uint8_t wp          :1;
-    uint8_t recolor     :1;
-    uint8_t upscalse    :1;
-    uint8_t shdw      :1;
-    uint8_t opa         :1;
-}my_app_data_t;
-
-/*Application specific data a window of this application*/
-typedef struct
-{
-    lv_obj_t * wp;
-    lv_obj_t * value_l;
-    lv_style_t style_wp;
-    lv_style_t style_value_l;
-    lv_style_t style_btn_rel;
-    lv_style_t style_btn_pr;
-    lv_style_t style_btn_trel;
-    lv_style_t style_btn_tpr;
-    lv_style_t style_btn_ina;
-}my_win_data_t;
-
-/*Application specific data for a shortcut of this application*/
-typedef struct
-{
-    lv_obj_t * label;
-}my_sc_data_t;
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-static void my_app_run(lv_app_inst_t * app, void * conf);
-static void my_app_close(lv_app_inst_t * app);
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec, lv_app_com_type_t type , const void * data, uint32_t size);
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc);
-static void my_sc_close(lv_app_inst_t * app);
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win);
-static void my_win_close(lv_app_inst_t * app);
-
-static void refr_monitor(uint32_t time_ms, uint32_t px_num);
-static lv_action_res_t run_rel_action(lv_obj_t * btn, lv_dispi_t * dispi);
-static lv_action_res_t wp_rel_action(lv_obj_t * btn, lv_dispi_t * dispi);
-static lv_action_res_t recolor_rel_action(lv_obj_t * btn, lv_dispi_t * dispi);
-static lv_action_res_t upscale_rel_action(lv_obj_t * btn, lv_dispi_t * dispi);
-static lv_action_res_t shadow_rel_action(lv_obj_t * btn, lv_dispi_t * dispi);
-static lv_action_res_t opa_rel_action(lv_obj_t * btn, lv_dispi_t * dispi);
-/**********************
- *  STATIC VARIABLES
- **********************/
-static lv_app_dsc_t my_app_dsc =
-{
-	.name = "Benchmark",
-	.mode = LV_APP_MODE_NONE,
-	.app_run = my_app_run,
-	.app_close = my_app_close,
-	.com_rec = my_com_rec,
-	.win_open = my_win_open,
-	.win_close = my_win_close,
-	.sc_open = my_sc_open,
-	.sc_close = my_sc_close,
-	.app_data_size = sizeof(my_app_data_t),
-	.sc_data_size = sizeof(my_sc_data_t),
-	.win_data_size = sizeof(my_win_data_t),
-};
-
-static lv_style_t style_win_scrl;
-static lv_style_t style_sc_btn_rel;
-static lv_style_t style_sc_btn_pr;
-
-static bool caputre_next;
-
-static const color_int_t img_benchmark_bg[];
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Initialize the application
- * @return pointer to the application descriptor of this application
- */
-const lv_app_dsc_t * lv_app_benchmark_init(void)
-{
-    lv_refr_set_monitor_cb(refr_monitor);
-
-    lv_img_create_file("app_bm_wp", img_benchmark_bg);
-
-    lv_style_get(LV_STYLE_TRANSP, &style_win_scrl);
-    style_win_scrl.opad = 2 * SHADOW_WIDTH + SHADOW_WIDTH / 8 ;
-    style_win_scrl.hpad = SHADOW_WIDTH;
-    style_win_scrl.vpad = SHADOW_WIDTH;
-
-    lv_style_get(LV_STYLE_BTN_REL, &style_sc_btn_rel);
-    style_sc_btn_rel.font = font_get(LV_IMG_DEF_SYMBOL_FONT);
-
-
-    lv_style_get(LV_STYLE_BTN_PR, &style_sc_btn_pr);
-    style_sc_btn_pr.font = font_get(LV_IMG_DEF_SYMBOL_FONT);
-
-	return &my_app_dsc;
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-/**
- * Run an application according to 'app_dsc'
- * @param app_dsc pointer to an application descriptor
- * @param conf pointer to a lv_app_benchmark_conf_t structure with configuration data or NULL if unused
- * @return pointer to the opened application or NULL if any error occurred
- */
-static void my_app_run(lv_app_inst_t * app, void * conf)
-{
-    /*Initialize the application*/
-	my_app_data_t * ad = app->app_data;
-	ad->opa = 0;
-	ad->recolor = 0;
-	ad->shdw = 0;
-	ad->upscalse = 0;
-	ad->wp = 0;
-
-
-}
-
-/**
- * Close a running application.
- * Close the Window and the Shortcut too if opened.
- * Free all the allocated memory by this application.
- * @param app pointer to an application
- */
-static void my_app_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_app_data'*/
-}
-
-/**
- * Read the data have been sent to this application
- * @param app_send pointer to an application which sent the message
- * @param app_rec pointer to an application which is receiving the message
- * @param type type of data from 'lv_app_com_type_t' enum
- * @param data pointer to the sent data
- * @param size length of 'data' in bytes
- */
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec,
-                       lv_app_com_type_t type , const void * data, uint32_t size)
-{
-	if(type == LV_APP_COM_TYPE_CHAR) {      /*data: string*/
-	    my_sc_data_t * sc_data = app_rec->sc_data;
-	    if (sc_data->label != NULL) {
-	        lv_label_set_text_array(sc_data->label, data, size);
-	        lv_obj_align(sc_data->label , NULL,LV_ALIGN_CENTER, 0, 0);
-	    }
-	}
-}
-
-/**
- * Open a shortcut for an application
- * @param app pointer to an application
- * @param sc pointer to an object where the application
- *           can create content of the shortcut
- */
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc)
-{
-    my_sc_data_t * sc_data = app->sc_data;
-
-    lv_cont_set_layout(sc, LV_CONT_LAYOUT_CENTER);
-
-    sc_data->label = lv_label_create(sc, NULL);
-	lv_label_set_text(sc_data->label, "N/A ms");
-
-	lv_obj_t * btn = lv_btn_create(sc, NULL);
-	lv_btn_set_rel_action(btn, run_rel_action);
-	lv_cont_set_fit(btn, true, true);
-	lv_btn_set_styles(btn, &style_sc_btn_rel, &style_sc_btn_pr, NULL, NULL, NULL);
-
-	lv_obj_t * btn_l = lv_label_create(btn, NULL);
-	lv_label_set_text(btn_l, SYMBOL_PLAY);
-}
-
-/**
- * Close the shortcut of an application
- * @param app pointer to an application
- */
-static void my_sc_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_sc_data'*/
-}
-
-
-/**
- * Open the application in a window
- * @param app pointer to an application
- * @param win pointer to a window object where
- *            the application can create content
- */
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
-{
-    my_win_data_t * wdata = app->win_data;
-    my_app_data_t * adata = app->app_data;
-
-    lv_style_get(LV_STYLE_BTN_INA, &wdata->style_value_l);
-    wdata->style_value_l.ccolor = COLOR_BLACK;
-    lv_style_get(LV_STYLE_BTN_REL, &wdata->style_btn_rel);
-    lv_style_get(LV_STYLE_BTN_PR, &wdata->style_btn_pr);
-    lv_style_get(LV_STYLE_BTN_TREL, &wdata->style_btn_trel);
-    lv_style_get(LV_STYLE_BTN_TPR, &wdata->style_btn_tpr);
-    lv_style_get(LV_STYLE_BTN_INA, &wdata->style_btn_ina);
-    lv_style_get(LV_STYLE_PLAIN, &wdata->style_wp);
-    wdata->style_wp.ccolor = COLOR_RED;//MAKE(0x10, 0x20, 0x30);
-
-    if(adata->opa == 0) {
-        wdata->style_btn_rel.opa = OPA_COVER;
-        wdata->style_btn_pr.opa  = OPA_COVER;
-        wdata->style_btn_trel.opa =OPA_COVER;
-        wdata->style_btn_tpr.opa = OPA_COVER;
-        wdata->style_btn_ina.opa = OPA_COVER;
-    } else {
-        wdata->style_btn_rel.opa = OPACITY;
-        wdata->style_btn_pr.opa  = OPACITY;
-        wdata->style_btn_trel.opa =OPACITY;
-        wdata->style_btn_tpr.opa = OPACITY;
-        wdata->style_btn_ina.opa = OPACITY;
-    }
-
-    if(adata->shdw == 0) {
-        wdata->style_btn_rel.swidth =  0;
-        wdata->style_btn_pr.swidth  =  0;
-        wdata->style_btn_trel.swidth = 0;
-        wdata->style_btn_tpr.swidth =  0;
-        wdata->style_btn_ina.swidth =  0;
-    } else {
-        wdata->style_btn_rel.swidth =  SHADOW_WIDTH;
-        wdata->style_btn_pr.swidth  =  SHADOW_WIDTH;
-        wdata->style_btn_trel.swidth = SHADOW_WIDTH;
-        wdata->style_btn_tpr.swidth =  SHADOW_WIDTH;
-        wdata->style_btn_ina.swidth =  SHADOW_WIDTH;
-    }
-
-    if(adata->recolor == 0) {
-        wdata->style_wp.img_recolor =  OPA_TRANSP;
-    } else {
-        wdata->style_wp.img_recolor =  IMG_RECOLOR;
-    }
-
-    lv_obj_set_style(lv_page_get_scrl(lv_win_get_page(win)), &style_win_scrl);
-
-	wdata->wp = lv_img_create(win, NULL);
-	lv_obj_set_protect(wdata->wp, LV_PROTECT_PARENT);
-	lv_obj_set_parent(wdata->wp, lv_win_get_page(win));
-	lv_img_set_file(wdata->wp, "U:/app_bm_wp");
-	lv_obj_set_size(wdata->wp, LV_HOR_RES, LV_VER_RES - lv_obj_get_height(lv_win_get_header(win)));
-	lv_obj_set_pos(wdata->wp, 0, 0);
-	lv_obj_set_style(wdata->wp, &wdata->style_wp);
-    lv_img_set_auto_size(wdata->wp, false);
-	if(adata->wp == 0) lv_obj_set_hidden(wdata->wp, true);
-    if(adata->upscalse != 0) lv_img_set_upscale(wdata->wp, true);
-
-	/* The order is changed because the wallpaper's parent change
-	 * Therefore add the scrollable again */
-	lv_obj_set_parent(lv_page_get_scrl(lv_win_get_page(win)), lv_win_get_page(win));
-
-	lv_cont_set_layout(lv_page_get_scrl(lv_win_get_page(win)), LV_CONT_LAYOUT_PRETTY);
-
-	lv_obj_t * holder;
-
-	holder = lv_cont_create(win, NULL);
-	lv_cont_set_fit(holder, true, true);
-	lv_obj_set_style(holder, &wdata->style_btn_ina);
-	lv_page_glue_obj(holder, true);
-
-    wdata->value_l = lv_label_create(holder, NULL);
-    lv_obj_set_style(wdata->value_l, &wdata->style_value_l);
-	lv_label_set_text(wdata->value_l, "Screen load: N/A ms\nN/A px/ms");
-
-	lv_obj_t * btn;
-	btn = lv_btn_create(win, NULL);
-	lv_obj_set_free_p(btn, app);
-    lv_page_glue_obj(btn, true);
-	lv_cont_set_fit(btn, true, true);
-	lv_btn_set_styles(btn, &wdata->style_btn_rel, &wdata->style_btn_pr, &wdata->style_btn_trel, &wdata->style_btn_tpr, NULL);
-	lv_btn_set_rel_action(btn, run_rel_action);
-
-	lv_obj_t * btn_l;
-	btn_l = lv_label_create(btn, NULL);
-	lv_label_set_text(btn_l, "Run\ntest!");
-	lv_obj_set_protect(btn, LV_PROTECT_FOLLOW);
-
-    btn = lv_btn_create(win, btn);
-    lv_btn_set_tgl(btn, true);
-    lv_obj_clr_protect(btn, LV_PROTECT_FOLLOW);
-    if(adata->wp != 0) lv_btn_set_state(btn, LV_BTN_STATE_TREL);
-    else lv_btn_set_state(btn, LV_BTN_STATE_REL);
-    lv_btn_set_rel_action(btn, wp_rel_action);
-    btn_l = lv_label_create(btn, btn_l);
-    lv_label_set_text(btn_l, "Wallpaper");
-
-
-    btn = lv_btn_create(win, btn);
-    if(adata->recolor != 0) lv_btn_set_state(btn, LV_BTN_STATE_TREL);
-    else lv_btn_set_state(btn, LV_BTN_STATE_REL);
-    lv_btn_set_rel_action(btn, recolor_rel_action);
-    btn_l = lv_label_create(btn, btn_l);
-    lv_label_set_text(btn_l, "Wp. recolor!");
-
-
-    btn = lv_btn_create(win, btn);
-    if(adata->upscalse != 0) lv_btn_set_state(btn, LV_BTN_STATE_TREL);
-    else lv_btn_set_state(btn, LV_BTN_STATE_REL);
-    lv_btn_set_rel_action(btn, upscale_rel_action);
-    btn_l = lv_label_create(btn, btn_l);
-    lv_label_set_text(btn_l, "Wp. upscalse!");
-
-
-    btn = lv_btn_create(win, btn);
-    if(adata->shdw != 0) lv_btn_set_state(btn, LV_BTN_STATE_TREL);
-    else lv_btn_set_state(btn, LV_BTN_STATE_REL);
-    lv_btn_set_rel_action(btn, shadow_rel_action);
-    btn_l = lv_label_create(btn, btn_l);
-    lv_label_set_text(btn_l, "Shadow");
-
-    btn = lv_btn_create(win, btn);
-    if(adata->opa != 0) lv_btn_set_state(btn, LV_BTN_STATE_TREL);
-    else lv_btn_set_state(btn, LV_BTN_STATE_REL);
-    lv_btn_set_rel_action(btn, opa_rel_action);
-    btn_l = lv_label_create(btn, btn_l);
-    lv_label_set_text(btn_l, "Opacity");
-
-}
-
-/**
- * Close the window of an application
- * @param app pointer to an application
- */
-static void my_win_close(lv_app_inst_t * app)
-{
-
-}
-
-/*--------------------
- * OTHER FUNCTIONS
- ---------------------*/
-
-static void refr_monitor(uint32_t time_ms, uint32_t px_num)
-{
-    if(caputre_next != false) {
-        lv_app_inst_t * app = NULL;
-        app = lv_app_get_next(app, &my_app_dsc);
-
-        char w_buf[256];
-        if(time_ms != 0) sprintf(w_buf, "Screen load: %d ms\n%d px/ms", time_ms, px_num/time_ms);
-        else sprintf(w_buf, "Screen load: %d ms\nN/A px/ms", time_ms);
-
-        char s_buf[16];
-        sprintf(s_buf, "%d ms", time_ms);
-
-        while(app != NULL) {
-            if(app->win_data != NULL) {
-               my_win_data_t * wdata = app->win_data;
-               lv_label_set_text(wdata->value_l, w_buf);
-            }
-
-            if(app->sc_data != NULL) {
-               my_sc_data_t * sdata = app->sc_data;
-               lv_label_set_text(sdata->label, s_buf);
-            }
-
-            app = lv_app_get_next(app, &my_app_dsc);
-        }
-
-
-        caputre_next = false;
-    }
-}
-
-static lv_action_res_t run_rel_action(lv_obj_t * btn, lv_dispi_t * dispi)
-{
-    lv_obj_inv(lv_scr_act());
-    caputre_next = true;
-
-    return LV_ACTION_RES_OK;
-}
-
-static lv_action_res_t wp_rel_action(lv_obj_t * btn, lv_dispi_t * dispi)
-{
-
-    lv_app_inst_t * app = lv_obj_get_free_p(btn);
-    my_win_data_t * wdata = app->win_data;
-    my_app_data_t * adata = app->app_data;
-
-    if(lv_btn_get_state(btn) == LV_BTN_STATE_TREL) {
-        adata->wp = 1;
-        lv_obj_set_hidden(wdata->wp, false);
-    } else {
-        adata->wp = 0;
-        lv_obj_set_hidden(wdata->wp, true);
-    }
-
-    return LV_ACTION_RES_OK;
-}
-
-static lv_action_res_t recolor_rel_action(lv_obj_t * btn, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(btn);
-    my_win_data_t * wdata = app->win_data;
-    my_app_data_t * adata = app->app_data;
-
-    if(lv_btn_get_state(btn) == LV_BTN_STATE_TREL) {
-        adata->recolor = 1;
-        wdata->style_wp.img_recolor = IMG_RECOLOR;
-    } else {
-        adata->recolor = 0;
-        wdata->style_wp.img_recolor = OPA_TRANSP;
-    }
-
-    lv_obj_refr_style(wdata->wp);
-
-    return LV_ACTION_RES_OK;
-}
-
-static lv_action_res_t upscale_rel_action(lv_obj_t * btn, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(btn);
-    my_win_data_t * wdata = app->win_data;
-    my_app_data_t * adata = app->app_data;
-
-    if(lv_btn_get_state(btn) == LV_BTN_STATE_TREL) {
-        adata->upscalse = 1;
-        lv_img_set_upscale(wdata->wp, true);
-    } else {
-        adata->upscalse = 0;
-        lv_img_set_upscale(wdata->wp, false);
-    }
-
-    lv_obj_set_size(wdata->wp, LV_HOR_RES, LV_VER_RES - lv_obj_get_height(lv_win_get_header(app->win)));
-
-    return LV_ACTION_RES_OK;
-}
-
-static lv_action_res_t shadow_rel_action(lv_obj_t * btn, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(btn);
-    my_win_data_t * wdata = app->win_data;
-    my_app_data_t * adata = app->app_data;
-
-    if(lv_btn_get_state(btn) == LV_BTN_STATE_TREL) {
-        adata->shdw = 1;
-        wdata->style_btn_rel.swidth = SHADOW_WIDTH;
-        wdata->style_btn_pr.swidth  =  SHADOW_WIDTH;
-        wdata->style_btn_trel.swidth = SHADOW_WIDTH;
-        wdata->style_btn_tpr.swidth =  SHADOW_WIDTH;
-        wdata->style_btn_ina.swidth =  SHADOW_WIDTH;
-    } else {
-        adata->shdw = 0;
-        wdata->style_btn_rel.swidth = 0;
-        wdata->style_btn_pr.swidth  = 0;
-        wdata->style_btn_trel.swidth =0;
-        wdata->style_btn_tpr.swidth = 0;
-        wdata->style_btn_ina.swidth = 0;
-    }
-
-    lv_style_refr_objs(&wdata->style_btn_rel);
-    lv_style_refr_objs(&wdata->style_btn_pr);
-    lv_style_refr_objs(&wdata->style_btn_trel);
-    lv_style_refr_objs(&wdata->style_btn_tpr);
-    lv_style_refr_objs(&wdata->style_btn_ina);
-
-    return LV_ACTION_RES_OK;
-}
-
-static lv_action_res_t opa_rel_action(lv_obj_t * btn, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(btn);
-    my_win_data_t * wdata = app->win_data;
-    my_app_data_t * adata = app->app_data;
-
-    if(lv_btn_get_state(btn) == LV_BTN_STATE_TREL) {
-        adata->opa = 1;
-        wdata->style_btn_rel.opa = OPACITY;
-        wdata->style_btn_pr.opa  = OPACITY;
-        wdata->style_btn_trel.opa =OPACITY;
-        wdata->style_btn_tpr.opa = OPACITY;
-        wdata->style_btn_ina.opa = OPACITY;
-    } else {
-        adata->opa = 0;
-        wdata->style_btn_rel.opa = OPA_COVER;
-        wdata->style_btn_pr.opa  = OPA_COVER;
-        wdata->style_btn_trel.opa =OPA_COVER;
-        wdata->style_btn_tpr.opa = OPA_COVER;
-        wdata->style_btn_ina.opa = OPA_COVER;
-    }
-
-    lv_style_refr_objs(&wdata->style_btn_rel);
-    lv_style_refr_objs(&wdata->style_btn_pr);
-    lv_style_refr_objs(&wdata->style_btn_trel);
-    lv_style_refr_objs(&wdata->style_btn_tpr);
-    lv_style_refr_objs(&wdata->style_btn_ina);
-
-    return LV_ACTION_RES_OK;
-}
-
-
-/*Exceptionally store the data because the big array would be bothering*/
-
-#if COLOR_DEPTH == 8
-static const color_int_t img_benchmark_bg[] = {
-/*HEADER
-   Width = 40
-   Height = 40
-   Transp: 0
-   Color depth: 8*/
-40, 128, 2, 2,
-
-/*IMAGE DATA*/
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 5, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 5, 5, 0, 5, 5, 5, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 5, 5, 0, 5, 5, 0, 0, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 5, 5, 5, 5, 5, 0, 0, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 5, 5, 0, 0, 5, 0, 0, 0, 5, 5, 5, 5, 5, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 5, 0, 0, 5, 5, 5, 5, 5, 5, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 0, 0, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 0, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 5, 5, 0, 0, 0, 5, 5, 5, 0, 5, 5, 5, 5, 0, 0, 5, 5, 5, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 5, 5, 5, 5, 5, 5, 5, 5, 0, 5, 5, 5, 5, 5, 0, 5, 5, 5, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 5, 5, 5, 5, 0, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 0, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 5, 5, 5, 0, 0, 0, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 0, 5, 5, 5, 0, 5, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 0, 5, 5, 5, 5, 0, 5, 5, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 5, 5, 0, 0, 0, 5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 5, 0, 0, 0, 0, 0, 5, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 5, 5, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 5, 5, 5, 5, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 5, 0, 0, 0, 0, 5, 5, 5, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-#endif /*COLOR_DEPTH*/
-
-#if COLOR_DEPTH == 16
-static const color_int_t img_benchmark_bg[] = {
-/*HEADER
-   Width = 40
-   Height = 40
-   Transp: 0
-   Color depth: 16*/
-32808, 1026,
-
-/*IMAGE DATA*/
-32, 32, 32, 2113, 2113, 4258, 6339, 4258, 4258, 4226, 4226, 2145, 4226, 2113, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 2145, 2145, 4226, 4226, 4226, 4226, 4226, 2145, 32, 32, 32, 32,
-0, 32, 2113, 32, 6339, 10565, 8452, 4258, 4226, 4226, 2145, 4226, 6339, 4226, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 2145, 4226, 2145, 2145, 4226, 4226, 4226, 6371, 6339, 4226, 32, 32, 32,
-32, 32, 2113, 4226, 8484, 8484, 8452, 6371, 4226, 2145, 4226, 4258, 4258, 4258, 2145, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 2145, 4226, 4226, 4226, 4226, 2145, 2145, 4226, 6339, 4258, 4258, 4226, 32, 32,
-32, 32, 4258, 6371, 8452, 6371, 6371, 6339, 4226, 2145, 4226, 4226, 2145, 4226, 4226, 2113, 32, 0, 0, 0, 0, 32, 0, 0, 32, 2113, 2145, 2145, 2145, 4226, 4226, 4226, 2145, 4226, 6339, 4226, 6371, 6339, 2145, 32,
-2113, 2145, 6371, 6339, 4226, 4226, 4226, 4226, 4258, 4258, 4226, 2145, 4226, 2145, 2145, 4226, 4258, 32, 0, 0, 0, 0, 0, 2113, 6339, 4226, 2113, 2145, 2145, 2145, 4226, 4226, 4258, 4226, 4258, 4258, 4258, 6339, 6339, 2145,
-4226, 4258, 6339, 4226, 4226, 2145, 2145, 2145, 4226, 4226, 4226, 2145, 2145, 2145, 4226, 6339, 8452, 6339, 32, 0, 0, 0, 2113, 6339, 6371, 6339, 2145, 2113, 2145, 2145, 4226, 4226, 4226, 4226, 4226, 4226, 4226, 4258, 4258, 4226,
-4226, 4226, 2145, 4226, 2145, 2145, 4226, 4226, 2145, 4226, 4226, 4226, 2145, 4226, 6371, 6371, 6371, 8452, 4258, 32, 0, 2113, 6371, 6371, 6371, 6339, 6339, 2145, 2145, 4226, 2145, 2145, 2145, 4226, 4258, 4226, 4226, 4226, 2145, 4226,
-4226, 2145, 4226, 2145, 2145, 4226, 4226, 4226, 4226, 4226, 2145, 2145, 4258, 6371, 8452, 6371, 6371, 6371, 8452, 6339, 2145, 6339, 8452, 6371, 6339, 6371, 6371, 6339, 4226, 2145, 2145, 2145, 2145, 2145, 4258, 4258, 2145, 2145, 2145, 2145,
-4226, 2145, 4226, 2113, 2145, 4226, 4258, 4226, 2145, 2145, 2145, 4258, 6371, 8452, 6371, 6339, 6371, 6371, 8452, 8452, 6339, 8452, 8452, 8452, 6371, 6371, 8452, 8452, 6339, 4226, 2145, 2145, 2145, 2145, 4226, 4258, 2145, 2113, 2145, 2145,
-2145, 2145, 2113, 2145, 4226, 4226, 4226, 2145, 2145, 2113, 4226, 6339, 6371, 6371, 6371, 6371, 6371, 8452, 6371, 8452, 8452, 6371, 8452, 8452, 6339, 6371, 8452, 8452, 8452, 6371, 4226, 2145, 4226, 4226, 4226, 4226, 4226, 4226, 2145, 4226,
-4226, 4226, 2145, 4226, 4226, 2145, 4226, 2145, 2113, 2145, 6339, 6371, 6371, 8452, 8452, 8452, 8484, 8452, 6371, 6371, 6371, 6371, 6371, 6371, 6371, 6371, 6371, 6371, 8452, 8452, 6339, 2145, 2145, 4226, 4226, 2145, 4226, 4226, 2145, 4226,
-2145, 4226, 4258, 2145, 2145, 2145, 2113, 2145, 4226, 6339, 6371, 6371, 6371, 8452, 8484, 8484, 8452, 6371, 6371, 6371, 6371, 6371, 6371, 8452, 6371, 6339, 6371, 6371, 6371, 8452, 8452, 6339, 4226, 2145, 2145, 4226, 4226, 2145, 4226, 2145,
-32, 2113, 4226, 4226, 2145, 2145, 2113, 2145, 8452, 8452, 6371, 6371, 6339, 8484, 8484, 8484, 8484, 8452, 6371, 6339, 6371, 6371, 6371, 6371, 6371, 6371, 6339, 6339, 6339, 6339, 8452, 8484, 6371, 2145, 2145, 4226, 2145, 4226, 4226, 2113,
-0, 0, 2145, 4226, 4226, 4226, 4258, 6371, 6371, 8452, 6371, 6339, 6339, 8452, 8484, 8452, 8452, 8452, 6371, 6371, 8452, 8452, 8452, 6371, 6371, 6339, 6371, 6339, 6371, 6371, 8452, 8452, 8484, 8452, 4226, 4226, 4258, 4258, 2113, 32,
-0, 0, 32, 2113, 2145, 6339, 8452, 8452, 6339, 6339, 8452, 6371, 6339, 6371, 10565, 8484, 8452, 8484, 8452, 6371, 6339, 8452, 8452, 6371, 6371, 6339, 6371, 6371, 6371, 8452, 8452, 8452, 8484, 10565, 6371, 4258, 4226, 2145, 32, 0,
-0, 0, 0, 0, 2113, 6339, 8452, 6371, 6371, 6339, 6371, 8452, 6371, 6371, 8452, 8484, 8452, 8452, 8484, 8452, 4258, 8452, 8452, 6339, 6339, 6339, 6339, 6371, 6371, 6371, 6371, 8452, 8452, 8452, 8484, 8452, 2113, 0, 0, 32,
-0, 0, 0, 0, 0, 4258, 6371, 6371, 6371, 6371, 6371, 6371, 6371, 6371, 8452, 8452, 8452, 8484, 8452, 2145, 32, 4226, 6371, 6371, 6371, 6339, 6371, 6371, 6371, 6371, 6371, 6371, 8452, 8452, 8452, 4226, 32, 0, 0, 32,
-0, 0, 0, 0, 0, 0, 4226, 8452, 6371, 6371, 6371, 6339, 6371, 8452, 8452, 8452, 8484, 8452, 2145, 0, 0, 0, 4226, 8452, 6371, 6371, 6371, 6339, 6339, 6371, 6371, 6371, 8452, 8484, 4258, 0, 32, 32, 32, 0,
-0, 0, 0, 0, 0, 0, 32, 4258, 6371, 6371, 6371, 6371, 6371, 8452, 8452, 8452, 8452, 2145, 0, 0, 32, 0, 0, 4226, 6371, 6371, 6339, 6339, 6371, 6371, 6371, 6371, 6371, 2145, 0, 0, 32, 32, 32, 0,
-0, 0, 0, 0, 0, 0, 0, 32, 6339, 6371, 6371, 6371, 6371, 8452, 8484, 8452, 4226, 32, 0, 0, 0, 0, 0, 0, 4226, 6339, 6339, 6339, 6371, 6371, 6371, 6371, 4226, 0, 32, 32, 32, 32, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 2113, 6339, 6371, 6371, 6371, 6371, 8452, 8484, 8484, 4258, 32, 0, 0, 0, 0, 0, 32, 4258, 6339, 6339, 6371, 6371, 6371, 8452, 8452, 4258, 32, 32, 32, 32, 32, 0, 32,
-0, 0, 0, 32, 0, 0, 2113, 6339, 8484, 8452, 6371, 6371, 8452, 8484, 8484, 8484, 8452, 4226, 0, 0, 0, 0, 32, 6339, 8452, 6371, 6371, 6371, 6371, 6371, 8452, 8452, 8484, 6371, 2113, 32, 32, 32, 32, 32,
-0, 0, 0, 0, 0, 2113, 6339, 8452, 8484, 8484, 8452, 6371, 8452, 10597, 8452, 8452, 8452, 6371, 4226, 0, 0, 32, 4258, 8452, 8452, 8452, 8452, 6371, 6339, 6371, 6371, 6371, 8484, 8484, 6339, 2113, 0, 32, 32, 32,
-0, 0, 0, 0, 2113, 6371, 8452, 8452, 8452, 8452, 8452, 8452, 8484, 10597, 8452, 8452, 6371, 8452, 8452, 4258, 2113, 6339, 8452, 8452, 8452, 6371, 8452, 8452, 8452, 8452, 6371, 6371, 8452, 8484, 8484, 6371, 2113, 32, 32, 32,
-0, 0, 0, 32, 2145, 6339, 8484, 8452, 8452, 8452, 8452, 8452, 8484, 8484, 8452, 8452, 6371, 8452, 8452, 10565, 8484, 8452, 8484, 8452, 8452, 6371, 8452, 8484, 8452, 8484, 8452, 6371, 8484, 8484, 10597, 6371, 6339, 2145, 0, 32,
-0, 0, 0, 2145, 4226, 2145, 6339, 8452, 8452, 8452, 8452, 8452, 8452, 8452, 8452, 8452, 8452, 8452, 8452, 8484, 8452, 8452, 8452, 8452, 8452, 6371, 8452, 8452, 8452, 8484, 8484, 8484, 8484, 12678, 6371, 4226, 6371, 4258, 32, 0,
-0, 32, 2145, 4226, 4226, 2145, 2145, 6339, 8484, 10565, 8452, 8452, 8452, 8452, 8484, 8484, 8452, 8452, 6371, 6371, 6371, 6339, 8452, 8452, 8452, 8452, 6371, 8452, 8484, 8484, 8452, 8484, 10565, 8484, 4258, 4226, 6339, 6339, 2145, 32,
-2113, 4226, 4258, 4226, 4226, 4226, 2145, 2145, 8452, 8484, 8452, 6371, 8452, 8452, 8484, 8452, 8452, 6371, 6339, 6339, 6339, 6371, 6371, 8452, 8452, 8452, 6371, 6371, 6339, 8452, 8484, 8484, 6371, 4226, 4258, 6339, 4226, 4258, 6339, 4226,
-2145, 2145, 4226, 4226, 4226, 4226, 2145, 2145, 2145, 10565, 8452, 8452, 8452, 6371, 8452, 8452, 8452, 6371, 8452, 6371, 6339, 6371, 6371, 6371, 8452, 6371, 6371, 6339, 6339, 6371, 6371, 6339, 4226, 4258, 4226, 6339, 6339, 4258, 6339, 4226,
-2145, 2145, 2113, 4226, 4226, 4226, 4226, 4226, 2145, 4226, 6339, 6371, 6371, 8452, 8452, 8452, 8452, 8452, 6371, 6371, 6371, 6339, 8452, 8452, 8452, 8452, 8452, 8452, 6371, 6371, 4258, 2145, 4226, 4258, 6339, 4258, 4258, 4226, 4226, 4258,
-2145, 2145, 2145, 2145, 2145, 4226, 4226, 4226, 4226, 2145, 2145, 6371, 8484, 8452, 8452, 8452, 8452, 8452, 8452, 6371, 6371, 6371, 8452, 8484, 8452, 8452, 8452, 8484, 8484, 6339, 2145, 2145, 4226, 4226, 4258, 6339, 4226, 2145, 4226, 4226,
-2145, 2145, 4226, 4226, 4226, 4258, 4226, 4258, 4258, 4226, 2145, 4226, 6371, 8452, 8452, 6371, 8452, 8452, 8452, 8452, 6339, 8452, 8452, 8452, 8484, 10565, 8452, 8484, 6371, 4226, 4226, 4258, 6339, 6339, 6339, 6339, 4226, 2145, 2145, 4226,
-2145, 2145, 2145, 4226, 4226, 6339, 6339, 6339, 4226, 4226, 4226, 2145, 4258, 6339, 8452, 8452, 8452, 8452, 8484, 4258, 2113, 6339, 8452, 8452, 8452, 8484, 8452, 6339, 4258, 4226, 6339, 6339, 6339, 6339, 6339, 6339, 4226, 2145, 2145, 4258,
-2145, 4226, 4226, 4226, 4258, 4226, 6371, 6339, 4226, 4226, 4226, 4226, 2145, 4226, 6339, 8452, 8452, 8452, 4258, 32, 0, 2113, 6339, 8484, 10565, 8484, 6339, 4226, 4258, 6339, 6339, 6339, 6339, 4258, 4226, 2145, 4258, 4226, 4226, 4258,
-2145, 4226, 4258, 4258, 4226, 4226, 4226, 4258, 6339, 4258, 4226, 2145, 2145, 2145, 4226, 6371, 8452, 4226, 32, 0, 0, 0, 32, 6371, 10565, 8452, 4226, 4226, 4258, 4258, 6339, 6339, 6371, 4226, 2145, 4226, 4226, 4226, 4258, 4226,
-32, 2113, 6339, 4258, 4258, 4226, 4226, 4226, 4258, 4258, 4226, 4226, 4226, 4226, 4226, 4226, 4226, 32, 0, 0, 0, 0, 0, 2113, 8452, 6339, 4258, 4226, 4226, 4226, 4258, 6339, 4258, 4258, 4226, 4258, 6339, 4258, 4226, 2113,
-0, 0, 2113, 4258, 4258, 4258, 4258, 4226, 2145, 2145, 4226, 4226, 4226, 4258, 4258, 2113, 32, 32, 32, 32, 32, 0, 32, 2113, 2145, 4258, 6371, 6339, 4258, 6339, 4258, 4226, 4258, 8484, 6371, 8452, 8484, 6339, 2113, 0,
-0, 0, 0, 2113, 6339, 6339, 4258, 4226, 2145, 2145, 2145, 4226, 6339, 4258, 2145, 32, 32, 32, 32, 32, 0, 0, 32, 32, 2113, 2145, 6339, 8452, 8452, 4258, 4226, 4258, 6339, 8484, 10565, 10597, 8452, 2145, 32, 0,
-0, 0, 0, 0, 4258, 6371, 6339, 4226, 4226, 2145, 2145, 4226, 4258, 4226, 32, 0, 32, 32, 32, 32, 0, 32, 0, 32, 32, 32, 2145, 8452, 8452, 4258, 4226, 4226, 4258, 8484, 8452, 8484, 4226, 0, 0, 0,
-0, 0, 0, 0, 32, 4226, 4258, 6339, 4226, 4226, 4226, 4226, 2145, 32, 32, 0, 0, 32, 32, 32, 0, 0, 0, 0, 32, 2113, 2113, 2145, 4226, 4226, 4226, 4226, 6339, 6371, 4226, 2145, 32, 0, 0, 0,
-};
-#endif /*COLOR_DEPTH == 16*/
-
-#if COLOR_DEPTH == 24
-static const color_int_t img_benchmark_bg[] = {
-/*HEADER
-   Width = 40
-   Height = 40
-   Transp: 0
-   Color depth: 24*/
-100827176,
-
-/*IMAGE DATA*/
-
-263172, 460551, 460551, 526344, 723723, 1447446, 1644825, 1447446, 1447446, 1052688, 1052688, 921102, 1052688, 723723, 263172, 197379, 131586, 65793, 65793, 0, 65793, 0, 65793, 65793, 65793, 65793, 65793, 328965, 789516, 855309, 1250067, 1052688, 1052688, 1184274, 1184274, 986895, 394758, 394758, 394758, 328965,
-131586, 460551, 526344, 394758, 1776411, 2631720, 2105376, 1447446, 1250067, 1052688, 855309, 1052688, 1579032, 1250067, 460551, 65793, 65793, 65793, 65793, 65793, 0, 65793, 65793, 0, 0, 0, 328965, 986895, 1184274, 789516, 921102, 1250067, 1052688, 1052688, 1842204, 1644825, 1052688, 328965, 263172, 328965,
-394758, 460551, 526344, 1052688, 2434341, 2434341, 2236962, 1907997, 1052688, 855309, 1052688, 1315860, 1381653, 1447446, 855309, 263172, 0, 0, 131586, 131586, 131586, 131586, 131586, 65793, 0, 263172, 855309, 1052688, 1052688, 1052688, 1118481, 921102, 986895, 1052688, 1579032, 1513239, 1513239, 1118481, 394758, 328965,
-263172, 460551, 1447446, 1842204, 2171169, 1973790, 1973790, 1776411, 1052688, 986895, 1184274, 1250067, 921102, 1118481, 1118481, 723723, 263172, 0, 65793, 131586, 197379, 263172, 131586, 131586, 328965, 657930, 921102, 855309, 921102, 1052688, 1052688, 1052688, 855309, 1250067, 1579032, 1250067, 1842204, 1710618, 986895, 263172,
-657930, 921102, 1842204, 1776411, 1250067, 1118481, 1052688, 1118481, 1315860, 1381653, 1052688, 855309, 1052688, 855309, 921102, 1184274, 1381653, 394758, 65793, 131586, 131586, 131586, 65793, 526344, 1579032, 1052688, 723723, 789516, 855309, 921102, 1052688, 1184274, 1315860, 1052688, 1315860, 1447446, 1513239, 1710618, 1644825, 855309,
-1052688, 1315860, 1710618, 1250067, 1052688, 986895, 921102, 921102, 1052688, 1052688, 1184274, 855309, 855309, 921102, 1052688, 1776411, 2302755, 1644825, 394758, 0, 131586, 131586, 657930, 1776411, 1907997, 1710618, 855309, 723723, 855309, 986895, 1052688, 1052688, 1184274, 1184274, 1052688, 1184274, 1250067, 1513239, 1447446, 1184274,
-1184274, 1052688, 986895, 1052688, 921102, 986895, 1184274, 1052688, 921102, 1052688, 1052688, 1052688, 986895, 1118481, 1907997, 1907997, 1973790, 2171169, 1513239, 394758, 65793, 657930, 1973790, 1973790, 1842204, 1776411, 1579032, 855309, 789516, 1052688, 986895, 986895, 986895, 1250067, 1315860, 1118481, 1250067, 1118481, 986895, 1118481,
-1250067, 986895, 1052688, 855309, 986895, 1250067, 1184274, 1052688, 1052688, 1052688, 986895, 921102, 1315860, 1973790, 2105376, 1842204, 1842204, 1973790, 2171169, 1579032, 789516, 1710618, 2105376, 1973790, 1776411, 1907997, 1973790, 1710618, 1118481, 855309, 855309, 855309, 921102, 986895, 1315860, 1381653, 986895, 855309, 789516, 986895,
-1250067, 855309, 1052688, 657930, 986895, 1118481, 1315860, 1118481, 986895, 986895, 855309, 1381653, 1907997, 2105376, 1842204, 1776411, 1842204, 1907997, 2105376, 2171169, 1776411, 2105376, 2236962, 2105376, 1842204, 1973790, 2171169, 2236962, 1776411, 1052688, 855309, 986895, 921102, 921102, 1118481, 1513239, 921102, 657930, 921102, 855309,
-986895, 855309, 657930, 855309, 1052688, 1118481, 1118481, 986895, 855309, 657930, 1052688, 1776411, 1907997, 1907997, 1973790, 1907997, 1907997, 2171169, 1973790, 2236962, 2171169, 1973790, 2105376, 2105376, 1776411, 1973790, 2236962, 2236962, 2302755, 1842204, 1118481, 855309, 1052688, 1052688, 1052688, 1184274, 1118481, 1052688, 921102, 1052688,
-1250067, 1250067, 855309, 1052688, 1052688, 986895, 1052688, 855309, 657930, 855309, 1710618, 1907997, 1907997, 2105376, 2171169, 2302755, 2368548, 2105376, 1973790, 1907997, 1842204, 1842204, 1907997, 1907997, 1842204, 1907997, 1973790, 1973790, 2171169, 2302755, 1776411, 855309, 855309, 1052688, 1052688, 986895, 1184274, 1184274, 855309, 1052688,
-986895, 1052688, 1315860, 855309, 855309, 855309, 723723, 789516, 1052688, 1710618, 1973790, 1842204, 1973790, 2302755, 2434341, 2434341, 2302755, 1973790, 1842204, 1842204, 1842204, 1973790, 1907997, 2236962, 1907997, 1776411, 1907997, 1907997, 1973790, 2105376, 2236962, 1776411, 1052688, 855309, 855309, 1184274, 1052688, 986895, 1184274, 986895,
-328965, 657930, 1052688, 1052688, 855309, 855309, 723723, 921102, 2105376, 2236962, 1907997, 1973790, 1710618, 2368548, 2434341, 2434341, 2368548, 2236962, 1842204, 1710618, 1842204, 1842204, 1907997, 1973790, 1907997, 1842204, 1776411, 1710618, 1776411, 1776411, 2171169, 2368548, 1907997, 855309, 986895, 1052688, 986895, 1118481, 1052688, 723723,
-131586, 131586, 855309, 1118481, 1052688, 1118481, 1447446, 1907997, 1842204, 2105376, 1907997, 1776411, 1776411, 2171169, 2500134, 2171169, 2171169, 2236962, 1907997, 1907997, 2105376, 2105376, 2171169, 1973790, 1842204, 1776411, 1842204, 1776411, 1842204, 1842204, 2171169, 2105376, 2434341, 2105376, 1118481, 1052688, 1381653, 1315860, 657930, 328965,
-65793, 131586, 263172, 657930, 855309, 1579032, 2236962, 2171169, 1776411, 1776411, 2105376, 1842204, 1776411, 1973790, 2631720, 2434341, 2302755, 2368548, 2105376, 1842204, 1776411, 2236962, 2171169, 1842204, 1842204, 1776411, 1842204, 1842204, 1842204, 2105376, 2105376, 2105376, 2500134, 2631720, 1907997, 1381653, 1052688, 789516, 263172, 197379,
-65793, 131586, 131586, 131586, 526344, 1644825, 2105376, 1842204, 1907997, 1776411, 1907997, 2105376, 1842204, 1973790, 2105376, 2368548, 2236962, 2302755, 2368548, 2171169, 1513239, 2105376, 2171169, 1776411, 1644825, 1710618, 1644825, 1842204, 1973790, 1973790, 1842204, 2105376, 2236962, 2236962, 2565927, 2105376, 657930, 131586, 131586, 328965,
-65793, 131586, 197379, 131586, 197379, 1315860, 1973790, 1973790, 1907997, 1907997, 1907997, 1842204, 1842204, 1973790, 2171169, 2236962, 2302755, 2434341, 2302755, 855309, 263172, 1184274, 1842204, 1973790, 1842204, 1710618, 1907997, 1842204, 1842204, 1973790, 1973790, 1842204, 2105376, 2302755, 2105376, 1184274, 328965, 197379, 131586, 263172,
-65793, 131586, 131586, 65793, 0, 197379, 1250067, 2105376, 1973790, 1907997, 1973790, 1776411, 1842204, 2236962, 2171169, 2105376, 2500134, 2171169, 789516, 131586, 197379, 197379, 1184274, 2171169, 1907997, 1907997, 1842204, 1710618, 1710618, 1842204, 1907997, 1842204, 2171169, 2368548, 1315860, 65793, 263172, 394758, 263172, 197379,
-65793, 131586, 131586, 131586, 65793, 0, 263172, 1315860, 1907997, 1907997, 1842204, 1907997, 1973790, 2302755, 2302755, 2236962, 2171169, 855309, 131586, 131586, 263172, 131586, 197379, 1052688, 1973790, 1907997, 1710618, 1710618, 1907997, 1842204, 1907997, 1973790, 1973790, 986895, 131586, 197379, 394758, 394758, 263172, 131586,
-65793, 197379, 65793, 131586, 131586, 131586, 65793, 394758, 1579032, 1907997, 1907997, 1907997, 1973790, 2171169, 2565927, 2171169, 1118481, 263172, 131586, 197379, 197379, 131586, 131586, 197379, 1118481, 1776411, 1776411, 1776411, 1842204, 1907997, 1973790, 1973790, 1052688, 131586, 263172, 328965, 394758, 328965, 197379, 197379,
-131586, 131586, 131586, 197379, 131586, 131586, 131586, 592137, 1644825, 1973790, 1842204, 1973790, 1973790, 2236962, 2500134, 2368548, 1447446, 263172, 65793, 197379, 197379, 131586, 131586, 394758, 1447446, 1776411, 1776411, 1842204, 1907997, 1973790, 2105376, 2171169, 1513239, 394758, 328965, 460551, 460551, 328965, 197379, 263172,
-197379, 197379, 197379, 328965, 197379, 131586, 592137, 1710618, 2368548, 2302755, 1907997, 1907997, 2236962, 2434341, 2368548, 2434341, 2236962, 1052688, 131586, 65793, 197379, 131586, 328965, 1579032, 2302755, 1973790, 1842204, 1842204, 1842204, 1907997, 2105376, 2302755, 2500134, 1907997, 657930, 394758, 394758, 394758, 394758, 328965,
-131586, 131586, 131586, 197379, 131586, 526344, 1776411, 2302755, 2434341, 2368548, 2171169, 1842204, 2302755, 2894892, 2302755, 2236962, 2171169, 1907997, 1118481, 197379, 131586, 394758, 1513239, 2236962, 2171169, 2105376, 2105376, 1842204, 1710618, 1842204, 1907997, 1907997, 2368548, 2565927, 1644825, 592137, 197379, 394758, 328965, 328965,
-65793, 131586, 131586, 65793, 526344, 1842204, 2302755, 2236962, 2302755, 2302755, 2105376, 2105376, 2434341, 2894892, 2302755, 2105376, 1973790, 2105376, 2105376, 1381653, 592137, 1644825, 2236962, 2302755, 2105376, 1973790, 2171169, 2171169, 2105376, 2105376, 1973790, 1973790, 2171169, 2565927, 2565927, 1973790, 657930, 460551, 460551, 263172,
-0, 65793, 65793, 263172, 855309, 1776411, 2434341, 2105376, 2236962, 2105376, 2302755, 2302755, 2368548, 2368548, 2105376, 2105376, 1973790, 2171169, 2302755, 2829099, 2565927, 2302755, 2500134, 2105376, 2105376, 1842204, 2171169, 2368548, 2302755, 2368548, 2171169, 1907997, 2368548, 2500134, 2894892, 1842204, 1579032, 789516, 197379, 263172,
-0, 0, 197379, 789516, 1052688, 921102, 1710618, 2302755, 2105376, 2171169, 2302755, 2236962, 2105376, 2105376, 2302755, 2171169, 2171169, 2302755, 2105376, 2434341, 2302755, 2171169, 2302755, 2105376, 2105376, 1973790, 2105376, 2302755, 2302755, 2368548, 2434341, 2368548, 2500134, 3158064, 1973790, 1118481, 1907997, 1315860, 328965, 131586,
-65793, 263172, 986895, 1184274, 1052688, 855309, 921102, 1644825, 2368548, 2631720, 2302755, 2236962, 2171169, 2302755, 2565927, 2368548, 2105376, 2105376, 1907997, 1907997, 1973790, 1776411, 2105376, 2171169, 2171169, 2105376, 1907997, 2302755, 2500134, 2434341, 2236962, 2434341, 2829099, 2434341, 1513239, 1184274, 1644825, 1776411, 921102, 394758,
-657930, 1052688, 1381653, 1184274, 1052688, 1052688, 855309, 855309, 2105376, 2368548, 2105376, 1973790, 2171169, 2302755, 2565927, 2302755, 2171169, 1907997, 1776411, 1710618, 1776411, 1973790, 1842204, 2105376, 2236962, 2105376, 1907997, 1842204, 1776411, 2236962, 2368548, 2500134, 1973790, 1184274, 1513239, 1710618, 1250067, 1381653, 1776411, 1118481,
-855309, 921102, 1118481, 1118481, 1184274, 1052688, 986895, 855309, 855309, 2631720, 2105376, 2105376, 2105376, 1973790, 2236962, 2302755, 2105376, 1907997, 2171169, 1907997, 1710618, 1842204, 1842204, 1842204, 2236962, 1842204, 1842204, 1710618, 1776411, 1842204, 1842204, 1579032, 1118481, 1513239, 1250067, 1579032, 1579032, 1513239, 1644825, 1052688,
-986895, 855309, 723723, 1052688, 1052688, 1052688, 1250067, 1052688, 986895, 1052688, 1644825, 1907997, 1973790, 2302755, 2236962, 2236962, 2236962, 2236962, 1973790, 1907997, 1907997, 1710618, 2105376, 2302755, 2105376, 2105376, 2105376, 2105376, 1973790, 1973790, 1315860, 789516, 1118481, 1513239, 1579032, 1381653, 1513239, 1118481, 1052688, 1315860,
-855309, 855309, 855309, 855309, 986895, 1184274, 1052688, 1118481, 1052688, 921102, 855309, 1842204, 2368548, 2302755, 2236962, 2105376, 2105376, 2236962, 2171169, 1973790, 1907997, 1842204, 2105376, 2434341, 2236962, 2171169, 2302755, 2434341, 2500134, 1776411, 986895, 855309, 1118481, 1250067, 1513239, 1776411, 1184274, 855309, 1052688, 1118481,
-855309, 789516, 1052688, 1052688, 1052688, 1381653, 1250067, 1315860, 1447446, 1052688, 855309, 1052688, 1973790, 2302755, 2105376, 1973790, 2105376, 2171169, 2302755, 2171169, 1710618, 2105376, 2171169, 2171169, 2500134, 2631720, 2105376, 2434341, 1907997, 1052688, 1118481, 1513239, 1579032, 1579032, 1776411, 1776411, 1184274, 789516, 986895, 1184274,
-986895, 855309, 789516, 1052688, 1250067, 1644825, 1776411, 1579032, 1184274, 1052688, 1052688, 986895, 1315860, 1776411, 2171169, 2171169, 2105376, 2302755, 2368548, 1315860, 592137, 1710618, 2236962, 2236962, 2171169, 2500134, 2171169, 1710618, 1315860, 1184274, 1644825, 1776411, 1776411, 1776411, 1644825, 1579032, 1184274, 921102, 855309, 1315860,
-921102, 1052688, 1052688, 1184274, 1315860, 1250067, 1842204, 1776411, 1250067, 1184274, 1118481, 1052688, 986895, 1052688, 1710618, 2302755, 2302755, 2302755, 1315860, 263172, 65793, 526344, 1644825, 2368548, 2631720, 2434341, 1644825, 1052688, 1315860, 1644825, 1579032, 1710618, 1579032, 1447446, 1052688, 921102, 1315860, 1118481, 1118481, 1315860,
-855309, 1184274, 1513239, 1315860, 1052688, 1118481, 1184274, 1513239, 1579032, 1381653, 1118481, 986895, 986895, 986895, 1052688, 1907997, 2302755, 1184274, 263172, 131586, 131586, 131586, 460551, 1973790, 2829099, 2171169, 1052688, 1184274, 1315860, 1381653, 1644825, 1644825, 1842204, 1250067, 986895, 1184274, 1052688, 1250067, 1513239, 1250067,
-394758, 657930, 1644825, 1381653, 1315860, 1184274, 1184274, 1184274, 1315860, 1381653, 1052688, 1052688, 1052688, 1184274, 1118481, 1118481, 1052688, 328965, 131586, 197379, 131586, 131586, 197379, 592137, 2105376, 1710618, 1447446, 1184274, 1052688, 1250067, 1447446, 1579032, 1513239, 1513239, 1250067, 1513239, 1579032, 1513239, 1118481, 592137,
-197379, 197379, 657930, 1381653, 1513239, 1315860, 1315860, 1250067, 789516, 855309, 1250067, 1250067, 1052688, 1513239, 1315860, 657930, 328965, 328965, 328965, 263172, 263172, 197379, 328965, 526344, 855309, 1513239, 1973790, 1710618, 1315860, 1579032, 1381653, 1184274, 1447446, 2368548, 1907997, 2105376, 2500134, 1644825, 657930, 131586,
-197379, 131586, 131586, 657930, 1710618, 1776411, 1447446, 1052688, 855309, 855309, 921102, 1118481, 1579032, 1447446, 855309, 328965, 328965, 394758, 328965, 263172, 131586, 197379, 263172, 460551, 657930, 789516, 1710618, 2236962, 2105376, 1447446, 1250067, 1381653, 1776411, 2368548, 2631720, 3026478, 2236962, 789516, 263172, 131586,
-197379, 197379, 131586, 197379, 1381653, 1973790, 1579032, 1184274, 1052688, 921102, 855309, 1052688, 1447446, 1052688, 328965, 131586, 328965, 460551, 460551, 328965, 131586, 263172, 197379, 328965, 460551, 460551, 921102, 2236962, 2105376, 1447446, 1118481, 1250067, 1513239, 2434341, 2302755, 2565927, 1052688, 131586, 131586, 131586,
-197379, 131586, 131586, 131586, 328965, 1052688, 1447446, 1644825, 1250067, 1052688, 1184274, 1052688, 855309, 394758, 263172, 197379, 131586, 263172, 328965, 263172, 197379, 131586, 197379, 197379, 263172, 592137, 657930, 921102, 1118481, 1250067, 1118481, 1118481, 1710618, 1973790, 1250067, 855309, 263172, 131586, 197379, 131586,
-};
-#endif /*COLOR_DEPTH == 24*/
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_BENCHMARK != 0*/

lv_appx/lv_app_benchmark.h

@@ -1,47 +0,0 @@
-/**
- * @file lv_app_benchmark.h
- *
- */
-
-#ifndef LV_APP_BENCHMARK_H
-#define LV_APP_BENCHMARK_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lvgl/lv_app/lv_app.h"
-
-#if LV_APP_ENABLE != 0 && USE_LV_APP_BENCHMARK != 0
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-typedef struct
-{
-
-}lv_app_benchmark_conf_t;
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-const lv_app_dsc_t * lv_app_benchmark_init(void);
-
-/**********************
- *      MACROS
- **********************/
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_BENCHMARK != 0*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* LV_APP_BENCHMARK_H */

lv_appx/lv_app_ethernet.c

@@ -1,227 +0,0 @@
-/**
- * @file lv_app_ethernet.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_app_ethernet.h"
-#if LV_APP_ENABLE != 0 && USE_LV_APP_ETHERNET != 0
-
-#include "../lv_app/lv_app_util/lv_app_kb.h"
-#include "hal/eth/eth.h"
-#include "misc/os/ptask.h"
-#include "hal/systick/systick.h"
-#include <stdio.h>
-
-/*********************
- *      DEFINES
- *********************/
-#define ETH_MONITOR_PERIOD     1000    /*ms*/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/*Application specific data for an instance of this application*/
-typedef struct
-{
-    uint8_t * last_msg_dp;
-    uint16_t last_msg_size;
-}my_app_data_t;
-
-/*Application specific data a window of this application*/
-typedef struct
-{
-
-}my_win_data_t;
-
-/*Application specific data for a shortcut of this application*/
-typedef struct
-{
-    lv_obj_t * label;
-}my_sc_data_t;
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-static void my_app_run(lv_app_inst_t * app, void * conf);
-static void my_app_close(lv_app_inst_t * app);
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec, lv_app_com_type_t type , const void * data, uint32_t size);
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc);
-static void my_sc_close(lv_app_inst_t * app);
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win);
-static void my_win_close(lv_app_inst_t * app);
-
-static void eth_state_monitor_task(void * param);
-static void tcp_transf_cb(eth_state_t state, const char * txt);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-static lv_app_dsc_t my_app_dsc =
-{
-	.name = "Ethernet",
-	.mode = LV_APP_MODE_NONE,
-	.app_run = my_app_run,
-	.app_close = my_app_close,
-	.com_rec = my_com_rec,
-	.win_open = my_win_open,
-	.win_close = my_win_close,
-	.sc_open = my_sc_open,
-	.sc_close = my_sc_close,
-	.app_data_size = sizeof(my_app_data_t),
-	.sc_data_size = sizeof(my_sc_data_t),
-	.win_data_size = sizeof(my_win_data_t),
-};
-
-static lv_app_inst_t * app_act_com = NULL;
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Initialize the application
- * @return pointer to the application descriptor of this application
- */
-const lv_app_dsc_t * lv_app_ethernet_init(void)
-{
-    ptask_create(eth_state_monitor_task, ETH_MONITOR_PERIOD, PTASK_PRIO_LOW, NULL);
-	return &my_app_dsc;
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-/**
- * Run an application according to 'app_dsc'
- * @param app_dsc pointer to an application descriptor
- * @param conf pointer to a lv_app_ethernet_conf_t structure with configuration data or NULL if unused
- * @return pointer to the opened application or NULL if any error occurred
- */
-static void my_app_run(lv_app_inst_t * app, void * conf)
-{
-    /*Initialize the application*/
-}
-
-/**
- * Close a running application.
- * Close the Window and the Shortcut too if opened.
- * Free all the allocated memory by this application.
- * @param app pointer to an application
- */
-static void my_app_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_app_data'*/
-}
-
-/**
- * Read the data have been sent to this application
- * @param app_send pointer to an application which sent the message
- * @param app_rec pointer to an application which is receiving the message
- * @param type type of data from 'lv_app_com_type_t' enum
- * @param data pointer to the sent data
- * @param size length of 'data' in bytes
- */
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec,
-                       lv_app_com_type_t type , const void * data, uint32_t size)
-{
-	if(type == LV_APP_COM_TYPE_CHAR) {      /*data: string*/
-        eth_tcp_transf(data, size, tcp_transf_cb);
-        app_act_com = app_rec;
-        my_app_data_t * adata = app_act_com->app_data;
-        if(adata->last_msg_dp != NULL) dm_free(adata->last_msg_dp); 
-        
-        adata->last_msg_dp = dm_alloc(size);
-        memcpy(adata->last_msg_dp, data, size);
-        adata->last_msg_size = size;
-	}
-}
-
-/**
- * Open a shortcut for an application
- * @param app pointer to an application
- * @param sc pointer to an object where the application
- *           can create content of the shortcut
- */
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc)
-{
-    my_sc_data_t * sc_data = app->sc_data;
-
-    sc_data->label = lv_label_create(sc, NULL);
-	lv_label_set_text(sc_data->label, "Empty");
-	lv_obj_align(sc_data->label, NULL, LV_ALIGN_CENTER, 0, 0);
-}
-
-/**
- * Close the shortcut of an application
- * @param app pointer to an application
- */
-static void my_sc_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_sc_data'*/
-}
-
-
-/**
- * Open the application in a window
- * @param app pointer to an application
- * @param win pointer to a window object where
- *            the application can create content
- */
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
-{
-    
-}
-
-/**
- * Close the window of an application
- * @param app pointer to an application
- */
-static void my_win_close(lv_app_inst_t * app)
-{
-
-}
-
-/*--------------------
- * OTHER FUNCTIONS
- ---------------------*/
-
-static void eth_state_monitor_task(void * param)
-{   
-    /* The eth. should be busy if there is sg. to send. 
-     * It means fail during last send. Try again*/
-    if(app_act_com != NULL && eth_busy() ==  false) {
-        /*Try to send the message again*/
-        lv_app_notice_add("Resend Ethernet message");
-        my_app_data_t * adata = app_act_com->app_data;
-        eth_tcp_transf(adata->last_msg_dp, adata->last_msg_size, tcp_transf_cb);
-    }
-}
-
-static void tcp_transf_cb(eth_state_t state, const char * txt)
-{
-    if(state == ETH_STATE_OK) {
-        uint16_t size =  txt[0] + ((txt[1] << 8) & 0xFF00);
-        char buf[256];
-        memcpy(buf, &txt[2], size);
-        buf[size] = '\0';
-        lv_app_com_send(app_act_com, LV_APP_COM_TYPE_CHAR, &txt[2], size);
-        my_app_data_t * adata = app_act_com->app_data;
-        dm_free(adata->last_msg_dp);
-        adata->last_msg_dp = NULL;
-        adata->last_msg_size = 0;
-        app_act_com = NULL;
-    }else if(state == ETH_STATE_ERROR) {
-        lv_app_notice_add("Ethernet TCP transfer error\n%s", txt);
-    }
-    
-}
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_ETHERNET != 0*/

lv_appx/lv_app_ethernet.h

@@ -1,48 +0,0 @@
-/**
- * @file lv_app_ethernet.h
- *
- */
-
-#ifndef LV_APP_ETHERNET_H
-#define LV_APP_ETHERNET_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lvgl/lv_app/lv_app.h"
-
-#if LV_APP_ENABLE != 0 && USE_LV_APP_ETHERNET != 0
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-typedef struct
-{
-
-}lv_app_ethernet_conf_t;
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-const lv_app_dsc_t * lv_app_ethernet_init(void);
-
-/**********************
- *      MACROS
- **********************/
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_ETHERNET != 0*/
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* LV_APP_ETHERNET_H */

lv_appx/lv_app_example.c

@@ -1,216 +0,0 @@
-/**
- * @file lv_app_example.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_app_example.h"
-#if LV_APP_ENABLE != 0 && USE_LV_APP_EXAMPLE != 0
-
-#include "../lv_app/lv_app_util/lv_app_kb.h"
-#include <stdio.h>
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/*Application specific data for an instance of this application*/
-typedef struct
-{
-
-}my_app_data_t;
-
-/*Application specific data a window of this application*/
-typedef struct
-{
-
-}my_win_data_t;
-
-/*Application specific data for a shortcut of this application*/
-typedef struct
-{
-    lv_obj_t * label;
-}my_sc_data_t;
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-static void my_app_run(lv_app_inst_t * app, void * conf);
-static void my_app_close(lv_app_inst_t * app);
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec, lv_app_com_type_t type , const void * data, uint32_t size);
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc);
-static void my_sc_close(lv_app_inst_t * app);
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win);
-static void my_win_close(lv_app_inst_t * app);
-
-static lv_action_res_t ta_rel_action(lv_obj_t * ta, lv_dispi_t * dispi);
-static void kb_ok_action(lv_obj_t * ta);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-static lv_app_dsc_t my_app_dsc =
-{
-	.name = "Example",
-	.mode = LV_APP_MODE_NONE,
-	.app_run = my_app_run,
-	.app_close = my_app_close,
-	.com_rec = my_com_rec,
-	.win_open = my_win_open,
-	.win_close = my_win_close,
-	.sc_open = my_sc_open,
-	.sc_close = my_sc_close,
-	.app_data_size = sizeof(my_app_data_t),
-	.sc_data_size = sizeof(my_sc_data_t),
-	.win_data_size = sizeof(my_win_data_t),
-};
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Initialize the application
- * @return pointer to the application descriptor of this application
- */
-const lv_app_dsc_t * lv_app_example_init(void)
-{
-	return &my_app_dsc;
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-/**
- * Run an application according to 'app_dsc'
- * @param app_dsc pointer to an application descriptor
- * @param conf pointer to a lv_app_example_conf_t structure with configuration data or NULL if unused
- * @return pointer to the opened application or NULL if any error occurred
- */
-static void my_app_run(lv_app_inst_t * app, void * conf)
-{
-    /*Initialize the application*/
-}
-
-/**
- * Close a running application.
- * Close the Window and the Shortcut too if opened.
- * Free all the allocated memory by this application.
- * @param app pointer to an application
- */
-static void my_app_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_app_data'*/
-}
-
-/**
- * Read the data have been sent to this application
- * @param app_send pointer to an application which sent the message
- * @param app_rec pointer to an application which is receiving the message
- * @param type type of data from 'lv_app_com_type_t' enum
- * @param data pointer to the sent data
- * @param size length of 'data' in bytes
- */
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec,
-                       lv_app_com_type_t type , const void * data, uint32_t size)
-{
-	if(type == LV_APP_COM_TYPE_CHAR) {      /*data: string*/
-	    my_sc_data_t * sc_data = app_rec->sc_data;
-	    if (sc_data->label != NULL) {
-	        lv_label_set_text_array(sc_data->label, data, size);
-	        lv_obj_align(sc_data->label , NULL,LV_ALIGN_CENTER, 0, 0);
-	    }
-	}
-}
-
-/**
- * Open a shortcut for an application
- * @param app pointer to an application
- * @param sc pointer to an object where the application
- *           can create content of the shortcut
- */
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc)
-{
-    my_sc_data_t * sc_data = app->sc_data;
-
-    sc_data->label = lv_label_create(sc, NULL);
-	lv_label_set_text(sc_data->label, "Empty");
-	lv_obj_align(sc_data->label, NULL, LV_ALIGN_CENTER, 0, 0);
-}
-
-/**
- * Close the shortcut of an application
- * @param app pointer to an application
- */
-static void my_sc_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_sc_data'*/
-}
-
-
-/**
- * Open the application in a window
- * @param app pointer to an application
- * @param win pointer to a window object where
- *            the application can create content
- */
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
-{
-	lv_obj_t * ta;
-	ta = lv_ta_create(win, NULL);
-    lv_obj_set_size_us(ta, 200, 100);
-	lv_obj_set_pos_us(ta, 0, 0);
-    lv_obj_set_free_p(ta, app);
-	lv_page_set_rel_action(ta, ta_rel_action);
-	lv_ta_set_text(ta, "Write a text to send to the other applications");
-}
-
-/**
- * Close the window of an application
- * @param app pointer to an application
- */
-static void my_win_close(lv_app_inst_t * app)
-{
-
-}
-
-/*--------------------
- * OTHER FUNCTIONS
- ---------------------*/
-
-/**
- * Called when the text area on the window is released to open the app. keyboard
- * @param ta pointer to the text area on the window
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_OK because the text area is not deleted
- */
-static lv_action_res_t ta_rel_action(lv_obj_t * ta, lv_dispi_t * dispi)
-{
-    lv_ta_set_text(ta, ""); /*Clear the ta*/
-    lv_app_kb_open(ta, LV_APP_KB_MODE_TXT | LV_APP_KB_MODE_WIN_RESIZE, NULL, kb_ok_action);
-    return LV_ACTION_RES_OK;
-}
-
-/**
- * Called when the "Ok" button is  pressed on the app. keyboard
- * @param ta pointer to the text area assigned to the app. kexboard
- */
-static void kb_ok_action(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    const char * txt = lv_ta_get_txt(ta);
-    lv_app_com_send(app, LV_APP_COM_TYPE_CHAR, txt, strlen(txt));
-}
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_EXAMPLE != 0*/

lv_appx/lv_app_example.h

@@ -1,48 +0,0 @@
-/**
- * @file lv_app_example.h
- *
- */
-
-#ifndef LV_APP_EXAMPLE_H
-#define LV_APP_EXAMPLE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lvgl/lv_app/lv_app.h"
-
-#if LV_APP_ENABLE != 0 && USE_LV_APP_EXAMPLE != 0
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-typedef struct
-{
-
-}lv_app_example_conf_t;
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-const lv_app_dsc_t * lv_app_example_init(void);
-
-/**********************
- *      MACROS
- **********************/
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_EXAMPLE != 0*/
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* LV_APP_EXAMPLE_H */

lv_appx/lv_app_files.c

@@ -1,897 +0,0 @@
-/**
- * @file lv_app_example.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_app_files.h"
-#if LV_APP_ENABLE != 0 && USE_LV_APP_FILES != 0
-
-#include <stdio.h>
-#include "misc/os/ptask.h"
-#include "../lv_app/lv_app_util/lv_app_kb.h"
-#include "../lv_app/lv_app_util/lv_app_notice.h"
-
-/*********************
- *      DEFINES
- *********************/
-#define LV_APP_FILES_CHUNK_MIN_SIZE     32
-#define LV_APP_FILES_CHUNK_MIN_TIME     10
-#define LV_APP_FILES_CHUNK_MAX_TIME     10000
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/*Application specific data for an instance of this application*/
-typedef struct
-{
-    char path[LV_APP_FILES_PATH_MAX_LEN];
-    char fn[LV_APP_FILES_FN_MAX_LEN];
-    fs_file_t file;
-    uint8_t file_cnt;
-    uint16_t chunk_delay;
-    uint16_t chunk_size;
-    uint8_t send_fn     :1;
-    uint8_t send_size   :1;
-    uint8_t send_crc    :1;
-    uint8_t send_in_prog :1;
-    ptask_t * send_task;
-}my_app_data_t;
-
-/*Application specific data a window of this application*/
-typedef struct
-{
-    lv_obj_t * file_list;
-}my_win_data_t;
-
-/*Application specific data for a shortcut of this application*/
-typedef struct
-{
-    lv_obj_t * label;
-}my_sc_data_t;
-
-typedef enum
-{
-    SEND_SETTINGS_FN,
-    SEND_SETTINGS_SIZE,
-    SEND_SETTINGS_CRC,
-    SEND_SETTINGS_CHUNK_SIZE,
-    SEND_SETTINGS_CHUNK_DELAY,
-}send_settings_id_t;
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-static void my_app_run(lv_app_inst_t * app, void * conf);
-static void my_app_close(lv_app_inst_t * app);
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec, lv_app_com_type_t type , const void * data, uint32_t size);
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc);
-static void my_sc_close(lv_app_inst_t * app);
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win);
-static void my_win_close(lv_app_inst_t * app);
-static void my_conf_open(lv_app_inst_t * app, lv_obj_t * conf_win);
-
-static void win_load_file_list(lv_app_inst_t * app);
-static void win_create_list(lv_app_inst_t * app);
-static lv_action_res_t win_up_action(lv_obj_t * up, lv_dispi_t * dispi);
-static lv_action_res_t win_next_action(lv_obj_t * next, lv_dispi_t * dispi);
-static lv_action_res_t win_prev_action(lv_obj_t * prev, lv_dispi_t * dispi);
-static lv_action_res_t win_drv_action(lv_obj_t * drv, lv_dispi_t * dispi);
-static lv_action_res_t win_folder_action(lv_obj_t * folder, lv_dispi_t * dispi);
-static lv_action_res_t win_file_action(lv_obj_t * file, lv_dispi_t * dispi);
-static lv_action_res_t win_send_rel_action(lv_obj_t * send, lv_dispi_t * dispi);
-static lv_action_res_t win_send_settings_element_rel_action(lv_obj_t * element, lv_dispi_t * dispi);
-static lv_action_res_t win_back_action(lv_obj_t * back, lv_dispi_t * dispi);
-static lv_action_res_t win_del_rel_action(lv_obj_t * del, lv_dispi_t * dispi);
-static lv_action_res_t win_del_lpr_action(lv_obj_t * del, lv_dispi_t * dispi);
-static void send_settings_kb_close_action(lv_obj_t * ta);
-static void send_settings_kb_ok_action(lv_obj_t * ta);
-static void start_send(lv_app_inst_t * app, const char * path);
-static void send_task(void * param);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-static lv_app_dsc_t my_app_dsc =
-{
-	.name = "Files",
-	.mode = LV_APP_MODE_NONE,
-	.app_run = my_app_run,
-	.app_close = my_app_close,
-	.com_rec = my_com_rec,
-	.win_open = my_win_open,
-	.win_close = my_win_close,
-	.sc_open = my_sc_open,
-	.sc_close = my_sc_close,
-    .conf_open = my_conf_open,
-	.app_data_size = sizeof(my_app_data_t),
-	.sc_data_size = sizeof(my_sc_data_t),
-	.win_data_size = sizeof(my_win_data_t),
-};
-
-static lv_style_t style_sc_label;
-static lv_style_t style_btn_symbol;
-
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Initialize the application
- * @return pointer to the application descriptor of this application
- */
-const lv_app_dsc_t * lv_app_files_init(void)
-{
-    lv_app_style_t * app_style = lv_app_style_get();
-    memcpy(&style_sc_label, &app_style->sc_rec_rel, sizeof(lv_style_t));
-    style_sc_label.font = font_get(LV_APP_FONT_LARGE);
-
-    lv_style_get(LV_STYLE_BTN_REL, &style_btn_symbol);
-    style_btn_symbol.font = font_get(LV_IMG_DEF_SYMBOL_FONT);
-	return &my_app_dsc;
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-/**
- * Run an application according to 'app_dsc'
- * @param app_dsc pointer to an application descriptor
- * @param conf pointer to a lv_app_example_conf_t structure with configuration data or NULL if unused
- * @return pointer to the opened application or NULL if any error occurred
- */
-static void my_app_run(lv_app_inst_t * app, void * conf)
-{
-    /*Initialize the application*/
-    my_app_data_t * app_data = app->app_data;
-    app_data->file_cnt = 0;
-    app_data->path[0] = '\0';
-    app_data->fn[0] = '\0';
-    app_data->send_fn = 0;
-    app_data->send_size = 0;
-    app_data->send_crc = 0;
-    app_data->chunk_size = LV_APP_FILES_CHUNK_DEF_SIZE;
-    app_data->chunk_delay = LV_APP_FILES_CHUNK_DEF_TIME;
-    app_data->send_in_prog = 0;
-
-    app_data->send_task = ptask_create(send_task, LV_APP_FILES_CHUNK_DEF_TIME, PTASK_PRIO_OFF, app);
-}
-
-/**
- * Close a running application.
- * Close the Window and the Shortcut too if opened.
- * Free all the allocated memory by this application.
- * @param app pointer to an application
- */
-static void my_app_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_app_data'*/
-    my_app_data_t * app_data = app->app_data;
-    ptask_del(app_data->send_task);
-    if(app_data->send_in_prog != 0) fs_close(&app_data->file);
-
-}
-
-/**
- * Read the data have been sent to this application
- * @param app_send pointer to an application which sent the message
- * @param app_rec pointer to an application which is receiving the message
- * @param type type of data from 'lv_app_com_type_t' enum
- * @param data pointer to the sent data
- * @param size length of 'data' in bytes
- */
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec,
-                       lv_app_com_type_t type , const void * data, uint32_t size)
-{
-    if(type == LV_APP_COM_TYPE_CHAR) {
-        /*Check for file query. E.g. "U:/file.txt?"*/
-        const char * path = data;
-        if(path[size - 1] == '?') {
-            if(size > LV_APP_FILES_PATH_MAX_LEN + LV_APP_FILES_FN_MAX_LEN) {
-                lv_app_notice_add("Can not send file:\ntoo long path");
-            }
-
-            char path_fn[LV_APP_FILES_PATH_MAX_LEN + LV_APP_FILES_FN_MAX_LEN];
-            memcpy(path_fn, data, size - 1); /*-1 to ignore the '?' at the end*/
-            path_fn[size - 1] = '\0';
-            start_send(app_rec, path_fn);
-        }
-    }
-}
-
-/**
- * Open a shortcut for an application
- * @param app pointer to an application
- * @param sc pointer to an object where the application
- *           can create content of the shortcut
- */
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc)
-{
-    my_sc_data_t * sc_data = app->sc_data;
-    my_app_data_t * app_data = app->app_data;
-
-
-    sc_data->label = lv_label_create(sc, NULL);
-    lv_obj_set_style(sc_data->label, &style_sc_label);
-    lv_label_set_text(sc_data->label, fs_get_last(app_data->path));
-    lv_obj_align(sc_data->label, NULL, LV_ALIGN_CENTER, 0, 0);
-}
-
-/**
- * Close the shortcut of an application
- * @param app pointer to an application
- */
-static void my_sc_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_sc_data'*/
-}
-
-
-/**
- * Open the application in a window
- * @param app pointer to an application
- * @param win pointer to a window object where
- *            the application can create content
- */
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
-{
-    my_win_data_t * win_data = app->win_data;
-    my_app_data_t * app_data = app->app_data;
-
-    app_data->file_cnt = 0;
-    win_data->file_list = NULL;
-
-    lv_win_set_title(win, app_data->path);
-
-    win_load_file_list(app);
-}
-
-/**
- * Close the window of an application
- * @param app pointer to an application
- */
-static void my_win_close(lv_app_inst_t * app)
-{
-
-}
-
-/**
- * Create objects to configure the applications
- * @param app pointer to an application which settings should be created
- * @param conf_win pointer to a window where the objects can be created
- *                (the window has the proper layout)
- */
-static void my_conf_open(lv_app_inst_t * app, lv_obj_t * conf_win)
-{
-    my_app_data_t * app_data = app->app_data;
-
-    /*Create check boxes*/
-    lv_obj_t * cb;
-
-    /*Send file name check box*/
-    cb = lv_cb_create(conf_win, NULL);
-    lv_cb_set_text(cb, "Send file name");
-    lv_obj_set_free_num(cb, SEND_SETTINGS_FN);
-    lv_obj_set_free_p(cb, app);
-    lv_btn_set_rel_action(cb, win_send_settings_element_rel_action);
-    if(app_data->send_fn != 0) lv_btn_set_state(cb, LV_BTN_STATE_TREL);
-    else lv_btn_set_state(cb, LV_BTN_STATE_REL);
-
-    /*Send size check box*/
-    cb = lv_cb_create(conf_win, cb);
-    lv_cb_set_text(cb, "Send size");
-    lv_obj_set_free_num(cb, SEND_SETTINGS_SIZE);
-    if(app_data->send_size != 0) lv_btn_set_state(cb, LV_BTN_STATE_TREL);
-    else lv_btn_set_state(cb, LV_BTN_STATE_REL);
-
-    /*Send CRC check box*/
-    cb = lv_cb_create(conf_win, cb);
-    lv_cb_set_text(cb, "Send CRC");
-    lv_obj_set_free_num(cb, SEND_SETTINGS_CRC);
-    if(app_data->send_crc != 0) lv_btn_set_state(cb, LV_BTN_STATE_TREL);
-    else lv_btn_set_state(cb, LV_BTN_STATE_REL);
-
-    /*Create a text area to type chunk size*/
-    lv_obj_t * val_set_h;
-    val_set_h = lv_cont_create(conf_win, NULL);
-    lv_obj_set_style(val_set_h, lv_style_get(LV_STYLE_PLAIN_COLOR, NULL));
-    lv_obj_set_click(val_set_h, false);
-    lv_cont_set_fit(val_set_h, true, true);
-    lv_cont_set_layout(val_set_h, LV_CONT_LAYOUT_ROW_M);
-
-    lv_obj_t * label;
-    label = lv_label_create(val_set_h, NULL);
-    lv_label_set_text(label, "Chunk size");
-
-    lv_obj_t * ta;
-    char buf[32];
-    ta = lv_ta_create(val_set_h, NULL);
-    lv_cont_set_fit(ta, false, true);
-    lv_obj_set_free_num(ta, SEND_SETTINGS_CHUNK_SIZE);
-    lv_obj_set_free_p(ta, app);
-    lv_page_set_rel_action(ta, win_send_settings_element_rel_action);
-    sprintf(buf, "%d", app_data->chunk_size);
-    lv_ta_set_text(ta, buf);
-
-    /*Create a text area to type the chunk delay*/
-    val_set_h = lv_cont_create(conf_win, val_set_h);
-
-    label = lv_label_create(val_set_h, NULL);
-    lv_label_set_text(label, "Inter-chunk delay");
-
-    ta = lv_ta_create(val_set_h, ta);
-    lv_obj_set_free_num(ta, SEND_SETTINGS_CHUNK_DELAY);
-    sprintf(buf, "%d", app_data->chunk_delay);
-    lv_ta_set_text(ta, buf);
-}
-
-/*--------------------
- * OTHER FUNCTIONS
- ---------------------*/
-/**
- * Create an mpty list on the window. 'win_load_file_list' will fill it.
- * @param app pointer to a Files application
- */
-static void win_create_list(lv_app_inst_t * app)
-{
-    my_win_data_t * win_data = app->win_data;
-
-    /*Delete the previous list*/
-    if(win_data->file_list != NULL) {
-      lv_obj_del(win_data->file_list);
-    }
-
-    /*Create a new list*/
-    win_data->file_list = lv_list_create(app->win, NULL);
-    lv_obj_set_width(win_data->file_list, lv_win_get_width(app->win));
-    lv_list_set_style_img(win_data->file_list, &style_btn_symbol);
-    lv_obj_set_style(lv_page_get_scrl(win_data->file_list), lv_style_get(LV_STYLE_TRANSP_TIGHT, NULL));
-    lv_obj_set_drag_parent(win_data->file_list, true);
-    lv_obj_set_drag_parent(lv_page_get_scrl(win_data->file_list), true);
-    lv_cont_set_fit(win_data->file_list, false, true);
-    lv_cont_set_layout(lv_page_get_scrl(win_data->file_list), LV_CONT_LAYOUT_COL_L);
-}
-
-/**
- * Load the file list from the current path on the window
- * @param app pointer to a Files application
- */
-static void win_load_file_list(lv_app_inst_t * app)
-{
-    my_app_data_t * app_data = app->app_data;
-    my_win_data_t * win_data = app->win_data;
-
-    /*Create a new list*/
-    win_create_list(app);
-
-    fs_res_t res = FS_RES_OK;
-
-      /*At empty path show the drivers */
-    lv_obj_t * liste;
-    if(app_data->path[0] == '\0') {
-        char drv[16];
-        char buf[2];
-        fs_get_letters(drv);
-        uint8_t i;
-        for(i = 0; drv[i] != '\0'; i++) {
-            buf[0] = drv[i];
-            buf[1] = '\0';
-            liste = lv_list_add(win_data->file_list, SYMBOL_DRIVE, buf, win_drv_action);
-            lv_obj_set_free_p(liste, app);
-        }
-    }
-    /*List the files/folders with fs interface*/
-    else {
-        liste = lv_list_add(win_data->file_list, SYMBOL_UP, "Up", win_up_action);
-        lv_obj_set_free_p(liste, app);
-
-        fs_readdir_t rd;
-        res = fs_readdir_init(&rd, app_data->path);
-        if(res != FS_RES_OK) {
-            lv_app_notice_add("Can not read the\npath in Files");
-        return;
-        }
-
-        /*At not first page add prev. page button */
-        if(app_data->file_cnt != 0) {
-            liste = lv_list_add(win_data->file_list, SYMBOL_LEFT, "Previous page", win_prev_action);
-            lv_obj_set_free_p(liste, app);
-        }
-
-        char fn[LV_APP_FILES_FN_MAX_LEN];
-
-        /*Read the files from the previous pages*/
-        uint16_t file_cnt = 0;
-        while(file_cnt <= app_data->file_cnt) {
-            res = fs_readdir(&rd, fn);
-            if(res != FS_RES_OK ){
-                lv_app_notice_add("Can not read\nthe path in Files");
-                return;
-            }
-            file_cnt ++;
-        }
-
-        /*Add list elements from the files and folders*/
-        while(res == FS_RES_OK && fn[0] != '\0') {
-            if(fn[0] == '/') { /*Add a folder*/
-                lv_obj_t * liste;
-                liste = lv_list_add(win_data->file_list, SYMBOL_FOLDER, &fn[1], win_folder_action);
-                lv_obj_set_free_p(liste, app);
-                app_data->file_cnt ++;
-            }
-            /*Add a file*/
-            else {
-                liste = lv_list_add(win_data->file_list, SYMBOL_FILE, fn, win_file_action);
-                lv_obj_set_free_p(liste, app);
-                app_data->file_cnt ++;
-            }
-
-            /*Get the next element*/
-            res = fs_readdir(&rd, fn);
-
-            /*Show only LV_APP_FSEL_MAX_FILE elements and add a Next page button*/
-            if(app_data->file_cnt != 0 && app_data->file_cnt % LV_APP_FILES_PAGE_SIZE == 0) {
-                liste = lv_list_add(win_data->file_list, SYMBOL_RIGHT, "Next page", win_next_action);
-                lv_obj_set_free_p(liste, app);
-                break;
-            }
-        }
-
-      /*Close the read directory*/
-      fs_readdir_close(&rd);
-    }
-
-    if(res != FS_RES_OK) {
-        lv_app_notice_add("Can not read\nthe path in Files");
-    }
-
-    /*Focus to the top of the list*/
-    lv_obj_set_y(lv_page_get_scrl(win_data->file_list), 0);
-    return;
-}
-
-
-/**
- * Called when the Up list element is released to step one level
- * @param up pointer to the Up button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the list is deleted in the function
- */
-static lv_action_res_t win_up_action(lv_obj_t * up, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(up);
-    my_app_data_t * app_data = app->app_data;
-    fs_up(app_data->path);
-    app_data->file_cnt = 0;
-    lv_win_set_title(app->win, app_data->path);
-
-    my_sc_data_t * sc_data = app->sc_data;
-    if(sc_data != NULL) {
-        lv_label_set_text(sc_data->label, fs_get_last(app_data->path));
-        lv_obj_align(sc_data->label, NULL, LV_ALIGN_CENTER, 0, 0);
-    }
-
-    win_load_file_list(app);
-    return LV_ACTION_RES_INV;
-}
-
-/**
- * Called when the Next list element is released to go to the next page
- * @param next pointer to the Next button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the list is deleted in the function
- */
-static lv_action_res_t win_next_action(lv_obj_t * next, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(next);
-    win_load_file_list(app);
-    return LV_ACTION_RES_INV;
-}
-
-/**
- * Called when the Prev list element is released to previous page
- * @param prev pointer to the Prev button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the list is deleted in the function
- */
-static lv_action_res_t win_prev_action(lv_obj_t * prev, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(prev);
-    my_app_data_t * app_data = app->app_data;
-    if(app_data->file_cnt <= 2 * LV_APP_FILES_PAGE_SIZE) app_data->file_cnt = 0;
-    else if(app_data->file_cnt % LV_APP_FILES_PAGE_SIZE == 0) {
-        app_data->file_cnt -= 2 * LV_APP_FILES_PAGE_SIZE;
-    } else {
-        app_data->file_cnt = ((app_data->file_cnt / LV_APP_FILES_PAGE_SIZE) - 1) * LV_APP_FILES_PAGE_SIZE;
-    }
-
-    win_load_file_list(app);
-    return LV_ACTION_RES_INV;
-}
-
-
-/**
- * Called when the Driver list element is released to step into a driver
- * @param drv pointer to the Driver button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the list is deleted in the function
- */
-static lv_action_res_t win_drv_action(lv_obj_t * drv, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(drv);
-    my_app_data_t * app_data = app->app_data;
-    sprintf(app_data->path, "%s:", lv_list_get_element_text(drv));
-    app_data->file_cnt = 0;
-    lv_win_set_title(app->win, app_data->path);
-    my_sc_data_t * sc_data = app->sc_data;
-    if(sc_data != NULL) {
-        lv_label_set_text(sc_data->label, fs_get_last(app_data->path));
-        lv_obj_align(sc_data->label, NULL, LV_ALIGN_CENTER, 0, 0);
-    }
-
-    win_load_file_list(app);
-    return LV_ACTION_RES_INV;
-}
-
-
-/**
- * Called when a folder list element is released to enter into it
- * @param folder pointer to a folder button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the list is deleted in the function
- */
-static lv_action_res_t win_folder_action(lv_obj_t * folder, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(folder);
-    my_app_data_t * app_data = app->app_data;
-    sprintf(app_data->path, "%s/%s", app_data->path, lv_list_get_element_text(folder));
-    app_data->file_cnt = 0;
-
-    lv_win_set_title(app->win, app_data->path);
-    my_sc_data_t * sc_data = app->sc_data;
-    if(sc_data != NULL) {
-        lv_label_set_text(sc_data->label, fs_get_last(app_data->path));
-        lv_obj_align(sc_data->label, NULL, LV_ALIGN_CENTER, 0, 0);
-    }
-
-
-    win_load_file_list(app);
-    return LV_ACTION_RES_INV;
-}
-
-
-/**
- * Called when a file list element is released to show the list of operation on it
- * @param file pointer to a file button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the list is deleted in the function
- */
-static lv_action_res_t win_file_action(lv_obj_t * file, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(file);
-    my_app_data_t * app_data = app->app_data;
-    my_win_data_t * win_data = app->win_data;
-
-    sprintf(app_data->fn, "%s", lv_list_get_element_text(file));
-
-    win_create_list(app);
-
-    /*Create the list of operations*/
-    lv_obj_t * liste;
-    liste = lv_list_add(win_data->file_list, SYMBOL_LEFT, "Back", win_back_action);
-    lv_obj_set_free_p(liste, app);
-
-    /*Send button*/
-    liste = lv_list_add(win_data->file_list, NULL, "Send", win_send_rel_action);
-    lv_obj_set_free_p(liste, app);
-
-    /*Delete button*/
-    liste = lv_list_add(win_data->file_list, NULL, "Delete", win_del_rel_action);
-    lv_btn_set_lpr_action(liste, win_del_lpr_action);
-    lv_obj_set_free_p(liste, app);
-
-    return LV_ACTION_RES_INV;
-}
-
-/**
- * Called when the Back list element is released to when a file chosen to
- * go back to the file list from file operation
- * @param back pointer to the back button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_INV because the list is deleted in the function
- */
-static lv_action_res_t win_back_action(lv_obj_t * up, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(up);
-    my_app_data_t * app_data = app->app_data;
-
-    app_data->file_cnt = 0;
-    win_load_file_list(app);
-    return LV_ACTION_RES_INV;
-}
-
-/**
- * Called when the Send list element is released to send the file
- * @param sed pointer to the Up button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_OK because the list is NOT deleted in the function
- */
-static lv_action_res_t win_send_rel_action(lv_obj_t * send, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(send);
-    my_app_data_t * app_data = app->app_data;
-
-    if(app_data->send_in_prog != 0) {
-        lv_app_notice_add("File sending\nin progress");
-        return LV_ACTION_RES_OK;
-    }
-
-    char path_fn[LV_APP_FILES_PATH_MAX_LEN + LV_APP_FILES_FN_MAX_LEN];
-    sprintf(path_fn, "%s/%s", app_data->path, app_data->fn);
-    start_send(app, path_fn);
-
-    return LV_ACTION_RES_OK;
-}
-
-/**
- * Called when a send settings element is released
- * @param element pointer to a chekbox or text area
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_OK because the list is NOT deleted in the function
- */
-static lv_action_res_t win_send_settings_element_rel_action(lv_obj_t * element, lv_dispi_t * dispi)
-{
-    send_settings_id_t id = lv_obj_get_free_num(element);
-    lv_app_inst_t * app = lv_obj_get_free_p(element);
-    my_app_data_t * app_data = app->app_data;
-
-    if(id == SEND_SETTINGS_FN) {
-        app_data->send_fn = lv_btn_get_state(element) == LV_BTN_STATE_REL ? 0 : 1;
-    } else if(id == SEND_SETTINGS_SIZE) {
-        app_data->send_size = lv_btn_get_state(element) == LV_BTN_STATE_REL ? 0 : 1;
-    } else if(id == SEND_SETTINGS_CRC) {
-        app_data->send_crc = lv_btn_get_state(element) == LV_BTN_STATE_REL ? 0 : 1;
-
-        /*TODO CRC sending is not supported yet*/
-        if(app_data->send_crc != 0) {
-            lv_app_notice_add("CRC sending is\nnot supported yet");
-        }
-    } else if(id == SEND_SETTINGS_CHUNK_SIZE) {
-        lv_app_kb_open(element, LV_APP_KB_MODE_NUM | LV_APP_KB_MODE_WIN_RESIZE, send_settings_kb_close_action, send_settings_kb_ok_action);
-    } else if(id == SEND_SETTINGS_CHUNK_DELAY) {
-        lv_app_kb_open(element, LV_APP_KB_MODE_NUM | LV_APP_KB_MODE_WIN_RESIZE, send_settings_kb_close_action, send_settings_kb_ok_action);
-    }
-
-    return LV_ACTION_RES_OK;
-}
-
-
-/**
- * Called when the Delete list element is released.
- * It will show a notification to long press the Delete button to remove the file
- * @param del pointer to the back button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_OK because the list is NOT deleted in the function
- */
-static lv_action_res_t win_del_rel_action(lv_obj_t * del, lv_dispi_t * dispi)
-{
-    lv_app_notice_add("Press long the Delete button\n"
-                      "to remove the file");
-
-    return LV_ACTION_RES_OK;
-}
-/**
- * Called when the Delete list element is long pressed to remove a file
- * @param del pointer to the Delete button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_OK because the list is NOT deleted in the function
- */
-static lv_action_res_t win_del_lpr_action(lv_obj_t * del, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(del);
-    my_app_data_t * app_data = app->app_data;
-
-    char path_fn[LV_APP_FILES_PATH_MAX_LEN + LV_APP_FILES_FN_MAX_LEN];
-    sprintf(path_fn, "%s/%s", app_data->path, app_data->fn);
-
-    fs_res_t res = fs_remove(path_fn);
-    if(res == FS_RES_OK) lv_app_notice_add("%s deleted", app_data->fn);
-    else lv_app_notice_add("Can not delete\n%s", app_data->fn);
-
-    return LV_ACTION_RES_OK;
-}
-
-/**
- * Called when a send setting is typed and 'Close' pressed on the App. keyboard.
- * The function reverts the original value in the text area.
- * @param ta pointer to a text area
- */
-static void send_settings_kb_close_action(lv_obj_t * ta)
-{
-    send_settings_id_t id = lv_obj_get_free_num(ta);
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * app_data = app->app_data;
-
-    char buf[32];
-    buf[0] = '\0';
-
-    if(id == SEND_SETTINGS_CHUNK_DELAY) {
-        sprintf(buf, "%d", app_data->chunk_size);
-    } else if(id == SEND_SETTINGS_CHUNK_SIZE) {
-        sprintf(buf, "%d", app_data->chunk_size);
-    }
-    lv_ta_set_text(ta, buf);
-}
-
-/**
- * Called when a send setting is typed and 'Ok' pressed on the App. keyboard.
- * The function saves teh new value.
- * @param ta pointer to a text area
- */
-static void send_settings_kb_ok_action(lv_obj_t * ta)
-{
-    send_settings_id_t id = lv_obj_get_free_num(ta);
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * app_data = app->app_data;
-
-    int num;
-    sscanf(lv_ta_get_txt(ta), "%d", &num);
-
-    if(id == SEND_SETTINGS_CHUNK_DELAY) {
-        if(num > LV_APP_FILES_CHUNK_MAX_TIME) num = LV_APP_FILES_CHUNK_MAX_TIME;
-        if(num < LV_APP_FILES_CHUNK_MIN_TIME) num = LV_APP_FILES_CHUNK_MIN_TIME;
-        app_data->chunk_delay = (uint16_t) num;
-    } else if(id == SEND_SETTINGS_CHUNK_SIZE) {
-        if(num > LV_APP_FILES_CHUNK_MAX_SIZE) num = LV_APP_FILES_CHUNK_MAX_SIZE;
-        if(num < LV_APP_FILES_CHUNK_MIN_SIZE) num = LV_APP_FILES_CHUNK_MIN_SIZE;
-        app_data->chunk_size= (uint16_t) num;
-    }
-
-}
-
-/**
- * Start the sending of a file
- * @param app pointer to a Files application
- * @param path path of the file to send
- */
-static void start_send(lv_app_inst_t * app, const char * path)
-{
-    my_app_data_t * app_data = app->app_data;
-
-    /*Open the file*/
-    fs_res_t res = fs_open(&app_data->file, path, FS_MODE_RD);
-    if(res == FS_RES_OK) {
-        app_data->send_in_prog = 1;
-
-        /*Send the header*/
-        if(app_data->send_fn != 0) {
-            lv_app_com_send(app, LV_APP_COM_TYPE_CHAR, app_data->path, strlen(app_data->path));
-            lv_app_com_send(app, LV_APP_COM_TYPE_CHAR, "/", 1);
-            lv_app_com_send(app, LV_APP_COM_TYPE_CHAR, app_data->fn, strlen(app_data->fn));
-            lv_app_com_send(app, LV_APP_COM_TYPE_CHAR, "\n", 1);
-        }
-
-        if(app_data->send_size != 0) {
-            char buf[64];
-            uint32_t size;
-            fs_size(&app_data->file, &size);
-            sprintf(buf,"%d", (int) size);
-            lv_app_com_send(app, LV_APP_COM_TYPE_CHAR, buf, strlen(buf));
-            lv_app_com_send(app, LV_APP_COM_TYPE_CHAR, "\n", 1);
-        }
-        if(app_data->send_crc != 0) {
-            lv_app_com_send(app, LV_APP_COM_TYPE_CHAR, "0x0000", 6);
-            lv_app_com_send(app, LV_APP_COM_TYPE_CHAR, "\n", 1);
-        }
-
-        /*Add an extra \n to separate the header from the file data*/
-        if(app_data->send_fn != 0 || app_data->send_size != 0 || app_data->send_crc != 0) {
-            lv_app_com_send(app, LV_APP_COM_TYPE_CHAR, "\n", 1);
-        } 
-    }
-
-    /*If an error occurred  close the file*/
-    if(res != FS_RES_OK) {
-        fs_close(&app_data->file);
-        ptask_set_prio(app_data->send_task, PTASK_PRIO_OFF);
-        app_data->send_in_prog = 0;
-        lv_app_notice_add("Can not send\nthe file in Files");
-    }
-    /*If no error show notification, start the sender task and refresh the shortcut*/
-    else {
-       /*Start the sender task*/
-       ptask_set_period(app_data->send_task, app_data->chunk_delay);
-       ptask_reset(app_data->send_task);
-       ptask_set_prio(app_data->send_task, PTASK_PRIO_HIGH);
-       lv_app_notice_add("Sending\n%s", fs_get_last(path));
-
-       /*Refresh the shortcut with the percentage of the sending*/
-       if(app->sc_data != NULL) {
-           my_sc_data_t * sc_data = app->sc_data;
-
-           uint32_t size;
-           fs_size(&app_data->file, &size);
-           uint32_t pos;
-           fs_tell(&app_data->file, &pos);
-
-           int pct = (uint32_t) (pos * 100) / size;
-
-           char buf[256];
-           sprintf(buf, "Sending\n%d%%", pct);
-           lv_label_set_text(sc_data->label, buf);
-           lv_obj_align(sc_data->label, NULL, LV_ALIGN_CENTER, 0, 0);
-       }
-   }
-}
-
-/**
- * Periodically send the next chunk of the file
- * @param app pointer to a Files application
- */
-static void send_task(void * param)
-{
-    lv_app_inst_t * app = param;
-    my_app_data_t * app_data = app->app_data;
-
-    if(app_data->send_in_prog == 0) return;
-
-    /*Read a chunk*/
-    uint32_t rn;
-    char rd_buf[LV_APP_FILES_CHUNK_MAX_SIZE];
-    fs_res_t res = fs_read(&app_data->file, rd_buf, app_data->chunk_size, &rn);
-    if(res == FS_RES_OK) {
-       app_data->send_in_prog = 1;
-       lv_app_com_send(app, LV_APP_COM_TYPE_CHAR, rd_buf, rn);
-    }
-
-    /*If the read failed close the file and show an error*/
-    if(res != FS_RES_OK) {
-       fs_close(&app_data->file);
-       app_data->send_in_prog = 0;
-       lv_app_notice_add("Can not send\nthe file in Files");
-    }
-    /*If the read was successful*/
-    else {
-        my_sc_data_t * sc_data = app->sc_data;
-
-        /*If the file is read close it a show a notification*/
-        if(rn < app_data->chunk_size) {
-            lv_app_notice_add("File sent");
-            fs_close(&app_data->file);
-            app_data->send_in_prog = 0;
-
-            /*Refresh the shortut*/
-            if(sc_data != NULL) {
-                lv_label_set_text(sc_data->label, fs_get_last(app_data->path));
-                lv_obj_align(sc_data->label, NULL, LV_ALIGN_CENTER, 0, 0);
-            }
-        }
-        /*If the file is not sent yet refresh the shortcut with percentage of sending*/
-        else {
-            if(sc_data != NULL) {
-                uint32_t size;
-                fs_size(&app_data->file, &size);
-                uint32_t pos;
-                fs_tell(&app_data->file, &pos);
-
-                uint8_t pct = (uint32_t) (pos * 100) / size;
-
-                char buf[256];
-                sprintf(buf, "Sending\n%d%%", pct);
-                lv_label_set_text(sc_data->label, buf);
-                lv_obj_align(sc_data->label, NULL, LV_ALIGN_CENTER, 0, 0);
-            }
-        }
-    }
-}
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_FILES != 0*/

lv_appx/lv_app_files.h

@@ -1,47 +0,0 @@
-/**
- * @file lv_app_files.h
- *
- */
-
-#ifndef LV_APP_FILES_H
-#define LV_APP_FILES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lvgl/lv_app/lv_app.h"
-
-#if LV_APP_ENABLE != 0 && USE_LV_APP_FILES != 0
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-typedef struct
-{
-
-}lv_app_files_conf_t;
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-const lv_app_dsc_t * lv_app_files_init(void);
-
-/**********************
- *      MACROS
- **********************/
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_FILES != 0*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* LV_APP_EXAMPLE_H */

lv_appx/lv_app_gsm.c

@@ -1,477 +0,0 @@
-/**
- * @file lv_app_gsm.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_app_gsm.h"
-#if LV_APP_ENABLE != 0 && USE_LV_APP_GSM != 0
-
-#include "../lv_app/lv_app_util/lv_app_kb.h"
-#include "hal/gsm/gsm.h"
-#include "misc/os/ptask.h"
-#include "hal/systick/systick.h"
-#include "misc/comm/gsmmng.h"
-#include <stdio.h>
-
-/*********************
- *      DEFINES
- *********************/
-#define GSM_MONITOR_PERIOD     1000    /*ms*/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/*Application specific data for an instance of this application*/
-typedef struct
-{
-    char set_apn[128];
-    char set_ip[32];
-    char set_port[16];
-    uint8_t * last_msg_dp;
-    uint16_t last_msg_size;
-}my_app_data_t;
-
-/*Application specific data a window of this application*/
-typedef struct
-{
-    lv_obj_t * title;
-    lv_obj_t * netw_apn_ta;
-    lv_obj_t * tcp_ip_ta;
-    lv_obj_t * tcp_port_ta;
-}my_win_data_t;
-
-/*Application specific data for a shortcut of this application*/
-typedef struct
-{
-    lv_obj_t * label;
-}my_sc_data_t;
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-static void my_app_run(lv_app_inst_t * app, void * conf);
-static void my_app_close(lv_app_inst_t * app);
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec, lv_app_com_type_t type , const void * data, uint32_t size);
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc);
-static void my_sc_close(lv_app_inst_t * app);
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win);
-static void my_win_close(lv_app_inst_t * app);
-
-static void gsm_state_monitor_task(void * param);
-
-static lv_action_res_t netw_con_rel_action(lv_obj_t * btn, lv_dispi_t * dispi);
-static lv_action_res_t netw_apn_rel_action( lv_obj_t * ta, lv_dispi_t * dispi);
-static lv_action_res_t tcp_ip_rel_action( lv_obj_t * ta, lv_dispi_t * dispi);
-static lv_action_res_t tcp_port_rel_action( lv_obj_t * ta, lv_dispi_t * dispi);
-
-static void netw_apn_kb_ok(lv_obj_t * ta);
-static void netw_apn_kb_close(lv_obj_t * ta);
-static void tcp_ip_kb_ok(lv_obj_t * ta);
-static void tcp_ip_kb_close(lv_obj_t * ta);
-static void tcp_port_kb_ok(lv_obj_t * ta);
-static void tcp_port_kb_close(lv_obj_t * ta);
-
-static void tcp_transf_cb(gsm_state_t state, const char * txt);
-
-static void win_title_refr(void);
-
-static void save_conf(lv_app_inst_t * app);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-static lv_app_dsc_t my_app_dsc =
-{
-	.name = "GSM",
-	.mode = LV_APP_MODE_NONE,
-	.app_run = my_app_run,
-	.app_close = my_app_close,
-	.com_rec = my_com_rec,
-	.win_open = my_win_open,
-	.win_close = my_win_close,
-	.sc_open = my_sc_open,
-	.sc_close = my_sc_close,
-	.app_data_size = sizeof(my_app_data_t),
-	.sc_data_size = sizeof(my_sc_data_t),
-	.win_data_size = sizeof(my_win_data_t),
-};
-
-static lv_app_inst_t * app_act_com;
-
-static char def_apn[128];
-static char def_ip[32];
-static char def_port[16];
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Initialize the application
- * @return pointer to the application descriptor of this application
- */
-const lv_app_dsc_t * lv_app_gsm_init(void)
-{
-    #ifdef LV_APP_GSM_CONF_PATH
-    fs_file_t f;
-    fs_res_t res;
-    
-    res = fs_open(&f, LV_APP_GSM_CONF_PATH, FS_MODE_RD);
-    if(res == FS_RES_NOT_EX) {
-        res = fs_open(&f, LV_APP_GSM_CONF_PATH, FS_MODE_WR | FS_MODE_RD);
-        if(res == FS_RES_OK) {
-            const char * def_conf = "apn\n100.101.102.103\n1234";
-            fs_write(&f, def_conf, strlen(def_conf) + 1, NULL);
-            fs_seek(&f, 0);
-        }
-    } 
-    
-    if(res == FS_RES_OK) {
-       volatile  char buf[256];
-       volatile  uint32_t rn;
-        fs_read(&f, (char *)buf, sizeof(buf) - 1, (uint32_t *)&rn);
-        
-        volatile  uint16_t i;
-        volatile uint16_t j = 0;
-        volatile uint8_t line_cnt = 0;
-        for(i = 0; i < rn; i++) {
-            if(buf[i] != '\n') {
-                if(line_cnt == 0) def_apn[j] = buf[i];
-                if(line_cnt == 1) def_ip[j] = buf[i];
-                if(line_cnt == 2) def_port[j] = buf[i];
-                j++;
-            } else {
-                if(line_cnt == 0) def_apn[j] = '\0';
-                if(line_cnt == 1) def_ip[j] = '\0';
-                if(line_cnt == 2) def_port[j] = '\0';
-                j = 0;
-                line_cnt ++;
-            }
-        }
-        
-        fs_close(&f);        
-        
-    } else {
-        lv_app_notice_add("SD card error");
-    }
-#else
-    strcpy(def_apn, LV_APP_GSM_APN_DEF);
-    strcpy(def_ip, LV_APP_GSM_IP_DEF);
-    strcpy(def_port, LV_APP_GSM_PORT_DEF);
-#endif
-    
-#if LV_APP_GSM_AUTO_CONNECT != 0
-    gsmmng_set_last_apn(def_apn);
-    gsmmng_set_last_tcp(def_ip, def_port);
-#endif
-    ptask_create(gsm_state_monitor_task, GSM_MONITOR_PERIOD, PTASK_PRIO_LOW, NULL);
-    
-    return &my_app_dsc;
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-/**
- * Run an application according to 'app_dsc'
- * @param app_dsc pointer to an application descriptor
- * @param conf pointer to a lv_app_example_conf_t structure with configuration data or NULL if unused
- * @return pointer to the opened application or NULL if any error occurred
- */
-static void my_app_run(lv_app_inst_t * app, void * conf)
-{
-    /*Initialize the application*/
-    my_app_data_t * adata = app->app_data;
-    strcpy(adata->set_apn, def_apn);
-    strcpy(adata->set_ip, def_ip);
-    strcpy(adata->set_port, def_port);
-}
-
-/**
- * Close a running application.
- * Close the Window and the Shortcut too if opened.
- * Free all the allocated memory by this application.
- * @param app pointer to an application
- */
-static void my_app_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_app_data'*/
-}
-
-/**
- * Read the data have been sent to this application
- * @param app_send pointer to an application which sent the message
- * @param app_rec pointer to an application which is receiving the message
- * @param type type of data from 'lv_app_com_type_t' enum
- * @param data pointer to the sent data
- * @param size length of 'data' in bytes
- */
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec,
-                       lv_app_com_type_t type , const void * data, uint32_t size)
-{
-	if(type == LV_APP_COM_TYPE_CHAR) {      /*data: string*/
-        app_act_com = app_rec;
-        gsm_tcp_transf(data, size, tcp_transf_cb);
-        my_app_data_t * adata = app_act_com->app_data;
-        if(adata->last_msg_dp != NULL) dm_free(adata->last_msg_dp); 
-        
-        adata->last_msg_dp = dm_alloc(size);
-        memcpy(adata->last_msg_dp, data, size);
-        adata->last_msg_size = size;
-	}
-}
-
-/**
- * Open a shortcut for an application
- * @param app pointer to an application
- * @param sc pointer to an object where the application
- *           can create content of the shortcut
- */
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc)
-{
-    my_sc_data_t * sc_data = app->sc_data;
-
-    sc_data->label = lv_label_create(sc, NULL);
-	lv_label_set_text(sc_data->label, "Empty");
-	lv_obj_align(sc_data->label, NULL, LV_ALIGN_CENTER, 0, 0);
-}
-
-/**
- * Close the shortcut of an application
- * @param app pointer to an application
- */
-static void my_sc_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_sc_data'*/
-}
-
-
-/**
- * Open the application in a window
- * @param app pointer to an application
- * @param win pointer to a window object where
- *            the application can create content
- */
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
-{
-    my_app_data_t * adata = app->app_data;
-    my_win_data_t * wdata = app->win_data;
-    
-    wdata->title = lv_label_create(win, NULL);
-       
-    lv_obj_t * ta_cont = lv_cont_create(win, NULL);
-    lv_cont_set_fit(ta_cont, true, true);
-    lv_cont_set_layout(ta_cont, LV_CONT_LAYOUT_COL_L);
-    lv_obj_set_style(ta_cont, lv_style_get(LV_STYLE_TRANSP_TIGHT, NULL));
-    
-    wdata->netw_apn_ta = lv_ta_create(ta_cont, NULL);
-    lv_cont_set_fit(wdata->netw_apn_ta, false, true);
-    lv_obj_set_free_p(wdata->netw_apn_ta, app);
-    lv_obj_set_width(wdata->netw_apn_ta, LV_DPI * 3);
-    lv_page_set_rel_action(wdata->netw_apn_ta, netw_apn_rel_action);
-    lv_ta_set_text(wdata->netw_apn_ta, adata->set_apn);
-    lv_ta_set_cursor_show(wdata->netw_apn_ta, false);
-  
-    wdata->tcp_ip_ta = lv_ta_create(ta_cont, wdata->netw_apn_ta);
-    lv_page_set_rel_action(wdata->tcp_ip_ta, tcp_ip_rel_action);
-    lv_ta_set_text(wdata->tcp_ip_ta, adata->set_ip);
-    
-    wdata->tcp_port_ta = lv_ta_create(ta_cont, wdata->netw_apn_ta);
-    lv_page_set_rel_action(wdata->tcp_port_ta, tcp_port_rel_action);
-    lv_ta_set_text(wdata->tcp_port_ta, adata->set_port);
-   
-    lv_obj_t * con_btn = lv_btn_create(win, NULL);
-    lv_obj_set_free_p(con_btn, app);
-    lv_btn_set_rel_action(con_btn, netw_con_rel_action);
-    lv_obj_t * label = lv_label_create(con_btn, NULL);
-    lv_label_set_text(label, "Connect");
-   
-    lv_cont_set_layout(lv_page_get_scrl(lv_win_get_page(win)), LV_CONT_LAYOUT_PRETTY); 
-    
-    win_title_refr();
-}
-
-
-/**
- * Close the window of an application
- * @param app pointer to an application
- */
-static void my_win_close(lv_app_inst_t * app)
-{
-
-}
-
-/*--------------------
- * OTHER FUNCTIONS
- ---------------------*/
-
-static void gsm_state_monitor_task(void * param)
-{
-    static gsmmng_state_t state_prev = GSMMNG_STATE_WAIT;
-    gsmmng_state_t state_act =  gsmmng_get_state();
-    
-    if(state_prev != state_act && state_act == GSMMNG_STATE_READY) {
-        lv_app_notice_add("GSM connected to:\n%s\n%s:%s", 
-                           gsmmng_get_last_apn(), gsmmng_get_last_ip(), gsmmng_get_last_port());
-        win_title_refr();
-    }
-      
-    /* The GSM should be busy if there is sg. to send. 
-     * It means fail during last send. Try again*/
-    if(app_act_com != NULL) {
-        if(gsm_busy() ==  false && state_act == GSMMNG_STATE_READY) {
-            /*Try to send the message again*/
-            lv_app_notice_add("Resend GSM message");
-            my_app_data_t * adata = app_act_com->app_data;
-            gsm_tcp_transf(adata->last_msg_dp, adata->last_msg_size, tcp_transf_cb);
-        }
-    }
-    
-    state_prev = state_act;
-}
-
-static lv_action_res_t netw_con_rel_action(lv_obj_t * btn, lv_dispi_t* dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(btn);
-    my_app_data_t * adata = app->app_data;
-    
-    gsmmng_set_last_apn(adata->set_apn);
-    gsmmng_set_last_tcp(adata->set_ip, adata->set_port);
-    gsmmng_reconnect();
-    save_conf(app);
-    lv_app_notice_add("Connecting to GSM network\n%s\n %s:%s", 
-                      adata->set_apn, adata->set_ip, adata->set_port);
-    return LV_ACTION_RES_OK;
-}
-
-static lv_action_res_t netw_apn_rel_action( lv_obj_t * ta, lv_dispi_t* dispi)
-{
-    lv_app_kb_open(ta, LV_APP_KB_MODE_TXT | LV_APP_KB_MODE_WIN_RESIZE | LV_APP_KB_MODE_CUR_MANAGE, netw_apn_kb_close ,netw_apn_kb_ok);
-    return LV_ACTION_RES_OK;
-}
-
-static lv_action_res_t tcp_ip_rel_action( lv_obj_t * ta, lv_dispi_t* dispi)
-{
-    lv_app_kb_open(ta, LV_APP_KB_MODE_TXT | LV_APP_KB_MODE_WIN_RESIZE | LV_APP_KB_MODE_CUR_MANAGE, tcp_ip_kb_close ,tcp_ip_kb_ok);
-    return LV_ACTION_RES_OK;
-}
-
-static lv_action_res_t tcp_port_rel_action( lv_obj_t * ta, lv_dispi_t* dispi)
-{
-    lv_app_kb_open(ta, LV_APP_KB_MODE_NUM | LV_APP_KB_MODE_WIN_RESIZE | LV_APP_KB_MODE_CUR_MANAGE, tcp_port_kb_close ,tcp_port_kb_ok);
-    return LV_ACTION_RES_OK;
-}
-
-static void netw_apn_kb_ok(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * adata = app->app_data;
-    strcpy(adata->set_apn, lv_ta_get_txt(ta));
-}
-
-static void netw_apn_kb_close(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * adata = app->app_data;
-    lv_ta_set_text(ta, adata->set_apn);
-}
-
-static void tcp_ip_kb_ok(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * adata = app->app_data;
-    strcpy(adata->set_ip, lv_ta_get_txt(ta));
-}
-
-static void tcp_ip_kb_close(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * adata = app->app_data;
-    lv_ta_set_text(ta, adata->set_ip);
-}
-
-static void tcp_port_kb_ok(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * adata = app->app_data;
-    strcpy(adata->set_port, lv_ta_get_txt(ta));
-}
-
-static void tcp_port_kb_close(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * adata = app->app_data;
-    lv_ta_set_text(ta, adata->set_port);
-}
-
-static void tcp_transf_cb(gsm_state_t state, const char * txt)
-{
-    if(state == GSM_STATE_OK) {
-        uint16_t size =  txt[0] + ((txt[1] << 8) & 0xFF00);
-        char buf[256];
-        memcpy(buf, &txt[2], size);
-        buf[size] = '\0';
-        lv_app_com_send(app_act_com, LV_APP_COM_TYPE_CHAR, &txt[2], size);
-        my_app_data_t * adata = app_act_com->app_data;
-        dm_free(adata->last_msg_dp);
-        adata->last_msg_dp = NULL;
-        adata->last_msg_size = 0;
-        app_act_com = NULL;
-    }else if(state == GSM_STATE_ERROR) {
-        lv_app_notice_add("GSM TCP transfer error\n%s", txt);
-        lv_app_notice_add("Reconnecting to GSM...");
-        gsmmng_reconnect();
-    }
-}
-
-
-static void win_title_refr(void)
-{
-    lv_app_inst_t * app;
-    app = lv_app_get_next(NULL, &my_app_dsc);
-    while(app != NULL) {
-        if(app->win != NULL) {
-            my_win_data_t * wdata = app->win_data;
-            
-            if(gsmmng_get_state() == GSMMNG_STATE_IDLE) {
-                lv_label_set_text(wdata->title, "Not connected");
-            } else if(gsmmng_get_state() == GSMMNG_STATE_READY) {
-                lv_label_set_text(wdata->title, "Connecting ...");
-            } else {
-                char buf[256];
-                sprintf(buf, "%s - %s:%s", gsmmng_get_last_apn(), gsmmng_get_last_ip(), gsmmng_get_last_port());
-                lv_label_set_text(wdata->title, buf);
-            }
-            lv_obj_set_width(wdata->title, lv_win_get_width(app->win));
-        }
-        app = lv_app_get_next(app, &my_app_dsc);
-    }
-}
-
-static void save_conf(lv_app_inst_t * app)
-{
-#ifdef LV_APP_GSM_CONF_PATH
-    my_app_data_t * adata = app->app_data;
-    
-    fs_file_t f;
-    fs_res_t res;
-    res = fs_open(&f, LV_APP_GSM_CONF_PATH, FS_MODE_WR);
-    if(res == FS_RES_OK) {
-        char buf[256];
-        sprintf(buf,"%s\n%s\n%s", adata->set_apn, adata->set_ip, adata->set_port);
-        fs_write(&f, buf, strlen(buf) + 1, NULL);
-        fs_close(&f);
-    } 
-#endif
-}
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_EXAMPLE != 0*/

lv_appx/lv_app_gsm.h

@@ -1,47 +0,0 @@
-/**
- * @file lv_app_gsm.h
- *
- */
-
-#ifndef LV_APP_GSM_H
-#define LV_APP_GSM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lvgl/lv_app/lv_app.h"
-
-#if LV_APP_ENABLE != 0 && USE_LV_APP_GSM != 0
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-typedef struct
-{
-
-}lv_app_gsm_conf_t;
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-const lv_app_dsc_t * lv_app_gsm_init(void);
-
-/**********************
- *      MACROS
- **********************/
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_EXAMPLE != 0*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* LV_APP_EXAMPLE_H */

lv_appx/lv_app_phantom.c

@@ -1,143 +0,0 @@
-/**
- * @file lv_app_example.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_app_phantom.h"
-#if LV_APP_ENABLE != 0 && USE_LV_APP_PHANTOM != 0
-
-#include "../lv_app/lv_app_util/lv_app_kb.h"
-#include <stdio.h>
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/*Application specific data for an instance of this application*/
-typedef struct
-{
-    void (*com_listen)(lv_app_inst_t * app_send, lv_app_inst_t * app_rec,
-                       lv_app_com_type_t type , const void * data, uint32_t size);
-}my_app_data_t;
-
-/*Application specific data a window of this application*/
-typedef struct
-{
-
-}my_win_data_t;
-
-/*Application specific data for a shortcut of this application*/
-typedef struct
-{
-    lv_obj_t * label;
-}my_sc_data_t;
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-static void my_app_run(lv_app_inst_t * app, void * conf);
-static void my_app_close(lv_app_inst_t * app);
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec,
-                       lv_app_com_type_t type , const void * data, uint32_t size);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-static lv_app_dsc_t my_app_dsc =
-{
-	.name = "Phantom",
-	.mode = LV_APP_MODE_NONE,
-	.app_run = my_app_run,
-	.app_close = my_app_close,
-	.com_rec = my_com_rec,
-	.win_open = NULL,
-	.win_close = NULL,
-	.sc_open = NULL,
-	.sc_close = NULL,
-	.app_data_size = sizeof(my_app_data_t),
-	.sc_data_size = sizeof(my_sc_data_t),
-	.win_data_size = sizeof(my_win_data_t),
-};
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Initialize the application
- * @return pointer to the application descriptor of this application
- */
-const lv_app_dsc_t * lv_app_phantom_init(void)
-{
-
-	return &my_app_dsc;
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-/**
- * Run an application according to 'app_dsc'
- * @param app_dsc pointer to an application descriptor
- * @param conf pointer to a lv_app_phantom_conf_t structure with configuration data or NULL if unused
- * @return pointer to the opened application or NULL if any error occurred
- */
-static void my_app_run(lv_app_inst_t * app, void * conf)
-{
-    /*Initialize the application*/
-    my_app_data_t * app_data = app->app_data;
-    app_data->com_listen = NULL;
-
-    if(conf != NULL) {
-        lv_app_phantom_conf_t * my_conf = conf;
-        app_data->com_listen = my_conf->com_listen;
-    }
-}
-
-/**
- * Close a running application.
- * Close the Window and the Shortcut too if opened.
- * Free all the allocated memory by this application.
- * @param app pointer to an application
- */
-static void my_app_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_app_data'*/
-}
-
-/**
- * Read the data have been sent to this application
- * @param app_send pointer to an application which sent the message
- * @param app_rec pointer to an application which is receiving the message
- * @param type type of data from 'lv_app_com_type_t' enum
- * @param data pointer to the sent data
- * @param size length of 'data' in bytes
- */
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec,
-                       lv_app_com_type_t type , const void * data, uint32_t size)
-{
-
-    my_app_data_t * app_data = app_rec->app_data;
-
-    if(app_data->com_listen != NULL) {
-        app_data->com_listen(app_send, app_rec, type, data, size);
-    }
-}
-
-/*--------------------
- * OTHER FUNCTIONS
- ---------------------*/
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_EXAMPLE != 0*/

lv_appx/lv_app_phantom.h

@@ -1,50 +0,0 @@
-/**
- * @file lv_app_phantom.h
- *
- */
-
-#ifndef LV_APP_PHANTOM_H
-#define LV_APP_PHANTOM_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lvgl/lv_app/lv_app.h"
-
-#if LV_APP_ENABLE != 0 && USE_LV_APP_PHANTOM != 0
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-typedef struct
-{
-    void (*com_listen)(lv_app_inst_t * app_send,
-                       lv_app_inst_t * app_rec,
-                       lv_app_com_type_t type ,
-                       const void * data, uint32_t size);
-}lv_app_phantom_conf_t;
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-const lv_app_dsc_t * lv_app_phantom_init(void);
-
-/**********************
- *      MACROS
- **********************/
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_PHANTOM != 0*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* LV_APP_PHANTOM_H */

lv_appx/lv_app_sysmon.c

@@ -1,399 +0,0 @@
-/**
- * @file lv_app_sysmon.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_app_sysmon.h"
-#if LV_APP_ENABLE != 0 && USE_LV_APP_SYSMON != 0
-
-#include <stdio.h>
-#include "misc/os/ptask.h"
-#include "misc/os/idle.h"
-#include "lvgl/lv_objx/lv_chart.h"
-#include "lvgl/lv_app/lv_app_util/lv_app_notice.h"
-#include "hal/systick/systick.h"
-
-/*********************
- *      DEFINES
- *********************/
-#define CPU_LABEL_COLOR "FF0000"
-#define MEM_LABEL_COLOR "0000FF"
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/*Application specific data for an instance of this application*/
-typedef struct
-{
-
-}my_app_data_t;
-
-/*Application specific data a window of this application*/
-typedef struct
-{
-    lv_obj_t * chart;
-    lv_chart_dl_t * cpu_dl;
-    lv_chart_dl_t * mem_dl;
-    lv_obj_t * label;
-}my_win_data_t;
-
-/*Application specific data for a shortcut of this application*/
-typedef struct
-{
-    lv_obj_t * bar_cpu;
-    lv_obj_t * bar_mem;
-}my_sc_data_t;
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-static void my_app_run(lv_app_inst_t * app, void * conf);
-static void my_app_close(lv_app_inst_t * app);
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec, lv_app_com_type_t type , const void * data, uint32_t size);
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc);
-static void my_sc_close(lv_app_inst_t * app);
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win);
-static void my_win_close(lv_app_inst_t * app);
-
-static void sysmon_task(void * param);
-static void lv_app_sysmon_refr(void);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-static lv_app_dsc_t my_app_dsc =
-{
-	.name = "Sys. monitor",
-	.mode = LV_APP_MODE_NONE,
-	.app_run = my_app_run,
-	.app_close = my_app_close,
-	.com_rec = my_com_rec,
-	.win_open = my_win_open,
-	.win_close = my_win_close,
-	.sc_open = my_sc_open,
-	.sc_close = my_sc_close,
-	.app_data_size = sizeof(my_app_data_t),
-	.sc_data_size = sizeof(my_sc_data_t),
-	.win_data_size = sizeof(my_win_data_t),
-};
-
-static uint8_t mem_pct[LV_APP_SYSMON_PNUM];
-static uint8_t cpu_pct[LV_APP_SYSMON_PNUM];
-static lv_style_t cpu_bar_bg;
-static lv_style_t mem_bar_bg;
-static lv_style_t cpu_bar_indic;
-static lv_style_t mem_bar_indic;
-#if USE_DYN_MEM != 0  && DM_CUSTOM == 0
-static  dm_mon_t mem_mon;
-#endif
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Initialize the application
- * @return pointer to the application descriptor of this application
- */
-const lv_app_dsc_t * lv_app_sysmon_init(void)
-{
-    ptask_create(sysmon_task, LV_APP_SYSMON_REFR_TIME, PTASK_PRIO_LOW, NULL);
-
-    memset(mem_pct, 0, sizeof(mem_pct));
-    memset(cpu_pct, 0, sizeof(cpu_pct));
-
-    /*Create bar styles for the shortcut*/
-    lv_style_get(LV_STYLE_PRETTY, &cpu_bar_bg);
-    cpu_bar_bg.ccolor = COLOR_MAKE(0x40, 0x00, 0x00);
-    cpu_bar_bg.font = font_get(LV_APP_FONT_MEDIUM);
-    cpu_bar_bg.line_space = 0;
-    cpu_bar_bg.txt_align = 1;
-    cpu_bar_bg.hpad = 0;
-    cpu_bar_bg.vpad = 0;
-
-    memcpy(&mem_bar_bg, &cpu_bar_bg, sizeof(lv_style_t));
-    mem_bar_bg.ccolor = COLOR_MAKE(0x00, 0x40, 0x00);
-
-    lv_style_get(LV_STYLE_PRETTY_COLOR, &cpu_bar_indic);
-    cpu_bar_indic.gcolor = COLOR_MARRON;
-    cpu_bar_indic.mcolor = COLOR_RED;
-    cpu_bar_indic.bcolor = COLOR_BLACK;
-    //cpu_bar_indic.bwidth = 1 * LV_DOWNSCALE;
-    cpu_bar_indic.bopa = OPA_50;
-    cpu_bar_indic.hpad = 0 * LV_DOWNSCALE;
-    cpu_bar_indic.vpad = 0 * LV_DOWNSCALE;
-
-
-    memcpy(&mem_bar_indic, &cpu_bar_indic, sizeof(lv_style_t));
-    mem_bar_indic.gcolor = COLOR_GREEN;
-    mem_bar_indic.mcolor = COLOR_LIME;
-
-	return &my_app_dsc;
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-/**
- * Run an application according to 'app_dsc'
- * @param app_dsc pointer to an application descriptor
- * @param conf pointer to a lv_app_sysmon_conf_t structure with configuration data or NULL if unused
- * @return pointer to the opened application or NULL if any error occurred
- */
-static void my_app_run(lv_app_inst_t * app,  void * conf)
-{
-
-}
-
-/**
- * Close a running application.
- * Close the Window and the Shortcut too if opened.
- * Free all the allocated memory by this application.
- * @param app pointer to an application
- */
-static void my_app_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_app_data'*/
-}
-
-/**
- * Read the data have been sent to this application
- * @param app_send pointer to an application which sent the message
- * @param app_rec pointer to an application which is receiving the message
- * @param type type of data from 'lv_app_com_type_t' enum
- * @param data pointer to the sent data
- * @param size length of 'data' in bytes
- */
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec,
-                       lv_app_com_type_t type , const void * data, uint32_t size)
-{
-
-}
-
-/**
- * Open a shortcut for an application
- * @param app pointer to an application
- * @param sc pointer to an object where the application
- *           can create content of the shortcut
- */
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc)
-{
-    my_sc_data_t * sc_data = app->sc_data;
-
-    cord_t w = lv_obj_get_width(sc) / 5;
-
-    /*Create 2 bars for the CPU and the Memory*/
-    sc_data->bar_cpu = lv_bar_create(sc, NULL);
-    lv_obj_set_size(sc_data->bar_cpu, w, 5 * lv_obj_get_height(sc) / 8);
-    lv_obj_align(sc_data->bar_cpu, NULL, LV_ALIGN_IN_BOTTOM_LEFT, w, - lv_obj_get_height(sc) / 8);
-    lv_obj_set_style(sc_data->bar_cpu, &cpu_bar_bg);
-    lv_bar_set_style_indic(sc_data->bar_cpu, &cpu_bar_indic);
-    lv_obj_set_click(sc_data->bar_cpu, false);
-    lv_bar_set_range(sc_data->bar_cpu, 0, 100);
-    lv_obj_t * label = lv_label_create(sc_data->bar_cpu, NULL);
-    lv_label_set_text(label, "C\nP\nU");
-    lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, 0);
-
-    sc_data->bar_mem = lv_bar_create(sc, sc_data->bar_cpu);
-    lv_obj_align(sc_data->bar_mem, sc_data->bar_cpu, LV_ALIGN_OUT_RIGHT_MID, w, 0);
-    lv_obj_set_style(sc_data->bar_mem, &mem_bar_bg);
-    lv_bar_set_style_indic(sc_data->bar_mem, &mem_bar_indic);
-    label = lv_label_create(sc_data->bar_mem, NULL);
-    lv_label_set_text(label, "M\nE\nM");
-    lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, 0);
-
-    lv_app_sysmon_refr();
-}
-
-/**
- * Close the shortcut of an application
- * @param app pointer to an application
- */
-static void my_sc_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_sc_data'*/
-}
-
-
-/**
- * Open the application in a window
- * @param app pointer to an application
- * @param win pointer to a window object where
- *            the application can create content
- */
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
-{
-    my_win_data_t * win_data = app->win_data;
-
-    /*Make the window content responsive*/
-    lv_cont_set_layout(lv_page_get_scrl(lv_win_get_page(win)), LV_CONT_LAYOUT_PRETTY);
-
-    /*Create a chart with two data lines*/
-    win_data->chart = lv_chart_create(win, NULL);
-    lv_obj_set_size(win_data->chart, LV_HOR_RES / 2, LV_VER_RES / 2);
-    lv_obj_set_pos(win_data->chart, LV_DPI / 10, LV_DPI / 10);
-    lv_chart_set_pnum(win_data->chart, LV_APP_SYSMON_PNUM);
-    lv_chart_set_range(win_data->chart, 0, 100);
-    lv_chart_set_type(win_data->chart, LV_CHART_LINE);
-    lv_chart_set_dl_width(win_data->chart, 2 * LV_DOWNSCALE);
-    win_data->cpu_dl =  lv_chart_add_data_line(win_data->chart, COLOR_RED);
-    win_data->mem_dl =  lv_chart_add_data_line(win_data->chart, COLOR_BLUE);
-
-    uint16_t i;
-    for(i = 0; i < LV_APP_SYSMON_PNUM; i ++) {
-        win_data->cpu_dl->points[i] = cpu_pct[i];
-        win_data->mem_dl->points[i] = mem_pct[i];
-    }
-
-    /*Create a label for the details of Memory and CPU usage*/
-    win_data->label = lv_label_create(win, NULL);
-    lv_label_set_recolor(win_data->label, true);
-    lv_obj_align(win_data->label, win_data->chart, LV_ALIGN_OUT_RIGHT_TOP, LV_DPI / 4, 0);
-
-
-    lv_app_sysmon_refr();
-}
-
-/**
- * Close the window of an application
- * @param app pointer to an application
- */
-static void my_win_close(lv_app_inst_t * app)
-{
-
-}
-
-/*--------------------
- * OTHER FUNCTIONS
- ---------------------*/
-
-/**
- * Called periodically to monitor the CPU and memory usage.
- * It refreshes the shortcuts and windows and also add notifications if there is any problem.
- * @param param unused
- */
-static void sysmon_task(void * param)
-{
-    /*Shift out the oldest data*/
-    uint16_t i;
-    for(i = 1; i < LV_APP_SYSMON_PNUM; i++) {
-        mem_pct[i - 1] = mem_pct[i];
-        cpu_pct[i - 1] = cpu_pct[i];
-    }
-
-    /*Get CPU and memory information */
-    uint8_t cpu_busy = 0;
-#if USE_IDLE != 0   /*Use the more precise idle module if enabled*/
-    cpu_busy = 100 - idle_get();
-#else
-    cpu_busy = 100 - ptask_get_idle();
-#endif
-
-    uint8_t mem_used_pct = 0;
-#if  USE_DYN_MEM != 0  && DM_CUSTOM == 0
-    dm_monitor(&mem_mon);
-    mem_used_pct = mem_mon.pct_used;
-#endif
-
-    /*Add the CPU and memory data*/
-    cpu_pct[LV_APP_SYSMON_PNUM - 1] = cpu_busy;
-    mem_pct[LV_APP_SYSMON_PNUM - 1] = mem_used_pct;
-
-    /*Refresh the shortcuts and windows*/
-    lv_app_sysmon_refr();
-
-#if USE_DYN_MEM != 0 && DM_CUSTOM == 0
-
-    /*Handle periodic defrag. if enabled*/
-#if LV_APP_SYSMON_DEFRAG_PERIOD != 0
-    static uint32_t last_defrag = 0;
-
-    if(systick_elaps(last_defrag) > LV_APP_SYSMON_DEFRAG_PERIOD) {
-        dm_defrag();
-        last_defrag = systick_get();
-    }
-#endif
-    /*Add notifications if something is critical*/
-    static bool mem_warn_report = false;
-    if(mem_mon.size_free < LV_APP_SYSMON_MEM_WARN && mem_warn_report == false) {
-        mem_warn_report = true;
-        lv_app_notice_add("Critically low memory");
-    }
-
-    if(mem_mon.size_free > LV_APP_SYSMON_MEM_WARN)  mem_warn_report = false;
-
-    static bool frag_warn_report = false;
-    if(mem_mon.pct_frag > LV_APP_SYSMON_FRAG_WARN) {
-        if(frag_warn_report == false) {
-            frag_warn_report = true;
-            lv_app_notice_add("Critical memory\nfragmentation");
-
-            dm_defrag(); /*Defrag. if the fragmentation is critical*/
-        }
-    }
-
-    if(mem_mon.pct_frag < LV_APP_SYSMON_FRAG_WARN)  frag_warn_report = false;
-#endif
-}
-
-/**
- * Refresh the shortcuts and windows.
- */
-static void lv_app_sysmon_refr(void)
-{
-
-    char buf_long[256];
-    char buf_short[128];
-    sprintf(buf_long, "%c%s CPU: %d %%%c\n\n",TXT_RECOLOR_CMD, CPU_LABEL_COLOR, cpu_pct[LV_APP_SYSMON_PNUM - 1], TXT_RECOLOR_CMD);
-    sprintf(buf_short, "CPU: %d %%\n", cpu_pct[LV_APP_SYSMON_PNUM - 1]);
-
-#if USE_DYN_MEM != 0  && DM_CUSTOM == 0
-    sprintf(buf_long, "%s%c%s MEMORY: %d %%%c\nTotal: %d bytes\nUsed: %d bytes\nFree: %d bytes\nFrag: %d %%",
-                  buf_long,
-                  TXT_RECOLOR_CMD,
-                  MEM_LABEL_COLOR,
-                  mem_pct[LV_APP_SYSMON_PNUM - 1],
-                  TXT_RECOLOR_CMD,
-                  (int)mem_mon.size_total,
-                  (int)mem_mon.size_total - mem_mon.size_free, mem_mon.size_free, mem_mon.pct_frag);
-
-    sprintf(buf_short, "%sMem: %d %%\nFrag: %d %%\n",
-                  buf_short, mem_pct[LV_APP_SYSMON_PNUM - 1], mem_mon.pct_frag);
-#else
-    sprintf(buf_long, "%s%c%s MEMORY: N/A%c", buf_long, TXT_RECOLOR_CMD, MEM_LABEL_COLOR, TXT_RECOLOR_CMD);
-    sprintf(buf_short, "%sMem: N/A\nFrag: N/A", buf_short);
-#endif
-    lv_app_inst_t * app;
-    app = lv_app_get_next(NULL, &my_app_dsc);
-    while(app != NULL) {
-        /*Refresh the windows*/
-        my_win_data_t * win_data = app->win_data;
-        if(win_data != NULL) {
-            lv_label_set_text(win_data->label, buf_long);
-
-            lv_chart_set_next(win_data->chart, win_data->mem_dl, mem_pct[LV_APP_SYSMON_PNUM - 1]);
-            lv_chart_set_next(win_data->chart, win_data->cpu_dl, cpu_pct[LV_APP_SYSMON_PNUM - 1]);
-
-        }
-        /*Refresh the shortcut*/
-        my_sc_data_t * sc_data = app->sc_data;
-        if(sc_data != NULL) {
-            lv_bar_set_value(sc_data->bar_cpu, cpu_pct[LV_APP_SYSMON_PNUM - 1]);
-            lv_bar_set_value(sc_data->bar_mem, mem_pct[LV_APP_SYSMON_PNUM - 1]);
-        }
-
-        lv_app_com_send(app, LV_APP_COM_TYPE_CHAR, buf_short, strlen(buf_short));
-
-        app = lv_app_get_next(app, &my_app_dsc);
-    }
-}
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_SYSMON != 0*/

lv_appx/lv_app_sysmon.h

@@ -1,47 +0,0 @@
-/**
- * @file lv_app_example.h
- *
- */
-
-#ifndef LV_APP_SYSMON_H
-#define LV_APP_SYSMON_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lvgl/lv_app/lv_app.h"
-
-#if LV_APP_ENABLE != 0 && USE_LV_APP_SYSMON != 0
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-typedef struct
-{
-
-}lv_app_sysmon_conf_t;
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-const lv_app_dsc_t * lv_app_sysmon_init(void);
-
-/**********************
- *      MACROS
- **********************/
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_SYSMON != 0*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* LV_APP_SYSMON_H */

lv_appx/lv_app_terminal.c

@@ -1,498 +0,0 @@
-/**
- * @file lv_app_terminal.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-
-#include <lv_conf.h>
-#include <misc/gfx/area.h>
-#include <lvgl/lv_obj/lv_dispi.h>
-#include <lvgl/lv_obj/lv_obj.h>
-#include <lvgl/lv_objx/lv_btn.h>
-#include <lvgl/lv_objx/lv_cont.h>
-#include <lvgl/lv_objx/lv_ddlist.h>
-#include <lvgl/lv_objx/lv_label.h>
-#include <lvgl/lv_objx/lv_page.h>
-#include <lvgl/lv_objx/lv_ta.h>
-#include <misc/gfx/color.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <string.h>
-#include "lv_app_terminal.h"
-
-#if LV_APP_ENABLE != 0 && USE_LV_APP_TERMINAL != 0
-
-#include "lvgl/lv_app/lv_app_util/lv_app_kb.h"
-#include <stdio.h>
-
-/*********************
- *      DEFINES
- *********************/
-#define OBJ_PAD (LV_DPI / 12)
-#define AUTO_CONNECT_TCP_DELAY  5000    /*Wait before TCS server connect when the WiFi connect is ready*/ 
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-
-/*Application specific data for an instance of this application*/
-typedef struct
-{
-    char txt[LV_APP_TERMINAL_LENGTH + 1];
-    lv_app_com_type_t com_type;
-    lv_app_terminal_format_t format;
-    lv_app_inst_t * last_sender;
-}my_app_data_t;
-
-/*Application specific data a window of this application*/
-typedef struct
-{
-    lv_obj_t * label;
-    lv_obj_t * ta;
-    lv_obj_t * clear_btn;
-}my_win_data_t;
-
-/*Application specific data for a shortcut of this application*/
-typedef struct
-{
-    lv_obj_t * label;
-}my_sc_data_t;
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-static void my_app_run(lv_app_inst_t * app, void * conf);
-static void my_app_close(lv_app_inst_t * app);
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec, lv_app_com_type_t type , const void * data, uint32_t size);
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc);
-static void my_sc_close(lv_app_inst_t * app);
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win);
-static void my_win_close(lv_app_inst_t * app);
-static void my_conf_open(lv_app_inst_t * app, lv_obj_t * conf_win);
-
-static void add_data(lv_app_inst_t * app, const void * data, uint16_t data_len);
-static lv_action_res_t win_ta_rel_action(lv_obj_t * ta, lv_dispi_t * dispi);
-static lv_action_res_t win_comtype_action(lv_obj_t * ddlist, lv_dispi_t * dispi);
-static lv_action_res_t win_format_action(lv_obj_t * ddlist, lv_dispi_t * dispi);
-static lv_action_res_t win_clear_rel_action(lv_obj_t * btn, lv_dispi_t * dispi);
-static void win_ta_kb_ok_action(lv_obj_t * ta);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-static lv_app_dsc_t my_app_dsc =
-{
-	.name = "Terminal",
-	.mode = LV_APP_MODE_NONE,
-	.app_run = my_app_run,
-	.app_close = my_app_close,
-	.com_rec = my_com_rec,
-	.win_open = my_win_open,
-	.win_close = my_win_close,
-	.sc_open = my_sc_open,
-	.sc_close = my_sc_close,
-    .conf_open = my_conf_open,
-	.app_data_size = sizeof(my_app_data_t),
-	.sc_data_size = sizeof(my_sc_data_t),
-	.win_data_size = sizeof(my_win_data_t),
-};
-
-static const char * com_type_list_txt[] = {"Character", "Integer", "Log", "None", ""};
-static lv_app_com_type_t com_type_list[] = {LV_APP_COM_TYPE_CHAR, LV_APP_COM_TYPE_INT, LV_APP_COM_TYPE_LOG, LV_APP_COM_TYPE_INV};
-static const char * txt_format_list_txt[] = {"ASCII", "Hexadecimal", ""};
-static lv_style_t style_sc_term;
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Initialize the application
- * @return pointer to the application descriptor of this application
- */
-const lv_app_dsc_t * lv_app_terminal_init(void)
-{
-    lv_style_get(LV_STYLE_PLAIN, &style_sc_term);
-    style_sc_term.line_space = 0;
-    style_sc_term.letter_space = 0;
-    style_sc_term.txt_align = 0;
-    style_sc_term.ccolor = COLOR_WHITE;
-    style_sc_term.mcolor = COLOR_MAKE(0x20, 0x20, 0x20);
-    style_sc_term.gcolor = COLOR_MAKE(0x20, 0x20, 0x20);
-
-	return &my_app_dsc;
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-/**
- * Run an application according to 'app_dsc'
- * @param app_dsc pointer to an application descriptor
- * @param conf pointer to a lv_app_example_conf_t structure with configuration data or NULL if unused
- * @return pointer to the opened application or NULL if any error occurred
- */
-static void my_app_run(lv_app_inst_t * app, void * conf)
-{
-    /*Initialize the application*/
-    my_app_data_t * app_data = app->app_data;
-
-    if(conf != NULL) {
-        app_data->com_type = ((lv_app_terminal_conf_t * ) conf)->com_type;
-        app_data->format = ((lv_app_terminal_conf_t * ) conf)->format;
-    } else {
-        app_data->com_type = LV_APP_COM_TYPE_CHAR;
-        app_data->format = LV_APP_TERMINAL_FORMAT_ASCII;
-    }
-
-    app_data->last_sender = NULL;
-
-    memset(app_data->txt, 0, sizeof(app_data->txt));
-}
-
-/**
- * Close a running application.
- * Close the Window and the Shortcut too if opened.
- * Free all the allocated memory by this application.
- * @param app pointer to an application
- */
-static void my_app_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_app_data'*/
-}
-
-/**
- * Read the data have been sent to this applicationstring
- * @param app_send pointer to an application which sent the message
- * @param app_rec pointer to an application which is receiving the message
- * @param type type of data from 'lv_app_com_type_t' enum
- * @param data pointer to the sent data
- * @param size length of 'data' in bytes
- */
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec,
-                       lv_app_com_type_t type , const void * data, uint32_t size)
-{
-    my_app_data_t * app_data = app_rec->app_data;
-
-    /*Add the received data if the type is matches*/
-	if(type == app_data->com_type) {
-
-        /*Insert the name of the sender application if it is not the last*/
-        if(app_data->last_sender != app_send) {
-            add_data(app_rec, "\n@", 2);
-            add_data(app_rec, app_send->name, strlen(app_send->name));
-            add_data(app_rec, "\n", 1);
-        }
-
-        if(app_data->format == LV_APP_TERMINAL_FORMAT_HEX) {
-            char hex_buf[8];
-            const char * data_buf = data;
-            uint32_t i;
-            for(i = 0; i < size; i++) {
-                sprintf(hex_buf, "%02x", data_buf[i]);
-                add_data(app_rec, hex_buf, 2);
-            }
-        } else {
-            add_data(app_rec, data, size);
-        }
-	}
-
-	app_data->last_sender = app_send;
-}
-
-/**
- * Open a shortcut for an application
- * @param app pointer to an application
- * @param sc pointer to an object where the application
- *           can create content of the shortcut
- */
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc)
-{
-    my_sc_data_t * sc_data = app->sc_data;
-    my_app_data_t * app_data = app->app_data;
-
-    /*Create a dark background*/
-    lv_obj_t * txt_bg = lv_obj_create(sc, NULL);
-    lv_obj_set_size(txt_bg, 7 * LV_APP_SC_WIDTH / 8 , app->sc->cords.y2 - app->sc_title->cords.y2 - 10 * LV_DOWNSCALE);
-    lv_obj_set_style(txt_bg, &style_sc_term);
-    lv_obj_align(txt_bg, app->sc_title, LV_ALIGN_OUT_BOTTOM_MID, 0, 3 * LV_DOWNSCALE);
-    lv_obj_set_click(txt_bg, false);
-
-    /*Add a text with the text of the terminal*/
-    sc_data->label = lv_label_create(txt_bg, NULL);
-    lv_label_set_long_mode(sc_data->label, LV_LABEL_LONG_BREAK);
-    lv_obj_set_width(sc_data->label, lv_obj_get_width(txt_bg) - LV_APP_SC_WIDTH / 8);
-    lv_label_set_text_static(sc_data->label, app_data->txt);
-    lv_obj_align(sc_data->label, txt_bg, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
-}
-
-/**
- * Close the shortcut of an application
- * @param app pointer to an application
- */
-static void my_sc_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_sc_data'*/
-}
-
-/**
- * Open the application in a window
- * @param app pointer to an application
- * @param win pointer to a window object where
- *            the application can create content
- */
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
-{
-    my_win_data_t * win_data = app->win_data;
-    my_app_data_t * app_data = app->app_data;
-
-    /*Make the window content responsive*/
-    lv_cont_set_layout(lv_page_get_scrl(lv_win_get_page(win)), LV_CONT_LAYOUT_PRETTY);
-
-    /*Create a label for the text of the terminal*/
-    win_data->label = lv_label_create(win, NULL);
-    lv_label_set_long_mode(win_data->label, LV_LABEL_LONG_BREAK);
-    lv_obj_set_width(win_data->label, lv_win_get_width(win));
-    lv_label_set_text_static(win_data->label, app_data->txt); /*Use the app. data text directly*/
-
-    /*Create a text area. Text can be added to the terminal from here by app. keyboard.*/
-    win_data->ta = lv_ta_create(win, NULL);
-    lv_obj_set_size(win_data->ta, 3 * LV_HOR_RES / 5, LV_VER_RES / 4);
-    lv_obj_set_free_p(win_data->ta, app);
-    lv_page_set_rel_action(win_data->ta, win_ta_rel_action);
-    lv_page_glue_obj(win_data->ta, true);
-    lv_ta_set_text(win_data->ta, "");
-
-    /*Create a clear button*/
-    win_data->clear_btn = lv_btn_create(win, NULL);
-    lv_cont_set_fit(win_data->clear_btn, true, true);
-    lv_obj_set_free_p(win_data->clear_btn, app);
-    lv_page_glue_obj(win_data->ta, true);
-    lv_btn_set_rel_action(win_data->clear_btn, win_clear_rel_action);
-    lv_obj_t * btn_label = lv_label_create(win_data->clear_btn, NULL);
-    lv_label_set_text(btn_label, "Clear");
-
-    /*Align the window to see the text area on the bottom*/
-    lv_obj_t * page = lv_win_get_page(app->win);
-    lv_obj_align(lv_page_get_scrl(page), NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, - LV_VER_RES);
-}
-
-/**
- * Close the window of an application
- * @param app pointer to an application
- */
-static void my_win_close(lv_app_inst_t * app)
-{
-
-}
-
-/**
- * Create objects to configure the applications
- * @param app pointer to an application which settings should be created
- * @param conf_win pointer to a window where the objects can be created
- *                (the window has the proper layout)
- */
-static void my_conf_open(lv_app_inst_t * app, lv_obj_t * conf_win)
-{
-    my_app_data_t * app_data = app->app_data;
-
-    lv_obj_t * label;
-    label = lv_label_create(conf_win, NULL);
-    lv_label_set_text(label, "Communication type");
-
-    lv_obj_t * ddl;
-    ddl = lv_ddlist_create(conf_win, NULL);
-    lv_obj_set_free_p(ddl, app);
-    lv_ddlist_set_options(ddl, com_type_list_txt);
-    lv_ddlist_set_action(ddl, win_comtype_action);
-    lv_ddlist_set_selected(ddl, app_data->com_type);
-
-    label = lv_label_create(conf_win, label);
-    lv_label_set_text(label, "\nText format");  /*First '\n' keeps space from the list above*/
-    ddl = lv_ddlist_create(conf_win, ddl);
-    lv_ddlist_set_options(ddl, txt_format_list_txt);
-    lv_ddlist_set_selected(ddl, app_data->format);
-    lv_ddlist_set_action(ddl, win_format_action);
-}
-
-/*--------------------
- * OTHER FUNCTIONS
- ---------------------*/
-
-/**
- * Called when the Text area is released to open the app. keybard
- * @param ta pointer to the text area
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_OK because the text area is not deleted
- */
-static lv_action_res_t win_ta_rel_action(lv_obj_t * ta, lv_dispi_t * dispi)
-{
-    lv_app_kb_open(ta, LV_APP_KB_MODE_TXT | LV_APP_KB_MODE_WIN_RESIZE, NULL, win_ta_kb_ok_action);
-
-    return LV_ACTION_RES_OK;
-}
-
-/**
- * Called when an option is chosen in the communication type drop down list on the configuration window
- * @param ddl pointer to the drop down list
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_OK because the list is not deleted
- */
-static lv_action_res_t win_comtype_action(lv_obj_t * ddlist, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ddlist);
-    my_app_data_t * app_data = app->app_data;
-
-    app_data->com_type = com_type_list[lv_ddlist_get_selected(ddlist)];
-
-    return LV_ACTION_RES_OK;
-}
-
-/**
- * Called when an option is chosen in the format drop down list on the configuration window
- * @param ddl pointer to the drop down list
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_OK because the list is not deleted
- */
-static lv_action_res_t win_format_action(lv_obj_t * ddlist, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ddlist);
-    my_app_data_t * app_data = app->app_data;
-    uint16_t opt = lv_ddlist_get_selected(ddlist);
-    if(strcmp(txt_format_list_txt[opt], "Hexadecimal") == 0) {
-        app_data->format = LV_APP_TERMINAL_FORMAT_HEX;
-    } else if (strcmp(txt_format_list_txt[opt], "ASCII") == 0) {
-        app_data->format = LV_APP_TERMINAL_FORMAT_ASCII;
-    }
-
-    return LV_ACTION_RES_OK;
-}
-
-
-/**
- * Called when the Clear button is released to clear the text of the terminal
- * @param btn pointer to the clear button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_OK because the button is not deleted
- */
-static lv_action_res_t win_clear_rel_action(lv_obj_t * btn, lv_dispi_t * dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(btn);
-    my_app_data_t * app_data = app->app_data;
-    my_win_data_t * win_data = app->win_data;
-    my_sc_data_t * sc_data = app->sc_data;
-
-    app_data->txt[0] = '\0';
-
-    if(sc_data != NULL) {
-        lv_label_set_text_static(sc_data->label, app_data->txt);
-        lv_obj_align(sc_data->label, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
-    }
-
-    if(win_data != NULL) {
-        lv_label_set_text_static(win_data->label, app_data->txt);
-        lv_obj_t * page = lv_win_get_page(app->win);
-        lv_obj_align(lv_page_get_scrl(page), NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, - LV_VER_RES);
-    }
-
-    return LV_ACTION_RES_OK;
-}
-
-/**
- * Called when the 'Ok' button of the keyboard in the window
- * is pressed to write to the Terminal
- * @param ta pointer to the Text area in the window
- */
-static void win_ta_kb_ok_action(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * app_data = app->app_data;
-    const char * ta_txt = lv_ta_get_txt(ta);
-    uint32_t ta_txt_len = strlen(ta_txt);
-    if(app_data->txt[0] != '\0') add_data(app, "\n", 1);
-    add_data(app, ">", 1);
-    add_data(app, ta_txt, ta_txt_len);
-
-    lv_app_com_send(app, app_data->com_type, ta_txt, ta_txt_len);
-
-    lv_ta_set_text(ta, "");
-    app_data->last_sender = NULL;   /*Now the least data in the terminal is from this app*/
-    
-}
-
-/**
- * Add data to the terminal
- * @param app pointer to a Terminal application
- * @param data pointer to the data
- * @param data_len length of 'data' in bytes
- */
-static void add_data(lv_app_inst_t * app, const void * data, uint16_t data_len)
-{
-    my_app_data_t * app_data = app->app_data;
-    uint16_t old_len = strlen(app_data->txt);
-    const char * txt = data;
-
-    /*IF the data is longer then the terminal ax size show the last part of data*/
-    if(data_len > LV_APP_TERMINAL_LENGTH) {
-        txt += (data_len - LV_APP_TERMINAL_LENGTH);
-        data_len = LV_APP_TERMINAL_LENGTH;
-        old_len = 0;
-    }
-    /*If the text become too long 'forget' the oldest lines*/
-    else if(old_len + data_len > LV_APP_TERMINAL_LENGTH) {
-        uint16_t new_start;
-        for(new_start = 0; new_start < old_len; new_start++) {
-            if(app_data->txt[new_start] == '\n') {
-                /*If there is enough space break*/
-                if(new_start >= data_len) {
-                    /*Ignore line breaks*/
-                    while(app_data->txt[new_start] == '\n' || app_data->txt[new_start] == '\r') new_start++;
-                    break;
-                }
-            }
-        }
-
-        /* If it wasn't able to make enough space on line breaks
-         * simply forget the oldest characters*/
-        if(new_start == old_len) {
-            new_start = old_len - (LV_APP_TERMINAL_LENGTH - data_len);
-        }
-        /*Move the remaining text to the beginning*/
-        uint16_t j;
-        for(j = new_start; j < old_len; j++) {
-            app_data->txt[j - new_start] = app_data->txt[j];
-        }
-        old_len = old_len - new_start;
-        app_data->txt[old_len] = '\0';
-
-    }
-
-    memcpy(&app_data->txt[old_len], txt, data_len);
-    app_data->txt[old_len + data_len] = '\0';
-
-    my_win_data_t * win_data = app->win_data;
-    my_sc_data_t * sc_data = app->sc_data;
-
-    if(win_data != NULL) {
-        lv_label_set_text_static(win_data->label, app_data->txt);
-        lv_obj_t * page = lv_win_get_page(app->win);
-        lv_obj_align(lv_page_get_scrl(page), NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, - LV_VER_RES);
-    }
-
-    /*Set the last line on the shortcut*/
-    if(sc_data != NULL) {
-        lv_label_set_text_static(sc_data->label, app_data->txt);
-        lv_obj_align(sc_data->label, NULL, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
-    }
-}
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_TERMINAL != 0*/

lv_appx/lv_app_terminal.h

@@ -1,54 +0,0 @@
-/**
- * @file lv_app_terminal.h
- *
- */
-
-#ifndef LV_APP_TERMINAL_H
-#define LV_APP_TERMINAL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lvgl/lv_app/lv_app.h"
-
-#if LV_APP_ENABLE != 0 && USE_LV_APP_TERMINAL != 0
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-typedef enum
-{
-    LV_APP_TERMINAL_FORMAT_ASCII,
-    LV_APP_TERMINAL_FORMAT_HEX,
-}lv_app_terminal_format_t;
-
-typedef struct
-{
-    lv_app_terminal_format_t format;    /*Data display format*/
-    lv_app_com_type_t com_type;          /*The listened communication type (channel) */
-}lv_app_terminal_conf_t;
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-const lv_app_dsc_t * lv_app_terminal_init(void);
-
-/**********************
- *      MACROS
- **********************/
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_TERMINAL != 0*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* LV_APP_TERMINAL_H */

lv_appx/lv_app_wifi.c

@@ -1,593 +0,0 @@
-/**
- * @file lv_app_wifi.c
- *
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_app_wifi.h"
-#if LV_APP_ENABLE != 0 && USE_LV_APP_WIFI != 0
-
-#include "../lv_app/lv_app_util/lv_app_kb.h"
-#include "hal/wifi/wifi.h"
-#include "misc/os/ptask.h"
-#include "hal/systick/systick.h"
-#include "misc/comm/wifimng.h"
-#include "misc/fs/fat32/integer.h"
-#include <stdio.h>
-
-/*********************
- *      DEFINES
- *********************/
-#define SSID_LIST_MAX_LENGTH    512 
-#define WIFI_MONITOR_PERIOD     1000    /*ms*/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/*Application specific data for an instance of this application*/
-typedef struct
-{
-    char set_ssid[64];
-    char set_pwd[64];
-    char set_ip[32];
-    char set_port[16];
-    uint8_t * last_msg_dp;
-    uint16_t last_msg_size;
-}my_app_data_t;
-
-/*Application specific data a window of this application*/
-typedef struct
-{
-    lv_obj_t * list;
-    lv_obj_t * title;
-    lv_obj_t * netw_ssid_ta;
-    lv_obj_t * netw_pwd_ta;
-    lv_obj_t * tcp_ip_ta;
-    lv_obj_t * tcp_port_ta;
-}my_win_data_t;
-
-/*Application specific data for a shortcut of this application*/
-typedef struct
-{
-    lv_obj_t * label;
-}my_sc_data_t;
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-static void my_app_run(lv_app_inst_t * app, void * conf);
-static void my_app_close(lv_app_inst_t * app);
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec, lv_app_com_type_t type , const void * data, uint32_t size);
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc);
-static void my_sc_close(lv_app_inst_t * app);
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win);
-static void my_win_close(lv_app_inst_t * app);
-
-static void wifi_state_monitor_task(void * param);
-
-static lv_action_res_t netw_list_rel_action(lv_obj_t * btn, lv_dispi_t * dispi);
-static lv_action_res_t netw_con_rel_action(lv_obj_t * btn, lv_dispi_t* dispi);
-static lv_action_res_t netw_ssid_rel_action( lv_obj_t * ta, lv_dispi_t* dispi);
-static lv_action_res_t netw_pwd_rel_action( lv_obj_t * ta, lv_dispi_t* dispi);
-static lv_action_res_t tcp_ip_rel_action( lv_obj_t * ta, lv_dispi_t* dispi);
-static lv_action_res_t tcp_port_rel_action( lv_obj_t * ta, lv_dispi_t* dispi);
-static lv_action_res_t wifi_ap_select_action( lv_obj_t * ddlist, lv_dispi_t* dispi);
-
-static void netw_ssid_kb_ok(lv_obj_t * ta);
-static void netw_ssid_kb_close(lv_obj_t * ta);
-static void netw_pwd_kb_ok(lv_obj_t * ta);
-static void netw_pwd_kb_close(lv_obj_t * ta);
-static void tcp_ip_kb_ok(lv_obj_t * ta);
-static void tcp_ip_kb_close(lv_obj_t * ta);
-static void tcp_port_kb_ok(lv_obj_t * ta);
-static void tcp_port_kb_close(lv_obj_t * ta);
-
-static void list_cb(wifi_state_t state, const char * txt);
-static void tcp_transf_cb(wifi_state_t state, const char * txt);
-
-static void win_title_refr(void);
-
-static void save_conf(lv_app_inst_t * app);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-static lv_app_dsc_t my_app_dsc =
-{
-	.name = "WiFi",
-	.mode = LV_APP_MODE_NONE,
-	.app_run = my_app_run,
-	.app_close = my_app_close,
-	.com_rec = my_com_rec,
-	.win_open = my_win_open,
-	.win_close = my_win_close,
-	.sc_open = my_sc_open,
-	.sc_close = my_sc_close,
-	.app_data_size = sizeof(my_app_data_t),
-	.sc_data_size = sizeof(my_sc_data_t),
-	.win_data_size = sizeof(my_win_data_t),
-};
-
-static char def_ssid[64];
-static char def_pwd[64];
-static char def_ip[32];
-static char def_port[16];
-
-static char ssid_list[SSID_LIST_MAX_LENGTH];
-static lv_app_inst_t * app_act_com;
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Initialize the application
- * @return pointer to the application descriptor of this application
- */
-const lv_app_dsc_t * lv_app_wifi_init(void)
-{
-    strcpy(ssid_list, "");
-#ifdef LV_APP_WIFI_CONF_PATH
-    fs_file_t f;
-    fs_res_t res;
-    
-    res = fs_open(&f, LV_APP_WIFI_CONF_PATH, FS_MODE_RD);
-    if(res == FS_RES_NOT_EX) {
-        res = fs_open(&f, LV_APP_WIFI_CONF_PATH, FS_MODE_WR | FS_MODE_RD);
-        if(res == FS_RES_OK) {
-            const char * def_conf = "ssid\npwd\n100.101.102.103\n1234";
-            fs_write(&f, def_conf, strlen(def_conf) + 1, NULL);
-            fs_seek(&f, 0);
-        }
-    } 
-    
-    if(res == FS_RES_OK) {
-       volatile  char buf[256];
-       volatile  uint32_t rn;
-        fs_read(&f, (char *)buf, sizeof(buf) - 1, (uint32_t *)&rn);
-        
-        volatile  uint16_t i;
-        volatile uint16_t j = 0;
-        volatile uint8_t line_cnt = 0;
-        for(i = 0; i < rn; i++) {
-            if(buf[i] != '\n') {
-                if(line_cnt == 0) def_ssid[j] = buf[i];
-                if(line_cnt == 1) def_pwd[j] = buf[i];
-                if(line_cnt == 2) def_ip[j] = buf[i];
-                if(line_cnt == 3) def_port[j] = buf[i];
-                j++;
-            } else {
-                if(line_cnt == 0) def_ssid[j] = '\0';
-                if(line_cnt == 1) def_pwd[j] =  '\0';
-                if(line_cnt == 2) def_ip[j] = '\0';
-                if(line_cnt == 3) def_port[j] = '\0';
-                j = 0;
-                line_cnt ++;
-            }
-        }
-        
-        
-        fs_close(&f);        
-        
-    } else {
-        lv_app_notice_add("SD card error");
-    }
-#else
-    strcpy(def_ssid, LV_APP_WIFI_SSID_DEF);
-    strcpy(def_pwd, LV_APP_WIFI_PWD_DEF);
-    strcpy(def_ip, LV_APP_WIFI_IP_DEF);
-    strcpy(def_port, LV_APP_WIFI_PORT_DEF);
-#endif
-    
-#if LV_APP_WIFI_AUTO_CONNECT != 0
-    wifimng_set_last_netw(def_ssid, def_pwd);
-    wifimng_set_last_tcp(def_ip, def_port);
-#endif
-    
-    ptask_create(wifi_state_monitor_task, WIFI_MONITOR_PERIOD, PTASK_PRIO_LOW, NULL);
-    
-    return &my_app_dsc;
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-/**
- * Run an application according to 'app_dsc'
- * @param app_dsc pointer to an application descriptor
- * @param conf pointer to a lv_app_example_conf_t structure with configuration data or NULL if unused
- * @return pointer to the opened application or NULL if any error occurred
- */
-static void my_app_run(lv_app_inst_t * app, void * conf)
-{
-    /*Initialize the application*/
-    my_app_data_t * adata = app->app_data;
-    strcpy(adata->set_ssid, def_ssid);
-    strcpy(adata->set_pwd, def_pwd);
-    strcpy(adata->set_ip, def_ip);
-    strcpy(adata->set_port, def_port);
-    adata->last_msg_dp = NULL;
-    adata->last_msg_size = 0;
-}
-
-/**
- * Close a running application.
- * Close the Window and the Shortcut too if opened.
- * Free all the allocated memory by this application.
- * @param app pointer to an application
- */
-static void my_app_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_app_data'*/
-}
-
-/**
- * Read the data have been sent to this application
- * @param app_send pointer to an application which sent the message
- * @param app_rec pointer to an application which is receiving the message
- * @param type type of data from 'lv_app_com_type_t' enum
- * @param data pointer to the sent data
- * @param size length of 'data' in bytes
- */
-static void my_com_rec(lv_app_inst_t * app_send, lv_app_inst_t * app_rec,
-                       lv_app_com_type_t type , const void * data, uint32_t size)
-{
-	if(type == LV_APP_COM_TYPE_CHAR) {      /*data: string*/
-        app_act_com = app_rec;
-        my_app_data_t * adata = app_act_com->app_data;
-        if(adata->last_msg_dp != NULL) dm_free(adata->last_msg_dp); 
-        
-        adata->last_msg_dp = dm_alloc(size);
-        memcpy(adata->last_msg_dp, data, size);
-        adata->last_msg_size = size;
-        
-        wifi_tcp_transf(data, size, tcp_transf_cb);
-	}
-}
-
-/**
- * Open a shortcut for an application
- * @param app pointer to an application
- * @param sc pointer to an object where the application
- *           can create content of the shortcut
- */
-static void my_sc_open(lv_app_inst_t * app, lv_obj_t * sc)
-{
-    my_sc_data_t * sc_data = app->sc_data;
-
-    sc_data->label = lv_label_create(sc, NULL);
-	lv_label_set_text(sc_data->label, "Empty");
-	lv_obj_align(sc_data->label, NULL, LV_ALIGN_CENTER, 0, 0);
-}
-
-/**
- * Close the shortcut of an application
- * @param app pointer to an application
- */
-static void my_sc_close(lv_app_inst_t * app)
-{
-    /*No dynamically allocated data in 'my_sc_data'*/
-}
-
-
-/**
- * Open the application in a window
- * @param app pointer to an application
- * @param win pointer to a window object where
- *            the application can create content
- */
-static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
-{
-    my_app_data_t * adata = app->app_data;
-    my_win_data_t * wdata = app->win_data;
-    
-    wdata->title = lv_label_create(win, NULL);
-    
-    wdata->list = lv_ddlist_create(win, NULL); 
-    lv_obj_set_free_p(wdata->list, app);
-    lv_ddlist_set_options_str(wdata->list, ssid_list);
-    lv_ddlist_set_action(wdata->list, wifi_ap_select_action);
-    
-    lv_obj_t * list_btn = lv_btn_create(win, NULL);
-    lv_obj_set_free_p(list_btn, app);
-    lv_btn_set_rel_action(list_btn, netw_list_rel_action);
-    lv_obj_t * label = lv_label_create(list_btn, NULL);
-    lv_label_set_text(label, "List\nrefresh");
-    
-    lv_obj_t * ta_cont = lv_cont_create(win, NULL);
-    lv_cont_set_fit(ta_cont, true, true);
-    lv_cont_set_layout(ta_cont, LV_CONT_LAYOUT_COL_L);
-    lv_obj_set_style(ta_cont, lv_style_get(LV_STYLE_TRANSP_TIGHT, NULL));
-    
-    wdata->netw_ssid_ta = lv_ta_create(ta_cont, NULL);
-    lv_cont_set_fit(wdata->netw_ssid_ta, false, true);
-    lv_obj_set_free_p(wdata->netw_ssid_ta, app);
-    lv_page_set_rel_action(wdata->netw_ssid_ta, netw_ssid_rel_action);
-    lv_ta_set_text(wdata->netw_ssid_ta, adata->set_ssid);
-    lv_ta_set_cursor_show(wdata->netw_ssid_ta, false);
-    
-    wdata->netw_pwd_ta = lv_ta_create(ta_cont, wdata->netw_ssid_ta);
-    lv_page_set_rel_action(wdata->netw_pwd_ta, netw_pwd_rel_action);
-    lv_ta_set_text(wdata->netw_pwd_ta, adata->set_pwd);
-  
-    wdata->tcp_ip_ta = lv_ta_create(ta_cont, wdata->netw_ssid_ta);
-    lv_page_set_rel_action(wdata->tcp_ip_ta, tcp_ip_rel_action);
-    lv_ta_set_text(wdata->tcp_ip_ta, adata->set_ip);
-    
-    wdata->tcp_port_ta = lv_ta_create(ta_cont, wdata->netw_ssid_ta);
-    lv_page_set_rel_action(wdata->tcp_port_ta, tcp_port_rel_action);
-    lv_ta_set_text(wdata->tcp_port_ta, adata->set_port);
-  
-    
-    lv_obj_t * con_btn = lv_btn_create(win, NULL);
-    lv_obj_set_free_p(con_btn, app);
-    lv_btn_set_rel_action(con_btn, netw_con_rel_action);
-    label = lv_label_create(con_btn, NULL);
-    lv_label_set_text(label, "Connect");
-   
-    
-    lv_cont_set_layout(lv_page_get_scrl(lv_win_get_page(win)), LV_CONT_LAYOUT_PRETTY); 
-    
-    win_title_refr();
-}
-
-
-/**
- * Close the window of an application
- * @param app pointer to an application
- */
-static void my_win_close(lv_app_inst_t * app)
-{
-
-}
-
-/*--------------------
- * OTHER FUNCTIONS
- ---------------------*/
-
-static void wifi_state_monitor_task(void * param)
-{
-    static wifimng_state_t state_prev = WIFIMNG_STATE_WAIT;
-    wifimng_state_t state_act =  wifimng_get_state();
-    
-    if(state_prev != state_act && state_act == WIFIMNG_STATE_READY) {
-        lv_app_notice_add("WiFi connected to:\n%s\n%s:%s", 
-                           wifimng_get_last_ssid(), wifimng_get_last_ip(), wifimng_get_last_port());
-        win_title_refr();
-    }
-    
-    /* The wifi should be busy if there is sg. to send. 
-     * It means fail during last send. Try again*/
-    if(app_act_com != NULL) {
-        if(wifi_busy() ==  false && state_act == WIFIMNG_STATE_READY) {
-            /*Try to send the message again*/
-            lv_app_notice_add("Resend WiFi message");
-            my_app_data_t * adata = app_act_com->app_data;
-            wifi_tcp_transf(adata->last_msg_dp, adata->last_msg_size, tcp_transf_cb);
-        }
-    }
-    state_prev = state_act;
-}
-
-static lv_action_res_t netw_list_rel_action(lv_obj_t * btn, lv_dispi_t* dispi)
-{
-    wifi_state_t ret;
-    ret = wifi_netw_list(list_cb);
-    
-    if(ret == WIFI_STATE_OK) {
-        lv_app_notice_add("Listing WiFi networks");
-    } else {
-        lv_app_notice_add("Cannot list networks\nWiFi was busy. Try again");
-        
-    }
-    return LV_ACTION_RES_OK;
-}
-
-static lv_action_res_t netw_con_rel_action(lv_obj_t * btn, lv_dispi_t* dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(btn);
-    my_app_data_t * adata = app->app_data;
-    
-    wifimng_set_last_netw(adata->set_ssid, adata->set_pwd);
-    wifimng_set_last_tcp(adata->set_ip, adata->set_port);
-    wifimng_reconnect();
-    save_conf(app);
-    lv_app_notice_add("Connecting to WiFi network\n%s, %s:%s", 
-                      adata->set_ssid, adata->set_ip, adata->set_port);
-    return LV_ACTION_RES_OK;
-}
-
-static lv_action_res_t netw_ssid_rel_action( lv_obj_t * ta, lv_dispi_t* dispi)
-{
-    lv_app_kb_open(ta, LV_APP_KB_MODE_TXT | LV_APP_KB_MODE_WIN_RESIZE | LV_APP_KB_MODE_CUR_MANAGE, netw_ssid_kb_close ,netw_ssid_kb_ok);
-    return LV_ACTION_RES_OK;
-}
-
-static lv_action_res_t netw_pwd_rel_action( lv_obj_t * ta, lv_dispi_t* dispi)
-{
-    lv_app_kb_open(ta, LV_APP_KB_MODE_TXT | LV_APP_KB_MODE_WIN_RESIZE | LV_APP_KB_MODE_CUR_MANAGE, netw_pwd_kb_close ,netw_pwd_kb_ok);
-    return LV_ACTION_RES_OK;
-}
-
-static lv_action_res_t tcp_ip_rel_action( lv_obj_t * ta, lv_dispi_t* dispi)
-{
-    lv_app_kb_open(ta, LV_APP_KB_MODE_TXT | LV_APP_KB_MODE_WIN_RESIZE | LV_APP_KB_MODE_CUR_MANAGE, tcp_ip_kb_close ,tcp_ip_kb_ok);
-    return LV_ACTION_RES_OK;
-}
-
-static lv_action_res_t tcp_port_rel_action( lv_obj_t * ta, lv_dispi_t* dispi)
-{
-    lv_app_kb_open(ta, LV_APP_KB_MODE_NUM | LV_APP_KB_MODE_WIN_RESIZE | LV_APP_KB_MODE_CUR_MANAGE, tcp_port_kb_close ,tcp_port_kb_ok);
-    return LV_ACTION_RES_OK;
-}
-
-static lv_action_res_t wifi_ap_select_action( lv_obj_t * ddlist, lv_dispi_t* dispi)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ddlist);
-    my_app_data_t * adata = app->app_data;
-    
-    char ssid[256];
-    lv_ddlist_get_selected_str(ddlist, ssid);
-   
-    my_win_data_t * wdata = app->win_data;
-    lv_ta_set_text(wdata->netw_ssid_ta, ssid);
-    strcpy(adata->set_ssid, ssid);
-    
-    return LV_ACTION_RES_OK;
-}
-
-static void netw_ssid_kb_ok(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * adata = app->app_data;
-    strcpy(adata->set_ssid, lv_ta_get_txt(ta));
-}
-
-static void netw_ssid_kb_close(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * adata = app->app_data;
-    lv_ta_set_text(ta, adata->set_ssid);
-}
-
-static void netw_pwd_kb_ok(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * adata = app->app_data;
-    strcpy(adata->set_pwd, lv_ta_get_txt(ta));
-}
-
-static void netw_pwd_kb_close(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * adata = app->app_data;
-    lv_ta_set_text(ta, adata->set_pwd);
-}
-
-static void tcp_ip_kb_ok(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * adata = app->app_data;
-    strcpy(adata->set_ip, lv_ta_get_txt(ta));
-}
-
-static void tcp_ip_kb_close(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * adata = app->app_data;
-    lv_ta_set_text(ta, adata->set_ip);
-}
-
-static void tcp_port_kb_ok(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * adata = app->app_data;
-    strcpy(adata->set_port, lv_ta_get_txt(ta));
-}
-
-static void tcp_port_kb_close(lv_obj_t * ta)
-{
-    lv_app_inst_t * app = lv_obj_get_free_p(ta);
-    my_app_data_t * adata = app->app_data;
-    lv_ta_set_text(ta, adata->set_port);
-}
-
-static void list_cb(wifi_state_t state, const char * txt)
-{
-    if(state == WIFI_STATE_OK) {
-        if(txt[0] == '\0') {
-        lv_app_notice_add("WiFi network list ready");
-            return;
-        }
-        if(strlen(ssid_list) + strlen(txt) + 4 < sizeof(ssid_list)) {
-            sprintf(ssid_list, "%s\n%s", ssid_list, txt);
-        }
-        
-        lv_app_inst_t * app = lv_app_get_next(NULL, &my_app_dsc);
-        while(app != NULL) {
-            if(app->win_data != NULL) {
-                my_win_data_t * wdata = app->win_data;
-                lv_ddlist_set_options_str(wdata->list, ssid_list);
-                
-            }
-            app = lv_app_get_next(app, &my_app_dsc);
-        }
-    } else if(state == WIFI_STATE_ERROR) {
-        lv_app_notice_add("WiFi network list error\n%s", txt);
-    }
-}
-
-static void tcp_transf_cb(wifi_state_t state, const char * txt)
-{
-    if(state == WIFI_STATE_OK) {
-        uint16_t size =  txt[0] + ((txt[1] << 8) & 0xFF00);
-        char buf[256];
-        memcpy(buf, &txt[2], size);
-        buf[size] = '\0';
-        lv_app_com_send(app_act_com, LV_APP_COM_TYPE_CHAR, &txt[2], size);
-        my_app_data_t * adata = app_act_com->app_data;
-        dm_free(adata->last_msg_dp);
-        adata->last_msg_dp = NULL;
-        adata->last_msg_size = 0;
-        app_act_com = NULL;
-    }else if(state == WIFI_STATE_ERROR) {
-        lv_app_notice_add("WiFi TCP transfer error\n%s", txt);
-        lv_app_notice_add("Reconnecting to WiFi...");
-        wifimng_reconnect();
-    }
-}
-
-
-static void win_title_refr(void)
-{
-    lv_app_inst_t * app;
-    app = lv_app_get_next(NULL, &my_app_dsc);
-    while(app != NULL) {
-        if(app->win != NULL) {
-            my_win_data_t * wdata = app->win_data;
-            
-            if(wifimng_get_state() == WIFIMNG_STATE_IDLE) {
-                lv_label_set_text(wdata->title, "Not connected");
-            }
-            else if(wifimng_get_state() == WIFIMNG_STATE_READY) {
-
-                char buf[256];
-                sprintf(buf, "%s - %s:%s", wifimng_get_last_ssid(), wifimng_get_last_ip(), wifimng_get_last_port());
-                lv_label_set_text(wdata->title, buf);
-            }
-            else {
-                lv_label_set_text(wdata->title, "Connecting ...");
-            }
-
-            lv_obj_set_width(wdata->title, lv_win_get_width(app->win));
-        }
-        app = lv_app_get_next(app, &my_app_dsc);
-    }
-}
-
-static void save_conf(lv_app_inst_t * app)
-{
-#ifdef LV_APP_WIFI_CONF_PATH
-    my_app_data_t * adata = app->app_data;
-    
-    fs_file_t f;
-    fs_res_t res;
-    res = fs_open(&f, LV_APP_WIFI_CONF_PATH, FS_MODE_WR);
-    if(res == FS_RES_OK) {
-        char buf[256];
-        sprintf(buf,"%s\n%s\n%s\n%s", adata->set_ssid, adata->set_pwd, adata->set_ip, adata->set_port);
-        fs_write(&f, buf, strlen(buf) + 1, NULL);
-        fs_close(&f);
-    }
-#endif
-}
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_EXAMPLE != 0*/

lv_appx/lv_app_wifi.h

@@ -1,47 +0,0 @@
-/**
- * @file lv_app_example.h
- *
- */
-
-#ifndef LV_APP_WIFI_H
-#define LV_APP_WIFI_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lvgl/lv_app/lv_app.h"
-
-#if LV_APP_ENABLE != 0 && USE_LV_APP_WIFI != 0
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-typedef struct
-{
-
-}lv_app_wifi_conf_t;
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-const lv_app_dsc_t * lv_app_wifi_init(void);
-
-/**********************
- *      MACROS
- **********************/
-
-#endif /*LV_APP_ENABLE != 0 && USE_LV_APP_EXAMPLE != 0*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* LV_APP_EXAMPLE_H */

lv_conf_templ.h

@@ -1,62 +1,189 @@
 /**
  * @file lv_conf.h
- * 
+ *
  */
 
-#if 0 /*Remove this to enable the content (Delete the last #endif too!)*/
+/*
+ * COPY THIS FILE AS lv_conf.h
+ */
+
+#if 0 /*Set it to "1" to enable content*/
 
 #ifndef LV_CONF_H
 #define LV_CONF_H
 
+/*===================
+   Dynamic memory
+ *===================*/
+
+/* Memory size which will be used by the library
+ * to store the graphical objects and other data */
+#define LV_MEM_CUSTOM      0                /*1: use custom malloc/free, 0: use the built-in lv_mem_alloc/lv_mem_free*/
+#if LV_MEM_CUSTOM == 0
+#define LV_MEM_SIZE    (32U * 1024U)        /*Size memory used by `lv_mem_alloc` in bytes (>= 2kB)*/
+#define LV_MEM_ATTR                         /*Complier prefix for big array declaration*/
+#define LV_MEM_AUTO_DEFRAG  1               /*Automatically defrag on free*/
+#else       /*LV_MEM_CUSTOM*/
+#define LV_MEM_CUSTOM_INCLUDE <stdlib.h>   /*Header for the dynamic memory function*/
+#define LV_MEM_CUSTOM_ALLOC   malloc       /*Wrapper to malloc*/
+#define LV_MEM_CUSTOM_FREE    free         /*Wrapper to free*/
+#endif     /*LV_MEM_CUSTOM*/
+
 /*===================
    Graphical settings
- *=====================*/
+ *===================*/
 
-/* Horizontal and vertical resolution of the library.
- * Screen resolution multiplied by LV_DOWN_SCALE*/
-#define LV_HOR_RES          (320 * LV_DOWNSCALE)
-#define LV_VER_RES          (240 * LV_DOWNSCALE)
-#define LV_DPI              (80 * LV_DOWNSCALE)
-/* Enable anti-aliasing
- * If enabled everything will half-sized
- * Use LV_DOWNSCALE to compensate he down scaling effect of anti-aliasing*/
-#define LV_ANTIALIAS        1
-#define LV_DOWNSCALE        (1 << LV_ANTIALIAS) /*Set the downscaling value*/
+/* Horizontal and vertical resolution of the library.*/
+#define LV_HOR_RES          (320)
+#define LV_VER_RES          (240)
+#define LV_DPI              100
 
-/* Buffered rendering: >= LV_DOWNSCALE * LV_HOR_RES or 0 to disable buffering*/
-#define LV_VDB_SIZE         (LV_HOR_RES * LV_VER_RES / 20)
-#if LV_VDB_SIZE
-/* Double virtual buffering
- * One for rendering another to transfer former rendered image to frame buffer in the background*/
-#define LV_VDB_DOUBLE       0
-#endif
+/* Size of VDB (Virtual Display Buffer: the internal graphics buffer).
+ * Required for buffered drawing, opacity and anti-aliasing
+ * VDB makes the double buffering, you don't need to deal with it!
+ * Typical size: ~1/10 screen */
+#define LV_VDB_SIZE         (30 * LV_HOR_RES)  /*Size of VDB in pixel count (1/10 screen size is good for first)*/
+#define LV_VDB_PX_BPP       LV_COLOR_SIZE     /*Bit-per-pixel of VDB. Useful for monochrome or non-standard color format displays. (Set `disp_drv->vdb_wr` and `disp_drv->vdb_rd` too)*/
+#define LV_VDB_ADR          0                 /*Place VDB to a specific address (e.g. in external RAM) (0: allocate automatically into RAM; LV_VDB_ADR_INV: to replace it later with `lv_vdb_set_adr()`)*/
 
-#define LV_REFR_PERIOD      40    /*Screen refresh period in milliseconds*/
-#define LV_INV_FIFO_SIZE    32    /*The average number of objects on a screen */
+/* Use two Virtual Display buffers (VDB) parallelize rendering and flushing (optional)
+ * The flushing should use DMA to write the frame buffer in the background*/
+#define LV_VDB_DOUBLE       0       /*1: Enable the use of 2 VDBs*/
+#define LV_VDB2_ADR         0       /*Place VDB2 to a specific address (e.g. in external RAM) (0: allocate automatically into RAM; LV_VDB_ADR_INV: to replace it later with `lv_vdb_set_adr()`)*/
+
+/* Enable anti-aliasing (lines, and radiuses will be smoothed) */
+#define LV_ANTIALIAS        1       /*1: Enable anti-aliasing*/
+
+/*Screen refresh settings*/
+#define LV_REFR_PERIOD      30    /*Screen refresh period in milliseconds*/
+#define LV_INV_FIFO_SIZE    32    /*The average count of objects on a screen */
 
 /*=================
    Misc. setting
  *=================*/
-/*Display Input settings*/
-#define LV_DISPI_READ_PERIOD      50                    /*Input device read period milliseconds*/
-#define LV_DISPI_TP_MARKER        0                     /*Mark the pressed points (Value means marker point size)*/
-#define LV_DISPI_DRAG_LIMIT       (10 * LV_DOWNSCALE)   /*Drag threshold in pixels */
-#define LV_DISPI_DRAG_THROW       20                    /*Drag throw slow-down in [%]. Greater value means faster slow-down */
-#define LV_DISPI_LONG_PRESS_TIME        400             /*Long press time in milliseconds*/
-#define LV_DISPI_LONG_PRESS_REP_TIME    100             /*Repeated trigger period in long press [ms] */
 
-/*lv_obj (base object) settings*/
-#define LV_OBJ_FREE_NUM          1           /*Enable the free number attribute*/
-#define LV_OBJ_FREE_P            1           /*Enable the free pointer attribute*/
-#define LV_OBJ_GROUP             1           /*Enable object groups*/
+/*Input device settings*/
+#define LV_INDEV_READ_PERIOD            50                     /*Input device read period in milliseconds*/
+#define LV_INDEV_POINT_MARKER           0                      /*Mark the pressed points  (required: USE_LV_REAL_DRAW = 1)*/
+#define LV_INDEV_DRAG_LIMIT             10                     /*Drag threshold in pixels */
+#define LV_INDEV_DRAG_THROW             20                     /*Drag throw slow-down in [%]. Greater value means faster slow-down */
+#define LV_INDEV_LONG_PRESS_TIME        400                    /*Long press time in milliseconds*/
+#define LV_INDEV_LONG_PRESS_REP_TIME    100                    /*Repeated trigger period in long press [ms] */
 
-/*Others*/
-#define LV_COLOR_TRANSP     COLOR_LIME      /*This could mean transparent pixel*/
-#define USE_LV_EXAMPLE      1               /*Enable examples (lvgl/lv_examples/). Disable to save memory*/
+/*Color settings*/
+#define LV_COLOR_DEPTH     16                     /*Color depth: 1/8/16/32*/
+#define LV_COLOR_16_SWAP   0                      /*Swap the 2 bytes of RGB565 color. Useful if the display has a 8 bit interface (e.g. SPI)*/
+#define LV_COLOR_SCREEN_TRANSP        0           /*1: Enable screen transparency. Useful for OSD or other overlapping GUIs. Requires ARGB8888 colors*/
+#define LV_COLOR_TRANSP    LV_COLOR_LIME          /*Images pixels with this color will not be drawn (with chroma keying)*/
+
+/*Text settings*/
+#define LV_TXT_UTF8             1                /*Enable UTF-8 coded Unicode character usage */
+#define LV_TXT_BREAK_CHARS     " ,.;:-_"         /*Can break texts on these chars*/
+
+/*Graphics feature usage*/
+#define USE_LV_ANIMATION        1               /*1: Enable all animations*/
+#define USE_LV_SHADOW           1               /*1: Enable shadows*/
+#define USE_LV_GROUP            1               /*1: Enable object groups (for keyboards)*/
+#define USE_LV_GPU              1               /*1: Enable GPU interface*/
+#define USE_LV_REAL_DRAW        1               /*1: Enable function which draw directly to the frame buffer instead of VDB (required if LV_VDB_SIZE = 0)*/
+#define USE_LV_FILESYSTEM       1               /*1: Enable file system (required by images*/
+
+/*Compiler settings*/
+#define LV_ATTRIBUTE_TICK_INC                   /* Define a custom attribute to `lv_tick_inc` function */
+#define LV_ATTRIBUTE_TASK_HANDLER               /* Define a custom attribute to `lv_task_handler` function */
+#define LV_COMPILER_VLA_SUPPORTED            1  /* 1: Variable length array is supported*/
+#define LV_COMPILER_NON_CONST_INIT_SUPPORTED 1  /* 1: Initialization with non constant values are supported */
+
+/*HAL settings*/
+#define LV_TICK_CUSTOM     0                        /*1: use a custom tick source (removing the need to manually update the tick with `lv_tick_inc`) */
+#if LV_TICK_CUSTOM == 1
+#define LV_TICK_CUSTOM_INCLUDE  "Arduino.h"         /*Header for the sys time function*/
+#define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis())     /*Expression evaluating to current systime in ms*/
+#endif     /*LV_TICK_CUSTOM*/
+
+
+/*Log settings*/
+#define USE_LV_LOG      1   /*Enable/disable the log module*/
+#if USE_LV_LOG
+/* How important log should be added:
+ * LV_LOG_LEVEL_TRACE       A lot of logs to give detailed information
+ * LV_LOG_LEVEL_INFO        Log important events
+ * LV_LOG_LEVEL_WARN        Log if something unwanted happened but didn't caused problem
+ * LV_LOG_LEVEL_ERROR       Only critical issue, when the system may fail
+ */
+#define LV_LOG_LEVEL    LV_LOG_LEVEL_INFO
+/* 1: Print the log with 'printf'; 0: user need to register a callback*/
+
+#define LV_LOG_PRINTF   0
+#endif  /*USE_LV_LOG*/
+
+/*================
+ *  THEME USAGE
+ *================*/
+#define LV_THEME_LIVE_UPDATE    0       /*1: Allow theme switching at run time. Uses 8..10 kB of RAM*/
+
+#define USE_LV_THEME_TEMPL      0       /*Just for test*/
+#define USE_LV_THEME_DEFAULT    0       /*Built mainly from the built-in styles. Consumes very few RAM*/
+#define USE_LV_THEME_ALIEN      0       /*Dark futuristic theme*/
+#define USE_LV_THEME_NIGHT      0       /*Dark elegant theme*/
+#define USE_LV_THEME_MONO       0       /*Mono color theme for monochrome displays*/
+#define USE_LV_THEME_MATERIAL   0       /*Flat theme with bold colors and light shadows*/
+#define USE_LV_THEME_ZEN        0       /*Peaceful, mainly light theme */
+#define USE_LV_THEME_NEMO       0       /*Water-like theme based on the movie "Finding Nemo"*/
 
 /*==================
- *  LV OBJ X USAGE 
- * ================*/
+ *    FONT USAGE
+ *===================*/
+
+/* More info about fonts: https://littlevgl.com/basics#fonts
+ * To enable a built-in font use 1,2,4 or 8 values
+ * which will determine the bit-per-pixel */
+#define LV_FONT_DEFAULT        &lv_font_dejavu_20     /*Always set a default font from the built-in fonts*/
+
+#define USE_LV_FONT_DEJAVU_10              0
+#define USE_LV_FONT_DEJAVU_10_LATIN_SUP    0
+#define USE_LV_FONT_DEJAVU_10_CYRILLIC     0
+#define USE_LV_FONT_SYMBOL_10              0
+
+#define USE_LV_FONT_DEJAVU_20              4
+#define USE_LV_FONT_DEJAVU_20_LATIN_SUP    0
+#define USE_LV_FONT_DEJAVU_20_CYRILLIC     0
+#define USE_LV_FONT_SYMBOL_20              4
+
+#define USE_LV_FONT_DEJAVU_30              0
+#define USE_LV_FONT_DEJAVU_30_LATIN_SUP    0
+#define USE_LV_FONT_DEJAVU_30_CYRILLIC     0
+#define USE_LV_FONT_SYMBOL_30              0
+
+#define USE_LV_FONT_DEJAVU_40              0
+#define USE_LV_FONT_DEJAVU_40_LATIN_SUP    0
+#define USE_LV_FONT_DEJAVU_40_CYRILLIC     0
+#define USE_LV_FONT_SYMBOL_40              0
+
+#define USE_LV_FONT_MONOSPACE_8            0
+
+/* Optionally declare your custom fonts here.
+ * You can use these fonts as default font too
+ * and they will be available globally. E.g.
+ * #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(my_font_1) \
+ *                                LV_FONT_DECLARE(my_font_2) \
+ */
+#define LV_FONT_CUSTOM_DECLARE
+
+#define LV_FONT_DEFAULT        &lv_font_dejavu_20     /*Always set a default font from the built-in fonts*/
+
+/*===================
+ *  LV_OBJ SETTINGS
+ *==================*/
+#define LV_OBJ_FREE_NUM_TYPE    uint32_t    /*Type of free number attribute (comment out disable free number)*/
+#define LV_OBJ_FREE_PTR         1           /*Enable the free pointer attribute*/
+
+/*==================
+ *  LV OBJ X USAGE
+ *================*/
+/*
+ * Documentation of the object types: https://littlevgl.com/object-types
+ */
 
 /*****************
  * Simple object
@@ -65,30 +192,24 @@
 /*Label (dependencies: -*/
 #define USE_LV_LABEL    1
 #if USE_LV_LABEL != 0
-#define LV_LABEL_SCROLL_SPEED       (25 * LV_DOWNSCALE) /*Hor, or ver. scroll speed (px/sec) in 'LV_LABEL_LONG_SCROLL' mode*/
-#define LV_LABEL_SCROLL_SPEED_VER   (10 * LV_DOWNSCALE) /*Ver. scroll speed if hor. scroll is applied too*/
-#define LV_LABEL_SCROLL_PLAYBACK_PAUSE  500 /*Wait before the scroll turns back in ms*/
-#define LV_LABEL_SCROLL_REPEAT_PAUSE    500 /*Wait before the scroll begins again in ms*/
+#define LV_LABEL_SCROLL_SPEED       25     /*Hor, or ver. scroll speed [px/sec] in 'LV_LABEL_LONG_SCROLL/ROLL' mode*/
 #endif
 
-/*Image (dependencies: lv_label (if symbols are enabled) from misc: FSINT, UFS)*/
+/*Image (dependencies: lv_label*/
 #define USE_LV_IMG      1
 #if USE_LV_IMG != 0
-//#define LV_IMG_DEF_WALLPAPER    img_square_x1  /*Comment this line to NOT use wallpaper*/
-/* 1: enables to interpret the file names as symbol name
- * from symbol_def.h if they begin with a lower case letter.
- * (driver letters are always upper case)*/
-#define LV_IMG_ENABLE_SYMBOLS   1
-#if LV_IMG_ENABLE_SYMBOLS != 0
-#define LV_IMG_DEF_SYMBOL_FONT       FONT_SYMBOL_30
-#endif /*LV_IMG_ENABLE_SYMBOLS*/
-#endif /*USE_LV_IMG*/
+#define LV_IMG_CF_INDEXED   1       /*Enable indexed (palette) images*/
+#define LV_IMG_CF_ALPHA     1       /*Enable alpha indexed images*/
+#endif
 
 /*Line (dependencies: -*/
 #define USE_LV_LINE     1
 
+/*Arc (dependencies: -)*/
+#define USE_LV_ARC      1
+
 /*******************
- * Container object
+ * Container objects
  *******************/
 
 /*Container (dependencies: -*/
@@ -100,21 +221,24 @@
 /*Window (dependencies: lv_cont, lv_btn, lv_label, lv_img, lv_page)*/
 #define USE_LV_WIN      1
 
+/*Tab (dependencies: lv_page, lv_btnm)*/
+#define USE_LV_TABVIEW      1
+#if USE_LV_TABVIEW != 0
+#define LV_TABVIEW_ANIM_TIME    300     /*Time of slide animation [ms] (0: no animation)*/
+#endif
+
 /*************************
- * Data visualizer object
+ * Data visualizer objects
  *************************/
 
 /*Bar (dependencies: -)*/
-#define USE_LV_BAR       1
+#define USE_LV_BAR      1
 
-/*Line meter (dependencies: bar; misc: trigo)*/
+/*Line meter (dependencies: *;)*/
 #define USE_LV_LMETER   1
 
-/*Gauge (dependencies:bar, lmeter; misc: trigo)*/
+/*Gauge (dependencies:bar, lmeter)*/
 #define USE_LV_GAUGE    1
-#if USE_LV_GAUGE != 0
-#define LV_GAUGE_MAX_NEEDLE     4   /*Max number of needles. Used in the style.*/
-#endif
 
 /*Chart (dependencies: -)*/
 #define USE_LV_CHART    1
@@ -122,175 +246,79 @@
 /*LED (dependencies: -)*/
 #define USE_LV_LED      1
 
-/*Message box (dependencies: lv_rect, lv_btn, lv_label)*/
+/*Message box (dependencies: lv_rect, lv_btnm, lv_label)*/
 #define USE_LV_MBOX     1
 
 /*Text area (dependencies: lv_label, lv_page)*/
 #define USE_LV_TA       1
 #if USE_LV_TA != 0
-#define LV_TA_MAX_LENGTH    256
-#define LV_TA_CUR_BLINK_TIME 400     /*ms*/
-#define LV_TA_PWD_SHOW_TIME  1500    /*ms*/
+#define LV_TA_CURSOR_BLINK_TIME 400     /*ms*/
+#define LV_TA_PWD_SHOW_TIME     1500    /*ms*/
+#endif
+
+/*Calendar (dependencies: -)*/
+#define USE_LV_CALENDAR 1
+
+/*Preload (dependencies: arc)*/
+#define USE_LV_PRELOAD      1
+#if USE_LV_PRELOAD != 0
+#define LV_PRELOAD_DEF_ARC_LENGTH   60      /*[deg]*/
+#define LV_PRELOAD_DEF_SPIN_TIME    1000    /*[ms]*/
 #endif
 
 /*************************
- * User input object
+ * User input objects
  *************************/
 
 /*Button (dependencies: lv_cont*/
 #define USE_LV_BTN      1
+#if USE_LV_BTN != 0
+#define LV_BTN_INK_EFFECT   1       /*Enable button-state animations - draw a circle on click (dependencies: USE_LV_ANIMATION)*/
+#endif
+
+/*Image Button (dependencies: lv_btn*/
+#define USE_LV_IMGBTN   1
 
 /*Button matrix (dependencies: -)*/
 #define USE_LV_BTNM     1
 
+/*Keyboard (dependencies: lv_btnm)*/
+#define USE_LV_KB       1
+
 /*Check box (dependencies: lv_btn, lv_label)*/
 #define USE_LV_CB       1
 
-/*List (dependencies: lv_page, lv_btn, lv_label, lv_img)*/
+/*List (dependencies: lv_page, lv_btn, lv_label, (lv_img optionally for icons ))*/
 #define USE_LV_LIST     1
 #if USE_LV_LIST != 0
-#define LV_LIST_FOCUS_TIME  100 /*Animation time of focusing to the a list element [ms] (0: no animation)  */
+#define LV_LIST_FOCUS_TIME  100 /*Default animation time of focusing to a list element [ms] (0: no animation)  */
 #endif
 
 /*Drop down list (dependencies: lv_page, lv_label)*/
 #define USE_LV_DDLIST    1
+#if USE_LV_DDLIST != 0
+#define LV_DDLIST_ANIM_TIME     200     /*Open and close default animation time [ms] (0: no animation)*/
+#endif
+
+/*Roller (dependencies: lv_ddlist)*/
+#define USE_LV_ROLLER    1
+#if USE_LV_ROLLER != 0
+#define LV_ROLLER_ANIM_TIME     200     /*Focus animation time [ms] (0: no animation)*/
+#endif
 
 /*Slider (dependencies: lv_bar)*/
 #define USE_LV_SLIDER    1
 
-/*==================
- *  LV APP SETTINGS
- * =================*/
+/*Switch (dependencies: lv_slider)*/
+#define USE_LV_SW       1
 
-/*Enable the application system*/
-#define LV_APP_ENABLE       0
-#if LV_APP_ENABLE != 0
-
-/****************************
- * Basic application settings
- *****************************/
-#define LV_APP_DESKTOP      1                   /*Create a desktop-like environment*/
-
-#define LV_APP_SC_WIDTH     (LV_DPI * 2)        /*Shortcut width*/
-#define LV_APP_SC_HEIGHT    (3 * LV_DPI / 2)    /*Shortcut height*/
-#define LV_APP_FONT_SMALL   FONT_DEJAVU_20      /*A small font*/
-#define LV_APP_FONT_MEDIUM  FONT_DEFAULT        /*A medium font*/
-#define LV_APP_FONT_LARGE   FONT_DEJAVU_40      /*A large font*/
-
-/***********************
- * Animation settings
- ***********************/
-#define LV_APP_ANIM_WIN      200      /*Animation time of windows [ms] (0: turn off animations)*/
-#define LV_APP_ANIM_DESKTOP  200      /*Animation time the desktop [ms] (0: turn off animations)*/
-
-/************************
- * App. utility settings
- ************************/
-
-/*Notice*/
-#define USE_LV_APP_NOTICE           1
-#if USE_LV_APP_NOTICE != 0
-#define LV_APP_NOTICE_SHOW_TIME         4000    /*Notices will be shown for this time [ms]*/
-#define LV_APP_NOTICE_CLOSE_ANIM_TIME   300     /*Notice close animation time. [ms] 0: no animation */
-#define LV_APP_NOTICE_MAX_NUM   6               /*Max. number of notices*/
-#define LV_APP_NOTICE_MAX_LEN   256             /*Max. number of characters on a notice*/
+/*************************
+ * Non-user section
+ *************************/
+#ifdef _MSC_VER                               /* Disable warnings for Visual Studio*/
+# define _CRT_SECURE_NO_WARNINGS
 #endif
 
-/*File selector*/
-#define USE_LV_APP_FSEL         1
-#if USE_LV_APP_FSEL != 0
-#define LV_APP_FSEL_PAGE_SIZE     8         /*Max. number of files/folder on a page*/
-#define LV_APP_FSEL_FN_MAX_LEN    32        /*Max file name length*/
-#define LV_APP_FSEL_PATH_MAX_LEN  256       /*Max path length*/
-#endif
-
-/*Keyboard*/
-#define USE_LV_APP_KB           1
-#if USE_LV_APP_KB != 0
-#define LV_APP_KB_ANIM_TIME     300         /*ms*/
-#endif
-
-/*==================
- *  LV APP X USAGE 
- * ================*/
-
-/*Example application*/
-#define USE_LV_APP_EXAMPLE  1
-
-/*Phantom application*/
-#define USE_LV_APP_PHANTOM  1
-#if USE_LV_APP_PHANTOM != 0
-/*No settings*/
-#endif
-
-/*System monitor*/
-#define USE_LV_APP_SYSMON   1
-#if USE_LV_APP_SYSMON != 0
-#define LV_APP_SYSMON_REFR_TIME     500         /*Mem. and CPU usage read period [ms]*/
-#define LV_APP_SYSMON_PNUM          64          /*Number of point on the window's chart*/
-#define LV_APP_SYSMON_MEM_WARN      (2 * 1024)  /*Make a notice less then this remaining memory [bytes]*/
-#define LV_APP_SYSMON_FRAG_WARN     (70)        /*Make a notice above this fragmentation level [%]*/
-#define LV_APP_SYSMON_DEFRAG_PERIOD (5000)      /*Auto-defrag period [ms]*/
-#endif /*USE_LV_APP_SYSMON != 0*/
-
-/*Terminal*/
-#define USE_LV_APP_TERMINAL 1
-#if USE_LV_APP_TERMINAL != 0
-#define LV_APP_TERMINAL_LENGTH      512     /*Memory of the terminal [character number]*/
-#endif /*USE_LV_APP_TERMINAL != 0*/
-
-/*Files*/
-#define USE_LV_APP_FILES    1
-#if USE_LV_APP_FILES != 0
-#define LV_APP_FILES_PAGE_SIZE      8       /*Max. number of files/folder on a page*/
-#define LV_APP_FILES_FN_MAX_LEN     32      /*Max file name length*/
-#define LV_APP_FILES_PATH_MAX_LEN   256     /*Max path length*/
-#define LV_APP_FILES_CHUNK_DEF_SIZE 256     /*Chunk size when sending a file*/
-#define LV_APP_FILES_CHUNK_DEF_TIME 100     /*Delay between sent chunks*/
-#define LV_APP_FILES_CHUNK_MAX_SIZE 1024    /*Max chunk size when the user sets it*/
-#endif /*USE_LV_APP_FILES != 0*/
-
-/*Benchmark*/
-#define USE_LV_APP_BENCHMARK     1
-#if USE_LV_APP_BENCHMARK != 0
-/*No settings*/
-#endif
-
-/*WiFi*/
-#define USE_LV_APP_WIFI    0
-#if USE_LV_APP_WIFI != 0
-#define LV_APP_WIFI_CONF_PATH       "S:/wifi_conf.txt"  /*Save config. here. Comment to use def. value*/
-#ifndef LV_APP_WIFI_CONF_PATH
-#define LV_APP_WIFI_SSID_DEF        "ssid"
-#define LV_APP_WIFI_PWD_DEF         "pwd"
-#define LV_APP_WIFI_IP_DEF          "100.101.102.103"
-#define LV_APP_WIFI_PORT_DEF        "1234" 
-#endif  /*LV_APP_WIFI_CONF_PATH*/
-#define LV_APP_WIFI_AUTO_CONNECT    1       /*Try to connect at start up to the deafult SSID and IP:PORT*/
-#endif /*USE_LV_APP_WIFI != 0*/
-
-/*GSM*/
-#define USE_LV_APP_GSM    0
-#if USE_LV_APP_GSM != 0
-#define LV_APP_GSM_CONF_PATH       "S:/gsm_conf.txt"    /*Save config. here. Comment to use def. value*/
-#ifndef LV_APP_GSM_CONF_PATH
-#define LV_APP_GSM_APN_DEF        "apn"
-#define LV_APP_GSM_IP_DEF         "101.102.103.104"
-#define LV_APP_GSM_PORT_DEF       "1234"
-#endif  /*LV_APP_GSM_CONF_PATH*/
-#define LV_APP_GSM_AUTO_CONNECT   1       /*Try to connect at start up with the deafult APN and IP:PORT*/
-#endif /*USE_LV_APP_GSM != 0*/
-
-/*Ethernet*/
-#define USE_LV_APP_ETHERNET    0
-#if USE_LV_APP_ETHERNET != 0
-/*No settings*/
-#endif /*USE_LV_APP_ETHERNET != 0*/
-
-#endif /*LV_APP_ENABLE != 0*/
-
 #endif /*LV_CONF_H*/
 
-
-#endif /*Remove this to enable the content*/
-
+#endif /*End of "Content enable"*/

lv_core/lv_core.mk

@@ -0,0 +1,11 @@
+CSRCS += lv_group.c
+CSRCS += lv_indev.c
+CSRCS += lv_obj.c
+CSRCS += lv_refr.c
+CSRCS += lv_style.c
+CSRCS += lv_vdb.c
+
+DEPPATH += --dep-path lvgl/lv_core
+VPATH += :lvgl/lv_core
+
+CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_core"

lv_core/lv_group.c

@@ -0,0 +1,462 @@
+/**
+ * @file lv_group.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_group.h"
+#if USE_LV_GROUP != 0
+#include <stddef.h>
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+static void style_mod_def(lv_style_t * style);
+static void style_mod_edit_def(lv_style_t * style);
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Create a new object group
+ * @return pointer to the new object group
+ */
+lv_group_t * lv_group_create(void)
+{
+    lv_group_t * group = lv_mem_alloc(sizeof(lv_group_t));
+    lv_mem_assert(group);
+    if(group == NULL) return NULL;
+    lv_ll_init(&group->obj_ll, sizeof(lv_obj_t *));
+
+    group->style_mod = style_mod_def;
+    group->style_mod_edit = style_mod_edit_def;
+    group->obj_focus = NULL;
+    group->frozen = 0;
+    group->focus_cb = NULL;
+    group->click_focus = 1;
+    group->editing = 0;
+
+    return group;
+}
+
+/**
+ * Delete a group object
+ * @param group pointer to a group
+ */
+void lv_group_del(lv_group_t * group)
+{
+    /*Defocus the the currently focused object*/
+    if(group->obj_focus != NULL) {
+        (*group->obj_focus)->signal_func(*group->obj_focus, LV_SIGNAL_DEFOCUS, NULL);
+        lv_obj_invalidate(*group->obj_focus);
+    }
+
+    /*Remove the objects from the group*/
+    lv_obj_t ** obj;
+    LL_READ(group->obj_ll, obj) {
+        (*obj)->group_p = NULL;
+    }
+
+    lv_ll_clear(&(group->obj_ll));
+    lv_mem_free(group);
+}
+
+/**
+ * Add an object to a group
+ * @param group pointer to a group
+ * @param obj pointer to an object to add
+ */
+void lv_group_add_obj(lv_group_t * group, lv_obj_t * obj)
+{
+    if(group == NULL) return;
+
+    /*If the object is already in a group and focused then defocuse it*/
+    if(obj->group_p) {
+        if(lv_obj_is_focused(obj)) {
+            lv_group_focus_next(obj->group_p);
+
+            LV_LOG_INFO("group: assign object to an other group");
+        }
+    }
+
+    obj->group_p = group;
+    lv_obj_t ** next = lv_ll_ins_tail(&group->obj_ll);
+    lv_mem_assert(next);
+    if(next == NULL) return;
+    *next = obj;
+
+    /* If the head and the tail is equal then there is only one object in the linked list.
+     * In this case automatically activate it*/
+    if(lv_ll_get_head(&group->obj_ll) == next) {
+        lv_group_focus_next(group);
+    }
+}
+
+/**
+ * Remove an object from its group
+ * @param obj pointer to an object to remove
+ */
+void lv_group_remove_obj(lv_obj_t * obj)
+{
+    lv_group_t * g = obj->group_p;
+    if(g == NULL) return;
+    if(g->obj_focus == NULL) return;        /*Just to be sure (Not possible if there is at least one object in the group)*/
+
+    if(*g->obj_focus == obj) {
+        lv_group_focus_next(g);
+    }
+
+    /* If the focuses object is still the same then it was the only object in the group but it will be deleted.
+     * Set the `obj_focus` to NULL to get back to the initial state of the group with zero objects*/
+    if(*g->obj_focus == obj) {
+        g->obj_focus = NULL;
+    }
+
+    /*Search the object and remove it from its group */
+    lv_obj_t ** i;
+    LL_READ(g->obj_ll, i) {
+        if(*i == obj) {
+            lv_ll_rem(&g->obj_ll, i);
+            lv_mem_free(i);
+            obj->group_p = NULL;
+        }
+    }
+}
+
+/**
+ * Focus on an object (defocus the current)
+ * @param obj pointer to an object to focus on
+ */
+void lv_group_focus_obj(lv_obj_t * obj)
+{
+    lv_group_t * g = obj->group_p;
+    if(g == NULL) return;
+
+    if(g->frozen != 0) return;
+
+    lv_obj_t ** i;
+    LL_READ(g->obj_ll, i) {
+        if(*i == obj) {
+            if(g->obj_focus == i) return;       /*Don't focus the already focused object again*/
+            if(g->obj_focus != NULL) {
+                (*g->obj_focus)->signal_func(*g->obj_focus, LV_SIGNAL_DEFOCUS, NULL);
+                lv_obj_invalidate(*g->obj_focus);
+            }
+
+            g->obj_focus = i;
+
+            if(g->obj_focus != NULL) {
+                (*g->obj_focus)->signal_func(*g->obj_focus, LV_SIGNAL_FOCUS, NULL);
+                if(g->focus_cb) g->focus_cb(g);
+                lv_obj_invalidate(*g->obj_focus);
+            }
+            break;
+        }
+    }
+}
+
+/**
+ * Focus the next object in a group (defocus the current)
+ * @param group pointer to a group
+ */
+void lv_group_focus_next(lv_group_t * group)
+{
+    if(group->frozen) return;
+
+    if(group->obj_focus) {
+        (*group->obj_focus)->signal_func(*group->obj_focus, LV_SIGNAL_DEFOCUS, NULL);
+        lv_obj_invalidate(*group->obj_focus);
+    }
+
+    lv_obj_t ** obj_next;
+    if(group->obj_focus == NULL) obj_next = lv_ll_get_head(&group->obj_ll);
+    else obj_next = lv_ll_get_next(&group->obj_ll, group->obj_focus);
+
+    if(obj_next == NULL) obj_next = lv_ll_get_head(&group->obj_ll);
+    group->obj_focus = obj_next;
+
+    if(group->obj_focus) {
+        (*group->obj_focus)->signal_func(*group->obj_focus, LV_SIGNAL_FOCUS, NULL);
+        lv_obj_invalidate(*group->obj_focus);
+
+        if(group->focus_cb) group->focus_cb(group);
+    }
+}
+
+/**
+ * Focus the previous object in a group (defocus the current)
+ * @param group pointer to a group
+ */
+void lv_group_focus_prev(lv_group_t * group)
+{
+    if(group->frozen) return;
+
+    if(group->obj_focus) {
+        (*group->obj_focus)->signal_func(*group->obj_focus, LV_SIGNAL_DEFOCUS, NULL);
+        lv_obj_invalidate(*group->obj_focus);
+    }
+
+    lv_obj_t ** obj_next;
+    if(group->obj_focus == NULL) obj_next = lv_ll_get_tail(&group->obj_ll);
+    else obj_next = lv_ll_get_prev(&group->obj_ll, group->obj_focus);
+
+    if(obj_next == NULL) obj_next = lv_ll_get_tail(&group->obj_ll);
+    group->obj_focus = obj_next;
+
+    if(group->obj_focus != NULL) {
+        (*group->obj_focus)->signal_func(*group->obj_focus, LV_SIGNAL_FOCUS, NULL);
+        lv_obj_invalidate(*group->obj_focus);
+
+        if(group->focus_cb) group->focus_cb(group);
+    }
+
+}
+
+/**
+ * Do not let to change the focus from the current object
+ * @param group pointer to a group
+ * @param en true: freeze, false: release freezing (normal mode)
+ */
+void lv_group_focus_freeze(lv_group_t * group, bool en)
+{
+    if(en == false) group->frozen = 0;
+    else group->frozen = 1;
+}
+
+/**
+ * Send a control character to the focuses object of a group
+ * @param group pointer to a group
+ * @param c a character (use LV_GROUP_KEY_.. to navigate)
+ */
+void lv_group_send_data(lv_group_t * group, uint32_t c)
+{
+    lv_obj_t * act = lv_group_get_focused(group);
+    if(act == NULL) return;
+
+    act->signal_func(act, LV_SIGNAL_CONTROLL, &c);
+}
+
+/**
+ * Set a function for a group which will modify the object's style if it is in focus
+ * @param group pointer to a group
+ * @param style_mod_func the style modifier function pointer
+ */
+void lv_group_set_style_mod_cb(lv_group_t * group, lv_group_style_mod_func_t style_mod_func)
+{
+    group->style_mod = style_mod_func;
+    if(group->obj_focus != NULL) lv_obj_invalidate(*group->obj_focus);
+}
+
+/**
+ * Set a function for a group which will modify the object's style if it is in focus in edit mode
+ * @param group pointer to a group
+ * @param style_mod_func the style modifier function pointer
+ */
+void lv_group_set_style_mod_edit_cb(lv_group_t * group, lv_group_style_mod_func_t style_mod_func)
+{
+    group->style_mod_edit = style_mod_func;
+    if(group->obj_focus != NULL) lv_obj_invalidate(*group->obj_focus);
+}
+
+/**
+ * Set a function for a group which will be called when a new object is focused
+ * @param group pointer to a group
+ * @param focus_cb the call back function or NULL if unused
+ */
+void lv_group_set_focus_cb(lv_group_t * group, lv_group_focus_cb_t focus_cb)
+{
+    group->focus_cb = focus_cb;
+}
+
+/**
+ * Manually set the current mode (edit or navigate).
+ * @param group pointer to group
+ * @param edit: true: edit mode; false: navigate mode
+ */
+void lv_group_set_editing(lv_group_t * group, bool edit)
+{
+    group->editing = edit ? 1 : 0;
+    lv_obj_t * focused = lv_group_get_focused(group);
+    lv_obj_invalidate(focused);
+}
+
+/**
+ * Set the `click_focus` attribute. If enabled then the object will be focused then it is clicked.
+ * @param group pointer to group
+ * @param en: true: enable `click_focus`
+ */
+void lv_group_set_click_focus(lv_group_t * group, bool en)
+{
+    group->click_focus = en ? 1 : 0;
+}
+
+/**
+ * Modify a style with the set 'style_mod' function. The input style remains unchanged.
+ * @param group pointer to group
+ * @param style pointer to a style to modify
+ * @return a copy of the input style but modified with the 'style_mod' function
+ */
+lv_style_t * lv_group_mod_style(lv_group_t * group, const lv_style_t * style)
+{
+    lv_style_copy(&group->style_tmp, style);
+
+    if(group->editing) {
+        if(group->style_mod_edit != NULL) group->style_mod_edit(&group->style_tmp);
+        else style_mod_edit_def(&group->style_tmp);
+    } else {
+        if(group->style_mod != NULL) group->style_mod(&group->style_tmp);
+        else style_mod_def(&group->style_tmp);
+    }
+    return &group->style_tmp;
+}
+
+/**
+ * Get the focused object or NULL if there isn't one
+ * @param group pointer to a group
+ * @return pointer to the focused object
+ */
+lv_obj_t * lv_group_get_focused(const lv_group_t * group)
+{
+    if(!group) return NULL;
+    if(group->obj_focus == NULL) return NULL;
+
+    return *group->obj_focus;
+}
+
+/**
+ * Get a the style modifier function of a group
+ * @param group pointer to a group
+ * @return pointer to the style modifier function
+ */
+lv_group_style_mod_func_t lv_group_get_style_mod_cb(const lv_group_t * group)
+{
+    if(!group) return false;
+    return group->style_mod ;
+}
+
+/**
+ * Get a the style modifier function of a group in edit mode
+ * @param group pointer to a group
+ * @return pointer to the style modifier function
+ */
+lv_group_style_mod_func_t lv_group_get_style_mod_edit_cb(const lv_group_t * group)
+{
+    if(!group) return false;
+    return group->style_mod_edit;
+}
+
+/**
+ * Get the focus callback function of a group
+ * @param group pointer to a group
+ * @return the call back function or NULL if not set
+ */
+lv_group_focus_cb_t lv_group_get_focus_cb(const lv_group_t * group)
+{
+    if(!group) return false;
+    return group->focus_cb;
+}
+
+/**
+ * Get the current mode (edit or navigate).
+ * @param group pointer to group
+ * @return true: edit mode; false: navigate mode
+ */
+bool lv_group_get_editing(const lv_group_t * group)
+{
+    if(!group) return false;
+    return group->editing ? true : false;
+}
+
+/**
+ * Get the `click_focus` attribute.
+ * @param group pointer to group
+ * @return true: `click_focus` is enabled; false: disabled
+ */
+bool lv_group_get_click_focus(const lv_group_t * group)
+{
+    if(!group) return false;
+    return group->click_focus ? true : false;
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+/**
+ * Default style modifier function
+ * @param style pointer to a style to modify. (Typically group.style_tmp) It will be OVERWRITTEN.
+ */
+static void style_mod_def(lv_style_t * style)
+{
+#if LV_COLOR_DEPTH != 1
+
+    /*Make the style to be a little bit orange*/
+    style->body.border.opa = LV_OPA_COVER;
+    style->body.border.color = LV_COLOR_ORANGE;
+
+    /*If not empty or has border then emphasis the border*/
+    if(style->body.empty == 0 || style->body.border.width != 0) style->body.border.width = LV_DPI / 20;
+
+    style->body.main_color = lv_color_mix(style->body.main_color, LV_COLOR_ORANGE, LV_OPA_70);
+    style->body.grad_color = lv_color_mix(style->body.grad_color, LV_COLOR_ORANGE, LV_OPA_70);
+    style->body.shadow.color = lv_color_mix(style->body.shadow.color, LV_COLOR_ORANGE, LV_OPA_60);
+
+    style->text.color = lv_color_mix(style->text.color, LV_COLOR_ORANGE, LV_OPA_70);
+#else
+    style->body.border.opa = LV_OPA_COVER;
+    style->body.border.color = LV_COLOR_BLACK;
+    style->body.border.width = 2;
+
+#endif
+
+}
+
+/**
+ * Default style modifier function
+ * @param style pointer to a style to modify. (Typically group.style_tmp) It will be OVERWRITTEN.
+ */
+static void style_mod_edit_def(lv_style_t * style)
+{
+#if LV_COLOR_DEPTH != 1
+
+    /*Make the style to be a little bit orange*/
+    style->body.border.opa = LV_OPA_COVER;
+    style->body.border.color = LV_COLOR_GREEN;
+
+    /*If not empty or has border then emphasis the border*/
+    if(style->body.empty == 0 || style->body.border.width != 0) style->body.border.width = LV_DPI / 20;
+
+    style->body.main_color = lv_color_mix(style->body.main_color, LV_COLOR_GREEN, LV_OPA_70);
+    style->body.grad_color = lv_color_mix(style->body.grad_color, LV_COLOR_GREEN, LV_OPA_70);
+    style->body.shadow.color = lv_color_mix(style->body.shadow.color, LV_COLOR_GREEN, LV_OPA_60);
+
+    style->text.color = lv_color_mix(style->text.color, LV_COLOR_GREEN, LV_OPA_70);
+#else
+    style->body.border.opa = LV_OPA_COVER;
+    style->body.border.color = LV_COLOR_BLACK;
+    style->body.border.width = 3;
+
+#endif
+
+}
+
+#endif /*USE_LV_GROUP != 0*/

lv_core/lv_group.h

@@ -0,0 +1,218 @@
+/**
+ * @file lv_group.h
+ *
+ */
+
+#ifndef LV_GROUP_H
+#define LV_GROUP_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
+#include "lv_obj.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+/*Predefined keys to control the focused object via lv_group_send(group, c)*/
+/*For compatibility in signal function define the keys regardless to LV_GROUP*/
+#define LV_GROUP_KEY_UP             17      /*0x11*/
+#define LV_GROUP_KEY_DOWN           18      /*0x12*/
+#define LV_GROUP_KEY_RIGHT          19      /*0x13*/
+#define LV_GROUP_KEY_LEFT           20      /*0x14*/
+#define LV_GROUP_KEY_ESC            27      /*0x1B*/
+#define LV_GROUP_KEY_DEL            28      /*0x1C*/
+#define LV_GROUP_KEY_ENTER          10      /*0x0A, '\n'*/
+#define LV_GROUP_KEY_NEXT           9       /*0x09, '\t'*/
+#define LV_GROUP_KEY_PREV           11      /*0x0B, '*/
+
+#if USE_LV_GROUP  != 0
+/**********************
+ *      TYPEDEFS
+ **********************/
+struct _lv_group_t;
+
+typedef void (*lv_group_style_mod_func_t)(lv_style_t *);
+typedef void (*lv_group_focus_cb_t)(struct _lv_group_t *);
+
+typedef struct _lv_group_t
+{
+    lv_ll_t obj_ll;                         /*Linked list to store the objects in the group */
+    lv_obj_t ** obj_focus;                  /*The object in focus*/
+    lv_group_style_mod_func_t style_mod;    /*A function which modifies the style of the focused object*/
+    lv_group_style_mod_func_t style_mod_edit;/*A function which modifies the style of the focused object*/
+    lv_group_focus_cb_t focus_cb;           /*A function to call when a new object is focused (optional)*/
+    lv_style_t style_tmp;                   /*Stores the modified style of the focused object */
+    uint8_t frozen          :1;             /*1: can't focus to new object*/
+    uint8_t editing         :1;             /*1: Edit mode, 0: Navigate mode*/
+    uint8_t click_focus     :1;             /*1: If an object in a group is clicked by an indev then it will be focused */
+} lv_group_t;
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Create a new object group
+ * @return pointer to the new object group
+ */
+lv_group_t * lv_group_create(void);
+
+/**
+ * Delete a group object
+ * @param group pointer to a group
+ */
+void lv_group_del(lv_group_t * group);
+
+/**
+ * Add an object to a group
+ * @param group pointer to a group
+ * @param obj pointer to an object to add
+ */
+void lv_group_add_obj(lv_group_t * group, lv_obj_t * obj);
+
+/**
+ * Remove an object from its group
+ * @param obj pointer to an object to remove
+ */
+void lv_group_remove_obj(lv_obj_t * obj);
+
+/**
+ * Focus on an object (defocus the current)
+ * @param obj pointer to an object to focus on
+ */
+void lv_group_focus_obj(lv_obj_t * obj);
+
+/**
+ * Focus the next object in a group (defocus the current)
+ * @param group pointer to a group
+ */
+void lv_group_focus_next(lv_group_t * group);
+
+/**
+ * Focus the previous object in a group (defocus the current)
+ * @param group pointer to a group
+ */
+void lv_group_focus_prev(lv_group_t * group);
+
+/**
+ * Do not let to change the focus from the current object
+ * @param group pointer to a group
+ * @param en true: freeze, false: release freezing (normal mode)
+ */
+void lv_group_focus_freeze(lv_group_t * group, bool en);
+
+/**
+ * Send a control character to the focuses object of a group
+ * @param group pointer to a group
+ * @param c a character (use LV_GROUP_KEY_.. to navigate)
+ */
+void lv_group_send_data(lv_group_t * group, uint32_t c);
+
+/**
+ * Set a function for a group which will modify the object's style if it is in focus
+ * @param group pointer to a group
+ * @param style_mod_func the style modifier function pointer
+ */
+void lv_group_set_style_mod_cb(lv_group_t * group, lv_group_style_mod_func_t style_mod_func);
+
+/**
+ * Set a function for a group which will modify the object's style if it is in focus in edit mode
+ * @param group pointer to a group
+ * @param style_mod_func the style modifier function pointer
+ */
+void lv_group_set_style_mod_edit_cb(lv_group_t * group, lv_group_style_mod_func_t style_mod_func);
+
+/**
+ * Set a function for a group which will be called when a new object is focused
+ * @param group pointer to a group
+ * @param focus_cb the call back function or NULL if unused
+ */
+void lv_group_set_focus_cb(lv_group_t * group, lv_group_focus_cb_t focus_cb);
+
+/**
+ * Manually set the current mode (edit or navigate).
+ * @param group pointer to group
+ * @param edit: true: edit mode; false: navigate mode
+ */
+void lv_group_set_editing(lv_group_t * group, bool edit);
+
+/**
+ * Set the `click_focus` attribute. If enabled then the object will be focused then it is clicked.
+ * @param group pointer to group
+ * @param en: true: enable `click_focus`
+ */
+void lv_group_set_click_focus(lv_group_t * group, bool en);
+
+/**
+ * Modify a style with the set 'style_mod' function. The input style remains unchanged.
+ * @param group pointer to group
+ * @param style pointer to a style to modify
+ * @return a copy of the input style but modified with the 'style_mod' function
+ */
+lv_style_t * lv_group_mod_style(lv_group_t * group, const lv_style_t * style);
+
+/**
+ * Get the focused object or NULL if there isn't one
+ * @param group pointer to a group
+ * @return pointer to the focused object
+ */
+lv_obj_t * lv_group_get_focused(const lv_group_t * group);
+
+/**
+ * Get a the style modifier function of a group
+ * @param group pointer to a group
+ * @return pointer to the style modifier function
+ */
+lv_group_style_mod_func_t lv_group_get_style_mod_cb(const lv_group_t * group);
+
+/**
+ * Get a the style modifier function of a group in edit mode
+ * @param group pointer to a group
+ * @return pointer to the style modifier function
+ */
+lv_group_style_mod_func_t lv_group_get_style_mod_edit_cb(const lv_group_t * group);
+
+/**
+ * Get the focus callback function of a group
+ * @param group pointer to a group
+ * @return the call back function or NULL if not set
+ */
+lv_group_focus_cb_t lv_group_get_focus_cb(const lv_group_t * group);
+
+/**
+ * Get the current mode (edit or navigate).
+ * @param group pointer to group
+ * @return true: edit mode; false: navigate mode
+ */
+bool lv_group_get_editing(const lv_group_t * group);
+
+/**
+ * Get the `click_focus` attribute.
+ * @param group pointer to group
+ * @return true: `click_focus` is enabled; false: disabled
+ */
+bool lv_group_get_click_focus(const lv_group_t * group);
+
+
+/**********************
+ *      MACROS
+ **********************/
+
+#endif /*USE_LV_GROUP != 0*/
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_GROUP_H*/

lv_core/lv_indev.c

@@ -0,0 +1,911 @@
+/**
+ * @file lv_indev_proc.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ ********************/
+#include "lv_indev.h"
+
+#include "../lv_hal/lv_hal_tick.h"
+#include "../lv_core/lv_group.h"
+#include "../lv_core/lv_refr.h"
+#include "../lv_misc/lv_task.h"
+#include "../lv_misc/lv_math.h"
+#include "../lv_draw/lv_draw_rbasic.h"
+#include "lv_obj.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+#if LV_INDEV_READ_PERIOD != 0
+static void indev_proc_task(void * param);
+static void indev_pointer_proc(lv_indev_t * i, lv_indev_data_t * data);
+static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data);
+static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data);
+static void indev_button_proc(lv_indev_t * i, lv_indev_data_t * data);
+static void indev_proc_press(lv_indev_proc_t * proc);
+static void indev_proc_release(lv_indev_proc_t * proc);
+static void indev_proc_reset_query_handler(lv_indev_t * indev);
+static lv_obj_t * indev_search_obj(const lv_indev_proc_t * proc, lv_obj_t * obj);
+static void indev_drag(lv_indev_proc_t * state);
+static void indev_drag_throw(lv_indev_proc_t * state);
+#endif
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+static lv_indev_t * indev_act;
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Initialize the display input device subsystem
+ */
+void lv_indev_init(void)
+{
+#if LV_INDEV_READ_PERIOD != 0
+    lv_task_create(indev_proc_task, LV_INDEV_READ_PERIOD, LV_TASK_PRIO_MID, NULL);
+#endif
+
+    lv_indev_reset(NULL);   /*Reset all input devices*/
+}
+
+/**
+ * Get the currently processed input device. Can be used in action functions too.
+ * @return pointer to the currently processed input device or NULL if no input device processing right now
+ */
+lv_indev_t * lv_indev_get_act(void)
+{
+    return indev_act;
+}
+
+/**
+ * Get the type of an input device
+ * @param indev pointer to an input device
+ * @return the type of the input device from `lv_hal_indev_type_t` (`LV_INDEV_TYPE_...`)
+ */
+lv_hal_indev_type_t lv_indev_get_type(const lv_indev_t * indev)
+{
+    if(indev == NULL) return LV_INDEV_TYPE_NONE;
+
+    return indev->driver.type;
+}
+/**
+ * Reset one or all input devices
+ * @param indev pointer to an input device to reset or NULL to reset all of them
+ */
+void lv_indev_reset(lv_indev_t * indev)
+{
+    if(indev) indev->proc.reset_query = 1;
+    else {
+        lv_indev_t * i = lv_indev_next(NULL);
+        while(i) {
+            i->proc.reset_query = 1;
+            i = lv_indev_next(i);
+        }
+    }
+}
+
+/**
+ * Reset the long press state of an input device
+ * @param indev pointer to an input device
+ */
+void lv_indev_reset_lpr(lv_indev_t * indev)
+{
+    indev->proc.long_pr_sent = 0;
+    indev->proc.longpr_rep_timestamp = lv_tick_get();
+    indev->proc.pr_timestamp = lv_tick_get();
+}
+
+/**
+ * Enable input devices device by type
+ * @param type Input device type
+ * @param enable true: enable this type; false: disable this type
+ */
+void lv_indev_enable(lv_hal_indev_type_t type, bool enable)
+{
+    lv_indev_t * i = lv_indev_next(NULL);
+
+    while(i) {
+        if(i->driver.type == type) i->proc.disabled = enable == false ? 1 : 0;
+        i = lv_indev_next(i);
+    }
+}
+
+/**
+ * Set a cursor for a pointer input device (for LV_INPUT_TYPE_POINTER and LV_INPUT_TYPE_BUTTON)
+ * @param indev pointer to an input device
+ * @param cur_obj pointer to an object to be used as cursor
+ */
+void lv_indev_set_cursor(lv_indev_t * indev, lv_obj_t * cur_obj)
+{
+    if(indev->driver.type != LV_INDEV_TYPE_POINTER && indev->driver.type != LV_INDEV_TYPE_BUTTON) return;
+
+    indev->cursor = cur_obj;
+    lv_obj_set_parent(indev->cursor, lv_layer_sys());
+    lv_obj_set_pos(indev->cursor, indev->proc.act_point.x,  indev->proc.act_point.y);
+}
+
+#if USE_LV_GROUP
+/**
+ * Set a destination group for a keypad input device (for LV_INDEV_TYPE_KEYPAD)
+ * @param indev pointer to an input device
+ * @param group point to a group
+ */
+void lv_indev_set_group(lv_indev_t * indev, lv_group_t * group)
+{
+    if(indev->driver.type == LV_INDEV_TYPE_KEYPAD || indev->driver.type == LV_INDEV_TYPE_ENCODER) indev->group = group;
+}
+#endif
+
+/**
+ * Set the an array of points for LV_INDEV_TYPE_BUTTON.
+ * These points will be assigned to the buttons to press a specific point on the screen
+ * @param indev pointer to an input device
+ * @param group point to a group
+ */
+void lv_indev_set_button_points(lv_indev_t * indev, lv_point_t * points)
+{
+    if(indev->driver.type == LV_INDEV_TYPE_BUTTON) indev->btn_points = points;
+}
+
+/**
+ * Get the last point of an input device (for LV_INDEV_TYPE_POINTER and LV_INDEV_TYPE_BUTTON)
+ * @param indev pointer to an input device
+ * @param point pointer to a point to store the result
+ */
+void lv_indev_get_point(const lv_indev_t * indev, lv_point_t * point)
+{
+    if(indev->driver.type != LV_INDEV_TYPE_POINTER && indev->driver.type != LV_INDEV_TYPE_BUTTON) {
+        point->x = -1;
+        point->y = -1;
+    } else {
+        point->x = indev->proc.act_point.x;
+        point->y = indev->proc.act_point.y;
+    }
+}
+
+/**
+ * Get the last key of an input device (for LV_INDEV_TYPE_KEYPAD)
+ * @param indev pointer to an input device
+ * @return the last pressed key (0 on error)
+ */
+uint32_t lv_indev_get_key(const lv_indev_t * indev)
+{
+    if(indev->driver.type != LV_INDEV_TYPE_KEYPAD) return 0;
+    else return indev->proc.last_key;
+}
+
+/**
+ * Check if there is dragging with an input device or not (for LV_INDEV_TYPE_POINTER and LV_INDEV_TYPE_BUTTON)
+ * @param indev pointer to an input device
+ * @return true: drag is in progress
+ */
+bool lv_indev_is_dragging(const lv_indev_t * indev)
+{
+    if(indev == NULL) return false;
+    if(indev->driver.type != LV_INDEV_TYPE_POINTER && indev->driver.type != LV_INDEV_TYPE_BUTTON) return false;
+    return indev->proc.drag_in_prog == 0 ? false : true;
+}
+
+/**
+ * Get the vector of dragging of an input device (for LV_INDEV_TYPE_POINTER and LV_INDEV_TYPE_BUTTON)
+ * @param indev pointer to an input device
+ * @param point pointer to a point to store the vector
+ */
+void lv_indev_get_vect(const lv_indev_t * indev, lv_point_t * point)
+{
+    if(indev->driver.type != LV_INDEV_TYPE_POINTER && indev->driver.type != LV_INDEV_TYPE_BUTTON) {
+        point->x = 0;
+        point->y = 0;
+    } else {
+        point->x = indev->proc.vect.x;
+        point->y = indev->proc.vect.y;
+    }
+}
+
+/**
+ * Get elapsed time since last press
+ * @param indev pointer to an input device (NULL to get the overall smallest inactivity)
+ * @return Elapsed ticks (milliseconds) since last press
+ */
+uint32_t lv_indev_get_inactive_time(const lv_indev_t * indev)
+{
+    uint32_t t;
+
+    if(indev) return t = lv_tick_elaps(indev->last_activity_time);
+
+    lv_indev_t * i;
+    t = UINT16_MAX;
+    i = lv_indev_next(NULL);
+    while(i) {
+        t = LV_MATH_MIN(t, lv_tick_elaps(i->last_activity_time));
+        i = lv_indev_next(i);
+    }
+
+    return t;
+}
+
+/**
+ * Do nothing until the next release
+ * @param indev pointer to an input device
+ */
+void lv_indev_wait_release(lv_indev_t * indev)
+{
+    indev->proc.wait_unil_release = 1;
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+#if LV_INDEV_READ_PERIOD != 0
+/**
+ * Called periodically to handle the input devices
+ * @param param unused
+ */
+static void indev_proc_task(void * param)
+{
+    (void)param;
+
+
+    LV_LOG_TRACE("indev task started");
+
+    lv_indev_data_t data;
+    lv_indev_t * i;
+    i = lv_indev_next(NULL);
+
+    /*Read and process all indevs*/
+    while(i) {
+        indev_act = i;
+
+        /*Handle reset query before processing the point*/
+        indev_proc_reset_query_handler(i);
+
+        if(i->proc.disabled == 0) {
+            bool more_to_read;
+            do {
+                /*Read the data*/
+                more_to_read = lv_indev_read(i, &data);
+                indev_proc_reset_query_handler(i);          /*The active object might deleted even in the read function*/
+                i->proc.state = data.state;
+
+                if(i->proc.state == LV_INDEV_STATE_PR) {
+                    i->last_activity_time = lv_tick_get();
+                }
+
+                if(i->driver.type == LV_INDEV_TYPE_POINTER) {
+                    indev_pointer_proc(i, &data);
+                } else if(i->driver.type == LV_INDEV_TYPE_KEYPAD) {
+                    indev_keypad_proc(i, &data);
+                } else if(i->driver.type == LV_INDEV_TYPE_ENCODER) {
+                    indev_encoder_proc(i, &data);
+                } else if(i->driver.type == LV_INDEV_TYPE_BUTTON) {
+                    indev_button_proc(i, &data);
+                }
+                /*Handle reset query if it happened in during processing*/
+                indev_proc_reset_query_handler(i);
+            } while(more_to_read);
+        }
+        i = lv_indev_next(i);    /*Go to the next indev*/
+    }
+
+    indev_act = NULL;   /*End of indev processing, so no act indev*/
+
+    LV_LOG_TRACE("indev task finished");
+}
+
+
+/**
+ * Process a new point from LV_INDEV_TYPE_POINTER input device
+ * @param i pointer to an input device
+ * @param data pointer to the data read from the input device
+ */
+static void indev_pointer_proc(lv_indev_t * i, lv_indev_data_t * data)
+{
+    /*Move the cursor if set and moved*/
+    if(i->cursor != NULL &&
+            (i->proc.last_point.x != data->point.x ||
+             i->proc.last_point.y != data->point.y)) {
+        lv_obj_set_pos(i->cursor, data->point.x, data->point.y);
+    }
+
+    i->proc.act_point.x = data->point.x;
+    i->proc.act_point.y = data->point.y;
+
+    if(i->proc.state == LV_INDEV_STATE_PR) {
+#if LV_INDEV_POINT_MARKER != 0
+        lv_area_t area;
+        area.x1 = i->proc.act_point.x - (LV_INDEV_POINT_MARKER >> 1);
+        area.y1 = i->proc.act_point.y - (LV_INDEV_POINT_MARKER >> 1);
+        area.x2 = i->proc.act_point.x + ((LV_INDEV_POINT_MARKER >> 1) | 0x1);
+        area.y2 = i->proc.act_point.y + ((LV_INDEV_POINT_MARKER >> 1) | 0x1);
+        lv_rfill(&area, NULL, LV_COLOR_MAKE(0xFF, 0, 0), LV_OPA_COVER);
+#endif
+        indev_proc_press(&i->proc);
+    } else {
+        indev_proc_release(&i->proc);
+    }
+
+    i->proc.last_point.x = i->proc.act_point.x;
+    i->proc.last_point.y = i->proc.act_point.y;
+}
+
+/**
+ * Process a new point from LV_INDEV_TYPE_KEYPAD input device
+ * @param i pointer to an input device
+ * @param data pointer to the data read from the input device
+ */
+static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data)
+{
+#if USE_LV_GROUP
+    if(i->group == NULL) return;
+
+    /*Key press happened*/
+    if(data->state == LV_INDEV_STATE_PR &&
+            i->proc.last_state == LV_INDEV_STATE_REL) {
+        i->proc.pr_timestamp = lv_tick_get();
+    }
+    /*Pressing*/
+    else if(data->state == LV_INDEV_STATE_PR && i->proc.last_state == LV_INDEV_STATE_PR) {
+        if(data->key == LV_GROUP_KEY_ENTER &&
+                i->proc.long_pr_sent == 0 &&
+                lv_tick_elaps(i->proc.pr_timestamp) > LV_INDEV_LONG_PRESS_TIME) {
+            /*On enter long press leave edit mode.*/
+            lv_obj_t * focused = lv_group_get_focused(i->group);
+            if(focused) {
+                focused->signal_func(focused, LV_SIGNAL_LONG_PRESS, indev_act);
+                i->proc.long_pr_sent = 1;
+            }
+        }
+    }
+    /*Release happened*/
+    else if(data->state == LV_INDEV_STATE_REL && i->proc.last_state == LV_INDEV_STATE_PR) {
+        /*The user might clear the key when it was released. Always release the pressed key*/
+        data->key = i->proc.last_key;
+
+        /* Edit mode is not used by KEYPAD devices.
+         * So leave edit mode if we are in it before focusing on the next/prev object*/
+        if(data->key == LV_GROUP_KEY_NEXT || data->key == LV_GROUP_KEY_PREV) {
+            if(lv_group_get_editing(i->group)) {
+                lv_group_set_editing(i->group, false);
+                lv_obj_t * focused = lv_group_get_focused(i->group);
+                if(focused) focused->signal_func(focused, LV_SIGNAL_FOCUS, NULL);       /*Focus again to properly leave edit mode*/
+            }
+        }
+
+        if(data->key == LV_GROUP_KEY_NEXT) {
+            lv_group_focus_next(i->group);
+        } else if(data->key == LV_GROUP_KEY_PREV) {
+            lv_group_focus_prev(i->group);
+        } else if(data->key == LV_GROUP_KEY_ENTER) {
+            if(!i->proc.long_pr_sent) {
+                lv_group_send_data(i->group, data->key);
+            }
+        } else {
+            lv_group_send_data(i->group, data->key);
+        }
+
+        if(i->proc.reset_query) return;     /*The object might be deleted in `focus_cb` or due to any other user event*/
+
+        i->proc.pr_timestamp = 0;
+        i->proc.long_pr_sent = 0;
+    }
+
+    i->proc.last_state = data->state;
+    i->proc.last_key = data->key;
+#endif
+}
+
+/**
+ * Process a new point from LV_INDEV_TYPE_ENCODER input device
+ * @param i pointer to an input device
+ * @param data pointer to the data read from the input device
+ */
+static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data)
+{
+#if USE_LV_GROUP
+    if(i->group == NULL) return;
+
+    /*Process the steps first. They are valid only with released button*/
+    if(data->state == LV_INDEV_STATE_REL) {
+        /*In edit mode send LEFT/RIGHT keys*/
+        if(lv_group_get_editing(i->group)) {
+            int32_t s;
+            if(data->enc_diff < 0) {
+                for(s = 0; s < -data->enc_diff; s++) lv_group_send_data(i->group, LV_GROUP_KEY_LEFT);
+            } else if(data->enc_diff > 0) {
+                for(s = 0; s < data->enc_diff; s++) lv_group_send_data(i->group, LV_GROUP_KEY_RIGHT);
+            }
+        }
+        /*In navigate mode focus on the next/prev objects*/
+        else {
+            int32_t s;
+            if(data->enc_diff < 0) {
+                for(s = 0; s < -data->enc_diff; s++) lv_group_focus_prev(i->group);
+            } else if(data->enc_diff > 0) {
+                for(s = 0; s < data->enc_diff; s++) lv_group_focus_next(i->group);
+            }
+        }
+    }
+
+    /*Key press happened*/
+    if(data->state == LV_INDEV_STATE_PR &&
+            i->proc.last_state == LV_INDEV_STATE_REL) {
+        i->proc.pr_timestamp = lv_tick_get();
+    }
+    /*Pressing*/
+    else if(data->state == LV_INDEV_STATE_PR && i->proc.last_state == LV_INDEV_STATE_PR) {
+        if(i->proc.long_pr_sent == 0 &&
+                lv_tick_elaps(i->proc.pr_timestamp) > LV_INDEV_LONG_PRESS_TIME) {
+            /*On enter long press leave edit mode.*/
+            lv_obj_t * focused = lv_group_get_focused(i->group);
+
+            bool editable = false;
+            if(focused) focused->signal_func(focused, LV_SIGNAL_GET_EDITABLE, &editable);
+
+            if(editable) {
+                i->group->editing = i->group->editing ? 0 : 1;
+                if(focused) focused->signal_func(focused, LV_SIGNAL_FOCUS, NULL);      /*Focus again. Some object do something on navigate->edit change*/
+                LV_LOG_INFO("Edit mode changed");
+                if(focused) lv_obj_invalidate(focused);
+            }
+            /*If not editable then just send a long press signal*/
+            else {
+                if(focused) focused->signal_func(focused, LV_SIGNAL_LONG_PRESS, indev_act);
+            }
+            i->proc.long_pr_sent = 1;
+        }
+    }
+    /*Release happened*/
+    else if(data->state == LV_INDEV_STATE_REL && i->proc.last_state == LV_INDEV_STATE_PR) {
+        lv_obj_t * focused = lv_group_get_focused(i->group);
+        bool editable = false;
+        if(focused) focused->signal_func(focused, LV_SIGNAL_GET_EDITABLE, &editable);
+
+        /*The button was released on a non-editable object. Just send enter*/
+        if(!editable) {
+            lv_group_send_data(i->group, LV_GROUP_KEY_ENTER);
+        }
+        /*An object is being edited and the button is releases. Just send enter */
+        else if(i->group->editing) {
+            if(!i->proc.long_pr_sent) lv_group_send_data(i->group, LV_GROUP_KEY_ENTER);  /*Ignore long pressed enter release because it comes from mode switch*/
+        }
+        /*If the focused object is editable and now in navigate mode then enter edit mode*/
+        else if(editable && !i->group->editing && !i->proc.long_pr_sent) {
+            i->group->editing = i->group->editing ? 0 : 1;
+            if(focused) focused->signal_func(focused, LV_SIGNAL_FOCUS, NULL);      /*Focus again. Some object do something on navigate->edit change*/
+            LV_LOG_INFO("Edit mode changed (edit)");
+            if(focused) lv_obj_invalidate(focused);
+        }
+
+        if(i->proc.reset_query) return;     /*The object might be deleted in `focus_cb` or due to any other user event*/
+
+        i->proc.pr_timestamp = 0;
+        i->proc.long_pr_sent = 0;
+    }
+
+    i->proc.last_state = data->state;
+    i->proc.last_key = data->key;
+#endif
+}
+
+/**
+ * Process new points from a input device. indev->state.pressed has to be set
+ * @param indev pointer to an input device state
+ * @param x x coordinate of the next point
+ * @param y y coordinate of the next point
+ */
+static void indev_button_proc(lv_indev_t * i, lv_indev_data_t * data)
+{
+    i->proc.act_point.x = i->btn_points[data->btn].x;
+    i->proc.act_point.y = i->btn_points[data->btn].y;
+
+    /*Still the same point is pressed*/
+    if(i->proc.last_point.x == i->proc.act_point.x &&
+            i->proc.last_point.y == i->proc.act_point.y &&
+            data->state == LV_INDEV_STATE_PR) {
+#if LV_INDEV_POINT_MARKER != 0
+        lv_area_t area;
+        area.x1 = i->proc.act_point.x - (LV_INDEV_POINT_MARKER >> 1);
+        area.y1 = i->proc.act_point.y - (LV_INDEV_POINT_MARKER >> 1);
+        area.x2 = i->proc.act_point.x + ((LV_INDEV_POINT_MARKER >> 1) | 0x1);
+        area.y2 = i->proc.act_point.y + ((LV_INDEV_POINT_MARKER >> 1) | 0x1);
+        lv_rfill(&area, NULL, LV_COLOR_MAKE(0xFF, 0, 0), LV_OPA_COVER);
+#endif
+        indev_proc_press(&i->proc);
+    } else {
+        /*If a new point comes always make a release*/
+        indev_proc_release(&i->proc);
+    }
+
+    i->proc.last_point.x = i->proc.act_point.x;
+    i->proc.last_point.y = i->proc.act_point.y;
+}
+
+/**
+ * Process the pressed state of LV_INDEV_TYPE_POINER input devices
+ * @param indev pointer to an input device 'proc'
+ */
+static void indev_proc_press(lv_indev_proc_t * proc)
+{
+    lv_obj_t * pr_obj = proc->act_obj;
+
+    if(proc->wait_unil_release != 0) return;
+
+    /*If there is no last object then search*/
+    if(proc->act_obj == NULL) {
+        pr_obj = indev_search_obj(proc, lv_layer_top());
+        if(pr_obj == NULL) pr_obj = indev_search_obj(proc, lv_scr_act());
+    }
+    /*If there is last object but it is not dragged and not protected also search*/
+    else if(proc->drag_in_prog == 0 &&
+            lv_obj_is_protected(proc->act_obj, LV_PROTECT_PRESS_LOST) == false) {/*Now act_obj != NULL*/
+        pr_obj = indev_search_obj(proc, lv_layer_top());
+        if(pr_obj == NULL) pr_obj = indev_search_obj(proc, lv_scr_act());
+    }
+    /*If a dragable or a protected object was the last then keep it*/
+    else {
+
+    }
+
+    /*If a new object was found reset some variables and send a pressed signal*/
+    if(pr_obj != proc->act_obj) {
+
+        proc->last_point.x = proc->act_point.x;
+        proc->last_point.y = proc->act_point.y;
+
+        /*If a new object found the previous was lost, so send a signal*/
+        if(proc->act_obj != NULL) {
+            proc->act_obj->signal_func(proc->act_obj, LV_SIGNAL_PRESS_LOST, indev_act);
+            if(proc->reset_query != 0) return;
+        }
+
+        if(pr_obj != NULL) {
+            /* Save the time when the obj pressed.
+             * It is necessary to count the long press time.*/
+            proc->pr_timestamp = lv_tick_get();
+            proc->long_pr_sent = 0;
+            proc->drag_range_out = 0;
+            proc->drag_in_prog = 0;
+            proc->drag_sum.x = 0;
+            proc->drag_sum.y = 0;
+
+            /*Search for 'top' attribute*/
+            lv_obj_t * i = pr_obj;
+            lv_obj_t * last_top = NULL;
+            while(i != NULL) {
+                if(i->top != 0) last_top = i;
+                i = lv_obj_get_parent(i);
+            }
+
+            if(last_top != NULL) {
+                /*Move the last_top object to the foreground*/
+                lv_obj_t * par = lv_obj_get_parent(last_top);
+                /*After list change it will be the new head*/
+                lv_ll_chg_list(&par->child_ll, &par->child_ll, last_top);
+                lv_obj_invalidate(last_top);
+            }
+
+            /*Send a signal about the press*/
+            pr_obj->signal_func(pr_obj, LV_SIGNAL_PRESSED, indev_act);
+            if(proc->reset_query != 0) return;
+        }
+    }
+
+    proc->act_obj = pr_obj;            /*Save the pressed object*/
+    proc->last_obj = proc->act_obj;   /*Refresh the last_obj*/
+
+    /*Calculate the vector*/
+    proc->vect.x = proc->act_point.x - proc->last_point.x;
+    proc->vect.y = proc->act_point.y - proc->last_point.y;
+
+    /*If there is active object and it can be dragged run the drag*/
+    if(proc->act_obj != NULL) {
+        proc->act_obj->signal_func(proc->act_obj, LV_SIGNAL_PRESSING, indev_act);
+        if(proc->reset_query != 0) return;
+
+        indev_drag(proc);
+        if(proc->reset_query != 0) return;
+
+        /*If there is no drag then check for long press time*/
+        if(proc->drag_in_prog == 0 && proc->long_pr_sent == 0) {
+            /*Send a signal about the long press if enough time elapsed*/
+            if(lv_tick_elaps(proc->pr_timestamp) > LV_INDEV_LONG_PRESS_TIME) {
+                pr_obj->signal_func(pr_obj, LV_SIGNAL_LONG_PRESS, indev_act);
+                if(proc->reset_query != 0) return;
+
+                /*Mark the signal sending to do not send it again*/
+                proc->long_pr_sent = 1;
+
+                /*Save the long press time stamp for the long press repeat handler*/
+                proc->longpr_rep_timestamp = lv_tick_get();
+            }
+        }
+        /*Send long press repeated signal*/
+        if(proc->drag_in_prog == 0 && proc->long_pr_sent == 1) {
+            /*Send a signal about the long press repeate if enough time elapsed*/
+            if(lv_tick_elaps(proc->longpr_rep_timestamp) > LV_INDEV_LONG_PRESS_REP_TIME) {
+                pr_obj->signal_func(pr_obj, LV_SIGNAL_LONG_PRESS_REP, indev_act);
+                if(proc->reset_query != 0) return;
+                proc->longpr_rep_timestamp = lv_tick_get();
+
+            }
+        }
+    }
+}
+
+/**
+ * Process the released state of LV_INDEV_TYPE_POINER input devices
+ * @param proc pointer to an input device 'proc'
+ */
+static void indev_proc_release(lv_indev_proc_t * proc)
+{
+    if(proc->wait_unil_release != 0) {
+        proc->act_obj = NULL;
+        proc->last_obj = NULL;
+        proc->pr_timestamp = 0;
+        proc->longpr_rep_timestamp = 0;
+        proc->wait_unil_release = 0;
+    }
+
+    /*Forgot the act obj and send a released signal */
+    if(proc->act_obj != NULL) {
+        /* If the object was protected against press lost then it possible that
+         * the object is already not pressed but still it is the `act_obj`.
+         * In this case send the `LV_SIGNAL_RELEASED` if the indev is ON the `act_obj` */
+        if(lv_obj_is_protected(proc->act_obj, LV_PROTECT_PRESS_LOST)) {
+            /* Search the object on the current current coordinates.
+             * The start object is the object itself. If not ON it the the result will be NULL*/
+            lv_obj_t * obj_on = indev_search_obj(proc, proc->act_obj);
+            if(obj_on == proc->act_obj) proc->act_obj->signal_func(proc->act_obj, LV_SIGNAL_RELEASED, indev_act);
+            else proc->act_obj->signal_func(proc->act_obj, LV_SIGNAL_PRESS_LOST, indev_act);
+
+        }
+        /* The simple case: `act_obj` was not protected against press lost.
+         * If it is already not pressed then was handled in `indev_proc_press`*/
+        else {
+            proc->act_obj->signal_func(proc->act_obj, LV_SIGNAL_RELEASED, indev_act);
+        }
+        /*Handle click focus*/
+#if USE_LV_GROUP
+        /*Edit mode is not used by POINTER devices. So leave edit mode if we are in it*/
+        lv_group_t * act_g = lv_obj_get_group(proc->act_obj);
+        if(lv_group_get_editing(act_g)) {
+            lv_group_set_editing(act_g, false);
+            proc->act_obj->signal_func(proc->act_obj, LV_SIGNAL_FOCUS, NULL);       /*Focus again to properly leave edit mode*/
+        }
+
+        /*Check, if the parent is in a group focus on it.*/
+        if(lv_obj_is_protected(proc->act_obj, LV_PROTECT_CLICK_FOCUS) == false) {       /*Respect the click protection*/
+            lv_group_t * g = lv_obj_get_group(proc->act_obj);
+            lv_obj_t * parent = proc->act_obj;
+
+            while(g == NULL) {
+                parent = lv_obj_get_parent(parent);
+                if(parent == NULL) break;
+                if(lv_obj_is_protected(parent, LV_PROTECT_CLICK_FOCUS)) {   /*Ignore is the protected against click focus*/
+                    parent = NULL;
+                    break;
+                }
+                g = lv_obj_get_group(parent);
+            }
+
+            if(g != NULL && parent != NULL)
+                if(lv_group_get_click_focus(g)) {
+                    lv_group_focus_obj(parent);
+                }
+        }
+#endif
+
+        if(proc->reset_query != 0) return;
+        proc->act_obj = NULL;
+        proc->pr_timestamp = 0;
+        proc->longpr_rep_timestamp = 0;
+    }
+
+    /*The reset can be set in the signal function.
+     * In case of reset query ignore the remaining parts.*/
+    if(proc->last_obj != NULL && proc->reset_query == 0) {
+        indev_drag_throw(proc);
+        if(proc->reset_query != 0) return;
+    }
+}
+
+/**
+ * Process a new point from LV_INDEV_TYPE_BUTTON input device
+ * @param i pointer to an input device
+ * @param data pointer to the data read from the input device
+ * Reset input device if a reset query has been sent to it
+ * @param indev pointer to an input device
+ */
+static void indev_proc_reset_query_handler(lv_indev_t * indev)
+{
+    if(indev->proc.reset_query) {
+        indev->proc.act_obj = NULL;
+        indev->proc.last_obj = NULL;
+        indev->proc.drag_range_out = 0;
+        indev->proc.drag_in_prog = 0;
+        indev->proc.long_pr_sent = 0;
+        indev->proc.pr_timestamp = 0;
+        indev->proc.longpr_rep_timestamp = 0;
+        indev->proc.drag_sum.x = 0;
+        indev->proc.drag_sum.y = 0;
+        indev->proc.reset_query = 0;
+    }
+}
+/**
+ * Search the most top, clickable object on the last point of an input device
+ * @param proc pointer to  the `lv_indev_proc_t` part of the input device
+ * @param obj pointer to a start object, typically the screen
+ * @return pointer to the found object or NULL if there was no suitable object
+ */
+static lv_obj_t * indev_search_obj(const lv_indev_proc_t * proc, lv_obj_t * obj)
+{
+    lv_obj_t * found_p = NULL;
+
+    /*If the point is on this object*/
+    /*Check its children too*/
+    if(lv_area_is_point_on(&obj->coords, &proc->act_point)) {
+        lv_obj_t * i;
+
+        LL_READ(obj->child_ll, i) {
+            found_p = indev_search_obj(proc, i);
+
+            /*If a child was found then break*/
+            if(found_p != NULL) {
+                break;
+            }
+        }
+
+        /*If then the children was not ok, and this obj is clickable
+         * and it or its parent is not hidden then save this object*/
+        if(found_p == NULL && lv_obj_get_click(obj) != false) {
+            lv_obj_t * hidden_i = obj;
+            while(hidden_i != NULL) {
+                if(lv_obj_get_hidden(hidden_i) == true) break;
+                hidden_i = lv_obj_get_parent(hidden_i);
+            }
+            /*No parent found with hidden == true*/
+            if(hidden_i == NULL) found_p = obj;
+        }
+
+    }
+
+    return found_p;
+}
+
+/**
+ * Handle the dragging of indev_proc_p->act_obj
+ * @param indev pointer to a input device state
+ */
+static void indev_drag(lv_indev_proc_t * state)
+{
+    lv_obj_t * drag_obj = state->act_obj;
+
+    /*If drag parent is active check recursively the drag_parent attribute*/
+    while(lv_obj_get_drag_parent(drag_obj) != false &&
+            drag_obj != NULL) {
+        drag_obj = lv_obj_get_parent(drag_obj);
+    }
+
+    if(drag_obj == NULL) return;
+
+    if(lv_obj_get_drag(drag_obj) == false) return;
+
+    /*If still there is no drag then count the movement*/
+    if(state->drag_range_out == 0) {
+        state->drag_sum.x += state->vect.x;
+        state->drag_sum.y += state->vect.y;
+
+        /*If a move is greater then LV_DRAG_LIMIT then begin the drag*/
+        if(LV_MATH_ABS(state->drag_sum.x) >= LV_INDEV_DRAG_LIMIT ||
+                LV_MATH_ABS(state->drag_sum.y) >= LV_INDEV_DRAG_LIMIT) {
+            state->drag_range_out = 1;
+        }
+    }
+
+    /*If the drag limit is stepped over then handle the dragging*/
+    if(state->drag_range_out != 0) {
+        /*Set new position if the vector is not zero*/
+        if(state->vect.x != 0 ||
+                state->vect.y != 0) {
+            /*Get the coordinates of the object and modify them*/
+            lv_coord_t act_x = lv_obj_get_x(drag_obj);
+            lv_coord_t act_y = lv_obj_get_y(drag_obj);
+            uint16_t inv_buf_size = lv_refr_get_buf_size(); /*Get the number of currently invalidated areas*/
+
+            lv_coord_t prev_x = drag_obj->coords.x1;
+            lv_coord_t prev_y = drag_obj->coords.y1;
+
+            lv_obj_set_pos(drag_obj, act_x + state->vect.x, act_y + state->vect.y);
+
+            /*Set the drag in progress flag if the object is really moved*/
+
+            if(drag_obj->coords.x1 != prev_x || drag_obj->coords.y1 != prev_y) {
+                if(state->drag_range_out != 0) { /*Send the drag begin signal on first move*/
+                    drag_obj->signal_func(drag_obj,  LV_SIGNAL_DRAG_BEGIN, indev_act);
+                    if(state->reset_query != 0) return;
+                }
+                state->drag_in_prog = 1;
+            }
+            /*If the object didn't moved then clear the invalidated areas*/
+            else {
+                uint16_t new_inv_buf_size = lv_refr_get_buf_size();
+                lv_refr_pop_from_buf(new_inv_buf_size - inv_buf_size);
+            }
+        }
+    }
+}
+
+/**
+ * Handle throwing by drag if the drag is ended
+ * @param indev pointer to an input device state
+ */
+static void indev_drag_throw(lv_indev_proc_t * state)
+{
+    if(state->drag_in_prog == 0) return;
+
+    /*Set new position if the vector is not zero*/
+    lv_obj_t * drag_obj = state->last_obj;
+
+    /*If drag parent is active check recursively the drag_parent attribute*/
+    while(lv_obj_get_drag_parent(drag_obj) != false &&
+            drag_obj != NULL) {
+        drag_obj = lv_obj_get_parent(drag_obj);
+    }
+
+    if(drag_obj == NULL) return;
+
+    /*Return if the drag throw is not enabled*/
+    if(lv_obj_get_drag_throw(drag_obj) == false) {
+        state->drag_in_prog = 0;
+        drag_obj->signal_func(drag_obj, LV_SIGNAL_DRAG_END, indev_act);
+        return;
+    }
+
+    /*Reduce the vectors*/
+    state->vect.x = state->vect.x * (100 - LV_INDEV_DRAG_THROW) / 100;
+    state->vect.y = state->vect.y * (100 - LV_INDEV_DRAG_THROW) / 100;
+
+    if(state->vect.x != 0 ||
+            state->vect.y != 0) {
+        /*Get the coordinates  and modify them*/
+        lv_coord_t act_x = lv_obj_get_x(drag_obj) + state->vect.x;
+        lv_coord_t act_y = lv_obj_get_y(drag_obj) + state->vect.y;
+        lv_obj_set_pos(drag_obj, act_x, act_y);
+
+        /*If non of the coordinates are changed then do not continue throwing*/
+        if((lv_obj_get_x(drag_obj) != act_x || state->vect.x == 0) &&
+                (lv_obj_get_y(drag_obj) != act_y || state->vect.y == 0)) {
+            state->drag_in_prog = 0;
+            state->vect.x = 0;
+            state->vect.y = 0;
+            drag_obj->signal_func(drag_obj, LV_SIGNAL_DRAG_END, indev_act);
+
+        }
+    }
+    /*If the vectors become 0 -> drag_in_prog = 0 and send a drag end signal*/
+    else {
+        state->drag_in_prog = 0;
+        drag_obj->signal_func(drag_obj, LV_SIGNAL_DRAG_END, indev_act);
+    }
+}
+#endif

lv_core/lv_indev.h

@@ -0,0 +1,143 @@
+/**
+ * @file lv_indev_proc.h
+ *
+ */
+
+#ifndef LV_INDEV_H
+#define LV_INDEV_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_obj.h"
+#include "../lv_hal/lv_hal_indev.h"
+#include "../lv_core/lv_group.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Initialize the display input device subsystem
+ */
+void lv_indev_init(void);
+
+/**
+ * Get the currently processed input device. Can be used in action functions too.
+ * @return pointer to the currently processed input device or NULL if no input device processing right now
+ */
+lv_indev_t * lv_indev_get_act(void);
+
+
+/**
+ * Get the type of an input device
+ * @param indev pointer to an input device
+ * @return the type of the input device from `lv_hal_indev_type_t` (`LV_INDEV_TYPE_...`)
+ */
+lv_hal_indev_type_t lv_indev_get_type(const lv_indev_t * indev);
+
+/**
+ * Reset one or all input devices
+ * @param indev pointer to an input device to reset or NULL to reset all of them
+ */
+void lv_indev_reset(lv_indev_t * indev);
+
+/**
+ * Reset the long press state of an input device
+ * @param indev_proc pointer to an input device
+ */
+void lv_indev_reset_lpr(lv_indev_t * indev);
+
+/**
+ * Enable input devices device by type
+ * @param type Input device type
+ * @param enable true: enable this type; false: disable this type
+ */
+void lv_indev_enable(lv_hal_indev_type_t type, bool enable);
+
+/**
+ * Set a cursor for a pointer input device (for LV_INPUT_TYPE_POINTER and LV_INPUT_TYPE_BUTTON)
+ * @param indev pointer to an input device
+ * @param cur_obj pointer to an object to be used as cursor
+ */
+void lv_indev_set_cursor(lv_indev_t *indev, lv_obj_t *cur_obj);
+
+#if USE_LV_GROUP
+/**
+ * Set a destination group for a keypad input device (for LV_INDEV_TYPE_KEYPAD)
+ * @param indev pointer to an input device
+ * @param group point to a group
+ */
+void lv_indev_set_group(lv_indev_t *indev, lv_group_t *group);
+#endif
+
+/**
+ * Set the an array of points for LV_INDEV_TYPE_BUTTON.
+ * These points will be assigned to the buttons to press a specific point on the screen
+ * @param indev pointer to an input device
+ * @param group point to a group
+ */
+void lv_indev_set_button_points(lv_indev_t *indev, lv_point_t *points);
+
+/**
+ * Get the last point of an input device (for LV_INDEV_TYPE_POINTER and LV_INDEV_TYPE_BUTTON)
+ * @param indev pointer to an input device
+ * @param point pointer to a point to store the result
+ */
+void lv_indev_get_point(const lv_indev_t * indev, lv_point_t * point);
+
+/**
+ * Get the last key of an input device (for LV_INDEV_TYPE_KEYPAD)
+ * @param indev pointer to an input device
+ * @return the last pressed key (0 on error)
+ */
+uint32_t lv_indev_get_key(const lv_indev_t * indev);
+
+/**
+ * Check if there is dragging with an input device or not (for LV_INDEV_TYPE_POINTER and LV_INDEV_TYPE_BUTTON)
+ * @param indev pointer to an input device
+ * @return true: drag is in progress
+ */
+bool lv_indev_is_dragging(const lv_indev_t * indev);
+
+/**
+ * Get the vector of dragging of an input device (for LV_INDEV_TYPE_POINTER and LV_INDEV_TYPE_BUTTON)
+ * @param indev pointer to an input device
+ * @param point pointer to a point to store the vector
+ */
+void lv_indev_get_vect(const lv_indev_t * indev, lv_point_t * point);
+/**
+ * Get elapsed time since last press
+ * @param indev pointer to an input device (NULL to get the overall smallest inactivity)
+ * @return Elapsed ticks (milliseconds) since last press
+ */
+uint32_t lv_indev_get_inactive_time(const lv_indev_t * indev);
+
+/**
+ * Do nothing until the next release
+ * @param indev pointer to an input device
+ */
+void lv_indev_wait_release(lv_indev_t * indev);
+
+/**********************
+ *      MACROS
+ **********************/
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif  /*LV_INDEV_H*/

lv_core/lv_obj.h

@@ -1,6 +1,6 @@
 /**
  * @file lv_obj.h
- * 
+ *
  */
 
 #ifndef LV_OBJ_H
@@ -13,14 +13,20 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
-#include <misc/gfx/area.h>
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include <stddef.h>
 #include <stdbool.h>
-#include "misc/mem/dyn_mem.h"
-#include "misc/mem/linked_list.h"
-#include "misc/gfx/color.h"
 #include "lv_style.h"
+#include "../lv_misc/lv_area.h"
+#include "../lv_misc/lv_mem.h"
+#include "../lv_misc/lv_ll.h"
+#include "../lv_misc/lv_color.h"
+#include "../lv_misc/lv_log.h"
 
 /*********************
  *      DEFINES
@@ -28,58 +34,65 @@ extern "C" {
 
 /*Error check of lv_conf.h*/
 #if LV_HOR_RES == 0 || LV_VER_RES == 0
-#error "LV: LV_HOR_RES and LV_VER_RES must be greater then 0"
+#error "LittlevGL: LV_HOR_RES and LV_VER_RES must be greater then 0"
 #endif
 
-#if LV_DOWNSCALE != 1 && LV_DOWNSCALE != 2
-#error "LV: LV_DOWNSCALE can be only 1 or 2"
+#if LV_ANTIALIAS > 1
+#error "LittlevGL: LV_ANTIALIAS can be only 0 or 1"
 #endif
 
 #if LV_VDB_SIZE == 0 && LV_ANTIALIAS != 0
-#error "LV: If LV_VDB_SIZE == 0 the antialaissing must be disabled"
+#error "LittlevGL: If LV_VDB_SIZE == 0 the anti-aliasing must be disabled"
 #endif
 
-#if LV_VDB_SIZE != 0 && LV_VDB_SIZE < LV_HOR_RES && LV_ANTIALIAS == 0
-#error "LV: Small Virtual Display Buffer (lv_conf.h: LV_VDB_SIZE >= LV_HOR_RES)"
+#if LV_VDB_SIZE > 0 && LV_VDB_SIZE < LV_HOR_RES
+#error "LittlevGL: Small Virtual Display Buffer (lv_conf.h: LV_VDB_SIZE >= LV_HOR_RES)"
 #endif
 
-#if LV_VDB_SIZE != 0 && LV_VDB_SIZE < 2 *LV_HOR_RES && LV_ANTIALIAS != 0
-#error "LV: Small Virtual Display Buffer (lv_conf.h: LV_VDB_SIZE >= (2 * LV_HOR_RES))"
+#if LV_VDB_SIZE == 0 && USE_LV_REAL_DRAW == 0
+#error "LittlevGL: If LV_VDB_SIZE = 0 Real drawing function are required (lv_conf.h: USE_LV_REAL_DRAW 1)"
 #endif
 
-/*New defines*/
-#define LV_OBJ_DEF_WIDTH  (80 * LV_DOWNSCALE)
-#define LV_OBJ_DEF_HEIGHT  (60 * LV_DOWNSCALE)
 
-#define ANIM_IN					0x00	/*Animation to show an object. 'OR' it with lv_anim_builtin_t*/
-#define ANIM_OUT				0x80    /*Animation to hide an object. 'OR' it with lv_anim_builtin_t*/
-#define ANIM_DIR_MASK			0x80	/*ANIM_IN/ANIM_OUT mask*/
+#define LV_ANIM_IN              0x00    /*Animation to show an object. 'OR' it with lv_anim_builtin_t*/
+#define LV_ANIM_OUT             0x80    /*Animation to hide an object. 'OR' it with lv_anim_builtin_t*/
+#define LV_ANIM_DIR_MASK        0x80    /*ANIM_IN/ANIM_OUT mask*/
 
+#define LV_MAX_ANCESTOR_NUM     8
 /**********************
  *      TYPEDEFS
  **********************/
 
-struct __LV_OBJ_T;
+struct _lv_obj_t;
 
-typedef enum
+enum
 {
     LV_DESIGN_DRAW_MAIN,
     LV_DESIGN_DRAW_POST,
     LV_DESIGN_COVER_CHK,
-}lv_design_mode_t;
+};
+typedef uint8_t lv_design_mode_t;
 
-typedef bool (* lv_design_f_t) (struct __LV_OBJ_T * obj, const area_t * mask_p, lv_design_mode_t mode);
+typedef bool (* lv_design_func_t) (struct _lv_obj_t * obj, const lv_area_t * mask_p, lv_design_mode_t mode);
 
-typedef enum
+enum
+{
+    LV_RES_INV = 0,      /*Typically indicates that the object is deleted (become invalid) in the action function or an operation was failed*/
+    LV_RES_OK,           /*The object is valid (no deleted) after the action*/
+};
+typedef uint8_t lv_res_t;
+
+enum
 {
     /*General signals*/
-	LV_SIGNAL_CLEANUP,
+    LV_SIGNAL_CLEANUP,
     LV_SIGNAL_CHILD_CHG,
     LV_SIGNAL_CORD_CHG,
     LV_SIGNAL_STYLE_CHG,
-	LV_SIGNAL_REFR_EXT_SIZE,
+    LV_SIGNAL_REFR_EXT_SIZE,
+    LV_SIGNAL_GET_TYPE,
 
-	/*Display input related*/
+    /*Input device related*/
     LV_SIGNAL_PRESSED,
     LV_SIGNAL_PRESSING,
     LV_SIGNAL_PRESS_LOST,
@@ -89,62 +102,76 @@ typedef enum
     LV_SIGNAL_DRAG_BEGIN,
     LV_SIGNAL_DRAG_END,
 
-	/*Group related*/
+    /*Group related*/
     LV_SIGNAL_FOCUS,
     LV_SIGNAL_DEFOCUS,
     LV_SIGNAL_CONTROLL,
-}lv_signal_t;
+    LV_SIGNAL_GET_EDITABLE,
+};
+typedef uint8_t lv_signal_t;
 
-typedef bool (* lv_signal_f_t) (struct __LV_OBJ_T * obj, lv_signal_t sign, void * param);
+typedef lv_res_t (* lv_signal_func_t) (struct _lv_obj_t * obj, lv_signal_t sign, void * param);
 
-typedef struct __LV_OBJ_T
+typedef struct _lv_obj_t
 {
-    struct __LV_OBJ_T * par;    /*Pointer to the parent object*/
-    ll_dsc_t child_ll;          /*Linked list to store the children objects*/
-    
-    area_t cords;               /*Coordinates of the object (x1, y1, x2, y2)*/
+    struct _lv_obj_t * par;    /*Pointer to the parent object*/
+    lv_ll_t child_ll;          /*Linked list to store the children objects*/
 
-    lv_signal_f_t signal_f;     /*Object type specific signal function*/
-    lv_design_f_t design_f;     /*Object type specific design function*/
-    
-    void * ext;                 /*Object type specific extended data*/
+    lv_area_t coords;               /*Coordinates of the object (x1, y1, x2, y2)*/
+
+    lv_signal_func_t signal_func;     /*Object type specific signal function*/
+    lv_design_func_t design_func;     /*Object type specific design function*/
+
+    void * ext_attr;                 /*Object type specific extended data*/
     lv_style_t * style_p;       /*Pointer to the object's style*/
 
-#if LV_OBJ_FREE_P != 0
-    void * free_p;              /*Application specific pointer (set it freely)*/
+#if LV_OBJ_FREE_PTR != 0
+    void * free_ptr;              /*Application specific pointer (set it freely)*/
 #endif
 
-    void * group_p;             /*Pointer to the group of the object*/
-
+#if USE_LV_GROUP != 0
+    void * group_p;                 /*Pointer to the group of the object*/
+#endif
     /*Attributes and states*/
-    uint8_t click_en     :1;    /*1: Can be pressed by a display input device*/
-    uint8_t drag_en      :1;    /*1: Enable the dragging*/
-    uint8_t drag_throw_en:1;    /*1: Enable throwing with drag*/
-    uint8_t drag_parent  :1;    /*1: Parent will be dragged instead*/
-    uint8_t hidden       :1;    /*1: Object is hidden*/
-    uint8_t top_en       :1;    /*1: If the object or its children is clicked it goes to the foreground*/
-    uint8_t reserved     :1;
+    uint8_t click         :1;    /*1: Can be pressed by an input device*/
+    uint8_t drag          :1;    /*1: Enable the dragging*/
+    uint8_t drag_throw    :1;    /*1: Enable throwing with drag*/
+    uint8_t drag_parent   :1;    /*1: Parent will be dragged instead*/
+    uint8_t hidden        :1;    /*1: Object is hidden*/
+    uint8_t top           :1;    /*1: If the object or its children is clicked it goes to the foreground*/
+    uint8_t opa_scale_en  :1;    /*1: opa_scale is set*/
+    uint8_t protect;            /*Automatically happening actions can be prevented. 'OR'ed values from `lv_protect_t`*/
+    lv_opa_t opa_scale;         /*Scale down the opacity by this factor. Effects all children as well*/
 
-    uint8_t protect;            /*Automatically happening actions can be prevented. 'OR'ed values from lv_obj_prot_t*/
+    lv_coord_t ext_size;        /*EXTtend the size of the object in every direction. E.g. for shadow drawing*/
 
-    cord_t ext_size;			/*EXTtend the size of the object in every direction. E.g. for shadow drawing*/
-
-#if LV_OBJ_FREE_NUM != 0
-    uint8_t free_num; 		    /*Application specific identifier (set it freely)*/
+#ifdef LV_OBJ_FREE_NUM_TYPE
+    LV_OBJ_FREE_NUM_TYPE free_num;          /*Application specific identifier (set it freely)*/
 #endif
-}lv_obj_t;
+} lv_obj_t;
+
+typedef lv_res_t (*lv_action_t) (struct _lv_obj_t * obj);
 
 /*Protect some attributes (max. 8 bit)*/
-typedef enum
+enum
 {
     LV_PROTECT_NONE      = 0x00,
     LV_PROTECT_CHILD_CHG = 0x01, /*Disable the child change signal. Used by the library*/
     LV_PROTECT_PARENT    = 0x02, /*Prevent automatic parent change (e.g. in lv_page)*/
     LV_PROTECT_POS       = 0x04, /*Prevent automatic positioning (e.g. in lv_cont layout)*/
     LV_PROTECT_FOLLOW    = 0x08, /*Prevent the object be followed in automatic ordering (e.g. in lv_cont PRETTY layout)*/
-}lv_protect_t;
+    LV_PROTECT_PRESS_LOST= 0x10, /*If the `indev` was pressing this object but swiped out while pressing do not search other object.*/
+    LV_PROTECT_CLICK_FOCUS= 0x20,/*Prevent focusing the object by clicking on it*/
+};
+typedef uint8_t lv_protect_t;
 
-typedef enum
+
+/*Used by `lv_obj_get_type()`. The object's and its ancestor types are stored here*/
+typedef struct {
+    const char * type[LV_MAX_ANCESTOR_NUM];   /*[0]: the actual type, [1]: ancestor, [2] #1's ancestor ... [x]: "lv_obj" */
+} lv_obj_type_t;
+
+enum
 {
     LV_ALIGN_CENTER = 0,
     LV_ALIGN_IN_TOP_LEFT,
@@ -167,18 +194,20 @@ typedef enum
     LV_ALIGN_OUT_RIGHT_TOP,
     LV_ALIGN_OUT_RIGHT_MID,
     LV_ALIGN_OUT_RIGHT_BOTTOM,
-}lv_align_t;
+};
+typedef uint8_t lv_align_t;
 
-typedef enum
+enum
 {
-	LV_ANIM_NONE = 0,
-	LV_ANIM_FLOAT_TOP, 		/*Float from/to the top*/
-	LV_ANIM_FLOAT_LEFT,		/*Float from/to the left*/
-	LV_ANIM_FLOAT_BOTTOM,	/*Float from/to the bottom*/
-	LV_ANIM_FLOAT_RIGHT,	/*Float from/to the right*/
-	LV_ANIM_GROW_H,			/*Grow/shrink  horizontally*/
-	LV_ANIM_GROW_V,			/*Grow/shrink  vertically*/
-}lv_anim_builtin_t;
+    LV_ANIM_NONE = 0,
+    LV_ANIM_FLOAT_TOP,      /*Float from/to the top*/
+    LV_ANIM_FLOAT_LEFT,     /*Float from/to the left*/
+    LV_ANIM_FLOAT_BOTTOM,   /*Float from/to the bottom*/
+    LV_ANIM_FLOAT_RIGHT,    /*Float from/to the right*/
+    LV_ANIM_GROW_H,         /*Grow/shrink  horizontally*/
+    LV_ANIM_GROW_V,         /*Grow/shrink  vertically*/
+};
+typedef uint8_t lv_anim_builtin_t;
 
 /**********************
  * GLOBAL PROTOTYPES
@@ -189,6 +218,10 @@ typedef enum
  */
 void lv_init(void);
 
+/*--------------------
+ * Create and delete
+ *-------------------*/
+
 /**
  * Create a basic object
  * @param parent pointer to a parent object.
@@ -196,28 +229,34 @@ void lv_init(void);
  * @param copy pointer to a base object, if not NULL then the new object will be copied from it
  * @return pointer to the new object
  */
-lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy);
+lv_obj_t * lv_obj_create(lv_obj_t * parent,const  lv_obj_t * copy);
 
 /**
  * Delete 'obj' and all of its children
  * @param obj pointer to an object to delete
+ * @return LV_RES_INV because the object is deleted
  */
-void lv_obj_del(lv_obj_t * obj);
+lv_res_t lv_obj_del(lv_obj_t * obj);
 
 /**
- * Signal function of the basic object
+ * Delete all children of an object
  * @param obj pointer to an object
- * @param sign signal type
- * @param param parameter for the signal (depends on signal type)
- * @return false: the object become invalid (e.g. deleted)
  */
-bool lv_obj_signal(lv_obj_t * obj, lv_signal_t sign, void * param);
+void lv_obj_clean(lv_obj_t *obj);
 
 /**
  * Mark the object as invalid therefore its current position will be redrawn by 'lv_refr_task'
  * @param obj pointer to an object
  */
-void lv_obj_inv(lv_obj_t * obj);
+void lv_obj_invalidate(const lv_obj_t * obj);
+
+/*=====================
+ * Setter functions
+ *====================*/
+
+/*--------------
+ * Screen set
+ *--------------*/
 
 /**
  * Load a new screen
@@ -225,59 +264,42 @@ void lv_obj_inv(lv_obj_t * obj);
  */
 void lv_scr_load(lv_obj_t * scr);
 
+/*--------------------
+ * Parent/children set
+ *--------------------*/
+
 /**
  * Set a new parent for an object. Its relative position will be the same.
- * @param obj pointer to an object
- * @param parent pointer to the new parent object
+ * @param obj pointer to an object. Can't be a screen.
+ * @param parent pointer to the new parent object. (Can't be NULL)
  */
 void lv_obj_set_parent(lv_obj_t * obj, lv_obj_t * parent);
 
+/*--------------------
+ * Coordinate set
+ * ------------------*/
+
 /**
  * Set relative the position of an object (relative to the parent)
  * @param obj pointer to an object
  * @param x new distance from the left side of the parent
  * @param y new distance from the top of the parent
  */
-void lv_obj_set_pos(lv_obj_t * obj, cord_t x, cord_t y);
-
-/**
- * Set relative the position of an object (relative to the parent).
- * The coordinates will be upscaled with LV_DOWNSCALE.
- * @param obj pointer to an object
- * @param x new distance from the left side of the parent. (will be multiplied with LV_DOWNSCALE)
- * @param y new distance from the top of the parent. (will be multiplied with LV_DOWNSCALE)
- */
-void lv_obj_set_pos_us(lv_obj_t * obj, cord_t x, cord_t y);
+void lv_obj_set_pos(lv_obj_t * obj, lv_coord_t x, lv_coord_t y);
 
 /**
  * Set the x coordinate of a object
  * @param obj pointer to an object
  * @param x new distance from the left side from the parent
  */
-void lv_obj_set_x(lv_obj_t * obj, cord_t x);
-
-/**
- * Set the x coordinate of a object.
- * The coordinate will be upscaled with  LV_DOWNSCALE.
- * @param obj pointer to an object
- * @param x new distance from the left side from the parent. (will be multiplied with LV_DOWNSCALE)
- */
-void lv_obj_set_x_us(lv_obj_t * obj, cord_t x);
+void lv_obj_set_x(lv_obj_t * obj, lv_coord_t x);
 
 /**
  * Set the y coordinate of a object
  * @param obj pointer to an object
  * @param y new distance from the top of the parent
  */
-void lv_obj_set_y(lv_obj_t * obj, cord_t y);
-
-/**
- * Set the y coordinate of a object.
- * The coordinate will be upscaled with LV_DOWNSCALE.
- * @param obj pointer to an object
- * @param y new distance from the top of the parent. (will be multiplied with LV_DOWNSCALE)
- */
-void lv_obj_set_y_us(lv_obj_t * obj, cord_t y);
+void lv_obj_set_y(lv_obj_t * obj, lv_coord_t y);
 
 /**
  * Set the size of an object
@@ -285,43 +307,21 @@ void lv_obj_set_y_us(lv_obj_t * obj, cord_t y);
  * @param w new width
  * @param h new height
  */
-void lv_obj_set_size(lv_obj_t * obj, cord_t w, cord_t h);
-
-/**
- * Set the size of an object. The coordinates will be upscaled with  LV_DOWNSCALE.
- * @param obj pointer to an object
- * @param w new width (will be multiplied with LV_DOWNSCALE)
- * @param h new height (will be multiplied with LV_DOWNSCALE)
- */
-void lv_obj_set_size_us(lv_obj_t * obj, cord_t w, cord_t h);
+void lv_obj_set_size(lv_obj_t * obj, lv_coord_t w, lv_coord_t h);
 
 /**
  * Set the width of an object
  * @param obj pointer to an object
  * @param w new width
  */
-void lv_obj_set_width(lv_obj_t * obj, cord_t w);
-
-/**
- * Set the width of an object.  The width will be upscaled with  LV_DOWNSCALE
- * @param obj pointer to an object
- * @param w new width (will be multiplied with LV_DOWNSCALE)
- */
-void lv_obj_set_width_us(lv_obj_t * obj, cord_t w);
+void lv_obj_set_width(lv_obj_t * obj, lv_coord_t w);
 
 /**
  * Set the height of an object
  * @param obj pointer to an object
  * @param h new height
  */
-void lv_obj_set_height(lv_obj_t * obj, cord_t h);
-
-/**
- * Set the height of an object.  The height will be upscaled with  LV_DOWNSCALE
- * @param obj pointer to an object
- * @param h new height (will be multiplied with LV_DOWNSCALE)
- */
-void lv_obj_set_height_us(lv_obj_t * obj, cord_t h);
+void lv_obj_set_height(lv_obj_t * obj, lv_coord_t h);
 
 /**
  * Align an object to an other object.
@@ -331,24 +331,12 @@ void lv_obj_set_height_us(lv_obj_t * obj, cord_t h);
  * @param x_mod x coordinate shift after alignment
  * @param y_mod y coordinate shift after alignment
  */
-void lv_obj_align(lv_obj_t * obj,lv_obj_t * base, lv_align_t align, cord_t x_mod, cord_t y_mod);
+void lv_obj_align(lv_obj_t * obj,const lv_obj_t * base, lv_align_t align, lv_coord_t x_mod, lv_coord_t y_mod);
 
-/**
- * Align an object to an other object. The coordinates will be upscaled with  LV_DOWNSCALE.
- * @param obj pointer to an object to align
- * @param base pointer to an object (if NULL the parent is used). 'obj' will be aligned to it.
- * @param align type of alignment (see 'lv_align_t' enum)
- * @param x_mod x coordinate shift after alignment (will be multiplied with LV_DOWNSCALE)
- * @param y_mod y coordinate shift after alignment (will be multiplied with LV_DOWNSCALE)
- */
-void lv_obj_align_us(lv_obj_t * obj,lv_obj_t * base, lv_align_t align, cord_t x_mod, cord_t y_mod);
 
-/**
- * Set the extended size of an object
- * @param obj pointer to an object
- * @param ext_size the extended size
- */
-void lv_obj_set_ext_size(lv_obj_t * obj, cord_t ext_size);
+/*---------------------
+ * Appearance set
+ *--------------------*/
 
 /**
  * Set a new style for an object
@@ -361,14 +349,18 @@ void lv_obj_set_style(lv_obj_t * obj, lv_style_t * style);
  * Notify an object about its style is modified
  * @param obj pointer to an object
  */
-void lv_obj_refr_style(lv_obj_t * obj);
+void lv_obj_refresh_style(lv_obj_t * obj);
 
 /**
  * Notify all object if a style is modified
  * @param style pointer to a style. Only the objects with this style will be notified
  *               (NULL to notify all objects)
  */
-void lv_style_refr_objs(void * style);
+void lv_obj_report_style_mod(lv_style_t * style);
+
+/*-----------------
+ * Attribute set
+ *----------------*/
 
 /**
  * Hide an object. It won't be visible and clickable.
@@ -414,19 +406,41 @@ void lv_obj_set_drag_throw(lv_obj_t * obj, bool en);
  */
 void lv_obj_set_drag_parent(lv_obj_t * obj, bool en);
 
+/**
+ * Set editable parameter Used by groups and keyboard/encoder control.
+ * Editable object has something inside to choose (the elements of a list)
+ * @param obj pointer to an object
+ * @param en true: enable editing
+ */
+void lv_obj_set_editable(lv_obj_t * obj, bool en);
+
+/**
+ * Set the opa scale enable parameter (required to set opa_scale with `lv_obj_set_opa_scale()`)
+ * @param obj pointer to an object
+ * @param en true: opa scaling is enabled for this object and all children; false: no opa scaling
+ */
+void lv_obj_set_opa_scale_enable(lv_obj_t * obj, bool en);
+
+/**
+ * Set the opa scale of an object
+ * @param obj pointer to an object
+ * @param opa_scale a factor to scale down opacity [0..255]
+ */
+void lv_obj_set_opa_scale(lv_obj_t * obj, lv_opa_t opa_scale);
+
 /**
  * Set a bit or bits in the protect filed
  * @param obj pointer to an object
- * @param prot 'OR'-ed values from lv_obj_prot_t
+ * @param prot 'OR'-ed values from `lv_protect_t`
  */
 void lv_obj_set_protect(lv_obj_t * obj, uint8_t prot);
 
 /**
  * Clear a bit or bits in the protect filed
  * @param obj pointer to an object
- * @param prot 'OR'-ed values from lv_obj_prot_t
+ * @param prot 'OR'-ed values from `lv_protect_t`
  */
-void lv_obj_clr_protect(lv_obj_t * obj, uint8_t prot);
+void lv_obj_clear_protect(lv_obj_t * obj, uint8_t prot);
 
 /**
  * Set the signal function of an object.
@@ -434,49 +448,54 @@ void lv_obj_clr_protect(lv_obj_t * obj, uint8_t prot);
  * @param obj pointer to an object
  * @param fp the new signal function
  */
-void lv_obj_set_signal_f(lv_obj_t * obj, lv_signal_f_t fp);
+void lv_obj_set_signal_func(lv_obj_t * obj, lv_signal_func_t fp);
 
 /**
  * Set a new design function for an object
  * @param obj pointer to an object
  * @param fp the new design function
  */
-void lv_obj_set_design_f(lv_obj_t * obj, lv_design_f_t fp);
+void lv_obj_set_design_func(lv_obj_t * obj, lv_design_func_t fp);
+
+/*----------------
+ * Other set
+ *--------------*/
 
 /**
  * Allocate a new ext. data for an object
  * @param obj pointer to an object
  * @param ext_size the size of the new ext. data
- * @return Normal pointer to the allocated ext
+ * @return pointer to the allocated ext
  */
-void * lv_obj_alloc_ext(lv_obj_t * obj, uint16_t ext_size);
+void * lv_obj_allocate_ext_attr(lv_obj_t * obj, uint16_t ext_size);
 
 /**
  * Send a 'LV_SIGNAL_REFR_EXT_SIZE' signal to the object
  * @param obj pointer to an object
  */
-void lv_obj_refr_ext_size(lv_obj_t * obj);
+void lv_obj_refresh_ext_size(lv_obj_t * obj);
 
-#if LV_OBJ_FREE_NUM != 0
+#ifdef LV_OBJ_FREE_NUM_TYPE
 /**
  * Set an application specific number for an object.
  * It can help to identify objects in the application.
  * @param obj pointer to an object
  * @param free_num the new free number
  */
-void lv_obj_set_free_num(lv_obj_t * obj, uint8_t free_num);
+void lv_obj_set_free_num(lv_obj_t * obj, LV_OBJ_FREE_NUM_TYPE free_num);
 #endif
 
-#if LV_OBJ_FREE_P != 0
+#if LV_OBJ_FREE_PTR != 0
 /**
  * Set an application specific  pointer for an object.
  * It can help to identify objects in the application.
  * @param obj pointer to an object
  * @param free_p the new free pinter
  */
-void lv_obj_set_free_p(lv_obj_t * obj, void * free_p);
+void lv_obj_set_free_ptr(lv_obj_t * obj, void * free_p);
 #endif
 
+#if USE_LV_ANIMATION
 /**
  * Animate an object
  * @param obj pointer to an object to animate
@@ -485,163 +504,221 @@ void lv_obj_set_free_p(lv_obj_t * obj, void * free_p);
  * @param delay delay before the animation in milliseconds
  * @param cb a function to call when the animation is ready
  */
-void lv_obj_anim(lv_obj_t * obj, lv_anim_builtin_t type, uint16_t time, uint16_t delay, void (*cb) (lv_obj_t *));
+void lv_obj_animate(lv_obj_t * obj, lv_anim_builtin_t type, uint16_t time, uint16_t delay, void (*cb) (lv_obj_t *));
+#endif
+
+/*=======================
+ * Getter functions
+ *======================*/
+
+/*------------------
+ * Screen get
+ *-----------------*/
 
 /**
- * Return with the actual screen
- * @return pointer to to the actual screen object
+ * Return with a pointer to the active screen
+ * @return pointer to the active screen object (loaded by 'lv_scr_load()')
  */
 lv_obj_t * lv_scr_act(void);
 
+/**
+ * Return with the top layer. (Same on every screen and it is above the normal screen layer)
+ * @return pointer to the top layer object  (transparent screen sized lv_obj)
+ */
+lv_obj_t * lv_layer_top(void);
+
+/**
+ * Return with the system layer. (Same on every screen and it is above the all other layers)
+ * It is used for example by the cursor
+ * @return pointer to the system layer object (transparent screen sized lv_obj)
+ */
+lv_obj_t * lv_layer_sys(void);
+
 /**
  * Return with the screen of an object
  * @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_screen(const lv_obj_t * obj);
+
+/*---------------------
+ * Parent/children get
+ *--------------------*/
 
 /**
  * Returns with the parent of an object
  * @param obj pointer to an object
  * @return pointer to the parent of  'obj'
  */
-lv_obj_t * lv_obj_get_parent(lv_obj_t * obj);
+lv_obj_t * lv_obj_get_parent(const lv_obj_t * obj);
 
 /**
- * Iterate through the children of an object
+ * Iterate through the children of an object (start from the "youngest, lastly created")
  * @param obj pointer to an object
  * @param child NULL at first call to get the next children
  *                  and the previous return value later
  * @return the child after 'act_child' or NULL if no more child
  */
-lv_obj_t * lv_obj_get_child(lv_obj_t * obj, lv_obj_t * child);
+lv_obj_t * lv_obj_get_child(const lv_obj_t * obj, const lv_obj_t * child);
+
+/**
+ * Iterate through the children of an object (start from the "oldest", firstly created)
+ * @param obj pointer to an object
+ * @param child NULL at first call to get the next children
+ *                  and the previous return value later
+ * @return the child after 'act_child' or NULL if no more child
+ */
+lv_obj_t * lv_obj_get_child_back(const lv_obj_t * obj, const lv_obj_t * child);
 
 /**
  * Count the children of an object (only children directly on 'obj')
  * @param obj pointer to an object
  * @return children number of 'obj'
  */
-uint16_t lv_obj_get_child_num(lv_obj_t * obj);
+uint16_t lv_obj_count_children(const lv_obj_t * obj);
+
+/*---------------------
+ * Coordinate get
+ *--------------------*/
 
 /**
  * Copy the coordinates of an object to an area
  * @param obj pointer to an object
  * @param cords_p pointer to an area to store the coordinates
  */
-void lv_obj_get_cords(lv_obj_t * obj, area_t * cords_p);
+void lv_obj_get_coords(const lv_obj_t * obj, lv_area_t * cords_p);
 
 /**
  * Get the x coordinate of object
  * @param obj pointer to an object
  * @return distance of 'obj' from the left side of its parent
  */
-cord_t lv_obj_get_x(lv_obj_t * obj);
+lv_coord_t lv_obj_get_x(const lv_obj_t * obj);
 
 /**
  * Get the y coordinate of object
  * @param obj pointer to an object
  * @return distance of 'obj' from the top of its parent
  */
-cord_t lv_obj_get_y(lv_obj_t * obj);
+lv_coord_t lv_obj_get_y(const lv_obj_t * obj);
 
 /**
  * Get the width of an object
  * @param obj pointer to an object
  * @return the width
  */
-cord_t lv_obj_get_width(lv_obj_t * obj);
+lv_coord_t lv_obj_get_width(const lv_obj_t * obj);
 
 /**
  * Get the height of an object
  * @param obj pointer to an object
  * @return the height
  */
-cord_t lv_obj_get_height(lv_obj_t * obj);
+lv_coord_t lv_obj_get_height(const lv_obj_t * obj);
 
 /**
  * Get the extended size attribute of an object
  * @param obj pointer to an object
  * @return the extended size attribute
  */
-cord_t lv_obj_get_ext_size(lv_obj_t * obj);
+lv_coord_t lv_obj_get_ext_size(const lv_obj_t * obj);
+
+/*-----------------
+ * Appearance get
+ *---------------*/
 
 /**
  * Get the style pointer of an object (if NULL get style of the parent)
  * @param obj pointer to an object
  * @return pointer to a style
  */
-lv_style_t * lv_obj_get_style(lv_obj_t * obj);
+lv_style_t * lv_obj_get_style(const lv_obj_t * obj);
+
+/*-----------------
+ * Attribute get
+ *----------------*/
 
 /**
  * Get the hidden attribute of an object
  * @param obj pointer to an object
  * @return true: the object is hidden
  */
-bool lv_obj_get_hidden(lv_obj_t * obj);
+bool lv_obj_get_hidden(const lv_obj_t * obj);
 
 /**
  * Get the click enable attribute of an object
  * @param obj pointer to an object
  * @return true: the object is clickable
  */
-bool lv_obj_get_click(lv_obj_t * obj);
+bool lv_obj_get_click(const lv_obj_t * obj);
 
 /**
  * Get the top enable attribute of an object
  * @param obj pointer to an object
  * @return true: the auto top feture is enabled
  */
-bool lv_obj_get_top(lv_obj_t * obj);
+bool lv_obj_get_top(const lv_obj_t * obj);
 
 /**
  * Get the drag enable attribute of an object
  * @param obj pointer to an object
  * @return true: the object is dragable
  */
-bool lv_obj_get_drag(lv_obj_t * obj);
+bool lv_obj_get_drag(const lv_obj_t * obj);
 
 /**
  * Get the drag thow enable attribute of an object
  * @param obj pointer to an object
  * @return true: drag throw is enabled
  */
-bool lv_obj_get_drag_throw(lv_obj_t * obj);
+bool lv_obj_get_drag_throw(const lv_obj_t * obj);
 
 /**
  * Get the drag parent attribute of an object
  * @param obj pointer to an object
  * @return true: drag parent is enabled
  */
-bool lv_obj_get_drag_parent(lv_obj_t * obj);
+bool lv_obj_get_drag_parent(const lv_obj_t * obj);
+
+/**
+ * Get the opa scale parameter of an object
+ * @param obj pointer to an object
+ * @return opa scale [0..255]
+ */
+lv_opa_t lv_obj_get_opa_scale(const lv_obj_t * obj);
 
 /**
  * Get the protect field of an object
  * @param obj pointer to an object
- * @return protect field ('OR'ed values of lv_obj_prot_t)
+ * @return protect field ('OR'ed values of `lv_protect_t`)
  */
-uint8_t lv_obj_get_protect(lv_obj_t * obj);
+uint8_t lv_obj_get_protect(const lv_obj_t * obj);
 
 /**
  * Check at least one bit of a given protect bitfield is set
  * @param obj pointer to an object
- * @param prot protect bits to test ('OR'ed values of lv_obj_prot_t)
+ * @param prot protect bits to test ('OR'ed values of `lv_protect_t`)
  * @return false: none of the given bits are set, true: at least one bit is set
  */
-bool lv_obj_is_protected(lv_obj_t * obj, uint8_t prot);
+bool lv_obj_is_protected(const lv_obj_t * obj, uint8_t prot);
 
 /**
  * Get the signal function of an object
  * @param obj pointer to an object
  * @return the signal function
  */
-lv_signal_f_t   lv_obj_get_signal_f(lv_obj_t * obj);
+lv_signal_func_t   lv_obj_get_signal_func(const lv_obj_t * obj);
 
 /**
  * Get the design function of an object
  * @param obj pointer to an object
  * @return the design function
  */
-lv_design_f_t lv_obj_get_design_f(lv_obj_t * obj);
+lv_design_func_t lv_obj_get_design_func(const lv_obj_t * obj);
+
+/*------------------
+ * Other get
+ *-----------------*/
 
 /**
  * Get the ext pointer
@@ -649,34 +726,53 @@ lv_design_f_t lv_obj_get_design_f(lv_obj_t * obj);
  * @return the ext pointer but not the dynamic version
  *         Use it as ext->data1, and NOT da(ext)->data1
  */
-void * lv_obj_get_ext(lv_obj_t * obj);
+void * lv_obj_get_ext_attr(const lv_obj_t * obj);
 
-#if LV_OBJ_FREE_NUM != 0
+/**
+ * Get object's and its ancestors type. Put their name in `type_buf` starting with the current type.
+ * E.g. buf.type[0]="lv_btn", buf.type[1]="lv_cont", buf.type[2]="lv_obj"
+ * @param obj pointer to an object which type should be get
+ * @param buf pointer to an `lv_obj_type_t` buffer to store the types
+ */
+void lv_obj_get_type(lv_obj_t * obj, lv_obj_type_t * buf);
+
+#ifdef LV_OBJ_FREE_NUM_TYPE
 /**
  * Get the free number
  * @param obj pointer to an object
  * @return the free number
  */
-uint8_t lv_obj_get_free_num(lv_obj_t * obj);
+LV_OBJ_FREE_NUM_TYPE lv_obj_get_free_num(const lv_obj_t * obj);
 #endif
 
-#if LV_OBJ_FREE_P != 0
+#if LV_OBJ_FREE_PTR != 0
 /**
  * Get the free pointer
  * @param obj pointer to an object
  * @return the free pointer
  */
-void * lv_obj_get_free_p(lv_obj_t * obj);
+void * lv_obj_get_free_ptr(const lv_obj_t * obj);
 #endif
 
-#if LV_OBJ_GROUP != 0
+#if USE_LV_GROUP
 /**
  * Get the group of the object
  * @param obj pointer to an object
  * @return the pointer to group of the object
  */
-void * lv_obj_get_group(lv_obj_t * obj);
+void * lv_obj_get_group(const lv_obj_t * obj);
+
+
+/**
+ * Tell whether the ohe object is the focused object of a group or not.
+ * @param obj pointer to an object
+ * @return true: the object is focused, false: the object is not focused or not in a group
+ */
+bool lv_obj_is_focused(const lv_obj_t * obj);
+
 #endif
+
+
 /**********************
  *      MACROS
  **********************/

lv_core/lv_refr.c

@@ -1,18 +1,17 @@
 /**
  * @file lv_refr.c
- * 
+ *
  */
 
 /*********************
  *      INCLUDES
  *********************/
 #include <stddef.h>
-#include "lv_conf.h"
-#include "misc/os/ptask.h"
-#include "misc/mem/fifo.h"
 #include "lv_refr.h"
 #include "lv_vdb.h"
-#include "hal/systick/systick.h"
+#include "../lv_hal/lv_hal_tick.h"
+#include "../lv_misc/lv_task.h"
+#include "../lv_misc/lv_mem.h"
 
 /*********************
  *      DEFINES
@@ -21,11 +20,10 @@
 /**********************
  *      TYPEDEFS
  **********************/
-typedef struct
-{
-    area_t area;
+typedef struct {
+    lv_area_t area;
     uint8_t joined;
-}lv_join_t;
+} lv_join_t;
 
 /**********************
  *  STATIC PROTOTYPES
@@ -34,21 +32,22 @@ static void lv_refr_task(void * param);
 static void lv_refr_join_area(void);
 static void lv_refr_areas(void);
 #if LV_VDB_SIZE == 0
-static void lv_refr_area_no_vdb(const area_t * area_p);
+static void lv_refr_area_no_vdb(const lv_area_t * area_p);
 #else
-static void lv_refr_area_with_vdb(const area_t * area_p);
-static void lv_refr_area_part_vdb(const area_t * area_p);
+static void lv_refr_area_with_vdb(const lv_area_t * area_p);
+static void lv_refr_area_part_vdb(const lv_area_t * area_p);
 #endif
-static lv_obj_t * lv_refr_get_top_obj(const area_t * area_p, lv_obj_t * obj);
-static void lv_refr_make(lv_obj_t * top_p, const area_t * mask_p);
-static void lv_refr_obj(lv_obj_t * obj, const area_t * mask_ori_p);
+static lv_obj_t * lv_refr_get_top_obj(const lv_area_t * area_p, lv_obj_t * obj);
+static void lv_refr_obj_and_children(lv_obj_t * top_p, const lv_area_t * mask_p);
+static void lv_refr_obj(lv_obj_t * obj, const lv_area_t * mask_ori_p);
 
 /**********************
  *  STATIC VARIABLES
  **********************/
 static lv_join_t inv_buf[LV_INV_FIFO_SIZE];
 static uint16_t inv_buf_p;
-static void (*monitor_cb)(uint32_t, uint32_t);
+static void (*monitor_cb)(uint32_t, uint32_t); /*Monitor the rendering time*/
+static void (*round_cb)(lv_area_t *);          /*If set then called to modify invalidated areas for special display controllers*/
 static uint32_t px_num;
 
 /**********************
@@ -63,64 +62,68 @@ static uint32_t px_num;
  * Initialize the screen refresh subsystem
  */
 void lv_refr_init(void)
-{    
+{
     inv_buf_p = 0;
     memset(inv_buf, 0, sizeof(inv_buf));
 
-    ptask_t* task;
-    task = ptask_create(lv_refr_task, LV_REFR_PERIOD, PTASK_PRIO_MID, NULL);
-    dm_assert(task);
+    lv_task_t * task;
+    task = lv_task_create(lv_refr_task, LV_REFR_PERIOD, LV_TASK_PRIO_MID, NULL);
+    lv_task_ready(task);        /*Be sure the screen will be refreshed immediately on start up*/
 }
 
+/**
+ * Redraw the invalidated areas now.
+ * Normally the redarwing is peridocally executed in `lv_task_handler` but a long blocking process can
+ * prevent the call of `lv_task_handler`. In this case if the the GUI is updated in the process (e.g. progress bar)
+ * this function can be called when the screen shoud be updated.
+ */
+void lv_refr_now(void)
+{
+    lv_refr_task(NULL);
+}
+
+
 /**
  * Invalidate an area
  * @param area_p pointer to area which should be invalidated
  */
-void lv_inv_area(const area_t * area_p)
+void lv_inv_area(const lv_area_t * area_p)
 {
     /*Clear the invalidate buffer if the parameter is NULL*/
     if(area_p == NULL) {
         inv_buf_p = 0;
         return;
     }
-    
-    area_t scr_area;
+
+    lv_area_t scr_area;
     scr_area.x1 = 0;
     scr_area.y1 = 0;
     scr_area.x2 = LV_HOR_RES - 1;
     scr_area.y2 = LV_VER_RES - 1;
-    
-    area_t com_area;    
+
+    lv_area_t com_area;
     bool suc;
 
-    suc = area_union(&com_area, area_p, &scr_area);
+    suc = lv_area_intersect(&com_area, area_p, &scr_area);
 
     /*The area is truncated to the screen*/
-    if(suc != false)
-    {
-#if LV_DOWNSCALE == 2
-    	/*Rounding*/
-    	com_area.x1 = com_area.x1 & (~0x1);
-    	com_area.y1 = com_area.y1 & (~0x1);
-    	com_area.x2 = com_area.x2 | 0x1;
-    	com_area.y2 = com_area.y2 | 0x1;
-#endif
-
-    	/*Save only if this area is not in one of the saved areas*/
-    	uint16_t i;
-    	for(i = 0; i < inv_buf_p; i++) {
-    	    if(area_is_in(&com_area, &inv_buf[i].area) != false) return;
-    	}
+    if(suc != false) {
+        if(round_cb) round_cb(&com_area);
 
+        /*Save only if this area is not in one of the saved areas*/
+        uint16_t i;
+        for(i = 0; i < inv_buf_p; i++) {
+            if(lv_area_is_in(&com_area, &inv_buf[i].area) != false) return;
+        }
 
         /*Save the area*/
-    	if(inv_buf_p < LV_INV_FIFO_SIZE) {
-            area_cpy(&inv_buf[inv_buf_p].area,&com_area);
-    	} else {/*If no place for the area add the screen*/
-    	    inv_buf_p = 0;
-            area_cpy(&inv_buf[inv_buf_p].area,&scr_area);
+        if(inv_buf_p < LV_INV_FIFO_SIZE) {
+            lv_area_copy(&inv_buf[inv_buf_p].area, &com_area);
+        } else {/*If no place for the area add the screen*/
+            inv_buf_p = 0;
+            lv_area_copy(&inv_buf[inv_buf_p].area, &scr_area);
         }
-    	inv_buf_p ++;
+        inv_buf_p ++;
     }
 }
 
@@ -136,6 +139,35 @@ void lv_refr_set_monitor_cb(void (*cb)(uint32_t, uint32_t))
     monitor_cb = cb;
 }
 
+/**
+ * Called when an area is invalidated to modify the coordinates of the area.
+ * Special display controllers may require special coordinate rounding
+ * @param cb pointer to the a function which will modify the area
+ */
+void lv_refr_set_round_cb(void(*cb)(lv_area_t *))
+{
+    round_cb = cb;
+}
+
+/**
+ * Get the number of areas in the buffer
+ * @return number of invalid areas
+ */
+uint16_t lv_refr_get_buf_size(void)
+{
+    return inv_buf_p;
+}
+
+/**
+ * Pop (delete) the last 'num' invalidated areas from the buffer
+ * @param num number of areas to delete
+ */
+void lv_refr_pop_from_buf(uint16_t num)
+{
+    if(inv_buf_p < num) inv_buf_p = 0;
+    else inv_buf_p -= num;
+}
+
 /**********************
  *   STATIC FUNCTIONS
  **********************/
@@ -146,11 +178,14 @@ void lv_refr_set_monitor_cb(void (*cb)(uint32_t, uint32_t))
  */
 static void lv_refr_task(void * param)
 {
+    (void)param;
 
-    uint32_t start = systick_get();
+    LV_LOG_TRACE("display refresh task started");
+
+    uint32_t start = lv_tick_get();
 
     lv_refr_join_area();
-    
+
     lv_refr_areas();
 
     bool refr_done = false;
@@ -162,9 +197,11 @@ static void lv_refr_task(void * param)
      * therefore be sure the inv_buf is cleared prior to it*/
     if(refr_done != false) {
         if(monitor_cb != NULL) {
-            monitor_cb(systick_elaps(start), px_num);
+            monitor_cb(lv_tick_elaps(start), px_num);
         }
     }
+
+    LV_LOG_TRACE("display refresh task finished");
 }
 
 
@@ -175,10 +212,10 @@ static void lv_refr_join_area(void)
 {
     uint32_t join_from;
     uint32_t join_in;
-    area_t joined_area;
+    lv_area_t joined_area;
     for(join_in = 0; join_in < inv_buf_p; join_in++) {
         if(inv_buf[join_in].joined != 0) continue;
-        
+
         /*Check all areas to join them in 'join_in'*/
         for(join_from = 0; join_from < inv_buf_p; join_from++) {
             /*Handle only unjoined areas and ignore itself*/
@@ -187,24 +224,23 @@ static void lv_refr_join_area(void)
             }
 
             /*Check if the areas are on each other*/
-            if(area_is_on(&inv_buf[join_in].area,
-                          &inv_buf[join_from].area) == false)
-            {
+            if(lv_area_is_on(&inv_buf[join_in].area,
+                             &inv_buf[join_from].area) == false) {
                 continue;
             }
-            
-            area_join(&joined_area, &inv_buf[join_in].area,
-                                    &inv_buf[join_from].area);
+
+            lv_area_join(&joined_area, &inv_buf[join_in].area,
+                         &inv_buf[join_from].area);
 
             /*Join two area only if the joined area size is smaller*/
-            if(area_get_size(&joined_area) < 
-             (area_get_size(&inv_buf[join_in].area) + area_get_size(&inv_buf[join_from].area))) {
-                area_cpy(&inv_buf[join_in].area, &joined_area);
+            if(lv_area_get_size(&joined_area) <
+                    (lv_area_get_size(&inv_buf[join_in].area) + lv_area_get_size(&inv_buf[join_from].area))) {
+                lv_area_copy(&inv_buf[join_in].area, &joined_area);
 
                 /*Mark 'join_form' is joined into 'join_in'*/
                 inv_buf[join_from].joined = 1;
             }
-        }   
+        }
     }
 }
 
@@ -226,7 +262,7 @@ static void lv_refr_areas(void)
             /*If VDB is used...*/
             lv_refr_area_with_vdb(&inv_buf[i].area);
 #endif
-            if(monitor_cb != NULL) px_num += area_get_size(&inv_buf[i].area);
+            if(monitor_cb != NULL) px_num += lv_area_get_size(&inv_buf[i].area);
         }
     }
 
@@ -237,15 +273,19 @@ static void lv_refr_areas(void)
  * Refresh an area if there is no Virtual Display Buffer
  * @param area_p pointer to an area to refresh
  */
-static void lv_refr_area_no_vdb(const area_t * area_p)
+static void lv_refr_area_no_vdb(const lv_area_t * area_p)
 {
     lv_obj_t * top_p;
-    
-    /*Get top object which is not covered by others*/    
+
+    /*Get top object which is not covered by others*/
     top_p = lv_refr_get_top_obj(area_p, lv_scr_act());
-    
+
     /*Do the refreshing*/
-    lv_refr_make(top_p, area_p);
+    lv_refr_obj_and_children(top_p, area_p);
+
+    /*Also refresh top and sys layer unconditionally*/
+    lv_refr_obj_and_children(lv_layer_top(), area_p);
+    lv_refr_obj_and_children(lv_layer_sys(), area_p);
 }
 
 #else
@@ -254,41 +294,74 @@ static void lv_refr_area_no_vdb(const area_t * area_p)
  * Refresh an area if there is Virtual Display Buffer
  * @param area_p  pointer to an area to refresh
  */
-static void lv_refr_area_with_vdb(const area_t * area_p)
+static void lv_refr_area_with_vdb(const lv_area_t * area_p)
 {
     /*Calculate the max row num*/
-    uint32_t max_row = (uint32_t) LV_VDB_SIZE / (area_get_width(area_p));
-    if(max_row > area_get_height(area_p)) max_row = area_get_height(area_p);
-    
-    /*Round the row number with downscale*/
-#if LV_DOWNSCALE == 2
-    max_row &= (~0x1);
-#endif
+    lv_coord_t w = lv_area_get_width(area_p);
+    lv_coord_t h = lv_area_get_height(area_p);
+    lv_coord_t y2 = area_p->y2 >= LV_VER_RES ? y2 = LV_VER_RES - 1 : area_p->y2;
+
+    int32_t max_row = (uint32_t) LV_VDB_SIZE / w;
+
+    if(max_row > h) max_row = h;
+
+
+    /*Round down the lines of VDB if rounding is added*/
+    if(round_cb) {
+        lv_area_t tmp;
+        tmp.x1 = 0;
+        tmp.x2 = 0;
+        tmp.y1 = 0;
+        tmp.y2 = max_row;
+
+        lv_coord_t y_tmp = max_row;
+        do {
+            tmp.y2 = y_tmp;
+            round_cb(&tmp);
+            y_tmp --;       /*Decrement the number of line until it is rounded to a smaller (or equal) value then the original. */
+        } while(lv_area_get_height(&tmp) > max_row && y_tmp != 0);
+
+        if(y_tmp == 0) {
+            LV_LOG_WARN("Can't set VDB height using the round function. (Wrong round_cb or to small VDB)");
+            return;
+        } else {
+            max_row = tmp.y2 + 1;
+        }
+    }
 
     /*Always use the full row*/
-    cord_t row;
-    cord_t row_last = 0;
-    for(row = area_p->y1; row  + max_row - 1 <= area_p->y2; row += max_row)  {
+    lv_coord_t row;
+    lv_coord_t row_last = 0;
+    for(row = area_p->y1; row  + max_row - 1 <= y2; row += max_row)  {
         lv_vdb_t * vdb_p = lv_vdb_get();
+        if(!vdb_p) {
+            LV_LOG_WARN("Invalid VDB pointer");
+            return;
+        }
 
         /*Calc. the next y coordinates of VDB*/
         vdb_p->area.x1 = area_p->x1;
         vdb_p->area.x2 = area_p->x2;
         vdb_p->area.y1 = row;
         vdb_p->area.y2 = row + max_row - 1;
-        row_last = row + max_row - 1;
+        if(vdb_p->area.y2 > y2) vdb_p->area.y2 = y2;
+        row_last = vdb_p->area.y2;
         lv_refr_area_part_vdb(area_p);
     }
-    
+
     /*If the last y coordinates are not handled yet ...*/
-    if(area_p->y2 != row_last) {
+    if(y2 != row_last) {
         lv_vdb_t * vdb_p = lv_vdb_get();
+        if(!vdb_p) {
+            LV_LOG_WARN("Invalid VDB pointer");
+            return;
+        }
 
         /*Calc. the next y coordinates of VDB*/
         vdb_p->area.x1 = area_p->x1;
         vdb_p->area.x2 = area_p->x2;
         vdb_p->area.y1 = row;
-        vdb_p->area.y2 = area_p->y2;
+        vdb_p->area.y2 = y2;
 
         /*Refresh this part too*/
         lv_refr_area_part_vdb(area_p);
@@ -299,23 +372,31 @@ static void lv_refr_area_with_vdb(const area_t * area_p)
  * Refresh a part of an area which is on the actual Virtual Display Buffer
  * @param area_p pointer to an area to refresh
  */
-static void lv_refr_area_part_vdb(const area_t * area_p)
+static void lv_refr_area_part_vdb(const lv_area_t * area_p)
 {
     lv_vdb_t * vdb_p = lv_vdb_get();
+    if(!vdb_p) {
+        LV_LOG_WARN("Invalid VDB pointer");
+        return;
+    }
     lv_obj_t * top_p;
 
     /*Get the new mask from the original area and the act. VDB
      It will be a part of 'area_p'*/
-    area_t start_mask;
-    area_union(&start_mask, area_p, &vdb_p->area);
+    lv_area_t start_mask;
+    lv_area_intersect(&start_mask, area_p, &vdb_p->area);
 
     /*Get the most top object which is not covered by others*/
     top_p = lv_refr_get_top_obj(&start_mask, lv_scr_act());
 
     /*Do the refreshing from the top object*/
-    lv_refr_make(top_p, &start_mask);
+    lv_refr_obj_and_children(top_p, &start_mask);
 
-    /*Flush the content of the VDB*/ 
+    /*Also refresh top and sys layer unconditionally*/
+    lv_refr_obj_and_children(lv_layer_top(), &start_mask);
+    lv_refr_obj_and_children(lv_layer_sys(), &start_mask);
+
+    /*Flush the content of the VDB*/
     lv_vdb_flush();
 }
 
@@ -325,35 +406,35 @@ static void lv_refr_area_part_vdb(const area_t * area_p)
  * Search the most top object which fully covers an area
  * @param area_p pointer to an area
  * @param obj the first object to start the searching (typically a screen)
- * @return 
+ * @return
  */
-static lv_obj_t * lv_refr_get_top_obj(const area_t * area_p, lv_obj_t * obj)
+static lv_obj_t * lv_refr_get_top_obj(const lv_area_t * area_p, lv_obj_t * obj)
 {
     lv_obj_t * i;
     lv_obj_t * found_p = NULL;
-    
+
     /*If this object is fully cover the draw area check the children too */
-    if(area_is_in(area_p, &obj->cords) && obj->hidden == 0)
-    {
+    if(lv_area_is_in(area_p, &obj->coords) && obj->hidden == 0) {
         LL_READ(obj->child_ll, i)        {
             found_p = lv_refr_get_top_obj(area_p, i);
-            
+
             /*If a children is ok then break*/
             if(found_p != NULL) {
                 break;
             }
         }
-        
+
         /*If no better children check this object*/
         if(found_p == NULL) {
             lv_style_t * style = lv_obj_get_style(obj);
-            if(style->opa == OPA_COVER &&
-               obj->design_f(obj, area_p, LV_DESIGN_COVER_CHK) != false) {
+            if(style->body.opa == LV_OPA_COVER &&
+                    obj->design_func(obj, area_p, LV_DESIGN_COVER_CHK) != false &&
+                    lv_obj_get_opa_scale(obj) == LV_OPA_COVER) {
                 found_p = obj;
             }
         }
     }
-    
+
     return found_p;
 }
 
@@ -362,16 +443,16 @@ static lv_obj_t * lv_refr_get_top_obj(const area_t * area_p, lv_obj_t * obj)
  * @param top_p pointer to an objects. Start the drawing from it.
  * @param mask_p pointer to an area, the objects will be drawn only here
  */
-static void lv_refr_make(lv_obj_t * top_p, const area_t * mask_p)
+static void lv_refr_obj_and_children(lv_obj_t * top_p, const lv_area_t * mask_p)
 {
     /* Normally always will be a top_obj (at least the screen)
      * but in special cases (e.g. if the screen has alpha) it won't.
      * In this case use the screen directly */
     if(top_p == NULL) top_p = lv_scr_act();
-    
+
     /*Refresh the top object and its children*/
     lv_refr_obj(top_p, mask_p);
-    
+
     /*Draw the 'younger' sibling objects because they can be on top_obj */
     lv_obj_t * par;
     lv_obj_t * i;
@@ -382,14 +463,14 @@ static void lv_refr_make(lv_obj_t * top_p, const area_t * mask_p)
     /*Do until not reach the screen*/
     while(par != NULL) {
         /*object before border_p has to be redrawn*/
-        i = ll_get_prev(&(par->child_ll), border_p);
+        i = lv_ll_get_prev(&(par->child_ll), border_p);
 
-        while(i != NULL) { 
+        while(i != NULL) {
             /*Refresh the objects*/
             lv_refr_obj(i, mask_p);
-            i = ll_get_prev(&(par->child_ll), i);
-        }  
-        
+            i = lv_ll_get_prev(&(par->child_ll), i);
+        }
+
         /*The new border will be there last parents,
          *so the 'younger' brothers of parent will be refreshed*/
         border_p = par;
@@ -400,7 +481,7 @@ static void lv_refr_make(lv_obj_t * top_p, const area_t * mask_p)
     /*Call the post draw design function of the parents of the to object*/
     par = lv_obj_get_parent(top_p);
     while(par != NULL) {
-        par->design_f(par, mask_p, LV_DESIGN_DRAW_POST);
+        par->design_func(par, mask_p, LV_DESIGN_DRAW_POST);
         par = lv_obj_get_parent(par);
     }
 }
@@ -410,65 +491,64 @@ static void lv_refr_make(lv_obj_t * top_p, const area_t * mask_p)
  * @param obj pointer to an object to refresh
  * @param mask_ori_p pointer to an area, the objects will be drawn only here
  */
-static void lv_refr_obj(lv_obj_t * obj, const area_t * mask_ori_p)
+static void lv_refr_obj(lv_obj_t * obj, const lv_area_t * mask_ori_p)
 {
     /*Do not refresh hidden objects*/
     if(obj->hidden != 0) return;
-    
+
     bool union_ok;  /* Store the return value of area_union */
     /* Truncate the original mask to the coordinates of the parent
      * because the parent and its children are visible only here */
-    area_t obj_mask;
-    area_t obj_ext_mask;
-    area_t obj_area;
-    cord_t ext_size = obj->ext_size;
-    lv_obj_get_cords(obj, &obj_area);
+    lv_area_t obj_mask;
+    lv_area_t obj_ext_mask;
+    lv_area_t obj_area;
+    lv_coord_t ext_size = obj->ext_size;
+    lv_obj_get_coords(obj, &obj_area);
     obj_area.x1 -= ext_size;
     obj_area.y1 -= ext_size;
     obj_area.x2 += ext_size;
     obj_area.y2 += ext_size;
-    union_ok = area_union(&obj_ext_mask, mask_ori_p, &obj_area);
-    
+    union_ok = lv_area_intersect(&obj_ext_mask, mask_ori_p, &obj_area);
+
     /*Draw the parent and its children only if they ore on 'mask_parent'*/
     if(union_ok != false) {
 
         /* Redraw the object */
         lv_style_t * style = lv_obj_get_style(obj);
-        if(style->opa != OPA_TRANSP) {
-            obj->design_f(obj, &obj_ext_mask, LV_DESIGN_DRAW_MAIN);
+        if(style->body.opa != LV_OPA_TRANSP) {
+            obj->design_func(obj, &obj_ext_mask, LV_DESIGN_DRAW_MAIN);
             //tick_wait_ms(100);  /*DEBUG: Wait after every object draw to see the order of drawing*/
         }
 
         /*Create a new 'obj_mask' without 'ext_size' because the children can't be visible there*/
-        lv_obj_get_cords(obj, &obj_area);
-        union_ok = area_union(&obj_mask, mask_ori_p, &obj_area);
+        lv_obj_get_coords(obj, &obj_area);
+        union_ok = lv_area_intersect(&obj_mask, mask_ori_p, &obj_area);
         if(union_ok != false) {
-			area_t mask_child; /*Mask from obj and its child*/
-			lv_obj_t * child_p;
-			area_t child_area;
-			LL_READ_BACK(obj->child_ll, child_p)
-			{
-				lv_obj_get_cords(child_p, &child_area);
-				ext_size = child_p->ext_size;
-				child_area.x1 -= ext_size;
-				child_area.y1 -= ext_size;
-				child_area.x2 += ext_size;
-				child_area.y2 += ext_size;
-				/* Get the union (common parts) of original mask (from obj)
-				 * and its child */
-				union_ok = area_union(&mask_child, &obj_mask, &child_area);
+            lv_area_t mask_child; /*Mask from obj and its child*/
+            lv_obj_t * child_p;
+            lv_area_t child_area;
+            LL_READ_BACK(obj->child_ll, child_p) {
+                lv_obj_get_coords(child_p, &child_area);
+                ext_size = child_p->ext_size;
+                child_area.x1 -= ext_size;
+                child_area.y1 -= ext_size;
+                child_area.x2 += ext_size;
+                child_area.y2 += ext_size;
+                /* Get the union (common parts) of original mask (from obj)
+                 * and its child */
+                union_ok = lv_area_intersect(&mask_child, &obj_mask, &child_area);
 
-				/*If the parent and the child has common area then refresh the child */
-				if(union_ok) {
-					/*Refresh the next children*/
-					lv_refr_obj(child_p, &mask_child);
-				}
-			}
+                /*If the parent and the child has common area then refresh the child */
+                if(union_ok) {
+                    /*Refresh the next children*/
+                    lv_refr_obj(child_p, &mask_child);
+                }
+            }
         }
 
         /* If all the children are redrawn make 'post draw' design */
-        if(style->opa != OPA_TRANSP) {
-		  obj->design_f(obj, &obj_ext_mask, LV_DESIGN_DRAW_POST);
-		}
+        if(style->body.opa != LV_OPA_TRANSP) {
+            obj->design_func(obj, &obj_ext_mask, LV_DESIGN_DRAW_POST);
+        }
     }
 }

lv_core/lv_refr.h

@@ -1,6 +1,6 @@
 /**
  * @file lv_refr.h
- * 
+ *
  */
 
 #ifndef LV_REFR_H
@@ -16,7 +16,6 @@ extern "C" {
 #include "lv_obj.h"
 #include <stdbool.h>
 
-
 /*********************
  *      DEFINES
  *********************/
@@ -46,11 +45,19 @@ extern "C" {
  */
 void lv_refr_init(void);
 
+/**
+ * Redraw the invalidated areas now.
+ * Normally the redarwing is peridocally executed in `lv_task_handler` but a long blocking process can
+ * prevent the call of `lv_task_handler`. In this case if the the GUI is updated in the process (e.g. progress bar)
+ * this function can be called when the screen shoud be updated.
+ */
+void lv_refr_now(void);
+
 /**
  * Invalidate an area
  * @param area_p pointer to area which should be invalidated
  */
-void lv_inv_area(const area_t * area_p);
+void lv_inv_area(const lv_area_t * area_p);
 
 /**
  * Set a function to call after every refresh to announce the refresh time and the number of refreshed pixels
@@ -58,6 +65,24 @@ void lv_inv_area(const area_t * area_p);
  */
 void lv_refr_set_monitor_cb(void (*cb)(uint32_t, uint32_t));
 
+/**
+ * Called when an area is invalidated to modify the coordinates of the area.
+ * Special display controllers may require special coordinate rounding
+ * @param cb pointer to the a function which will modify the area
+ */
+void lv_refr_set_round_cb(void(*cb)(lv_area_t*));
+
+/**
+ * Get the number of areas in the buffer
+ * @return number of invalid areas
+ */
+uint16_t lv_refr_get_buf_size(void);
+
+/**
+ * Pop (delete) the last 'num' invalidated areas from the buffer
+ * @param num number of areas to delete
+ */
+void lv_refr_pop_from_buf(uint16_t num);
 /**********************
  *   STATIC FUNCTIONS
  **********************/

lv_core/lv_style.c

@@ -0,0 +1,345 @@
+/**
+ * @file lv_style.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_obj.h"
+#include "../lv_misc/lv_mem.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+#define STYLE_MIX_MAX       256
+#define STYLE_MIX_SHIFT     8      /*log2(STYLE_MIX_MAX)*/
+
+#define VAL_PROP(v1, v2, r)   v1 + (((v2-v1) * r) >> STYLE_MIX_SHIFT)
+#define STYLE_ATTR_MIX(attr, r)   if(start->attr != end->attr) {res->attr = VAL_PROP(start->attr, end->attr, r);} else {res->attr = start->attr;}
+
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+#if USE_LV_ANIMATION
+typedef struct {
+    lv_style_t style_start;   /*Save not only pointers because can be same as 'style_anim' then it will be modified too*/
+    lv_style_t style_end;
+    lv_style_t * style_anim;
+    void (*end_cb)(void *);
+} lv_style_anim_dsc_t;
+#endif
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+#if USE_LV_ANIMATION
+static void style_animator(lv_style_anim_dsc_t * dsc, int32_t val);
+static void style_animation_common_end_cb(void * ptr);
+#endif
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+lv_style_t lv_style_scr;
+lv_style_t lv_style_transp;
+lv_style_t lv_style_transp_fit;
+lv_style_t lv_style_transp_tight;
+lv_style_t lv_style_plain;
+lv_style_t lv_style_plain_color;
+lv_style_t lv_style_pretty;
+lv_style_t lv_style_pretty_color;
+lv_style_t lv_style_btn_rel;
+lv_style_t lv_style_btn_pr;
+lv_style_t lv_style_btn_tgl_rel;
+lv_style_t lv_style_btn_tgl_pr;
+lv_style_t lv_style_btn_ina;
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ *  Init the basic styles
+ */
+void lv_style_init(void)
+{
+    /* Not White/Black/Gray colors are created by HSV model with
+     * HUE = 210*/
+
+    /*Screen style*/
+    lv_style_scr.glass = 0;
+    lv_style_scr.body.opa = LV_OPA_COVER;
+    lv_style_scr.body.main_color = LV_COLOR_WHITE;
+    lv_style_scr.body.grad_color = LV_COLOR_WHITE;
+    lv_style_scr.body.radius = 0;
+    lv_style_scr.body.padding.ver = LV_DPI / 12;
+    lv_style_scr.body.padding.hor = LV_DPI / 12;
+    lv_style_scr.body.padding.inner = LV_DPI / 12;
+
+    lv_style_scr.body.border.color = LV_COLOR_BLACK;
+    lv_style_scr.body.border.opa = LV_OPA_COVER;
+    lv_style_scr.body.border.width = 0;
+    lv_style_scr.body.border.part = LV_BORDER_FULL;
+
+    lv_style_scr.body.shadow.color = LV_COLOR_GRAY;
+    lv_style_scr.body.shadow.type = LV_SHADOW_FULL;
+    lv_style_scr.body.shadow.width = 0;
+
+    lv_style_scr.text.opa = LV_OPA_COVER;
+    lv_style_scr.text.color = LV_COLOR_MAKE(0x30, 0x30, 0x30);
+    lv_style_scr.text.font = LV_FONT_DEFAULT;
+    lv_style_scr.text.letter_space = 2;
+    lv_style_scr.text.line_space = 2;
+
+    lv_style_scr.image.opa = LV_OPA_COVER;
+    lv_style_scr.image.color = LV_COLOR_MAKE(0x20, 0x20, 0x20);
+    lv_style_scr.image.intense = LV_OPA_TRANSP;
+
+    lv_style_scr.line.opa = LV_OPA_COVER;
+    lv_style_scr.line.color = LV_COLOR_MAKE(0x20, 0x20, 0x20);
+    lv_style_scr.line.width = 2;
+    lv_style_scr.line.rounded = 0;
+
+    /*Plain style (by default near the same as the screen style)*/
+    memcpy(&lv_style_plain, &lv_style_scr, sizeof(lv_style_t));
+
+    /*Plain color style*/
+    memcpy(&lv_style_plain_color, &lv_style_plain, sizeof(lv_style_t));
+    lv_style_plain_color.text.color = LV_COLOR_MAKE(0xf0, 0xf0, 0xf0);
+    lv_style_plain_color.image.color = LV_COLOR_MAKE(0xf0, 0xf0, 0xf0);
+    lv_style_plain_color.line.color = LV_COLOR_MAKE(0xf0, 0xf0, 0xf0);
+    lv_style_plain_color.body.main_color = LV_COLOR_MAKE(0x55, 0x96, 0xd8);
+    lv_style_plain_color.body.grad_color = lv_style_plain_color.body.main_color;
+
+    /*Pretty style */
+    memcpy(&lv_style_pretty, &lv_style_plain, sizeof(lv_style_t));
+    lv_style_pretty.text.color = LV_COLOR_MAKE(0x20, 0x20, 0x20);
+    lv_style_pretty.image.color = LV_COLOR_MAKE(0x20, 0x20, 0x20);
+    lv_style_pretty.line.color = LV_COLOR_MAKE(0x20, 0x20, 0x20);
+    lv_style_pretty.body.main_color = LV_COLOR_WHITE;
+    lv_style_pretty.body.grad_color = LV_COLOR_SILVER;
+    lv_style_pretty.body.radius = LV_DPI / 15;
+    lv_style_pretty.body.border.color = LV_COLOR_MAKE(0x40, 0x40, 0x40);
+    lv_style_pretty.body.border.width = LV_DPI / 50 >= 1 ? LV_DPI / 50  : 1;
+    lv_style_pretty.body.border.opa = LV_OPA_30;
+
+    /*Pretty color style*/
+    memcpy(&lv_style_pretty_color, &lv_style_pretty, sizeof(lv_style_t));
+    lv_style_pretty_color.text.color = LV_COLOR_MAKE(0xe0, 0xe0, 0xe0);
+    lv_style_pretty_color.image.color = LV_COLOR_MAKE(0xe0, 0xe0, 0xe0);
+    lv_style_pretty_color.line.color = LV_COLOR_MAKE(0xc0, 0xc0, 0xc0);
+    lv_style_pretty_color.body.main_color = LV_COLOR_MAKE(0x6b, 0x9a, 0xc7);
+    lv_style_pretty_color.body.grad_color = LV_COLOR_MAKE(0x2b, 0x59, 0x8b);
+    lv_style_pretty_color.body.border.color = LV_COLOR_MAKE(0x15, 0x2c, 0x42);
+
+    /*Transparent style*/
+    memcpy(&lv_style_transp, &lv_style_plain, sizeof(lv_style_t));
+    lv_style_transp.body.empty = 1;
+    lv_style_transp.glass = 1;
+    lv_style_transp.body.border.width = 0;
+
+    /*Transparent fitting size*/
+    memcpy(&lv_style_transp_fit, &lv_style_transp, sizeof(lv_style_t));
+    lv_style_transp_fit.body.padding.hor = 0;
+    lv_style_transp_fit.body.padding.ver = 0;
+
+    /*Transparent tight style*/
+    memcpy(&lv_style_transp_tight, &lv_style_transp_fit, sizeof(lv_style_t));
+    lv_style_transp_tight.body.padding.inner = 0;
+
+    /*Button released style*/
+    memcpy(&lv_style_btn_rel, &lv_style_plain, sizeof(lv_style_t));
+    lv_style_btn_rel.body.main_color = LV_COLOR_MAKE(0x76, 0xa2, 0xd0);
+    lv_style_btn_rel.body.grad_color = LV_COLOR_MAKE(0x19, 0x3a, 0x5d);
+    lv_style_btn_rel.body.radius = LV_DPI / 15;
+    lv_style_btn_rel.body.padding.hor = LV_DPI / 4;
+    lv_style_btn_rel.body.padding.ver = LV_DPI / 6;
+    lv_style_btn_rel.body.padding.inner = LV_DPI / 10;
+    lv_style_btn_rel.body.border.color = LV_COLOR_MAKE(0x0b, 0x19, 0x28);
+    lv_style_btn_rel.body.border.width = LV_DPI / 50 >= 1 ? LV_DPI / 50  : 1;
+    lv_style_btn_rel.body.border.opa = LV_OPA_70;
+    lv_style_btn_rel.text.color = LV_COLOR_MAKE(0xff, 0xff, 0xff);
+    lv_style_btn_rel.body.shadow.color = LV_COLOR_GRAY;
+    lv_style_btn_rel.body.shadow.width = 0;
+
+    /*Button pressed style*/
+    memcpy(&lv_style_btn_pr, &lv_style_btn_rel, sizeof(lv_style_t));
+    lv_style_btn_pr.body.main_color = LV_COLOR_MAKE(0x33, 0x62, 0x94);
+    lv_style_btn_pr.body.grad_color = LV_COLOR_MAKE(0x10, 0x26, 0x3c);
+    lv_style_btn_pr.text.color = LV_COLOR_MAKE(0xa4, 0xb5, 0xc6);
+    lv_style_btn_pr.image.color = LV_COLOR_MAKE(0xa4, 0xb5, 0xc6);
+    lv_style_btn_pr.line.color = LV_COLOR_MAKE(0xa4, 0xb5, 0xc6);
+
+    /*Button toggle released style*/
+    memcpy(&lv_style_btn_tgl_rel, &lv_style_btn_rel, sizeof(lv_style_t));
+    lv_style_btn_tgl_rel.body.main_color = LV_COLOR_MAKE(0x0a, 0x11, 0x22);
+    lv_style_btn_tgl_rel.body.grad_color = LV_COLOR_MAKE(0x37, 0x62, 0x90);
+    lv_style_btn_tgl_rel.body.border.color = LV_COLOR_MAKE(0x01, 0x07, 0x0d);
+    lv_style_btn_tgl_rel.text.color = LV_COLOR_MAKE(0xc8, 0xdd, 0xf4);
+    lv_style_btn_tgl_rel.image.color = LV_COLOR_MAKE(0xc8, 0xdd, 0xf4);
+    lv_style_btn_tgl_rel.line.color = LV_COLOR_MAKE(0xc8, 0xdd, 0xf4);
+
+    /*Button toggle pressed style*/
+    memcpy(&lv_style_btn_tgl_pr, &lv_style_btn_tgl_rel, sizeof(lv_style_t));
+    lv_style_btn_tgl_pr.body.main_color = LV_COLOR_MAKE(0x02, 0x14, 0x27);
+    lv_style_btn_tgl_pr.body.grad_color = LV_COLOR_MAKE(0x2b, 0x4c, 0x70);
+    lv_style_btn_tgl_pr.text.color = LV_COLOR_MAKE(0xa4, 0xb5, 0xc6);
+    lv_style_btn_tgl_pr.image.color = LV_COLOR_MAKE(0xa4, 0xb5, 0xc6);
+    lv_style_btn_tgl_pr.line.color = LV_COLOR_MAKE(0xa4, 0xb5, 0xc6);
+
+    /*Button inactive style*/
+    memcpy(&lv_style_btn_ina, &lv_style_btn_rel, sizeof(lv_style_t));
+    lv_style_btn_ina.body.main_color = LV_COLOR_MAKE(0xd8, 0xd8, 0xd8);
+    lv_style_btn_ina.body.grad_color = LV_COLOR_MAKE(0xd8, 0xd8, 0xd8);
+    lv_style_btn_ina.body.border.color = LV_COLOR_MAKE(0x90, 0x90, 0x90);
+    lv_style_btn_ina.text.color = LV_COLOR_MAKE(0x70, 0x70, 0x70);
+    lv_style_btn_ina.image.color = LV_COLOR_MAKE(0x70, 0x70, 0x70);
+    lv_style_btn_ina.line.color = LV_COLOR_MAKE(0x70, 0x70, 0x70);
+}
+
+
+/**
+ * Copy a style to an other
+ * @param dest pointer to the destination style
+ * @param src pointer to the source style
+ */
+void lv_style_copy(lv_style_t * dest, const lv_style_t * src)
+{
+    memcpy(dest, src, sizeof(lv_style_t));
+}
+
+
+/**
+ * Mix two styles according to a given ratio
+ * @param start start style
+ * @param end end style
+ * @param res store the result style here
+ * @param ratio the ratio of mix [0..256]; 0: `start` style; 256: `end` style
+ */
+void lv_style_mix(const lv_style_t * start, const lv_style_t * end, lv_style_t * res, uint16_t ratio)
+{
+    STYLE_ATTR_MIX(body.opa, ratio);
+    STYLE_ATTR_MIX(body.radius, ratio);
+    STYLE_ATTR_MIX(body.border.width, ratio);
+    STYLE_ATTR_MIX(body.border.opa, ratio);
+    STYLE_ATTR_MIX(body.shadow.width, ratio);
+    STYLE_ATTR_MIX(body.padding.hor, ratio);
+    STYLE_ATTR_MIX(body.padding.ver, ratio);
+    STYLE_ATTR_MIX(body.padding.inner, ratio);
+    STYLE_ATTR_MIX(text.line_space, ratio);
+    STYLE_ATTR_MIX(text.letter_space, ratio);
+    STYLE_ATTR_MIX(text.opa, ratio);
+    STYLE_ATTR_MIX(line.width, ratio);
+    STYLE_ATTR_MIX(line.opa, ratio);
+    STYLE_ATTR_MIX(image.intense, ratio);
+    STYLE_ATTR_MIX(image.opa, ratio);
+
+    lv_opa_t opa = ratio == STYLE_MIX_MAX ? LV_OPA_COVER : ratio;
+
+    res->body.main_color = lv_color_mix(end->body.main_color, start->body.main_color, opa);
+    res->body.grad_color = lv_color_mix(end->body.grad_color, start->body.grad_color, opa);
+    res->body.border.color = lv_color_mix(end->body.border.color, start->body.border.color, opa);
+    res->body.shadow.color = lv_color_mix(end->body.shadow.color, start->body.shadow.color, opa);
+    res->text.color = lv_color_mix(end->text.color, start->text.color, opa);
+    res->image.color = lv_color_mix(end->image.color, start->image.color, opa);
+    res->line.color = lv_color_mix(end->line.color, start->line.color, opa);
+
+    if(ratio < (STYLE_MIX_MAX >> 1)) {
+        res->body.empty = start->body.empty;
+        res->body.border.part = start->body.border.part;
+        res->glass = start->glass;
+        res->text.font = start->text.font;
+        res->body.shadow.type = start->body.shadow.type;
+        res->line.rounded = start->line.rounded;
+    } else {
+        res->body.empty = end->body.empty;
+        res->body.border.part = end->body.border.part;
+        res->glass = end->glass;
+        res->text.font = end->text.font;
+        res->body.shadow.type = end->body.shadow.type;
+        res->line.rounded = end->line.rounded;
+    }
+}
+
+#if USE_LV_ANIMATION
+
+/**
+ * Create an animation from a pre-configured 'lv_style_anim_t' variable
+ * @param anim pointer to a pre-configured 'lv_style_anim_t' variable (will be copied)
+ * @return pointer to a descriptor. Really this variable will be animated. (Can be used in `lv_anim_del(dsc, NULL)`)
+ */
+void * lv_style_anim_create(lv_style_anim_t * anim)
+{
+    lv_style_anim_dsc_t * dsc;
+    dsc = lv_mem_alloc(sizeof(lv_style_anim_dsc_t));
+    lv_mem_assert(dsc);
+    if(dsc == NULL) return NULL;
+
+    dsc->style_anim = anim->style_anim;
+    memcpy(&dsc->style_start, anim->style_start, sizeof(lv_style_t));
+    memcpy(&dsc->style_end, anim->style_end, sizeof(lv_style_t));
+    memcpy(dsc->style_anim, anim->style_start, sizeof(lv_style_t));
+    dsc->end_cb = anim->end_cb;
+
+
+    lv_anim_t a;
+    a.var = (void *)dsc;
+    a.start = 0;
+    a.end = STYLE_MIX_MAX;
+    a.fp = (lv_anim_fp_t)style_animator;
+    a.path = lv_anim_path_linear;
+    a.end_cb = style_animation_common_end_cb;
+    a.act_time = anim->act_time;
+    a.time = anim->time;
+    a.playback = anim->playback;
+    a.playback_pause = anim->playback_pause;
+    a.repeat = anim->repeat;
+    a.repeat_pause = anim->repeat_pause;
+
+    lv_anim_create(&a);
+
+    return dsc;
+}
+
+#endif
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+#if USE_LV_ANIMATION
+/**
+ * Used by the style animations to set the values of a style according to start and end style.
+ * @param dsc the 'animated variable' set by lv_style_anim_create()
+ * @param val the current state of the animation between 0 and LV_STYLE_ANIM_RES
+ */
+static void style_animator(lv_style_anim_dsc_t * dsc, int32_t val)
+{
+    const lv_style_t * start = &dsc->style_start;
+    const lv_style_t * end = &dsc->style_end;
+    lv_style_t * act = dsc->style_anim;
+
+    lv_style_mix(start, end, act, val);
+
+    lv_obj_report_style_mod(dsc->style_anim);
+}
+
+/**
+ * Called when a style animation is ready
+ * It called the user defined call back and free the allocated memories
+ * @param ptr the 'animated variable' set by lv_style_anim_create()
+ */
+static void style_animation_common_end_cb(void * ptr)
+{
+    lv_style_anim_dsc_t * dsc = ptr;    /*To avoid casting*/
+
+    if(dsc->end_cb) dsc->end_cb(dsc);
+
+    lv_mem_free(dsc);
+}
+
+#endif

lv_core/lv_style.h

@@ -0,0 +1,198 @@
+/**
+ * @file lv_style.h
+ *
+ */
+
+#ifndef LV_STYLE_H
+#define LV_STYLE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include <stdbool.h>
+#include "../lv_misc/lv_color.h"
+#include "../lv_misc/lv_area.h"
+#include "../lv_misc/lv_font.h"
+#include "../lv_misc/lv_anim.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+#define LV_RADIUS_CIRCLE  (LV_COORD_MAX)    /*A very big radius to always draw as circle*/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/*Border types (Use 'OR'ed values)*/
+enum
+{
+    LV_BORDER_NONE =   0x00,
+    LV_BORDER_BOTTOM = 0x01,
+    LV_BORDER_TOP =    0x02,
+    LV_BORDER_LEFT =   0x04,
+    LV_BORDER_RIGHT =  0x08,
+    LV_BORDER_FULL =   0x0F,
+};
+typedef uint8_t lv_border_part_t;
+
+/*Shadow types*/
+enum
+{
+    LV_SHADOW_BOTTOM = 0,
+    LV_SHADOW_FULL,
+};
+typedef uint8_t lv_shadow_type_t;
+
+typedef struct
+{
+    uint8_t glass :1;           /*1: Do not inherit this style*/
+
+    struct {
+        lv_color_t main_color;
+        lv_color_t grad_color;      /*`grad_color` will be removed in v6.0, use `aux_color` instead*/
+        lv_coord_t radius;
+        lv_opa_t opa;
+
+        struct {
+            lv_color_t color;
+            lv_coord_t width;
+            lv_border_part_t part;
+            lv_opa_t opa;
+        } border;
+
+        struct {
+            lv_color_t color;
+            lv_coord_t width;
+            lv_shadow_type_t type;
+        } shadow;
+
+        struct {
+            lv_coord_t ver;
+            lv_coord_t hor;
+            lv_coord_t inner;
+        } padding;
+
+        uint8_t empty :1;   /*Transparent background (border still drawn)*/
+    } body;
+
+
+    struct {
+        lv_color_t color;
+        const lv_font_t * font;
+        lv_coord_t letter_space;
+        lv_coord_t line_space;
+        lv_opa_t opa;
+    } text;
+
+    struct {
+        lv_color_t color;
+        lv_opa_t intense;
+        lv_opa_t opa;
+    } image;
+
+    struct {
+        lv_color_t color;
+        lv_coord_t width;
+        lv_opa_t opa;
+        uint8_t rounded :1;     /*1: rounded line endings*/
+    } line;
+} lv_style_t;
+
+#if USE_LV_ANIMATION
+typedef struct {
+    const lv_style_t * style_start; /*Pointer to the starting style*/
+    const lv_style_t * style_end;   /*Pointer to the destination style*/
+    lv_style_t * style_anim;        /*Pointer to a style to animate*/
+    lv_anim_cb_t end_cb;            /*Call it when the animation is ready (NULL if unused)*/
+    int16_t time;                   /*Animation time in ms*/
+    int16_t act_time;               /*Current time in animation. Set to negative to make delay.*/
+    uint16_t playback_pause;        /*Wait before play back*/
+    uint16_t repeat_pause;          /*Wait before repeat*/
+    uint8_t playback :1;            /*When the animation is ready play it back*/
+    uint8_t repeat :1;              /*Repeat the animation infinitely*/
+} lv_style_anim_t;
+
+/* Example initialization
+lv_style_anim_t a;
+a.style_anim = &style_to_anim;
+a.style_start = &style_1;
+a.style_end = &style_2;
+a.act_time = 0;
+a.time = 1000;
+a.playback = 0;
+a.playback_pause = 0;
+a.repeat = 0;
+a.repeat_pause = 0;
+a.end_cb = NULL;
+lv_style_anim_create(&a);
+ */
+#endif
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ *  Init the basic styles
+ */
+void lv_style_init (void);
+
+/**
+ * Copy a style to an other
+ * @param dest pointer to the destination style
+ * @param src pointer to the source style
+ */
+void lv_style_copy(lv_style_t * dest, const lv_style_t * src);
+
+
+/**
+ * Mix two styles according to a given ratio
+ * @param start start style
+ * @param end end style
+ * @param res store the result style here
+ * @param ratio the ratio of mix [0..256]; 0: `start` style; 256: `end` style
+ */
+void lv_style_mix(const lv_style_t * start, const lv_style_t * end, lv_style_t * res, uint16_t ratio);
+
+#if USE_LV_ANIMATION
+
+/**
+ * Create an animation from a pre-configured 'lv_style_anim_t' variable
+ * @param anim pointer to a pre-configured 'lv_style_anim_t' variable (will be copied)
+ * @return pointer to a descriptor. Really this variable will be animated. (Can be used in `lv_anim_del(dsc, NULL)`)
+ */
+void * lv_style_anim_create(lv_style_anim_t * anim);
+#endif
+
+/*************************
+ *    GLOBAL VARIABLES
+ *************************/
+extern lv_style_t lv_style_scr;
+extern lv_style_t lv_style_transp;
+extern lv_style_t lv_style_transp_fit;
+extern lv_style_t lv_style_transp_tight;
+extern lv_style_t lv_style_plain;
+extern lv_style_t lv_style_plain_color;
+extern lv_style_t lv_style_pretty;
+extern lv_style_t lv_style_pretty_color;
+extern lv_style_t lv_style_btn_rel;
+extern lv_style_t lv_style_btn_pr;
+extern lv_style_t lv_style_btn_tgl_rel;
+extern lv_style_t lv_style_btn_tgl_pr;;
+extern lv_style_t lv_style_btn_ina;
+
+/**********************
+ *      MACROS
+ **********************/
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif  /*LV_STYLE_H*/

lv_core/lv_vdb.c

@@ -0,0 +1,193 @@
+/**
+ * @file lv_vdb.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_vdb.h"
+#if LV_VDB_SIZE != 0
+
+#include "../lv_hal/lv_hal_disp.h"
+#include "../lv_misc/lv_log.h"
+#include <stddef.h>
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+enum {
+    LV_VDB_STATE_FREE = 0,      /*Not used*/
+    LV_VDB_STATE_ACTIVE,        /*Being used to render*/
+    LV_VDB_STATE_FLUSH,         /*Flushing pixels from it*/
+};
+typedef uint8_t lv_vdb_state_t;
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+#if LV_VDB_DOUBLE == 0
+/*Simple VDB*/
+static volatile lv_vdb_state_t vdb_state = LV_VDB_STATE_ACTIVE;
+#  if LV_VDB_ADR == 0
+/*If the buffer address is not specified  simply allocate it*/
+static uint8_t vdb_buf[LV_VDB_SIZE_IN_BYTES];
+static lv_vdb_t vdb = {.buf = (lv_color_t *)vdb_buf};
+#  else     /*LV_VDB_ADR != 0*/
+/*If the buffer address is specified use that address*/
+static lv_vdb_t vdb = {.buf = (lv_color_t *)LV_VDB_ADR};
+#  endif
+#else       /*LV_VDB_DOUBLE != 0*/
+/*Double VDB*/
+static volatile lv_vdb_state_t vdb_state[2] = {LV_VDB_STATE_FREE, LV_VDB_STATE_FREE};
+#  if LV_VDB_ADR == 0
+/*If the buffer address is not specified  simply allocate it*/
+static uint8_t vdb_buf1[LV_VDB_SIZE_IN_BYTES];
+static uint8_t vdb_buf2[LV_VDB_SIZE_IN_BYTES];
+static lv_vdb_t vdb[2] = {{.buf = (lv_color_t *) vdb_buf1}, {.buf = (lv_color_t *) vdb_buf2}};
+#  else /*LV_VDB_ADR != 0*/
+/*If the buffer address is specified use that address*/
+static lv_vdb_t vdb[2] = {{.buf = (lv_color_t *)LV_VDB_ADR}, {.buf = (lv_color_t *)LV_VDB2_ADR}};
+#  endif
+#endif
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Get the 'vdb' variable or allocate one in LV_VDB_DOUBLE mode
+ * @return pointer to a 'vdb' variable
+ */
+lv_vdb_t * lv_vdb_get(void)
+{
+#if LV_VDB_DOUBLE == 0
+    /* Wait until VDB become ACTIVE from FLUSH by the
+     * user call of 'lv_flush_ready()' in display drivers's flush function*/
+    while(vdb_state != LV_VDB_STATE_ACTIVE);
+
+    if(vdb.buf == (void *)LV_VDB_ADR_INV) {
+        LV_LOG_ERROR("VDB address is invalid. Use `lv_vdb_set_adr` to set a valid address or use LV_VDB_ADR = 0 in lv_conf.h");
+        return NULL;
+    }
+    return &vdb;
+#else
+    /*If already there is an active do nothing*/
+    if(vdb_state[0] == LV_VDB_STATE_ACTIVE) return &vdb[0];
+    if(vdb_state[1] == LV_VDB_STATE_ACTIVE) return &vdb[1];
+
+    /*Try to allocate a free VDB*/
+    if(vdb_state[0] == LV_VDB_STATE_FREE) {
+        vdb_state[0] = LV_VDB_STATE_ACTIVE;
+        return &vdb[0];
+    }
+
+    if(vdb_state[1] == LV_VDB_STATE_FREE) {
+        vdb_state[1] = LV_VDB_STATE_ACTIVE;
+        return &vdb[1];
+    }
+
+    return NULL;   /*There wasn't free VDB (never happen)*/
+#endif
+}
+
+/**
+ * Flush the content of the VDB
+ */
+void lv_vdb_flush(void)
+{
+    lv_vdb_t * vdb_act = lv_vdb_get();
+    if(!vdb_act) {
+        LV_LOG_WARN("Invalid VDB pointer");
+        return;
+    }
+#if LV_VDB_DOUBLE == 0
+    vdb_state = LV_VDB_STATE_FLUSH;     /*User call to 'lv_flush_ready()' will set to ACTIVE 'disp_flush'*/
+#else
+    /* Wait the pending flush before starting this one
+     * (Don't forget: 'lv_flush_ready()' has to be called when flushing is ready)*/
+    while(vdb_state[0] == LV_VDB_STATE_FLUSH || vdb_state[1] == LV_VDB_STATE_FLUSH);
+
+    /*Turn the active VDB to flushing*/
+    if(vdb_state[0] == LV_VDB_STATE_ACTIVE) vdb_state[0] = LV_VDB_STATE_FLUSH;
+    if(vdb_state[1] == LV_VDB_STATE_ACTIVE) vdb_state[1] = LV_VDB_STATE_FLUSH;
+#endif
+
+    /*Flush the rendered content to the display*/
+    lv_disp_flush(vdb_act->area.x1, vdb_act->area.y1, vdb_act->area.x2, vdb_act->area.y2, vdb_act->buf);
+
+}
+
+
+/**
+ * Set the address of VDB buffer(s) manually. To use this set `LV_VDB_ADR` (and `LV_VDB2_ADR`) to `LV_VDB_ADR_INV` in `lv_conf.h`.
+ * It should be called before `lv_init()`. The size of the buffer should be: `LV_VDB_SIZE_IN_BYTES`
+ * @param buf1 address of the VDB.
+ * @param buf2 address of the second buffer. `NULL` if `LV_VDB_DOUBLE  0`
+ */
+void lv_vdb_set_adr(void * buf1, void * buf2)
+{
+#if LV_VDB_DOUBLE == 0
+    (void) buf2;   /*unused*/
+    vdb.buf = buf1;
+#else
+    vdb[0].buf = buf1;
+    vdb[1].buf = buf2;
+#endif
+}
+
+/**
+ * Call in the display driver's  'disp_flush' function when the flushing is finished
+ */
+void lv_flush_ready(void)
+{
+#if LV_VDB_DOUBLE == 0
+    vdb_state = LV_VDB_STATE_ACTIVE;
+
+#if LV_COLOR_SCREEN_TRANSP
+    memset(vdb_buf, 0x00, LV_VDB_SIZE_IN_BYTES);
+#endif
+
+#else
+    if(vdb_state[0] == LV_VDB_STATE_FLUSH) {
+#if LV_COLOR_SCREEN_TRANSP
+        memset(vdb_buf[0], 0x00, LV_VDB_SIZE_IN_BYTES);
+#endif
+        vdb_state[0] = LV_VDB_STATE_FREE;
+    }
+    if(vdb_state[1] == LV_VDB_STATE_FLUSH) {
+#if LV_COLOR_SCREEN_TRANSP
+        memset(vdb_buf[1], 0x00, LV_VDB_SIZE_IN_BYTES);
+#endif
+        vdb_state[1] = LV_VDB_STATE_FREE;
+    }
+#endif
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+#else
+
+/**
+ * Just for compatibility
+ */
+void lv_flush_ready(void)
+{
+    /*Do nothing. It is used only for VDB*/
+}
+#endif

lv_core/lv_vdb.h

@@ -0,0 +1,96 @@
+/**
+ * @file lv_vdb.h
+ *
+ */
+
+#ifndef LV_VDB_H
+#define LV_VDB_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
+#if LV_VDB_SIZE != 0
+
+#include "../lv_misc/lv_color.h"
+#include "../lv_misc/lv_area.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+/*Can be used in `lv_conf.h` the set an invalid address for the VDB. It should be replaced later by a valid address using `lv_vdb_set_adr()`*/
+#define LV_VDB_ADR_INV  8       /*8 is still too small to be valid but it's aligned on 64 bit machines as well*/
+
+#ifndef LV_VDB_PX_BPP
+#warning "LV_VDB_PX_BPP is not specified in lv_conf.h. Use the default value (LV_COLOR_SIZE)"
+#define LV_VDB_PX_BPP LV_COLOR_SIZE
+#endif
+
+/* The size of VDB in bytes.
+ * (LV_VDB_SIZE * LV_VDB_PX_BPP) >> 3): just divide by 8 to convert bits to bytes
+ * (((LV_VDB_SIZE * LV_VDB_PX_BPP) & 0x7) ? 1 : 0): add an extra byte to round up.
+ *    E.g. if LV_VDB_SIZE = 10 and LV_VDB_PX_BPP = 1 -> 10 bits -> 2 bytes*/
+#define LV_VDB_SIZE_IN_BYTES ((LV_VDB_SIZE * LV_VDB_PX_BPP) >> 3) + (((LV_VDB_SIZE * LV_VDB_PX_BPP) & 0x7) ? 1 : 0)
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+typedef struct
+{
+    lv_area_t area;
+    lv_color_t *buf;
+} lv_vdb_t;
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Get the 'vdb' variable or allocate one in LV_VDB_DOUBLE mode
+ * @return pointer to a 'vdb' variable
+ */
+lv_vdb_t * lv_vdb_get(void);
+
+/**
+ * Flush the content of the vdb
+ */
+void lv_vdb_flush(void);
+
+/**
+ * Set the address of VDB buffer(s) manually. To use this set `LV_VDB_ADR` (and `LV_VDB2_ADR`) to `LV_VDB_ADR_INV` in `lv_conf.h`.
+ * It should be called before `lv_init()`. The size of the buffer should be: `LV_VDB_SIZE_IN_BYTES`
+ * @param buf1 address of the VDB.
+ * @param buf2 address of the second buffer. `NULL` if `LV_VDB_DOUBLE  0`
+ */
+void lv_vdb_set_adr(void * buf1, void * buf2);
+
+/**
+ * Call in the display driver's  'disp_flush' function when the flushing is finished
+ */
+void lv_flush_ready(void);
+
+/**********************
+ *      MACROS
+ **********************/
+
+#else /*LV_VDB_SIZE != 0*/
+
+/*Just for compatibility*/
+void lv_flush_ready(void);
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_VDB_H*/

lv_draw/lv_draw.h

@@ -1,6 +1,6 @@
 /**
  * @file lv_draw.h
- * 
+ *
  */
 
 #ifndef LV_DRAW_H
@@ -13,78 +13,100 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc_conf.h"
-#include "misc/gfx/text.h"
-#include "../lv_obj/lv_style.h"
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
+#include "../lv_core/lv_style.h"
+#include "../lv_misc/lv_txt.h"
 
 /*********************
  *      DEFINES
  *********************/
+/*If image pixels contains alpha we need to know how much byte is a pixel*/
+#if LV_COLOR_DEPTH == 1 || LV_COLOR_DEPTH == 8
+# define LV_IMG_PX_SIZE_ALPHA_BYTE   2
+#elif LV_COLOR_DEPTH == 16
+# define LV_IMG_PX_SIZE_ALPHA_BYTE   3
+#elif LV_COLOR_DEPTH == 32
+# define LV_IMG_PX_SIZE_ALPHA_BYTE   4
+#endif
 
 /**********************
  *      TYPEDEFS
- **********************/ 
+ **********************/
+
+enum {
+    LV_IMG_SRC_VARIABLE,
+    LV_IMG_SRC_FILE,
+    LV_IMG_SRC_SYMBOL,
+    LV_IMG_SRC_UNKNOWN,
+};
+typedef uint8_t lv_img_src_t;
+
 
 /**********************
  * GLOBAL PROTOTYPES
  **********************/
 
-/**
- * Draw a rectangle
- * @param cords_p the coordinates of the rectangle
- * @param mask_p the rectangle will be drawn only in this mask
- * @param style_p pointer to a style
- */
-void lv_draw_rect(const area_t * cords_p, const area_t * mask_p, const lv_style_t * style_p);
+#if LV_ANTIALIAS != 0
 
-
-/*Experimental use for 3D modeling*/
-#define USE_LV_TRIANGLE 0
-#if USE_LV_TRIANGLE != 0
 /**
- *
- * @param points pointer to an array with 3 points
- * @param mask_p the triangle will be drawn only in this mask
- * @param color color of the triangle
+ * Get the opacity of a pixel based it's position in a line segment
+ * @param seg segment length
+ * @param px_id position of  of a pixel which opacity should be get [0..seg-1]
+ * @param base_opa the base opacity
+ * @return the opacity of the given pixel
  */
-void lv_draw_triangle(const point_t * points, const area_t * mask_p, color_t color);
+lv_opa_t lv_draw_aa_get_opa(lv_coord_t seg, lv_coord_t px_id, lv_opa_t base_opa);
+
+/**
+ * Add a vertical  anti-aliasing segment (pixels with decreasing opacity)
+ * @param x start point x coordinate
+ * @param y start point y coordinate
+ * @param length length of segment (negative value to start from 0 opacity)
+ * @param mask draw only in this area
+ * @param color color of pixels
+ * @param opa maximum opacity
+ */
+void lv_draw_aa_ver_seg(lv_coord_t x, lv_coord_t y, lv_coord_t length, const lv_area_t * mask, lv_color_t color, lv_opa_t opa);
+
+/**
+ * Add a horizontal anti-aliasing segment (pixels with decreasing opacity)
+ * @param x start point x coordinate
+ * @param y start point y coordinate
+ * @param length length of segment (negative value to start from 0 opacity)
+ * @param mask draw only in this area
+ * @param color color of pixels
+ * @param opa maximum opacity
+ */
+void lv_draw_aa_hor_seg(lv_coord_t x, lv_coord_t y, lv_coord_t length, const lv_area_t * mask, lv_color_t color, lv_opa_t opa);
 #endif
 
-/**
- * Write a text
- * @param cords_p coordinates of the label
- * @param mask_p the label will be drawn only in this area
- * @param style_p pointer to a style
- * @param txt 0 terminated text to write
- * @param flags settings for the text from 'txt_flag_t' enum
- * @param offset text offset in x and y direction (NULL if unused)
- */
-void lv_draw_label(const area_t * cords_p,const area_t * mask_p, const lv_style_t * style_p,
-                    const char * txt, txt_flag_t flag, point_t * offset);
-
-/**
- * Draw an image
- * @param cords_p the coordinates of the image
- * @param mask_p the image will be drawn only in this area
- * @param map_p pointer to a color_t array which contains the pixels of the image
- */
-void lv_draw_img(const area_t * cords_p, const area_t * mask_p,
-                 const lv_style_t * style_p, const char * fn);
-
-/**
- * Draw a line
- * @param p1 first point of the line
- * @param p2 second point of the line
- * @param mask_pthe line will be drawn only on this area
- * @param style_p pointer to a style
- */
-void lv_draw_line(const point_t * p1, const point_t * p2, const area_t * mask_p,
-                  const lv_style_t * style_p);
+/**********************
+ *  GLOBAL VARIABLES
+ **********************/
+extern void (*const px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa);
+extern void (*const fill_fp)(const lv_area_t * coords, const lv_area_t * mask, lv_color_t color, lv_opa_t opa);
+extern void (*const letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const lv_font_t * font_p, uint32_t letter, lv_color_t color, lv_opa_t opa);
+extern void (*const map_fp)(const lv_area_t * cords_p, const lv_area_t * mask_p,
+                            const uint8_t * map_p, lv_opa_t opa, bool chroma_key, bool alpha_byte,
+                            lv_color_t recolor, lv_opa_t recolor_opa);
 
 /**********************
  *      MACROS
  **********************/
 
+/**********************
+ *   POST INCLUDES
+ *********************/
+#include "lv_draw_rect.h"
+#include "lv_draw_label.h"
+#include "lv_draw_img.h"
+#include "lv_draw_line.h"
+#include "lv_draw_triangle.h"
 
 #ifdef __cplusplus
 } /* extern "C" */

lv_draw/lv_draw.mk

@@ -0,0 +1,14 @@
+CSRCS += lv_draw_vbasic.c
+CSRCS += lv_draw_rbasic.c
+CSRCS += lv_draw.c
+CSRCS += lv_draw_rect.c
+CSRCS += lv_draw_label.c
+CSRCS += lv_draw_line.c
+CSRCS += lv_draw_img.c
+CSRCS += lv_draw_arc.c
+CSRCS += lv_draw_triangle.c
+
+DEPPATH += --dep-path lvgl/lv_draw
+VPATH += :lvgl/lv_draw
+
+CFLAGS += "-I$(LVGL_DIR)/lvgl/lv_draw"

lv_draw/lv_draw_arc.c

@@ -0,0 +1,264 @@
+/**
+ * @file lv_draw_arc.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw_arc.h"
+#include "../lv_misc/lv_math.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+static uint16_t fast_atan2(int x, int y);
+static void ver_line(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_coord_t len, lv_color_t color, lv_opa_t opa);
+static void hor_line(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_coord_t len, lv_color_t color, lv_opa_t opa);
+static bool deg_test_norm(uint16_t deg, uint16_t start, uint16_t end);
+static bool deg_test_inv(uint16_t deg, uint16_t start, uint16_t end);
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Draw an arc. (Can draw pie too with great thickness.)
+ * @param center_x the x coordinate of the center of the arc
+ * @param center_y the y coordinate of the center of the arc
+ * @param radius the radius of the arc
+ * @param mask the arc will be drawn only in this mask
+ * @param start_angle the start angle of the arc (0 deg on the bottom, 90 deg on the right)
+ * @param end_angle the end angle of the arc
+ * @param style style of the arc (`body.thickness`, `body.main_color`, `body.opa` is used)
+ * @param opa_scale scale down all opacities by the factor
+ */
+void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, const lv_area_t * mask,
+                 uint16_t start_angle, uint16_t end_angle, const lv_style_t * style, lv_opa_t opa_scale)
+{
+    lv_coord_t thickness = style->line.width;
+    if(thickness > radius) thickness = radius;
+
+    lv_coord_t r_out = radius;
+    lv_coord_t r_in = r_out - thickness;
+    int16_t deg_base;
+    int16_t deg;
+    lv_coord_t x_start[4];
+    lv_coord_t x_end[4];
+
+    lv_color_t color = style->line.color;
+    lv_opa_t opa = opa_scale == LV_OPA_COVER ? style->body.opa : (uint16_t)((uint16_t) style->body.opa * opa_scale) >> 8;
+
+
+    bool (*deg_test)(uint16_t, uint16_t, uint16_t);
+    if(start_angle <= end_angle) deg_test = deg_test_norm;
+    else deg_test = deg_test_inv;
+
+    if(deg_test(270, start_angle, end_angle))  hor_line(center_x - r_out + 1, center_y, mask, thickness - 1, color, opa);   // Left Middle
+    if(deg_test(90, start_angle, end_angle))   hor_line(center_x + r_in, center_y,  mask, thickness - 1, color, opa);       // Right Middle
+    if(deg_test(180, start_angle, end_angle))  ver_line(center_x, center_y - r_out + 1,  mask, thickness - 1, color, opa);  // Top Middle
+    if(deg_test(0, start_angle, end_angle))    ver_line(center_x, center_y + r_in,  mask, thickness - 1, color, opa);       // Bottom middle
+
+    uint32_t r_out_sqr = r_out * r_out;
+    uint32_t r_in_sqr = r_in * r_in;
+    int16_t xi;
+    int16_t yi;
+    for(yi = -r_out; yi < 0; yi++) {
+        x_start[0] = LV_COORD_MIN;
+        x_start[1] = LV_COORD_MIN;
+        x_start[2] = LV_COORD_MIN;
+        x_start[3] = LV_COORD_MIN;
+        x_end[0] = LV_COORD_MIN;
+        x_end[1] = LV_COORD_MIN;
+        x_end[2] = LV_COORD_MIN;
+        x_end[3] = LV_COORD_MIN;
+        for(xi = -r_out; xi < 0; xi++) {
+
+            uint32_t r_act_sqr = xi * xi + yi * yi;
+            if(r_act_sqr > r_out_sqr) continue;
+
+            deg_base =  fast_atan2(xi, yi) - 180;
+
+            deg = 180 + deg_base;
+            if(deg_test(deg, start_angle, end_angle)) {
+                if(x_start[0] == LV_COORD_MIN) x_start[0] = xi;
+            } else if(x_start[0] != LV_COORD_MIN && x_end[0] == LV_COORD_MIN) {
+                x_end[0] = xi - 1;
+            }
+
+            deg = 360 - deg_base;
+            if(deg_test(deg, start_angle, end_angle)) {
+                if(x_start[1] == LV_COORD_MIN) x_start[1] = xi;
+            } else if(x_start[1] != LV_COORD_MIN && x_end[1] == LV_COORD_MIN) {
+                x_end[1] = xi - 1;
+            }
+
+            deg = 180 - deg_base;
+            if(deg_test(deg, start_angle, end_angle)) {
+                if(x_start[2] == LV_COORD_MIN) x_start[2] = xi;
+            } else if(x_start[2] != LV_COORD_MIN && x_end[2] == LV_COORD_MIN) {
+                x_end[2] = xi - 1;
+            }
+
+            deg = deg_base;
+            if(deg_test(deg, start_angle, end_angle)) {
+                if(x_start[3] == LV_COORD_MIN) x_start[3] = xi;
+            } else if(x_start[3] != LV_COORD_MIN && x_end[3] == LV_COORD_MIN) {
+                x_end[3] = xi - 1;
+            }
+
+            if(r_act_sqr < r_in_sqr) break; /*No need to continue the iteration in x once we found the inner edge of the arc*/
+        }
+
+
+        if(x_start[0] != LV_COORD_MIN) {
+            if(x_end[0] == LV_COORD_MIN) x_end[0] = xi - 1;
+            hor_line(center_x + x_start[0], center_y + yi, mask, x_end[0] - x_start[0], color, opa);
+        }
+
+        if(x_start[1] != LV_COORD_MIN) {
+            if(x_end[1] == LV_COORD_MIN) x_end[1] = xi - 1;
+            hor_line(center_x + x_start[1], center_y - yi, mask, x_end[1] - x_start[1], color, opa);
+        }
+
+        if(x_start[2] != LV_COORD_MIN) {
+            if(x_end[2] == LV_COORD_MIN) x_end[2] = xi - 1;
+            hor_line(center_x - x_end[2], center_y + yi, mask, LV_MATH_ABS(x_end[2] - x_start[2]), color, opa);
+        }
+
+        if(x_start[3] != LV_COORD_MIN) {
+            if(x_end[3] == LV_COORD_MIN) x_end[3] = xi - 1;
+            hor_line(center_x - x_end[3], center_y - yi, mask, LV_MATH_ABS(x_end[3] - x_start[3]), color, opa);
+        }
+
+
+#if LV_ANTIALIAS
+        /*TODO*/
+
+#endif
+
+    }
+}
+
+static uint16_t fast_atan2(int x, int y)
+{
+    // Fast XY vector to integer degree algorithm - Jan 2011 www.RomanBlack.com
+    // Converts any XY values including 0 to a degree value that should be
+    // within +/- 1 degree of the accurate value without needing
+    // large slow trig functions like ArcTan() or ArcCos().
+    // NOTE! at least one of the X or Y values must be non-zero!
+    // This is the full version, for all 4 quadrants and will generate
+    // the angle in integer degrees from 0-360.
+    // Any values of X and Y are usable including negative values provided
+    // they are between -1456 and 1456 so the 16bit multiply does not overflow.
+
+    unsigned char negflag;
+    unsigned char tempdegree;
+    unsigned char comp;
+    unsigned int degree;     // this will hold the result
+    //signed int x;            // these hold the XY vector at the start
+    //signed int y;            // (and they will be destroyed)
+    unsigned int ux;
+    unsigned int uy;
+
+    // Save the sign flags then remove signs and get XY as unsigned ints
+    negflag = 0;
+    if(x < 0) {
+        negflag += 0x01;    // x flag bit
+        x = (0 - x);        // is now +
+    }
+    ux = x;                // copy to unsigned var before multiply
+    if(y < 0) {
+        negflag += 0x02;    // y flag bit
+        y = (0 - y);        // is now +
+    }
+    uy = y;                // copy to unsigned var before multiply
+
+    // 1. Calc the scaled "degrees"
+    if(ux > uy) {
+        degree = (uy * 45) / ux;   // degree result will be 0-45 range
+        negflag += 0x10;    // octant flag bit
+    } else {
+        degree = (ux * 45) / uy;   // degree result will be 0-45 range
+    }
+
+    // 2. Compensate for the 4 degree error curve
+    comp = 0;
+    tempdegree = degree;    // use an unsigned char for speed!
+    if(tempdegree > 22) {    // if top half of range
+        if(tempdegree <= 44) comp++;
+        if(tempdegree <= 41) comp++;
+        if(tempdegree <= 37) comp++;
+        if(tempdegree <= 32) comp++;  // max is 4 degrees compensated
+    } else { // else is lower half of range
+        if(tempdegree >= 2) comp++;
+        if(tempdegree >= 6) comp++;
+        if(tempdegree >= 10) comp++;
+        if(tempdegree >= 15) comp++;  // max is 4 degrees compensated
+    }
+    degree += comp;   // degree is now accurate to +/- 1 degree!
+
+    // Invert degree if it was X>Y octant, makes 0-45 into 90-45
+    if(negflag & 0x10) degree = (90 - degree);
+
+    // 3. Degree is now 0-90 range for this quadrant,
+    // need to invert it for whichever quadrant it was in
+    if(negflag & 0x02) { // if -Y
+        if(negflag & 0x01)   // if -Y -X
+            degree = (180 + degree);
+        else        // else is -Y +X
+            degree = (180 - degree);
+    } else { // else is +Y
+        if(negflag & 0x01)   // if +Y -X
+            degree = (360 - degree);
+    }
+    return degree;
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+static void ver_line(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_coord_t len, lv_color_t color, lv_opa_t opa)
+{
+    lv_area_t area;
+    lv_area_set(&area, x, y, x, y + len);
+
+    fill_fp(&area, mask, color, opa);
+}
+
+static void hor_line(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_coord_t len, lv_color_t color, lv_opa_t opa)
+{
+    lv_area_t area;
+    lv_area_set(&area, x, y, x + len, y);
+
+    fill_fp(&area, mask, color, opa);
+}
+
+static bool deg_test_norm(uint16_t deg, uint16_t start, uint16_t end)
+{
+    if(deg >= start && deg <= end) return true;
+    else return false;
+}
+
+static bool deg_test_inv(uint16_t deg, uint16_t start, uint16_t end)
+{
+    if(deg >= start || deg <= end) {
+        return true;
+    } else return false;
+}

lv_draw/lv_draw_arc.h

@@ -0,0 +1,53 @@
+/**
+ * @file lv_draw_arc.h
+ *
+ */
+
+#ifndef LV_DRAW_ARC_H
+#define LV_DRAW_ARC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Draw an arc. (Can draw pie too with great thickness.)
+ * @param center_x the x coordinate of the center of the arc
+ * @param center_y the y coordinate of the center of the arc
+ * @param radius the radius of the arc
+ * @param mask the arc will be drawn only in this mask
+ * @param start_angle the start angle of the arc (0 deg on the bottom, 90 deg on the right)
+ * @param end_angle the end angle of the arc
+ * @param style style of the arc (`body.thickness`, `body.main_color`, `body.opa` is used)
+ * @param opa_scale scale down all opacities by the factor
+ */
+void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, const lv_area_t * mask,
+                 uint16_t start_angle, uint16_t end_angle, const lv_style_t * style, lv_opa_t opa_scale);
+
+/**********************
+ *      MACROS
+ **********************/
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_DRAW_ARC*/

lv_draw/lv_draw_img.c

@@ -0,0 +1,740 @@
+/**
+ * @file lv_draw_img.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw_img.h"
+#include "../lv_misc/lv_fs.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+static lv_res_t lv_img_draw_core(const lv_area_t * coords, const lv_area_t * mask,
+                                 const void * src, const lv_style_t * style, lv_opa_t opa_scale);
+
+static const uint8_t * lv_img_decoder_open(const void * src, const lv_style_t * style);
+static lv_res_t lv_img_decoder_read_line(lv_coord_t x, lv_coord_t y, lv_coord_t len, uint8_t * buf);
+static void lv_img_decoder_close(void);
+static lv_res_t lv_img_built_in_decoder_line_alpha(lv_coord_t x, lv_coord_t y, lv_coord_t len, uint8_t * buf);
+static lv_res_t lv_img_built_in_decoder_line_indexed(lv_coord_t x, lv_coord_t y, lv_coord_t len, uint8_t * buf);
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+static bool decoder_custom;
+static const void * decoder_src;
+static lv_img_src_t decoder_src_type;
+static lv_img_header_t decoder_header;
+static const lv_style_t * decoder_style;
+#if USE_LV_FILESYSTEM
+static lv_fs_file_t decoder_file;
+#endif
+#if LV_IMG_CF_INDEXED
+static lv_color_t decoder_index_map[256];
+#endif
+
+static lv_img_decoder_info_f_t lv_img_decoder_info_custom;
+static lv_img_decoder_open_f_t lv_img_decoder_open_custom;
+static lv_img_decoder_read_line_f_t lv_img_decoder_read_line_custom;
+static lv_img_decoder_close_f_t lv_img_decoder_close_custom;
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Draw an image
+ * @param coords the coordinates of the image
+ * @param mask the image will be drawn only in this area
+ * @param src pointer to a lv_color_t array which contains the pixels of the image
+ * @param style style of the image
+ * @param opa_scale scale down all opacities by the factor
+ */
+void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask,
+                 const void * src, const lv_style_t * style, lv_opa_t opa_scale)
+{
+    if(src == NULL) {
+        LV_LOG_WARN("Image draw: src is NULL");
+        lv_draw_rect(coords, mask, &lv_style_plain, LV_OPA_COVER);
+        lv_draw_label(coords, mask, &lv_style_plain, LV_OPA_COVER, "No\ndata", LV_TXT_FLAG_NONE, NULL);
+        return;
+    }
+
+    lv_res_t res;
+    res = lv_img_draw_core(coords, mask, src, style, opa_scale);
+
+    if(res ==  LV_RES_INV) {
+        LV_LOG_WARN("Image draw error");
+        lv_draw_rect(coords, mask, &lv_style_plain, LV_OPA_COVER);
+        lv_draw_label(coords, mask, &lv_style_plain, LV_OPA_COVER, "No\ndata", LV_TXT_FLAG_NONE, NULL);
+        return;
+    }
+}
+
+
+/**
+ *
+ * @param src
+ * @param header
+ * @param style
+ * @return
+ */
+lv_res_t lv_img_dsc_get_info(const char * src, lv_img_header_t * header)
+{
+    header->always_zero = 0;
+    /*Try to get info with the custom functions first*/
+    if(lv_img_decoder_info_custom) {
+        lv_res_t custom_res;
+        custom_res = lv_img_decoder_info_custom(src, header);
+        if(custom_res == LV_RES_OK) return LV_RES_OK;       /*Custom info has supported this source*/
+    }
+
+    lv_img_src_t src_type = lv_img_src_get_type(src);
+    if(src_type == LV_IMG_SRC_VARIABLE) {
+        header->w = ((lv_img_dsc_t *)src)->header.w;
+        header->h = ((lv_img_dsc_t *)src)->header.h;
+        header->cf = ((lv_img_dsc_t *)src)->header.cf;
+    }
+#if USE_LV_FILESYSTEM
+    else if(src_type == LV_IMG_SRC_FILE) {
+        lv_fs_file_t file;
+        lv_fs_res_t res;
+        uint32_t rn;
+        res = lv_fs_open(&file, src, LV_FS_MODE_RD);
+        if(res == LV_FS_RES_OK) {
+            res = lv_fs_read(&file, header, sizeof(lv_img_header_t), &rn);
+        }
+
+        /*Create a dummy header on fs error*/
+        if(res != LV_FS_RES_OK || rn != sizeof(lv_img_header_t)) {
+            header->w = LV_DPI;
+            header->h = LV_DPI;
+            header->cf = LV_IMG_CF_UNKOWN;
+        }
+
+        lv_fs_close(&file);
+    }
+#endif
+    else if(src_type == LV_IMG_SRC_SYMBOL) {
+        /*The size depend on the font but it is unknown here. It should be handled outside of the function*/
+        header->w = 1;
+        header->h = 1;
+        /* Symbols always have transparent parts. Important because of cover check in the design function.
+         * The actual value doesn't matter because lv_draw_label will draw it*/
+        header->cf  = LV_IMG_CF_ALPHA_1BIT;
+    } else {
+        LV_LOG_WARN("Image get info found unknown src type");
+        return false;
+    }
+    return true;
+
+}
+
+uint8_t lv_img_color_format_get_px_size(lv_img_cf_t cf)
+{
+    switch(cf) {
+        case LV_IMG_CF_UNKOWN:
+        case LV_IMG_CF_RAW:
+            return 0;
+        case LV_IMG_CF_TRUE_COLOR:
+        case LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED:
+            return LV_COLOR_SIZE;
+        case LV_IMG_CF_TRUE_COLOR_ALPHA:
+            return LV_IMG_PX_SIZE_ALPHA_BYTE;
+
+        case LV_IMG_CF_INDEXED_1BIT:
+        case LV_IMG_CF_ALPHA_1BIT:
+            return 1;
+
+        case LV_IMG_CF_INDEXED_2BIT:
+        case LV_IMG_CF_ALPHA_2BIT:
+            return 2;
+
+        case LV_IMG_CF_INDEXED_4BIT:
+        case LV_IMG_CF_ALPHA_4BIT:
+            return 4;
+
+        case LV_IMG_CF_INDEXED_8BIT:
+        case LV_IMG_CF_ALPHA_8BIT:
+            return 8;
+
+        default:
+            return 0;
+    }
+
+    return 0;
+}
+
+bool lv_img_color_format_is_chroma_keyed(lv_img_cf_t cf)
+{
+    switch(cf) {
+        case LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED:
+        case LV_IMG_CF_RAW_CHROMA_KEYED:
+        case LV_IMG_CF_INDEXED_1BIT:
+        case LV_IMG_CF_INDEXED_2BIT:
+        case LV_IMG_CF_INDEXED_4BIT:
+        case LV_IMG_CF_INDEXED_8BIT:
+            return true;
+        default:
+            return false;
+    }
+
+    return false;
+}
+
+
+bool lv_img_color_format_has_alpha(lv_img_cf_t cf)
+{
+    switch(cf) {
+        case LV_IMG_CF_TRUE_COLOR_ALPHA:
+        case LV_IMG_CF_RAW_ALPHA:
+        case LV_IMG_CF_ALPHA_1BIT:
+        case LV_IMG_CF_ALPHA_2BIT:
+        case LV_IMG_CF_ALPHA_4BIT:
+        case LV_IMG_CF_ALPHA_8BIT:
+            return true;
+        default:
+            return false;
+    }
+
+    return false;
+}
+
+/**
+ * Get the type of an image source
+ * @param src pointer to an image source:
+ *  - pointer to an 'lv_img_t' variable (image stored internally and compiled into the code)
+ *  - a path to a file (e.g. "S:/folder/image.bin")
+ *  - or a symbol (e.g. SYMBOL_CLOSE)
+ * @return type of the image source LV_IMG_SRC_VARIABLE/FILE/SYMBOL/UNKOWN
+ */
+lv_img_src_t lv_img_src_get_type(const void * src)
+{
+    if(src == NULL) return LV_IMG_SRC_UNKNOWN;
+    const uint8_t * u8_p = src;
+
+    /*The first byte shows the type of the image source*/
+    if(u8_p[0] >= 0x20 && u8_p[0] <= 0x7F) {
+        return LV_IMG_SRC_FILE;     /*If it's an ASCII character then it's file name*/
+    } else if(u8_p[0] >= 0x80) {
+        return LV_IMG_SRC_SYMBOL;   /*Symbols begins after 0x7F*/
+    } else {
+        return LV_IMG_SRC_VARIABLE; /*`lv_img_dsc_t` is design to the first byte < 0x20*/
+    }
+
+    LV_LOG_WARN("lv_img_src_get_type: unknown image type");
+    return LV_IMG_SRC_UNKNOWN;
+}
+
+/**
+ * Set custom decoder functions. See the typdefs of the function typed above for more info about them
+ * @param info_fp info get function
+ * @param open_fp open function
+ * @param read_fp read line function
+ * @param close_fp clode function
+ */
+void lv_img_decoder_set_custom(lv_img_decoder_info_f_t  info_fp, lv_img_decoder_open_f_t  open_fp,
+                               lv_img_decoder_read_line_f_t read_fp, lv_img_decoder_close_f_t close_fp)
+{
+    lv_img_decoder_info_custom = info_fp;
+    lv_img_decoder_open_custom = open_fp;
+    lv_img_decoder_read_line_custom = read_fp;
+    lv_img_decoder_close_custom = close_fp;
+}
+
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+
+static lv_res_t lv_img_draw_core(const lv_area_t * coords, const lv_area_t * mask,
+                                 const void * src, const lv_style_t * style, lv_opa_t opa_scale)
+{
+
+    lv_area_t mask_com;    /*Common area of mask and coords*/
+    bool union_ok;
+    union_ok = lv_area_intersect(&mask_com, mask, coords);
+    if(union_ok == false) {
+        return LV_RES_OK;         /*Out of mask. There is nothing to draw so the image is drawn successfully.*/
+    }
+
+    lv_opa_t opa = opa_scale == LV_OPA_COVER ? style->image.opa : (uint16_t)((uint16_t) style->image.opa * opa_scale) >> 8;
+
+    lv_img_header_t header;
+    lv_res_t header_res;
+    header_res = lv_img_dsc_get_info(src, &header);
+    if(header_res != LV_RES_OK) {
+        LV_LOG_WARN("Image draw can't get image info");
+        lv_img_decoder_close();
+        return LV_RES_INV;
+    }
+
+    bool chroma_keyed = lv_img_color_format_is_chroma_keyed(header.cf);
+    bool alpha_byte = lv_img_color_format_has_alpha(header.cf);
+
+    const uint8_t * img_data = lv_img_decoder_open(src, style);
+    if(img_data == LV_IMG_DECODER_OPEN_FAIL) {
+        LV_LOG_WARN("Image draw cannot open the image resource");
+        lv_img_decoder_close();
+        return LV_RES_INV;
+    }
+
+    /* The decoder open could open the image and gave the entire uncompressed image.
+     * Just draw it!*/
+    if(img_data) {
+        map_fp(coords, mask, img_data, opa, chroma_keyed, alpha_byte, style->image.color, style->image.intense);
+    }
+    /* The whole uncompressed image is not available. Try to read it line-by-line*/
+    else {
+        lv_coord_t width = lv_area_get_width(&mask_com);
+
+#if LV_COMPILER_VLA_SUPPORTED
+        uint8_t buf[(lv_area_get_width(&mask_com) * (LV_COLOR_SIZE + 1))];
+#else
+        uint8_t buf[LV_HOR_RES * ((LV_COLOR_DEPTH >> 3) + 1)];  /*+1 because of the possible alpha byte*/
+#endif
+        lv_area_t line;
+        lv_area_copy(&line, &mask_com);
+        lv_area_set_height(&line, 1);
+        lv_coord_t x = mask_com.x1 - coords->x1;
+        lv_coord_t y = mask_com.y1 - coords->y1;
+        lv_coord_t row;
+        lv_res_t read_res;
+        for(row = mask_com.y1; row <= mask_com.y2; row++) {
+            read_res = lv_img_decoder_read_line(x, y, width, buf);
+            if(read_res != LV_RES_OK) {
+                lv_img_decoder_close();
+                LV_LOG_WARN("Image draw can't read the line");
+                return LV_RES_INV;
+            }
+            map_fp(&line, mask, buf, opa, chroma_keyed, alpha_byte, style->image.color, style->image.intense);
+            line.y1++;
+            line.y2++;
+            y++;
+        }
+    }
+
+    lv_img_decoder_close();
+
+    return LV_RES_OK;
+}
+
+
+static const uint8_t * lv_img_decoder_open(const void * src, const lv_style_t * style)
+{
+    decoder_custom = false;
+
+    /*Try to open with the custom functions first*/
+    if(lv_img_decoder_open_custom) {
+        const uint8_t * custom_res;
+        custom_res = lv_img_decoder_open_custom(src, style);
+        if(custom_res != LV_IMG_DECODER_OPEN_FAIL) {
+            decoder_custom = true;  /*Mark that custom decoder function should be used for this img source.*/
+            return custom_res;      /*Custom open supported this source*/
+        }
+    }
+
+    decoder_src = src;
+    decoder_style = style;
+    decoder_src_type = lv_img_src_get_type(src);
+
+    lv_res_t header_res;
+    header_res = lv_img_dsc_get_info(src, &decoder_header);
+    if(header_res == LV_RES_INV) {
+        decoder_src = NULL;
+        decoder_src_type = LV_IMG_SRC_UNKNOWN;
+        LV_LOG_WARN("Built-in image decoder can't get the header info");
+        return LV_IMG_DECODER_OPEN_FAIL;
+    }
+
+    /*Open the file if it's a file*/
+    if(decoder_src_type == LV_IMG_SRC_FILE) {
+#if USE_LV_FILESYSTEM
+        lv_fs_res_t res = lv_fs_open(&decoder_file, src, LV_FS_MODE_RD);
+        if(res != LV_FS_RES_OK) {
+            LV_LOG_WARN("Built-in image decoder can't open the file");
+            return LV_IMG_DECODER_OPEN_FAIL;
+        }
+#else
+        LV_LOG_WARN("Image built-in decoder can read file because USE_LV_FILESYSTEM = 0");
+        return LV_IMG_DECODER_OPEN_FAIL;
+#endif
+    }
+
+
+    /*Process the different color formats*/
+    lv_img_cf_t cf = decoder_header.cf;
+    if(cf == LV_IMG_CF_TRUE_COLOR ||
+            cf == LV_IMG_CF_TRUE_COLOR_ALPHA ||
+            cf == LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED) {
+        if(decoder_src_type == LV_IMG_SRC_VARIABLE) {
+            /*In case of uncompressed formats if the image stored in the ROM/RAM simply give it's pointer*/
+            return ((lv_img_dsc_t *)decoder_src)->data;
+        } else {
+            /*If it's file it need to be read line by line later*/
+            return NULL;
+        }
+    } else if(cf == LV_IMG_CF_INDEXED_1BIT ||
+              cf == LV_IMG_CF_INDEXED_2BIT ||
+              cf == LV_IMG_CF_INDEXED_4BIT ||
+              cf == LV_IMG_CF_INDEXED_8BIT) {
+
+#if LV_IMG_CF_INDEXED
+#if USE_LV_FILESYSTEM
+        lv_color32_t palette_file[256];
+#endif
+
+        lv_color32_t * palette_p = NULL;
+        uint8_t px_size = lv_img_color_format_get_px_size(cf);
+        uint32_t palette_size = 1 << px_size;
+
+        if(decoder_src_type == LV_IMG_SRC_FILE) {
+            /*Read the palette from file*/
+#if USE_LV_FILESYSTEM
+            lv_fs_seek(&decoder_file, 4);   /*Skip the header*/
+            lv_fs_read(&decoder_file, palette_file, palette_size * sizeof(lv_color32_t), NULL);
+            palette_p = palette_file;
+#else
+            LV_LOG_WARN("Image built-in decoder can read the palette because USE_LV_FILESYSTEM = 0");
+            return LV_IMG_DECODER_OPEN_FAIL;
+#endif
+        } else {
+            /*The palette begins in the beginning of the image data. Just point to it.*/
+            palette_p = (lv_color32_t *)((lv_img_dsc_t *)decoder_src)->data;
+        }
+
+        uint32_t i;
+        for(i = 0; i < palette_size; i++) {
+            decoder_index_map[i] = LV_COLOR_MAKE(palette_p[i].red, palette_p[i].green, palette_p[i].blue);
+        }
+        return NULL;
+#else
+        LV_LOG_WARN("Indexed (palette) images are not enabled in lv_conf.h. See LV_IMG_CF_INDEXED");
+        return LV_IMG_DECODER_OPEN_FAIL;
+#endif
+    } else if(cf == LV_IMG_CF_ALPHA_1BIT ||
+              cf == LV_IMG_CF_ALPHA_2BIT ||
+              cf == LV_IMG_CF_ALPHA_4BIT ||
+              cf == LV_IMG_CF_ALPHA_8BIT) {
+#if LV_IMG_CF_ALPHA
+        return NULL;   /*Nothing to process*/
+#else
+        LV_LOG_WARN("Alpha indexed images are not enabled in lv_conf.h. See LV_IMG_CF_ALPHA");
+        return LV_IMG_DECODER_OPEN_FAIL;
+#endif
+    } else {
+        LV_LOG_WARN("Image decoder open: unknown color format")
+        return LV_IMG_DECODER_OPEN_FAIL;
+    }
+}
+
+
+static lv_res_t lv_img_decoder_read_line(lv_coord_t x, lv_coord_t y, lv_coord_t len, uint8_t * buf)
+{
+    /*Try to read the line with the custom functions*/
+    if(decoder_custom) {
+        if(lv_img_decoder_read_line_custom) {
+            lv_res_t custom_res;
+            custom_res = lv_img_decoder_read_line_custom(x, y, len, buf);
+            return custom_res;
+        } else {
+            LV_LOG_WARN("Image open with custom decoder but read not supported")
+        }
+        return LV_RES_INV;  /*It"s an error if not returned earlier*/
+    }
+
+    if(decoder_src_type == LV_IMG_SRC_FILE) {
+#if USE_LV_FILESYSTEM
+        uint8_t px_size = lv_img_color_format_get_px_size(decoder_header.cf);
+
+        lv_fs_res_t res;
+
+        if(decoder_header.cf == LV_IMG_CF_TRUE_COLOR ||
+                decoder_header.cf == LV_IMG_CF_TRUE_COLOR_ALPHA ||
+                decoder_header.cf == LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED) {
+            uint32_t pos = ((y * decoder_header.w + x) * px_size) >> 3;
+            res = lv_fs_seek(&decoder_file, pos);
+            if(res != LV_FS_RES_OK) {
+                LV_LOG_WARN("Built-in image decoder seek failed");
+                return false;
+            }
+            uint32_t btr = len * (px_size >> 3);
+            uint32_t br = 0;
+            lv_fs_read(&decoder_file, buf, btr, &br);
+            if(res != LV_FS_RES_OK || btr != br) {
+                LV_LOG_WARN("Built-in image decoder read failed");
+                return false;
+            }
+        } else if(decoder_header.cf == LV_IMG_CF_ALPHA_1BIT ||
+                  decoder_header.cf == LV_IMG_CF_ALPHA_2BIT ||
+                  decoder_header.cf == LV_IMG_CF_ALPHA_4BIT ||
+                  decoder_header.cf == LV_IMG_CF_ALPHA_8BIT) {
+
+            lv_img_built_in_decoder_line_alpha(x, y, len, buf);
+        } else if(decoder_header.cf == LV_IMG_CF_INDEXED_1BIT ||
+                  decoder_header.cf == LV_IMG_CF_INDEXED_2BIT ||
+                  decoder_header.cf == LV_IMG_CF_INDEXED_4BIT ||
+                  decoder_header.cf == LV_IMG_CF_INDEXED_8BIT) {
+            lv_img_built_in_decoder_line_indexed(x, y, len, buf);
+        } else {
+            LV_LOG_WARN("Built-in image decoder read not supports the color format");
+            return false;
+        }
+#else
+        LV_LOG_WARN("Image built-in decoder can't read file because USE_LV_FILESYSTEM = 0");
+        return false;
+#endif
+    } else if(decoder_src_type == LV_IMG_SRC_VARIABLE) {
+        const lv_img_dsc_t * img_dsc = decoder_src;
+
+        if(img_dsc->header.cf == LV_IMG_CF_ALPHA_1BIT ||
+                img_dsc->header.cf == LV_IMG_CF_ALPHA_2BIT ||
+                img_dsc->header.cf == LV_IMG_CF_ALPHA_4BIT ||
+                img_dsc->header.cf == LV_IMG_CF_ALPHA_8BIT) {
+            lv_img_built_in_decoder_line_alpha(x, y, len, buf);
+        } else if(img_dsc->header.cf == LV_IMG_CF_INDEXED_1BIT ||
+                  img_dsc->header.cf == LV_IMG_CF_INDEXED_2BIT ||
+                  img_dsc->header.cf == LV_IMG_CF_INDEXED_4BIT ||
+                  img_dsc->header.cf == LV_IMG_CF_INDEXED_8BIT) {
+            lv_img_built_in_decoder_line_indexed(x, y, len, buf);
+        } else {
+            LV_LOG_WARN("Built-in image decoder not supports the color format");
+            return false;
+        }
+    }
+
+    return true;
+}
+
+static void lv_img_decoder_close(void)
+{
+    /*Try to close with the custom functions*/
+    if(decoder_custom) {
+        if(lv_img_decoder_close_custom) lv_img_decoder_close_custom();
+        return;
+    }
+
+    /*It was opened with built-in decoder*/
+    if(decoder_src) {
+#if USE_LV_FILESYSTEM
+        if(decoder_src_type == LV_IMG_SRC_FILE) {
+            lv_fs_close(&decoder_file);
+        }
+#endif
+        decoder_src_type = LV_IMG_SRC_UNKNOWN;
+        decoder_src = NULL;
+    }
+}
+
+static lv_res_t lv_img_built_in_decoder_line_alpha(lv_coord_t x, lv_coord_t y, lv_coord_t len, uint8_t * buf)
+{
+
+#if LV_IMG_CF_ALPHA
+    const lv_opa_t alpha1_opa_table[2] =  {0, 255};                   /*Opacity mapping with bpp = 1 (Just for compatibility)*/
+    const lv_opa_t alpha2_opa_table[4] =  {0, 85, 170, 255};          /*Opacity mapping with bpp = 2*/
+    const lv_opa_t alpha4_opa_table[16] = {0,   17,  34,  51,         /*Opacity mapping with bpp = 4*/
+                                           68,  85,  102, 119,
+                                           136, 153, 170, 187,
+                                           204, 221, 238, 255
+                                          };
+
+    /*Simply fill the buffer with the color. Later only the alpha value will be modified.*/
+    lv_color_t bg_color = decoder_style->image.color;
+    lv_coord_t i;
+    for(i = 0; i < len; i++) {
+#if LV_COLOR_DEPTH == 8 || LV_COLOR_DEPTH == 1
+        buf[i * LV_IMG_PX_SIZE_ALPHA_BYTE] = bg_color.full;
+#elif LV_COLOR_DEPTH == 16
+        /*Because of Alpha byte 16 bit color can start on odd address which can cause crash*/
+        buf[i * LV_IMG_PX_SIZE_ALPHA_BYTE] = bg_color.full & 0xFF;
+        buf[i * LV_IMG_PX_SIZE_ALPHA_BYTE + 1] = (bg_color.full >> 8) & 0xFF;
+#elif LV_COLOR_DEPTH == 32
+        *((uint32_t *)&buf[i * LV_IMG_PX_SIZE_ALPHA_BYTE]) = bg_color.full;
+#else
+#error "Invalid LV_COLOR_DEPTH. Check it in lv_conf.h"
+#endif
+    }
+
+    const lv_opa_t * opa_table = NULL;
+    uint8_t px_size = lv_img_color_format_get_px_size(decoder_header.cf);
+    uint16_t mask = (1 << px_size) - 1; /*E.g. px_size = 2; mask = 0x03*/
+
+    lv_coord_t w = 0;
+    uint32_t ofs = 0;
+    int8_t pos = 0;
+    switch(decoder_header.cf) {
+        case LV_IMG_CF_ALPHA_1BIT:
+            w = (decoder_header.w >> 3);        /*E.g. w = 20 -> w = 2 + 1*/
+            if(decoder_header.w & 0x7) w++;
+            ofs += w * y + (x >> 3);      /*First pixel*/
+            pos = 7 - (x & 0x7);
+            opa_table = alpha1_opa_table;
+            break;
+        case LV_IMG_CF_ALPHA_2BIT:
+            w = (decoder_header.w >> 2);       /*E.g. w = 13 -> w = 3 + 1 (bytes)*/
+            if(decoder_header.w & 0x3) w++;
+            ofs += w * y + (x >> 2);      /*First pixel*/
+            pos = 6 - ((x & 0x3) * 2);
+            opa_table = alpha2_opa_table;
+            break;
+        case LV_IMG_CF_ALPHA_4BIT:
+            w = (decoder_header.w >> 1);       /*E.g. w = 13 -> w = 6 + 1 (bytes)*/
+            if(decoder_header.w & 0x1) w++;
+            ofs += w * y + (x >> 1);      /*First pixel*/
+            pos = 4 - ((x & 0x1) * 4);
+            opa_table = alpha4_opa_table;
+            break;
+        case LV_IMG_CF_ALPHA_8BIT:
+            w = decoder_header.w;              /*E.g. x = 7 -> w = 7 (bytes)*/
+            ofs += w * y + x;      /*First pixel*/
+            pos = 0;
+            break;
+    }
+
+#if USE_LV_FILESYSTEM
+# if LV_COMPILER_VLA_SUPPORTED
+    uint8_t fs_buf[w];
+# else
+    uint8_t fs_buf[LV_HOR_RES];
+# endif
+#endif
+    const uint8_t * data_tmp = NULL;
+    if(decoder_src_type == LV_IMG_SRC_VARIABLE) {
+        const lv_img_dsc_t * img_dsc = decoder_src;
+        data_tmp = img_dsc->data + ofs;
+    } else {
+#if USE_LV_FILESYSTEM
+        lv_fs_seek(&decoder_file, ofs + 4);     /*+4 to skip the header*/
+        lv_fs_read(&decoder_file, fs_buf, w, NULL);
+        data_tmp = fs_buf;
+#else
+        LV_LOG_WARN("Image built-in alpha line reader can't read file because USE_LV_FILESYSTEM = 0");
+        data_tmp = NULL;        /*To avoid warnings*/
+        return LV_RES_INV;
+#endif
+    }
+
+
+    uint8_t byte_act = 0;
+    uint8_t val_act;
+    for(i = 0; i < len; i ++) {
+        val_act = (data_tmp[byte_act] & (mask << pos)) >> pos;
+
+        buf[i * LV_IMG_PX_SIZE_ALPHA_BYTE + LV_IMG_PX_SIZE_ALPHA_BYTE - 1] =
+            decoder_header.cf == LV_IMG_CF_ALPHA_8BIT ? val_act : opa_table[val_act];
+
+        pos -= px_size;
+        if(pos < 0) {
+            pos = 8 - px_size;
+            data_tmp++;
+        }
+    }
+
+    return LV_RES_OK;
+
+#else
+    LV_LOG_WARN("Image built-in alpha line reader failed because LV_IMG_CF_ALPHA is 0 in lv_conf.h");
+    return LV_RES_INV;
+#endif
+}
+
+static lv_res_t lv_img_built_in_decoder_line_indexed(lv_coord_t x, lv_coord_t y, lv_coord_t len, uint8_t * buf)
+{
+
+#if LV_IMG_CF_INDEXED
+    uint8_t px_size = lv_img_color_format_get_px_size(decoder_header.cf);
+    uint16_t mask = (1 << px_size) - 1; /*E.g. px_size = 2; mask = 0x03*/
+
+    lv_coord_t w = 0;
+    int8_t pos = 0;
+    uint32_t ofs = 0;
+    switch(decoder_header.cf) {
+        case LV_IMG_CF_INDEXED_1BIT:
+            w = (decoder_header.w >> 3);       /*E.g. w = 20 -> w = 2 + 1*/
+            if(decoder_header.w & 0x7) w++;
+            ofs += w * y + (x >> 3);      /*First pixel*/
+            ofs += 8;                    /*Skip the palette*/
+            pos = 7 - (x & 0x7);
+            break;
+        case LV_IMG_CF_INDEXED_2BIT:
+            w = (decoder_header.w >> 2);       /*E.g. w = 13 -> w = 3 + 1 (bytes)*/
+            if(decoder_header.w & 0x3) w++;
+            ofs += w * y + (x >> 2);      /*First pixel*/
+            ofs += 16;                    /*Skip the palette*/
+            pos = 6 - ((x & 0x3) * 2);
+            break;
+        case LV_IMG_CF_INDEXED_4BIT:
+            w = (decoder_header.w >> 1);       /*E.g. w = 13 -> w = 6 + 1 (bytes)*/
+            if(decoder_header.w & 0x1) w++;
+            ofs += w * y + (x >> 1);      /*First pixel*/
+            ofs += 64;                    /*Skip the palette*/
+            pos = 4 - ((x & 0x1) * 4);
+            break;
+        case LV_IMG_CF_INDEXED_8BIT:
+            w = decoder_header.w;              /*E.g. x = 7 -> w = 7 (bytes)*/
+            ofs += w * y + x;              /*First pixel*/
+            ofs += 1024;                    /*Skip the palette*/
+            pos = 0;
+            break;
+    }
+
+#if USE_LV_FILESYSTEM
+# if LV_COMPILER_VLA_SUPPORTED
+    uint8_t fs_buf[w];
+# else
+    uint8_t fs_buf[LV_HOR_RES];
+# endif
+#endif
+    const uint8_t * data_tmp = NULL;
+    if(decoder_src_type == LV_IMG_SRC_VARIABLE) {
+        const lv_img_dsc_t * img_dsc = decoder_src;
+        data_tmp = img_dsc->data + ofs;
+    } else {
+#if USE_LV_FILESYSTEM
+        lv_fs_seek(&decoder_file, ofs + 4);     /*+4 to skip the header*/
+        lv_fs_read(&decoder_file, fs_buf, w, NULL);
+        data_tmp = fs_buf;
+#else
+        LV_LOG_WARN("Image built-in indexed line reader can't read file because USE_LV_FILESYSTEM = 0");
+        data_tmp = NULL;        /*To avoid warnings*/
+        return LV_RES_INV;
+#endif
+    }
+
+    uint8_t byte_act = 0;
+    uint8_t val_act;
+    lv_coord_t i;
+    lv_color_t * cbuf = (lv_color_t *) buf;
+    for(i = 0; i < len; i ++) {
+        val_act = (data_tmp[byte_act] & (mask << pos)) >> pos;
+        cbuf[i] = decoder_index_map[val_act];
+
+        pos -= px_size;
+        if(pos < 0) {
+            pos = 8 - px_size;
+            data_tmp++;
+        }
+    }
+
+    return LV_RES_OK;
+#else
+    LV_LOG_WARN("Image built-in indexed line reader failed because LV_IMG_CF_INDEXED is 0 in lv_conf.h");
+    return LV_RES_INV;
+#endif
+}

lv_draw/lv_draw_img.h

@@ -0,0 +1,167 @@
+/**
+ * @file lv_draw_img.h
+ *
+ */
+
+#ifndef LV_DRAW_IMG_H
+#define LV_DRAW_IMG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw.h"
+#include "../lv_core/lv_obj.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+#define LV_IMG_DECODER_OPEN_FAIL    ((void*)(-1))
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+struct _lv_img_t;
+
+typedef struct {
+
+    /* The first 8 bit is very important to distinguish the different source types.
+     * For more info see `lv_img_get_src_type()` in lv_img.c */
+    uint32_t cf           :5;    /* Color format: See `lv_img_color_format_t`*/
+    uint32_t always_zero  :3;    /*It the upper bits of the first byte. Always zero to look like a non-printable character*/
+
+    uint32_t reserved     :2;   /*Reserved to be used later*/
+
+    uint32_t w:11;              /*Width of the image map*/
+    uint32_t h:11;              /*Height of the image map*/
+} lv_img_header_t;
+
+/*Image color format*/
+enum {
+    LV_IMG_CF_UNKOWN = 0,
+
+    LV_IMG_CF_RAW,                  /*Contains the file as it is. Needs custom decoder function*/
+    LV_IMG_CF_RAW_ALPHA,            /*Contains the file as it is. The image has alpha. Needs custom decoder function*/
+    LV_IMG_CF_RAW_CHROMA_KEYED,     /*Contains the file as it is. The image is chroma keyed. Needs custom decoder function*/
+
+    LV_IMG_CF_TRUE_COLOR,           /*Color format and depth should match with LV_COLOR settings*/
+    LV_IMG_CF_TRUE_COLOR_ALPHA,     /*Same as `LV_IMG_CF_TRUE_COLOR` but every pixel has an alpha byte*/
+    LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED,  /*Same as `LV_IMG_CF_TRUE_COLOR` but LV_COLOR_TRANSP pixels will be transparent*/
+
+    LV_IMG_CF_INDEXED_1BIT,         /*Can have 2 different colors in a palette (always chroma keyed)*/
+    LV_IMG_CF_INDEXED_2BIT,         /*Can have 4 different colors in a palette (always chroma keyed)*/
+    LV_IMG_CF_INDEXED_4BIT,         /*Can have 16 different colors in a palette (always chroma keyed)*/
+    LV_IMG_CF_INDEXED_8BIT,         /*Can have 256 different colors in a palette (always chroma keyed)*/
+
+    LV_IMG_CF_ALPHA_1BIT,           /*Can have one color and it can be drawn or not*/
+    LV_IMG_CF_ALPHA_2BIT,           /*Can have one color but 4 different alpha value*/
+    LV_IMG_CF_ALPHA_4BIT,           /*Can have one color but 16 different alpha value*/
+    LV_IMG_CF_ALPHA_8BIT,           /*Can have one color but 256 different alpha value*/
+};
+typedef uint8_t lv_img_cf_t;
+
+/* Image header it is compatible with
+ * the result image converter utility*/
+typedef struct
+{
+    lv_img_header_t header;
+    uint32_t data_size;
+    const uint8_t * data;
+} lv_img_dsc_t;
+
+/* Decoder function definitions */
+
+
+/**
+ * Get info from an image and store in the `header`
+ * @param src the image source. Can be a pointer to a C array or a file name (Use `lv_img_src_get_type` to determine the type)
+ * @param header store the info here
+ * @return LV_RES_OK: info written correctly; LV_RES_INV: failed
+ */
+typedef lv_res_t (*lv_img_decoder_info_f_t)(const void * src, lv_img_header_t * header);
+
+/**
+ * Open an image for decoding. Prepare it as it is required to read it later
+ * @param src the image source. Can be a pointer to a C array or a file name (Use `lv_img_src_get_type` to determine the type)
+ * @param style the style of image (maybe it will be required to determine a color or something)
+ * @return there are 3 possible return values:
+ *    1) buffer with the decoded image
+ *    2) if can decode the whole image NULL. decoder_read_line will be called to read the image line-by-line
+ *    3) LV_IMG_DECODER_OPEN_FAIL if the image format is unknown to the decoder or an error occurred
+ */
+typedef const uint8_t * (*lv_img_decoder_open_f_t)(const void * src, const lv_style_t * style);
+
+/**
+ * Decode `len` pixels starting from the given `x`, `y` coordinates and store them in `buf`.
+ * Required only if the "open" function can't return with the whole decoded pixel array.
+ * @param x start x coordinate
+ * @param y startt y coordinate
+ * @param len number of pixels to decode
+ * @param buf a buffer to store the decoded pixels
+ * @return LV_RES_OK: ok; LV_RES_INV: failed
+ */
+typedef lv_res_t (*lv_img_decoder_read_line_f_t)(lv_coord_t x, lv_coord_t y, lv_coord_t len, uint8_t * buf);
+
+/**
+ * Close the pending decoding. Free resources etc.
+ */
+typedef void (*lv_img_decoder_close_f_t)(void);
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Draw an image
+ * @param coords the coordinates of the image
+ * @param mask the image will be drawn only in this area
+ * @param src pointer to a lv_color_t array which contains the pixels of the image
+ * @param style style of the image
+ * @param opa_scale scale down all opacities by the factor
+ */
+void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask,
+                 const void * src, const lv_style_t * style, lv_opa_t opa_scale);
+
+
+/**
+ * Get the type of an image source
+ * @param src pointer to an image source:
+ *  - pointer to an 'lv_img_t' variable (image stored internally and compiled into the code)
+ *  - a path to a file (e.g. "S:/folder/image.bin")
+ *  - or a symbol (e.g. SYMBOL_CLOSE)
+ * @return type of the image source LV_IMG_SRC_VARIABLE/FILE/SYMBOL/UNKOWN
+ */
+lv_img_src_t lv_img_src_get_type(const void * src);
+
+/**
+ * Set custom decoder functions. See the typdefs of the function typed above for more info about them
+ * @param info_fp info get function
+ * @param open_fp open function
+ * @param read_fp read line function
+ * @param close_fp clode function
+ */
+void lv_img_decoder_set_custom(lv_img_decoder_info_f_t  info_fp, lv_img_decoder_open_f_t  open_fp,
+                               lv_img_decoder_read_line_f_t read_fp, lv_img_decoder_close_f_t close_fp);
+
+lv_res_t lv_img_dsc_get_info(const char * src, lv_img_header_t * header);
+
+uint8_t lv_img_color_format_get_px_size(lv_img_cf_t cf);
+
+bool lv_img_color_format_is_chroma_keyed(lv_img_cf_t cf);
+
+bool lv_img_color_format_has_alpha(lv_img_cf_t cf);
+
+
+/**********************
+ *      MACROS
+ **********************/
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_TEMPL_H*/

lv_draw/lv_draw_label.c

@@ -0,0 +1,236 @@
+/**
+ * @file lv_draw_label.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw_label.h"
+#include "lv_draw_rbasic.h"
+#include "../lv_misc/lv_math.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+#define LABEL_RECOLOR_PAR_LENGTH    6
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+enum {
+    CMD_STATE_WAIT,
+    CMD_STATE_PAR,
+    CMD_STATE_IN,
+};
+typedef uint8_t cmd_state_t;
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+static uint8_t hex_char_to_num(char hex);
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Write a text
+ * @param coords coordinates of the label
+ * @param mask the label will be drawn only in this area
+ * @param style pointer to a style
+ * @param opa_scale scale down all opacities by the factor
+ * @param txt 0 terminated text to write
+ * @param flag settings for the text from 'txt_flag_t' enum
+ * @param offset text offset in x and y direction (NULL if unused)
+ *
+ */
+void lv_draw_label(const lv_area_t * coords, const lv_area_t * mask, const lv_style_t * style, lv_opa_t opa_scale,
+                   const char * txt, lv_txt_flag_t flag, lv_point_t * offset)
+{
+    const lv_font_t * font = style->text.font;
+    lv_coord_t w;
+    if((flag & LV_TXT_FLAG_EXPAND) == 0) {
+        /*Normally use the label's width as width*/
+        w = lv_area_get_width(coords);
+    } else {
+        /*If EXAPND is enabled then not limit the text's width to the object's width*/
+        lv_point_t p;
+        lv_txt_get_size(&p, txt, style->text.font, style->text.letter_space, style->text.line_space, LV_COORD_MAX, flag);
+        w = p.x;
+    }
+
+    /*Init variables for the first line*/
+    lv_coord_t line_width = 0;
+    uint32_t line_start = 0;
+    uint32_t line_end = lv_txt_get_next_line(txt, font, style->text.letter_space, w, flag);
+
+    lv_point_t pos;
+    pos.x = coords->x1;
+    pos.y = coords->y1;
+
+    /*Align to middle*/
+    if(flag & LV_TXT_FLAG_CENTER) {
+        line_width = lv_txt_get_width(&txt[line_start], line_end - line_start,
+                                      font, style->text.letter_space, flag);
+
+        pos.x += (lv_area_get_width(coords) - line_width) / 2;
+
+    }
+    /*Align to the right*/
+    else if(flag & LV_TXT_FLAG_RIGHT) {
+        line_width = lv_txt_get_width(&txt[line_start], line_end - line_start,
+                                      font, style->text.letter_space, flag);
+        pos.x += lv_area_get_width(coords) - line_width;
+    }
+
+
+    lv_opa_t opa = opa_scale == LV_OPA_COVER ? style->text.opa : (uint16_t)((uint16_t) style->text.opa * opa_scale) >> 8;
+
+    cmd_state_t cmd_state = CMD_STATE_WAIT;
+    uint32_t i;
+    uint16_t par_start = 0;
+    lv_color_t recolor;
+    lv_coord_t letter_w;
+
+    lv_coord_t x_ofs = 0;
+    lv_coord_t y_ofs = 0;
+    if(offset != NULL) {
+        x_ofs = offset->x;
+        y_ofs = offset->y;
+        pos.y += y_ofs;
+    }
+
+    /*Real draw need a background color for higher bpp letter*/
+#if LV_VDB_SIZE == 0
+    lv_rletter_set_background(style->body.main_color);
+#endif
+
+    /*Write out all lines*/
+    while(txt[line_start] != '\0') {
+        if(offset != NULL) {
+            pos.x += x_ofs;
+        }
+        /*Write all letter of a line*/
+        cmd_state = CMD_STATE_WAIT;
+        i = line_start;
+        uint32_t letter;
+        while(i < line_end) {
+            letter = lv_txt_encoded_next(txt, &i);
+            /*Handle the re-color command*/
+            if((flag & LV_TXT_FLAG_RECOLOR) != 0) {
+                if(letter == (uint32_t)LV_TXT_COLOR_CMD[0]) {
+                    if(cmd_state == CMD_STATE_WAIT) { /*Start char*/
+                        par_start = i;
+                        cmd_state = CMD_STATE_PAR;
+                        continue;
+                    } else if(cmd_state == CMD_STATE_PAR) { /*Other start char in parameter escaped cmd. char */
+                        cmd_state = CMD_STATE_WAIT;
+                    } else if(cmd_state == CMD_STATE_IN) { /*Command end */
+                        cmd_state = CMD_STATE_WAIT;
+                        continue;
+                    }
+                }
+
+                /*Skip the color parameter and wait the space after it*/
+                if(cmd_state == CMD_STATE_PAR) {
+                    if(letter == ' ') {
+                        /*Get the parameter*/
+                        if(i - par_start == LABEL_RECOLOR_PAR_LENGTH + 1) {
+                            char buf[LABEL_RECOLOR_PAR_LENGTH + 1];
+                            memcpy(buf, &txt[par_start], LABEL_RECOLOR_PAR_LENGTH);
+                            buf[LABEL_RECOLOR_PAR_LENGTH] = '\0';
+                            int r, g, b;
+                            r = (hex_char_to_num(buf[0]) << 4) + hex_char_to_num(buf[1]);
+                            g = (hex_char_to_num(buf[2]) << 4) + hex_char_to_num(buf[3]);
+                            b = (hex_char_to_num(buf[4]) << 4) + hex_char_to_num(buf[5]);
+                            recolor = LV_COLOR_MAKE(r, g, b);
+                        } else {
+                            recolor.full = style->text.color.full;
+                        }
+                        cmd_state = CMD_STATE_IN; /*After the parameter the text is in the command*/
+                    }
+                    continue;
+                }
+            }
+
+            lv_color_t color = style->text.color;
+
+            if(cmd_state == CMD_STATE_IN) color = recolor;
+
+            letter_fp(&pos, mask, font, letter, color, opa);
+            letter_w = lv_font_get_width(font, letter);
+
+            pos.x += letter_w + style->text.letter_space;
+        }
+        /*Go to next line*/
+        line_start = line_end;
+        line_end += lv_txt_get_next_line(&txt[line_start], font, style->text.letter_space, w, flag);
+
+        pos.x = coords->x1;
+        /*Align to middle*/
+        if(flag & LV_TXT_FLAG_CENTER) {
+            line_width = lv_txt_get_width(&txt[line_start], line_end - line_start,
+                                          font, style->text.letter_space, flag);
+
+            pos.x += (lv_area_get_width(coords) - line_width) / 2;
+
+        }
+        /*Align to the right*/
+        else if(flag & LV_TXT_FLAG_RIGHT) {
+            line_width = lv_txt_get_width(&txt[line_start], line_end - line_start,
+                                          font, style->text.letter_space, flag);
+            pos.x += lv_area_get_width(coords) - line_width;
+        }
+
+        /*Go the next line position*/
+        pos.y += lv_font_get_height(font);
+        pos.y += style->text.line_space;
+    }
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+/**
+ * Convert a hexadecimal characters to a number (0..15)
+ * @param hex Pointer to a hexadecimal character (0..9, A..F)
+ * @return the numerical value of `hex` or 0 on error
+ */
+static uint8_t hex_char_to_num(char hex)
+{
+    if(hex >= '0' && hex <= '9') {
+        return hex - '0';
+    }
+
+    if(hex >= 'a') hex -= 'a' - 'A';    /*Convert to upper case*/
+
+    switch(hex) {
+        case 'A':
+            return 10;
+        case 'B':
+            return 11;
+        case 'C':
+            return 12;
+        case 'D':
+            return 13;
+        case 'E':
+            return 14;
+        case 'F':
+            return 15;
+        default:
+            return 0;
+    }
+
+    return 0;
+}

lv_draw/lv_draw_label.h

@@ -0,0 +1,53 @@
+/**
+ * @file lv_draw_label.h
+ *
+ */
+
+#ifndef LV_DRAW_LABEL_H
+#define LV_DRAW_LABEL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Write a text
+ * @param coords coordinates of the label
+ * @param mask the label will be drawn only in this area
+ * @param style pointer to a style
+ * @param opa_scale scale down all opacities by the factor
+ * @param txt 0 terminated text to write
+ * @param flag settings for the text from 'txt_flag_t' enum
+ * @param offset text offset in x and y direction (NULL if unused)
+ *
+ */
+void lv_draw_label(const lv_area_t * coords,const lv_area_t * mask, const lv_style_t * style, lv_opa_t opa_scale,
+                   const char * txt, lv_txt_flag_t flag, lv_point_t * offset);
+
+/**********************
+ *      MACROS
+ **********************/
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_DRAW_LABEL_H*/

lv_draw/lv_draw_line.c

@@ -0,0 +1,562 @@
+/**
+ * @file lv_draw_line.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include <stdio.h>
+#include <stdbool.h>
+#include "lv_draw.h"
+#include "../lv_misc/lv_math.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+#if LV_COMPILER_VLA_SUPPORTED == 0
+#define LINE_MAX_WIDTH        64
+#endif
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+typedef struct {
+    lv_point_t p1;
+    lv_point_t p2;
+    lv_point_t p_act;
+    lv_coord_t dx;
+    lv_coord_t sx;      /*-1: x1 < x2; 1: x2 >= x1*/
+    lv_coord_t dy;
+    lv_coord_t sy;      /*-1: y1 < y2; 1: y2 >= y1*/
+    lv_coord_t err;
+    lv_coord_t e2;
+    bool hor;   /*Rather horizontal or vertical*/
+} line_draw_t;
+
+typedef struct {
+    lv_coord_t width;
+    lv_coord_t width_1;
+    lv_coord_t width_half;
+} line_width_t;
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+static void line_draw_hor(line_draw_t * main_line, const lv_area_t * mask, const lv_style_t * style, lv_opa_t opa_scale);
+static void line_draw_ver(line_draw_t * main_line, const lv_area_t * mask, const lv_style_t * style, lv_opa_t opa_scale);
+static void line_draw_skew(line_draw_t * main_line, const lv_area_t * mask, const lv_style_t * style, lv_opa_t opa_scale);
+static void line_init(line_draw_t * line, const lv_point_t * p1, const lv_point_t * p2);
+static bool line_next(line_draw_t * line);
+static bool line_next_y(line_draw_t * line);
+static bool line_next_x(line_draw_t * line);
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Draw a line
+ * @param point1 first point of the line
+ * @param point2 second point of the line
+ * @param mask the line will be drawn only on this area
+ * @param style pointer to a line's style
+ * @param opa_scale scale down all opacities by the factor
+ */
+void lv_draw_line(const lv_point_t * point1, const lv_point_t * point2, const lv_area_t * mask,
+                  const lv_style_t * style, lv_opa_t opa_scale)
+{
+
+    if(style->line.width == 0) return;
+    if(point1->x == point2->x && point1->y == point2->y) return;
+
+    line_draw_t main_line;
+    lv_point_t p1;
+    lv_point_t p2;
+
+    /*If the line if rather vertical then be sure y1 < y2 else x1 < x2*/
+
+    if(LV_MATH_ABS(point1->x - point2->x) > LV_MATH_ABS(point1->y - point2->y)) {
+
+        /*Steps less in y then x -> rather horizontal*/
+        if(point1->x < point2->x) {
+            p1.x = point1->x;
+            p1.y = point1->y;
+            p2.x = point2->x;
+            p2.y = point2->y;
+        } else {
+            p1.x = point2->x;
+            p1.y = point2->y;
+            p2.x = point1->x;
+            p2.y = point1->y;
+        }
+    } else {
+        /*Steps less in x then y -> rather vertical*/
+        if(point1->y < point2->y) {
+            p1.x = point1->x;
+            p1.y = point1->y;
+            p2.x = point2->x;
+            p2.y = point2->y;
+        } else {
+            p1.x = point2->x;
+            p1.y = point2->y;
+            p2.x = point1->x;
+            p2.y = point1->y;
+        }
+    }
+
+    line_init(&main_line, &p1, &p2);
+
+
+    /*Special case draw a horizontal line*/
+    if(main_line.p1.y == main_line.p2.y) {
+        line_draw_hor(&main_line, mask, style, opa_scale);
+    }
+    /*Special case draw a vertical line*/
+    else if(main_line.p1.x == main_line.p2.x) {
+        line_draw_ver(&main_line, mask, style, opa_scale);
+    }
+    /*Arbitrary skew line*/
+    else {
+        line_draw_skew(&main_line, mask, style, opa_scale);
+    }
+}
+
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+
+static void line_draw_hor(line_draw_t * line, const lv_area_t * mask, const lv_style_t * style, lv_opa_t opa_scale)
+{
+    lv_coord_t width = style->line.width - 1;
+    lv_coord_t width_half = width >> 1;
+    lv_coord_t width_1 = width & 0x1;
+    lv_opa_t opa = opa_scale == LV_OPA_COVER ? style->line.opa : (uint16_t)((uint16_t) style->line.opa * opa_scale) >> 8;
+
+    lv_area_t act_area;
+    act_area.x1 = line->p1.x;
+    act_area.x2 = line->p2.x;
+    act_area.y1 = line->p1.y - width_half - width_1;
+    act_area.y2 = line->p2.y + width_half ;
+
+    lv_area_t draw_area;
+    draw_area.x1 = LV_MATH_MIN(act_area.x1, act_area.x2);
+    draw_area.x2 = LV_MATH_MAX(act_area.x1, act_area.x2);
+    draw_area.y1 = LV_MATH_MIN(act_area.y1, act_area.y2);
+    draw_area.y2 = LV_MATH_MAX(act_area.y1, act_area.y2);
+    fill_fp(&draw_area, mask, style->line.color, opa);
+}
+
+static void line_draw_ver(line_draw_t * line, const lv_area_t * mask, const lv_style_t * style, lv_opa_t opa_scale)
+{
+    lv_coord_t width = style->line.width - 1;
+    lv_coord_t width_half = width >> 1;
+    lv_coord_t width_1 = width & 0x1;
+    lv_opa_t opa = opa_scale == LV_OPA_COVER ? style->line.opa : (uint16_t)((uint16_t) style->line.opa * opa_scale) >> 8;
+
+
+    lv_area_t act_area;
+    act_area.x1 = line->p1.x - width_half;
+    act_area.x2 = line->p2.x + width_half + width_1;
+    act_area.y1 = line->p1.y;
+    act_area.y2 = line->p2.y;
+
+    lv_area_t draw_area;
+    draw_area.x1 = LV_MATH_MIN(act_area.x1, act_area.x2);
+    draw_area.x2 = LV_MATH_MAX(act_area.x1, act_area.x2);
+    draw_area.y1 = LV_MATH_MIN(act_area.y1, act_area.y2);
+    draw_area.y2 = LV_MATH_MAX(act_area.y1, act_area.y2);
+    fill_fp(&draw_area, mask, style->line.color, opa);
+}
+
+static void line_draw_skew(line_draw_t * main_line, const lv_area_t * mask, const lv_style_t * style, lv_opa_t opa_scale)
+{
+
+    lv_opa_t opa = opa_scale == LV_OPA_COVER ? style->line.opa : (uint16_t)((uint16_t) style->line.opa * opa_scale) >> 8;
+
+    lv_point_t vect_main, vect_norm;
+    vect_main.x = main_line->p2.x - main_line->p1.x;
+    vect_main.y = main_line->p2.y - main_line->p1.y;
+
+    if(main_line->hor) {
+        if(main_line->p1.y < main_line->p2.y) {
+            vect_norm.x = - vect_main.y;
+            vect_norm.y = vect_main.x;
+        } else {
+            vect_norm.x = vect_main.y;
+            vect_norm.y = -vect_main.x;
+        }
+    } else {
+        if(main_line->p1.x < main_line->p2.x) {
+            vect_norm.x = vect_main.y;
+            vect_norm.y = - vect_main.x;
+        } else {
+            vect_norm.x = - vect_main.y;
+            vect_norm.y = vect_main.x;
+        }
+    }
+
+    /* In case of a short but tick line the perpendicular ending is longer then the real line.
+     * it would break the calculations so make the normal vector larger*/
+    vect_norm.x = vect_norm.x << 4;
+    vect_norm.y = vect_norm.y << 4;
+
+    lv_coord_t width;
+    width = style->line.width;
+
+    /* The pattern stores the points of the line ending. It has the good direction and length.
+     * The worth case is the 45° line where pattern can have 1.41 x `width` points*/
+#if LV_COMPILER_VLA_SUPPORTED
+    lv_point_t pattern[width * 2];
+#else
+    lv_point_t pattern[LINE_MAX_WIDTH];
+#endif
+    lv_coord_t i = 0;
+
+    /*Create a perpendicular pattern (a small line)*/
+    if(width != 0) {
+        line_draw_t pattern_line;
+        lv_point_t p0 = {0, 0};
+        line_init(&pattern_line, &p0, &vect_norm);
+
+        uint32_t width_sqr = width * width;
+        /* Run for a lot of times. Meanwhile the real width will be determined as well */
+        for(i = 0; i < (lv_coord_t)sizeof(pattern); i ++) {
+            pattern[i].x = pattern_line.p_act.x;
+            pattern[i].y = pattern_line.p_act.y;
+
+            /*Finish the pattern line if it's length equal to the desired width (Use Pythagoras theorem)*/
+            uint32_t  sqr = pattern_line.p_act.x * pattern_line.p_act.x + pattern_line.p_act.y * pattern_line.p_act.y;
+            if(sqr >= width_sqr) {
+                width = i;
+#if LV_ANTIALIAS
+                width--;
+
+#endif
+                break;
+            }
+
+            line_next(&pattern_line);
+        }
+    } else {
+        pattern[0].x = 0;
+        pattern[0].y = 0;
+    }
+
+#if LV_ANTIALIAS
+    lv_coord_t width_safe = width;
+    if(width == 0) width_safe = 1;
+
+    lv_coord_t aa_last_corner;
+    aa_last_corner = 0;
+#endif
+
+    /* Make the coordinates relative to the center */
+    for(i = 0; i < width; i++) {
+        pattern[i].x -= pattern[width - 1].x / 2;
+        pattern[i].y -= pattern[width - 1].y / 2;
+#if LV_ANTIALIAS
+        if(i != 0) {
+            if(main_line->hor) {
+                if(pattern[i - 1].x != pattern[i].x) {
+                    lv_coord_t seg_w = pattern[i].y - pattern[aa_last_corner].y;
+                    if(main_line->sy < 0) {
+                        lv_draw_aa_ver_seg(main_line->p1.x + pattern[aa_last_corner].x - 1, main_line->p1.y + pattern[aa_last_corner].y + seg_w + 1,
+                                           seg_w, mask, style->line.color, opa);
+
+                        lv_draw_aa_ver_seg(main_line->p2.x + pattern[aa_last_corner].x + 1, main_line->p2.y + pattern[aa_last_corner].y + seg_w + 1,
+                                           -seg_w, mask, style->line.color, opa);
+                    } else {
+                        lv_draw_aa_ver_seg(main_line->p1.x + pattern[aa_last_corner].x - 1, main_line->p1.y + pattern[aa_last_corner].y,
+                                           seg_w, mask, style->line.color, opa);
+
+                        lv_draw_aa_ver_seg(main_line->p2.x + pattern[aa_last_corner].x + 1, main_line->p2.y + pattern[aa_last_corner].y,
+                                           -seg_w, mask, style->line.color, opa);
+                    }
+                    aa_last_corner = i;
+                }
+            } else {
+                if(pattern[i - 1].y != pattern[i].y) {
+                    lv_coord_t seg_w = pattern[i].x - pattern[aa_last_corner].x;
+                    if(main_line->sx < 0) {
+                        lv_draw_aa_hor_seg(main_line->p1.x + pattern[aa_last_corner].x + seg_w + 1, main_line->p1.y + pattern[aa_last_corner].y - 1,
+                                           seg_w, mask, style->line.color, opa);
+
+                        lv_draw_aa_hor_seg(main_line->p2.x + pattern[aa_last_corner].x + seg_w + 1, main_line->p2.y + pattern[aa_last_corner].y + 1,
+                                           -seg_w, mask, style->line.color, opa);
+                    } else {
+                        lv_draw_aa_hor_seg(main_line->p1.x + pattern[aa_last_corner].x, main_line->p1.y + pattern[aa_last_corner].y - 1,
+                                           seg_w, mask, style->line.color, opa);
+
+                        lv_draw_aa_hor_seg(main_line->p2.x + pattern[aa_last_corner].x, main_line->p2.y + pattern[aa_last_corner].y + 1,
+                                           -seg_w, mask, style->line.color, opa);
+                    }
+                    aa_last_corner = i;
+                }
+            }
+
+        }
+#endif
+    }
+
+
+
+#if LV_ANTIALIAS
+    /*Add the last part of anti-aliasing for the perpendicular ending*/
+    if(main_line->hor) {
+        lv_coord_t seg_w = pattern[width_safe - 1].y - pattern[aa_last_corner].y;
+        if(main_line->sy < 0) {
+            lv_draw_aa_ver_seg(main_line->p1.x + pattern[aa_last_corner].x - 1, main_line->p1.y + pattern[aa_last_corner].y + seg_w,
+                               seg_w + main_line->sy, mask, style->line.color, opa);
+
+            lv_draw_aa_ver_seg(main_line->p2.x + pattern[aa_last_corner].x + 1, main_line->p2.y + pattern[aa_last_corner].y + seg_w,
+                               -(seg_w + main_line->sy), mask, style->line.color, opa);
+
+        } else {
+            lv_draw_aa_ver_seg(main_line->p1.x + pattern[aa_last_corner].x - 1, main_line->p1.y + pattern[aa_last_corner].y,
+                               seg_w + main_line->sy, mask, style->line.color, opa);
+
+            lv_draw_aa_ver_seg(main_line->p2.x + pattern[aa_last_corner].x + 1, main_line->p2.y + pattern[aa_last_corner].y,
+                               -(seg_w + main_line->sy), mask, style->line.color, opa);
+        }
+    } else {
+        lv_coord_t seg_w = pattern[width_safe - 1].x - pattern[aa_last_corner].x;
+        if(main_line->sx < 0) {
+            lv_draw_aa_hor_seg(main_line->p1.x + pattern[aa_last_corner].x + seg_w, main_line->p1.y + pattern[aa_last_corner].y - 1,
+                               seg_w + main_line->sx, mask, style->line.color, opa);
+
+            lv_draw_aa_hor_seg(main_line->p2.x + pattern[aa_last_corner].x + seg_w, main_line->p2.y + pattern[aa_last_corner].y + 1,
+                               -(seg_w + main_line->sx), mask, style->line.color, opa);
+
+        } else {
+            lv_draw_aa_hor_seg(main_line->p1.x + pattern[aa_last_corner].x, main_line->p1.y + pattern[aa_last_corner].y - 1,
+                               seg_w + main_line->sx, mask, style->line.color, opa);
+
+            lv_draw_aa_hor_seg(main_line->p2.x + pattern[aa_last_corner].x, main_line->p2.y + pattern[aa_last_corner].y + 1,
+                               -(seg_w + main_line->sx), mask, style->line.color, opa);
+        }
+
+    }
+#endif
+
+#if LV_ANTIALIAS
+
+    /*Shift the anti aliasing on the edges (-1, 1 or 0 (zero only in case width == 0))*/
+    lv_coord_t aa_shift1;
+    lv_coord_t aa_shift2;
+
+    if(main_line->hor == false) {
+        if(main_line->sx < 0) {
+            aa_shift1 = -1;
+            aa_shift2 = width == 0 ? 0 : aa_shift1;
+        } else {
+            aa_shift2 = 1;
+            aa_shift1 = width == 0 ? 0 : aa_shift2;
+        }
+    } else {
+        if(main_line->sy < 0) {
+            aa_shift1 = -1;
+            aa_shift2 = width == 0 ? 0 : aa_shift1;
+        } else {
+            aa_shift2 = 1;
+            aa_shift1 = width == 0 ? 0 : aa_shift2;
+        }
+    }
+
+#endif
+
+
+    volatile lv_point_t prev_p;
+    prev_p.x = main_line->p1.x;
+    prev_p.y = main_line->p1.y;
+    lv_area_t draw_area;
+    bool first_run = true;
+
+    if(main_line->hor) {
+        while(line_next_y(main_line)) {
+            for(i = 0; i < width; i++) {
+                draw_area.x1 = prev_p.x + pattern[i].x;
+                draw_area.y1 = prev_p.y + pattern[i].y;
+                draw_area.x2 = draw_area.x1 + main_line->p_act.x - prev_p.x - 1;
+                draw_area.y2 = draw_area.y1;
+                fill_fp(&draw_area, mask, style->line.color, opa);
+
+                /* Fill the gaps
+                 * When stepping in y one pixel remains empty on every corner (don't do this on the first segment ) */
+                if(i != 0 && pattern[i].x != pattern[i - 1].x && !first_run) {
+                    px_fp(draw_area.x1, draw_area.y1 - main_line->sy, mask, style->line.color, opa);
+                }
+            }
+
+#if LV_ANTIALIAS
+            lv_draw_aa_hor_seg(prev_p.x + pattern[0].x, prev_p.y + pattern[0].y - aa_shift1,
+                               -(main_line->p_act.x - prev_p.x), mask, style->line.color, opa);
+            lv_draw_aa_hor_seg(prev_p.x + pattern[width_safe - 1].x, prev_p.y + pattern[width_safe - 1].y + aa_shift2,
+                               main_line->p_act.x - prev_p.x, mask, style->line.color, opa);
+#endif
+
+            first_run = false;
+
+            prev_p.x = main_line->p_act.x;
+            prev_p.y = main_line->p_act.y;
+        }
+
+        for(i = 0; i < width; i++) {
+            draw_area.x1 = prev_p.x + pattern[i].x;
+            draw_area.y1 = prev_p.y + pattern[i].y;
+            draw_area.x2 = draw_area.x1 + main_line->p_act.x - prev_p.x;
+            draw_area.y2 = draw_area.y1;
+            fill_fp(&draw_area, mask, style->line.color, opa);
+
+            /* Fill the gaps
+             * When stepping in y one pixel remains empty on every corner */
+            if(i != 0 && pattern[i].x != pattern[i - 1].x && !first_run) {
+                px_fp(draw_area.x1, draw_area.y1 - main_line->sy, mask, style->line.color, opa);
+            }
+        }
+
+#if LV_ANTIALIAS
+        lv_draw_aa_hor_seg(prev_p.x + pattern[0].x, prev_p.y + pattern[0].y - aa_shift1,
+                           -(main_line->p_act.x - prev_p.x + 1), mask, style->line.color, opa);
+        lv_draw_aa_hor_seg(prev_p.x + pattern[width_safe - 1].x, prev_p.y + pattern[width_safe - 1].y + aa_shift2,
+                           main_line->p_act.x - prev_p.x + 1, mask, style->line.color, opa);
+#endif
+    }
+    /*Rather a vertical line*/
+    else {
+
+        while(line_next_x(main_line)) {
+            for(i = 0; i < width; i++) {
+                draw_area.x1 = prev_p.x + pattern[i].x;
+                draw_area.y1 = prev_p.y + pattern[i].y;
+                draw_area.x2 = draw_area.x1;
+                draw_area.y2 = draw_area.y1 + main_line->p_act.y - prev_p.y - 1;
+
+                fill_fp(&draw_area, mask, style->line.color, opa);
+
+                /* Fill the gaps
+                 * When stepping in x one pixel remains empty on every corner (don't do this on the first segment ) */
+                if(i != 0 && pattern[i].y != pattern[i - 1].y && !first_run) {
+                    px_fp(draw_area.x1 - main_line->sx, draw_area.y1, mask, style->line.color, opa);
+                }
+
+            }
+
+#if LV_ANTIALIAS
+            lv_draw_aa_ver_seg(prev_p.x + pattern[0].x - aa_shift1, prev_p.y + pattern[0].y,
+                               -(main_line->p_act.y - prev_p.y), mask, style->line.color, opa);
+            lv_draw_aa_ver_seg(prev_p.x + pattern[width_safe - 1].x + aa_shift2, prev_p.y + pattern[width_safe - 1].y,
+                               main_line->p_act.y - prev_p.y, mask, style->line.color, opa);
+#endif
+
+            first_run = false;
+
+            prev_p.x = main_line->p_act.x;
+            prev_p.y = main_line->p_act.y;
+        }
+
+        /*Draw the last part*/
+        for(i = 0; i < width; i++) {
+            draw_area.x1 = prev_p.x + pattern[i].x;
+            draw_area.y1 = prev_p.y + pattern[i].y;
+            draw_area.x2 = draw_area.x1;
+            draw_area.y2 = draw_area.y1 + main_line->p_act.y - prev_p.y;
+
+            fill_fp(&draw_area, mask, style->line.color, opa);
+
+            /* Fill the gaps
+             * When stepping in x one pixel remains empty on every corner */
+            if(i != 0 && pattern[i].y != pattern[i - 1].y && !first_run) {
+                px_fp(draw_area.x1 - main_line->sx, draw_area.y1, mask, style->line.color, opa);
+            }
+        }
+
+#if LV_ANTIALIAS
+        lv_draw_aa_ver_seg(prev_p.x + pattern[0].x - aa_shift1, prev_p.y + pattern[0].y,
+                           -(main_line->p_act.y - prev_p.y + 1), mask, style->line.color, opa);
+        lv_draw_aa_ver_seg(prev_p.x + pattern[width_safe - 1].x + aa_shift2, prev_p.y + pattern[width_safe - 1].y,
+                           main_line->p_act.y - prev_p.y + 1, mask, style->line.color, opa);
+#endif
+    }
+}
+
+
+static void line_init(line_draw_t * line, const lv_point_t * p1, const lv_point_t * p2)
+{
+    line->p1.x = p1->x;
+    line->p1.y = p1->y;
+    line->p2.x = p2->x;
+    line->p2.y = p2->y;
+
+    line->dx = LV_MATH_ABS(line->p2.x - line->p1.x);
+    line->sx = line->p1.x < line->p2.x ? 1 : -1;
+    line->dy = LV_MATH_ABS(line->p2.y - line->p1.y);
+    line->sy = line->p1.y < line->p2.y ? 1 : -1;
+    line->err = (line->dx > line->dy ? line->dx : -line->dy) / 2;
+    line->e2 = 0;
+    line->hor = line->dx > line->dy ? true : false; /*Rather horizontal or vertical*/
+
+    line->p_act.x = line->p1.x;
+    line->p_act.y = line->p1.y;
+}
+
+static bool line_next(line_draw_t * line)
+{
+    if(line->p_act.x == line->p2.x && line->p_act.y == line->p2.y) return false;
+    line->e2 = line->err;
+    if(line->e2 > -line->dx) {
+        line->err -= line->dy;
+        line->p_act.x += line->sx;
+    }
+    if(line->e2 < line->dy) {
+        line->err += line->dx;
+        line->p_act.y += line->sy;
+    }
+    return true;
+}
+
+/**
+ * Iterate until step one in y direction.
+ * @param line
+ * @return
+ */
+static bool line_next_y(line_draw_t * line)
+{
+    lv_coord_t last_y = line->p_act.y;
+
+    do {
+        if(!line_next(line)) return false;
+    } while(last_y == line->p_act.y);
+
+    return true;
+
+}
+
+/**
+ * Iterate until step one in x direction.
+ * @param line
+ * @return
+ */
+static bool line_next_x(line_draw_t * line)
+{
+    lv_coord_t last_x = line->p_act.x;
+
+    do {
+        if(!line_next(line)) return false;
+    } while(last_x == line->p_act.x);
+
+    return true;
+
+}
+

lv_draw/lv_draw_line.h

@@ -0,0 +1,49 @@
+/**
+ * @file lv_draw_line.h
+ *
+ */
+
+#ifndef LV_DRAW_LINE_H
+#define LV_DRAW_LINE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Draw a line
+ * @param point1 first point of the line
+ * @param point2 second point of the line
+ * @param mask the line will be drawn only on this area
+ * @param style pointer to a line's style
+ * @param opa_scale scale down all opacities by the factor
+ */
+void lv_draw_line(const lv_point_t * point1, const lv_point_t * point2, const lv_area_t * mask,
+                  const lv_style_t * style, lv_opa_t opa_scale);
+
+/**********************
+ *      MACROS
+ **********************/
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_DRAW_LINE_H*/

lv_draw/lv_draw_rbasic.c

@@ -1,15 +1,17 @@
 /**
  * @file lv_draw_rbasic.c
- * 
+ *
  */
 
 /*********************
  *      INCLUDES
  *********************/
 #include "lv_draw_rbasic.h"
-#include "lv_conf.h"
-#include "hal/disp/disp.h"
-#include "misc/gfx/font.h"
+#if USE_LV_REAL_DRAW != 0
+
+#include "../lv_hal/lv_hal_disp.h"
+#include "../lv_misc/lv_font.h"
+#include "lv_draw.h"
 
 /*********************
  *      DEFINES
@@ -26,6 +28,7 @@
 /**********************
  *  STATIC VARIABLES
  **********************/
+static lv_color_t letter_bg_color;
 
 /**********************
  *      MACROS
@@ -43,15 +46,17 @@
  * @param color color of the pixel
  * @param opa opacity (ignored, only for compatibility with lv_vpx)
  */
-void lv_rpx(cord_t x, cord_t y, const area_t * mask_p, color_t color, opa_t opa)
+void lv_rpx(lv_coord_t x, lv_coord_t y, const lv_area_t * mask_p, lv_color_t color, lv_opa_t opa)
 {
-    area_t area;
+    (void)opa;      /*Opa is used only for compatibility with lv_vpx*/
+
+    lv_area_t area;
     area.x1 = x;
     area.y1 = y;
     area.x2 = x;
     area.y2 = y;
 
-    lv_rfill(&area, mask_p, color, OPA_COVER);
+    lv_rfill(&area, mask_p, color, LV_OPA_COVER);
 }
 
 /**
@@ -61,23 +66,25 @@ void lv_rpx(cord_t x, cord_t y, const area_t * mask_p, color_t color, opa_t opa)
  * @param color fill color
  * @param opa opacity (ignored, only for compatibility with lv_vfill)
  */
-void lv_rfill(const area_t * cords_p, const area_t * mask_p, 
-              color_t color, opa_t opa)
-{   
-    area_t masked_area;
+void lv_rfill(const lv_area_t * cords_p, const lv_area_t * mask_p,
+              lv_color_t color, lv_opa_t opa)
+{
+
+    (void)opa;      /*Opa is used only for compatibility with lv_vfill*/
+
+    lv_area_t masked_area;
     bool union_ok = true;
-    
+
     if(mask_p != NULL) {
-        union_ok = area_union(&masked_area, cords_p, mask_p);
+        union_ok = lv_area_intersect(&masked_area, cords_p, mask_p);
     } else {
-        area_t scr_area;
-        area_set(&scr_area, 0, 0, LV_HOR_RES - 1, LV_VER_RES - 1);
-        union_ok = area_union(&masked_area, cords_p, &scr_area);
+        lv_area_t scr_area;
+        lv_area_set(&scr_area, 0, 0, LV_HOR_RES - 1, LV_VER_RES - 1);
+        union_ok = lv_area_intersect(&masked_area, cords_p, &scr_area);
     }
-        
-    
-    if(union_ok != false){
-    	disp_fill(masked_area.x1, masked_area.y1, masked_area.x2, masked_area.y2, color);
+
+    if(union_ok != false) {
+        lv_disp_fill(masked_area.x1, masked_area.y1, masked_area.x2, masked_area.y2, color);
     }
 }
 
@@ -85,128 +92,172 @@ void lv_rfill(const area_t * cords_p, const area_t * mask_p,
  * Draw a letter to the display
  * @param pos_p left-top coordinate of the latter
  * @param mask_p the letter will be drawn only on this area
- * @param font_p pointer to font 
+ * @param font_p pointer to font
  * @param letter a letter to draw
  * @param color color of letter
  * @param opa opacity of letter (ignored, only for compatibility with lv_vletter)
  */
-void lv_rletter(const point_t * pos_p, const area_t * mask_p,
-                     const font_t * font_p, uint8_t letter,
-                     color_t color, opa_t opa)
+void lv_rletter(const lv_point_t * pos_p, const lv_area_t * mask_p,
+                const lv_font_t * font_p, uint32_t letter,
+                lv_color_t color, lv_opa_t opa)
 {
-    uint8_t w = font_get_width(font_p, letter);
-    const uint8_t * bitmap_p = font_get_bitmap(font_p, letter);
+    (void)opa;      /*Opa is used only for compatibility with lv_vletter*/
 
-    uint8_t col, col_sub, row;
-#if FONT_ANTIALIAS == 0
-    for(row = 0; row < font_p->height_row; row ++) {
-        for(col = 0, col_sub = 7; col < w; col ++, col_sub--) {
-            if(*bitmap_p & (1 << col_sub)) {
-                lv_rpx(pos_p->x + col, pos_p->y + row, mask_p, color, opa);
+    static uint8_t bpp1_opa_table[2] =  {0, 255};                   /*Opacity mapping with bpp = 1 (Just for compatibility)*/
+    static uint8_t bpp2_opa_table[4] =  {0, 85, 170, 255};          /*Opacity mapping with bpp = 2*/
+    static uint8_t bpp4_opa_table[16] = {0,   17,  34,  51,         /*Opacity mapping with bpp = 4*/
+                                         68,  85,  102, 119,
+                                         136, 153, 170, 187,
+                                         204, 221, 238, 255
+                                        };
+
+    if(font_p == NULL) return;
+
+    uint8_t letter_w = lv_font_get_width(font_p, letter);
+    uint8_t letter_h = lv_font_get_height(font_p);
+    uint8_t bpp = lv_font_get_bpp(font_p, letter);  /*Bit per pixel (1,2, 4 or 8)*/
+    uint8_t * bpp_opa_table;
+    uint8_t mask_init;
+    uint8_t mask;
+
+    switch(bpp) {
+        case 1:
+            bpp_opa_table = bpp1_opa_table;
+            mask_init = 0x80;
+            break;
+        case 2:
+            bpp_opa_table = bpp2_opa_table;
+            mask_init = 0xC0;
+            break;
+        case 4:
+            bpp_opa_table = bpp4_opa_table;
+            mask_init = 0xF0;
+            break;
+        case 8:
+            bpp_opa_table = NULL;
+            mask_init = 0xFF;
+            break;             /*No opa table, pixel value will be used directly*/
+        default:
+            return;        /*Invalid bpp. Can't render the letter*/
+    }
+
+    const uint8_t * map_p = lv_font_get_bitmap(font_p, letter);
+
+    if(map_p == NULL) return;
+
+    /*If the letter is completely out of mask don't draw it */
+    if(pos_p->x + letter_w < mask_p->x1 || pos_p->x > mask_p->x2 ||
+            pos_p->y + letter_h < mask_p->y1 || pos_p->y > mask_p->y2) return;
+
+    lv_coord_t col, row;
+    uint8_t col_bit;
+    uint8_t col_byte_cnt;
+    uint8_t width_byte_scr = letter_w >> 3;      /*Width in bytes (on the screen finally) (e.g. w = 11 -> 2 bytes wide)*/
+    if(letter_w & 0x7) width_byte_scr++;
+    uint8_t width_byte_bpp = (letter_w * bpp) >> 3;    /*Letter width in byte. Real width in the font*/
+    if((letter_w * bpp) & 0x7) width_byte_bpp++;
+
+    /* Calculate the col/row start/end on the map*/
+    lv_coord_t col_start = pos_p->x >= mask_p->x1 ? 0 : mask_p->x1 - pos_p->x;
+    lv_coord_t col_end = pos_p->x + letter_w <= mask_p->x2 ? letter_w : mask_p->x2 - pos_p->x + 1;
+    lv_coord_t row_start = pos_p->y >= mask_p->y1 ? 0 : mask_p->y1 - pos_p->y;
+    lv_coord_t row_end  = pos_p->y + letter_h <= mask_p->y2 ? letter_h : mask_p->y2 - pos_p->y + 1;
+
+    /*Move on the map too*/
+    map_p += (row_start * width_byte_bpp) + ((col_start * bpp) >> 3);
+
+    uint8_t letter_px;
+    for(row = row_start; row < row_end; row ++) {
+        col_byte_cnt = 0;
+        col_bit = (col_start * bpp) % 8;
+        mask = mask_init >> col_bit;
+        for(col = col_start; col < col_end; col ++) {
+            letter_px = (*map_p & mask) >> (8 - col_bit - bpp);
+            if(letter_px != 0) {
+                lv_rpx(pos_p->x + col, pos_p->y + row, mask_p, lv_color_mix(color, letter_bg_color, bpp == 8 ? letter_px : bpp_opa_table[letter_px]), LV_OPA_COVER);
             }
 
-            if(col_sub == 0) {
-                bitmap_p++;
-                col_sub = 8;
+            if(col_bit < 8 - bpp) {
+                col_bit += bpp;
+                mask = mask >> bpp;
+            } else {
+                col_bit = 0;
+                col_byte_cnt ++;
+                mask = mask_init;
+                map_p ++;
             }
         }
-        
-        /*Correction if the letter is short*/
-        bitmap_p += font_p->width_byte - ((w >> 3) + 1);  
-        /*Go to the next row*/
-        bitmap_p ++;
+
+        map_p += (width_byte_bpp) - col_byte_cnt;
     }
-#else
-       const uint8_t * map1_p = bitmap_p;
-       const uint8_t * map2_p = bitmap_p + font_p->width_byte;
-       uint8_t px_cnt;
-       uint8_t col_byte_cnt;
-       for(row = 0; row < (font_p->height_row >> 1); row ++) {
-           col_byte_cnt = 0;
-           col_sub = 7;
-           for(col = 0; col < (w >> 1); col ++) {
-
-               px_cnt = 0;
-               if((*map1_p & (1 << col_sub)) != 0) px_cnt++;
-               if((*map2_p & (1 << col_sub)) != 0) px_cnt++;
-               if(col_sub != 0) col_sub --;
-               else {
-                   col_sub = 7;
-                   col_byte_cnt ++;
-                   map1_p ++;
-                   map2_p ++;
-               }
-               if((*map1_p & (1 << col_sub)) != 0) px_cnt++;
-               if((*map2_p & (1 << col_sub)) != 0) px_cnt++;
-               if(col_sub != 0) col_sub --;
-               else {
-                   col_sub = 7;
-                   col_byte_cnt ++;
-                   map1_p ++;
-                   map2_p ++;
-               }
-
-
-               if(px_cnt != 0) {
-                   lv_rpx(pos_p->x + col, pos_p->y + row, mask_p, color_mix(color, COLOR_SILVER, 63 * px_cnt), OPA_COVER);
-               }
-           }
-
-           map1_p += font_p->width_byte;
-           map2_p += font_p->width_byte;
-           map1_p += font_p->width_byte - col_byte_cnt;
-           map2_p += font_p->width_byte - col_byte_cnt;
-       }
-#endif
 }
 
 /**
- * Draw a color map to the display
+ * When the letter is ant-aliased it needs to know the background color
+ * @param bg_color the background color of the currently drawn letter
+ */
+void lv_rletter_set_background(lv_color_t color)
+{
+    letter_bg_color = color;
+}
+
+/**
+ * Draw a color map to the display (image)
  * @param cords_p coordinates the color map
  * @param mask_p the map will drawn only on this area
- * @param map_p pointer to a color_t array
- * @param opa opacity of the map (ignored, only for compatibility with lv_vmap)
- * @param transp true: enable transparency of LV_IMG_COLOR_TRANSP color pixels
- * @param upscale true: upscale to double size (not supported)
- * @param recolor mix the pixels with this color (not supported)
- * @param recolor_opa the intense of recoloring (not supported)
+ * @param map_p pointer to a lv_color_t array
+ * @param opa opacity of the map (ignored, only for compatibility with 'lv_vmap')
+ * @param chroma_keyed true: enable transparency of LV_IMG_LV_COLOR_TRANSP color pixels
+ * @param alpha_byte true: extra alpha byte is inserted for every pixel (not supported, only l'v_vmap' can draw it)
+ * @param recolor mix the pixels with this color
+ * @param recolor_opa the intense of recoloring
  */
-void lv_rmap(const area_t * cords_p, const area_t * mask_p,
-             const color_t * map_p, opa_t opa, bool transp, bool upscale,
-			 color_t recolor, opa_t recolor_opa)
+void lv_rmap(const lv_area_t * cords_p, const lv_area_t * mask_p,
+             const uint8_t * map_p, lv_opa_t opa, bool chroma_key, bool alpha_byte,
+             lv_color_t recolor, lv_opa_t recolor_opa)
 {
-    area_t masked_a;
+    if(alpha_byte) return;      /*Pixel level opacity i not supported in real map drawing*/
+
+    (void)opa;              /*opa is used only for compatibility with lv_vmap*/
+    lv_area_t masked_a;
     bool union_ok;
 
-    union_ok = area_union(&masked_a, cords_p, mask_p);
+    union_ok = lv_area_intersect(&masked_a, cords_p, mask_p);
 
     /*If there are common part of the mask and map then draw the map*/
     if(union_ok == false) return;
 
     /*Go to the first pixel*/
-    cord_t map_width = area_get_width(cords_p);
-    map_p+= (masked_a.y1 - cords_p->y1) * map_width;
-    map_p += masked_a.x1 - cords_p->x1;
+    lv_coord_t map_width = lv_area_get_width(cords_p);
+    map_p += (masked_a.y1 - cords_p->y1) * map_width * sizeof(lv_color_t);
+    map_p += (masked_a.x1 - cords_p->x1) * sizeof(lv_color_t);
 
-    if(transp == false) {
-        cord_t row;
-        cord_t mask_w = area_get_width(&masked_a) - 1;
-        for(row = 0; row < area_get_height(&masked_a); row++) {
-            disp_map(masked_a.x1, masked_a.y1 + row, masked_a.x1 + mask_w, masked_a.y1 + row, map_p);
-
-            map_p += map_width;
+    lv_coord_t row;
+    if(recolor_opa == LV_OPA_TRANSP && chroma_key == false) {
+        lv_coord_t mask_w = lv_area_get_width(&masked_a) - 1;
+        for(row = masked_a.y1; row <= masked_a.y2; row++) {
+            lv_disp_map(masked_a.x1, row, masked_a.x1 + mask_w, row, (lv_color_t *)map_p);
+            map_p += map_width * sizeof(lv_color_t);               /*Next row on the map*/
         }
-    }else {
-        color_t transp_color = LV_COLOR_TRANSP;
-        cord_t row;
-        for(row = 0; row < area_get_height(&masked_a); row++) {
-            cord_t col;
-            for(col = 0; col < area_get_width(&masked_a); col ++) {
-                if(map_p[col].full != transp_color.full) {
-                    lv_rpx(masked_a.x1 + col, masked_a.y1 + row, mask_p, map_p[col], opa);
+    } else {
+        lv_color_t chroma_key_color = LV_COLOR_TRANSP;
+        lv_coord_t col;
+        for(row = masked_a.y1; row <= masked_a.y2; row++) {
+            for(col = masked_a.x1; col <= masked_a.x2; col++) {
+                lv_color_t * px_color = (lv_color_t *) &map_p[(uint32_t)(col - masked_a.x1) * sizeof(lv_color_t)];
+
+                if(chroma_key && chroma_key_color.full == px_color->full) continue;
+
+                if(recolor_opa != LV_OPA_TRANSP) {
+                    lv_color_t recolored_px = lv_color_mix(recolor, *px_color, recolor_opa);
+
+                    lv_rpx(col, row, mask_p, recolored_px, LV_OPA_COVER);
+                } else {
+                    lv_rpx(col, row, mask_p, *px_color, LV_OPA_COVER);
                 }
+
             }
-            map_p += map_width;
+            map_p += map_width * sizeof(lv_color_t);               /*Next row on the map*/
         }
     }
 }
@@ -214,3 +265,5 @@ void lv_rmap(const area_t * cords_p, const area_t * mask_p,
 /**********************
  *   STATIC FUNCTIONS
  **********************/
+
+#endif  /*USE_LV_REAL_DRAW*/

lv_draw/lv_draw_rbasic.h

@@ -1,6 +1,6 @@
 /**
  * @file lv_draw_rbasic..h
- * 
+ *
  */
 
 #ifndef LV_DRAW_RBASIC_H
@@ -13,9 +13,17 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc/gfx/color.h"
-#include "misc/gfx/area.h"
-#include "misc/gfx/font.h"
+#ifdef LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
+#if USE_LV_REAL_DRAW != 0
+
+#include "../lv_misc/lv_color.h"
+#include "../lv_misc/lv_area.h"
+#include "../lv_misc/lv_font.h"
 
 /*********************
  *      DEFINES
@@ -29,7 +37,7 @@ extern "C" {
  * GLOBAL PROTOTYPES
  **********************/
 
-void lv_rpx(cord_t x, cord_t y, const area_t * mask_p, color_t color, opa_t opa);
+void lv_rpx(lv_coord_t x, lv_coord_t y, const lv_area_t * mask_p, lv_color_t color, lv_opa_t opa);
 
 /**
  * Fill an area on the display
@@ -38,8 +46,8 @@ void lv_rpx(cord_t x, cord_t y, const area_t * mask_p, color_t color, opa_t opa)
  * @param color fill color
  * @param opa opacity (ignored, only for compatibility with lv_vfill)
  */
-void lv_rfill(const area_t * cords_p, const area_t * mask_p,
-                color_t color, opa_t opa);
+void lv_rfill(const lv_area_t * cords_p, const lv_area_t * mask_p,
+              lv_color_t color, lv_opa_t opa);
 
 /**
  * Draw a letter to the display
@@ -50,28 +58,36 @@ void lv_rfill(const area_t * cords_p, const area_t * mask_p,
  * @param color color of letter
  * @param opa opacity of letter (ignored, only for compatibility with lv_vletter)
  */
-void lv_rletter(const point_t * pos_p, const area_t * mask_p,
-                const font_t * font_p, uint8_t letter,
-                color_t color, opa_t opa);
+void lv_rletter(const lv_point_t * pos_p, const lv_area_t * mask_p,
+                const lv_font_t * font_p, uint32_t letter,
+                lv_color_t color, lv_opa_t opa);
 
 /**
- * Draw a color map to the display
+ * When the letter is ant-aliased it needs to know the background color
+ * @param bg_color the background color of the currently drawn letter
+ */
+void lv_rletter_set_background(lv_color_t color);
+
+
+/**
+ * Draw a color map to the display (image)
  * @param cords_p coordinates the color map
  * @param mask_p the map will drawn only on this area
- * @param map_p pointer to a color_t array
- * @param opa opacity of the map (ignored, only for compatibility with lv_vmap)
- * @param transp true: enable transparency of LV_IMG_COLOR_TRANSP color pixels
- * @param upscale true: upscale to double size (not supported)
- * @param recolor mix the pixels with this color (not supported)
- * @param recolor_opa the intense of recoloring (not supported)
+ * @param map_p pointer to a lv_color_t array
+ * @param opa opacity of the map (ignored, only for compatibility with 'lv_vmap')
+ * @param chroma_keyed true: enable transparency of LV_IMG_LV_COLOR_TRANSP color pixels
+ * @param alpha_byte true: extra alpha byte is inserted for every pixel (not supported, only l'v_vmap' can draw it)
+ * @param recolor mix the pixels with this color
+ * @param recolor_opa the intense of recoloring
  */
-void lv_rmap(const area_t * cords_p, const area_t * mask_p,
-             const color_t * map_p, opa_t opa, bool transp, bool upscale,
-			 color_t recolor, opa_t recolor_opa);
+void lv_rmap(const lv_area_t * cords_p, const lv_area_t * mask_p,
+             const uint8_t * map_p, lv_opa_t opa, bool chroma_key, bool alpha_byte,
+             lv_color_t recolor, lv_opa_t recolor_opa);
 /**********************
  *      MACROS
  **********************/
 
+#endif  /*USE_LV_REAL_DRAW*/
 
 #ifdef __cplusplus
 } /* extern "C" */

lv_draw/lv_draw_rect.h

@@ -0,0 +1,48 @@
+/**
+ * @file lv_draw_rect.h
+ *
+ */
+
+#ifndef LV_DRAW_RECT_H
+#define LV_DRAW_RECT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**
+ * Draw a rectangle
+ * @param coords the coordinates of the rectangle
+ * @param mask the rectangle will be drawn only in this mask
+ * @param style pointer to a style
+ * @param opa_scale scale down all opacities by the factor
+ */
+void lv_draw_rect(const lv_area_t * coords, const lv_area_t * mask, const lv_style_t * style, lv_opa_t opa_scale);
+
+/**********************
+ *      MACROS
+ **********************/
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_DRAW_RECT_H*/

lv_draw/lv_draw_triangle.c

@@ -0,0 +1,168 @@
+/**
+ * @file lv_draw_triangle.c
+ *
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw_triangle.h"
+#include "../lv_misc/lv_math.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+static void point_swap(lv_point_t * p1, lv_point_t * p2);
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+#if USE_LV_TRIANGLE != 0
+/**
+ *
+ * @param points pointer to an array with 3 points
+ * @param mask the triangle will be drawn only in this mask
+ * @param color color of the triangle
+ */
+void lv_draw_triangle(const lv_point_t * points, const lv_area_t * mask, lv_color_t color)
+{
+    lv_point_t tri[3];
+
+    memcpy(tri, points, sizeof(tri));
+
+    /*Sort the vertices according to their y coordinate (0: y max, 1: y mid, 2:y min)*/
+    if(tri[1].y < tri[0].y) point_swap(&tri[1], &tri[0]);
+    if(tri[2].y < tri[1].y) point_swap(&tri[2], &tri[1]);
+    if(tri[1].y < tri[0].y) point_swap(&tri[1], &tri[0]);
+
+    /*Return is the triangle is degenerated*/
+    if(tri[0].x == tri[1].x && tri[0].y == tri[1].y) return;
+    if(tri[1].x == tri[2].x && tri[1].y == tri[2].y) return;
+    if(tri[0].x == tri[2].x && tri[0].y == tri[2].y) return;
+
+    if(tri[0].x == tri[1].x && tri[1].x == tri[2].x) return;
+    if(tri[0].y == tri[1].y && tri[1].y == tri[2].y) return;
+
+    /*Draw the triangle*/
+    lv_point_t edge1;
+    lv_coord_t dx1 = LV_MATH_ABS(tri[0].x - tri[1].x);
+    lv_coord_t sx1 = tri[0].x < tri[1].x ? 1 : -1;
+    lv_coord_t dy1 = LV_MATH_ABS(tri[0].y - tri[1].y);
+    lv_coord_t sy1 = tri[0].y < tri[1].y ? 1 : -1;
+    lv_coord_t err1 = (dx1 > dy1 ? dx1 : -dy1) / 2;
+    lv_coord_t err_tmp1;
+
+    lv_point_t edge2;
+    lv_coord_t dx2 = LV_MATH_ABS(tri[0].x - tri[2].x);
+    lv_coord_t sx2 = tri[0].x < tri[2].x ? 1 : -1;
+    lv_coord_t dy2 = LV_MATH_ABS(tri[0].y - tri[2].y);
+    lv_coord_t sy2 = tri[0].y < tri[2].y ? 1 : -1;
+    lv_coord_t err2 = (dx1 > dy2 ? dx2 : -dy2) / 2;
+    lv_coord_t err_tmp2;
+
+    lv_coord_t y1_tmp;
+    lv_coord_t y2_tmp;
+
+    edge1.x = tri[0].x;
+    edge1.y = tri[0].y;
+    edge2.x = tri[0].x;
+    edge2.y = tri[0].y;
+    lv_area_t act_area;
+    lv_area_t draw_area;
+
+    while(1) {
+        act_area.x1 = edge1.x;
+        act_area.x2 = edge2.x ;
+        act_area.y1 = edge1.y;
+        act_area.y2 = edge2.y ;
+
+
+        draw_area.x1 = LV_MATH_MIN(act_area.x1, act_area.x2);
+        draw_area.x2 = LV_MATH_MAX(act_area.x1, act_area.x2);
+        draw_area.y1 = LV_MATH_MIN(act_area.y1, act_area.y2);
+        draw_area.y2 = LV_MATH_MAX(act_area.y1, act_area.y2);
+        draw_area.x2--; /*Do not draw most right pixel because it will be drawn by the adjacent triangle*/
+        fill_fp(&draw_area, mask, color, LV_OPA_50);
+
+        /*Calc. the next point of edge1*/
+        y1_tmp = edge1.y;
+        do {
+            if(edge1.x == tri[1].x && edge1.y == tri[1].y) {
+
+                dx1 = LV_MATH_ABS(tri[1].x - tri[2].x);
+                sx1 = tri[1].x < tri[2].x ? 1 : -1;
+                dy1 = LV_MATH_ABS(tri[1].y - tri[2].y);
+                sy1 = tri[1].y < tri[2].y ? 1 : -1;
+                err1 = (dx1 > dy1 ? dx1 : -dy1) / 2;
+            } else if(edge1.x == tri[2].x && edge1.y == tri[2].y) return;
+            err_tmp1 = err1;
+            if(err_tmp1 > -dx1) {
+                err1 -= dy1;
+                edge1.x += sx1;
+            }
+            if(err_tmp1 < dy1) {
+                err1 += dx1;
+                edge1.y += sy1;
+            }
+        } while(edge1.y == y1_tmp);
+
+        /*Calc. the next point of edge2*/
+        y2_tmp = edge2.y;
+        do {
+            if(edge2.x == tri[2].x && edge2.y == tri[2].y) return;
+            err_tmp2 = err2;
+            if(err_tmp2 > -dx2) {
+                err2 -= dy2;
+                edge2.x += sx2;
+            }
+            if(err_tmp2 < dy2) {
+                err2 += dx2;
+                edge2.y += sy2;
+            }
+        } while(edge2.y == y2_tmp);
+    }
+}
+#endif
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+
+#if USE_LV_TRIANGLE != 0
+/**
+ * Swap two points
+ * p1 pointer to the first point
+ * p2 pointer to the second point
+ */
+static void point_swap(lv_point_t * p1, lv_point_t * p2)
+{
+    lv_point_t tmp;
+    tmp.x = p1->x;
+    tmp.y = p1->y;
+
+    p1->x = p2->x;
+    p1->y = p2->y;
+
+    p2->x = tmp.x;
+    p2->y = tmp.y;
+
+}
+
+#endif

lv_draw/lv_draw_triangle.h

@@ -0,0 +1,51 @@
+/**
+ * @file lv_draw_triangle.h
+ *
+ */
+
+#ifndef LV_DRAW_TRIANGLE_H
+#define LV_DRAW_TRIANGLE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_draw.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+/*Experimental use for 3D modeling*/
+#define USE_LV_TRIANGLE 1
+
+#if USE_LV_TRIANGLE != 0
+/**
+ *
+ * @param points pointer to an array with 3 points
+ * @param mask the triangle will be drawn only in this mask
+ * @param color color of the triangle
+ */
+void lv_draw_triangle(const lv_point_t * points, const lv_area_t * mask, lv_color_t color);
+#endif
+
+/**********************
+ *      MACROS
+ **********************/
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_DRAW_TRIANGLE_H*/

lv_draw/lv_draw_vbasic.h

@@ -1,6 +1,6 @@
 /**
  * @file lv_draw_vbasic.h
- * 
+ *
  */
 
 #ifndef LV_DRAW_VBASIC_H
@@ -13,13 +13,17 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_CONF_INCLUDE_SIMPLE
 #include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
 
 #if LV_VDB_SIZE != 0
 
-#include "misc/gfx/color.h"
-#include "misc/gfx/area.h"
-#include "misc/gfx/font.h"
+#include "../lv_misc/lv_color.h"
+#include "../lv_misc/lv_area.h"
+#include "../lv_misc/lv_font.h"
 
 /*********************
  *      DEFINES
@@ -33,7 +37,7 @@ extern "C" {
  * GLOBAL PROTOTYPES
  **********************/
 
-void lv_vpx(cord_t x, cord_t y, const area_t * mask_p, color_t color, opa_t opa);
+void lv_vpx(lv_coord_t x, lv_coord_t y, const lv_area_t * mask_p, lv_color_t color, lv_opa_t opa);
 /**
  * Fill an area in the Virtual Display Buffer
  * @param cords_p coordinates of the area to fill
@@ -41,8 +45,8 @@ void lv_vpx(cord_t x, cord_t y, const area_t * mask_p, color_t color, opa_t opa)
  * @param color fill color
  * @param opa opacity of the area (0..255)
  */
-void lv_vfill(const area_t * cords_p, const area_t * mask_p,
-                color_t color, opa_t opa);
+void lv_vfill(const lv_area_t * cords_p, const lv_area_t * mask_p,
+              lv_color_t color, lv_opa_t opa);
 
 /**
  * Draw a letter in the Virtual Display Buffer
@@ -53,26 +57,30 @@ void lv_vfill(const area_t * cords_p, const area_t * mask_p,
  * @param color color of letter
  * @param opa opacity of letter (0..255)
  */
-void lv_vletter(const point_t * pos_p, const area_t * mask_p,
-                const font_t * font_p, uint8_t letter,
-                color_t color, opa_t opa);
+void lv_vletter(const lv_point_t * pos_p, const lv_area_t * mask_p,
+                const lv_font_t * font_p, uint32_t letter,
+                lv_color_t color, lv_opa_t opa);
 
 /**
- * Draw a color map to the display
+ * Draw a color map to the display (image)
  * @param cords_p coordinates the color map
- * @param mask_p the map will drawn only on this area
- * @param map_p pointer to a color_t array
- * @param opa opacity of the map (ignored, only for compatibility with lv_vmap)
- * @param transp true: enable transparency of LV_IMG_COLOR_TRANSP color pixels
- * @param upscale true: upscale to double size
+ * @param mask_p the map will drawn only on this area  (truncated to VDB area)
+ * @param map_p pointer to a lv_color_t array
+ * @param opa opacity of the map
+ * @param chroma_keyed true: enable transparency of LV_IMG_LV_COLOR_TRANSP color pixels
+ * @param alpha_byte true: extra alpha byte is inserted for every pixel
  * @param recolor mix the pixels with this color
  * @param recolor_opa the intense of recoloring
  */
-void lv_vmap(const area_t * cords_p, const area_t * mask_p,
-            const color_t * map_p, opa_t opa, bool transp, bool upscale,
-            color_t recolor, opa_t recolor_opa);
+void lv_vmap(const lv_area_t * cords_p, const lv_area_t * mask_p,
+             const uint8_t * map_p, lv_opa_t opa, bool chroma_key, bool alpha_byte,
+             lv_color_t recolor, lv_opa_t recolor_opa);
 
 
+/**
+ * Reallocate 'color_map_tmp' to the new hor. res. size. It is used in 'sw_fill'
+ */
+void lv_vdraw_refresh_temp_arrays(void);
 
 /**********************
  *      MACROS

lv_examples/1_1_hello_world/lv_ex_hello_world.c

@@ -1,67 +0,0 @@
-/**
- * @file lv_ex_hello_world.c
- *
- */
-
-/*
- * Greetings,
- * this is the first example in the tutorial hence this is the most simple one.
- * It only creates a Label, set its text, and align to the middle.
- *
- * Be sure in lv_conf.h LV_APP_ENEBLE is 0 (just for simplicity)
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_ex_hello_world.h"
-#if USE_LV_EXAMPLE != 0
-
-#include "lvgl/lvgl.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Create a simple 'Hello world!' label
- */
-void lv_ex_hello_world(void)
-{
-    /*Create a Label on the current screen*/
-    lv_obj_t * label1 =  lv_label_create(lv_scr_act(), NULL);
-
-    /*Modify the Label's text*/
-    lv_label_set_text(label1, "Hello world!");
-
-    /* Align the Label to the center
-     * NULL means align on parent (which is the screen now)
-     * 0, 0 at the and means an x, y offset after alignment*/
-    lv_obj_align_us(label1, NULL, LV_ALIGN_CENTER, 0, 0);
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-#endif /*USE_LV_EXAMPLE != 0*/

lv_examples/1_1_hello_world/lv_ex_hello_world.h

@@ -1,42 +0,0 @@
-/**
- * @file lv_ex_hello_world.h
- *
- */
-
-#ifndef LV_EX_HELLO_WORLD_H
-#define LV_EX_HELLO_WORLD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_conf.h"
-#if USE_LV_EXAMPLE != 0
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-void lv_ex_hello_world(void);
-
-/**********************
- *      MACROS
- **********************/
-
-#endif /*USE_LV_EXAMPLE != 0*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /*LV_HELLO_WORLD_H*/

lv_examples/1_2_objects/lv_ex_objects.c

@@ -1,218 +0,0 @@
-/**
- * @file lv_hello_world.c
- *
- */
-
-/*
- * The basic building blocks (components or widgets) in LittlevGL are the graphical objects.
- * For example:
- *  - Buttons
- *  - Labels
- *  - Charts
- *  - Sliders etc
- *
- * In this part you can learn the basics of the objects like creating, positioning, sizing etc.
- * You will also meet some different object types and their attributes.
- *
- * Regardless to the object type the 'lv_obj_t' variable type is used stores the objects
- * and you can refer to an object with an lv_obj_t pointer (lv_obj_t *)
- *
- * INHERITANCE
- * -------------
- * Similarly to object oriented languages some kind of inheritance is used
- * among the object types.
- *
- * Every object is derived from the 'Basic object'. (lv_obj)
- *
- * The types are backward compatible which means a type can use all the ancestor
- * attributes/functions too.
- *
- * For example a 'Button' is derived from 'Container'  which is derived from 'Basic objects'.
- * Therefore a button can use container attributes like automatically fit size to the content.
- *
- * PARENT-CHILD
- * -------------
- * A parent can be considered as the container of its children.
- * Every object has exactly one parent object (except screens).
- * A parent can have unlimited number of children.
- * There is no limitation for the type of the parent.
- *
- * The children are visible only on their parent. The parts outside will be cropped (not displayed)
- *
- * If the parent is moved the children will be moved with it.
- *
- * The earlier created object (and its children) will drawn earlier.
- * Using this layers can be built.
- *
- * LEARN MORE
- * -------------
- * - General overview: http://www.gl.littlev.hu/objects
- * - Detailed description of types: http://www.gl.littlev.hu/object-types
- *
- * NOTES
- * -------------
- * - Be sure 'LV_OBJ_FREE_P' is enabled in 'lv_conf.h'
- */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_ex_objects.h"
-#if USE_LV_EXAMPLE != 0
-
-#include "lvgl/lvgl.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-static  lv_action_res_t btn_rel_action(lv_obj_t * btn, lv_dispi_t * dispi);
-static  lv_action_res_t ddlist_action(lv_obj_t * ddlist, lv_dispi_t * dispi);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Initialize the Object usage example
- */
-void lv_ex_objects(void)
-{
-
-    /********************
-     * CREATE A SCREEN
-     *******************/
-
-    /* Create a new screen and load it
-     * Screen can be created from any type object
-     * Now a Page is used which is an objects with scrollable content*/
-    lv_obj_t * scr = lv_page_create(NULL, NULL);
-    lv_scr_load(scr);
-
-
-    /****************
-     * ADD A TITLE
-     ****************/
-    lv_obj_t * label = lv_label_create(scr, NULL);  /*First parameters (scr) is the parent*/
-    lv_label_set_text(label, "Object usage demo");  /*Set the text*/
-    lv_obj_set_x(label, 50);       /*Labels are inherited from Basic object so 'lv_obj_...' functions can be used*/
-
-
-    /********************
-     * CREATE TWO BUTTONS
-     ********************/
-
-    /*Create a button*/
-    lv_obj_t * btn1 = lv_btn_create(lv_scr_act(), NULL);    /*Create a button on the currently loaded screen*/
-    lv_btn_set_rel_action(btn1, btn_rel_action);            /*Set function to call when the button is released*/
-    lv_obj_align(btn1, label, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 20); /*Align below the label*/
-    label = lv_label_create(btn1, NULL);                    /*Create a label on the button (the 'label' variable can be reused)*/
-    lv_label_set_text(label, "Button 1");
-
-    /*Copy the previous button*/
-    lv_obj_t * btn2 = lv_btn_create(lv_scr_act(), btn1);    /*Second parameter is an object to copy*/
-    lv_obj_align(btn2, btn1, LV_ALIGN_OUT_RIGHT_MID, 50, 0);/*Align next to the prev. button.*/
-    label = lv_label_create(btn2, NULL);                     /*Create a label on the button*/
-    lv_label_set_text(label, "Button 2");
-
-
-    /****************
-     * ADD A SLIDER
-     ****************/
-
-    /*Add a slider (inheritance: lv_obj -> lv_bar -> lv_slider)*/
-    lv_obj_t * slider = lv_slider_create(scr, NULL);                            /*Create a slider*/
-    lv_obj_set_size(slider, lv_obj_get_width(lv_scr_act())  / 3, LV_DPI / 3);   /*Set the size*/
-    lv_obj_align(slider, btn1, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 20);                /*Align below the first button*/
-    lv_bar_set_value(slider, 30);                                               /*Slider is a 'bar' so set its value like a 'bar'*/
-
-
-    /***********************
-     * ADD A DROP DOWN LIST
-     ************************/
-
-    lv_obj_t * ddlist = lv_ddlist_create(lv_scr_act(), NULL);
-    lv_obj_align(ddlist, slider, LV_ALIGN_OUT_RIGHT_TOP, 20, 0);        /*Align next to the slider*/
-    lv_obj_set_free_p(ddlist, slider);                                  /*Save the pointer of the slider in the ddlist (used in 'ddlist_action()')*/
-    lv_ddlist_set_options_str(ddlist, "None\nLittle\nHalf\nA lot\nAll");    /*Set the options*/
-    lv_ddlist_set_action(ddlist, ddlist_action);                        /*Set function to call on new option choose*/
-    lv_obj_set_top(ddlist, true);                                       /*Enable the drop down list always be on the top*/
-
-
-    /****************
-     * CREATE A CHART
-     ****************/
-    lv_obj_t * chart = lv_chart_create(lv_scr_act(), NULL);         /*Craete the chart*/
-    lv_obj_set_size(chart, lv_obj_get_width(scr) / 2, lv_obj_get_width(scr) / 4);   /*Set the size*/
-    lv_obj_align(chart, slider, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 20);   /*Align below the slider*/
-    lv_chart_set_dl_width(chart, 3 * LV_DOWNSCALE);                 /*Set the line width (LV_DOWNSCALE compensates anti-aliasing if enabled)*/
-
-    /*Add a RED data line and set some points*/
-    lv_chart_dl_t * dl1 = lv_chart_add_data_line(chart, COLOR_RED);
-    lv_chart_set_next(chart, dl1, 10);
-    lv_chart_set_next(chart, dl1, 25);
-    lv_chart_set_next(chart, dl1, 45);
-    lv_chart_set_next(chart, dl1, 80);
-
-    /*Add a BLUE data line and set some points*/
-    lv_chart_dl_t * dl2 = lv_chart_add_data_line(chart, COLOR_MAKE(0x40, 0x70, 0xC0));
-    lv_chart_set_next(chart, dl2, 10);
-    lv_chart_set_next(chart, dl2, 25);
-    lv_chart_set_next(chart, dl2, 45);
-    lv_chart_set_next(chart, dl2, 80);
-    lv_chart_set_next(chart, dl2, 75);
-    lv_chart_set_next(chart, dl2, 505);
-
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-/**
- * Called when a button is released
- * @param btn pointer to the released button
- * @param dispi pointer to caller display input (e.g. touchpad)
- * @return LV_ACTION_RES_OK because the object is not deleted in this function
- */
-static  lv_action_res_t btn_rel_action(lv_obj_t * btn, lv_dispi_t * dispi)
-{
-    /*Increase the button width*/
-    cord_t width = lv_obj_get_width(btn);
-    lv_obj_set_width(btn, width + 20);
-
-    return LV_ACTION_RES_OK;
-}
-
-/**
- * Called when a new option is chosen in the drop down list
- * @param ddlist pointer to the drop down list
- * @param dispi pointer to caller display input (e.g. touchpad)
- * @return LV_ACTION_RES_OK because the object is not deleted in this function
- */
-static  lv_action_res_t ddlist_action(lv_obj_t * ddlist, lv_dispi_t * dispi)
-{
-    uint16_t opt = lv_ddlist_get_selected(ddlist);      /*Get the id of selected option*/
-
-    lv_obj_t * slider = lv_obj_get_free_p(ddlist);      /*Get the saved slider*/
-    lv_bar_set_value(slider, (opt * 100) / 4);          /*Modify the slider value according to the selection*/
-
-    return LV_ACTION_RES_OK;
-}
-
-#endif /*USE_LV_EXAMPLE != 0*/

lv_examples/1_3_styles/lv_ex_styles.c

@@ -1,161 +0,0 @@
-/**
- * @file lv_ex_styles.h
- *
- */
-
-/*
- * You can modify the appearance of the graphical objects with styles.
- * A style is simple 'lv_style_t' variable.
- * Objects save the address of this variable so it has to be 'static or 'global'.
- *
- * A style contains various attributes to describe rectangle, image or text like
- * objects at same time. To know which attribute is used by an object see:
- * http://www.gl.littlev.hu/object-types
- *
- * To set a new style for an object use: 'lv_obj_set_style(obj, &style);
- * If NULL is set as style then the object will inherit the parents style.
- * For example is you create a style for button the label appearance can be defined there as well.
- *
- * You can use built-in styles. 'lv_style_get(LV_STYLE_... , &copy)' will give you a pointer to built in style
- * and copy it to variable (second parameter) if it is not NULL.
- * By default the objects use the built-in styles.
- * The built-in styles can be modified in run time to give a new default skin to your GUI.
- *
- * Learn more here: http://www.gl.littlev.hu/objects#style
- * */
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_ex_styles.h"
-
-#if USE_LV_EXAMPLE != 0
-
-#include "lvgl/lvgl.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Create a simple 'Hello world!' label
- */
-void lv_ex_styles(void)
-{
-
-    /****************************************
-     * BASE OBJECT + LABEL WITH DEFAULT STYLE
-     ****************************************/
-
-    lv_obj_t * obj1;
-    obj1 = lv_obj_create(lv_scr_act(), NULL);           /*Create a simple objects*/
-    lv_obj_set_pos(obj1, 10, 10);
-    lv_obj_t * label = lv_label_create(obj1, NULL);
-
-    /*Add a label to the object*/
-    lv_label_set_text(label, "Default");
-    lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, 0);
-
-    /****************************************
-     * BASE OBJECT WITH PRETTY COLOR STYLE
-     ****************************************/
-
-    lv_obj_t * obj2;
-    obj2 = lv_obj_create(lv_scr_act(), NULL);
-    lv_obj_align(obj2, obj1, LV_ALIGN_OUT_RIGHT_MID, 20, 0);            /*Align next to the previous object*/
-    lv_obj_set_style(obj2, lv_style_get(LV_STYLE_PRETTY_COLOR, NULL));  /*Set built in style*/
-    label = lv_label_create(obj2, NULL);
-
-    /* Add a label to the object.
-     * Labels by default inherit the parent's style */
-    lv_label_set_text(label, "Pretty\ncolor");
-    lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, 0);
-
-    /*****************************
-     * BASE OBJECT WITH NEW STYLE
-     *****************************/
-
-    /* Create a new style */
-    static lv_style_t style_new;                       /*Styles can't be local variables*/
-    lv_style_get(LV_STYLE_PRETTY_COLOR, &style_new);   /*Copy a built-in style as a starting point*/
-    style_new.radius = LV_RADIUS_CIRCLE;               /*Fully round corners*/
-    style_new.swidth = 8;                              /*8 px shadow*/
-    style_new.bwidth = 2;                              /*2 px border width*/
-    style_new.mcolor = COLOR_WHITE;                    /*White main color*/
-    style_new.gcolor = color_mix(COLOR_BLUE, COLOR_WHITE, OPA_40);     /*light blue gradient color*/
-    style_new.scolor = COLOR_MAKE(0xa0, 0xa0, 0xa0);    /*Light gray shadow color*/
-    style_new.ccolor = color_mix(COLOR_BLUE, COLOR_WHITE, OPA_90);  /*Blue content color (text color)*/
-    style_new.letter_space = 10;                       /*10 px letter space*/
-    style_new.txt_align = LV_TXT_ALIGN_MID;            /*Middel text align*/
-
-    /*Create a base object and apply the new style*/
-    lv_obj_t * obj3;
-    obj3 = lv_obj_create(lv_scr_act(), NULL);
-    lv_obj_align(obj3, obj2, LV_ALIGN_OUT_RIGHT_MID, 20, 0);
-    lv_obj_set_style(obj3, &style_new);
-
-    /* Add a label to the object.
-     * Labels by default inherit the parent's style */
-    label = lv_label_create(obj3, NULL);
-    lv_label_set_text(label, "New\nstyle");
-    lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, 0);
-
-
-    /************************
-     * CREATE A STYLED LED
-     ***********************/
-
-    /*Create a style for the LED*/
-    static lv_style_t style_led;
-    lv_style_get(LV_STYLE_PRETTY_COLOR, &style_led);
-    style_led.swidth = 15;
-    style_led.radius = LV_RADIUS_CIRCLE;
-    style_led.bwidth = 3;
-    style_led.bopa = OPA_30;
-    style_led.mcolor = COLOR_MAKE(0xb5, 0x0f, 0x04);
-    style_led.gcolor = COLOR_MAKE(0x50, 0x07, 0x02);
-    style_led.bcolor = COLOR_MAKE(0xfa, 0x0f, 0x00);
-    style_led.scolor = COLOR_MAKE(0xb5, 0x0f, 0x04);
-
-    /*Create a LED and switch it ON*/
-    lv_obj_t * led1  = lv_led_create(lv_scr_act(), NULL);
-    lv_obj_set_style(led1, &style_led);
-    lv_obj_align_us(led1, obj1, LV_ALIGN_OUT_BOTTOM_MID, 0, 40);
-    lv_led_on(led1);
-
-    /*Copy the previous LED and set a brightness*/
-    lv_obj_t * led2  = lv_led_create(lv_scr_act(), led1);
-    lv_obj_align_us(led2, obj2, LV_ALIGN_OUT_BOTTOM_MID, 0, 40);
-    lv_led_set_bright(led2, 190);
-
-    /*Copy the previous LED and switch it OFF*/
-    lv_obj_t * led3  = lv_led_create(lv_scr_act(), led1);
-    lv_obj_align_us(led3, obj3, LV_ALIGN_OUT_BOTTOM_MID, 0, 40);
-    lv_led_off(led3);
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-#endif /*USE_LV_EXAMPLE != 0*/

lv_examples/1_5_animations/lv_ex_animations.c

@@ -1 +0,0 @@
-

lv_examples/2_2_encoder_ctrl/lv_ex_encoder_ctrl.c

@@ -1,328 +0,0 @@
-/**
- * @file lv_ex_encoder_ctrl.c
- *
- */
-
-/*
- * Create a simple GUI to demonstrate how to control it with an encoder
- * using 'lv_group'.
- *
- * Be sure in lv_conf.h:
- * - LV_OBJ_GROUP   1   to enable groups
- * - LV_APP_ENABLE  0   to disable applications because they might bother now
- *
- * lv_group:
- * - you can create groups and add object to them
- * - it can be a focused object within a group
- * - the style of the focused object will be automatically modified
- * - different style modifier functions can be applied in each groups
- * - you can focus on the next or previous object (lv_group_focus_next/prev)
- * - letters can be sent to the focused object to do something (lv_group_send):
- *    - LV_GROUP_KEY_RIGHT/UP: increment action in the object
- *    - LV_GROUP_KEY_LEFT/DOWN: decrement action in the object
- *    - LV_GROUP_KEY_ENTER: ok or select action in the object
- *    - LV_GROUP_KEY_ESC: close or back action action in the object
- *    - or any character for example to a text area
- *
- * The encoder is replaced by 4 button on the screen:
- * - [>] Next (lv_group_focus_next): focus on the next object in the group (simulates encoder press)
- * - [+] IncrementNext (LV_GROUP_KEY_RIGHT): increment signal to the object (simulates rotate right)
- * - [-] DecrementNext (LV_GROUP_KEY_LEFT): increment signal to the object (simulates rotate left)
- * - [!] SelectNext (LV_GROUP_KEY_ENTER): Select something (simulates encoder long press or an 'Select' button)
- */
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_ex_encoder_ctrl.h"
-#if USE_LV_EXAMPLE != 0
-
-#include "lvgl/lvgl.h"
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- *  STATIC PROTOTYPES
- **********************/
-static void gui_create(void);
-static void enc_create(void);
-static lv_action_res_t mbox_yes_action(lv_obj_t * btn, lv_dispi_t * dispi);
-static lv_action_res_t mbox_no_action(lv_obj_t * btn, lv_dispi_t * dispi);
-static lv_action_res_t enable_action(lv_obj_t * btn, lv_dispi_t * dispi);
-static lv_action_res_t enc_next(lv_obj_t * btn, lv_dispi_t * dispi);
-static lv_action_res_t enc_inc(lv_obj_t * btn, lv_dispi_t * dispi);
-static lv_action_res_t enc_dec(lv_obj_t * btn, lv_dispi_t * dispi);
-static lv_action_res_t enc_sel(lv_obj_t * btn, lv_dispi_t * dispi);
-
-/**********************
- *  STATIC VARIABLES
- **********************/
-static lv_obj_t * scr;              /*The screen for the demo*/
-static lv_obj_t * btn_enable;       /*An enable button*/
-static lv_style_t style_mbox_bg;    /*Black bg. style with opacity*/
-static lv_group_t * g;              /*An Object Group*/
-
-/**********************
- *      MACROS
- **********************/
-
-/**********************
- *   GLOBAL FUNCTIONS
- **********************/
-
-/**
- * Create a simple GUI to demonstrate encoder control capability
- */
-void lv_ex_encoder_ctrl(void)
-{
-    /* Create a Page screen (to make it scrollable)
-     * and use Pretty layout to make the content responsive.
-     * See the 'responsive' example for more information */
-    scr = lv_page_create(NULL, NULL);
-    lv_cont_set_layout(lv_page_get_scrl(scr), LV_CONT_LAYOUT_PRETTY);
-    lv_page_set_sb_mode(scr, LV_PAGE_SB_MODE_AUTO);
-    lv_scr_load(scr);
-
-    /*Create an object group for objects to focus*/
-    g = lv_group_create();
-
-    /* Create a dark plain style for a message box's background*/
-    lv_style_get(LV_STYLE_PLAIN, &style_mbox_bg);
-    style_mbox_bg.mcolor = COLOR_BLACK;
-    style_mbox_bg.gcolor = COLOR_BLACK;
-    style_mbox_bg.opa = OPA_50;
-
-    /*Create a demo GUI*/
-    gui_create();
-
-    /*Create virtual encoder*/
-    enc_create();
-}
-
-/**********************
- *   STATIC FUNCTIONS
- **********************/
-
-/**
- * Create a demo GUI
- */
-static void gui_create(void)
-{
-    /*Create a title*/
-    lv_obj_t * title = lv_label_create(scr, NULL);
-    lv_label_set_text(title, "Encoder control");
-    lv_obj_set_protect(title, LV_PROTECT_FOLLOW);   /*Make a line break in the layout*/
-
-    /*Create a drop down list*/
-    lv_obj_t * ddlist = lv_ddlist_create(scr, NULL);
-    lv_ddlist_set_options_str(ddlist, "Low\nMedium\nHigh");
-    lv_group_add_obj(g, ddlist);                    /*Add the object to the group*/
-
-    /*Create a holder an check boxes on it*/
-    lv_obj_t * holder = lv_cont_create(scr, NULL);   /*Create a transparent holder*/
-    lv_cont_set_fit(holder, true, true);
-    lv_cont_set_layout(holder, LV_CONT_LAYOUT_COL_L);
-    lv_obj_set_style(holder, lv_style_get(LV_STYLE_TRANSP, NULL));
-
-    lv_obj_t * cb = lv_cb_create(holder, NULL);     /*First check box*/
-    lv_cb_set_text(cb, "Red");
-    lv_group_add_obj(g, cb);                        /*Add to the group*/
-
-    cb = lv_cb_create(holder, cb);                  /*Copy the first check box. Automatically added to the same group*/
-    lv_cb_set_text(cb, "Green");
-
-    cb = lv_cb_create(holder, cb);                  /*Copy the second check box. Automatically added to the same group*/
-    lv_cb_set_text(cb, "Blue");
-
-    /*Create a sliders*/
-    lv_obj_t * slider = lv_slider_create(scr, NULL);
-    lv_obj_set_size_us(slider, 180, 30);
-    lv_bar_set_range(slider, 0, 20);
-    lv_group_add_obj(g, slider);                    /*Add to the group*/
-
-    /*Create a button*/
-    btn_enable = lv_btn_create(scr, NULL);
-    lv_btn_set_rel_action(btn_enable, enable_action);
-    lv_cont_set_fit(btn_enable, true, true);
-    lv_group_add_obj(g, btn_enable);                /*Add to the group*/
-    lv_obj_t * l = lv_label_create(btn_enable, NULL);
-    lv_label_set_text(l, "Enable");
-    lv_obj_set_protect(btn_enable, LV_PROTECT_FOLLOW); /*Make a line break in the layout*/
-}
-
-/**
- * Create virtual encoder using 4 buttons:
- * - [>] Next: focus on the next object in the group (simulates encoder press)
- * - [+] Increment: increment signal to the object (simulates rotate right)
- * - [-] Decrement: increment signal to the object (simulates rotate left)
- * - [!] Select: Select something (simulates encoder long press or an 'Select' button)
- */
-static void enc_create(void)
-{
-    /*Next button*/
-    lv_obj_t * btn = lv_btn_create(lv_scr_act(), NULL);
-    lv_btn_set_rel_action(btn, enc_next);
-    lv_cont_set_fit(btn, true, true);
-    lv_obj_t * l = lv_label_create(btn, NULL);
-    lv_label_set_text(l, ">");
-
-    /*Increment button*/
-    btn = lv_btn_create(lv_scr_act(), btn);
-    lv_btn_set_rel_action(btn, enc_dec);
-    l = lv_label_create(btn, NULL);
-    lv_label_set_text(l, "-");
-
-    /*Decrement button*/
-    btn = lv_btn_create(lv_scr_act(), btn);
-    lv_btn_set_rel_action(btn, enc_inc);
-    l = lv_label_create(btn, NULL);
-    lv_label_set_text(l, "+");
-
-    /*Select button*/
-    btn = lv_btn_create(lv_scr_act(), btn);
-    lv_btn_set_rel_action(btn, enc_sel);
-    l = lv_label_create(btn, NULL);
-    lv_label_set_text(l, "!");
-}
-
-/**
- * Called when the Enable button is released. Show a message box to really enable or not?
- * @param btn pointer to the Enable button
- * @param dispi pointer to the caller display input or NULL if the encoder used
- * @return LV_ACTION_RES_OK: because the button is not deleted
- */
-static lv_action_res_t enable_action(lv_obj_t * btn, lv_dispi_t * dispi)
-{
-    /*If the butto nsi released the show message box to be sure about the Enable*/
-    if(lv_btn_get_state(btn) == LV_BTN_STATE_REL) {
-        /* Create a dark screen sized bg. with opacity to show
-         * the other objects are not available now*/
-        lv_obj_t * bg = lv_obj_create(scr, NULL);
-        lv_obj_set_protect(bg, LV_PROTECT_PARENT);          /*The page screen move it to scrollable area*/
-        lv_obj_set_parent(bg, scr);                         /*So movi it back ater protected*/
-        lv_obj_set_style(bg, &style_mbox_bg);
-        lv_obj_set_size(bg, LV_HOR_RES, LV_VER_RES);
-        lv_obj_set_pos(bg, 0, 0);
-        lv_obj_set_click(bg, false);                        /*For test disable click there fore buttons under it remain  clickable*/
-
-        /*Create a message box*/
-        lv_obj_t * mbox = lv_mbox_create(bg, NULL);
-        lv_mbox_set_text(mbox, "Really Enable the outputs?");
-        lv_group_add_obj(g, mbox);          /*Add to he group*/
-
-        /*Add two buttons*/
-        lv_mbox_add_btn(mbox, "Yes", mbox_yes_action);
-        lv_mbox_add_btn(mbox, "No", mbox_no_action);
-
-        lv_obj_align(mbox, NULL, LV_ALIGN_CENTER, 0, - LV_DPI / 2);
-
-        /*Focus on the new message box, can freeze focus on it*/
-        lv_group_focus_obj(mbox);
-        lv_group_focus_freeze(g, true);
-    }
-    /*Disable is not dangerous so just change the button state*/
-    else {
-        lv_btn_set_state(btn_enable, LV_BTN_STATE_REL);
-    }
-    return LV_ACTION_RES_OK;
-}
-
-/**
- * Called when the message box's 'Yes' button is released
- * @param btn pointer to the 'Yes' button
- * @param dispi pointer to the caller display input or NULL if the encoder used
- * @return LV_ACTION_RES_INV: because the button along with the message box will be deleted
- */
-static lv_action_res_t mbox_yes_action(lv_obj_t * btn, lv_dispi_t * dispi)
-{
-    lv_group_focus_freeze(g, false);        /*Release the freeze*/
-    lv_obj_t * mbox = lv_mbox_get_from_btn(btn);
-    lv_obj_del(lv_obj_get_parent(mbox));    /*Delete the black background. (it will delete the mbox too)*/
-
-    /*Mark the enabled state by toggling the button*/
-    lv_btn_set_state(btn_enable, LV_BTN_STATE_TREL);
-
-    /* In a real case you can add some specific actions here
-     * to really enable something */
-
-    return LV_ACTION_RES_INV;
-}
-
-/**
- * Called when the message box's 'No' button is released
- * @param btn pointer to the 'No' button
- * @param dispi pointer to the caller display input or NULL if the encoder used
- * @return LV_ACTION_RES_INV: because the button along with the message box will be deleted
- */
-static lv_action_res_t mbox_no_action(lv_obj_t * btn, lv_dispi_t * dispi)
-{
-    lv_group_focus_freeze(g, false);        /*Release the freeze*/
-    lv_obj_t * mbox = lv_mbox_get_from_btn(btn);
-    lv_obj_del(lv_obj_get_parent(mbox));    /*Delete the black background. (it will delete the mbox too)*/
-
-    return LV_ACTION_RES_INV;
-}
-
-/**
- * Called when the Encoder emulator's Next button is released
- * @param btn pointer to the button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_OK: because the button is not deleted
- */
-static lv_action_res_t enc_next(lv_obj_t * btn, lv_dispi_t * dispi)
-{
-    /*Focus on the next object in the group*/
-    lv_group_focus_next(g);
-
-    return LV_ACTION_RES_OK;
-}
-
-/**
- * Called when the Encoder emulator's Increment button is released
- * @param btn pointer to the button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_OK: because the button is not deleted
- */
-static lv_action_res_t enc_inc(lv_obj_t * btn, lv_dispi_t * dispi)
-{
-    /* Send RIGHT key when rotate to right.
-     * It will trigger an increment like action in the object */
-    lv_group_send(g, LV_GROUP_KEY_RIGHT);
-    return LV_ACTION_RES_OK;
-}
-
-/**
- * Called when the Encoder emulator's Increment button is released
- * @param btn pointer to the button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_OK: because the button is not deleted
- */
-static lv_action_res_t enc_dec(lv_obj_t * btn, lv_dispi_t * dispi)
-{
-    /* Send LEFT key when rotate to left.
-     * It will trigger a decrement like action in the object */
-    lv_group_send(g, LV_GROUP_KEY_LEFT);
-
-    return LV_ACTION_RES_OK;
-}
-/**
- * Called when the Encoder emulator's Send button is released
- * @param btn pointer to the button
- * @param dispi pointer to the caller display input
- * @return LV_ACTION_RES_OK: because the button is not deleted
- */
-static lv_action_res_t enc_sel(lv_obj_t * btn, lv_dispi_t * dispi)
-{
-    /* Send ENTER key.
-     * It will trigger an 'OK' or 'Select' action in the object */
-    lv_group_send(g, LV_GROUP_KEY_ENTER);
-
-    return LV_ACTION_RES_OK;
-}
-
-#endif /*USE_LV_EXAMPLE != 0*/

lv_examples/2_2_encoder_ctrl/lv_ex_encoder_ctrl.h

@@ -1,42 +0,0 @@
-/**
- * @file lv_ex_encoder_ctrl.h
- *
- */
-
-#ifndef LV_EX_ENCODER_CTRL_H
-#define LV_EX_ENCODER_CTRL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*********************
- *      INCLUDES
- *********************/
-#include "lv_conf.h"
-#if USE_LV_EXAMPLE != 0
-
-/*********************
- *      DEFINES
- *********************/
-
-/**********************
- *      TYPEDEFS
- **********************/
-
-/**********************
- * GLOBAL PROTOTYPES
- **********************/
-void lv_ex_encoder_ctrl(void);
-
-/**********************
- *      MACROS
- **********************/
-
-#endif /*USE_LV_EXAMPLE != 0*/
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /*ENCODER_CTRL_H*/