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
7d302574
Commit
7d302574
authored
Jan 16, 2018
by
Zaltora
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix warning/error for Graphics feature usage
parent
ee4a4190
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
1 deletion
+22
-1
lv_draw.c
lv_draw/lv_draw.c
+2
-0
lv_ufs.c
lv_misc/lv_ufs.c
+3
-0
lv_ufs.h
lv_misc/lv_ufs.h
+6
-0
lv_list.c
lv_objx/lv_list.c
+4
-0
lv_mbox.c
lv_objx/lv_mbox.c
+1
-1
lv_ta.c
lv_objx/lv_ta.c
+6
-0
No files found.
lv_draw/lv_draw.c
View file @
7d302574
...
@@ -67,7 +67,9 @@ static void (*px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_colo
...
@@ -67,7 +67,9 @@ static void (*px_fp)(lv_coord_t x, lv_coord_t y, const lv_area_t * mask, lv_colo
#endif
#endif
static
void
(
*
fill_fp
)(
const
lv_area_t
*
coords
,
const
lv_area_t
*
mask
,
lv_color_t
color
,
lv_opa_t
opa
)
=
lv_vfill
;
static
void
(
*
fill_fp
)(
const
lv_area_t
*
coords
,
const
lv_area_t
*
mask
,
lv_color_t
color
,
lv_opa_t
opa
)
=
lv_vfill
;
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_vletter
;
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_vletter
;
#if USE_LV_IMG
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
;
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
#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;
//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
(
*
fill_fp
)(
const
lv_area_t
*
coords
,
const
lv_area_t
*
mask
,
lv_color_t
color
,
lv_opa_t
opa
)
=
lv_rfill
;
...
...
lv_misc/lv_ufs.c
View file @
7d302574
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
* INCLUDES
* INCLUDES
*********************/
*********************/
#include "../../lv_conf.h"
#include "../../lv_conf.h"
#if USE_LV_FILESYSTEM
#include "lv_ufs.h"
#include "lv_ufs.h"
#include "lv_ll.h"
#include "lv_ll.h"
#include <string.h>
#include <string.h>
...
@@ -500,3 +501,5 @@ static lv_ufs_ent_t* lv_ufs_ent_new(const char * fn)
...
@@ -500,3 +501,5 @@ static lv_ufs_ent_t* lv_ufs_ent_new(const char * fn)
return
new_ent
;
return
new_ent
;
}
}
#endif
/*USE_LV_FILESYSTEM*/
lv_misc/lv_ufs.h
View file @
7d302574
...
@@ -15,6 +15,10 @@ extern "C" {
...
@@ -15,6 +15,10 @@ extern "C" {
/*********************
/*********************
* INCLUDES
* INCLUDES
*********************/
*********************/
#include "../../lv_conf.h"
#if USE_LV_FILESYSTEM
#include <stdbool.h>
#include <stdbool.h>
#include "lv_fs.h"
#include "lv_fs.h"
#include "lv_mem.h"
#include "lv_mem.h"
...
@@ -197,6 +201,8 @@ lv_fs_res_t lv_ufs_free (uint32_t * total_p, uint32_t * free_p);
...
@@ -197,6 +201,8 @@ lv_fs_res_t lv_ufs_free (uint32_t * total_p, uint32_t * free_p);
* MACROS
* MACROS
**********************/
**********************/
#endif
/*USE_LV_FILESYSTEM*/
#ifdef __cplusplus
#ifdef __cplusplus
}
/* extern "C" */
}
/* extern "C" */
#endif
#endif
...
...
lv_objx/lv_list.c
View file @
7d302574
...
@@ -44,7 +44,9 @@ static void refr_btn_width(lv_obj_t *list);
...
@@ -44,7 +44,9 @@ static void refr_btn_width(lv_obj_t *list);
* STATIC VARIABLES
* STATIC VARIABLES
**********************/
**********************/
static
lv_signal_func_t
btn_signal
;
static
lv_signal_func_t
btn_signal
;
#if USE_LV_IMG
static
lv_signal_func_t
img_signal
;
static
lv_signal_func_t
img_signal
;
#endif
static
lv_signal_func_t
label_signal
;
static
lv_signal_func_t
label_signal
;
static
lv_signal_func_t
ancestor_signal
;
static
lv_signal_func_t
ancestor_signal
;
...
@@ -110,8 +112,10 @@ lv_obj_t * lv_list_create(lv_obj_t * par, lv_obj_t * copy)
...
@@ -110,8 +112,10 @@ lv_obj_t * lv_list_create(lv_obj_t * par, lv_obj_t * copy)
lv_obj_t
*
new_btn
;
lv_obj_t
*
new_btn
;
while
(
copy_btn
)
{
while
(
copy_btn
)
{
new_btn
=
lv_btn_create
(
new_list
,
copy_btn
);
new_btn
=
lv_btn_create
(
new_list
,
copy_btn
);
#if USE_LV_IMG
lv_obj_t
*
copy_img
=
lv_list_get_btn_img
(
copy_btn
);
lv_obj_t
*
copy_img
=
lv_list_get_btn_img
(
copy_btn
);
if
(
copy_img
)
lv_img_create
(
new_btn
,
copy_img
);
if
(
copy_img
)
lv_img_create
(
new_btn
,
copy_img
);
#endif
lv_label_create
(
new_btn
,
lv_list_get_btn_label
(
copy_btn
));
lv_label_create
(
new_btn
,
lv_list_get_btn_label
(
copy_btn
));
copy_btn
=
lv_obj_get_child_back
(
lv_page_get_scrl
(
copy
),
copy_btn
);
copy_btn
=
lv_obj_get_child_back
(
lv_page_get_scrl
(
copy
),
copy_btn
);
}
}
...
...
lv_objx/lv_mbox.c
View file @
7d302574
...
@@ -198,9 +198,9 @@ void lv_mbox_set_anim_time(lv_obj_t * mbox, uint16_t time)
...
@@ -198,9 +198,9 @@ void lv_mbox_set_anim_time(lv_obj_t * mbox, uint16_t time)
*/
*/
void
lv_mbox_start_auto_close
(
lv_obj_t
*
mbox
,
uint16_t
delay
)
void
lv_mbox_start_auto_close
(
lv_obj_t
*
mbox
,
uint16_t
delay
)
{
{
#if USE_LV_ANIMATION
lv_mbox_ext_t
*
ext
=
lv_obj_get_ext_attr
(
mbox
);
lv_mbox_ext_t
*
ext
=
lv_obj_get_ext_attr
(
mbox
);
#if USE_LV_ANIMATION
if
(
ext
->
anim_time
!=
0
)
{
if
(
ext
->
anim_time
!=
0
)
{
/*Add shrinking animations*/
/*Add shrinking animations*/
lv_obj_animate
(
mbox
,
LV_ANIM_GROW_H
|
LV_ANIM_OUT
,
ext
->
anim_time
,
delay
,
NULL
);
lv_obj_animate
(
mbox
,
LV_ANIM_GROW_H
|
LV_ANIM_OUT
,
ext
->
anim_time
,
delay
,
NULL
);
...
...
lv_objx/lv_ta.c
View file @
7d302574
...
@@ -45,8 +45,10 @@ static bool lv_ta_design(lv_obj_t * ta, const lv_area_t * mask, lv_design_mode_t
...
@@ -45,8 +45,10 @@ static bool lv_ta_design(lv_obj_t * ta, const lv_area_t * mask, lv_design_mode_t
static
bool
lv_ta_scrollable_design
(
lv_obj_t
*
scrl
,
const
lv_area_t
*
mask
,
lv_design_mode_t
mode
);
static
bool
lv_ta_scrollable_design
(
lv_obj_t
*
scrl
,
const
lv_area_t
*
mask
,
lv_design_mode_t
mode
);
static
lv_res_t
lv_ta_signal
(
lv_obj_t
*
ta
,
lv_signal_t
sign
,
void
*
param
);
static
lv_res_t
lv_ta_signal
(
lv_obj_t
*
ta
,
lv_signal_t
sign
,
void
*
param
);
static
lv_res_t
lv_ta_scrollable_signal
(
lv_obj_t
*
scrl
,
lv_signal_t
sign
,
void
*
param
);
static
lv_res_t
lv_ta_scrollable_signal
(
lv_obj_t
*
scrl
,
lv_signal_t
sign
,
void
*
param
);
#if USE_LV_ANIMATION
static
void
cursor_blink_anim
(
lv_obj_t
*
ta
,
uint8_t
show
);
static
void
cursor_blink_anim
(
lv_obj_t
*
ta
,
uint8_t
show
);
static
void
pwd_char_hider_anim
(
lv_obj_t
*
ta
,
int32_t
x
);
static
void
pwd_char_hider_anim
(
lv_obj_t
*
ta
,
int32_t
x
);
#endif
static
void
pwd_char_hider
(
lv_obj_t
*
ta
);
static
void
pwd_char_hider
(
lv_obj_t
*
ta
);
/**********************
/**********************
...
@@ -987,6 +989,8 @@ static lv_res_t lv_ta_scrollable_signal(lv_obj_t * scrl, lv_signal_t sign, void
...
@@ -987,6 +989,8 @@ static lv_res_t lv_ta_scrollable_signal(lv_obj_t * scrl, lv_signal_t sign, void
return
res
;
return
res
;
}
}
#if USE_LV_ANIMATION
/**
/**
* Called to blink the cursor
* Called to blink the cursor
* @param ta pointer to a text area
* @param ta pointer to a text area
...
@@ -1018,6 +1022,8 @@ static void pwd_char_hider_anim(lv_obj_t * ta, int32_t x)
...
@@ -1018,6 +1022,8 @@ static void pwd_char_hider_anim(lv_obj_t * ta, int32_t x)
(
void
)
x
;
(
void
)
x
;
}
}
#endif
/**
/**
* Hide all characters (convert them to '*')
* Hide all characters (convert them to '*')
* @param ta: pointer to text area object
* @param ta: pointer to text area object
...
...
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