BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lvgl
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
lvgl
Commits
4ecee47c
Commit
4ecee47c
authored
Jan 19, 2018
by
Gabor Kiss-Vamosi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add dependecy check to some object types
parent
5db75661
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
42 additions
and
7 deletions
+42
-7
lv_conf_templ.h
lv_conf_templ.h
+4
-4
lv_draw.c
lv_draw/lv_draw.c
+3
-1
lv_ufs.c
lv_misc/lv_ufs.c
+2
-2
lv_img.c
lv_objx/lv_img.c
+9
-0
lv_kb.h
lv_objx/lv_kb.h
+9
-0
lv_roller.h
lv_objx/lv_roller.h
+5
-0
lv_slider.h
lv_objx/lv_slider.h
+5
-0
lv_sw.c
lv_objx/lv_sw.c
+5
-0
No files found.
lv_conf_templ.h
View file @
4ecee47c
...
...
@@ -204,10 +204,10 @@
/*Page (dependencies: lv_cont)*/
#define USE_LV_PAGE 1
/*Window (dependencies: lv_
cont, lv_
btn, lv_label, lv_img, lv_page)*/
/*Window (dependencies: lv_btn, lv_label, lv_img, lv_page)*/
#define USE_LV_WIN 1
/*Tab (dependencies: lv_page, lv_btnm)*/
/*Tab
view
(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)*/
...
...
@@ -220,7 +220,7 @@
/*Bar (dependencies: -)*/
#define USE_LV_BAR 1
/*Line meter (dependencies:
*;
)*/
/*Line meter (dependencies:
-
)*/
#define USE_LV_LMETER 1
/*Gauge (dependencies:bar, lmeter)*/
...
...
@@ -232,7 +232,7 @@
/*LED (dependencies: -)*/
#define USE_LV_LED 1
/*Message box (dependencies: lv_
rec
t, lv_btnm, lv_label)*/
/*Message box (dependencies: lv_
con
t, lv_btnm, lv_label)*/
#define USE_LV_MBOX 1
/*Text area (dependencies: lv_label, lv_page)*/
...
...
lv_draw/lv_draw.c
View file @
4ecee47c
...
...
@@ -71,7 +71,9 @@ static void (*letter_fp)(const lv_point_t * pos_p, const lv_area_t * mask, const
static
void
(
*
map_fp
)(
const
lv_area_t
*
coords
,
const
lv_area_t
*
mask
,
const
lv_color_t
*
map_p
,
lv_opa_t
opa
,
bool
transp
,
bool
upscale
,
lv_color_t
recolor
,
lv_opa_t
recolor_opa
)
=
lv_vmap
;
#endif
#else
//static void (*px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_rpx;
/* px_fp used only by shadow drawing the shadows are not drawn with out VDB
* static void (*px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_color_t color, lv_opa_t opa) = lv_rpx;
*/
static
void
(
*
fill_fp
)(
const
lv_area_t
*
coords
,
const
lv_area_t
*
mask
,
lv_color_t
color
,
lv_opa_t
opa
)
=
lv_rfill
;
static
void
(
*
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
)
=
lv_rletter
;
#if USE_LV_IMG
...
...
lv_misc/lv_ufs.c
View file @
4ecee47c
...
...
@@ -7,9 +7,9 @@
/*********************
* INCLUDES
*********************/
#include "../../lv_conf.h"
#if USE_LV_FILESYSTEM
#include "lv_ufs.h"
#if USE_LV_FILESYSTEM
#include "lv_ll.h"
#include <string.h>
#include <stdio.h>
...
...
lv_objx/lv_img.c
View file @
4ecee47c
...
...
@@ -9,6 +9,15 @@
#include "../../lv_conf.h"
#if USE_LV_IMG != 0
/*Testing of dependencies*/
#if USE_LV_LABEL == 0
#error "lv_img: lv_label is required. Enable it in lv_conf.h (USE_LV_LABEL 1) "
#endif
#if USE_LV_FILESYSTEM == 0
#error "lv_img: lv_fs is required. Enable it in lv_conf.h (USE_LV_FILESYSTEM 1) "
#endif
#include "lv_img.h"
#include "../lv_draw/lv_draw.h"
#include "../lv_themes/lv_theme.h"
...
...
lv_objx/lv_kb.h
View file @
4ecee47c
...
...
@@ -16,6 +16,15 @@ extern "C" {
#include "../../lv_conf.h"
#if USE_LV_KB != 0
/*Testing of dependencies*/
#if USE_LV_BTNM == 0
#error "lv_kb: lv_btnm is required. Enable it in lv_conf.h (USE_LV_BTNM 1) "
#endif
#if USE_LV_TA == 0
#error "lv_kb: lv_ta is required. Enable it in lv_conf.h (USE_LV_TA 1) "
#endif
#include "../lv_core/lv_obj.h"
#include "lv_btnm.h"
...
...
lv_objx/lv_roller.h
View file @
4ecee47c
...
...
@@ -16,6 +16,11 @@ extern "C" {
#include "../../lv_conf.h"
#if USE_LV_ROLLER != 0
/*Testing of dependencies*/
#if USE_LV_DDLIST == 0
#error "lv_roller: lv_ddlist is required. Enable it in lv_conf.h (USE_LV_DDLIST 1) "
#endif
#include "../lv_core/lv_obj.h"
#include "lv_ddlist.h"
...
...
lv_objx/lv_slider.h
View file @
4ecee47c
...
...
@@ -16,6 +16,11 @@ extern "C" {
#include "../../lv_conf.h"
#if USE_LV_SLIDER != 0
/*Testing of dependencies*/
#if USE_LV_BAR == 0
#error "lv_slider: lv_bar is required. Enable it in lv_conf.h (USE_LV_BAR 1) "
#endif
#include "../lv_core/lv_obj.h"
#include "lv_bar.h"
...
...
lv_objx/lv_sw.c
View file @
4ecee47c
...
...
@@ -9,6 +9,11 @@
#include "../../lv_conf.h"
#if USE_LV_SW != 0
/*Testing of dependencies*/
#if USE_LV_SLIDER == 0
#error "lv_sw: lv_slider is required. Enable it in lv_conf.h (USE_LV_SLIDER 1) "
#endif
#include "lv_sw.h"
#include "../lv_themes/lv_theme.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment