github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: upgrade astyle tool (#4776)

Browse Source 
Install from source to use the latest version
This commit is contained in:
Viktor Szépe
2023-11-10 15:37:23 +01:00
committed by GitHub
parent df910893e4
commit cc6581ae03
321 changed files with 14 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
demos/benchmark/lv_demo_benchmark.c
View File

@@ -141,7 +141,6 @@ static void rotated_argb_image_cb(void)
lv_obj_set_flex_align(lv_screen_active(), LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START);
lv_obj_set_style_pad_row(lv_screen_active(), 20, 0);
LV_IMG_DECLARE(img_benchmark_cogwheel_argb);
uint32_t hor_cnt = (lv_display_get_horizontal_resolution(NULL) - 16) / 116;
uint32_t ver_cnt = (lv_display_get_vertical_resolution(NULL) - 116) / 116;
@@ -233,7 +232,6 @@ static void multiple_arcs_cb(void)
}
}
static void containers_cb(void)
{
@@ -416,7 +414,6 @@ void lv_demo_benchmark(void)
* STATIC FUNCTIONS
**********************/
static void load_scene(uint32_t scene)
{
lv_obj_t * scr = lv_screen_active();
@@ -429,7 +426,6 @@ static void load_scene(uint32_t scene)
lv_obj_set_layout(scr, LV_LAYOUT_NONE);
lv_obj_set_flex_align(lv_screen_active(), LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START);
lv_anim_delete(scr, scroll_anim_y_cb);
lv_anim_delete(scr, shake_anim_y_cb);
lv_anim_delete(scr, color_anim_cb);
@@ -441,8 +437,6 @@ static void load_scene(uint32_t scene)
if(scenes[scene].create_cb) scenes[scene].create_cb();
}
static void next_scene_timer_cb(lv_timer_t * timer)
{
LV_UNUSED(timer);
@@ -477,7 +471,6 @@ static void sysmon_perf_observer_cb(lv_subject_t * subject, lv_observer_t * obse
* SCENE HELPERS
*----------------*/
static void color_anim_cb(void * var, int32_t v)
{
LV_UNUSED(v);
@@ -558,7 +551,6 @@ static void shake_anim(lv_obj_t * obj, int32_t y_max)
lv_anim_start(&a);
}
static lv_obj_t * card_create(void)
{
lv_obj_t * panel = lv_obj_create(lv_screen_active());
@@ -586,8 +578,6 @@ static lv_obj_t * card_create(void)
child = lv_label_create(child);
lv_label_set_text(child, "Connect");
return panel;
}

1
demos/flex_layout/lv_demo_flex_layout_ctrl_pad.c
View File

@@ -25,7 +25,6 @@
#define SPINBOX_EVENT_ATTACH(item) \
lv_obj_add_event(ui->ctrl_pad.tab.layout.spinbox_##item, ctrl_pad_spinbox_event_handler, LV_EVENT_VALUE_CHANGED, ui);
/**********************
* TYPEDEFS
**********************/

2
demos/music/lv_demo_music_list.c
View File

@@ -226,7 +226,6 @@ static lv_obj_t * add_list_button(lv_obj_t * parent, uint32_t track_id)
return btn;
}
static void btn_click_event_cb(lv_event_t * e)
{
lv_obj_t * btn = lv_event_get_target(e);
@@ -252,4 +251,3 @@ static void list_delete_event_cb(lv_event_t * e)
}
}
#endif /*LV_USE_DEMO_MUSIC*/

3
demos/music/lv_demo_music_main.c
View File

@@ -1000,7 +1000,6 @@ static void next_click_event_cb(lv_event_t * e)
}
}
static void timer_cb(lv_timer_t * t)
{
LV_UNUSED(t);
@@ -1015,7 +1014,6 @@ static void spectrum_end_cb(lv_anim_t * a)
_lv_demo_music_album_next(true);
}
static void stop_start_anim(lv_timer_t * t)
{
LV_UNUSED(t);
@@ -1028,4 +1026,3 @@ static void album_fade_anim_cb(void * var, int32_t v)
lv_obj_set_style_image_opa(var, v, 0);
}
#endif /*LV_USE_DEMO_MUSIC*/

1
demos/music/lv_demo_music_main.h
View File

@@ -38,7 +38,6 @@ void _lv_demo_music_album_next(bool next);
**********************/
#endif /*LV_USE_DEMO_MUSIC*/
#ifdef __cplusplus
} /* extern "C" */
#endif

7
demos/render/lv_demo_render.c
View File

