github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 51a522c8d3 into dev

Browse Source
This commit is contained in:
github-actions[bot]
2020-10-24 18:07:52 +00:00
committed by GitHub
parent 120d579c88 51a522c8d3
commit bd59dafa42
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -317,7 +317,7 @@ The following object types are renamed:
- Merge new features and fixes directly into `master` and release a patch or minor releases every 2 weeks. - Merge new features and fixes directly into `master` and release a patch or minor releases every 2 weeks.
### Migrating from v6 to v7 ### Migrating from v6 to v7
- First and foremost, create a new `lv_conf.h` based on `lv_conf_templ.h`. - First and foremost, create a new `lv_conf.h` based on `lv_conf_template.h`.
- To try the new version it suggested using a simulator project and see the examples. - To try the new version it suggested using a simulator project and see the examples.
- If you have a running project, the most difficult part of the migration is updating to the new style system. Unfortunately, there is no better way than manually updating to the new format. - If you have a running project, the most difficult part of the migration is updating to the new style system. Unfortunately, there is no better way than manually updating to the new format.
- The other parts are mainly minor renames and refactoring as described above. - The other parts are mainly minor renames and refactoring as described above.

2
scripts/lv_conf_checker.py
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
''' '''
Generates a checker file for lv_conf.h from lv_conf_templ.h define all the not defined values Generates a checker file for lv_conf.h from lv_conf_template.h define all the not defined values
''' '''

2
src/lv_widgets/lv_objx_templ.c
View File

@@ -9,7 +9,7 @@
* TEMPL -> object short name with upper case (e.g. BTN, LABEL etc.) * TEMPL -> object short name with upper case (e.g. BTN, LABEL etc.)
* *
* You can remove the defined() clause from the #if statement below. This exists because * You can remove the defined() clause from the #if statement below. This exists because
* LV_USE_TEMPL is not in lv_conf.h or lv_conf_templ.h by default. * LV_USE_TEMPL is not in lv_conf.h or lv_conf_template.h by default.
*/ */
/********************* /*********************