diff --git a/src/lv_conf_checker.h b/src/lv_conf_checker.h index 7accfd259..d7edb6dff 100644 --- a/src/lv_conf_checker.h +++ b/src/lv_conf_checker.h @@ -266,6 +266,14 @@ #define LV_ATTRIBUTE_LARGE_CONST #endif +/* Export integer constant to binding. + * This macro is used with constants in the form of LV_ that + * should also appear on lvgl binding API such as Micropython + */ +#ifndef LV_EXPORT_CONST_INT +#define LV_EXPORT_CONST_INT(int_value) +#endif + /*=================== * HAL settings *==================*/ diff --git a/src/lv_objx/lv_gauge.c b/src/lv_objx/lv_gauge.c index 3ebb1cb7c..aedb63c2a 100644 --- a/src/lv_objx/lv_gauge.c +++ b/src/lv_objx/lv_gauge.c @@ -135,7 +135,6 @@ lv_obj_t * lv_gauge_create(lv_obj_t * par, const lv_obj_t * copy) void lv_gauge_set_needle_count(lv_obj_t * gauge, uint8_t needle_cnt, const lv_color_t colors[]) { LV_ASSERT_OBJ(gauge, LV_OBJX_NAME); - LV_ASSERT_NULL(colors); lv_gauge_ext_t * ext = lv_obj_get_ext_attr(gauge); diff --git a/src/lv_objx/lv_tabview.c b/src/lv_objx/lv_tabview.c index 80ea4ba48..158ff5393 100644 --- a/src/lv_objx/lv_tabview.c +++ b/src/lv_objx/lv_tabview.c @@ -746,7 +746,7 @@ static lv_res_t lv_tabview_signal(lv_obj_t * tabview, lv_signal_t sign, void * p } if(sign == LV_SIGNAL_FOCUS) { - lv_btnm_set_pressed(ext->btns, ext->tab_cur); + lv_indev_type_t indev_type = lv_indev_get_type(lv_indev_get_act()); /*With ENCODER select the first button only in edit mode*/ @@ -754,15 +754,11 @@ static lv_res_t lv_tabview_signal(lv_obj_t * tabview, lv_signal_t sign, void * p #if LV_USE_GROUP lv_group_t * g = lv_obj_get_group(tabview); if(lv_group_get_editing(g)) { - lv_btnm_ext_t * btnm_ext = lv_obj_get_ext_attr(ext->btns); - btnm_ext->btn_id_pr = 0; - lv_obj_invalidate(ext->btns); + lv_btnm_set_pressed(ext->btns, ext->tab_cur); } #endif } else { - lv_btnm_ext_t * btnm_ext = lv_obj_get_ext_attr(ext->btns); - btnm_ext->btn_id_pr = 0; - lv_obj_invalidate(ext->btns); + lv_btnm_set_pressed(ext->btns, ext->tab_cur); } } } else if(sign == LV_SIGNAL_GET_EDITABLE) {