@@ -274,7 +274,6 @@ static void box_shadow_cb(lv_obj_t * parent)
}
}
static lv_obj_t * text_obj_create(lv_obj_t * parent, int32_t col, int32_t row)
{
@@ -311,7 +310,6 @@ static void text_cb(lv_obj_t * parent)
obj = text_obj_create(parent, 3, 5);
lv_obj_set_style_text_decor(obj, LV_TEXT_DECOR_UNDERLINE | LV_TEXT_DECOR_STRIKETHROUGH, 0);
}
static lv_obj_t * image_obj_create(lv_obj_t * parent, int32_t col, int32_t row, bool recolor)
@@ -395,7 +393,6 @@ static void image_core_cb(lv_obj_t * parent, bool recolor)
}
}
static void image_normal_cb(lv_obj_t * parent)
{
image_core_cb(parent, false);
@@ -406,7 +403,6 @@ static void image_recolored_cb(lv_obj_t * parent)
image_core_cb(parent, true);
}
static lv_obj_t * line_obj_create(lv_obj_t * parent, int32_t col, int32_t row, lv_point_precise_t p[])
{
lv_obj_t * obj = lv_line_create(parent);
@@ -537,7 +533,6 @@ static void triangle_draw_event_cb(lv_event_t * e)
lv_draw_triangle(lv_event_get_layer(e), &dsc);
}
static lv_obj_t * triangle_obj_create(lv_obj_t * parent, int32_t col, int32_t row, lv_point_t p[])
{
lv_obj_t * obj = lv_arc_create(parent);
@@ -612,7 +607,6 @@ static void triangle_cb(lv_obj_t * parent)
}
}
static lv_obj_t * layer_obj_create(lv_obj_t * parent, int32_t col, int32_t row, lv_blend_mode_t blend_mode)
{
lv_obj_t * obj = lv_obj_create(parent);
@@ -761,7 +755,6 @@ void lv_demo_render(lv_demo_render_scene_t id, lv_opa_t opa)
if(scenes[id].create_cb) scenes[id].create_cb(main_parent);
}
const char * lv_demo_render_get_scene_name(lv_demo_render_scene_t id)
{
if(id > _LV_DEMO_RENDER_SCENE_NUM) return NULL;

1
demos/scroll/lv_demo_scroll.c
View File

@@ -65,7 +65,6 @@ void lv_demo_scroll(void)
switch_create(panel, "Elastic scroll", LV_OBJ_FLAG_SCROLL_ELASTIC, true);
switch_create(panel, "Add scroll momentum", LV_OBJ_FLAG_SCROLL_MOMENTUM, true);
/*Show the switches first*/
lv_obj_move_foreground(list);

1
demos/stress/lv_demo_stress.c
View File

@@ -88,7 +88,6 @@ static void obj_test_task_cb(lv_timer_t * tmr)
lv_obj_set_size(main_page, LV_HOR_RES / 2, LV_VER_RES);
lv_obj_set_flex_flow(main_page, LV_FLEX_FLOW_COLUMN);
obj = lv_button_create(main_page);
lv_obj_set_size(obj, 100, 70);
obj = lv_label_create(obj);

15
demos/widgets/lv_demo_widgets.c
View File

@@ -211,7 +211,6 @@ void lv_demo_widgets(void)
color_changer_create(tv);
}
void lv_demo_widgets_start_slideshow(void)
{
lv_obj_update_layout(tv);
@@ -378,7 +377,6 @@ static void profile_create(lv_obj_t * parent)
LV_GRID_TEMPLATE_LAST
};
lv_obj_set_grid_dsc_array(parent, grid_main_col_dsc, grid_main_row_dsc);
lv_obj_set_grid_cell(panel1, LV_GRID_ALIGN_STRETCH, 0, 2, LV_GRID_ALIGN_CENTER, 0, 1);
@@ -406,7 +404,6 @@ static void profile_create(lv_obj_t * parent)
lv_obj_set_grid_cell(gender, LV_GRID_ALIGN_STRETCH, 0, 1, LV_GRID_ALIGN_CENTER, 6, 1);
lv_obj_set_grid_cell(gender_label, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 5, 1);
lv_obj_set_grid_cell(panel3, LV_GRID_ALIGN_STRETCH, 1, 1, LV_GRID_ALIGN_STRETCH, 1, 1);
lv_obj_set_grid_dsc_array(panel3, grid_2_col_dsc, grid_2_row_dsc);
lv_obj_set_grid_cell(panel3_title, LV_GRID_ALIGN_START, 0, 2, LV_GRID_ALIGN_CENTER, 0, 1);
@@ -421,7 +418,6 @@ static void profile_create(lv_obj_t * parent)
static int32_t grid_main_col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
static int32_t grid_main_row_dsc[] = {LV_GRID_CONTENT, LV_GRID_CONTENT, LV_GRID_TEMPLATE_LAST};
/*Create the top panel*/
static int32_t grid_1_col_dsc[] = {LV_GRID_CONTENT, 1, LV_GRID_CONTENT, LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
static int32_t grid_1_row_dsc[] = {
@@ -449,7 +445,6 @@ static void profile_create(lv_obj_t * parent)
LV_GRID_TEMPLATE_LAST
};
lv_obj_set_grid_dsc_array(parent, grid_main_col_dsc, grid_main_row_dsc);
lv_obj_set_grid_cell(panel1, LV_GRID_ALIGN_STRETCH, 0, 2, LV_GRID_ALIGN_CENTER, 0, 1);
@@ -494,7 +489,6 @@ static void profile_create(lv_obj_t * parent)
static int32_t grid_main_row_dsc[] = {LV_GRID_CONTENT, LV_GRID_CONTENT, LV_GRID_CONTENT, LV_GRID_TEMPLATE_LAST};
lv_obj_set_grid_dsc_array(parent, grid_main_col_dsc, grid_main_row_dsc);
/*Create the top panel*/
static int32_t grid_1_col_dsc[] = {LV_GRID_CONTENT, LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
static int32_t grid_1_row_dsc[] = {LV_GRID_CONTENT, /*Avatar*/
@@ -509,7 +503,6 @@ static void profile_create(lv_obj_t * parent)
lv_obj_set_grid_dsc_array(panel1, grid_1_col_dsc, grid_1_row_dsc);
static int32_t grid_2_col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
static int32_t grid_2_row_dsc[] = {
LV_GRID_CONTENT, /*Title*/
@@ -564,7 +557,6 @@ static void profile_create(lv_obj_t * parent)
}
}
static lv_obj_t * create_chart_with_scales(lv_obj_t * parent, const char * title, const char * hor_text[])
{
static const int32_t col_dsc[] = {40, LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
@@ -625,7 +617,6 @@ static void analytics_create(lv_obj_t * parent)
lv_obj_set_style_max_height(chart1_cont, 300, 0);
lv_obj_set_flex_grow(chart1_cont, 1);
static const char * chart1_texts[] = {"Jan", "Feb", "March", "April", "May", "Jun", "July", "Aug", "Sept", "Oct", "Nov", "Dec", NULL};
chart1 = create_chart_with_scales(chart1_cont, "Unique visitors", chart1_texts);
@@ -641,7 +632,6 @@ static void analytics_create(lv_obj_t * parent)
lv_obj_set_flex_grow(chart2_cont, 1);
lv_obj_add_flag(chart2_cont, LV_OBJ_FLAG_FLEX_IN_NEW_TRACK);
static const char * chart2_texts[] = {"I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X", "XI", "XII", NULL};
chart2 = create_chart_with_scales(chart2_cont, "Monthly revenue", chart2_texts);
lv_chart_set_type(chart2, LV_CHART_TYPE_BAR);
@@ -925,7 +915,6 @@ void shop_create(lv_obj_t * parent)
lv_obj_set_size(chart3, lv_pct(100), lv_pct(100));
lv_obj_set_style_pad_column(chart3, LV_DPX(30), 0);
lv_obj_set_grid_dsc_array(panel1, grid1_col_dsc, grid1_row_dsc);
lv_obj_set_grid_cell(title, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 0, 1);
lv_obj_set_grid_cell(date, LV_GRID_ALIGN_START, 0, 1, LV_GRID_ALIGN_START, 1, 1);
@@ -1041,7 +1030,6 @@ void shop_create(lv_obj_t * parent)
cb = lv_checkbox_create(notifications);
lv_checkbox_set_text(cb, "Out of stock");
}
static void color_changer_create(lv_obj_t * parent)
@@ -1549,13 +1537,11 @@ static void chart_event_cb(lv_event_t * e)
}
}
static void shop_chart_event_cb(lv_event_t * e)
{
LV_UNUSED(e);
}
static void scale1_indic1_anim_cb(void * var, int32_t v)
{
lv_arc_set_value(var, v);
@@ -1573,7 +1559,6 @@ static void scale2_timer_cb(lv_timer_t * timer)
static bool down2 = false;
static bool down3 = false;
if(down1) {
session_desktop -= 137;
if(session_desktop < 1400) down1 = false;