From 43f5e4d2e0bfe140b37297ac165d40d398052e77 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 7 Jul 2020 09:36:59 +0200 Subject: [PATCH] Run code formatter --- src/lv_api_map.h | 2 +- src/lv_core/lv_indev.c | 186 ++++++++++++++++---------------- src/lv_core/lv_obj.c | 34 +++--- src/lv_core/lv_obj_style_dec.h | 9 +- src/lv_core/lv_style.c | 20 ++-- src/lv_draw/lv_draw_blend.c | 2 +- src/lv_draw/lv_img_buf.h | 2 +- src/lv_font/lv_font.h | 2 +- src/lv_gpu/lv_gpu_stm32_dma2d.c | 8 +- src/lv_misc/lv_mem.c | 23 ++-- src/lv_widgets/lv_btnmatrix.c | 20 ++-- src/lv_widgets/lv_btnmatrix.h | 10 +- src/lv_widgets/lv_label.c | 18 ++-- src/lv_widgets/lv_list.c | 2 +- src/lv_widgets/lv_roller.c | 6 +- src/lv_widgets/lv_slider.c | 6 +- src/lv_widgets/lv_textarea.c | 8 +- src/lv_widgets/lv_win.c | 30 +++--- 18 files changed, 200 insertions(+), 188 deletions(-) diff --git a/src/lv_api_map.h b/src/lv_api_map.h index cc3f245e8..dd2eb129a 100644 --- a/src/lv_api_map.h +++ b/src/lv_api_map.h @@ -180,7 +180,7 @@ static inline lv_obj_t * lv_page_get_scrl(lv_obj_t * page) static inline lv_obj_t * lv_win_add_btn(lv_obj_t * win, const void * img_src) { - return lv_win_add_btn_right(win, img_src); + return lv_win_add_btn_right(win, img_src); } #endif diff --git a/src/lv_core/lv_indev.c b/src/lv_core/lv_indev.c index a491c0996..98461f5ed 100644 --- a/src/lv_core/lv_indev.c +++ b/src/lv_core/lv_indev.c @@ -609,7 +609,7 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data) /*Process the steps they are valid only with released button*/ if(data->state != LV_INDEV_STATE_REL) { - data->enc_diff = 0; + data->enc_diff = 0; } /*Refresh the focused object. It might change due to lv_group_focus_prev/next*/ @@ -619,71 +619,74 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data) /*Button press happened*/ if(data->state == LV_INDEV_STATE_PR && last_state == LV_INDEV_STATE_REL) { - i->proc.pr_timestamp = lv_tick_get(); + i->proc.pr_timestamp = lv_tick_get(); - if (data->key == LV_KEY_ENTER) { - bool editable = false; - indev_obj_act->signal_cb(indev_obj_act, LV_SIGNAL_GET_EDITABLE, &editable); + if(data->key == LV_KEY_ENTER) { + bool editable = false; + indev_obj_act->signal_cb(indev_obj_act, LV_SIGNAL_GET_EDITABLE, &editable); - if(lv_group_get_editing(g) == true || editable == false) { - indev_obj_act->signal_cb(indev_obj_act, LV_SIGNAL_PRESSED, NULL); - if(indev_reset_check(&i->proc)) return; + if(lv_group_get_editing(g) == true || editable == false) { + indev_obj_act->signal_cb(indev_obj_act, LV_SIGNAL_PRESSED, NULL); + if(indev_reset_check(&i->proc)) return; - lv_event_send(indev_obj_act, LV_EVENT_PRESSED, NULL); - if(indev_reset_check(&i->proc)) return; - } - } else if(data->key == LV_KEY_LEFT) { - /*emulate encoder left*/ - data->enc_diff--; - } else if(data->key == LV_KEY_RIGHT) { - /*emulate encoder right*/ - data->enc_diff++; - } else if(data->key == LV_KEY_ESC) { + lv_event_send(indev_obj_act, LV_EVENT_PRESSED, NULL); + if(indev_reset_check(&i->proc)) return; + } + } + else if(data->key == LV_KEY_LEFT) { + /*emulate encoder left*/ + data->enc_diff--; + } + else if(data->key == LV_KEY_RIGHT) { + /*emulate encoder right*/ + data->enc_diff++; + } + else if(data->key == LV_KEY_ESC) { /*Send the ESC as a normal KEY*/ lv_group_send_data(g, LV_KEY_ESC); lv_event_send(indev_obj_act, LV_EVENT_CANCEL, NULL); if(indev_reset_check(&i->proc)) return; } - /*Just send other keys to the object (e.g. 'A' or `LV_GROUP_KEY_RIGHT`)*/ + /*Just send other keys to the object (e.g. 'A' or `LV_GROUP_KEY_RIGHT`)*/ else { lv_group_send_data(g, data->key); } } /*Pressing*/ else if(data->state == LV_INDEV_STATE_PR && last_state == LV_INDEV_STATE_PR) { - /* Long press*/ + /* Long press*/ if(i->proc.long_pr_sent == 0 && lv_tick_elaps(i->proc.pr_timestamp) > i->driver.long_press_time) { - i->proc.long_pr_sent = 1; - i->proc.longpr_rep_timestamp = lv_tick_get(); + i->proc.long_pr_sent = 1; + i->proc.longpr_rep_timestamp = lv_tick_get(); - if (data->key == LV_KEY_ENTER) { - bool editable = false; - indev_obj_act->signal_cb(indev_obj_act, LV_SIGNAL_GET_EDITABLE, &editable); + if(data->key == LV_KEY_ENTER) { + bool editable = false; + indev_obj_act->signal_cb(indev_obj_act, LV_SIGNAL_GET_EDITABLE, &editable); - /*On enter long press toggle edit mode.*/ - if(editable) { - /*Don't leave edit mode if there is only one object (nowhere to navigate)*/ - if(_lv_ll_is_empty(&g->obj_ll) == false) { - lv_group_set_editing(g, lv_group_get_editing(g) ? false : true); /*Toggle edit mode on long press*/ - } - } - /*If not editable then just send a long press signal*/ - else { - indev_obj_act->signal_cb(indev_obj_act, LV_SIGNAL_LONG_PRESS, NULL); - if(indev_reset_check(&i->proc)) return; - lv_event_send(indev_obj_act, LV_EVENT_LONG_PRESSED, NULL); - if(indev_reset_check(&i->proc)) return; - } - } + /*On enter long press toggle edit mode.*/ + if(editable) { + /*Don't leave edit mode if there is only one object (nowhere to navigate)*/ + if(_lv_ll_is_empty(&g->obj_ll) == false) { + lv_group_set_editing(g, lv_group_get_editing(g) ? false : true); /*Toggle edit mode on long press*/ + } + } + /*If not editable then just send a long press signal*/ + else { + indev_obj_act->signal_cb(indev_obj_act, LV_SIGNAL_LONG_PRESS, NULL); + if(indev_reset_check(&i->proc)) return; + lv_event_send(indev_obj_act, LV_EVENT_LONG_PRESSED, NULL); + if(indev_reset_check(&i->proc)) return; + } + } - i->proc.long_pr_sent = 1; + i->proc.long_pr_sent = 1; } /*Long press repeated time has elapsed?*/ - else if(i->proc.long_pr_sent != 0 && lv_tick_elaps(i->proc.longpr_rep_timestamp) > i->driver.long_press_rep_time) { + else if(i->proc.long_pr_sent != 0 && lv_tick_elaps(i->proc.longpr_rep_timestamp) > i->driver.long_press_rep_time) { - i->proc.longpr_rep_timestamp = lv_tick_get(); + i->proc.longpr_rep_timestamp = lv_tick_get(); if(data->key == LV_KEY_ENTER) { indev_obj_act->signal_cb(indev_obj_act, LV_SIGNAL_LONG_PRESS_REP, NULL); @@ -692,12 +695,14 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data) if(indev_reset_check(&i->proc)) return; } else if(data->key == LV_KEY_LEFT) { - /*emulate encoder left*/ - data->enc_diff--; - } else if(data->key == LV_KEY_RIGHT) { - /*emulate encoder right*/ - data->enc_diff++; - } else { + /*emulate encoder left*/ + data->enc_diff--; + } + else if(data->key == LV_KEY_RIGHT) { + /*emulate encoder right*/ + data->enc_diff++; + } + else { lv_group_send_data(g, data->key); if(indev_reset_check(&i->proc)) return; } @@ -708,49 +713,49 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data) /*Release happened*/ else if(data->state == LV_INDEV_STATE_REL && last_state == LV_INDEV_STATE_PR) { - if (data->key == LV_KEY_ENTER) { - bool editable = false; - indev_obj_act->signal_cb(indev_obj_act, LV_SIGNAL_GET_EDITABLE, &editable); + if(data->key == LV_KEY_ENTER) { + bool editable = false; + indev_obj_act->signal_cb(indev_obj_act, LV_SIGNAL_GET_EDITABLE, &editable); - /*The button was released on a non-editable object. Just send enter*/ - if(editable == false) { - indev_obj_act->signal_cb(indev_obj_act, LV_SIGNAL_RELEASED, NULL); - if(indev_reset_check(&i->proc)) return; + /*The button was released on a non-editable object. Just send enter*/ + if(editable == false) { + indev_obj_act->signal_cb(indev_obj_act, LV_SIGNAL_RELEASED, NULL); + if(indev_reset_check(&i->proc)) return; - if(i->proc.long_pr_sent == 0) lv_event_send(indev_obj_act, LV_EVENT_SHORT_CLICKED, NULL); - if(indev_reset_check(&i->proc)) return; + if(i->proc.long_pr_sent == 0) lv_event_send(indev_obj_act, LV_EVENT_SHORT_CLICKED, NULL); + if(indev_reset_check(&i->proc)) return; - lv_event_send(indev_obj_act, LV_EVENT_CLICKED, NULL); - if(indev_reset_check(&i->proc)) return; + lv_event_send(indev_obj_act, LV_EVENT_CLICKED, NULL); + if(indev_reset_check(&i->proc)) return; - lv_event_send(indev_obj_act, LV_EVENT_RELEASED, NULL); - if(indev_reset_check(&i->proc)) return; - } - /*An object is being edited and the button is released. */ - else if(g->editing) { - /*Ignore long pressed enter release because it comes from mode switch*/ - if(!i->proc.long_pr_sent || _lv_ll_is_empty(&g->obj_ll)) { - indev_obj_act->signal_cb(indev_obj_act, LV_SIGNAL_RELEASED, NULL); - if(indev_reset_check(&i->proc)) return; + lv_event_send(indev_obj_act, LV_EVENT_RELEASED, NULL); + if(indev_reset_check(&i->proc)) return; + } + /*An object is being edited and the button is released. */ + else if(g->editing) { + /*Ignore long pressed enter release because it comes from mode switch*/ + if(!i->proc.long_pr_sent || _lv_ll_is_empty(&g->obj_ll)) { + indev_obj_act->signal_cb(indev_obj_act, LV_SIGNAL_RELEASED, NULL); + if(indev_reset_check(&i->proc)) return; - lv_event_send(indev_obj_act, LV_EVENT_SHORT_CLICKED, NULL); - if(indev_reset_check(&i->proc)) return; + lv_event_send(indev_obj_act, LV_EVENT_SHORT_CLICKED, NULL); + if(indev_reset_check(&i->proc)) return; - lv_event_send(indev_obj_act, LV_EVENT_CLICKED, NULL); - if(indev_reset_check(&i->proc)) return; + lv_event_send(indev_obj_act, LV_EVENT_CLICKED, NULL); + if(indev_reset_check(&i->proc)) return; - lv_event_send(indev_obj_act, LV_EVENT_RELEASED, NULL); - if(indev_reset_check(&i->proc)) return; + lv_event_send(indev_obj_act, LV_EVENT_RELEASED, NULL); + if(indev_reset_check(&i->proc)) return; - lv_group_send_data(g, LV_KEY_ENTER); - } - } - /*If the focused object is editable and now in navigate mode then on enter switch edit - mode*/ - else if(editable && !g->editing && !i->proc.long_pr_sent) { - lv_group_set_editing(g, true); /*Set edit mode*/ - } - } + lv_group_send_data(g, LV_KEY_ENTER); + } + } + /*If the focused object is editable and now in navigate mode then on enter switch edit + mode*/ + else if(editable && !g->editing && !i->proc.long_pr_sent) { + lv_group_set_editing(g, true); /*Set edit mode*/ + } + } i->proc.pr_timestamp = 0; i->proc.long_pr_sent = 0; @@ -758,7 +763,7 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data) indev_obj_act = NULL; /*if encoder steps or simulated steps via left/right keys*/ - if (data->enc_diff != 0) { + if(data->enc_diff != 0) { /*In edit mode send LEFT/RIGHT keys*/ if(lv_group_get_editing(g)) { int32_t s; @@ -1211,15 +1216,16 @@ static void indev_click_focus(lv_indev_proc_t * proc) } /*Focus to the act. in its group*/ - if(g_act) { - lv_group_focus_obj(indev_obj_act); - if(indev_reset_check(proc)) return; - } else { + if(g_act) { + lv_group_focus_obj(indev_obj_act); + if(indev_reset_check(proc)) return; + } + else { lv_signal_send(indev_obj_act, LV_SIGNAL_FOCUS, NULL); if(indev_reset_check(proc)) return; lv_event_send(indev_obj_act, LV_EVENT_FOCUSED, NULL); if(indev_reset_check(proc)) return; - } + } } #else if(proc->types.pointer.last_pressed) { diff --git a/src/lv_core/lv_obj.c b/src/lv_core/lv_obj.c index 9259d3325..059d3d78b 100644 --- a/src/lv_core/lv_obj.c +++ b/src/lv_core/lv_obj.c @@ -39,7 +39,7 @@ #include LV_THEME_DEFAULT_INCLUDE #if LV_USE_GPU_STM32_DMA2D -#include "../lv_gpu/lv_gpu_stm32_dma2d.h" + #include "../lv_gpu/lv_gpu_stm32_dma2d.h" #endif /********************* @@ -1570,21 +1570,21 @@ void lv_obj_set_gesture_parent(lv_obj_t * obj, bool en) */ void lv_obj_set_focus_parent(lv_obj_t * obj, bool en) { - if (lv_obj_is_focused(obj)) { - if (en) { - obj->focus_parent = 1; - lv_obj_clear_state(obj, LV_STATE_FOCUSED | LV_STATE_EDITED); - lv_obj_set_state(lv_obj_get_focused_obj(obj), LV_STATE_FOCUSED); - } - else { - lv_obj_clear_state(lv_obj_get_focused_obj(obj), LV_STATE_FOCUSED | LV_STATE_EDITED); - lv_obj_set_state(obj, LV_STATE_FOCUSED); - obj->focus_parent = 0; - } + if(lv_obj_is_focused(obj)) { + if(en) { + obj->focus_parent = 1; + lv_obj_clear_state(obj, LV_STATE_FOCUSED | LV_STATE_EDITED); + lv_obj_set_state(lv_obj_get_focused_obj(obj), LV_STATE_FOCUSED); + } + else { + lv_obj_clear_state(lv_obj_get_focused_obj(obj), LV_STATE_FOCUSED | LV_STATE_EDITED); + lv_obj_set_state(obj, LV_STATE_FOCUSED); + obj->focus_parent = 0; + } + } + else { + obj->focus_parent = (en == true ? 1 : 0); } - else { - obj->focus_parent = (en == true ? 1 : 0); - } } /** @@ -3704,10 +3704,10 @@ lv_obj_t * lv_obj_get_focused_obj(const lv_obj_t * obj) if(obj == NULL) return NULL; const lv_obj_t * focus_obj = obj; while(lv_obj_get_focus_parent(focus_obj) != false && focus_obj != NULL) { - focus_obj = lv_obj_get_parent(focus_obj); + focus_obj = lv_obj_get_parent(focus_obj); } - return (lv_obj_t*)focus_obj; + return (lv_obj_t *)focus_obj; } /** diff --git a/src/lv_core/lv_obj_style_dec.h b/src/lv_core/lv_obj_style_dec.h index e1b65f720..47751597e 100644 --- a/src/lv_core/lv_obj_style_dec.h +++ b/src/lv_core/lv_obj_style_dec.h @@ -246,7 +246,8 @@ static inline void lv_style_set_pad_ver(lv_style_t * style, lv_state_t state, lv } -static inline void lv_obj_set_style_local_margin_all(lv_obj_t * obj, uint8_t part, lv_state_t state, lv_style_int_t value) +static inline void lv_obj_set_style_local_margin_all(lv_obj_t * obj, uint8_t part, lv_state_t state, + lv_style_int_t value) { lv_obj_set_style_local_margin_top(obj, part, state, value); lv_obj_set_style_local_margin_bottom(obj, part, state, value); @@ -264,7 +265,8 @@ static inline void lv_style_set_margin_all(lv_style_t * style, lv_state_t state, } -static inline void lv_obj_set_style_local_margin_hor(lv_obj_t * obj, uint8_t part, lv_state_t state, lv_style_int_t value) +static inline void lv_obj_set_style_local_margin_hor(lv_obj_t * obj, uint8_t part, lv_state_t state, + lv_style_int_t value) { lv_obj_set_style_local_margin_left(obj, part, state, value); lv_obj_set_style_local_margin_right(obj, part, state, value); @@ -278,7 +280,8 @@ static inline void lv_style_set_margin_hor(lv_style_t * style, lv_state_t state, } -static inline void lv_obj_set_style_local_margin_ver(lv_obj_t * obj, uint8_t part, lv_state_t state, lv_style_int_t value) +static inline void lv_obj_set_style_local_margin_ver(lv_obj_t * obj, uint8_t part, lv_state_t state, + lv_style_int_t value) { lv_obj_set_style_local_margin_top(obj, part, state, value); lv_obj_set_style_local_margin_bottom(obj, part, state, value); diff --git a/src/lv_core/lv_style.c b/src/lv_core/lv_style.c index 1be4e3dbe..ce3665e0d 100644 --- a/src/lv_core/lv_style.c +++ b/src/lv_core/lv_style.c @@ -36,10 +36,10 @@ **********************/ LV_ATTRIBUTE_FAST_MEM static inline int32_t get_property_index(const lv_style_t * style, lv_style_property_t prop); static lv_style_t * get_alloc_local_style(lv_style_list_t * list); -static inline void style_resize(lv_style_t *style, size_t sz); -static inline lv_style_property_t get_style_prop(const lv_style_t *style, size_t idx); -static inline uint8_t get_style_prop_id(const lv_style_t *style, size_t idx); -static inline uint8_t get_style_prop_attr(const lv_style_t *style, size_t idx); +static inline void style_resize(lv_style_t * style, size_t sz); +static inline lv_style_property_t get_style_prop(const lv_style_t * style, size_t idx); +static inline uint8_t get_style_prop_id(const lv_style_t * style, size_t idx); +static inline uint8_t get_style_prop_attr(const lv_style_t * style, size_t idx); static inline size_t get_prop_size(uint8_t prop_id); static inline size_t get_next_prop_index(uint8_t prop_id, size_t id); @@ -1065,7 +1065,7 @@ LV_ATTRIBUTE_FAST_MEM static inline int32_t get_property_index(const lv_style_t size_t i = 0; - uint8_t prop_id; + uint8_t prop_id; while((prop_id = get_style_prop_id(style, i)) != _LV_STYLE_CLOSEING_PROP) { if(prop_id == id_to_find) { lv_style_attr_t attr_i; @@ -1124,7 +1124,7 @@ static lv_style_t * get_alloc_local_style(lv_style_list_t * list) * @param style pointer to the style to be resized. * @param size new size */ -static inline void style_resize(lv_style_t *style, size_t sz) +static inline void style_resize(lv_style_t * style, size_t sz) { style->map = lv_mem_realloc(style->map, sz); } @@ -1135,10 +1135,10 @@ static inline void style_resize(lv_style_t *style, size_t sz) * @param idx index of the style in style->map * @return property in style->map + idx */ -static inline lv_style_property_t get_style_prop(const lv_style_t *style, size_t idx) +static inline lv_style_property_t get_style_prop(const lv_style_t * style, size_t idx) { lv_style_property_t prop; - uint8_t *prop_p = (uint8_t*)∝ + uint8_t * prop_p = (uint8_t *)∝ prop_p[0] = style->map[idx]; prop_p[1] = style->map[idx + 1]; return prop; @@ -1150,7 +1150,7 @@ static inline lv_style_property_t get_style_prop(const lv_style_t *style, size_t * @param idx index of the style in style->map * @return id of property in style->map + idx */ -static inline uint8_t get_style_prop_id(const lv_style_t *style, size_t idx) +static inline uint8_t get_style_prop_id(const lv_style_t * style, size_t idx) { return get_style_prop(style, idx) & 0xFF; } @@ -1161,7 +1161,7 @@ static inline uint8_t get_style_prop_id(const lv_style_t *style, size_t idx) * @param idx index of the style in style->map * @return attribute of property in style->map + idx */ -static inline uint8_t get_style_prop_attr(const lv_style_t *style, size_t idx) +static inline uint8_t get_style_prop_attr(const lv_style_t * style, size_t idx) { return ((get_style_prop(style, idx) >> 8) & 0xFFU); } diff --git a/src/lv_draw/lv_draw_blend.c b/src/lv_draw/lv_draw_blend.c index 3b94c3c78..375bee819 100644 --- a/src/lv_draw/lv_draw_blend.c +++ b/src/lv_draw/lv_draw_blend.c @@ -61,7 +61,7 @@ static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_co **********************/ #if LV_USE_GPU || LV_USE_GPU_STM32_DMA2D -LV_ATTRIBUTE_DMA static lv_color_t blend_buf[LV_HOR_RES_MAX]; + LV_ATTRIBUTE_DMA static lv_color_t blend_buf[LV_HOR_RES_MAX]; #endif /********************** diff --git a/src/lv_draw/lv_img_buf.h b/src/lv_draw/lv_img_buf.h index 4b6db2b87..204f3c1d8 100644 --- a/src/lv_draw/lv_img_buf.h +++ b/src/lv_draw/lv_img_buf.h @@ -103,7 +103,7 @@ typedef uint8_t lv_img_cf_t; * LVGL image header */ /* The first 8 bit is very important to distinguish the different source types. - * For more info see `lv_img_get_src_type()` in lv_img.c + * For more info see `lv_img_get_src_type()` in lv_img.c * On big endian systems the order is reversed so cf and always_zero must be at * the end of the struct. * */ diff --git a/src/lv_font/lv_font.h b/src/lv_font/lv_font.h index b319158c1..041211acd 100644 --- a/src/lv_font/lv_font.h +++ b/src/lv_font/lv_font.h @@ -174,7 +174,7 @@ LV_FONT_DECLARE(lv_font_montserrat_32) #if LV_FONT_MONTSERRAT_34 LV_FONT_DECLARE(lv_font_montserrat_34) #endif - + #if LV_FONT_MONTSERRAT_36 LV_FONT_DECLARE(lv_font_montserrat_36) #endif diff --git a/src/lv_gpu/lv_gpu_stm32_dma2d.c b/src/lv_gpu/lv_gpu_stm32_dma2d.c index 9810587dd..d5c8e40dc 100644 --- a/src/lv_gpu/lv_gpu_stm32_dma2d.c +++ b/src/lv_gpu/lv_gpu_stm32_dma2d.c @@ -194,10 +194,10 @@ void lv_gpu_stm32_dma2d_blend(lv_color_t * buf, lv_coord_t buf_w, const lv_color DMA2D->BGOR = buf_w - copy_w; DMA2D->FGPFCCR = (uint32_t)LV_DMA2D_COLOR_FORMAT - /* alpha mode 2, replace with foreground * alpha value */ - | (2 << DMA2D_FGPFCCR_AM_Pos) - /* alpha value */ - | (opa << DMA2D_FGPFCCR_ALPHA_Pos); + /* alpha mode 2, replace with foreground * alpha value */ + | (2 << DMA2D_FGPFCCR_AM_Pos) + /* alpha value */ + | (opa << DMA2D_FGPFCCR_ALPHA_Pos); DMA2D->FGMAR = (uint32_t)map; DMA2D->FGOR = map_w - copy_w; diff --git a/src/lv_misc/lv_mem.c b/src/lv_misc/lv_mem.c index 331771d7e..8775f39da 100644 --- a/src/lv_misc/lv_mem.c +++ b/src/lv_misc/lv_mem.c @@ -87,7 +87,7 @@ typedef struct { static uint32_t zero_mem; /*Give the address of this variable if 0 byte should be allocated*/ #if LV_MEM_CUSTOM == 0 -static uint32_t mem_max_size; /*Tracks the maximum total size of memory ever used from the internal heap*/ + static uint32_t mem_max_size; /*Tracks the maximum total size of memory ever used from the internal heap*/ #endif static uint8_t mem_buf1_32[MEM_BUF_SMALL_SIZE]; @@ -125,7 +125,7 @@ void _lv_mem_init(void) #else work_mem = (uint8_t *)LV_MEM_ADR; #endif - + lv_mem_ent_t * full = (lv_mem_ent_t *)work_mem; full->header.s.used = 0; /*The total mem size id reduced by the first header and the close patterns */ @@ -205,16 +205,17 @@ void * lv_mem_alloc(size_t size) #endif if(alloc == NULL) { - LV_LOG_WARN("Couldn't allocate memory"); - }else{ - #if LV_MEM_CUSTOM == 0 - /* just a safety check, should always be true */ - if ((uintptr_t) alloc > (uintptr_t) work_mem) { - if ((((uintptr_t) alloc - (uintptr_t) work_mem) + size) > mem_max_size) { - mem_max_size = ((uintptr_t) alloc - (uintptr_t) work_mem) + size; + LV_LOG_WARN("Couldn't allocate memory"); + } + else { +#if LV_MEM_CUSTOM == 0 + /* just a safety check, should always be true */ + if((uintptr_t) alloc > (uintptr_t) work_mem) { + if((((uintptr_t) alloc - (uintptr_t) work_mem) + size) > mem_max_size) { + mem_max_size = ((uintptr_t) alloc - (uintptr_t) work_mem) + size; + } } - } - #endif +#endif } return alloc; diff --git a/src/lv_widgets/lv_btnmatrix.c b/src/lv_widgets/lv_btnmatrix.c index d40880ce1..5501fcfa6 100644 --- a/src/lv_widgets/lv_btnmatrix.c +++ b/src/lv_widgets/lv_btnmatrix.c @@ -427,12 +427,12 @@ void lv_btnmatrix_set_one_check(lv_obj_t * btnm, bool one_chk) * @param btnm pointer to a btnmatrix object * @param align LV_LABEL_ALIGN_LEFT, LV_LABEL_ALIGN_RIGHT or LV_LABEL_ALIGN_CENTER */ -void lv_btnmatrix_set_align(lv_obj_t* btnm, lv_label_align_t align) +void lv_btnmatrix_set_align(lv_obj_t * btnm, lv_label_align_t align) { LV_ASSERT_OBJ(btnm, LV_OBJX_NAME); - lv_btnmatrix_ext_t* ext = lv_obj_get_ext_attr(btnm); - if (ext->align == align) return; + lv_btnmatrix_ext_t * ext = lv_obj_get_ext_attr(btnm); + if(ext->align == align) return; ext->align = align; @@ -585,18 +585,18 @@ bool lv_btnmatrix_get_one_check(const lv_obj_t * btnm) * @param btnm pointer to a btnmatrix object * @return LV_LABEL_ALIGN_LEFT, LV_LABEL_ALIGN_RIGHT or LV_LABEL_ALIGN_CENTER */ -lv_label_align_t lv_btnmatrix_get_align(const lv_obj_t* btnm) +lv_label_align_t lv_btnmatrix_get_align(const lv_obj_t * btnm) { LV_ASSERT_OBJ(btnm, LV_OBJX_NAME); - lv_btnmatrix_ext_t* ext = lv_obj_get_ext_attr(btnm); + lv_btnmatrix_ext_t * ext = lv_obj_get_ext_attr(btnm); lv_label_align_t align = ext->align; - if (align == LV_LABEL_ALIGN_AUTO) { + if(align == LV_LABEL_ALIGN_AUTO) { #if LV_USE_BIDI lv_bidi_dir_t base_dir = lv_obj_get_base_dir(btnm); - if (base_dir == LV_BIDI_DIR_RTL) align = LV_LABEL_ALIGN_RIGHT; + if(base_dir == LV_BIDI_DIR_RTL) align = LV_LABEL_ALIGN_RIGHT; else align = LV_LABEL_ALIGN_LEFT; #else align = LV_LABEL_ALIGN_LEFT; @@ -641,10 +641,10 @@ static lv_design_res_t lv_btnmatrix_design(lv_obj_t * btnm, const lv_area_t * cl uint16_t btn_i = 0; uint16_t txt_i = 0; lv_txt_flag_t txt_flag = LV_TXT_FLAG_NONE; - if (ext->recolor) txt_flag |= LV_TXT_FLAG_RECOLOR; + if(ext->recolor) txt_flag |= LV_TXT_FLAG_RECOLOR; lv_label_align_t align = lv_btnmatrix_get_align(btnm); - if (align == LV_LABEL_ALIGN_CENTER) txt_flag |= LV_TXT_FLAG_CENTER; - if (align == LV_LABEL_ALIGN_RIGHT) txt_flag |= LV_TXT_FLAG_RIGHT; + if(align == LV_LABEL_ALIGN_CENTER) txt_flag |= LV_TXT_FLAG_CENTER; + if(align == LV_LABEL_ALIGN_RIGHT) txt_flag |= LV_TXT_FLAG_RIGHT; lv_draw_rect_dsc_t draw_rect_rel_dsc; lv_draw_label_dsc_t draw_label_rel_dsc; diff --git a/src/lv_widgets/lv_btnmatrix.h b/src/lv_widgets/lv_btnmatrix.h index f9d9b06a0..c30a959f0 100644 --- a/src/lv_widgets/lv_btnmatrix.h +++ b/src/lv_widgets/lv_btnmatrix.h @@ -170,13 +170,13 @@ void lv_btnmatrix_set_btn_width(lv_obj_t * btnm, uint16_t btn_id, uint8_t width) * @param one_chk Whether "one check" mode is enabled */ void lv_btnmatrix_set_one_check(lv_obj_t * btnm, bool one_chk); - + /** * Set the align of the map text (left, right or center) * @param btnm pointer to a btnmatrix object * @param align LV_LABEL_ALIGN_LEFT, LV_LABEL_ALIGN_RIGHT or LV_LABEL_ALIGN_CENTER */ -void lv_btnmatrix_set_align(lv_obj_t* btnm, lv_label_align_t align); +void lv_btnmatrix_set_align(lv_obj_t * btnm, lv_label_align_t align); /*===================== * Getter functions @@ -244,14 +244,14 @@ bool lv_btnmatrix_get_btn_ctrl(lv_obj_t * btnm, uint16_t btn_id, lv_btnmatrix_ct * @return whether "one toggle" mode is enabled */ bool lv_btnmatrix_get_one_check(const lv_obj_t * btnm); - + /** * Get the align attribute * @param btnm pointer to a btnmatrix object * @return LV_LABEL_ALIGN_LEFT, LV_LABEL_ALIGN_RIGHT or LV_LABEL_ALIGN_CENTER */ -lv_label_align_t lv_btnmatrix_get_align(const lv_obj_t* btnm); - +lv_label_align_t lv_btnmatrix_get_align(const lv_obj_t * btnm); + /********************** * MACROS **********************/ diff --git a/src/lv_widgets/lv_label.c b/src/lv_widgets/lv_label.c index da8b6d308..1113a6b10 100644 --- a/src/lv_widgets/lv_label.c +++ b/src/lv_widgets/lv_label.c @@ -577,15 +577,15 @@ void lv_label_get_letter_pos(const lv_obj_t * label, uint32_t char_id, lv_point_ if(txt[0] == '\0') { pos->y = 0; switch(align) { - case LV_LABEL_ALIGN_LEFT: - pos->x = 0; - break; - case LV_LABEL_ALIGN_RIGHT: - pos->x = lv_obj_get_width(label); - break; - case LV_LABEL_ALIGN_CENTER: - pos->x = lv_obj_get_width(label) / 2; - break; + case LV_LABEL_ALIGN_LEFT: + pos->x = 0; + break; + case LV_LABEL_ALIGN_RIGHT: + pos->x = lv_obj_get_width(label); + break; + case LV_LABEL_ALIGN_CENTER: + pos->x = lv_obj_get_width(label) / 2; + break; } return; } diff --git a/src/lv_widgets/lv_list.c b/src/lv_widgets/lv_list.c index 9df0d621d..76ba666ff 100644 --- a/src/lv_widgets/lv_list.c +++ b/src/lv_widgets/lv_list.c @@ -470,7 +470,7 @@ int32_t lv_list_get_btn_index(const lv_obj_t * list, const lv_obj_t * btn) list = lv_obj_get_parent(lv_obj_get_parent(btn)); } LV_ASSERT_OBJ(list, LV_OBJX_NAME); - + lv_obj_t * e = lv_list_get_next_btn(list, NULL); while(e != NULL) { if(e == btn) { diff --git a/src/lv_widgets/lv_roller.c b/src/lv_widgets/lv_roller.c index 066d3c29a..41874af52 100644 --- a/src/lv_widgets/lv_roller.c +++ b/src/lv_widgets/lv_roller.c @@ -196,9 +196,9 @@ void lv_roller_set_options(lv_obj_t * roller, const char * options, lv_roller_mo ext->sel_opt_id_ori = ext->sel_opt_id; - refr_height(roller); - refr_width(roller); -// refr_position(roller, LV_ANIM_OFF); + refr_height(roller); + refr_width(roller); + // refr_position(roller, LV_ANIM_OFF); } /** diff --git a/src/lv_widgets/lv_slider.c b/src/lv_widgets/lv_slider.c index b9ce83cf3..bb83f9298 100644 --- a/src/lv_widgets/lv_slider.c +++ b/src/lv_widgets/lv_slider.c @@ -264,14 +264,14 @@ static lv_res_t lv_slider_signal(lv_obj_t * slider, lv_signal_t sign, void * par lv_slider_ext_t * ext = lv_obj_get_ext_attr(slider); /* Advanced hit testing: react only on dragging the knob(s) */ - if (sign == LV_SIGNAL_HIT_TEST) { - lv_hit_test_info_t *info = param; + if(sign == LV_SIGNAL_HIT_TEST) { + lv_hit_test_info_t * info = param; /* Ordinary slider: was the knob area hit? */ info->result = _lv_area_is_point_on(&ext->right_knob_area, info->point, 0); /* There's still a change we have a hit, if we have another knob */ - if ((info->result == false) && (type == LV_SLIDER_TYPE_RANGE)) { + if((info->result == false) && (type == LV_SLIDER_TYPE_RANGE)) { info->result = _lv_area_is_point_on(&ext->left_knob_area, info->point, 0); } } diff --git a/src/lv_widgets/lv_textarea.c b/src/lv_widgets/lv_textarea.c index 182ac55da..9cf859f82 100644 --- a/src/lv_widgets/lv_textarea.c +++ b/src/lv_widgets/lv_textarea.c @@ -231,16 +231,16 @@ void lv_textarea_add_char(lv_obj_t * ta, uint32_t c) lv_textarea_ext_t * ext = lv_obj_get_ext_attr(ta); - const char *letter_buf; + const char * letter_buf; uint32_t u32_buf[2]; u32_buf[0] = c; u32_buf[1] = 0; - - letter_buf = (char*)&u32_buf; + + letter_buf = (char *)&u32_buf; #if LV_BIG_ENDIAN_SYSTEM - if (c != 0) while (*letter_buf == 0) ++letter_buf; + if(c != 0) while(*letter_buf == 0) ++letter_buf; #endif ta_insert_replace = NULL; diff --git a/src/lv_widgets/lv_win.c b/src/lv_widgets/lv_win.c index 6b825c168..20fbb7426 100644 --- a/src/lv_widgets/lv_win.c +++ b/src/lv_widgets/lv_win.c @@ -34,8 +34,8 @@ typedef struct { } lv_win_btn_ext_t; enum { - LV_WIN_BTN_ALIGN_RIGHT = 0, /**< Align button to right of the header */ - LV_WIN_BTN_ALIGN_LEFT /**< Align button to left of the header */ + LV_WIN_BTN_ALIGN_RIGHT = 0, /**< Align button to right of the header */ + LV_WIN_BTN_ALIGN_LEFT /**< Align button to left of the header */ }; typedef uint8_t lv_win_btn_align_t; @@ -559,7 +559,7 @@ static lv_design_res_t lv_win_header_design(lv_obj_t * header, const lv_area_t * lv_coord_t left_btn_offset = 0; btn = lv_obj_get_child_back(ext->header, NULL); while(btn != NULL) { - if (LV_WIN_BTN_ALIGN_LEFT == lv_win_btn_get_alignment(btn)) { + if(LV_WIN_BTN_ALIGN_LEFT == lv_win_btn_get_alignment(btn)) { left_btn_offset += btn_w + header_inner; } @@ -716,26 +716,28 @@ static void lv_win_realign(lv_obj_t * win) lv_obj_set_size(btn, btn_w, btn_h); uint8_t btn_alignment = lv_win_btn_get_alignment(btn); - if (LV_WIN_BTN_ALIGN_RIGHT == btn_alignment) { - if (is_header_right_side_empty) { + if(LV_WIN_BTN_ALIGN_RIGHT == btn_alignment) { + if(is_header_right_side_empty) { /* Align the button to the right of the header */ lv_obj_align(btn, ext->header, LV_ALIGN_IN_RIGHT_MID, -header_right, 0); is_header_right_side_empty = false; - } else { + } + else { /* Align the button to the left of the previous button */ - lv_obj_align(btn, btn_prev_at_right, LV_ALIGN_OUT_LEFT_MID, -header_inner, 0); + lv_obj_align(btn, btn_prev_at_right, LV_ALIGN_OUT_LEFT_MID, -header_inner, 0); } btn_prev_at_right = btn; } - else if (LV_WIN_BTN_ALIGN_LEFT == btn_alignment) { - if (is_header_left_side_empty) { + else if(LV_WIN_BTN_ALIGN_LEFT == btn_alignment) { + if(is_header_left_side_empty) { /* Align the button to the right of the header */ lv_obj_align(btn, ext->header, LV_ALIGN_IN_LEFT_MID, header_left, 0); is_header_left_side_empty = false; - } else { + } + else { /* Align the button to the right of the previous button */ lv_obj_align(btn, btn_prev_at_left, LV_ALIGN_OUT_RIGHT_MID, header_inner, 0); } @@ -754,11 +756,11 @@ static void lv_win_realign(lv_obj_t * win) static lv_obj_t * lv_win_btn_create(lv_obj_t * par, const void * img_src) { - LV_LOG_TRACE("win btn create started"); + LV_LOG_TRACE("win btn create started"); - lv_obj_t * win_btn; + lv_obj_t * win_btn; - win_btn = lv_btn_create(par, NULL); + win_btn = lv_btn_create(par, NULL); LV_ASSERT_MEM(win_btn); if(win_btn == NULL) return NULL; @@ -785,7 +787,7 @@ static lv_obj_t * lv_win_btn_create(lv_obj_t * par, const void * img_src) LV_LOG_INFO("win btn created"); - return win_btn; + return win_btn; } static void lv_win_btn_set_alignment(lv_obj_t * win_btn, const uint8_t alignment)