Skip to content
This repository was archived by the owner on Dec 4, 2020. It is now read-only.

Commit 3ae9a78

Browse files
Pablo2048Pablo2048
committed
LVgl 6.1.1 used
1 parent aa0a56e commit 3ae9a78

40 files changed

+135
-138
lines changed

‎library.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"type": "git",
1313
"url": "https://github.com/littlevgl/arduino"
1414
},
15-
"version": "2.0.4",
15+
"version": "2.1.4",
1616
"license": "MIT",
1717
"frameworks": "arduino",
1818
"build": {

‎library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=lv_arduino
2-
version=2.0.4
2+
version=2.1.4
33
author=Gabor Kiss-Vamosi
44
maintainer=Pavel Brychta <[email protected]>
55
sentence=Full-featured Graphics Library for embedded systems

‎src/library.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lvgl",
3-
"version": "6.0.2",
3+
"version": "6.1.1",
44
"keywords": "graphics, gui, embedded, littlevgl",
55
"description": "Graphics library to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. It offers anti-aliasing, opacity, and animations using only one frame buffer.",
66
"repository":

‎src/src/lv_core/lv_debug.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void lv_debug_log_error(const char * msg, uint64_t value)
131131
{
132132
static const char hex[] = "0123456789ABCDEF";
133133

134-
uint32_t msg_len = strlen(msg);
134+
size_t msg_len = strlen(msg);
135135
uint32_t value_len = sizeof(unsigned long int);
136136

137137
if(msg_len < 230) {

‎src/src/lv_core/lv_debug.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void lv_debug_log_error(const char * msg, uint64_t value);
4949
{ \
5050
if(!(expr)) { \
5151
LV_LOG_ERROR(__func__); \
52-
lv_debug_log_error(msg, (unsigned long int)value); \
52+
lv_debug_log_error(msg, (uint64_t)value); \
5353
while(1); \
5454
} \
5555
}

‎src/src/lv_core/lv_disp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ static inline lv_obj_t * lv_layer_top(void)
109109
}
110110

111111
/**
112-
* Get the active screen of the deafult display
112+
* Get the active screen of the default display
113113
* @return pointer to the sys layer
114114
*/
115115
static inline lv_obj_t * lv_layer_sys(void)

‎src/src/lv_core/lv_obj.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1839,7 +1839,7 @@ lv_coord_t lv_obj_get_height(const lv_obj_t * obj)
18391839
* @param obj pointer to an object
18401840
* @return the width which still fits into the container
18411841
*/
1842-
lv_coord_t lv_obj_get_width_fit(lv_obj_t * obj)
1842+
lv_coord_t lv_obj_get_width_fit(const lv_obj_t * obj)
18431843
{
18441844
LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
18451845

@@ -1853,7 +1853,7 @@ lv_coord_t lv_obj_get_width_fit(lv_obj_t * obj)
18531853
* @param obj pointer to an object
18541854
* @return the height which still fits into the container
18551855
*/
1856-
lv_coord_t lv_obj_get_height_fit(lv_obj_t * obj)
1856+
lv_coord_t lv_obj_get_height_fit(const lv_obj_t * obj)
18571857
{
18581858
LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
18591859

@@ -1867,7 +1867,7 @@ lv_coord_t lv_obj_get_height_fit(lv_obj_t * obj)
18671867
* @param obj pointer to an object
18681868
* @return true: auto realign is enabled; false: auto realign is disabled
18691869
*/
1870-
bool lv_obj_get_auto_realign(lv_obj_t * obj)
1870+
bool lv_obj_get_auto_realign(const lv_obj_t * obj)
18711871
{
18721872
LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
18731873

@@ -2250,7 +2250,7 @@ void * lv_obj_get_ext_attr(const lv_obj_t * obj)
22502250
* @param obj pointer to an object which type should be get
22512251
* @param buf pointer to an `lv_obj_type_t` buffer to store the types
22522252
*/
2253-
void lv_obj_get_type(lv_obj_t * obj, lv_obj_type_t * buf)
2253+
void lv_obj_get_type(const lv_obj_t * obj, lv_obj_type_t * buf)
22542254
{
22552255
LV_ASSERT_NULL(buf);
22562256
LV_ASSERT_NULL(obj);
@@ -2260,7 +2260,7 @@ void lv_obj_get_type(lv_obj_t * obj, lv_obj_type_t * buf)
22602260
memset(buf, 0, sizeof(lv_obj_type_t));
22612261
memset(&tmp, 0, sizeof(lv_obj_type_t));
22622262

2263-
obj->signal_cb(obj, LV_SIGNAL_GET_TYPE, &tmp);
2263+
obj->signal_cb((lv_obj_t *)obj, LV_SIGNAL_GET_TYPE, &tmp);
22642264

22652265
uint8_t cnt;
22662266
for(cnt = 0; cnt < LV_MAX_ANCESTOR_NUM; cnt++) {
@@ -2281,7 +2281,7 @@ void lv_obj_get_type(lv_obj_t * obj, lv_obj_type_t * buf)
22812281
* @param obj pointer to an object
22822282
* @return user data
22832283
*/
2284-
lv_obj_user_data_t lv_obj_get_user_data(lv_obj_t * obj)
2284+
lv_obj_user_data_t lv_obj_get_user_data(const lv_obj_t * obj)
22852285
{
22862286
LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
22872287

@@ -2293,11 +2293,11 @@ lv_obj_user_data_t lv_obj_get_user_data(lv_obj_t * obj)
22932293
* @param obj pointer to an object
22942294
* @return pointer to the user data
22952295
*/
2296-
lv_obj_user_data_t * lv_obj_get_user_data_ptr(lv_obj_t * obj)
2296+
lv_obj_user_data_t * lv_obj_get_user_data_ptr(const lv_obj_t * obj)
22972297
{
22982298
LV_ASSERT_OBJ(obj, LV_OBJX_NAME);
22992299

2300-
return &obj->user_data;
2300+
return (lv_obj_user_data_t *)&obj->user_data;
23012301
}
23022302

23032303
/**
@@ -2351,8 +2351,8 @@ bool lv_obj_is_focused(const lv_obj_t * obj)
23512351
/**
23522352
* Used in the signal callback to handle `LV_SIGNAL_GET_TYPE` signal
23532353
* @param obj pointer to an object
2354-
* @param buf pointer to `lv_obj_type_t`. (`param` i nteh signal callback)
2355-
* @param name name of the object. E.g. "lv_btn". (Only teh pointer is saved)
2354+
* @param buf pointer to `lv_obj_type_t`. (`param` in the signal callback)
2355+
* @param name name of the object. E.g. "lv_btn". (Only the pointer is saved)
23562356
* @return LV_RES_OK
23572357
*/
23582358
lv_res_t lv_obj_handle_get_type_signal(lv_obj_type_t * buf, const char * name)

‎src/src/lv_core/lv_obj.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -732,21 +732,21 @@ lv_coord_t lv_obj_get_height(const lv_obj_t * obj);
732732
* @param obj pointer to an object
733733
* @return the width which still fits into the container
734734
*/
735-
lv_coord_t lv_obj_get_width_fit(lv_obj_t * obj);
735+
lv_coord_t lv_obj_get_width_fit(const lv_obj_t * obj);
736736

737737
/**
738738
* Get that height reduced by the top an bottom padding.
739739
* @param obj pointer to an object
740740
* @return the height which still fits into the container
741741
*/
742-
lv_coord_t lv_obj_get_height_fit(lv_obj_t * obj);
742+
lv_coord_t lv_obj_get_height_fit(const lv_obj_t * obj);
743743

744744
/**
745745
* Get the automatic realign property of the object.
746746
* @param obj pointer to an object
747747
* @return true: auto realign is enabled; false: auto realign is disabled
748748
*/
749-
bool lv_obj_get_auto_realign(lv_obj_t * obj);
749+
bool lv_obj_get_auto_realign(const lv_obj_t * obj);
750750

751751
/**
752752
* Get the left padding of extended clickable area
@@ -925,22 +925,22 @@ void * lv_obj_get_ext_attr(const lv_obj_t * obj);
925925
* @param obj pointer to an object which type should be get
926926
* @param buf pointer to an `lv_obj_type_t` buffer to store the types
927927
*/
928-
void lv_obj_get_type(lv_obj_t * obj, lv_obj_type_t * buf);
928+
void lv_obj_get_type(const lv_obj_t * obj, lv_obj_type_t * buf);
929929

930930
#if LV_USE_USER_DATA
931931
/**
932932
* Get the object's user data
933933
* @param obj pointer to an object
934934
* @return user data
935935
*/
936-
lv_obj_user_data_t lv_obj_get_user_data(lv_obj_t * obj);
936+
lv_obj_user_data_t lv_obj_get_user_data(const lv_obj_t * obj);
937937

938938
/**
939939
* Get a pointer to the object's user data
940940
* @param obj pointer to an object
941941
* @return pointer to the user data
942942
*/
943-
lv_obj_user_data_t * lv_obj_get_user_data_ptr(lv_obj_t * obj);
943+
lv_obj_user_data_t * lv_obj_get_user_data_ptr(const lv_obj_t * obj);
944944

945945
/**
946946
* Set the object's user data. The data will be copied.
@@ -974,8 +974,8 @@ bool lv_obj_is_focused(const lv_obj_t * obj);
974974

975975
/**
976976
* Used in the signal callback to handle `LV_SIGNAL_GET_TYPE` signal
977-
* @param buf pointer to `lv_obj_type_t`. (`param` i nteh signal callback)
978-
* @param name name of the object. E.g. "lv_btn". (Only teh pointer is saved)
977+
* @param buf pointer to `lv_obj_type_t`. (`param` in the signal callback)
978+
* @param name name of the object. E.g. "lv_btn". (Only the pointer is saved)
979979
* @return LV_RES_OK
980980
*/
981981
lv_res_t lv_obj_handle_get_type_signal(lv_obj_type_t * buf, const char * name);

‎src/src/lv_draw/lv_draw_basic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ void lv_draw_letter(const lv_point_t * pos_p, const lv_area_t * mask_p, const lv
333333
map_p += bit_ofs >> 3;
334334

335335
uint8_t letter_px;
336-
lv_opa_t px_opa;
336+
lv_opa_t px_opa = 0;
337337
uint16_t col_bit;
338338
col_bit = bit_ofs & 0x7; /* "& 0x7" equals to "% 8" just faster */
339339

‎src/src/lv_draw/lv_draw_img.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ void lv_draw_img(const lv_area_t * coords, const lv_area_t * mask, const void *
7979
lv_color_t lv_img_buf_get_px_color(lv_img_dsc_t * dsc, lv_coord_t x, lv_coord_t y, const lv_style_t * style)
8080
{
8181
lv_color_t p_color = LV_COLOR_BLACK;
82-
if(x >= dsc->header.w) {
82+
if(x >= (lv_coord_t)dsc->header.w) {
8383
x = dsc->header.w - 1;
8484
LV_LOG_WARN("lv_canvas_get_px: x is too large (out of canvas)");
8585
} else if(x < 0) {
8686
x = 0;
8787
LV_LOG_WARN("lv_canvas_get_px: x is < 0 (out of canvas)");
8888
}
8989

90-
if(y >= dsc->header.h) {
90+
if(y >= (lv_coord_t)dsc->header.h) {
9191
y = dsc->header.h - 1;
9292
LV_LOG_WARN("lv_canvas_get_px: y is too large (out of canvas)");
9393
} else if(y < 0) {
@@ -158,15 +158,15 @@ lv_color_t lv_img_buf_get_px_color(lv_img_dsc_t * dsc, lv_coord_t x, lv_coord_t
158158
*/
159159
lv_opa_t lv_img_buf_get_px_alpha(lv_img_dsc_t * dsc, lv_coord_t x, lv_coord_t y)
160160
{
161-
if(x >= dsc->header.w) {
161+
if(x >= (lv_coord_t)dsc->header.w) {
162162
x = dsc->header.w - 1;
163163
LV_LOG_WARN("lv_canvas_get_px: x is too large (out of canvas)");
164164
} else if(x < 0) {
165165
x = 0;
166166
LV_LOG_WARN("lv_canvas_get_px: x is < 0 (out of canvas)");
167167
}
168168

169-
if(y >= dsc->header.h) {
169+
if(y >= (lv_coord_t)dsc->header.h) {
170170
y = dsc->header.h - 1;
171171
LV_LOG_WARN("lv_canvas_get_px: y is too large (out of canvas)");
172172
} else if(y < 0) {

0 commit comments

Comments
 (0)