fix a lot of warnings
This commit is contained in:
@@ -192,6 +192,8 @@ void lv_indev_wait_release(lv_indev_t * indev)
|
|||||||
*/
|
*/
|
||||||
static void indev_proc_task(void * param)
|
static void indev_proc_task(void * param)
|
||||||
{
|
{
|
||||||
|
(void)param;
|
||||||
|
|
||||||
lv_indev_data_t data;
|
lv_indev_data_t data;
|
||||||
lv_indev_t * i;
|
lv_indev_t * i;
|
||||||
i = lv_indev_next(NULL);
|
i = lv_indev_next(NULL);
|
||||||
|
|||||||
@@ -1428,6 +1428,8 @@ static bool lv_obj_design(lv_obj_t * obj, const lv_area_t * mask_p, lv_design_m
|
|||||||
*/
|
*/
|
||||||
static lv_res_t lv_obj_signal(lv_obj_t * obj, lv_signal_t sign, void * param)
|
static lv_res_t lv_obj_signal(lv_obj_t * obj, lv_signal_t sign, void * param)
|
||||||
{
|
{
|
||||||
|
(void)param;
|
||||||
|
|
||||||
lv_res_t res = LV_RES_OK;
|
lv_res_t res = LV_RES_OK;
|
||||||
|
|
||||||
lv_style_t * style = lv_obj_get_style(obj);
|
lv_style_t * style = lv_obj_get_style(obj);
|
||||||
|
|||||||
@@ -146,6 +146,7 @@ void lv_refr_set_monitor_cb(void (*cb)(uint32_t, uint32_t))
|
|||||||
*/
|
*/
|
||||||
static void lv_refr_task(void * param)
|
static void lv_refr_task(void * param)
|
||||||
{
|
{
|
||||||
|
(void)param;
|
||||||
|
|
||||||
uint32_t start = lv_tick_get();
|
uint32_t start = lv_tick_get();
|
||||||
|
|
||||||
@@ -257,7 +258,7 @@ static void lv_refr_area_no_vdb(const lv_area_t * area_p)
|
|||||||
static void lv_refr_area_with_vdb(const lv_area_t * area_p)
|
static void lv_refr_area_with_vdb(const lv_area_t * area_p)
|
||||||
{
|
{
|
||||||
/*Calculate the max row num*/
|
/*Calculate the max row num*/
|
||||||
uint32_t max_row = (uint32_t) LV_VDB_SIZE / (lv_area_get_width(area_p));
|
lv_coord_t max_row = (uint32_t) LV_VDB_SIZE / (lv_area_get_width(area_p));
|
||||||
if(max_row > lv_area_get_height(area_p)) max_row = lv_area_get_height(area_p);
|
if(max_row > lv_area_get_height(area_p)) max_row = lv_area_get_height(area_p);
|
||||||
|
|
||||||
/*Round the row number with downscale*/
|
/*Round the row number with downscale*/
|
||||||
|
|||||||
@@ -191,4 +191,13 @@ void lv_flush_ready(void)
|
|||||||
* STATIC FUNCTIONS
|
* STATIC FUNCTIONS
|
||||||
**********************/
|
**********************/
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Just for compatibility
|
||||||
|
*/
|
||||||
|
void lv_flush_ready(void)
|
||||||
|
{
|
||||||
|
/*Do nothing. It is used only for VDB*/
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -60,7 +60,11 @@ void lv_flush_ready(void);
|
|||||||
* MACROS
|
* MACROS
|
||||||
**********************/
|
**********************/
|
||||||
|
|
||||||
#endif /*LV_VDB_SIZE != 0*/
|
#else /*LV_VDB_SIZE != 0*/
|
||||||
|
|
||||||
|
/*Just for compatibility*/
|
||||||
|
void lv_flush_ready(void);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} /* extern "C" */
|
} /* extern "C" */
|
||||||
|
|||||||
@@ -265,7 +265,7 @@ void lv_draw_label(const lv_area_t * coords,const lv_area_t * mask, const lv_sty
|
|||||||
|
|
||||||
cmd_state_t cmd_state = CMD_STATE_WAIT;
|
cmd_state_t cmd_state = CMD_STATE_WAIT;
|
||||||
uint32_t i;
|
uint32_t i;
|
||||||
uint16_t par_start;
|
uint16_t par_start = 0;
|
||||||
lv_color_t recolor;
|
lv_color_t recolor;
|
||||||
|
|
||||||
if(offset != NULL) {
|
if(offset != NULL) {
|
||||||
@@ -285,7 +285,7 @@ void lv_draw_label(const lv_area_t * coords,const lv_area_t * mask, const lv_sty
|
|||||||
letter = lv_txt_utf8_next(txt, &i);
|
letter = lv_txt_utf8_next(txt, &i);
|
||||||
/*Handle the re-color command*/
|
/*Handle the re-color command*/
|
||||||
if((flag & LV_TXT_FLAG_RECOLOR) != 0) {
|
if((flag & LV_TXT_FLAG_RECOLOR) != 0) {
|
||||||
if(letter == LV_TXT_COLOR_CMD[0]) {
|
if(letter == (uint32_t)LV_TXT_COLOR_CMD[0]) {
|
||||||
if(cmd_state == CMD_STATE_WAIT) { /*Start char*/
|
if(cmd_state == CMD_STATE_WAIT) { /*Start char*/
|
||||||
par_start = i + lv_txt_utf8_size(txt[i]);
|
par_start = i + lv_txt_utf8_size(txt[i]);
|
||||||
cmd_state = CMD_STATE_PAR;
|
cmd_state = CMD_STATE_PAR;
|
||||||
|
|||||||
@@ -45,6 +45,8 @@
|
|||||||
*/
|
*/
|
||||||
void lv_rpx(lv_coord_t x, lv_coord_t y, const lv_area_t * mask_p, lv_color_t color, lv_opa_t opa)
|
void lv_rpx(lv_coord_t x, lv_coord_t y, const lv_area_t * mask_p, lv_color_t color, lv_opa_t opa)
|
||||||
{
|
{
|
||||||
|
(void)opa; /*Opa is used only for compatibility with lv_vpx*/
|
||||||
|
|
||||||
lv_area_t area;
|
lv_area_t area;
|
||||||
area.x1 = x;
|
area.x1 = x;
|
||||||
area.y1 = y;
|
area.y1 = y;
|
||||||
@@ -64,6 +66,9 @@ void lv_rpx(lv_coord_t x, lv_coord_t y, const lv_area_t * mask_p, lv_color_t col
|
|||||||
void lv_rfill(const lv_area_t * cords_p, const lv_area_t * mask_p,
|
void lv_rfill(const lv_area_t * cords_p, const lv_area_t * mask_p,
|
||||||
lv_color_t color, lv_opa_t opa)
|
lv_color_t color, lv_opa_t opa)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
(void)opa; /*Opa is used only for compatibility with lv_vfill*/
|
||||||
|
|
||||||
lv_area_t masked_area;
|
lv_area_t masked_area;
|
||||||
bool union_ok = true;
|
bool union_ok = true;
|
||||||
|
|
||||||
@@ -93,6 +98,8 @@ void lv_rletter(const lv_point_t * pos_p, const lv_area_t * mask_p,
|
|||||||
const lv_font_t * font_p, uint32_t letter,
|
const lv_font_t * font_p, uint32_t letter,
|
||||||
lv_color_t color, lv_opa_t opa)
|
lv_color_t color, lv_opa_t opa)
|
||||||
{
|
{
|
||||||
|
(void)opa; /*Opa is used only for compatibility with lv_vletter*/
|
||||||
|
|
||||||
uint8_t w = lv_font_get_width(font_p, letter);
|
uint8_t w = lv_font_get_width(font_p, letter);
|
||||||
|
|
||||||
if(letter == 'C') {
|
if(letter == 'C') {
|
||||||
@@ -178,6 +185,11 @@ void lv_rmap(const lv_area_t * cords_p, const lv_area_t * mask_p,
|
|||||||
const lv_color_t * map_p, lv_opa_t opa, bool transp, bool upscale,
|
const lv_color_t * map_p, lv_opa_t opa, bool transp, bool upscale,
|
||||||
lv_color_t recolor, lv_opa_t recolor_opa)
|
lv_color_t recolor, lv_opa_t recolor_opa)
|
||||||
{
|
{
|
||||||
|
(void)opa; /*opa is used only for compatibility with lv_vmap*/
|
||||||
|
(void)recolor_opa; /*recolor_opa is used only for compatibility with lv_vmap*/
|
||||||
|
(void)recolor; /*recolor is used only for compatibility with lv_vmap*/
|
||||||
|
(void)upscale; /*upscale is used only for compatibility with lv_vmap*/
|
||||||
|
|
||||||
lv_area_t masked_a;
|
lv_area_t masked_a;
|
||||||
bool union_ok;
|
bool union_ok;
|
||||||
|
|
||||||
|
|||||||
@@ -522,7 +522,7 @@ static void sw_mem_blend(lv_color_t * dest, const lv_color_t * src, uint32_t len
|
|||||||
if(opa == LV_OPA_COVER) {
|
if(opa == LV_OPA_COVER) {
|
||||||
memcpy(dest, src, length * sizeof(lv_color_t));
|
memcpy(dest, src, length * sizeof(lv_color_t));
|
||||||
} else {
|
} else {
|
||||||
lv_coord_t col;
|
uint32_t col;
|
||||||
for(col = 0; col < length; col++) {
|
for(col = 0; col < length; col++) {
|
||||||
dest[col] = lv_color_mix(src[col], dest[col], opa);
|
dest[col] = lv_color_mix(src[col], dest[col], opa);
|
||||||
}
|
}
|
||||||
@@ -541,7 +541,7 @@ static void sw_color_fill(lv_area_t * mem_area, lv_color_t * mem, const lv_area_
|
|||||||
{
|
{
|
||||||
/*Set all row in vdb to the given color*/
|
/*Set all row in vdb to the given color*/
|
||||||
lv_coord_t row;
|
lv_coord_t row;
|
||||||
uint32_t col;
|
lv_coord_t col;
|
||||||
lv_coord_t mem_width = lv_area_get_width(mem_area);
|
lv_coord_t mem_width = lv_area_get_width(mem_area);
|
||||||
|
|
||||||
/*Run simpler function without opacity*/
|
/*Run simpler function without opacity*/
|
||||||
|
|||||||
@@ -169,6 +169,8 @@ lv_anim_path_t * lv_anim_get_path(lv_anim_path_name_t name)
|
|||||||
*/
|
*/
|
||||||
static void anim_task (void * param)
|
static void anim_task (void * param)
|
||||||
{
|
{
|
||||||
|
(void)param;
|
||||||
|
|
||||||
volatile uint32_t elaps;
|
volatile uint32_t elaps;
|
||||||
elaps = lv_tick_elaps(last_task_run);
|
elaps = lv_tick_elaps(last_task_run);
|
||||||
|
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ void lv_area_set(lv_area_t * area_p, lv_coord_t x1, lv_coord_t y1, lv_coord_t x2
|
|||||||
* @param dest pointer to the destination area
|
* @param dest pointer to the destination area
|
||||||
* @param src pointer to the source area
|
* @param src pointer to the source area
|
||||||
*/
|
*/
|
||||||
static void inline lv_area_copy(lv_area_t * dest, const lv_area_t * src)
|
inline static void lv_area_copy(lv_area_t * dest, const lv_area_t * src)
|
||||||
{
|
{
|
||||||
memcpy(dest, src, sizeof(lv_area_t));
|
memcpy(dest, src, sizeof(lv_area_t));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4039,6 +4039,7 @@ lv_font_t lv_font_dejavu_40 =
|
|||||||
dejavu_40_bitmap, /*Glyph's bitmap*/
|
dejavu_40_bitmap, /*Glyph's bitmap*/
|
||||||
dejavu_40_map, /*Glyph start indexes in the bitmap*/
|
dejavu_40_map, /*Glyph start indexes in the bitmap*/
|
||||||
dejavu_40_width, /*Glyph widths (columns)*/
|
dejavu_40_width, /*Glyph widths (columns)*/
|
||||||
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*DEJAVU_40_H*/
|
#endif /*DEJAVU_40_H*/
|
||||||
|
|||||||
@@ -10841,6 +10841,7 @@ lv_font_t lv_font_dejavu_40_cyrillic =
|
|||||||
dejavu_40_cyrillic_bitmap, /*Glyph's bitmap*/
|
dejavu_40_cyrillic_bitmap, /*Glyph's bitmap*/
|
||||||
dejavu_40_cyrillic_map, /*Glyph start indexes in the bitmap*/
|
dejavu_40_cyrillic_map, /*Glyph start indexes in the bitmap*/
|
||||||
dejavu_40_cyrillic_width, /*Glyph widths (columns)*/
|
dejavu_40_cyrillic_width, /*Glyph widths (columns)*/
|
||||||
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*DEJAVU_40_CYRILLIC_H*/
|
#endif /*DEJAVU_40_CYRILLIC_H*/
|
||||||
|
|||||||
@@ -5433,6 +5433,7 @@ lv_font_t lv_font_dejavu_40_latin_ext_a =
|
|||||||
dejavu_40_latin_ext_a_bitmap, /*Glyph's bitmap*/
|
dejavu_40_latin_ext_a_bitmap, /*Glyph's bitmap*/
|
||||||
dejavu_40_latin_ext_a_map, /*Glyph start indexes in the bitmap*/
|
dejavu_40_latin_ext_a_map, /*Glyph start indexes in the bitmap*/
|
||||||
dejavu_40_latin_ext_a_width, /*Glyph widths (columns)*/
|
dejavu_40_latin_ext_a_width, /*Glyph widths (columns)*/
|
||||||
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*DEJAVU_40_LATIN_EXT_A_H*/
|
#endif /*DEJAVU_40_LATIN_EXT_A_H*/
|
||||||
|
|||||||
@@ -8813,6 +8813,7 @@ lv_font_t lv_font_dejavu_40_latin_ext_b =
|
|||||||
dejavu_40_latin_ext_b_bitmap, /*Glyph's bitmap*/
|
dejavu_40_latin_ext_b_bitmap, /*Glyph's bitmap*/
|
||||||
dejavu_40_latin_ext_b_map, /*Glyph start indexes in the bitmap*/
|
dejavu_40_latin_ext_b_map, /*Glyph start indexes in the bitmap*/
|
||||||
dejavu_40_latin_ext_b_width, /*Glyph widths (columns)*/
|
dejavu_40_latin_ext_b_width, /*Glyph widths (columns)*/
|
||||||
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*DEJAVU_40_LATIN_EXT_B_H*/
|
#endif /*DEJAVU_40_LATIN_EXT_B_H*/
|
||||||
|
|||||||
@@ -4081,6 +4081,7 @@ lv_font_t lv_font_dejavu_40_sup =
|
|||||||
dejavu_40_sup_bitmap, /*Glyph's bitmap*/
|
dejavu_40_sup_bitmap, /*Glyph's bitmap*/
|
||||||
dejavu_40_sup_map, /*Glyph start indexes in the bitmap*/
|
dejavu_40_sup_map, /*Glyph start indexes in the bitmap*/
|
||||||
dejavu_40_sup_width, /*Glyph widths (columns)*/
|
dejavu_40_sup_width, /*Glyph widths (columns)*/
|
||||||
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*DEJAVU_40_SUP_H*/
|
#endif /*DEJAVU_40_SUP_H*/
|
||||||
|
|||||||
@@ -622,6 +622,7 @@ lv_font_t lv_font_symbol_40_basic =
|
|||||||
symbol_40_basic_bitmap, /*Glyph's bitmap*/
|
symbol_40_basic_bitmap, /*Glyph's bitmap*/
|
||||||
symbol_40_basic_map, /*Glyph start indexes in the bitmap*/
|
symbol_40_basic_map, /*Glyph start indexes in the bitmap*/
|
||||||
symbol_40_basic_width, /*Glyph widths (columns)*/
|
symbol_40_basic_width, /*Glyph widths (columns)*/
|
||||||
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*SYMBOL_40_BASIC_H*/
|
#endif /*SYMBOL_40_BASIC_H*/
|
||||||
|
|||||||
@@ -664,6 +664,7 @@ lv_font_t lv_font_symbol_40_feedback =
|
|||||||
symbol_40_feedback_bitmap, /*Glyph's bitmap*/
|
symbol_40_feedback_bitmap, /*Glyph's bitmap*/
|
||||||
symbol_40_feedback_map, /*Glyph start indexes in the bitmap*/
|
symbol_40_feedback_map, /*Glyph start indexes in the bitmap*/
|
||||||
symbol_40_feedback_width, /*Glyph widths (columns)*/
|
symbol_40_feedback_width, /*Glyph widths (columns)*/
|
||||||
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*SYMBOL_40_FEEDBACK_H*/
|
#endif /*SYMBOL_40_FEEDBACK_H*/
|
||||||
|
|||||||
@@ -918,6 +918,7 @@ lv_font_t lv_font_symbol_40_file =
|
|||||||
symbol_40_file_bitmap, /*Glyph's bitmap*/
|
symbol_40_file_bitmap, /*Glyph's bitmap*/
|
||||||
symbol_40_file_map, /*Glyph start indexes in the bitmap*/
|
symbol_40_file_map, /*Glyph start indexes in the bitmap*/
|
||||||
symbol_40_file_width, /*Glyph widths (columns)*/
|
symbol_40_file_width, /*Glyph widths (columns)*/
|
||||||
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*SYMBOL_40_FILE_H*/
|
#endif /*SYMBOL_40_FILE_H*/
|
||||||
|
|||||||
@@ -903,6 +903,7 @@ lv_font_t lv_font_symbol_60_basic =
|
|||||||
symbol_60_basic_bitmap, /*Glyph's bitmap*/
|
symbol_60_basic_bitmap, /*Glyph's bitmap*/
|
||||||
symbol_60_basic_map, /*Glyph start indexes in the bitmap*/
|
symbol_60_basic_map, /*Glyph start indexes in the bitmap*/
|
||||||
symbol_60_basic_width, /*Glyph widths (columns)*/
|
symbol_60_basic_width, /*Glyph widths (columns)*/
|
||||||
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /*SYMBOL_60_BASIC_H*/
|
#endif /*SYMBOL_60_BASIC_H*/
|
||||||
|
|||||||
@@ -270,6 +270,9 @@ void * lv_ll_get_prev(lv_ll_t * ll_p, void * n_act)
|
|||||||
|
|
||||||
void lv_ll_swap(lv_ll_t * ll_p, void * n1_p, void * n2_p)
|
void lv_ll_swap(lv_ll_t * ll_p, void * n1_p, void * n2_p)
|
||||||
{
|
{
|
||||||
|
(void)(ll_p);
|
||||||
|
(void)(n1_p);
|
||||||
|
(void)(n2_p);
|
||||||
/*TODO*/
|
/*TODO*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -224,7 +224,7 @@ bool lv_txt_is_cmd(lv_txt_cmd_state_t * state, uint32_t c)
|
|||||||
{
|
{
|
||||||
bool ret = false;
|
bool ret = false;
|
||||||
|
|
||||||
if(c == LV_TXT_COLOR_CMD[0]) {
|
if(c == (uint32_t)LV_TXT_COLOR_CMD[0]) {
|
||||||
if(*state == LV_TXT_CMD_STATE_WAIT) { /*Start char*/
|
if(*state == LV_TXT_CMD_STATE_WAIT) { /*Start char*/
|
||||||
*state = LV_TXT_CMD_STATE_PAR;
|
*state = LV_TXT_CMD_STATE_PAR;
|
||||||
ret = true;
|
ret = true;
|
||||||
@@ -263,7 +263,7 @@ void lv_txt_ins(char * txt_buf, uint32_t pos, const char * ins_txt)
|
|||||||
pos = txt_utf8_get_byte_id(txt_buf, pos); /*Convert to byte index instead of letter index*/
|
pos = txt_utf8_get_byte_id(txt_buf, pos); /*Convert to byte index instead of letter index*/
|
||||||
#endif
|
#endif
|
||||||
/*Copy the second part into the end to make place to text to insert*/
|
/*Copy the second part into the end to make place to text to insert*/
|
||||||
int32_t i;
|
uint32_t i;
|
||||||
for(i = new_len; i >= pos + ins_len; i--){
|
for(i = new_len; i >= pos + ins_len; i--){
|
||||||
txt_buf[i] = txt_buf[i - ins_len];
|
txt_buf[i] = txt_buf[i - ins_len];
|
||||||
}
|
}
|
||||||
@@ -550,7 +550,7 @@ static bool is_break_char(uint32_t letter)
|
|||||||
|
|
||||||
/*Compare the letter to TXT_BREAK_CHARS*/
|
/*Compare the letter to TXT_BREAK_CHARS*/
|
||||||
for(i = 0; LV_TXT_BREAK_CHARS[i] != '\0'; i++) {
|
for(i = 0; LV_TXT_BREAK_CHARS[i] != '\0'; i++) {
|
||||||
if(letter == LV_TXT_BREAK_CHARS[i]) {
|
if(letter == (uint32_t)LV_TXT_BREAK_CHARS[i]) {
|
||||||
ret = true; /*If match then it is break char*/
|
ret = true; /*If match then it is break char*/
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -428,6 +428,7 @@ lv_fs_res_t lv_ufs_readdir(void * dir_p, char * fn)
|
|||||||
*/
|
*/
|
||||||
lv_fs_res_t lv_ufs_readdir_close(void * rddir_p)
|
lv_fs_res_t lv_ufs_readdir_close(void * rddir_p)
|
||||||
{
|
{
|
||||||
|
(void)rddir_p;
|
||||||
return FS_RES_OK;
|
return FS_RES_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -417,6 +417,7 @@ static bool lv_btnm_design(lv_obj_t * btnm, const lv_area_t * mask, lv_design_mo
|
|||||||
else if(btn_i == ext->btn_id_pr && btn_i != ext->btn_id_tgl) btn_style = lv_btnm_get_style(btnm, LV_BTNM_STYLE_BTN_PR);
|
else if(btn_i == ext->btn_id_pr && btn_i != ext->btn_id_tgl) btn_style = lv_btnm_get_style(btnm, LV_BTNM_STYLE_BTN_PR);
|
||||||
else if(btn_i != ext->btn_id_pr && btn_i == ext->btn_id_tgl) btn_style = lv_btnm_get_style(btnm, LV_BTNM_STYLE_BTN_TGL_REL);
|
else if(btn_i != ext->btn_id_pr && btn_i == ext->btn_id_tgl) btn_style = lv_btnm_get_style(btnm, LV_BTNM_STYLE_BTN_TGL_REL);
|
||||||
else if(btn_i == ext->btn_id_pr && btn_i == ext->btn_id_tgl) btn_style = lv_btnm_get_style(btnm, LV_BTNM_STYLE_BTN_TGL_PR);
|
else if(btn_i == ext->btn_id_pr && btn_i == ext->btn_id_tgl) btn_style = lv_btnm_get_style(btnm, LV_BTNM_STYLE_BTN_TGL_PR);
|
||||||
|
else btn_style = lv_btnm_get_style(btnm, LV_BTNM_STYLE_BTN_REL); /*Not possible option, just to be sure*/
|
||||||
|
|
||||||
/*On the right buttons clear the border if only right borders are drawn*/
|
/*On the right buttons clear the border if only right borders are drawn*/
|
||||||
if(ext->map_p[txt_i + 1][0] == '\0' || ext->map_p[txt_i + 1][0] == '\n') {
|
if(ext->map_p[txt_i + 1][0] == '\0' || ext->map_p[txt_i + 1][0] == '\n') {
|
||||||
|
|||||||
@@ -332,7 +332,7 @@ lv_coord_t lv_chart_get_series_width(lv_obj_t * chart)
|
|||||||
* @param chart pointer to chart object
|
* @param chart pointer to chart object
|
||||||
* @return dark effect level (LV_OPA_TRANSP to turn off)
|
* @return dark effect level (LV_OPA_TRANSP to turn off)
|
||||||
*/
|
*/
|
||||||
lv_opa_t lv_chart_get_series_darking(lv_obj_t * chart, lv_opa_t dark_eff)
|
lv_opa_t lv_chart_get_series_darking(lv_obj_t * chart)
|
||||||
{
|
{
|
||||||
lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart);
|
lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart);
|
||||||
return ext->series.dark;
|
return ext->series.dark;
|
||||||
|
|||||||
@@ -195,7 +195,7 @@ lv_coord_t lv_chart_get_series_width(lv_obj_t * chart);
|
|||||||
* @param chart pointer to chart object
|
* @param chart pointer to chart object
|
||||||
* @return dark effect level (LV_OPA_TRANSP to turn off)
|
* @return dark effect level (LV_OPA_TRANSP to turn off)
|
||||||
*/
|
*/
|
||||||
lv_opa_t lv_chart_get_series_darking(lv_obj_t * chart, lv_opa_t dark_eff);
|
lv_opa_t lv_chart_get_series_darking(lv_obj_t * chart);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the style of an chart object
|
* Get the style of an chart object
|
||||||
|
|||||||
@@ -205,9 +205,9 @@ void lv_img_set_upscale(lv_obj_t * img, bool upscale_en)
|
|||||||
/*Upscale works only if antialiassing is enabled*/
|
/*Upscale works only if antialiassing is enabled*/
|
||||||
#if LV_ANTIALIAS == 0
|
#if LV_ANTIALIAS == 0
|
||||||
upscale_en = false;
|
upscale_en = false;
|
||||||
#else
|
|
||||||
ext->upscale = (upscale_en == false ? 0 : 1);
|
|
||||||
#endif
|
#endif
|
||||||
|
ext->upscale = (upscale_en == false ? 0 : 1);
|
||||||
|
|
||||||
/*Refresh the image with the new size*/
|
/*Refresh the image with the new size*/
|
||||||
lv_img_set_file(img, ext->fn);
|
lv_img_set_file(img, ext->fn);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -274,7 +274,7 @@ lv_kb_mode_t lv_kb_get_mode(lv_obj_t * kb)
|
|||||||
* @param kb pointer to a Keyboard object
|
* @param kb pointer to a Keyboard object
|
||||||
* @return true: show cursor on the current text area, false: hide cursor
|
* @return true: show cursor on the current text area, false: hide cursor
|
||||||
*/
|
*/
|
||||||
bool lv_kb_get_cursor_manage(lv_obj_t * kb, bool en)
|
bool lv_kb_get_cursor_manage(lv_obj_t * kb)
|
||||||
{
|
{
|
||||||
lv_kb_ext_t * ext = lv_obj_get_ext_attr(kb);
|
lv_kb_ext_t * ext = lv_obj_get_ext_attr(kb);
|
||||||
return ext->cursor_mng == 0 ? false : true;
|
return ext->cursor_mng == 0 ? false : true;
|
||||||
@@ -285,7 +285,7 @@ bool lv_kb_get_cursor_manage(lv_obj_t * kb, bool en)
|
|||||||
* @param kb pointer to Keyboard object
|
* @param kb pointer to Keyboard object
|
||||||
* @return the ok callback
|
* @return the ok callback
|
||||||
*/
|
*/
|
||||||
lv_action_t lv_kb_get_ok_action(lv_obj_t * kb, lv_action_t action)
|
lv_action_t lv_kb_get_ok_action(lv_obj_t * kb)
|
||||||
{
|
{
|
||||||
lv_kb_ext_t * ext = lv_obj_get_ext_attr(kb);
|
lv_kb_ext_t * ext = lv_obj_get_ext_attr(kb);
|
||||||
return ext->ok_action;
|
return ext->ok_action;
|
||||||
@@ -296,7 +296,7 @@ lv_action_t lv_kb_get_ok_action(lv_obj_t * kb, lv_action_t action)
|
|||||||
* @param kb pointer to Keyboard object
|
* @param kb pointer to Keyboard object
|
||||||
* @return the close callback
|
* @return the close callback
|
||||||
*/
|
*/
|
||||||
lv_action_t lv_kb_get_close_action(lv_obj_t * kb, lv_action_t action)
|
lv_action_t lv_kb_get_close_action(lv_obj_t * kb)
|
||||||
{
|
{
|
||||||
lv_kb_ext_t * ext = lv_obj_get_ext_attr(kb);
|
lv_kb_ext_t * ext = lv_obj_get_ext_attr(kb);
|
||||||
return ext->close_action;
|
return ext->close_action;
|
||||||
|
|||||||
@@ -135,21 +135,21 @@ lv_kb_mode_t lv_kb_get_mode(lv_obj_t * kb);
|
|||||||
* @param kb pointer to a Keyboard object
|
* @param kb pointer to a Keyboard object
|
||||||
* @return true: show cursor on the current text area, false: hide cursor
|
* @return true: show cursor on the current text area, false: hide cursor
|
||||||
*/
|
*/
|
||||||
bool lv_kb_get_cursor_manage(lv_obj_t * kb, bool en);
|
bool lv_kb_get_cursor_manage(lv_obj_t * kb);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the callback to call when the "Ok" button is pressed
|
* Get the callback to call when the "Ok" button is pressed
|
||||||
* @param kb pointer to Keyboard object
|
* @param kb pointer to Keyboard object
|
||||||
* @return the ok callback
|
* @return the ok callback
|
||||||
*/
|
*/
|
||||||
lv_action_t lv_kb_get_ok_action(lv_obj_t * kb, lv_action_t action);
|
lv_action_t lv_kb_get_ok_action(lv_obj_t * kb);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the callback to call when the "Hide" button is pressed
|
* Get the callback to call when the "Hide" button is pressed
|
||||||
* @param kb pointer to Keyboard object
|
* @param kb pointer to Keyboard object
|
||||||
* @return the close callback
|
* @return the close callback
|
||||||
*/
|
*/
|
||||||
lv_action_t lv_kb_get_close_action(lv_obj_t * kb, lv_action_t action);
|
lv_action_t lv_kb_get_close_action(lv_obj_t * kb);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get a style of a keyboard
|
* Get a style of a keyboard
|
||||||
|
|||||||
@@ -244,7 +244,7 @@ static bool lv_roller_design(lv_obj_t * roller, const lv_area_t * mask, lv_desig
|
|||||||
*/
|
*/
|
||||||
static lv_res_t lv_roller_signal(lv_obj_t * roller, lv_signal_t sign, void * param)
|
static lv_res_t lv_roller_signal(lv_obj_t * roller, lv_signal_t sign, void * param)
|
||||||
{
|
{
|
||||||
lv_res_t res;
|
lv_res_t res = LV_RES_OK;
|
||||||
|
|
||||||
/*Don't let the drop down list to handle the control signals. It works differently*/
|
/*Don't let the drop down list to handle the control signals. It works differently*/
|
||||||
if(sign != LV_SIGNAL_CONTROLL && sign != LV_SIGNAL_FOCUS && sign != LV_SIGNAL_DEFOCUS) {
|
if(sign != LV_SIGNAL_CONTROLL && sign != LV_SIGNAL_FOCUS && sign != LV_SIGNAL_DEFOCUS) {
|
||||||
|
|||||||
@@ -1013,7 +1013,8 @@ 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)
|
||||||
{
|
{
|
||||||
|
(void)ta;
|
||||||
|
(void)x;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -446,7 +446,7 @@ bool lv_tabview_get_sliding(lv_obj_t * tabview)
|
|||||||
* @param tabview pointer to Tab view object
|
* @param tabview pointer to Tab view object
|
||||||
* @return time of animation in milliseconds
|
* @return time of animation in milliseconds
|
||||||
*/
|
*/
|
||||||
uint16_t lv_tabview_get_anim_time(lv_obj_t * tabview, uint16_t anim_time_ms)
|
uint16_t lv_tabview_get_anim_time(lv_obj_t * tabview)
|
||||||
{
|
{
|
||||||
lv_tabview_ext_t * ext = lv_obj_get_ext_attr(tabview);
|
lv_tabview_ext_t * ext = lv_obj_get_ext_attr(tabview);
|
||||||
return ext->anim_time;
|
return ext->anim_time;
|
||||||
@@ -595,6 +595,8 @@ static lv_res_t tabpage_scrl_signal(lv_obj_t * tab_scrl, lv_signal_t sign, void
|
|||||||
*/
|
*/
|
||||||
static void tabpage_pressed_hadler(lv_obj_t * tabview, lv_obj_t * tabpage)
|
static void tabpage_pressed_hadler(lv_obj_t * tabview, lv_obj_t * tabpage)
|
||||||
{
|
{
|
||||||
|
(void)tabpage;
|
||||||
|
|
||||||
lv_tabview_ext_t * ext = lv_obj_get_ext_attr(tabview);
|
lv_tabview_ext_t * ext = lv_obj_get_ext_attr(tabview);
|
||||||
lv_indev_t * indev = lv_indev_get_act();
|
lv_indev_t * indev = lv_indev_get_act();
|
||||||
lv_indev_get_point(indev, &ext->point_last);
|
lv_indev_get_point(indev, &ext->point_last);
|
||||||
|
|||||||
@@ -182,7 +182,7 @@ bool lv_tabview_get_sliding(lv_obj_t * tabview);
|
|||||||
* @param tabview pointer to Tab view object
|
* @param tabview pointer to Tab view object
|
||||||
* @return time of animation in milliseconds
|
* @return time of animation in milliseconds
|
||||||
*/
|
*/
|
||||||
uint16_t lv_tabview_get_anim_time(lv_obj_t * tabview, uint16_t anim_time_ms);
|
uint16_t lv_tabview_get_anim_time(lv_obj_t * tabview);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get a style of a tab view
|
* Get a style of a tab view
|
||||||
|
|||||||
@@ -467,7 +467,7 @@ static void lv_win_realign(lv_obj_t * win)
|
|||||||
|
|
||||||
bool first_btn = true;
|
bool first_btn = true;
|
||||||
lv_obj_t *btn;
|
lv_obj_t *btn;
|
||||||
lv_obj_t *btn_prev;
|
lv_obj_t *btn_prev = NULL;
|
||||||
/*Refresh the size of all control buttons*/
|
/*Refresh the size of all control buttons*/
|
||||||
btn = lv_obj_get_child_back(ext->header, NULL);
|
btn = lv_obj_get_child_back(ext->header, NULL);
|
||||||
btn = lv_obj_get_child_back(ext->header, btn); /*Skip the title*/
|
btn = lv_obj_get_child_back(ext->header, btn); /*Skip the title*/
|
||||||
|
|||||||
Reference in New Issue
Block a user