From 51a522c8d34fa2e552b648437411fee749bc3f0a Mon Sep 17 00:00:00 2001 From: Chris Mumford Date: Sat, 24 Oct 2020 11:07:19 -0700 Subject: [PATCH] Fixed a few dangling references to lv_conf_templ.h. (#1863) --- CHANGELOG.md | 2 +- scripts/lv_conf_checker.py | 2 +- src/lv_widgets/lv_objx_templ.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9eb4a23d6..d7ac5c56d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -312,7 +312,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. ### 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. - 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. diff --git a/scripts/lv_conf_checker.py b/scripts/lv_conf_checker.py index a3c63800a..46d227cc2 100755 --- a/scripts/lv_conf_checker.py +++ b/scripts/lv_conf_checker.py @@ -1,7 +1,7 @@ #!/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 ''' diff --git a/src/lv_widgets/lv_objx_templ.c b/src/lv_widgets/lv_objx_templ.c index 2e4651823..649fbb8dd 100644 --- a/src/lv_widgets/lv_objx_templ.c +++ b/src/lv_widgets/lv_objx_templ.c @@ -9,7 +9,7 @@ * 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 - * 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. */ /*********************