diff --git a/src/lv_core/lv_indev.c b/src/lv_core/lv_indev.c index 16ff27502..632540640 100644 --- a/src/lv_core/lv_indev.c +++ b/src/lv_core/lv_indev.c @@ -1026,7 +1026,7 @@ static lv_obj_t * indev_search_obj(const lv_indev_proc_t * proc, lv_obj_t * obj) */ static void indev_drag(lv_indev_proc_t * state) { - lv_obj_t * drag_obj = state->types.pointer.act_obj; + lv_obj_t * drag_obj = state->types.pointer.act_obj; bool drag_just_started = false; /*If drag parent is active check recursively the drag_parent attribute*/ @@ -1052,7 +1052,7 @@ static void indev_drag(lv_indev_proc_t * state) ((allowed_dirs & LV_DRAG_DIR_VER) && LV_MATH_ABS(state->types.pointer.drag_sum.y) >= indev_act->driver.drag_limit)) { state->types.pointer.drag_limit_out = 1; - drag_just_started = true; + drag_just_started = true; } } @@ -1078,7 +1078,8 @@ static void indev_drag(lv_indev_proc_t * state) act_x += state->types.pointer.drag_sum.x; act_y += state->types.pointer.drag_sum.y; } - lv_obj_set_pos(drag_obj, act_x + state->types.pointer.vect.x, act_y + state->types.pointer.vect.y); + lv_obj_set_pos(drag_obj, act_x + state->types.pointer.vect.x, + act_y + state->types.pointer.vect.y); } else if(allowed_dirs & LV_DRAG_DIR_HOR) { if(drag_just_started) { act_x += state->types.pointer.drag_sum.x; diff --git a/src/lv_objx/lv_btnm.c b/src/lv_objx/lv_btnm.c index 56d2ee09a..fac07cb06 100644 --- a/src/lv_objx/lv_btnm.c +++ b/src/lv_objx/lv_btnm.c @@ -102,7 +102,7 @@ lv_obj_t * lv_btnm_create(lv_obj_t * par, const lv_obj_t * copy) /*Init the new button matrix object*/ if(copy == NULL) { lv_obj_set_size(new_btnm, LV_DPI * 3, LV_DPI * 2); - lv_btnm_set_map_array(new_btnm, lv_btnm_def_map); + lv_btnm_set_map(new_btnm, lv_btnm_def_map); /*Set the default styles*/ lv_theme_t * th = lv_theme_get_current(); @@ -121,7 +121,7 @@ lv_obj_t * lv_btnm_create(lv_obj_t * par, const lv_obj_t * copy) else { lv_btnm_ext_t * copy_ext = lv_obj_get_ext_attr(copy); memcpy(ext->styles_btn, copy_ext->styles_btn, sizeof(ext->styles_btn)); - lv_btnm_set_map_array(new_btnm, lv_btnm_get_map_array(copy)); + lv_btnm_set_map(new_btnm, lv_btnm_get_map_array(copy)); } LV_LOG_INFO("button matrix created"); @@ -140,7 +140,7 @@ lv_obj_t * lv_btnm_create(lv_obj_t * par, const lv_obj_t * copy) * @param btnm pointer to a button matrix object * @param map pointer a string array. The last string has to be: "". Use "\n" to make a line break. */ -void lv_btnm_set_map_array(const lv_obj_t * btnm, const char ** map) +void lv_btnm_set_map(const lv_obj_t * btnm, const char * map[]) { if(map == NULL) return; @@ -271,12 +271,12 @@ void lv_btnm_set_map_array(const lv_obj_t * btnm, const char ** map) * - bit 2..0: Relative width compared to the buttons in the * same row. [1..7] */ -void lv_btnm_set_ctrl_map_array(const lv_obj_t * btnm, const lv_btnm_ctrl_t * ctrl_map) +void lv_btnm_set_ctrl_map(const lv_obj_t * btnm, const lv_btnm_ctrl_t ctrl_map[]) { lv_btnm_ext_t * ext = lv_obj_get_ext_attr(btnm); memcpy(ext->ctrl_bits, ctrl_map, sizeof(lv_btnm_ctrl_t) * ext->btn_cnt); - lv_btnm_set_map_array(btnm, ext->map_p); + lv_btnm_set_map(btnm, ext->map_p); } /** @@ -396,7 +396,7 @@ void lv_btnm_set_btn_width(const lv_obj_t * btnm, uint16_t btn_id, uint8_t width ext->ctrl_bits[btn_id] &= (~LV_BTNM_WIDTH_MASK); ext->ctrl_bits[btn_id] |= (LV_BTNM_WIDTH_MASK & width); - lv_btnm_set_map_array(btnm, ext->map_p); + lv_btnm_set_map(btnm, ext->map_p); } /** @@ -701,7 +701,7 @@ static lv_res_t lv_btnm_signal(lv_obj_t * btnm, lv_signal_t sign, void * param) lv_mem_free(ext->button_areas); lv_mem_free(ext->ctrl_bits); } else if(sign == LV_SIGNAL_STYLE_CHG || sign == LV_SIGNAL_CORD_CHG) { - lv_btnm_set_map_array(btnm, ext->map_p); + lv_btnm_set_map(btnm, ext->map_p); } else if(sign == LV_SIGNAL_PRESSED) { lv_indev_t * indev = lv_indev_get_act(); if(lv_indev_get_type(indev) == LV_INDEV_TYPE_POINTER || diff --git a/src/lv_objx/lv_btnm.h b/src/lv_objx/lv_btnm.h index 7d5ac6252..26c0740f9 100644 --- a/src/lv_objx/lv_btnm.h +++ b/src/lv_objx/lv_btnm.h @@ -97,7 +97,7 @@ lv_obj_t * lv_btnm_create(lv_obj_t * par, const lv_obj_t * copy); * @param btnm pointer to a button matrix object * @param map pointer a string array. The last string has to be: "". Use "\n" to make a line break. */ -void lv_btnm_set_map_array(const lv_obj_t * btnm, const char ** map); +void lv_btnm_set_map(const lv_obj_t * btnm, const char * map[]); /** * Set the button control map (hidden, disabled etc.) for a button matrix. The @@ -115,7 +115,7 @@ void lv_btnm_set_map_array(const lv_obj_t * btnm, const char ** map); * - bit 2..0: Relative width compared to the buttons in the * same row. [1..7] */ -void lv_btnm_set_ctrl_map_array(const lv_obj_t * btnm, const lv_btnm_ctrl_t * ctrl_map); +void lv_btnm_set_ctrl_map(const lv_obj_t * btnm, const lv_btnm_ctrl_t ctrl_map[]); /** * Set the pressed button i.e. visually highlight it. diff --git a/src/lv_objx/lv_chart.c b/src/lv_objx/lv_chart.c index 8a16af938..adad30e4f 100644 --- a/src/lv_objx/lv_chart.c +++ b/src/lv_objx/lv_chart.c @@ -376,7 +376,7 @@ void lv_chart_init_points(lv_obj_t * chart, lv_chart_series_t * ser, lv_coord_t * @param ser pointer to a data series on 'chart' * @param y_array array of 'lv_coord_t' points (with 'points count' elements ) */ -void lv_chart_set_points_array(lv_obj_t * chart, lv_chart_series_t * ser, lv_coord_t * y_array) +void lv_chart_set_points(lv_obj_t * chart, lv_chart_series_t * ser, lv_coord_t y_array[]) { lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart); memcpy(ser->points, y_array, ext->point_cnt * (sizeof(lv_coord_t))); diff --git a/src/lv_objx/lv_chart.h b/src/lv_objx/lv_chart.h index 0399abc9a..09e201f78 100644 --- a/src/lv_objx/lv_chart.h +++ b/src/lv_objx/lv_chart.h @@ -191,7 +191,7 @@ void lv_chart_init_points(lv_obj_t * chart, lv_chart_series_t * ser, lv_coord_t * @param ser pointer to a data series on 'chart' * @param y_array array of 'lv_coord_t' points (with 'points count' elements ) */ -void lv_chart_set_points_array(lv_obj_t * chart, lv_chart_series_t * ser, lv_coord_t * y_array); +void lv_chart_set_points(lv_obj_t * chart, lv_chart_series_t * ser, lv_coord_t * y_array); /** * Shift all data right and set the most right data on a data line diff --git a/src/lv_objx/lv_gauge.c b/src/lv_objx/lv_gauge.c index 10fc4c740..4162fb115 100644 --- a/src/lv_objx/lv_gauge.c +++ b/src/lv_objx/lv_gauge.c @@ -130,7 +130,7 @@ lv_obj_t * lv_gauge_create(lv_obj_t * par, const lv_obj_t * copy) * @param needle_cnt new count of needles * @param colors an array of colors for needles (with 'num' elements) */ -void lv_gauge_set_needle_count(lv_obj_t * gauge, uint8_t needle_cnt, const lv_color_t * colors) +void lv_gauge_set_needle_count(lv_obj_t * gauge, uint8_t needle_cnt, const lv_color_t colors[]) { lv_gauge_ext_t * ext = lv_obj_get_ext_attr(gauge); diff --git a/src/lv_objx/lv_gauge.h b/src/lv_objx/lv_gauge.h index 83977f1ec..ebb90391e 100644 --- a/src/lv_objx/lv_gauge.h +++ b/src/lv_objx/lv_gauge.h @@ -72,7 +72,7 @@ lv_obj_t * lv_gauge_create(lv_obj_t * par, const lv_obj_t * copy); * @param needle_cnt new count of needles * @param colors an array of colors for needles (with 'num' elements) */ -void lv_gauge_set_needle_count(lv_obj_t * gauge, uint8_t needle_cnt, const lv_color_t * colors); +void lv_gauge_set_needle_count(lv_obj_t * gauge, uint8_t needle_cnt, const lv_color_t colors[]); /** * Set the value of a needle diff --git a/src/lv_objx/lv_kb.c b/src/lv_objx/lv_kb.c index cb8ac7245..da15be7b1 100644 --- a/src/lv_objx/lv_kb.c +++ b/src/lv_objx/lv_kb.c @@ -116,8 +116,8 @@ lv_obj_t * lv_kb_create(lv_obj_t * par, const lv_obj_t * copy) lv_obj_set_size(new_kb, LV_DPI * 3, LV_DPI * 2); lv_obj_align(new_kb, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, 0); lv_obj_set_event_cb(new_kb, lv_kb_def_event_cb); - lv_btnm_set_map_array(new_kb, kb_map_lc); - lv_btnm_set_ctrl_map_array(new_kb, kb_ctrl_lc_map); + lv_btnm_set_map(new_kb, kb_map_lc); + lv_btnm_set_ctrl_map(new_kb, kb_ctrl_lc_map); /*Set the default styles*/ lv_theme_t * th = lv_theme_get_current(); @@ -190,11 +190,11 @@ void lv_kb_set_mode(lv_obj_t * kb, lv_kb_mode_t mode) ext->mode = mode; if(mode == LV_KB_MODE_TEXT) { - lv_btnm_set_map_array(kb, kb_map_lc); - lv_btnm_set_ctrl_map_array(kb, kb_ctrl_lc_map); + lv_btnm_set_map(kb, kb_map_lc); + lv_btnm_set_ctrl_map(kb, kb_ctrl_lc_map); } else if(mode == LV_KB_MODE_NUM) { - lv_btnm_set_map_array(kb, kb_map_num); - lv_btnm_set_ctrl_map_array(kb, kb_ctrl_num_map); + lv_btnm_set_map(kb, kb_map_num); + lv_btnm_set_ctrl_map(kb, kb_ctrl_num_map); } } @@ -332,16 +332,16 @@ void lv_kb_def_event_cb(lv_obj_t * kb, lv_event_t event) /*Do the corresponding action according to the text of the button*/ if(strcmp(txt, "abc") == 0) { - lv_btnm_set_map_array(kb, kb_map_lc); - lv_btnm_set_ctrl_map_array(kb, kb_ctrl_lc_map); + lv_btnm_set_map(kb, kb_map_lc); + lv_btnm_set_ctrl_map(kb, kb_ctrl_lc_map); return; } else if(strcmp(txt, "ABC") == 0) { - lv_btnm_set_map_array(kb, kb_map_uc); - lv_btnm_set_ctrl_map_array(kb, kb_ctrl_uc_map); + lv_btnm_set_map(kb, kb_map_uc); + lv_btnm_set_ctrl_map(kb, kb_ctrl_uc_map); return; } else if(strcmp(txt, "1#") == 0) { - lv_btnm_set_map_array(kb, kb_map_spec); - lv_btnm_set_ctrl_map_array(kb, kb_ctrl_spec_map); + lv_btnm_set_map(kb, kb_map_spec); + lv_btnm_set_ctrl_map(kb, kb_ctrl_spec_map); return; } else if(strcmp(txt, LV_SYMBOL_CLOSE) == 0) { if(kb->event_cb) { diff --git a/src/lv_objx/lv_kb.h b/src/lv_objx/lv_kb.h index 85090385d..d0c52d321 100644 --- a/src/lv_objx/lv_kb.h +++ b/src/lv_objx/lv_kb.h @@ -111,9 +111,9 @@ void lv_kb_set_cursor_manage(lv_obj_t * kb, bool en); * @param map pointer to a string array to describe the map. * See 'lv_btnm_set_map_array()' for more info. */ -static inline void lv_kb_set_map_array(lv_obj_t * kb, const char ** map) +static inline void lv_kb_set_map(lv_obj_t * kb, const char * map[]) { - lv_btnm_set_map_array(kb, map); + lv_btnm_set_map(kb, map); } /** @@ -124,9 +124,9 @@ static inline void lv_kb_set_map_array(lv_obj_t * kb, const char ** map) * @param ctrl_map pointer to an array of `lv_btn_ctrl_t` control bytes. * See: `lv_btnm_set_ctrl_map` for more details. */ -static inline void lv_kb_set_ctrl_map_array(lv_obj_t * kb, const lv_btnm_ctrl_t * ctrl_map) +static inline void lv_kb_set_ctrl_map(lv_obj_t * kb, const lv_btnm_ctrl_t ctrl_map[]) { - lv_btnm_set_ctrl_map_array(kb, ctrl_map); + lv_btnm_set_ctrl_map(kb, ctrl_map); } /** diff --git a/src/lv_objx/lv_mbox.c b/src/lv_objx/lv_mbox.c index 8304d124c..0a99a7853 100644 --- a/src/lv_objx/lv_mbox.c +++ b/src/lv_objx/lv_mbox.c @@ -151,7 +151,7 @@ void lv_mbox_add_btns(lv_obj_t * mbox, const char ** btn_map) } } - lv_btnm_set_map_array(ext->btnm, btn_map); + lv_btnm_set_map(ext->btnm, btn_map); lv_btnm_set_btn_ctrl_all(ext->btnm, LV_BTNM_CTRL_CLICK_TRIG | LV_BTNM_CTRL_NO_REPEAT, true); lv_obj_set_parent_event(ext->btnm, true); diff --git a/src/lv_objx/lv_roller.c b/src/lv_objx/lv_roller.c index d3cbed074..39eb1547e 100644 --- a/src/lv_objx/lv_roller.c +++ b/src/lv_objx/lv_roller.c @@ -655,9 +655,9 @@ static void refr_position(lv_obj_t * roller, bool anim_en) */ static void inf_normalize(void * scrl) { - lv_obj_t * roller_scrl= (lv_obj_t *)scrl; - lv_obj_t * roller = lv_obj_get_parent(roller_scrl); - lv_roller_ext_t * ext = lv_obj_get_ext_attr(roller); + lv_obj_t * roller_scrl = (lv_obj_t *)scrl; + lv_obj_t * roller = lv_obj_get_parent(roller_scrl); + lv_roller_ext_t * ext = lv_obj_get_ext_attr(roller); if(ext->inf) { uint16_t real_id_cnt = ext->ddlist.option_cnt / LV_ROLLER_INF_PAGES; diff --git a/src/lv_objx/lv_tabview.c b/src/lv_objx/lv_tabview.c index dd4181a65..d687a55b7 100644 --- a/src/lv_objx/lv_tabview.c +++ b/src/lv_objx/lv_tabview.c @@ -115,7 +115,7 @@ lv_obj_t * lv_tabview_create(lv_obj_t * par, const lv_obj_t * copy) ext->btns = lv_btnm_create(new_tabview, NULL); lv_obj_set_height(ext->btns, 3 * LV_DPI / 4); - lv_btnm_set_map_array(ext->btns, tab_def); + lv_btnm_set_map(ext->btns, tab_def); lv_obj_set_event_cb(ext->btns, tab_btnm_event_cb); ext->indic = lv_obj_create(ext->btns, NULL); @@ -163,7 +163,7 @@ lv_obj_t * lv_tabview_create(lv_obj_t * par, const lv_obj_t * copy) lv_mem_assert(ext->tab_name_ptr); if(ext->tab_name_ptr == NULL) return NULL; ext->tab_name_ptr[0] = ""; - lv_btnm_set_map_array(ext->btns, ext->tab_name_ptr); + lv_btnm_set_map(ext->btns, ext->tab_name_ptr); uint16_t i; lv_obj_t * new_tab; @@ -244,7 +244,7 @@ lv_obj_t * lv_tabview_add_tab(lv_obj_t * tabview, const char * name) lv_btnm_ext_t * btnm_ext = lv_obj_get_ext_attr(ext->btns); btnm_ext->map_p = NULL; - lv_btnm_set_map_array(ext->btns, ext->tab_name_ptr); + lv_btnm_set_map(ext->btns, ext->tab_name_ptr); lv_btnm_set_btn_ctrl(ext->btns, ext->tab_cur, LV_BTNM_CTRL_NO_REPEAT, true); /*Modify the indicator size*/