From 8004058463a8d4a71f47910e3c6c93653d4f7c50 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Wed, 24 Feb 2021 10:07:54 +0100 Subject: [PATCH] minor fixes --- examples/widgets/lv_example_widgets.h | 1 + src/lv_core/lv_indev_scroll.c | 1 - src/lv_misc/lv_mem.c | 4 ++++ src/lv_widgets/lv_btnmatrix.c | 8 ++++---- src/lv_widgets/lv_btnmatrix.h | 7 +++++++ src/lv_widgets/lv_table.c | 2 +- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/examples/widgets/lv_example_widgets.h b/examples/widgets/lv_example_widgets.h index 50490f7c3..d74142a37 100644 --- a/examples/widgets/lv_example_widgets.h +++ b/examples/widgets/lv_example_widgets.h @@ -102,6 +102,7 @@ void lv_example_spinner_1(void); void lv_example_switch_1(void); void lv_example_table_1(void); +void lv_example_table_2(void); void lv_example_tabview_1(void); diff --git a/src/lv_core/lv_indev_scroll.c b/src/lv_core/lv_indev_scroll.c index 281b08da6..c071096f6 100644 --- a/src/lv_core/lv_indev_scroll.c +++ b/src/lv_core/lv_indev_scroll.c @@ -560,7 +560,6 @@ static lv_coord_t elastic_diff(lv_obj_t * obj, lv_coord_t diff, lv_coord_t scrol /* If there is snapping in the current direction don't use the elastic factor because * it's natural that the first and last items are scrolled (snapped) in. */ lv_scroll_snap_t snap; - void(*size)(const lv_area_t) = dir == LV_DIR_HOR ? lv_area_get_width : lv_area_get_height; snap = dir == LV_DIR_HOR ? lv_obj_get_scroll_snap_x(obj) : lv_obj_get_scroll_snap_y(obj); lv_obj_t * act_obj = lv_indev_get_obj_act(); diff --git a/src/lv_misc/lv_mem.c b/src/lv_misc/lv_mem.c index 71ff1b60e..d746bbdbf 100644 --- a/src/lv_misc/lv_mem.c +++ b/src/lv_misc/lv_mem.c @@ -129,6 +129,10 @@ void lv_mem_init(void) /*The total mem size reduced by the first header and the close patterns */ full->header.s.d_size = LV_MEM_SIZE - sizeof(lv_mem_header_t); #endif + +#if LV_MEM_ADD_JUNK + LV_LOG_WARN("LV_MEM_ADD_JUNK is enabled which makes LVGL much slower") +#endif } /** diff --git a/src/lv_widgets/lv_btnmatrix.c b/src/lv_widgets/lv_btnmatrix.c index 7ae9a68cf..d68e348de 100644 --- a/src/lv_widgets/lv_btnmatrix.c +++ b/src/lv_widgets/lv_btnmatrix.c @@ -181,17 +181,17 @@ void lv_btnmatrix_set_ctrl_map(lv_obj_t * obj, const lv_btnmatrix_ctrl_t ctrl_ma lv_btnmatrix_set_map(obj, btnm->map_p); } -void lv_btnmatrix_set_active_btn(lv_obj_t * obj, uint16_t id) +void lv_btnmatrix_set_selected_btn(lv_obj_t * obj, uint16_t btn_id) { LV_ASSERT_OBJ(obj, MY_CLASS); lv_btnmatrix_t * btnm = (lv_btnmatrix_t *)obj; - if(id >= btnm->btn_cnt && id != LV_BTNMATRIX_BTN_NONE) return; + if(btn_id >= btnm->btn_cnt && btn_id != LV_BTNMATRIX_BTN_NONE) return; invalidate_button_area(obj, btnm->btn_id_sel); - btnm->btn_id_sel = id; - invalidate_button_area(obj, id); + btnm->btn_id_sel = btn_id; + invalidate_button_area(obj, btn_id); } void lv_btnmatrix_set_recolor(const lv_obj_t * obj, bool en) diff --git a/src/lv_widgets/lv_btnmatrix.h b/src/lv_widgets/lv_btnmatrix.h index 7f837141e..0f452b169 100644 --- a/src/lv_widgets/lv_btnmatrix.h +++ b/src/lv_widgets/lv_btnmatrix.h @@ -106,6 +106,13 @@ void lv_btnmatrix_set_map(lv_obj_t * obj, const char * map[]); */ void lv_btnmatrix_set_ctrl_map(lv_obj_t * obj, const lv_btnmatrix_ctrl_t ctrl_map[]); +/** + * Set the selected buttons + * @param obj pointer to button matrix object + * @param id 0 based index of the button to modify. (Not counting new lines) + */ +void lv_btnmatrix_set_selected_btn(lv_obj_t * obj, uint16_t id); + /** * Enable recoloring of button's texts. E.g. "a #ff0000 red# word" * @param obj pointer to button matrix object diff --git a/src/lv_widgets/lv_table.c b/src/lv_widgets/lv_table.c index 5e85aaae8..9abc0c875 100644 --- a/src/lv_widgets/lv_table.c +++ b/src/lv_widgets/lv_table.c @@ -120,7 +120,7 @@ void lv_table_set_cell_value_fmt(lv_obj_t * obj, uint16_t row, uint16_t col, con } uint32_t cell = row * table->col_cnt + col; - lv_table_cell_ctrl_t ctrl; + lv_table_cell_ctrl_t ctrl = 0; /*Save the control byte*/ if(table->cell_data[cell]) ctrl= table->cell_data[cell][0];