From cc6581ae0320ae51f341519f17f770714b396cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Fri, 10 Nov 2023 15:37:23 +0100 Subject: [PATCH] ci: upgrade astyle tool (#4776) Install from source to use the latest version --- .github/workflows/check_style.yml | 12 +++- demos/benchmark/lv_demo_benchmark.c | 10 --- .../lv_demo_flex_layout_ctrl_pad.c | 1 - demos/music/lv_demo_music_list.c | 2 - demos/music/lv_demo_music_main.c | 3 - demos/music/lv_demo_music_main.h | 1 - demos/render/lv_demo_render.c | 7 -- demos/scroll/lv_demo_scroll.c | 1 - demos/stress/lv_demo_stress.c | 1 - demos/widgets/lv_demo_widgets.c | 15 ----- examples/anim/lv_example_anim_1.c | 1 - examples/anim/lv_example_anim_2.c | 1 - examples/layouts/grid/lv_example_grid_2.c | 1 - examples/layouts/grid/lv_example_grid_4.c | 1 - examples/libs/ffmpeg/lv_example_ffmpeg_1.c | 1 - examples/libs/gif/img_bulb_gif.c | 1 - examples/libs/lodepng/img_wink_png.c | 1 - .../libs/tiny_ttf/lv_example_tiny_ttf_3.c | 2 - .../lv_example_file_explorer_3.c | 2 - .../others/fragment/lv_example_fragment_1.c | 1 - .../others/fragment/lv_example_fragment_2.c | 1 - .../others/gridnav/lv_example_gridnav_2.c | 1 - .../others/gridnav/lv_example_gridnav_3.c | 4 -- .../others/gridnav/lv_example_gridnav_4.c | 1 - .../others/observer/lv_example_observer_1.c | 1 - .../others/observer/lv_example_observer_2.c | 1 - .../others/observer/lv_example_observer_3.c | 2 - .../others/observer/lv_example_observer_4.c | 1 - .../others/observer/lv_example_observer_6.c | 2 - examples/porting/lv_port_indev_template.c | 2 - examples/scroll/lv_example_scroll.h | 1 - examples/scroll/lv_example_scroll_4.c | 2 - examples/scroll/lv_example_scroll_5.c | 1 - examples/styles/lv_example_style_14.c | 3 - examples/styles/lv_example_style_15.c | 2 - examples/widgets/arc/lv_example_arc_2.c | 2 - examples/widgets/bar/lv_example_bar_3.c | 1 - examples/widgets/bar/lv_example_bar_5.c | 1 - examples/widgets/bar/lv_example_bar_7.c | 1 - .../btnmatrix/lv_example_btnmatrix_1.c | 1 - .../btnmatrix/lv_example_btnmatrix_2.c | 1 - .../btnmatrix/lv_example_btnmatrix_3.c | 1 - examples/widgets/canvas/lv_example_canvas_1.c | 3 - examples/widgets/canvas/lv_example_canvas_7.c | 1 - examples/widgets/chart/lv_example_chart_3.c | 1 - examples/widgets/chart/lv_example_chart_4.c | 1 - examples/widgets/chart/lv_example_chart_5.c | 1 - examples/widgets/chart/lv_example_chart_8.c | 1 - .../widgets/checkbox/lv_example_checkbox_2.c | 3 - .../widgets/dropdown/lv_example_dropdown_2.c | 1 - examples/widgets/img/lv_example_img_1.c | 1 - examples/widgets/img/lv_example_img_2.c | 1 - examples/widgets/img/lv_example_img_3.c | 1 - examples/widgets/list/lv_example_list_2.c | 1 - examples/widgets/obj/lv_example_obj_2.c | 1 - examples/widgets/slider/lv_example_slider_2.c | 2 - .../widgets/spinbox/lv_example_spinbox_1.c | 2 - examples/widgets/table/lv_example_table_1.c | 1 - examples/widgets/table/lv_example_table_2.c | 1 - .../widgets/tabview/lv_example_tabview_2.c | 1 - .../widgets/textarea/lv_example_textarea_2.c | 1 - .../widgets/tileview/lv_example_tileview_1.c | 1 - examples/widgets/win/lv_example_win_1.c | 2 - src/core/lv_global.h | 1 - src/core/lv_group.h | 4 -- src/core/lv_obj.c | 1 - src/core/lv_obj.h | 2 - src/core/lv_obj_class.c | 1 - src/core/lv_obj_class.h | 2 - src/core/lv_obj_draw.h | 2 - src/core/lv_obj_event.c | 4 -- src/core/lv_obj_event.h | 1 - src/core/lv_obj_pos.c | 5 -- src/core/lv_obj_pos.h | 2 - src/core/lv_obj_scroll.c | 4 -- src/core/lv_obj_scroll.h | 1 - src/core/lv_obj_style.c | 10 --- src/core/lv_obj_style.h | 4 -- src/core/lv_obj_tree.c | 2 - src/core/lv_obj_tree.h | 2 - src/core/lv_refr.c | 6 -- src/dev/nuttx/lv_nuttx_lcd.c | 1 - src/dev/sdl/lv_sdl_keyboard.c | 2 - src/dev/sdl/lv_sdl_mouse.c | 1 - src/dev/sdl/lv_sdl_window.c | 1 - src/display/lv_display.c | 5 -- src/display/lv_display.h | 10 --- src/draw/lv_draw.c | 3 - src/draw/lv_draw.h | 1 - src/draw/lv_draw_buf.c | 5 -- src/draw/lv_draw_image.c | 4 -- src/draw/lv_draw_image.h | 1 - src/draw/lv_draw_label.c | 8 --- src/draw/lv_draw_label.h | 10 +-- src/draw/lv_draw_line.h | 1 - src/draw/lv_draw_mask.h | 1 - src/draw/lv_draw_rect.c | 3 - src/draw/lv_draw_rect.h | 1 - src/draw/lv_draw_vector.c | 1 - src/draw/lv_draw_vector.h | 5 -- src/draw/lv_image_decoder.c | 1 - src/draw/lv_image_decoder.h | 1 - src/draw/nxp/pxp/lv_draw_buf_pxp.c | 1 - src/draw/nxp/pxp/lv_draw_pxp.c | 1 - src/draw/nxp/pxp/lv_draw_pxp.h | 1 - src/draw/nxp/pxp/lv_draw_pxp_bg_img.c | 1 - src/draw/nxp/pxp/lv_draw_pxp_fill.c | 1 - src/draw/nxp/pxp/lv_draw_pxp_img.c | 1 - src/draw/nxp/pxp/lv_draw_pxp_layer.c | 1 - src/draw/nxp/pxp/lv_pxp_cfg.c | 1 - src/draw/nxp/pxp/lv_pxp_cfg.h | 1 - src/draw/nxp/pxp/lv_pxp_osa.c | 1 - src/draw/nxp/pxp/lv_pxp_osa.h | 1 - src/draw/nxp/pxp/lv_pxp_utils.c | 1 - src/draw/nxp/pxp/lv_pxp_utils.h | 1 - src/draw/nxp/vglite/lv_draw_buf_vglite.c | 1 - src/draw/nxp/vglite/lv_draw_vglite.c | 1 - src/draw/nxp/vglite/lv_draw_vglite.h | 1 - src/draw/nxp/vglite/lv_draw_vglite_arc.c | 1 - src/draw/nxp/vglite/lv_draw_vglite_bg_img.c | 1 - src/draw/nxp/vglite/lv_draw_vglite_fill.c | 1 - src/draw/nxp/vglite/lv_draw_vglite_img.c | 1 - src/draw/nxp/vglite/lv_draw_vglite_label.c | 2 - src/draw/nxp/vglite/lv_draw_vglite_layer.c | 1 - src/draw/nxp/vglite/lv_draw_vglite_line.c | 1 - src/draw/nxp/vglite/lv_vglite_buf.c | 1 - src/draw/nxp/vglite/lv_vglite_buf.h | 1 - src/draw/nxp/vglite/lv_vglite_matrix.c | 1 - src/draw/nxp/vglite/lv_vglite_matrix.h | 1 - src/draw/nxp/vglite/lv_vglite_path.c | 1 - src/draw/nxp/vglite/lv_vglite_path.h | 1 - src/draw/nxp/vglite/lv_vglite_utils.c | 1 - src/draw/nxp/vglite/lv_vglite_utils.h | 1 - src/draw/sw/blend/lv_draw_sw_blend.h | 1 - .../sw/blend/lv_draw_sw_blend_to_argb8888.c | 3 - .../sw/blend/lv_draw_sw_blend_to_argb8888.h | 2 - .../sw/blend/lv_draw_sw_blend_to_rgb565.c | 1 - .../sw/blend/lv_draw_sw_blend_to_rgb565.h | 2 - .../sw/blend/lv_draw_sw_blend_to_rgb888.c | 5 -- .../sw/blend/lv_draw_sw_blend_to_rgb888.h | 2 - .../sw/blend/neon/lv_blend_to_rgb888_neon.h | 1 - src/draw/sw/lv_draw_sw.c | 2 - src/draw/sw/lv_draw_sw_arc.c | 2 - src/draw/sw/lv_draw_sw_border.c | 5 -- src/draw/sw/lv_draw_sw_box_shadow.c | 10 --- src/draw/sw/lv_draw_sw_fill.c | 1 - src/draw/sw/lv_draw_sw_gradient.c | 2 - src/draw/sw/lv_draw_sw_gradient.h | 2 - src/draw/sw/lv_draw_sw_img.c | 1 - src/draw/sw/lv_draw_sw_line.c | 1 - src/draw/sw/lv_draw_sw_mask.c | 4 -- src/draw/sw/lv_draw_sw_mask.h | 4 -- src/draw/sw/lv_draw_sw_transform.c | 6 -- src/draw/sw/lv_draw_sw_triangle.c | 1 - src/font/lv_font_dejavu_16_persian_hebrew.c | 7 -- src/font/lv_font_fmt_txt.c | 2 - src/font/lv_font_fmt_txt.h | 3 - src/font/lv_font_loader.c | 1 - src/font/lv_font_loader.h | 1 - src/font/lv_font_montserrat_10.c | 7 -- src/font/lv_font_montserrat_12.c | 7 -- src/font/lv_font_montserrat_14.c | 7 -- src/font/lv_font_montserrat_16.c | 7 -- src/font/lv_font_montserrat_18.c | 7 -- src/font/lv_font_montserrat_20.c | 7 -- src/font/lv_font_montserrat_22.c | 7 -- src/font/lv_font_montserrat_24.c | 7 -- src/font/lv_font_montserrat_26.c | 7 -- src/font/lv_font_montserrat_28.c | 7 -- src/font/lv_font_montserrat_28_compressed.c | 7 -- src/font/lv_font_montserrat_30.c | 7 -- src/font/lv_font_montserrat_32.c | 7 -- src/font/lv_font_montserrat_34.c | 7 -- src/font/lv_font_montserrat_36.c | 7 -- src/font/lv_font_montserrat_38.c | 7 -- src/font/lv_font_montserrat_40.c | 7 -- src/font/lv_font_montserrat_42.c | 7 -- src/font/lv_font_montserrat_44.c | 7 -- src/font/lv_font_montserrat_46.c | 7 -- src/font/lv_font_montserrat_48.c | 7 -- src/font/lv_font_montserrat_8.c | 7 -- src/font/lv_font_simsun_16_cjk.c | 7 -- src/font/lv_font_unscii_16.c | 9 --- src/font/lv_font_unscii_8.c | 9 --- src/font/lv_symbol_def.h | 1 - src/indev/lv_indev.c | 4 -- src/indev/lv_indev_scroll.c | 7 -- src/layouts/flex/lv_flex.c | 4 -- src/layouts/flex/lv_flex.h | 1 - src/layouts/grid/lv_grid.c | 6 -- src/layouts/lv_layout.h | 4 -- src/libs/bmp/lv_bmp.c | 4 -- src/libs/ffmpeg/lv_ffmpeg.c | 1 - src/libs/freetype/ftoption.h | 65 ------------------- src/libs/freetype/lv_ftsystem.c | 1 - src/libs/fsdrv/lv_fs_memfs.c | 3 - src/libs/fsdrv/lv_fs_posix.c | 1 - src/libs/fsdrv/lv_fs_stdio.c | 2 - src/libs/fsdrv/lv_fs_win32.c | 1 - src/libs/gif/lv_gif.c | 1 - src/libs/libpng/lv_libpng.c | 1 - src/libs/lodepng/lv_lodepng.c | 5 -- src/libs/qrcode/lv_qrcode.c | 1 - src/libs/rlottie/lv_rlottie.c | 1 - src/libs/tiny_ttf/stb_rect_pack.h | 4 -- src/libs/tiny_ttf/stb_truetype_htcw.h | 14 ---- src/lv_api_map.h | 1 - src/lv_init.h | 2 - src/misc/lv_anim.c | 2 - src/misc/lv_anim.h | 1 - src/misc/lv_anim_timeline.c | 2 - src/misc/lv_area.c | 1 - src/misc/lv_area.h | 3 - src/misc/lv_bidi.h | 2 - src/misc/lv_cache.h | 1 - src/misc/lv_color.c | 2 - src/misc/lv_color.h | 5 -- src/misc/lv_color_op.h | 2 - src/misc/lv_event.c | 3 - src/misc/lv_event.h | 4 -- src/misc/lv_fs.c | 2 - src/misc/lv_fs.h | 2 - src/misc/lv_lru.c | 3 - src/misc/lv_lru.h | 2 - src/misc/lv_profiler_builtin.c | 1 - src/misc/lv_profiler_builtin.h | 1 - src/misc/lv_style.h | 10 --- src/misc/lv_style_gen.c | 2 - src/misc/lv_style_gen.h | 1 - src/misc/lv_text.h | 3 - src/misc/lv_types.h | 1 - src/osal/lv_os_none.c | 2 - src/others/file_explorer/lv_file_explorer.c | 10 --- src/others/file_explorer/lv_file_explorer.h | 1 - src/others/fragment/lv_fragment.h | 3 - src/others/fragment/lv_fragment_manager.c | 2 - src/others/ime/lv_ime_pinyin.c | 13 ---- src/others/ime/lv_ime_pinyin.h | 3 - src/others/observer/lv_observer.c | 7 -- src/others/observer/lv_observer.h | 3 - src/others/snapshot/lv_snapshot.h | 1 - src/others/sysmon/lv_sysmon.c | 3 - src/stdlib/builtin/lv_mem_core_builtin.c | 3 - src/stdlib/builtin/lv_tlsf.c | 1 - src/stdlib/clib/lv_mem_core_clib.c | 2 - src/stdlib/clib/lv_sprintf_clib.c | 1 - src/stdlib/lv_mem.c | 1 - src/stdlib/lv_mem.h | 2 - src/stdlib/lv_sprintf.h | 2 - .../micropython/lv_mem_core_micropython.c | 2 - src/themes/basic/lv_theme_basic.c | 3 - src/themes/default/lv_theme_default.c | 6 -- src/themes/lv_theme.h | 1 - src/widgets/animimage/lv_animimage.h | 3 - src/widgets/arc/lv_arc.c | 4 -- src/widgets/arc/lv_arc.h | 1 - src/widgets/bar/lv_bar.h | 2 - src/widgets/buttonmatrix/lv_buttonmatrix.c | 1 - src/widgets/buttonmatrix/lv_buttonmatrix.h | 2 - src/widgets/calendar/lv_calendar.c | 1 - src/widgets/canvas/lv_canvas.c | 4 -- src/widgets/canvas/lv_canvas.h | 1 - src/widgets/chart/lv_chart.c | 5 -- src/widgets/chart/lv_chart.h | 6 -- src/widgets/dropdown/lv_dropdown.c | 4 -- src/widgets/image/lv_image.c | 1 - src/widgets/image/lv_image.h | 3 - src/widgets/imgbtn/lv_imgbtn.c | 3 - src/widgets/imgbtn/lv_imgbtn.h | 2 - src/widgets/keyboard/lv_keyboard.h | 1 - src/widgets/label/lv_label.c | 3 - src/widgets/label/lv_label.h | 1 - src/widgets/led/lv_led.h | 1 - src/widgets/menu/lv_menu.c | 1 - src/widgets/menu/lv_menu.h | 1 - src/widgets/msgbox/lv_msgbox.c | 1 - src/widgets/roller/lv_roller.c | 6 -- src/widgets/roller/lv_roller.h | 3 - src/widgets/scale/lv_scale.c | 1 - src/widgets/slider/lv_slider.h | 2 - src/widgets/span/lv_span.h | 2 - src/widgets/spinner/lv_spinner.c | 3 - src/widgets/spinner/lv_spinner.h | 1 - src/widgets/switch/lv_switch.c | 1 - src/widgets/table/lv_table.c | 4 -- src/widgets/table/lv_table.h | 2 - src/widgets/tabview/lv_tabview.c | 3 - src/widgets/textarea/lv_textarea.c | 3 - src/widgets/win/lv_win.c | 2 - src/widgets/win/lv_win.h | 1 - tests/src/lv_test_conf.h | 3 - tests/src/lv_test_helpers.h | 3 - tests/src/lv_test_indev.h | 2 - tests/src/lv_test_init.c | 1 - tests/src/test_cases/draw/test_clip_corner.c | 1 - tests/src/test_cases/draw/test_draw_blend.c | 6 -- tests/src/test_cases/draw/test_draw_label.c | 7 -- tests/src/test_cases/draw/test_draw_vector.c | 7 -- .../src/test_cases/draw/test_image_formats.c | 7 -- .../src/test_cases/libs/test_libjpeg_turbo.c | 1 - tests/src/test_cases/libs/test_libpng.c | 1 - tests/src/test_cases/libs/test_lodepng.c | 1 - tests/src/test_cases/libs/test_tjpgd.c | 1 - tests/src/test_cases/test_array.c | 6 -- tests/src/test_cases/test_bindings.c | 5 -- tests/src/test_cases/test_event.c | 1 - tests/src/test_cases/test_fs.c | 2 - tests/src/test_cases/test_grid.c | 5 -- tests/src/test_cases/test_margin_align.c | 1 - tests/src/test_cases/test_math.c | 1 - tests/src/test_cases/test_observer.c | 1 - tests/src/test_cases/test_snapshot.c | 1 - tests/src/test_cases/widgets/test_animimg.c | 2 - tests/src/test_cases/widgets/test_bar.c | 1 - tests/src/test_cases/widgets/test_btnmatrix.c | 1 - tests/src/test_cases/widgets/test_dropdown.c | 3 - tests/src/test_cases/widgets/test_image.c | 4 -- tests/src/test_cases/widgets/test_line.c | 2 - tests/src/test_cases/widgets/test_obj_flags.c | 2 - tests/src/test_cases/widgets/test_win.c | 1 - tests/unity/unity.h | 4 -- 321 files changed, 14 insertions(+), 948 deletions(-) diff --git a/.github/workflows/check_style.yml b/.github/workflows/check_style.yml index 7fad6125b..7623a0191 100644 --- a/.github/workflows/check_style.yml +++ b/.github/workflows/check_style.yml @@ -13,11 +13,17 @@ jobs: with: persist-credentials: false fetch-depth: 0 + - name: Checkout astyle + uses: actions/checkout@v4 + with: + repository: szepeviktor/astyle + path: astyle - name: Install astyle run: | - sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse" - sudo apt-get update -y -qq - sudo apt-get install astyle + cd astyle/build/gcc/ + make + sudo make install + astyle --version - name: Format code run: python code-format.py working-directory: scripts diff --git a/demos/benchmark/lv_demo_benchmark.c b/demos/benchmark/lv_demo_benchmark.c index 914e7bacf..af28394fe 100644 --- a/demos/benchmark/lv_demo_benchmark.c +++ b/demos/benchmark/lv_demo_benchmark.c @@ -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; } diff --git a/demos/flex_layout/lv_demo_flex_layout_ctrl_pad.c b/demos/flex_layout/lv_demo_flex_layout_ctrl_pad.c index 3ef4531f4..06d6a4549 100644 --- a/demos/flex_layout/lv_demo_flex_layout_ctrl_pad.c +++ b/demos/flex_layout/lv_demo_flex_layout_ctrl_pad.c @@ -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 **********************/ diff --git a/demos/music/lv_demo_music_list.c b/demos/music/lv_demo_music_list.c index 510c86289..4034aba08 100644 --- a/demos/music/lv_demo_music_list.c +++ b/demos/music/lv_demo_music_list.c @@ -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*/ - diff --git a/demos/music/lv_demo_music_main.c b/demos/music/lv_demo_music_main.c index 486d4baf4..ec0c614a8 100644 --- a/demos/music/lv_demo_music_main.c +++ b/demos/music/lv_demo_music_main.c @@ -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*/ - diff --git a/demos/music/lv_demo_music_main.h b/demos/music/lv_demo_music_main.h index a2cf93994..7a225736f 100644 --- a/demos/music/lv_demo_music_main.h +++ b/demos/music/lv_demo_music_main.h @@ -38,7 +38,6 @@ void _lv_demo_music_album_next(bool next); **********************/ #endif /*LV_USE_DEMO_MUSIC*/ - #ifdef __cplusplus } /* extern "C" */ #endif diff --git a/demos/render/lv_demo_render.c b/demos/render/lv_demo_render.c index 47b405544..68fb4f744 100644 --- a/demos/render/lv_demo_render.c +++ b/demos/render/lv_demo_render.c @@ -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; diff --git a/demos/scroll/lv_demo_scroll.c b/demos/scroll/lv_demo_scroll.c index 7e5a00636..ccd5ba48c 100644 --- a/demos/scroll/lv_demo_scroll.c +++ b/demos/scroll/lv_demo_scroll.c @@ -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); diff --git a/demos/stress/lv_demo_stress.c b/demos/stress/lv_demo_stress.c index e7505bf53..470370035 100644 --- a/demos/stress/lv_demo_stress.c +++ b/demos/stress/lv_demo_stress.c @@ -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); diff --git a/demos/widgets/lv_demo_widgets.c b/demos/widgets/lv_demo_widgets.c index ee3491fd0..b868dada7 100644 --- a/demos/widgets/lv_demo_widgets.c +++ b/demos/widgets/lv_demo_widgets.c @@ -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; diff --git a/examples/anim/lv_example_anim_1.c b/examples/anim/lv_example_anim_1.c index a3ba285a2..b9f630cbe 100644 --- a/examples/anim/lv_example_anim_1.c +++ b/examples/anim/lv_example_anim_1.c @@ -43,7 +43,6 @@ void lv_example_anim_1(void) lv_label_set_text(label, "Hello animations!"); lv_obj_set_pos(label, 100, 10); - lv_obj_t * sw = lv_switch_create(lv_screen_active()); lv_obj_center(sw); lv_obj_add_state(sw, LV_STATE_CHECKED); diff --git a/examples/anim/lv_example_anim_2.c b/examples/anim/lv_example_anim_2.c index 2f76ad935..e59d534a4 100644 --- a/examples/anim/lv_example_anim_2.c +++ b/examples/anim/lv_example_anim_2.c @@ -1,7 +1,6 @@ #include "../lv_examples.h" #if LV_BUILD_EXAMPLES && LV_USE_SWITCH - static void anim_x_cb(void * var, int32_t v) { lv_obj_set_x(var, v); diff --git a/examples/layouts/grid/lv_example_grid_2.c b/examples/layouts/grid/lv_example_grid_2.c index c521d5c0b..92e33b008 100644 --- a/examples/layouts/grid/lv_example_grid_2.c +++ b/examples/layouts/grid/lv_example_grid_2.c @@ -1,7 +1,6 @@ #include "../../lv_examples.h" #if LV_USE_GRID && LV_BUILD_EXAMPLES - /** * Demonstrate cell placement and span */ diff --git a/examples/layouts/grid/lv_example_grid_4.c b/examples/layouts/grid/lv_example_grid_4.c index be202ca83..eba363087 100644 --- a/examples/layouts/grid/lv_example_grid_4.c +++ b/examples/layouts/grid/lv_example_grid_4.c @@ -9,7 +9,6 @@ void lv_example_grid_4(void) static int32_t col_dsc[] = {60, 60, 60, LV_GRID_TEMPLATE_LAST}; static int32_t row_dsc[] = {45, 45, 45, LV_GRID_TEMPLATE_LAST}; - /*Add space between the columns and move the rows to the bottom (end)*/ /*Create a container with grid*/ diff --git a/examples/libs/ffmpeg/lv_example_ffmpeg_1.c b/examples/libs/ffmpeg/lv_example_ffmpeg_1.c index 32af664c7..aa88240a8 100644 --- a/examples/libs/ffmpeg/lv_example_ffmpeg_1.c +++ b/examples/libs/ffmpeg/lv_example_ffmpeg_1.c @@ -2,7 +2,6 @@ #if LV_BUILD_EXAMPLES #if LV_USE_FFMPEG - /** * Open an image from a file */ diff --git a/examples/libs/gif/img_bulb_gif.c b/examples/libs/gif/img_bulb_gif.c index 13e47529c..8b1443274 100644 --- a/examples/libs/gif/img_bulb_gif.c +++ b/examples/libs/gif/img_bulb_gif.c @@ -1,6 +1,5 @@ #include "../../../lvgl.h" - #ifndef LV_ATTRIBUTE_MEM_ALIGN #define LV_ATTRIBUTE_MEM_ALIGN #endif diff --git a/examples/libs/lodepng/img_wink_png.c b/examples/libs/lodepng/img_wink_png.c index a26724f3c..167e0831a 100644 --- a/examples/libs/lodepng/img_wink_png.c +++ b/examples/libs/lodepng/img_wink_png.c @@ -1,7 +1,6 @@ #include "../../../lvgl.h" #if LV_USE_LODEPNG && LV_BUILD_EXAMPLES - #ifndef LV_ATTRIBUTE_MEM_ALIGN #define LV_ATTRIBUTE_MEM_ALIGN #endif diff --git a/examples/libs/tiny_ttf/lv_example_tiny_ttf_3.c b/examples/libs/tiny_ttf/lv_example_tiny_ttf_3.c index 65378d45b..142bc5eca 100644 --- a/examples/libs/tiny_ttf/lv_example_tiny_ttf_3.c +++ b/examples/libs/tiny_ttf/lv_example_tiny_ttf_3.c @@ -32,7 +32,6 @@ void lv_example_tiny_ttf_3(void) lv_obj_align_to(slider_label, slider, LV_ALIGN_OUT_BOTTOM_MID, 0, 10); lv_label_bind_text(slider_label, &subject_font, "%d"); - /*Create a label with the new style*/ lv_obj_t * label = lv_label_create(lv_screen_active()); lv_obj_add_style(label, &style, 0); @@ -40,7 +39,6 @@ void lv_example_tiny_ttf_3(void) lv_label_set_text(label, "Hello world!"); lv_obj_center(label); - lv_subject_add_observer(&subject_font, font_size_observer_cb, &style); } diff --git a/examples/others/file_explorer/lv_example_file_explorer_3.c b/examples/others/file_explorer/lv_example_file_explorer_3.c index f6c974664..4d7f97995 100644 --- a/examples/others/file_explorer/lv_example_file_explorer_3.c +++ b/examples/others/file_explorer/lv_example_file_explorer_3.c @@ -20,7 +20,6 @@ static void exch_table_item(lv_obj_t * tb, int16_t i, int16_t j) lv_table_set_cell_value(tb, j, 1, lv_table_get_cell_value(tb, 0, 2)); } - /*Quick sort 3 way*/ static void sort_by_file_kind(lv_obj_t * tb, int16_t lo, int16_t hi) { @@ -43,7 +42,6 @@ static void sort_by_file_kind(lv_obj_t * tb, int16_t lo, int16_t hi) sort_by_file_kind(tb, gt + 1, hi); } - static void file_explorer_event_handler(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); diff --git a/examples/others/fragment/lv_example_fragment_1.c b/examples/others/fragment/lv_example_fragment_1.c index 92abfbd51..e7c2afcfe 100644 --- a/examples/others/fragment/lv_example_fragment_1.c +++ b/examples/others/fragment/lv_example_fragment_1.c @@ -37,7 +37,6 @@ void lv_example_fragment_1(void) lv_fragment_manager_replace(manager, fragment, &root); } - static void sample_fragment_ctor(lv_fragment_t * self, void * args) { ((struct sample_fragment_t *) self)->name = args; diff --git a/examples/others/fragment/lv_example_fragment_2.c b/examples/others/fragment/lv_example_fragment_2.c index b008e1f15..8b84967b0 100644 --- a/examples/others/fragment/lv_example_fragment_2.c +++ b/examples/others/fragment/lv_example_fragment_2.c @@ -66,7 +66,6 @@ void lv_example_fragment_2(void) lv_obj_add_event(pop_btn, sample_pop_click, LV_EVENT_CLICKED, manager); } - static void sample_fragment_ctor(lv_fragment_t * self, void * args) { LV_UNUSED(args); diff --git a/examples/others/gridnav/lv_example_gridnav_2.c b/examples/others/gridnav/lv_example_gridnav_2.c index 0da833ac5..8ce001334 100644 --- a/examples/others/gridnav/lv_example_gridnav_2.c +++ b/examples/others/gridnav/lv_example_gridnav_2.c @@ -16,7 +16,6 @@ void lv_example_gridnav_2(void) lv_obj_set_style_bg_color(list1, lv_palette_lighten(LV_PALETTE_BLUE, 5), LV_STATE_FOCUSED); lv_group_add_obj(lv_group_get_default(), list1); - char buf[32]; uint32_t i; for(i = 0; i < 15; i++) { diff --git a/examples/others/gridnav/lv_example_gridnav_3.c b/examples/others/gridnav/lv_example_gridnav_3.c index d60c77860..2c0cbecfb 100644 --- a/examples/others/gridnav/lv_example_gridnav_3.c +++ b/examples/others/gridnav/lv_example_gridnav_3.c @@ -46,7 +46,6 @@ void lv_example_gridnav_3(void) label = lv_label_create(btn); lv_label_set_text(label, "Button 2"); - /*Create an other container with long text to show how LV_GRIDNAV_CTRL_SCROLL_FIRST works*/ lv_obj_t * cont_sub1 = lv_obj_create(cont_main); lv_obj_set_size(cont_sub1, lv_pct(100), 100); @@ -93,9 +92,6 @@ void lv_example_gridnav_3(void) label = lv_label_create(btn); lv_label_set_text(label, "Button 4"); - - - } #endif diff --git a/examples/others/gridnav/lv_example_gridnav_4.c b/examples/others/gridnav/lv_example_gridnav_4.c index 093b63547..3668ee322 100644 --- a/examples/others/gridnav/lv_example_gridnav_4.c +++ b/examples/others/gridnav/lv_example_gridnav_4.c @@ -1,7 +1,6 @@ #include "../../lv_examples.h" #if LV_USE_GRIDNAV && LV_USE_FLEX && LV_BUILD_EXAMPLES - static void event_handler(lv_event_t * e) { lv_obj_t * obj = lv_event_get_target(e); diff --git a/examples/others/observer/lv_example_observer_1.c b/examples/others/observer/lv_example_observer_1.c index 6f587e690..332e8a5dc 100644 --- a/examples/others/observer/lv_example_observer_1.c +++ b/examples/others/observer/lv_example_observer_1.c @@ -21,5 +21,4 @@ void lv_example_observer_1(void) lv_label_bind_text(label, &temperature_subject, "%d °C"); } - #endif diff --git a/examples/others/observer/lv_example_observer_2.c b/examples/others/observer/lv_example_observer_2.c index 457ae1cab..858891c0e 100644 --- a/examples/others/observer/lv_example_observer_2.c +++ b/examples/others/observer/lv_example_observer_2.c @@ -18,7 +18,6 @@ void lv_example_observer_2(void) ui_init(); } - /*-------------------------------------------------- * APPLICATION * diff --git a/examples/others/observer/lv_example_observer_3.c b/examples/others/observer/lv_example_observer_3.c index 0babe8335..b2fa5cf6a 100644 --- a/examples/others/observer/lv_example_observer_3.c +++ b/examples/others/observer/lv_example_observer_3.c @@ -60,14 +60,12 @@ void lv_example_observer_3(void) lv_obj_t * set_label = lv_label_create(set_btn); lv_label_set_text(set_label, "Set"); - /*Update some subjects to see if the UI is updated as well*/ lv_subject_set_int(&hour_subject, 9); lv_subject_set_int(&minute_subject, 30); lv_subject_set_int(&am_pm_subject, TIME_PM); } - static void set_btn_clicked_event_cb(lv_event_t * e) { lv_obj_t * set_btn = lv_event_get_target(e); diff --git a/examples/others/observer/lv_example_observer_4.c b/examples/others/observer/lv_example_observer_4.c index 97fbad9f0..71213b072 100644 --- a/examples/others/observer/lv_example_observer_4.c +++ b/examples/others/observer/lv_example_observer_4.c @@ -149,7 +149,6 @@ static void cont_observer_cb(lv_subject_t * subject, lv_observer_t * observer) } - static void btn_create(lv_obj_t * parent, const char * text) { lv_obj_t * btn = lv_button_create(parent); diff --git a/examples/others/observer/lv_example_observer_6.c b/examples/others/observer/lv_example_observer_6.c index e75b99b29..7df722c14 100644 --- a/examples/others/observer/lv_example_observer_6.c +++ b/examples/others/observer/lv_example_observer_6.c @@ -6,7 +6,6 @@ typedef enum { THEME_MODE_DARK, } theme_mode_t; - static lv_obj_t * my_panel_create(lv_obj_t * parent); static lv_obj_t * my_button_create(lv_obj_t * parent, const char * text, lv_event_cb_t event_cb); static void switch_theme_event_cb(lv_event_t * e); @@ -45,7 +44,6 @@ static void switch_theme_event_cb(lv_event_t * e) else lv_subject_set_int(&theme_subject, THEME_MODE_LIGHT); } - /*----------------------------------------- * my_panel.c * diff --git a/examples/porting/lv_port_indev_template.c b/examples/porting/lv_port_indev_template.c index dd1a5b7ac..d5e776323 100644 --- a/examples/porting/lv_port_indev_template.c +++ b/examples/porting/lv_port_indev_template.c @@ -80,7 +80,6 @@ void lv_port_indev_init(void) * You should shape them according to your hardware */ - /*------------------ * Touchpad * -----------------*/ @@ -122,7 +121,6 @@ void lv_port_indev_init(void) lv_indev_set_type(indev_keypad, LV_INDEV_TYPE_KEYPAD); lv_indev_set_read_cb(indev_keypad, keypad_read); - /*Later you should create group(s) with `lv_group_t * group = lv_group_create()`, *add objects to the group with `lv_group_add_obj(group, obj)` *and assign this input device to group to navigate in it: diff --git a/examples/scroll/lv_example_scroll.h b/examples/scroll/lv_example_scroll.h index dc38bef00..f6443b455 100644 --- a/examples/scroll/lv_example_scroll.h +++ b/examples/scroll/lv_example_scroll.h @@ -32,7 +32,6 @@ void lv_example_scroll_4(void); void lv_example_scroll_5(void); void lv_example_scroll_6(void); - /********************** * MACROS **********************/ diff --git a/examples/scroll/lv_example_scroll_4.c b/examples/scroll/lv_example_scroll_4.c index c8944c2f2..f0c741ba3 100644 --- a/examples/scroll/lv_example_scroll_4.c +++ b/examples/scroll/lv_example_scroll_4.c @@ -1,7 +1,6 @@ #include "../lv_examples.h" #if LV_BUILD_EXAMPLES && LV_USE_LIST - /** * Styling the scrollbars */ @@ -28,7 +27,6 @@ void lv_example_scroll_4(void) "Fusce molestie rhoncus nisi sit amet tincidunt. \n" "Suspendisse a nunc ut magna ornare volutpat."); - /*Remove the style of scrollbar to have clean start*/ lv_obj_remove_style(obj, NULL, LV_PART_SCROLLBAR | LV_STATE_ANY); diff --git a/examples/scroll/lv_example_scroll_5.c b/examples/scroll/lv_example_scroll_5.c index 5e2fa2810..5f0b0af71 100644 --- a/examples/scroll/lv_example_scroll_5.c +++ b/examples/scroll/lv_example_scroll_5.c @@ -1,7 +1,6 @@ #include "../lv_examples.h" #if LV_BUILD_EXAMPLES && LV_FONT_DEJAVU_16_PERSIAN_HEBREW - /** * Scrolling with Right To Left base direction */ diff --git a/examples/styles/lv_example_style_14.c b/examples/styles/lv_example_style_14.c index e47f5dca7..9915ff0b8 100644 --- a/examples/styles/lv_example_style_14.c +++ b/examples/styles/lv_example_style_14.c @@ -1,7 +1,6 @@ #include "../lv_examples.h" #if LV_BUILD_EXAMPLES && LV_USE_IMG - static lv_style_t style_btn; /*Will be called when the styles of the base theme are already added @@ -36,8 +35,6 @@ static void new_theme_init_and_set(void) lv_display_set_theme(NULL, &th_new); } - - /** * Extending the current theme */ diff --git a/examples/styles/lv_example_style_15.c b/examples/styles/lv_example_style_15.c index 4a3914bc8..1bfa84dfa 100644 --- a/examples/styles/lv_example_style_15.c +++ b/examples/styles/lv_example_style_15.c @@ -1,8 +1,6 @@ #include "../lv_examples.h" #if LV_BUILD_EXAMPLES && LV_USE_BTN && LV_USE_LABEL - - /** * Opacity and Transformations */ diff --git a/examples/widgets/arc/lv_example_arc_2.c b/examples/widgets/arc/lv_example_arc_2.c index ca3b7d44b..ecbdc2e85 100644 --- a/examples/widgets/arc/lv_example_arc_2.c +++ b/examples/widgets/arc/lv_example_arc_2.c @@ -30,8 +30,6 @@ void lv_example_arc_2(void) lv_anim_set_values(&a, 0, 100); lv_anim_start(&a); - - } #endif diff --git a/examples/widgets/bar/lv_example_bar_3.c b/examples/widgets/bar/lv_example_bar_3.c index 01775302b..45d62be7e 100644 --- a/examples/widgets/bar/lv_example_bar_3.c +++ b/examples/widgets/bar/lv_example_bar_3.c @@ -36,5 +36,4 @@ void lv_example_bar_3(void) lv_anim_start(&a); } - #endif diff --git a/examples/widgets/bar/lv_example_bar_5.c b/examples/widgets/bar/lv_example_bar_5.c index dd3538472..75b923505 100644 --- a/examples/widgets/bar/lv_example_bar_5.c +++ b/examples/widgets/bar/lv_example_bar_5.c @@ -8,7 +8,6 @@ void lv_example_bar_5(void) { lv_obj_t * label; - lv_obj_t * bar_ltr = lv_bar_create(lv_screen_active()); lv_obj_set_size(bar_ltr, 200, 20); lv_bar_set_value(bar_ltr, 70, LV_ANIM_OFF); diff --git a/examples/widgets/bar/lv_example_bar_7.c b/examples/widgets/bar/lv_example_bar_7.c index a6d97e587..86d1e037a 100644 --- a/examples/widgets/bar/lv_example_bar_7.c +++ b/examples/widgets/bar/lv_example_bar_7.c @@ -8,7 +8,6 @@ void lv_example_bar_7(void) { lv_obj_t * label; - lv_obj_t * bar_tob = lv_bar_create(lv_screen_active()); lv_obj_set_size(bar_tob, 20, 200); lv_bar_set_range(bar_tob, 100, 0); diff --git a/examples/widgets/btnmatrix/lv_example_btnmatrix_1.c b/examples/widgets/btnmatrix/lv_example_btnmatrix_1.c index 2c0973105..428ef91ef 100644 --- a/examples/widgets/btnmatrix/lv_example_btnmatrix_1.c +++ b/examples/widgets/btnmatrix/lv_example_btnmatrix_1.c @@ -13,7 +13,6 @@ static void event_handler(lv_event_t * e) } } - static const char * btnm_map[] = {"1", "2", "3", "4", "5", "\n", "6", "7", "8", "9", "0", "\n", "Action1", "Action2", "" diff --git a/examples/widgets/btnmatrix/lv_example_btnmatrix_2.c b/examples/widgets/btnmatrix/lv_example_btnmatrix_2.c index 2a3073309..c63d01d5f 100644 --- a/examples/widgets/btnmatrix/lv_example_btnmatrix_2.c +++ b/examples/widgets/btnmatrix/lv_example_btnmatrix_2.c @@ -1,7 +1,6 @@ #include "../../lv_examples.h" #if LV_USE_BTNMATRIX && LV_BUILD_EXAMPLES - static void event_cb(lv_event_t * e) { lv_obj_t * obj = lv_event_get_target(e); diff --git a/examples/widgets/btnmatrix/lv_example_btnmatrix_3.c b/examples/widgets/btnmatrix/lv_example_btnmatrix_3.c index 526aec00e..9c5491e08 100644 --- a/examples/widgets/btnmatrix/lv_example_btnmatrix_3.c +++ b/examples/widgets/btnmatrix/lv_example_btnmatrix_3.c @@ -34,7 +34,6 @@ void lv_example_buttonmatrix_3(void) lv_style_set_radius(&style_bg, LV_RADIUS_CIRCLE); lv_style_set_border_width(&style_bg, 0); - static lv_style_t style_btn; lv_style_init(&style_btn); lv_style_set_radius(&style_btn, 0); diff --git a/examples/widgets/canvas/lv_example_canvas_1.c b/examples/widgets/canvas/lv_example_canvas_1.c index 4b4319718..92c820953 100644 --- a/examples/widgets/canvas/lv_example_canvas_1.c +++ b/examples/widgets/canvas/lv_example_canvas_1.c @@ -1,7 +1,6 @@ #include "../../lv_examples.h" #if LV_USE_CANVAS && LV_BUILD_EXAMPLES - #define CANVAS_WIDTH 200 #define CANVAS_HEIGHT 150 @@ -35,14 +34,12 @@ void lv_example_canvas_1(void) lv_obj_center(canvas); lv_canvas_fill_bg(canvas, lv_palette_lighten(LV_PALETTE_GREY, 3), LV_OPA_COVER); - lv_layer_t layer; lv_canvas_init_layer(canvas, &layer); lv_area_t coords_rect = {30, 20, 100, 70}; lv_draw_rect(&layer, &rect_dsc, &coords_rect); - lv_area_t coords_text = {40, 80, 100, 120}; lv_draw_label(&layer, &label_dsc, &coords_text); diff --git a/examples/widgets/canvas/lv_example_canvas_7.c b/examples/widgets/canvas/lv_example_canvas_7.c index 545776ec5..da655b7fc 100644 --- a/examples/widgets/canvas/lv_example_canvas_7.c +++ b/examples/widgets/canvas/lv_example_canvas_7.c @@ -35,6 +35,5 @@ void lv_example_canvas_7(void) lv_canvas_finish_layer(canvas, &layer); - } #endif diff --git a/examples/widgets/chart/lv_example_chart_3.c b/examples/widgets/chart/lv_example_chart_3.c index 96746a5a7..81a0217a0 100644 --- a/examples/widgets/chart/lv_example_chart_3.c +++ b/examples/widgets/chart/lv_example_chart_3.c @@ -1,7 +1,6 @@ #include "../../lv_examples.h" #if LV_USE_CHART && LV_BUILD_EXAMPLES - static void event_cb(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); diff --git a/examples/widgets/chart/lv_example_chart_4.c b/examples/widgets/chart/lv_example_chart_4.c index 224eba331..93bdb5738 100644 --- a/examples/widgets/chart/lv_example_chart_4.c +++ b/examples/widgets/chart/lv_example_chart_4.c @@ -19,7 +19,6 @@ static void draw_event_cb(lv_event_t * e) } } - /** * Recolor the bars of a chart based on their value */ diff --git a/examples/widgets/chart/lv_example_chart_5.c b/examples/widgets/chart/lv_example_chart_5.c index 9ae6c2e82..86ed0961a 100644 --- a/examples/widgets/chart/lv_example_chart_5.c +++ b/examples/widgets/chart/lv_example_chart_5.c @@ -54,7 +54,6 @@ static void add_faded_area(lv_event_t * e) lv_draw_task_t * draw_task = lv_event_get_draw_task(e); lv_draw_dsc_base_t * base_dsc = draw_task->draw_dsc; - const lv_chart_series_t * ser = lv_chart_get_series_next(obj, NULL); /*Draw a triangle below the line witch some opacity gradient*/ diff --git a/examples/widgets/chart/lv_example_chart_8.c b/examples/widgets/chart/lv_example_chart_8.c index 2aca39939..9ae1745c5 100644 --- a/examples/widgets/chart/lv_example_chart_8.c +++ b/examples/widgets/chart/lv_example_chart_8.c @@ -1,7 +1,6 @@ #include "../../lv_examples.h" #if LV_USE_CHART && LV_DRAW_SW_COMPLEX && LV_BUILD_EXAMPLES - static void add_data(lv_timer_t * t) { lv_obj_t * chart = t->user_data; diff --git a/examples/widgets/checkbox/lv_example_checkbox_2.c b/examples/widgets/checkbox/lv_example_checkbox_2.c index f4f0c8297..79aa557ce 100644 --- a/examples/widgets/checkbox/lv_example_checkbox_2.c +++ b/examples/widgets/checkbox/lv_example_checkbox_2.c @@ -24,7 +24,6 @@ static void radio_event_handler(lv_event_t * e) LV_LOG_USER("Selected radio buttons: %d, %d", (int)active_index_1, (int)active_index_2); } - static void radiobutton_create(lv_obj_t * parent, const char * txt) { lv_obj_t * obj = lv_checkbox_create(parent); @@ -44,7 +43,6 @@ void lv_example_checkbox_2(void) * A variable is passed as event user data where the index of the active * radiobutton is saved */ - lv_style_init(&style_radio); lv_style_set_radius(&style_radio, LV_RADIUS_CIRCLE); @@ -82,5 +80,4 @@ void lv_example_checkbox_2(void) lv_obj_add_state(lv_obj_get_child(cont2, 0), LV_STATE_CHECKED); } - #endif diff --git a/examples/widgets/dropdown/lv_example_dropdown_2.c b/examples/widgets/dropdown/lv_example_dropdown_2.c index 6489d323e..10c485a04 100644 --- a/examples/widgets/dropdown/lv_example_dropdown_2.c +++ b/examples/widgets/dropdown/lv_example_dropdown_2.c @@ -1,7 +1,6 @@ #include "../../lv_examples.h" #if LV_USE_DROPDOWN && LV_BUILD_EXAMPLES - /** * Create a drop down, up, left and right menus */ diff --git a/examples/widgets/img/lv_example_img_1.c b/examples/widgets/img/lv_example_img_1.c index ebb51a2f2..e516f4df6 100644 --- a/examples/widgets/img/lv_example_img_1.c +++ b/examples/widgets/img/lv_example_img_1.c @@ -1,7 +1,6 @@ #include "../../lv_examples.h" #if LV_USE_IMG && LV_BUILD_EXAMPLES - void lv_example_image_1(void) { LV_IMAGE_DECLARE(img_cogwheel_argb); diff --git a/examples/widgets/img/lv_example_img_2.c b/examples/widgets/img/lv_example_img_2.c index 45077955a..05b454099 100644 --- a/examples/widgets/img/lv_example_img_2.c +++ b/examples/widgets/img/lv_example_img_2.c @@ -7,7 +7,6 @@ static void slider_event_cb(lv_event_t * e); static lv_obj_t * red_slider, * green_slider, * blue_slider, * intense_slider; static lv_obj_t * img1; - /** * Demonstrate runtime image re-coloring */ diff --git a/examples/widgets/img/lv_example_img_3.c b/examples/widgets/img/lv_example_img_3.c index 9b3a53842..a807ff57b 100644 --- a/examples/widgets/img/lv_example_img_3.c +++ b/examples/widgets/img/lv_example_img_3.c @@ -11,7 +11,6 @@ static void set_zoom(void * img, int32_t v) lv_image_set_zoom(img, v); } - /** * Show transformations (zoom and rotation) using a pivot point. */ diff --git a/examples/widgets/list/lv_example_list_2.c b/examples/widgets/list/lv_example_list_2.c index 0b5fa0a57..b45a0b09f 100644 --- a/examples/widgets/list/lv_example_list_2.c +++ b/examples/widgets/list/lv_example_list_2.c @@ -1,6 +1,5 @@ #include - #include "../../lv_examples.h" #if LV_USE_LIST && LV_BUILD_EXAMPLES diff --git a/examples/widgets/obj/lv_example_obj_2.c b/examples/widgets/obj/lv_example_obj_2.c index 2b084e524..688e520fd 100644 --- a/examples/widgets/obj/lv_example_obj_2.c +++ b/examples/widgets/obj/lv_example_obj_2.c @@ -16,7 +16,6 @@ static void drag_event_handler(lv_event_t * e) lv_obj_set_pos(obj, x, y); } - /** * Make an object draggable. */ diff --git a/examples/widgets/slider/lv_example_slider_2.c b/examples/widgets/slider/lv_example_slider_2.c index 308b481cc..7cfeff745 100644 --- a/examples/widgets/slider/lv_example_slider_2.c +++ b/examples/widgets/slider/lv_example_slider_2.c @@ -1,8 +1,6 @@ #include "../../lv_examples.h" #if LV_USE_SLIDER && LV_BUILD_EXAMPLES - - /** * Show how to style a slider. */ diff --git a/examples/widgets/spinbox/lv_example_spinbox_1.c b/examples/widgets/spinbox/lv_example_spinbox_1.c index 786308eb5..15cb49ef8 100644 --- a/examples/widgets/spinbox/lv_example_spinbox_1.c +++ b/examples/widgets/spinbox/lv_example_spinbox_1.c @@ -3,7 +3,6 @@ static lv_obj_t * spinbox; - static void lv_spinbox_increment_event_cb(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); @@ -20,7 +19,6 @@ static void lv_spinbox_decrement_event_cb(lv_event_t * e) } } - void lv_example_spinbox_1(void) { spinbox = lv_spinbox_create(lv_screen_active()); diff --git a/examples/widgets/table/lv_example_table_1.c b/examples/widgets/table/lv_example_table_1.c index 36684abd9..9553c009c 100644 --- a/examples/widgets/table/lv_example_table_1.c +++ b/examples/widgets/table/lv_example_table_1.c @@ -41,7 +41,6 @@ static void draw_event_cb(lv_event_t * e) } } - void lv_example_table_1(void) { lv_obj_t * table = lv_table_create(lv_screen_active()); diff --git a/examples/widgets/table/lv_example_table_2.c b/examples/widgets/table/lv_example_table_2.c index 2cf939f4a..b5457e8f5 100644 --- a/examples/widgets/table/lv_example_table_2.c +++ b/examples/widgets/table/lv_example_table_2.c @@ -54,7 +54,6 @@ static void change_event_cb(lv_event_t * e) else lv_table_add_cell_ctrl(obj, row, 0, LV_TABLE_CELL_CTRL_CUSTOM_1); } - /** * A very light-weighted list created from table */ diff --git a/examples/widgets/tabview/lv_example_tabview_2.c b/examples/widgets/tabview/lv_example_tabview_2.c index b00dff3c4..346fc13a6 100644 --- a/examples/widgets/tabview/lv_example_tabview_2.c +++ b/examples/widgets/tabview/lv_example_tabview_2.c @@ -14,7 +14,6 @@ void lv_example_tabview_2(void) lv_obj_set_style_text_color(tab_buttons, lv_palette_lighten(LV_PALETTE_GREY, 5), 0); lv_obj_set_style_border_side(tab_buttons, LV_BORDER_SIDE_RIGHT, LV_PART_ITEMS | LV_STATE_CHECKED); - /*Add 3 tabs (the tabs are page (lv_page) and can be scrolled*/ lv_obj_t * tab1 = lv_tabview_add_tab(tabview, "Tab 1"); lv_obj_t * tab2 = lv_tabview_add_tab(tabview, "Tab 2"); diff --git a/examples/widgets/textarea/lv_example_textarea_2.c b/examples/widgets/textarea/lv_example_textarea_2.c index 176390553..a56208db5 100644 --- a/examples/widgets/textarea/lv_example_textarea_2.c +++ b/examples/widgets/textarea/lv_example_textarea_2.c @@ -29,7 +29,6 @@ void lv_example_textarea_2(void) lv_obj_add_event(text_ta, ta_event_cb, LV_EVENT_ALL, NULL); lv_obj_align(text_ta, LV_ALIGN_TOP_RIGHT, -5, 20); - /*Create a label and position it above the text box*/ lv_obj_t * oneline_label = lv_label_create(lv_screen_active()); lv_label_set_text(oneline_label, "Text:"); diff --git a/examples/widgets/tileview/lv_example_tileview_1.c b/examples/widgets/tileview/lv_example_tileview_1.c index 64e487af0..8a1458063 100644 --- a/examples/widgets/tileview/lv_example_tileview_1.c +++ b/examples/widgets/tileview/lv_example_tileview_1.c @@ -16,7 +16,6 @@ void lv_example_tileview_1(void) lv_label_set_text(label, "Scroll down"); lv_obj_center(label); - /*Tile2: a button*/ lv_obj_t * tile2 = lv_tileview_add_tile(tv, 0, 1, LV_DIR_TOP | LV_DIR_RIGHT); diff --git a/examples/widgets/win/lv_example_win_1.c b/examples/widgets/win/lv_example_win_1.c index 439155c3b..7d0acb975 100644 --- a/examples/widgets/win/lv_example_win_1.c +++ b/examples/widgets/win/lv_example_win_1.c @@ -1,7 +1,6 @@ #include "../../lv_examples.h" #if LV_USE_WIN && LV_BUILD_EXAMPLES - static void event_handler(lv_event_t * e) { lv_obj_t * obj = lv_event_get_target(e); @@ -40,7 +39,6 @@ void lv_example_win_1(void) "sure it\n" "overflows. :)"); - } #endif diff --git a/src/core/lv_global.h b/src/core/lv_global.h index cdacdee62..de64dd760 100644 --- a/src/core/lv_global.h +++ b/src/core/lv_global.h @@ -194,7 +194,6 @@ typedef struct _lv_global_t { void * user_data; } lv_global_t; - /********************** * MACROS **********************/ diff --git a/src/core/lv_group.h b/src/core/lv_group.h index 459d9266d..987784e6f 100644 --- a/src/core/lv_group.h +++ b/src/core/lv_group.h @@ -46,8 +46,6 @@ typedef _lv_key_t lv_key_t; typedef uint8_t lv_key_t; #endif /*DOXYGEN*/ - - /********************** * TYPEDEFS **********************/ @@ -81,7 +79,6 @@ typedef struct _lv_group_t { of list.*/ } lv_group_t; - typedef enum { LV_GROUP_REFOCUS_POLICY_NEXT = 0, LV_GROUP_REFOCUS_POLICY_PREV = 1 @@ -200,7 +197,6 @@ void lv_group_set_focus_cb(lv_group_t * group, lv_group_focus_cb_t focus_cb); */ void lv_group_set_edge_cb(lv_group_t * group, lv_group_edge_cb_t edge_cb); - /** * Set whether the next or previous item in a group is focused if the currently focused obj is * deleted. diff --git a/src/core/lv_obj.c b/src/core/lv_obj.c index 37ffc65ab..605044e85 100644 --- a/src/core/lv_obj.c +++ b/src/core/lv_obj.c @@ -725,7 +725,6 @@ static void update_obj_state(lv_obj_t * obj, lv_state_t new_state) obj->state = new_state; - _lv_obj_style_transition_dsc_t * ts = lv_malloc_zeroed(sizeof(_lv_obj_style_transition_dsc_t) * STYLE_TRANSITION_MAX); uint32_t tsi = 0; uint32_t i; diff --git a/src/core/lv_obj.h b/src/core/lv_obj.h index 6fb14598a..6f9e198fa 100644 --- a/src/core/lv_obj.h +++ b/src/core/lv_obj.h @@ -256,7 +256,6 @@ typedef struct _lv_obj_t { */ lv_obj_t * lv_obj_create(lv_obj_t * parent); - /*===================== * Setter functions *====================*/ @@ -467,7 +466,6 @@ void lv_objid_builtin_destroy(void); # define LV_TRACE_OBJ_CREATE(...) #endif - #ifdef __cplusplus } /*extern "C"*/ #endif diff --git a/src/core/lv_obj_class.c b/src/core/lv_obj_class.c index e7890609f..fd483ee05 100644 --- a/src/core/lv_obj_class.c +++ b/src/core/lv_obj_class.c @@ -179,7 +179,6 @@ static void lv_obj_construct(const lv_obj_class_t * class_p, lv_obj_t * obj) obj->class_p = original_class_p; } - if(obj->class_p->constructor_cb) obj->class_p->constructor_cb(class_p, obj); } diff --git a/src/core/lv_obj_class.h b/src/core/lv_obj_class.h index f3b3df7e2..2c59badac 100644 --- a/src/core/lv_obj_class.h +++ b/src/core/lv_obj_class.h @@ -22,7 +22,6 @@ extern "C" { * DEFINES *********************/ - /********************** * TYPEDEFS **********************/ @@ -104,7 +103,6 @@ bool lv_obj_is_group_def(struct _lv_obj_t * obj); * MACROS **********************/ - #ifdef __cplusplus } /*extern "C"*/ #endif diff --git a/src/core/lv_obj_draw.h b/src/core/lv_obj_draw.h index a378ec389..dd505c6db 100644 --- a/src/core/lv_obj_draw.h +++ b/src/core/lv_obj_draw.h @@ -67,7 +67,6 @@ void lv_obj_init_draw_label_dsc(struct _lv_obj_t * obj, uint32_t part, lv_draw_l */ void lv_obj_init_draw_image_dsc(struct _lv_obj_t * obj, uint32_t part, lv_draw_image_dsc_t * draw_dsc); - /** * Initialize a line draw descriptor from an object's styles in its current state * @param obj pointer to an object @@ -108,7 +107,6 @@ void lv_obj_refresh_ext_draw_size(struct _lv_obj_t * obj); */ int32_t _lv_obj_get_ext_draw_size(const struct _lv_obj_t * obj); - lv_layer_type_t _lv_obj_get_layer_type(const struct _lv_obj_t * obj); /********************** diff --git a/src/core/lv_obj_event.c b/src/core/lv_obj_event.c index eaa206038..10fd470c8 100644 --- a/src/core/lv_obj_event.c +++ b/src/core/lv_obj_event.c @@ -69,7 +69,6 @@ lv_result_t lv_obj_send_event(lv_obj_t * obj, lv_event_code_t event_code, void * return res; } - lv_result_t lv_obj_event_base(const lv_obj_class_t * class_p, lv_event_t * e) { const lv_obj_class_t * base; @@ -109,7 +108,6 @@ uint32_t lv_obj_get_event_count(lv_obj_t * obj) return lv_event_get_count(&obj->spec_attr->event_list); } - lv_event_dsc_t * lv_obj_get_event_dsc(lv_obj_t * obj, uint32_t index) { LV_ASSERT_NULL(obj); @@ -151,7 +149,6 @@ lv_obj_t * lv_event_get_target_obj(lv_event_t * e) return lv_event_get_target(e); } - lv_indev_t * lv_event_get_indev(lv_event_t * e) { @@ -337,7 +334,6 @@ static lv_result_t event_send_core(lv_event_t * e) return res; } - static bool event_is_bubbled(lv_event_t * e) { if(e->stop_bubbling) return false; diff --git a/src/core/lv_obj_event.h b/src/core/lv_obj_event.h index 15522d068..f4df61392 100644 --- a/src/core/lv_obj_event.h +++ b/src/core/lv_obj_event.h @@ -40,7 +40,6 @@ typedef struct { bool res; /**< true: `point` can click the object; false: it cannot*/ } lv_hit_test_info_t; - /** Cover check results.*/ typedef enum { LV_COVER_RES_COVER = 0, diff --git a/src/core/lv_obj_pos.c b/src/core/lv_obj_pos.c index c34d0910f..bc653aaaf 100644 --- a/src/core/lv_obj_pos.c +++ b/src/core/lv_obj_pos.c @@ -527,7 +527,6 @@ int32_t lv_obj_get_y_aligned(const lv_obj_t * obj) return lv_obj_get_style_y(obj, LV_PART_MAIN); } - int32_t lv_obj_get_width(const lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); @@ -602,7 +601,6 @@ void lv_obj_refr_pos(lv_obj_t * obj) { if(lv_obj_is_layout_positioned(obj)) return; - lv_obj_t * parent = lv_obj_get_parent(obj); int32_t x = lv_obj_get_style_x(obj, LV_PART_MAIN); int32_t y = lv_obj_get_style_y(obj, LV_PART_MAIN); @@ -797,7 +795,6 @@ void lv_obj_get_transformed_area(const lv_obj_t * obj, lv_area_t * area, bool re area->y2 = LV_MAX4(p[0].y, p[1].y, p[2].y, p[3].y); } - void lv_obj_invalidate_area(const lv_obj_t * obj, const lv_area_t * area) { LV_ASSERT_OBJ(obj, MY_CLASS); @@ -941,8 +938,6 @@ int32_t lv_clamp_height(int32_t height, int32_t min_height, int32_t max_height, return LV_CLAMP(min_height, height, max_height); } - - /********************** * STATIC FUNCTIONS **********************/ diff --git a/src/core/lv_obj_pos.h b/src/core/lv_obj_pos.h index 97718db81..19128ae95 100644 --- a/src/core/lv_obj_pos.h +++ b/src/core/lv_obj_pos.h @@ -186,7 +186,6 @@ static inline void lv_obj_center(struct _lv_obj_t * obj) lv_obj_align(obj, LV_ALIGN_CENTER, 0, 0); } - /** * Copy the coordinates of an object to an area * @param obj pointer to an object @@ -330,7 +329,6 @@ void lv_obj_refr_pos(struct _lv_obj_t * obj); void lv_obj_move_to(struct _lv_obj_t * obj, int32_t x, int32_t y); - void lv_obj_move_children_by(struct _lv_obj_t * obj, int32_t x_diff, int32_t y_diff, bool ignore_floating); /** diff --git a/src/core/lv_obj_scroll.c b/src/core/lv_obj_scroll.c index 45cec5244..9b86e0d17 100644 --- a/src/core/lv_obj_scroll.c +++ b/src/core/lv_obj_scroll.c @@ -301,7 +301,6 @@ void lv_obj_scroll_by_bounded(lv_obj_t * obj, int32_t dx, int32_t dy, lv_anim_en } } - void lv_obj_scroll_by(lv_obj_t * obj, int32_t dx, int32_t dy, lv_anim_enable_t anim_en) { if(dx == 0 && dy == 0) return; @@ -427,7 +426,6 @@ lv_result_t _lv_obj_scroll_by_raw(lv_obj_t * obj, int32_t x, int32_t y) return LV_RESULT_OK; } - bool lv_obj_is_scrolling(const lv_obj_t * obj) { lv_indev_t * indev = lv_indev_get_next(NULL); @@ -482,7 +480,6 @@ void lv_obj_get_scrollbar_area(lv_obj_t * obj, lv_area_t * hor_area, lv_area_t * ver_draw = true; } - bool hor_draw = false; if((dir & LV_DIR_HOR) && ((sm == LV_SCROLLBAR_MODE_ON) || @@ -670,7 +667,6 @@ void lv_obj_readjust_scroll(lv_obj_t * obj, lv_anim_enable_t anim_en) * STATIC FUNCTIONS **********************/ - static void scroll_x_anim(void * obj, int32_t v) { _lv_obj_scroll_by_raw(obj, v + lv_obj_get_scroll_x(obj), 0); diff --git a/src/core/lv_obj_scroll.h b/src/core/lv_obj_scroll.h index 1884ff0eb..1de391286 100644 --- a/src/core/lv_obj_scroll.h +++ b/src/core/lv_obj_scroll.h @@ -258,7 +258,6 @@ void lv_obj_scroll_to_view(struct _lv_obj_t * obj, lv_anim_enable_t anim_en); */ void lv_obj_scroll_to_view_recursive(struct _lv_obj_t * obj, lv_anim_enable_t anim_en); - /** * Low level function to scroll by given x and y coordinates. * `LV_EVENT_SCROLL` is sent. diff --git a/src/core/lv_obj_style.c b/src/core/lv_obj_style.c index a5c5038da..c0b650aaf 100644 --- a/src/core/lv_obj_style.c +++ b/src/core/lv_obj_style.c @@ -124,7 +124,6 @@ void lv_obj_add_style(lv_obj_t * obj, const lv_style_t * style, lv_style_selecto obj->styles[i].style = style; obj->styles[i].selector = selector; - #if LV_OBJ_STYLE_CACHE uint32_t * prop_is_set = part == LV_PART_MAIN ? &obj->style_main_prop_is_set : &obj->style_other_prop_is_set; if(lv_style_is_const(style)) { @@ -318,7 +317,6 @@ void lv_obj_enable_style_refresh(bool en) style_refr = en; } - static inline lv_style_value_t lv_style_prop_get_default_inlined(lv_style_prop_t prop) { const lv_color_t black = LV_COLOR_MAKE(0x00, 0x00, 0x00); @@ -383,7 +381,6 @@ static inline lv_style_value_t lv_style_prop_get_default_inlined(lv_style_prop_t } } - lv_style_value_t lv_obj_get_style_prop(const lv_obj_t * obj, lv_part_t part, lv_style_prop_t prop) { LV_ASSERT_NULL(obj) @@ -471,7 +468,6 @@ void lv_obj_set_local_style_prop(lv_obj_t * obj, lv_style_prop_t prop, lv_style_ } #endif - lv_obj_refresh_style(obj, selector, prop); } @@ -568,7 +564,6 @@ void _lv_obj_style_create_transition(lv_obj_t * obj, lv_part_t part, lv_state_t lv_anim_start(&a); } - lv_style_value_t _lv_obj_style_apply_color_filter(const lv_obj_t * obj, uint32_t part, lv_style_value_t v) { if(obj == NULL) return v; @@ -666,7 +661,6 @@ void lv_obj_fade_out(lv_obj_t * obj, uint32_t time, uint32_t delay) lv_anim_start(&a); } - lv_text_align_t lv_obj_calculate_style_text_align(const struct _lv_obj_t * obj, lv_part_t part, const char * txt) { lv_text_align_t align = lv_obj_get_style_text_align(obj, part); @@ -708,7 +702,6 @@ lv_opa_t lv_obj_get_style_opa_recursive(const lv_obj_t * obj, lv_part_t part) return opa_final; } - /********************** * STATIC FUNCTIONS **********************/ @@ -776,7 +769,6 @@ static _lv_obj_style_t * get_trans_style(lv_obj_t * obj, lv_style_selector_t se obj->styles[i] = obj->styles[i - 1]; } - lv_memzero(&obj->styles[0], sizeof(_lv_obj_style_t)); obj->styles[0].style = lv_malloc(sizeof(lv_style_t)); lv_style_init((lv_style_t *)obj->styles[0].style); @@ -786,7 +778,6 @@ static _lv_obj_style_t * get_trans_style(lv_obj_t * obj, lv_style_selector_t se return &obj->styles[0]; } - static lv_style_res_t get_prop_core(const lv_obj_t * obj, lv_part_t part, lv_style_prop_t prop, lv_style_value_t * v) { @@ -1057,7 +1048,6 @@ static lv_layer_type_t calculate_layer_type(lv_obj_t * obj) return LV_LAYER_TYPE_NONE; } - static void full_cache_refresh(lv_obj_t * obj, lv_part_t part) { #if LV_OBJ_STYLE_CACHE diff --git a/src/core/lv_obj_style.h b/src/core/lv_obj_style.h index aff4e822f..04d0ef802 100644 --- a/src/core/lv_obj_style.h +++ b/src/core/lv_obj_style.h @@ -46,7 +46,6 @@ typedef enum { _LV_STYLE_STATE_CMP_DIFF_LAYOUT, /*The differences can be shown with a simple redraw*/ } _lv_style_state_cmp_t; - typedef uint32_t lv_style_selector_t; typedef struct { @@ -219,7 +218,6 @@ void lv_obj_fade_in(struct _lv_obj_t * obj, uint32_t time, uint32_t delay); */ void lv_obj_fade_out(struct _lv_obj_t * obj, uint32_t time, uint32_t delay); - static inline lv_state_t lv_obj_style_get_selector_state(lv_style_selector_t selector) { return selector & 0xFFFF; @@ -338,7 +336,6 @@ static inline int32_t lv_obj_get_style_transform_scale_y_safe(const struct _lv_o return zoom != 0 ? zoom : 1; } - /** * Get the `opa` style property from all parents and multiply and `>> 8` them. * @param obj the object whose opacity should be get @@ -347,7 +344,6 @@ static inline int32_t lv_obj_get_style_transform_scale_y_safe(const struct _lv_o */ lv_opa_t lv_obj_get_style_opa_recursive(const struct _lv_obj_t * obj, lv_part_t part); - /********************** * MACROS **********************/ diff --git a/src/core/lv_obj_tree.c b/src/core/lv_obj_tree.c index 00b1e1418..6ea8d3195 100644 --- a/src/core/lv_obj_tree.c +++ b/src/core/lv_obj_tree.c @@ -341,7 +341,6 @@ lv_obj_t * lv_obj_get_sibling(const lv_obj_t * obj, int32_t id) return lv_obj_get_child(parent, (int32_t)lv_obj_get_index(obj) + id); } - uint32_t lv_obj_get_child_cnt(const lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); @@ -483,7 +482,6 @@ static void obj_delete_core(lv_obj_t * obj) lv_free(obj); } - static lv_obj_tree_walk_res_t walk_core(lv_obj_t * obj, lv_obj_tree_walk_cb_t cb, void * user_data) { lv_obj_tree_walk_res_t res = LV_OBJ_TREE_WALK_NEXT; diff --git a/src/core/lv_obj_tree.h b/src/core/lv_obj_tree.h index c881386d2..8bb2a4ea7 100644 --- a/src/core/lv_obj_tree.h +++ b/src/core/lv_obj_tree.h @@ -22,7 +22,6 @@ extern "C" { * DEFINES *********************/ - /********************** * TYPEDEFS **********************/ @@ -187,7 +186,6 @@ void lv_obj_dump_tree(struct _lv_obj_t * start_ob); * MACROS **********************/ - #ifdef __cplusplus } /*extern "C"*/ #endif diff --git a/src/core/lv_refr.c b/src/core/lv_refr.c index 61526e35f..e2105af1b 100644 --- a/src/core/lv_refr.c +++ b/src/core/lv_refr.c @@ -405,7 +405,6 @@ refr_clean_up: lv_memzero(disp_refr->inv_area_joined, sizeof(disp_refr->inv_area_joined)); disp_refr->inv_p = 0; - refr_finish: #if LV_DRAW_SW_COMPLEX == 1 @@ -487,7 +486,6 @@ static void refr_sync_areas(void) uint32_t hor_res = lv_display_get_horizontal_resolution(disp_refr); uint32_t ver_res = lv_display_get_vertical_resolution(disp_refr); - /*Iterate through invalidated areas to see if sync area should be copied*/ uint16_t i; int8_t j; @@ -803,7 +801,6 @@ static void refr_obj_and_children(lv_layer_t * layer, lv_obj_t * top_obj) } } - static lv_result_t layer_get_area(lv_layer_t * layer, lv_obj_t * obj, lv_layer_type_t layer_type, lv_area_t * layer_area_out) { @@ -863,7 +860,6 @@ static bool alpha_test_area_on_obj(lv_obj_t * obj, const lv_area_t * area) else return true; } - void refr_obj(lv_layer_t * layer, lv_obj_t * obj) { if(lv_obj_has_flag(obj, LV_OBJ_FLAG_HIDDEN)) return; @@ -933,7 +929,6 @@ void refr_obj(lv_layer_t * layer, lv_obj_t * obj) } } - static uint32_t get_max_row(lv_display_t * disp, int32_t area_w, int32_t area_h) { bool has_alpha = lv_color_format_has_alpha(disp->color_format); @@ -1044,7 +1039,6 @@ static void call_flush_cb(lv_display_t * disp, const lv_area_t * area, uint8_t * LV_PROFILER_END; } - static void wait_for_flushing(lv_display_t * disp) { LV_PROFILER_BEGIN; diff --git a/src/dev/nuttx/lv_nuttx_lcd.c b/src/dev/nuttx/lv_nuttx_lcd.c index 61bd273af..d14fa735e 100644 --- a/src/dev/nuttx/lv_nuttx_lcd.c +++ b/src/dev/nuttx/lv_nuttx_lcd.c @@ -114,7 +114,6 @@ static int32_t align_round_up(int32_t v, uint16_t align) return (v + align - 1) & ~(align - 1); } - static void rounder_cb(lv_event_t * e) { lv_nuttx_lcd_t * lcd = lv_event_get_user_data(e); diff --git a/src/dev/sdl/lv_sdl_keyboard.c b/src/dev/sdl/lv_sdl_keyboard.c index ccc5bd20e..0d803be6b 100644 --- a/src/dev/sdl/lv_sdl_keyboard.c +++ b/src/dev/sdl/lv_sdl_keyboard.c @@ -114,7 +114,6 @@ void _lv_sdl_keyboard_handler(SDL_Event * event) if(indev == NULL) return; lv_sdl_keyboard_t * dsc = lv_indev_get_driver_data(indev); - /* We only care about SDL_KEYDOWN and SDL_TEXTINPUT events */ switch(event->type) { case SDL_KEYDOWN: { /*Button press*/ @@ -140,7 +139,6 @@ void _lv_sdl_keyboard_handler(SDL_Event * event) } } - /** * Convert a SDL key code to it's LV_KEY_* counterpart or return '\0' if it's not a control character. * @param sdl_key the key code diff --git a/src/dev/sdl/lv_sdl_mouse.c b/src/dev/sdl/lv_sdl_mouse.c index 89dd35556..47b34fb57 100644 --- a/src/dev/sdl/lv_sdl_mouse.c +++ b/src/dev/sdl/lv_sdl_mouse.c @@ -74,7 +74,6 @@ static void sdl_mouse_read(lv_indev_t * indev, lv_indev_data_t * data) data->state = dsc->left_button_down ? LV_INDEV_STATE_PRESSED : LV_INDEV_STATE_RELEASED; } - void _lv_sdl_mouse_handler(SDL_Event * event) { uint32_t win_id = UINT32_MAX; diff --git a/src/dev/sdl/lv_sdl_window.c b/src/dev/sdl/lv_sdl_window.c index 86cd95192..cb3cdb68b 100644 --- a/src/dev/sdl/lv_sdl_window.c +++ b/src/dev/sdl/lv_sdl_window.c @@ -161,7 +161,6 @@ void lv_sdl_quit() * STATIC FUNCTIONS **********************/ - static void flush_cb(lv_display_t * disp, const lv_area_t * area, uint8_t * px_map) { lv_sdl_window_t * dsc = lv_display_get_driver_data(disp); diff --git a/src/display/lv_display.c b/src/display/lv_display.c index 7bdf08b75..2c8fcc2b6 100644 --- a/src/display/lv_display.c +++ b/src/display/lv_display.c @@ -135,7 +135,6 @@ lv_display_t * lv_display_create(int32_t hor_res, int32_t ver_res) return disp; } - void lv_display_remove(lv_display_t * disp) { bool was_default = false; @@ -398,7 +397,6 @@ void lv_display_set_flush_cb(lv_display_t * disp, lv_display_flush_cb_t flush_cb disp->flush_cb = flush_cb; } - void lv_display_set_flush_wait_cb(lv_display_t * disp, lv_display_flush_wait_cb_t wait_cb) { if(disp == NULL) disp = lv_display_get_default(); @@ -440,7 +438,6 @@ bool lv_display_get_antialiasing(lv_display_t * disp) return disp->antialiasing; } - LV_ATTRIBUTE_FLUSH_READY void lv_display_flush_ready(lv_display_t * disp) { disp->flushing = 0; @@ -565,7 +562,6 @@ void lv_screen_load_anim(lv_obj_t * new_scr, lv_screen_load_anim_t anim_type, ui lv_obj_remove_local_style_prop(new_scr, LV_STYLE_OPA, 0); lv_obj_remove_local_style_prop(lv_screen_active(), LV_STYLE_OPA, 0); - /*Shortcut for immediate load*/ if(time == 0 && delay == 0) { @@ -688,7 +684,6 @@ uint32_t lv_display_get_event_count(lv_display_t * disp) return lv_event_get_count(&disp->event_list); } - lv_event_dsc_t * lv_display_get_event_dsc(lv_display_t * disp, uint32_t index) { LV_ASSERT_NULL(disp); diff --git a/src/display/lv_display.h b/src/display/lv_display.h index 112e1b4f0..68657c756 100644 --- a/src/display/lv_display.h +++ b/src/display/lv_display.h @@ -63,7 +63,6 @@ typedef enum { LV_DISPLAY_RENDER_MODE_FULL, } lv_display_render_mode_t; - typedef enum { LV_SCR_LOAD_ANIM_NONE, LV_SCR_LOAD_ANIM_OVER_LEFT, @@ -83,7 +82,6 @@ typedef enum { LV_SCR_LOAD_ANIM_OUT_BOTTOM, } lv_screen_load_anim_t; - typedef void (*lv_display_flush_cb_t)(struct _lv_display_t * disp, const lv_area_t * area, uint8_t * px_map); typedef void (*lv_display_flush_wait_cb_t)(struct _lv_display_t * disp); @@ -261,7 +259,6 @@ void lv_display_set_flush_cb(lv_display_t * disp, lv_display_flush_cb_t flush_cb */ void lv_display_set_flush_wait_cb(lv_display_t * disp, lv_display_flush_wait_cb_t wait_cb); - /** * Set the color format of the display. * If set to other than `LV_COLOR_FORMAT_NATIVE` the layer's `buffer_convert` function will be used @@ -294,7 +291,6 @@ void lv_display_set_antialiasing(lv_display_t * disp, bool en); */ bool lv_display_get_antialiasing(lv_display_t * disp); - //! @cond Doxygen_Suppress /** @@ -314,7 +310,6 @@ LV_ATTRIBUTE_FLUSH_READY bool lv_display_flush_is_last(lv_display_t * disp); //! @endcond - bool lv_display_is_double_buffered(lv_display_t * disp); /*--------------------- @@ -357,7 +352,6 @@ struct _lv_obj_t * lv_display_get_layer_top(lv_display_t * disp); */ struct _lv_obj_t * lv_display_get_layer_sys(lv_display_t * disp); - /** * Return the bottom layer. The bottom layer is the same on all screen and it is under the normal screen layer. * It's visible only if the the screen is transparent. @@ -366,7 +360,6 @@ struct _lv_obj_t * lv_display_get_layer_sys(lv_display_t * disp); */ struct _lv_obj_t * lv_display_get_layer_bottom(lv_display_t * disp); - /** * Switch screen with animation * @param scr pointer to the new screen to load @@ -423,7 +416,6 @@ static inline void lv_screen_load(struct _lv_obj_t * scr) lv_display_load_scr(scr); } - /*--------------------- * OTHERS *--------------------*/ @@ -529,7 +521,6 @@ void * lv_display_get_driver_data(lv_display_t * disp); #define LV_VER_RES lv_display_get_vertical_resolution(lv_display_get_default()) #endif - /** * Same as Android's DIP. (Different name is chosen to avoid mistype between LV_DPI and LV_DIP) * 1 dip is 1 px on a 160 DPI screen @@ -566,7 +557,6 @@ static inline int32_t lv_display_dpx(const lv_display_t * disp, int32_t n) return _LV_DPX_CALC(lv_display_get_dpi(disp), n); } - #ifdef __cplusplus } /*extern "C"*/ #endif diff --git a/src/draw/lv_draw.c b/src/draw/lv_draw.c index 8b2289344..63ca87030 100644 --- a/src/draw/lv_draw.c +++ b/src/draw/lv_draw.c @@ -101,7 +101,6 @@ lv_draw_task_t * lv_draw_add_task(lv_layer_t * layer, const lv_area_t * coords) return new_task; } - void lv_draw_finalize_task_creation(lv_layer_t * layer, lv_draw_task_t * t) { lv_draw_dsc_base_t * base_dsc = t->draw_dsc; @@ -368,7 +367,6 @@ void * lv_draw_layer_alloc_buf(lv_layer_t * layer) _draw_info.used_memory_for_layers_kb += kb; LV_LOG_INFO("Layer memory used: %d kB\n", _draw_info.used_memory_for_layers_kb); - if(lv_color_format_has_alpha(layer->color_format)) { lv_area_t a; a.x1 = 0; @@ -422,4 +420,3 @@ static bool is_independent(lv_layer_t * layer, lv_draw_task_t * t_check) return true; } - diff --git a/src/draw/lv_draw.h b/src/draw/lv_draw.h index df06b629a..6ee9a36d1 100644 --- a/src/draw/lv_draw.h +++ b/src/draw/lv_draw.h @@ -143,7 +143,6 @@ typedef struct _lv_draw_unit_t { int32_t (*delete_cb)(struct _lv_draw_unit_t * draw_unit); } lv_draw_unit_t; - typedef struct _lv_layer_t { /** The unaligned buffer where drawing will happen*/ diff --git a/src/draw/lv_draw_buf.c b/src/draw/lv_draw_buf.c index 23b8565d8..7a0fd5fb1 100644 --- a/src/draw/lv_draw_buf.c +++ b/src/draw/lv_draw_buf.c @@ -11,7 +11,6 @@ #include "../stdlib/lv_string.h" #include "../core/lv_global.h" - /********************* * DEFINES *********************/ @@ -67,7 +66,6 @@ lv_draw_buf_handlers_t * lv_draw_buf_get_handlers(void) return &handlers; } - uint32_t lv_draw_buf_width_to_stride(uint32_t w, lv_color_format_t color_format) { if(handlers.width_to_stride_cb) return handlers.width_to_stride_cb(w, color_format); @@ -108,7 +106,6 @@ void lv_draw_buf_clear(void * buf, uint32_t w, uint32_t h, lv_color_format_t col if(handlers.buf_clear_cb) handlers.buf_clear_cb(buf, w, h, color_format, a); } - void lv_draw_buf_copy(void * dest_buf, uint32_t dest_w, uint32_t dest_h, const lv_area_t * dest_area_to_copy, void * src_buf, uint32_t src_w, uint32_t src_h, const lv_area_t * src_area_to_copy, lv_color_format_t color_format) @@ -122,7 +119,6 @@ void lv_draw_buf_copy(void * dest_buf, uint32_t dest_w, uint32_t dest_h, const l * STATIC FUNCTIONS **********************/ - static void * buf_malloc(size_t size_bytes, lv_color_format_t color_format) { LV_UNUSED(color_format); @@ -218,4 +214,3 @@ static void buf_copy(void * dest_buf, uint32_t dest_w, uint32_t dest_h, const lv src_bufc += src_stride; } } - diff --git a/src/draw/lv_draw_image.c b/src/draw/lv_draw_image.c index 81943a74a..9f94a1517 100644 --- a/src/draw/lv_draw_image.c +++ b/src/draw/lv_draw_image.c @@ -48,7 +48,6 @@ void lv_draw_image_dsc_init(lv_draw_image_dsc_t * dsc) dsc->antialias = LV_COLOR_DEPTH > 8 ? 1 : 0; } - void lv_draw_layer(lv_layer_t * layer, const lv_draw_image_dsc_t * dsc, const lv_area_t * coords) { lv_draw_task_t * t = lv_draw_add_task(layer, coords); @@ -64,7 +63,6 @@ void lv_draw_layer(lv_layer_t * layer, const lv_draw_image_dsc_t * dsc, const lv lv_draw_finalize_task_creation(layer, t); } - void lv_draw_image(lv_layer_t * layer, const lv_draw_image_dsc_t * dsc, const lv_area_t * coords) { if(dsc->src == NULL) { @@ -73,7 +71,6 @@ void lv_draw_image(lv_layer_t * layer, const lv_draw_image_dsc_t * dsc, const lv } if(dsc->opa <= LV_OPA_MIN) return; - LV_PROFILER_BEGIN; lv_draw_image_dsc_t * new_image_dsc = lv_malloc(sizeof(*dsc)); @@ -129,4 +126,3 @@ lv_image_src_t lv_image_src_get_type(const void * src) /********************** * STATIC FUNCTIONS **********************/ - diff --git a/src/draw/lv_draw_image.h b/src/draw/lv_draw_image.h index 6449d13ff..176d73e85 100644 --- a/src/draw/lv_draw_image.h +++ b/src/draw/lv_draw_image.h @@ -42,7 +42,6 @@ typedef struct _lv_draw_image_dsc_t { const void * src; lv_image_header_t header; - int32_t rotation; int32_t scale_x; int32_t scale_y; diff --git a/src/draw/lv_draw_label.c b/src/draw/lv_draw_label.c index 2263bb1c8..74071438f 100644 --- a/src/draw/lv_draw_label.c +++ b/src/draw/lv_draw_label.c @@ -60,7 +60,6 @@ void lv_draw_label_dsc_init(lv_draw_label_dsc_t * dsc) dsc->bidi_dir = LV_BASE_DIR_LTR; } - void lv_draw_letter_dsc_init(lv_draw_glyph_dsc_t * dsc) { lv_memzero(dsc, sizeof(lv_draw_glyph_dsc_t)); @@ -91,8 +90,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_label(lv_layer_t * layer, const lv_draw_label lv_draw_finalize_task_creation(layer, t); } - - LV_ATTRIBUTE_FAST_MEM void lv_draw_letter(lv_layer_t * layer, lv_draw_label_dsc_t * dsc, const lv_point_t * point, uint32_t unicode_letter) { @@ -307,8 +304,6 @@ void lv_draw_label_iterate_letters(lv_draw_unit_t * draw_unit, const lv_draw_lab } } - - if(sel_start != 0xFFFF && sel_end != 0xFFFF && logical_char_pos >= sel_start && logical_char_pos < sel_end) { draw_letter_dsc.color = dsc->sel_color; fill_dsc.color = dsc->sel_bg_color; @@ -318,7 +313,6 @@ void lv_draw_label_iterate_letters(lv_draw_unit_t * draw_unit, const lv_draw_lab draw_letter_dsc.color = dsc->color; } - draw_letter(draw_unit, &draw_letter_dsc, &pos, font, letter, cb); if(letter_w > 0) { @@ -359,7 +353,6 @@ void lv_draw_label_iterate_letters(lv_draw_unit_t * draw_unit, const lv_draw_lab LV_ASSERT_MEM_INTEGRITY(); } - /********************** * STATIC FUNCTIONS **********************/ @@ -423,4 +416,3 @@ static void draw_letter(lv_draw_unit_t * draw_unit, lv_draw_glyph_dsc_t * dsc, cb(draw_unit, dsc, NULL, NULL); LV_PROFILER_END; } - diff --git a/src/draw/lv_draw_label.h b/src/draw/lv_draw_label.h index 6682d157f..69869dee7 100644 --- a/src/draw/lv_draw_label.h +++ b/src/draw/lv_draw_label.h @@ -46,7 +46,6 @@ typedef struct _lv_draw_label_hint_t { int32_t coord_y; } lv_draw_label_hint_t; - typedef struct { lv_draw_dsc_base_t base; @@ -66,9 +65,11 @@ typedef struct { lv_text_align_t align; lv_text_flag_t flag; lv_text_decor_t decor : 3; - lv_blend_mode_t blend_mode: 3; -uint8_t text_local : - 1; /**< 1: malloc buffer and copy `text` there. 0: `text` is const and it's pointer will be valid during rendering*/ + lv_blend_mode_t blend_mode : 3; + /** + * < 1: malloc buffer and copy `text` there. + * 0: `text` is const and it's pointer will be valid during rendering.*/ + uint8_t text_local : 1; lv_draw_label_hint_t * hint; } lv_draw_label_dsc_t; @@ -89,7 +90,6 @@ typedef struct { lv_opa_t opa; } lv_draw_glyph_dsc_t; - typedef void(*lv_draw_letter_cb_t)(lv_draw_unit_t * draw_unit, lv_draw_glyph_dsc_t * dsc, lv_draw_fill_dsc_t * fill_dsc, const lv_area_t * fill_area); diff --git a/src/draw/lv_draw_line.h b/src/draw/lv_draw_line.h index dcf22e684..773130cf3 100644 --- a/src/draw/lv_draw_line.h +++ b/src/draw/lv_draw_line.h @@ -58,7 +58,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_line_dsc_init(lv_draw_line_dsc_t * dsc); */ void lv_draw_line(struct _lv_layer_t * layer, const lv_draw_line_dsc_t * dsc); - /********************** * MACROS **********************/ diff --git a/src/draw/lv_draw_mask.h b/src/draw/lv_draw_mask.h index b8f431111..6c65e4f47 100644 --- a/src/draw/lv_draw_mask.h +++ b/src/draw/lv_draw_mask.h @@ -49,7 +49,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_mask_rect_dsc_init(lv_draw_mask_rect_dsc_t * */ void lv_draw_mask_rect(struct _lv_layer_t * layer, const lv_draw_mask_rect_dsc_t * dsc); - /********************** * MACROS **********************/ diff --git a/src/draw/lv_draw_rect.c b/src/draw/lv_draw_rect.c index 4396ff7d7..682f4eca5 100644 --- a/src/draw/lv_draw_rect.c +++ b/src/draw/lv_draw_rect.c @@ -80,7 +80,6 @@ void lv_draw_bg_image_dsc_init(lv_draw_bg_image_dsc_t * dsc) dsc->opa = LV_OPA_COVER; } - void lv_draw_rect(lv_layer_t * layer, const lv_draw_rect_dsc_t * dsc, const lv_area_t * coords) { @@ -174,7 +173,6 @@ void lv_draw_rect(lv_layer_t * layer, const lv_draw_rect_dsc_t * dsc, const lv_a t = lv_draw_add_task(layer, coords); - lv_image_src_t src_type = lv_image_src_get_type(dsc->bg_image_src); lv_result_t res = LV_RESULT_OK; lv_image_header_t header; @@ -243,7 +241,6 @@ void lv_draw_rect(lv_layer_t * layer, const lv_draw_rect_dsc_t * dsc, const lv_a LV_PROFILER_END; } - /********************** * STATIC FUNCTIONS **********************/ diff --git a/src/draw/lv_draw_rect.h b/src/draw/lv_draw_rect.h index b3fec02d4..2d1d6f53f 100644 --- a/src/draw/lv_draw_rect.h +++ b/src/draw/lv_draw_rect.h @@ -133,7 +133,6 @@ void lv_draw_box_shadow_dsc_init(lv_draw_box_shadow_dsc_t * dsc); void lv_draw_bg_image_dsc_init(lv_draw_bg_image_dsc_t * dsc); - /** * Draw a rectangle * @param layer pointer to a layer diff --git a/src/draw/lv_draw_vector.c b/src/draw/lv_draw_vector.c index c0ba95ee3..34d221eaf 100644 --- a/src/draw/lv_draw_vector.c +++ b/src/draw/lv_draw_vector.c @@ -46,7 +46,6 @@ typedef struct { * STATIC PROTOTYPES **********************/ - static bool _is_identity_or_translation(const lv_matrix_t * matrix) { return (matrix->m[0][0] == 1.0f && diff --git a/src/draw/lv_draw_vector.h b/src/draw/lv_draw_vector.h index ea6d63ca3..10a09d90d 100644 --- a/src/draw/lv_draw_vector.h +++ b/src/draw/lv_draw_vector.h @@ -16,7 +16,6 @@ extern "C" { #include "lv_draw.h" #include "../misc/lv_array.h" - #if LV_USE_VECTOR_GRAPHIC /********************** @@ -96,12 +95,10 @@ typedef struct { float y; } lv_fpoint_t; - typedef struct { float m[3][3]; } lv_matrix_t; - typedef struct { lv_vector_path_quality_t quality; lv_array_t ops; @@ -148,7 +145,6 @@ typedef struct { lv_area_t scissor_area; } lv_vector_draw_dsc_t; - typedef struct { lv_draw_dsc_base_t base; lv_ll_t * task_list; // draw task list. @@ -161,7 +157,6 @@ typedef struct { lv_draw_vector_task_dsc_t tasks; } lv_vector_dsc_t; - /********************** * GLOBAL PROTOTYPES **********************/ diff --git a/src/draw/lv_image_decoder.c b/src/draw/lv_image_decoder.c index 7d0422856..d5471497b 100644 --- a/src/draw/lv_image_decoder.c +++ b/src/draw/lv_image_decoder.c @@ -751,7 +751,6 @@ lv_result_t lv_image_decoder_built_in_get_area(lv_image_decoder_t * decoder, lv_ return LV_RESULT_OK; } - if(cf == LV_COLOR_FORMAT_RGB565A8) { bpp = 16; /* RGB565 + A8 mask*/ uint32_t len = (w_px * bpp) / 8; /*map comes firstly*/ diff --git a/src/draw/lv_image_decoder.h b/src/draw/lv_image_decoder.h index ed8475fec..4d966099c 100644 --- a/src/draw/lv_image_decoder.h +++ b/src/draw/lv_image_decoder.h @@ -97,7 +97,6 @@ typedef struct _lv_image_decoder_t { void * user_data; } lv_image_decoder_t; - /**Describe an image decoding session. Stores data about the decoding*/ typedef struct _lv_image_decoder_dsc_t { /**The decoder which was able to open the image source*/ diff --git a/src/draw/nxp/pxp/lv_draw_buf_pxp.c b/src/draw/nxp/pxp/lv_draw_buf_pxp.c index 581d9ea0b..1170f6d58 100644 --- a/src/draw/nxp/pxp/lv_draw_buf_pxp.c +++ b/src/draw/nxp/pxp/lv_draw_buf_pxp.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/pxp/lv_draw_pxp.c b/src/draw/nxp/pxp/lv_draw_pxp.c index bb483bee8..6a6eb1f0d 100644 --- a/src/draw/nxp/pxp/lv_draw_pxp.c +++ b/src/draw/nxp/pxp/lv_draw_pxp.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/pxp/lv_draw_pxp.h b/src/draw/nxp/pxp/lv_draw_pxp.h index 31eaf2487..d164e291b 100644 --- a/src/draw/nxp/pxp/lv_draw_pxp.h +++ b/src/draw/nxp/pxp/lv_draw_pxp.h @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - #ifndef LV_DRAW_PXP_H #define LV_DRAW_PXP_H diff --git a/src/draw/nxp/pxp/lv_draw_pxp_bg_img.c b/src/draw/nxp/pxp/lv_draw_pxp_bg_img.c index 88e1ab8ab..9dada1ef2 100644 --- a/src/draw/nxp/pxp/lv_draw_pxp_bg_img.c +++ b/src/draw/nxp/pxp/lv_draw_pxp_bg_img.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/pxp/lv_draw_pxp_fill.c b/src/draw/nxp/pxp/lv_draw_pxp_fill.c index 6112de60b..44fc1601a 100644 --- a/src/draw/nxp/pxp/lv_draw_pxp_fill.c +++ b/src/draw/nxp/pxp/lv_draw_pxp_fill.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/pxp/lv_draw_pxp_img.c b/src/draw/nxp/pxp/lv_draw_pxp_img.c index ec0431360..451aa0ad5 100644 --- a/src/draw/nxp/pxp/lv_draw_pxp_img.c +++ b/src/draw/nxp/pxp/lv_draw_pxp_img.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/pxp/lv_draw_pxp_layer.c b/src/draw/nxp/pxp/lv_draw_pxp_layer.c index ad7322d50..c933a5380 100644 --- a/src/draw/nxp/pxp/lv_draw_pxp_layer.c +++ b/src/draw/nxp/pxp/lv_draw_pxp_layer.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/pxp/lv_pxp_cfg.c b/src/draw/nxp/pxp/lv_pxp_cfg.c index ef813cb23..34dc71443 100644 --- a/src/draw/nxp/pxp/lv_pxp_cfg.c +++ b/src/draw/nxp/pxp/lv_pxp_cfg.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/pxp/lv_pxp_cfg.h b/src/draw/nxp/pxp/lv_pxp_cfg.h index 227307173..b487e7ff9 100644 --- a/src/draw/nxp/pxp/lv_pxp_cfg.h +++ b/src/draw/nxp/pxp/lv_pxp_cfg.h @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - #ifndef LV_PXP_CFG_H #define LV_PXP_CFG_H diff --git a/src/draw/nxp/pxp/lv_pxp_osa.c b/src/draw/nxp/pxp/lv_pxp_osa.c index 1632e719d..770e99c1f 100644 --- a/src/draw/nxp/pxp/lv_pxp_osa.c +++ b/src/draw/nxp/pxp/lv_pxp_osa.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/pxp/lv_pxp_osa.h b/src/draw/nxp/pxp/lv_pxp_osa.h index c08d1c050..03a8fdc59 100644 --- a/src/draw/nxp/pxp/lv_pxp_osa.h +++ b/src/draw/nxp/pxp/lv_pxp_osa.h @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - #ifndef LV_PXP_OSA_H #define LV_PXP_OSA_H diff --git a/src/draw/nxp/pxp/lv_pxp_utils.c b/src/draw/nxp/pxp/lv_pxp_utils.c index 720edd036..164ca6f0e 100644 --- a/src/draw/nxp/pxp/lv_pxp_utils.c +++ b/src/draw/nxp/pxp/lv_pxp_utils.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/pxp/lv_pxp_utils.h b/src/draw/nxp/pxp/lv_pxp_utils.h index d5eb9cadc..0a7c670e9 100644 --- a/src/draw/nxp/pxp/lv_pxp_utils.h +++ b/src/draw/nxp/pxp/lv_pxp_utils.h @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - #ifndef LV_PXP_UTILS_H #define LV_PXP_UTILS_H diff --git a/src/draw/nxp/vglite/lv_draw_buf_vglite.c b/src/draw/nxp/vglite/lv_draw_buf_vglite.c index 91bfbb22c..c8b7b8bde 100644 --- a/src/draw/nxp/vglite/lv_draw_buf_vglite.c +++ b/src/draw/nxp/vglite/lv_draw_buf_vglite.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/vglite/lv_draw_vglite.c b/src/draw/nxp/vglite/lv_draw_vglite.c index b2d407541..c1b46153d 100644 --- a/src/draw/nxp/vglite/lv_draw_vglite.c +++ b/src/draw/nxp/vglite/lv_draw_vglite.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/vglite/lv_draw_vglite.h b/src/draw/nxp/vglite/lv_draw_vglite.h index 58a69dff0..c3d25a0a1 100644 --- a/src/draw/nxp/vglite/lv_draw_vglite.h +++ b/src/draw/nxp/vglite/lv_draw_vglite.h @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - #ifndef LV_DRAW_VGLITE_H #define LV_DRAW_VGLITE_H diff --git a/src/draw/nxp/vglite/lv_draw_vglite_arc.c b/src/draw/nxp/vglite/lv_draw_vglite_arc.c index 5d39b6223..8bc4b9c50 100644 --- a/src/draw/nxp/vglite/lv_draw_vglite_arc.c +++ b/src/draw/nxp/vglite/lv_draw_vglite_arc.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/vglite/lv_draw_vglite_bg_img.c b/src/draw/nxp/vglite/lv_draw_vglite_bg_img.c index 995331d53..b66af8336 100644 --- a/src/draw/nxp/vglite/lv_draw_vglite_bg_img.c +++ b/src/draw/nxp/vglite/lv_draw_vglite_bg_img.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/vglite/lv_draw_vglite_fill.c b/src/draw/nxp/vglite/lv_draw_vglite_fill.c index f47896ee9..d2d452295 100644 --- a/src/draw/nxp/vglite/lv_draw_vglite_fill.c +++ b/src/draw/nxp/vglite/lv_draw_vglite_fill.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/vglite/lv_draw_vglite_img.c b/src/draw/nxp/vglite/lv_draw_vglite_img.c index f5be3231c..58af218db 100644 --- a/src/draw/nxp/vglite/lv_draw_vglite_img.c +++ b/src/draw/nxp/vglite/lv_draw_vglite_img.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/vglite/lv_draw_vglite_label.c b/src/draw/nxp/vglite/lv_draw_vglite_label.c index ee602ad1e..edff907e1 100644 --- a/src/draw/nxp/vglite/lv_draw_vglite_label.c +++ b/src/draw/nxp/vglite/lv_draw_vglite_label.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ @@ -38,7 +37,6 @@ static void _draw_vglite_letter(lv_draw_unit_t * draw_unit, lv_draw_glyph_dsc_t * glyph_draw_dsc, lv_draw_fill_dsc_t * fill_draw_dsc, const lv_area_t * fill_area); - /** * Draw letter (character bitmap blend) with optional color and opacity * diff --git a/src/draw/nxp/vglite/lv_draw_vglite_layer.c b/src/draw/nxp/vglite/lv_draw_vglite_layer.c index eb5c1e029..683563d88 100644 --- a/src/draw/nxp/vglite/lv_draw_vglite_layer.c +++ b/src/draw/nxp/vglite/lv_draw_vglite_layer.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/vglite/lv_draw_vglite_line.c b/src/draw/nxp/vglite/lv_draw_vglite_line.c index ea7c36e91..cae4bbd52 100644 --- a/src/draw/nxp/vglite/lv_draw_vglite_line.c +++ b/src/draw/nxp/vglite/lv_draw_vglite_line.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/vglite/lv_vglite_buf.c b/src/draw/nxp/vglite/lv_vglite_buf.c index 434a7fad1..4dc6217c3 100644 --- a/src/draw/nxp/vglite/lv_vglite_buf.c +++ b/src/draw/nxp/vglite/lv_vglite_buf.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/vglite/lv_vglite_buf.h b/src/draw/nxp/vglite/lv_vglite_buf.h index 822ec44b5..97529a5d2 100644 --- a/src/draw/nxp/vglite/lv_vglite_buf.h +++ b/src/draw/nxp/vglite/lv_vglite_buf.h @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - #ifndef LV_VGLITE_BUF_H #define LV_VGLITE_BUF_H diff --git a/src/draw/nxp/vglite/lv_vglite_matrix.c b/src/draw/nxp/vglite/lv_vglite_matrix.c index 45f8083a4..8d41e8b60 100644 --- a/src/draw/nxp/vglite/lv_vglite_matrix.c +++ b/src/draw/nxp/vglite/lv_vglite_matrix.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/vglite/lv_vglite_matrix.h b/src/draw/nxp/vglite/lv_vglite_matrix.h index f05e99e73..832cd86bb 100644 --- a/src/draw/nxp/vglite/lv_vglite_matrix.h +++ b/src/draw/nxp/vglite/lv_vglite_matrix.h @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - #ifndef LV_VGLITE_MATRIX_H #define LV_VGLITE_MATRIX_H diff --git a/src/draw/nxp/vglite/lv_vglite_path.c b/src/draw/nxp/vglite/lv_vglite_path.c index ca163021b..271a0d295 100644 --- a/src/draw/nxp/vglite/lv_vglite_path.c +++ b/src/draw/nxp/vglite/lv_vglite_path.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/vglite/lv_vglite_path.h b/src/draw/nxp/vglite/lv_vglite_path.h index 8ae82f379..6c92e50e6 100644 --- a/src/draw/nxp/vglite/lv_vglite_path.h +++ b/src/draw/nxp/vglite/lv_vglite_path.h @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - #ifndef LV_VGLITE_PATH_H #define LV_VGLITE_PATH_H diff --git a/src/draw/nxp/vglite/lv_vglite_utils.c b/src/draw/nxp/vglite/lv_vglite_utils.c index 7c976baf3..330449059 100644 --- a/src/draw/nxp/vglite/lv_vglite_utils.c +++ b/src/draw/nxp/vglite/lv_vglite_utils.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - /********************* * INCLUDES *********************/ diff --git a/src/draw/nxp/vglite/lv_vglite_utils.h b/src/draw/nxp/vglite/lv_vglite_utils.h index edaf6ea78..899743943 100644 --- a/src/draw/nxp/vglite/lv_vglite_utils.h +++ b/src/draw/nxp/vglite/lv_vglite_utils.h @@ -9,7 +9,6 @@ * SPDX-License-Identifier: MIT */ - #ifndef LV_VGLITE_UTILS_H #define LV_VGLITE_UTILS_H diff --git a/src/draw/sw/blend/lv_draw_sw_blend.h b/src/draw/sw/blend/lv_draw_sw_blend.h index 80c95b129..0124f36e9 100644 --- a/src/draw/sw/blend/lv_draw_sw_blend.h +++ b/src/draw/sw/blend/lv_draw_sw_blend.h @@ -46,7 +46,6 @@ typedef struct { struct _lv_draw_unit_t; - typedef struct { void * dest_buf; int32_t dest_w; diff --git a/src/draw/sw/blend/lv_draw_sw_blend_to_argb8888.c b/src/draw/sw/blend/lv_draw_sw_blend_to_argb8888.c index 5bcca6f6a..541054081 100644 --- a/src/draw/sw/blend/lv_draw_sw_blend_to_argb8888.c +++ b/src/draw/sw/blend/lv_draw_sw_blend_to_argb8888.c @@ -32,7 +32,6 @@ typedef struct { lv_opa_t ratio_saved; } lv_color_mix_alpha_cache_t; - /********************** * STATIC PROTOTYPES **********************/ @@ -172,7 +171,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_sw_blend_image_to_argb8888(_lv_draw_sw_blend_ } } - /********************** * STATIC FUNCTIONS **********************/ @@ -519,5 +517,4 @@ LV_ATTRIBUTE_FAST_MEM static inline void blend_non_normal_pixel(lv_color32_t * d *dest = lv_color_32_32_mix(res, *dest, cache); } - #endif diff --git a/src/draw/sw/blend/lv_draw_sw_blend_to_argb8888.h b/src/draw/sw/blend/lv_draw_sw_blend_to_argb8888.h index 21d9bff87..66299f4e2 100644 --- a/src/draw/sw/blend/lv_draw_sw_blend_to_argb8888.h +++ b/src/draw/sw/blend/lv_draw_sw_blend_to_argb8888.h @@ -16,7 +16,6 @@ extern "C" { #include "../lv_draw_sw.h" #if LV_USE_DRAW_SW - /********************* * DEFINES *********************/ @@ -25,7 +24,6 @@ extern "C" { * TYPEDEFS **********************/ - /********************** * GLOBAL PROTOTYPES **********************/ diff --git a/src/draw/sw/blend/lv_draw_sw_blend_to_rgb565.c b/src/draw/sw/blend/lv_draw_sw_blend_to_rgb565.c index c37a63f2d..0104d1aee 100644 --- a/src/draw/sw/blend/lv_draw_sw_blend_to_rgb565.c +++ b/src/draw/sw/blend/lv_draw_sw_blend_to_rgb565.c @@ -221,7 +221,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_sw_blend_image_to_rgb565(_lv_draw_sw_blend_im } } - /********************** * STATIC FUNCTIONS **********************/ diff --git a/src/draw/sw/blend/lv_draw_sw_blend_to_rgb565.h b/src/draw/sw/blend/lv_draw_sw_blend_to_rgb565.h index 81d2c7da3..b87611ee2 100644 --- a/src/draw/sw/blend/lv_draw_sw_blend_to_rgb565.h +++ b/src/draw/sw/blend/lv_draw_sw_blend_to_rgb565.h @@ -16,7 +16,6 @@ extern "C" { #include "../lv_draw_sw.h" #if LV_USE_DRAW_SW - /********************* * DEFINES *********************/ @@ -25,7 +24,6 @@ extern "C" { * TYPEDEFS **********************/ - /********************** * GLOBAL PROTOTYPES **********************/ diff --git a/src/draw/sw/blend/lv_draw_sw_blend_to_rgb888.c b/src/draw/sw/blend/lv_draw_sw_blend_to_rgb888.c index 0b318f069..22cf856fb 100644 --- a/src/draw/sw/blend/lv_draw_sw_blend_to_rgb888.c +++ b/src/draw/sw/blend/lv_draw_sw_blend_to_rgb888.c @@ -216,7 +216,6 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_sw_blend_image_to_rgb888(_lv_draw_sw_blend_im } } - /********************** * STATIC FUNCTIONS **********************/ @@ -415,7 +414,6 @@ LV_ATTRIBUTE_FAST_MEM static void argb8888_image_blend(_lv_draw_sw_blend_image_d int32_t src_x; int32_t y; - if(dsc->blend_mode == LV_BLEND_MODE_NORMAL) { if(mask_buf == NULL && opa >= LV_OPA_MAX) { #ifdef LV_DRAW_SW_ARGB8888_BLEND_NORMAL_TO_RGB888 @@ -517,11 +515,9 @@ LV_ATTRIBUTE_FAST_MEM static inline void blend_non_normal_pixel(uint8_t * dest, lv_color_24_24_mix(res, dest, src.alpha); } - LV_ATTRIBUTE_FAST_MEM static inline void lv_color_24_24_mix(const uint8_t * src, uint8_t * dest, uint8_t mix) { - if(mix == 0) return; // dest[0] = 0xff; // dest[1] = 0x00; @@ -541,5 +537,4 @@ LV_ATTRIBUTE_FAST_MEM static inline void lv_color_24_24_mix(const uint8_t * src, } } - #endif diff --git a/src/draw/sw/blend/lv_draw_sw_blend_to_rgb888.h b/src/draw/sw/blend/lv_draw_sw_blend_to_rgb888.h index afd40c6fb..9e46ef210 100644 --- a/src/draw/sw/blend/lv_draw_sw_blend_to_rgb888.h +++ b/src/draw/sw/blend/lv_draw_sw_blend_to_rgb888.h @@ -16,7 +16,6 @@ extern "C" { #include "../lv_draw_sw.h" #if LV_USE_DRAW_SW - /********************* * DEFINES *********************/ @@ -25,7 +24,6 @@ extern "C" { * TYPEDEFS **********************/ - /********************** * GLOBAL PROTOTYPES **********************/ diff --git a/src/draw/sw/blend/neon/lv_blend_to_rgb888_neon.h b/src/draw/sw/blend/neon/lv_blend_to_rgb888_neon.h index 0300199f9..5aea4ccb5 100644 --- a/src/draw/sw/blend/neon/lv_blend_to_rgb888_neon.h +++ b/src/draw/sw/blend/neon/lv_blend_to_rgb888_neon.h @@ -1528,7 +1528,6 @@ static inline void _lv_color_blend_to_rgb888_neon(_lv_draw_sw_blend_fill_dsc_t * } } - static inline void _lv_color_blend_to_rgb888_with_opa_neon(_lv_draw_sw_blend_fill_dsc_t * dsc, uint32_t dest_px_size) { if(dest_px_size == 3) { diff --git a/src/draw/sw/lv_draw_sw.c b/src/draw/sw/lv_draw_sw.c index dee466746..dbbf8111d 100644 --- a/src/draw/sw/lv_draw_sw.c +++ b/src/draw/sw/lv_draw_sw.c @@ -128,7 +128,6 @@ static int32_t lv_draw_sw_dispatch(lv_draw_unit_t * draw_unit, lv_layer_t * laye void * buf = lv_draw_layer_alloc_buf(layer); if(buf == NULL) return -1; - t->state = LV_DRAW_TASK_STATE_IN_PROGRESS; draw_sw_unit->base_unit.target_layer = layer; draw_sw_unit->base_unit.clip_area = &t->clip_area; @@ -280,7 +279,6 @@ static void execute_drawing(lv_draw_sw_unit_t * u) } - void lv_draw_sw_rgb565_swap(void * buf, int32_t buf_size_px) { uint32_t u32_cnt = buf_size_px / 2; diff --git a/src/draw/sw/lv_draw_sw_arc.c b/src/draw/sw/lv_draw_sw_arc.c index b201a3a53..17a4926e3 100644 --- a/src/draw/sw/lv_draw_sw_arc.c +++ b/src/draw/sw/lv_draw_sw_arc.c @@ -16,7 +16,6 @@ #include "../../stdlib/lv_string.h" #include "../lv_draw.h" - static void add_circle(const lv_opa_t * circle_mask, const lv_area_t * blend_area, const lv_area_t * circle_area, lv_opa_t * mask_buf, int32_t width); static void get_rounded_area(int16_t angle, int32_t radius, uint8_t thickness, lv_area_t * res_area); @@ -138,7 +137,6 @@ void lv_draw_sw_arc(lv_draw_unit_t * draw_unit, const lv_draw_arc_dsc_t * dsc, c blend_dsc.src_stride = decoder_dsc.header.stride; } - lv_opa_t * circle_mask = NULL; lv_area_t round_area_1; lv_area_t round_area_2; diff --git a/src/draw/sw/lv_draw_sw_border.c b/src/draw/sw/lv_draw_sw_border.c index 7a58ed958..c7f11919d 100644 --- a/src/draw/sw/lv_draw_sw_border.c +++ b/src/draw/sw/lv_draw_sw_border.c @@ -22,7 +22,6 @@ *********************/ #define SPLIT_LIMIT 50 - /********************** * TYPEDEFS **********************/ @@ -36,7 +35,6 @@ static void draw_border_complex(lv_draw_unit_t * draw_unit, const lv_area_t * ou static void draw_border_simple(lv_draw_unit_t * draw_unit, const lv_area_t * outer_area, const lv_area_t * inner_area, lv_color_t color, lv_opa_t opa); - /********************** * STATIC VARIABLES **********************/ @@ -100,7 +98,6 @@ void draw_border_complex(lv_draw_unit_t * draw_unit, const lv_area_t * outer_are lv_opa_t * mask_buf = lv_malloc(draw_area_w); blend_dsc.mask_buf = mask_buf; - void * mask_list[3] = {0}; /*Create mask for the inner mask*/ @@ -108,7 +105,6 @@ void draw_border_complex(lv_draw_unit_t * draw_unit, const lv_area_t * outer_are lv_draw_sw_mask_radius_init(&mask_rin_param, inner_area, rin, true); mask_list[0] = &mask_rin_param; - /*Create mask for the outer area*/ lv_draw_sw_mask_radius_param_t mask_rout_param; if(rout > 0) { @@ -144,7 +140,6 @@ void draw_border_complex(lv_draw_unit_t * draw_unit, const lv_area_t * outer_are split_hor = false; } - blend_dsc.mask_res = LV_DRAW_SW_MASK_RES_FULL_COVER; /*Draw the straight lines first if they are long enough*/ if(top_side && split_hor) { diff --git a/src/draw/sw/lv_draw_sw_box_shadow.c b/src/draw/sw/lv_draw_sw_box_shadow.c index 8104f9801..f5ea57010 100644 --- a/src/draw/sw/lv_draw_sw_box_shadow.c +++ b/src/draw/sw/lv_draw_sw_box_shadow.c @@ -40,7 +40,6 @@ LV_ATTRIBUTE_FAST_MEM static void shadow_draw_corner_buf(const lv_area_t * coord LV_ATTRIBUTE_FAST_MEM static void shadow_blur_corner(int32_t size, int32_t sw, uint16_t * sh_ups_buf); #endif /*LV_DRAW_SW_COMPLEX*/ - /********************** * STATIC VARIABLES **********************/ @@ -92,7 +91,6 @@ void lv_draw_sw_box_shadow(lv_draw_unit_t * draw_unit, const lv_draw_box_shadow_ short_side = LV_MIN(lv_area_get_width(&core_area), lv_area_get_height(&core_area)); if(r_sh > short_side >> 1) r_sh = short_side >> 1; - /*Get how many pixels are affected by the blur on the corners*/ int32_t corner_size = dsc->width + r_sh; @@ -293,7 +291,6 @@ void lv_draw_sw_box_shadow(lv_draw_unit_t * draw_unit, const lv_draw_box_shadow_ blend_area.y2 = shadow_area.y2; blend_area.y1 = LV_MAX(blend_area.y1, h_half + 1); - if(_lv_area_intersect(&clip_area_sub, &blend_area, draw_unit->clip_area) && !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) { int32_t w = lv_area_get_width(&clip_area_sub); @@ -532,13 +529,6 @@ void lv_draw_sw_box_shadow(lv_draw_unit_t * draw_unit, const lv_draw_box_shadow_ blend_area.y2 = LV_MAX(blend_area.y2, h_half); blend_dsc.mask_buf = mask_buf; - - - - - - - if(_lv_area_intersect(&clip_area_sub, &blend_area, draw_unit->clip_area) && !_lv_area_is_in(&clip_area_sub, &bg_area, r_bg)) { int32_t w = lv_area_get_width(&clip_area_sub); diff --git a/src/draw/sw/lv_draw_sw_fill.c b/src/draw/sw/lv_draw_sw_fill.c index 01aac052d..9274f25c1 100644 --- a/src/draw/sw/lv_draw_sw_fill.c +++ b/src/draw/sw/lv_draw_sw_fill.c @@ -100,7 +100,6 @@ void lv_draw_sw_fill(lv_draw_unit_t * draw_unit, const lv_draw_fill_dsc_t * dsc, blend_dsc.mask_area = &blend_area; blend_dsc.opa = LV_OPA_COVER; - /*Get gradient if appropriate*/ lv_grad_t * grad = lv_gradient_get(&dsc->grad, coords_bg_w, coords_bg_h); lv_opa_t * grad_opa_map = NULL; diff --git a/src/draw/sw/lv_draw_sw_gradient.c b/src/draw/sw/lv_draw_sw_gradient.c index 665158f53..0759d943c 100644 --- a/src/draw/sw/lv_draw_sw_gradient.c +++ b/src/draw/sw/lv_draw_sw_gradient.c @@ -12,7 +12,6 @@ #include "../../misc/lv_types.h" #include "../../osal/lv_os.h" - /********************* * DEFINES *********************/ @@ -56,7 +55,6 @@ static lv_grad_t * allocate_item(const lv_grad_dsc_t * g, int32_t w, int32_t h) return item; } - /********************** * FUNCTIONS **********************/ diff --git a/src/draw/sw/lv_draw_sw_gradient.h b/src/draw/sw/lv_draw_sw_gradient.h index af7ea3718..19fa697b3 100644 --- a/src/draw/sw/lv_draw_sw_gradient.h +++ b/src/draw/sw/lv_draw_sw_gradient.h @@ -25,7 +25,6 @@ extern "C" { #error LVGL needs at least 2 stops for gradients. Please increase the LV_GRADIENT_MAX_STOPS #endif - /********************** * TYPEDEFS **********************/ @@ -50,7 +49,6 @@ typedef struct _lv_gradient_cache_t { LV_ATTRIBUTE_FAST_MEM void lv_gradient_color_calculate(const lv_grad_dsc_t * dsc, int32_t range, int32_t frac, lv_grad_color_t * color_out, lv_opa_t * opa_out); - /** Get a gradient cache from the given parameters */ lv_grad_t * lv_gradient_get(const lv_grad_dsc_t * gradient, int32_t w, int32_t h); diff --git a/src/draw/sw/lv_draw_sw_img.c b/src/draw/sw/lv_draw_sw_img.c index 4758ad173..2e129f0ee 100644 --- a/src/draw/sw/lv_draw_sw_img.c +++ b/src/draw/sw/lv_draw_sw_img.c @@ -403,7 +403,6 @@ static void img_draw_core(lv_draw_unit_t * draw_unit, const lv_draw_image_dsc_t blend_dsc.src_stride = lv_draw_buf_width_to_stride(blend_w, cf_final); } - while(blend_area.y1 <= y_last) { /*Apply transformations if any or separate the channels*/ lv_area_t relative_area; diff --git a/src/draw/sw/lv_draw_sw_line.c b/src/draw/sw/lv_draw_sw_line.c index 076a97b8e..d8fbd0042 100644 --- a/src/draw/sw/lv_draw_sw_line.c +++ b/src/draw/sw/lv_draw_sw_line.c @@ -308,7 +308,6 @@ LV_ATTRIBUTE_FAST_MEM static void draw_line_skew(lv_draw_unit_t * draw_unit, con void * masks[5] = {&mask_left_param, & mask_right_param, NULL, NULL, NULL}; - if(flat) { if(xdiff > 0) { lv_draw_sw_mask_line_points_init(&mask_left_param, p1.x, p1.y - w_half0, p2.x, p2.y - w_half0, diff --git a/src/draw/sw/lv_draw_sw_mask.c b/src/draw/sw/lv_draw_sw_mask.c index 3f529a3ae..2439bcee0 100644 --- a/src/draw/sw/lv_draw_sw_mask.c +++ b/src/draw/sw/lv_draw_sw_mask.c @@ -898,8 +898,6 @@ LV_ATTRIBUTE_FAST_MEM static lv_draw_sw_mask_res_t lv_draw_mask_angle(lv_opa_t * } } - - LV_ATTRIBUTE_FAST_MEM static lv_draw_sw_mask_res_t lv_draw_mask_radius(lv_opa_t * mask_buf, int32_t abs_x, int32_t abs_y, int32_t len, lv_draw_sw_mask_radius_param_t * p) @@ -1288,7 +1286,6 @@ static lv_opa_t * get_next_line(_lv_draw_sw_mask_radius_circle_dsc_t * c, int32_ return &c->cir_opa[c->opa_start_on_y[y]]; } - LV_ATTRIBUTE_FAST_MEM static inline lv_opa_t mask_mix(lv_opa_t mask_act, lv_opa_t mask_new) { if(mask_new >= LV_OPA_MAX) return mask_act; @@ -1297,5 +1294,4 @@ LV_ATTRIBUTE_FAST_MEM static inline lv_opa_t mask_mix(lv_opa_t mask_act, lv_opa_ return LV_UDIV255(mask_act * mask_new); } - #endif /*LV_DRAW_SW_COMPLEX*/ diff --git a/src/draw/sw/lv_draw_sw_mask.h b/src/draw/sw/lv_draw_sw_mask.h index c7572762c..9cde01683 100644 --- a/src/draw/sw/lv_draw_sw_mask.h +++ b/src/draw/sw/lv_draw_sw_mask.h @@ -10,7 +10,6 @@ extern "C" { #endif - /********************* * INCLUDES *********************/ @@ -155,7 +154,6 @@ typedef struct { _lv_draw_sw_mask_radius_circle_dsc_t * circle; } lv_draw_sw_mask_radius_param_t; - typedef struct { /*The first element must be the common descriptor*/ _lv_draw_sw_mask_common_dsc_t dsc; @@ -170,7 +168,6 @@ typedef struct { } lv_draw_sw_mask_fade_param_t; - typedef struct _lv_draw_sw_mask_map_param_t { /*The first element must be the common descriptor*/ _lv_draw_sw_mask_common_dsc_t dsc; @@ -181,7 +178,6 @@ typedef struct _lv_draw_sw_mask_map_param_t { } cfg; } lv_draw_sw_mask_map_param_t; - /********************** * GLOBAL PROTOTYPES **********************/ diff --git a/src/draw/sw/lv_draw_sw_transform.c b/src/draw/sw/lv_draw_sw_transform.c index 30eb2af60..051da4d51 100644 --- a/src/draw/sw/lv_draw_sw_transform.c +++ b/src/draw/sw/lv_draw_sw_transform.c @@ -15,7 +15,6 @@ #include "../../misc/lv_color.h" #include "../../stdlib/lv_string.h" - /********************* * DEFINES *********************/ @@ -56,7 +55,6 @@ static void transform_rgb888(const uint8_t * src, int32_t src_w, int32_t src_h, int32_t xs_ups, int32_t ys_ups, int32_t xs_step, int32_t ys_step, int32_t x_end, uint8_t * dest_buf, bool aa, uint32_t px_size); - static void transform_argb8888(const uint8_t * src, int32_t src_w, int32_t src_h, int32_t src_stride, int32_t xs_ups, int32_t ys_ups, int32_t xs_step, int32_t ys_step, int32_t x_end, uint8_t * dest_buf, bool aa); @@ -111,7 +109,6 @@ void lv_draw_sw_transform(lv_draw_unit_t * draw_unit, const lv_area_t * dest_are tr_dsc.pivot_x_256 = tr_dsc.pivot.x * 256; tr_dsc.pivot_y_256 = tr_dsc.pivot.y * 256; - int32_t dest_w = lv_area_get_width(dest_area); int32_t dest_h = lv_area_get_height(dest_area); @@ -295,7 +292,6 @@ static void transform_rgb888(const uint8_t * src, int32_t src_w, int32_t src_h, } } - static void transform_argb8888(const uint8_t * src, int32_t src_w, int32_t src_h, int32_t src_stride, int32_t xs_ups, int32_t ys_ups, int32_t xs_step, int32_t ys_step, int32_t x_end, uint8_t * dest_buf, bool aa) @@ -439,7 +435,6 @@ static void transform_rgb565a8(const uint8_t * src, int32_t src_w, int32_t src_h src_tmp_u16 += (ys_int * src_stride) + xs_int; cbuf[x] = src_tmp_u16[0]; - if(aa && xs_int + x_next >= 0 && xs_int + x_next <= src_w - 1 && @@ -569,7 +564,6 @@ static void transform_a8(const uint8_t * src, int32_t src_w, int32_t src_h, int3 } } - static void transform_point_upscaled(point_transform_dsc_t * t, int32_t xin, int32_t yin, int32_t * xout, int32_t * yout) { diff --git a/src/draw/sw/lv_draw_sw_triangle.c b/src/draw/sw/lv_draw_sw_triangle.c index 315f8a472..836dbcfb9 100644 --- a/src/draw/sw/lv_draw_sw_triangle.c +++ b/src/draw/sw/lv_draw_sw_triangle.c @@ -206,5 +206,4 @@ static void point_swap(lv_point_t * p1, lv_point_t * p2) *p2 = tmp; } - #endif /*LV_USE_DRAW_SW*/ diff --git a/src/font/lv_font_dejavu_16_persian_hebrew.c b/src/font/lv_font_dejavu_16_persian_hebrew.c index 3f692adab..02a95735e 100644 --- a/src/font/lv_font_dejavu_16_persian_hebrew.c +++ b/src/font/lv_font_dejavu_16_persian_hebrew.c @@ -5864,7 +5864,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -6556,8 +6555,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { } }; - - /*-------------------- * ALL CUSTOM DATA *--------------------*/ @@ -6581,7 +6578,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -6606,7 +6602,4 @@ lv_font_t lv_font_dejavu_16_persian_hebrew = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_DEJAVU_16_PERSIAN_HEBREW*/ - diff --git a/src/font/lv_font_fmt_txt.c b/src/font/lv_font_fmt_txt.c index b4a81f390..ac9616b92 100644 --- a/src/font/lv_font_fmt_txt.c +++ b/src/font/lv_font_fmt_txt.c @@ -59,7 +59,6 @@ static const uint8_t opa3_table[8] = {0, 36, 73, 109, 146, 182, 218, 255}; static const uint8_t opa2_table[4] = {0, 85, 170, 255}; - /********************** * GLOBAL PROTOTYPES **********************/ @@ -72,7 +71,6 @@ static const uint8_t opa2_table[4] = {0, 85, 170, 255}; * GLOBAL FUNCTIONS **********************/ - const uint8_t * lv_font_get_bitmap_fmt_txt(const lv_font_t * font, uint32_t unicode_letter, uint8_t * bitmap_out) { if(unicode_letter == '\t') unicode_letter = ' '; diff --git a/src/font/lv_font_fmt_txt.h b/src/font/lv_font_fmt_txt.h index 58905f449..722b17ec2 100644 --- a/src/font/lv_font_fmt_txt.h +++ b/src/font/lv_font_fmt_txt.h @@ -59,7 +59,6 @@ typedef _lv_font_fmt_txt_cmap_type_t lv_font_fmt_txt_cmap_type_t; typedef uint8_t lv_font_fmt_txt_cmap_type_t; #endif /*DOXYGEN*/ - /** * Map codepoints to a `glyph_dsc`s * Several formats are supported to optimize memory usage @@ -224,7 +223,6 @@ typedef struct { */ const uint8_t * lv_font_get_bitmap_fmt_txt(const lv_font_t * font, uint32_t unicode_letter, uint8_t * bitmap_out); - /** * Used as `get_glyph_dsc` callback in lvgl's native font format if the font is uncompressed. * @param font pointer to font @@ -237,7 +235,6 @@ const uint8_t * lv_font_get_bitmap_fmt_txt(const lv_font_t * font, uint32_t unic bool lv_font_get_glyph_dsc_fmt_txt(const lv_font_t * font, lv_font_glyph_dsc_t * dsc_out, uint32_t unicode_letter, uint32_t unicode_letter_next); - /********************** * MACROS **********************/ diff --git a/src/font/lv_font_loader.c b/src/font/lv_font_loader.c index ef59f0c9b..650e6384a 100644 --- a/src/font/lv_font_loader.c +++ b/src/font/lv_font_loader.c @@ -78,7 +78,6 @@ static unsigned int read_bits(bit_iterator_t * it, int n_bits, lv_fs_res_t * res * GLOBAL FUNCTIONS **********************/ - lv_font_t * lv_font_load(const char * font_name) { lv_fs_file_t file; diff --git a/src/font/lv_font_loader.h b/src/font/lv_font_loader.h index 6410463e6..9f8e16462 100644 --- a/src/font/lv_font_loader.h +++ b/src/font/lv_font_loader.h @@ -33,7 +33,6 @@ extern "C" { */ lv_font_t * lv_font_load(const char * fontName); - #if LV_USE_FS_MEMFS /** * Loads a `lv_font_t` object from a memory buffer containing the binary font file. diff --git a/src/font/lv_font_montserrat_10.c b/src/font/lv_font_montserrat_10.c index 415c0fcf2..80fe261a1 100644 --- a/src/font/lv_font_montserrat_10.c +++ b/src/font/lv_font_montserrat_10.c @@ -973,7 +973,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x30, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -1170,7 +1169,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -1597,7 +1595,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -1630,7 +1627,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -1655,7 +1651,4 @@ lv_font_t lv_font_montserrat_10 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_10*/ - diff --git a/src/font/lv_font_montserrat_12.c b/src/font/lv_font_montserrat_12.c index f18f69ffe..6e5c1ea41 100644 --- a/src/font/lv_font_montserrat_12.c +++ b/src/font/lv_font_montserrat_12.c @@ -1234,7 +1234,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -1431,7 +1430,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -1858,7 +1856,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -1891,7 +1888,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -1916,7 +1912,4 @@ lv_font_t lv_font_montserrat_12 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_12*/ - diff --git a/src/font/lv_font_montserrat_14.c b/src/font/lv_font_montserrat_14.c index e65410be9..2ba984ee0 100644 --- a/src/font/lv_font_montserrat_14.c +++ b/src/font/lv_font_montserrat_14.c @@ -1510,7 +1510,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -1707,7 +1706,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -2134,7 +2132,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -2167,7 +2164,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -2192,7 +2188,4 @@ lv_font_t lv_font_montserrat_14 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_14*/ - diff --git a/src/font/lv_font_montserrat_16.c b/src/font/lv_font_montserrat_16.c index 86663821d..36cdea4ee 100644 --- a/src/font/lv_font_montserrat_16.c +++ b/src/font/lv_font_montserrat_16.c @@ -1779,7 +1779,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -1976,7 +1975,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -2403,7 +2401,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -2436,7 +2433,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -2461,7 +2457,4 @@ lv_font_t lv_font_montserrat_16 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_16*/ - diff --git a/src/font/lv_font_montserrat_18.c b/src/font/lv_font_montserrat_18.c index 9bcbe79e8..de7339039 100644 --- a/src/font/lv_font_montserrat_18.c +++ b/src/font/lv_font_montserrat_18.c @@ -2179,7 +2179,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -2376,7 +2375,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -2803,7 +2801,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -2836,7 +2833,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -2861,7 +2857,4 @@ lv_font_t lv_font_montserrat_18 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_18*/ - diff --git a/src/font/lv_font_montserrat_20.c b/src/font/lv_font_montserrat_20.c index 0672e100f..de7e49db4 100644 --- a/src/font/lv_font_montserrat_20.c +++ b/src/font/lv_font_montserrat_20.c @@ -2536,7 +2536,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -2733,7 +2732,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -3160,7 +3158,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -3193,7 +3190,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -3218,7 +3214,4 @@ lv_font_t lv_font_montserrat_20 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_20*/ - diff --git a/src/font/lv_font_montserrat_22.c b/src/font/lv_font_montserrat_22.c index 2a89b094f..33907436c 100644 --- a/src/font/lv_font_montserrat_22.c +++ b/src/font/lv_font_montserrat_22.c @@ -2965,7 +2965,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -3162,7 +3161,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -3589,7 +3587,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -3622,7 +3619,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -3647,7 +3643,4 @@ lv_font_t lv_font_montserrat_22 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_22*/ - diff --git a/src/font/lv_font_montserrat_24.c b/src/font/lv_font_montserrat_24.c index 9d44e559b..ffb9c83f0 100644 --- a/src/font/lv_font_montserrat_24.c +++ b/src/font/lv_font_montserrat_24.c @@ -3376,7 +3376,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -3573,7 +3572,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -4000,7 +3998,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -4033,7 +4030,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -4058,7 +4054,4 @@ lv_font_t lv_font_montserrat_24 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_24*/ - diff --git a/src/font/lv_font_montserrat_26.c b/src/font/lv_font_montserrat_26.c index a62e57d3b..93d4f71f8 100644 --- a/src/font/lv_font_montserrat_26.c +++ b/src/font/lv_font_montserrat_26.c @@ -3911,7 +3911,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -4108,7 +4107,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -4535,7 +4533,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -4568,7 +4565,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -4593,7 +4589,4 @@ lv_font_t lv_font_montserrat_26 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_26*/ - diff --git a/src/font/lv_font_montserrat_28.c b/src/font/lv_font_montserrat_28.c index 5cedabc15..a1867474a 100644 --- a/src/font/lv_font_montserrat_28.c +++ b/src/font/lv_font_montserrat_28.c @@ -4460,7 +4460,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -4657,7 +4656,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -5084,7 +5082,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -5116,7 +5113,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .bitmap_format = 0, }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -5141,7 +5137,4 @@ lv_font_t lv_font_montserrat_28 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_28*/ - diff --git a/src/font/lv_font_montserrat_28_compressed.c b/src/font/lv_font_montserrat_28_compressed.c index 6dbebb81d..170ab48e0 100644 --- a/src/font/lv_font_montserrat_28_compressed.c +++ b/src/font/lv_font_montserrat_28_compressed.c @@ -2590,7 +2590,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0xff, 0x3a, 0xba, 0x40, 0x3f, 0xf9, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -2787,7 +2786,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -3214,7 +3212,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -3247,7 +3244,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -3272,7 +3268,4 @@ lv_font_t lv_font_montserrat_28_compressed = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_28_COMPRESSED*/ - diff --git a/src/font/lv_font_montserrat_30.c b/src/font/lv_font_montserrat_30.c index d0aa70ed1..30e48eb57 100644 --- a/src/font/lv_font_montserrat_30.c +++ b/src/font/lv_font_montserrat_30.c @@ -5042,7 +5042,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -5239,7 +5238,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -5666,7 +5664,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -5699,7 +5696,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -5724,7 +5720,4 @@ lv_font_t lv_font_montserrat_30 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_30*/ - diff --git a/src/font/lv_font_montserrat_32.c b/src/font/lv_font_montserrat_32.c index 71dfe9a42..a12a49c6a 100644 --- a/src/font/lv_font_montserrat_32.c +++ b/src/font/lv_font_montserrat_32.c @@ -5531,7 +5531,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -5728,7 +5727,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -6155,7 +6153,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -6188,7 +6185,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -6213,7 +6209,4 @@ lv_font_t lv_font_montserrat_32 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_32*/ - diff --git a/src/font/lv_font_montserrat_34.c b/src/font/lv_font_montserrat_34.c index 3e6f0c77f..7577c7343 100644 --- a/src/font/lv_font_montserrat_34.c +++ b/src/font/lv_font_montserrat_34.c @@ -6330,7 +6330,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -6527,7 +6526,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -6954,7 +6952,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -6987,7 +6984,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -7012,7 +7008,4 @@ lv_font_t lv_font_montserrat_34 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_34*/ - diff --git a/src/font/lv_font_montserrat_36.c b/src/font/lv_font_montserrat_36.c index 65fb10479..f5ef2ec02 100644 --- a/src/font/lv_font_montserrat_36.c +++ b/src/font/lv_font_montserrat_36.c @@ -6974,7 +6974,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -7171,7 +7170,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -7598,7 +7596,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -7631,7 +7628,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -7656,7 +7652,4 @@ lv_font_t lv_font_montserrat_36 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_36*/ - diff --git a/src/font/lv_font_montserrat_38.c b/src/font/lv_font_montserrat_38.c index e93c79f1e..992b5c65f 100644 --- a/src/font/lv_font_montserrat_38.c +++ b/src/font/lv_font_montserrat_38.c @@ -7719,7 +7719,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -7916,7 +7915,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -8343,7 +8341,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -8376,7 +8373,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -8401,7 +8397,4 @@ lv_font_t lv_font_montserrat_38 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_38*/ - diff --git a/src/font/lv_font_montserrat_40.c b/src/font/lv_font_montserrat_40.c index b55c01e59..36c7d31de 100644 --- a/src/font/lv_font_montserrat_40.c +++ b/src/font/lv_font_montserrat_40.c @@ -8567,7 +8567,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -8764,7 +8763,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -9191,7 +9189,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -9224,7 +9221,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -9249,7 +9245,4 @@ lv_font_t lv_font_montserrat_40 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_40*/ - diff --git a/src/font/lv_font_montserrat_42.c b/src/font/lv_font_montserrat_42.c index a5284221f..71fdd9311 100644 --- a/src/font/lv_font_montserrat_42.c +++ b/src/font/lv_font_montserrat_42.c @@ -9409,7 +9409,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -9606,7 +9605,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -10033,7 +10031,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -10066,7 +10063,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -10091,7 +10087,4 @@ lv_font_t lv_font_montserrat_42 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_42*/ - diff --git a/src/font/lv_font_montserrat_44.c b/src/font/lv_font_montserrat_44.c index bfbe70fbe..07071531e 100644 --- a/src/font/lv_font_montserrat_44.c +++ b/src/font/lv_font_montserrat_44.c @@ -10235,7 +10235,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -10432,7 +10431,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -10859,7 +10857,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -10892,7 +10889,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -10917,7 +10913,4 @@ lv_font_t lv_font_montserrat_44 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_44*/ - diff --git a/src/font/lv_font_montserrat_46.c b/src/font/lv_font_montserrat_46.c index 65b7655dc..48fa6875c 100644 --- a/src/font/lv_font_montserrat_46.c +++ b/src/font/lv_font_montserrat_46.c @@ -11187,7 +11187,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -11384,7 +11383,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -11811,7 +11809,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -11844,7 +11841,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -11869,7 +11865,4 @@ lv_font_t lv_font_montserrat_46 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_46*/ - diff --git a/src/font/lv_font_montserrat_48.c b/src/font/lv_font_montserrat_48.c index 8841d1c8d..1f731ac67 100644 --- a/src/font/lv_font_montserrat_48.c +++ b/src/font/lv_font_montserrat_48.c @@ -11888,7 +11888,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -12085,7 +12084,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -12512,7 +12510,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -12545,7 +12542,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -12570,7 +12566,4 @@ lv_font_t lv_font_montserrat_48 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_48*/ - diff --git a/src/font/lv_font_montserrat_8.c b/src/font/lv_font_montserrat_8.c index a8ce73695..698579249 100644 --- a/src/font/lv_font_montserrat_8.c +++ b/src/font/lv_font_montserrat_8.c @@ -759,7 +759,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -956,7 +955,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { * KERNING *----------------*/ - /*Map glyph_ids to kern left classes*/ static const uint8_t kern_left_class_mapping[] = { 0, 0, 1, 2, 0, 3, 4, 5, @@ -1383,7 +1381,6 @@ static const int8_t kern_class_values[] = { 0, 0, 0, 0, 0 }; - /*Collect the kern class' data in one place*/ static const lv_font_fmt_txt_kern_classes_t kern_classes = { .class_pair_values = kern_class_values, @@ -1416,7 +1413,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -1441,7 +1437,4 @@ lv_font_t lv_font_montserrat_8 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_MONTSERRAT_8*/ - diff --git a/src/font/lv_font_simsun_16_cjk.c b/src/font/lv_font_simsun_16_cjk.c index 53496c3c2..d79105891 100644 --- a/src/font/lv_font_simsun_16_cjk.c +++ b/src/font/lv_font_simsun_16_cjk.c @@ -22100,7 +22100,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x2f, 0xdd, 0xdd, 0x80, 0x0, 0x0, 0x0, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -23723,8 +23722,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { } }; - - /*-------------------- * ALL CUSTOM DATA *--------------------*/ @@ -23748,7 +23745,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -23773,7 +23769,4 @@ lv_font_t lv_font_simsun_16_cjk = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_SIMSUN_16_CJK*/ - diff --git a/src/font/lv_font_unscii_16.c b/src/font/lv_font_unscii_16.c index 078e3310c..b95d51aed 100644 --- a/src/font/lv_font_unscii_16.c +++ b/src/font/lv_font_unscii_16.c @@ -475,7 +475,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0xc0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -584,8 +583,6 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { * CHARACTER MAPPING *--------------------*/ - - /*Collect the unicode lists and glyph_id offsets*/ static const lv_font_fmt_txt_cmap_t cmaps[] = { { @@ -594,8 +591,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { } }; - - /*-------------------- * ALL CUSTOM DATA *--------------------*/ @@ -619,7 +614,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -644,7 +638,4 @@ lv_font_t lv_font_unscii_16 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_UNSCII_16*/ - diff --git a/src/font/lv_font_unscii_8.c b/src/font/lv_font_unscii_8.c index b6878faf1..26b92fbbf 100644 --- a/src/font/lv_font_unscii_8.c +++ b/src/font/lv_font_unscii_8.c @@ -311,7 +311,6 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0xc1, 0x42, 0xbd, 0x2c, 0x40, 0x81, 0x0 }; - /*--------------------- * GLYPH DESCRIPTION *--------------------*/ @@ -420,8 +419,6 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { * CHARACTER MAPPING *--------------------*/ - - /*Collect the unicode lists and glyph_id offsets*/ static const lv_font_fmt_txt_cmap_t cmaps[] = { { @@ -430,8 +427,6 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = { } }; - - /*-------------------- * ALL CUSTOM DATA *--------------------*/ @@ -455,7 +450,6 @@ static lv_font_fmt_txt_dsc_t font_dsc = { }; - /*----------------- * PUBLIC FONT *----------------*/ @@ -480,7 +474,4 @@ lv_font_t lv_font_unscii_8 = { .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; - - #endif /*#if LV_FONT_UNSCII_8*/ - diff --git a/src/font/lv_symbol_def.h b/src/font/lv_symbol_def.h index 696daf189..7c2365869 100644 --- a/src/font/lv_symbol_def.h +++ b/src/font/lv_symbol_def.h @@ -31,7 +31,6 @@ extern "C" { * If they are not predefined, they will use the following values */ - #if !defined LV_SYMBOL_AUDIO #define LV_SYMBOL_AUDIO "\xEF\x80\x81" /*61441, 0xF001*/ #endif diff --git a/src/indev/lv_indev.c b/src/indev/lv_indev.c index 175403e0c..1f96c6254 100644 --- a/src/indev/lv_indev.c +++ b/src/indev/lv_indev.c @@ -37,7 +37,6 @@ *Time between `LV_EVENT_LONG_PRESSED_REPEAT*/ #define LV_INDEV_DEF_LONG_PRESS_REP_TIME 100 - /*Gesture threshold in pixels*/ #define LV_INDEV_DEF_GESTURE_LIMIT 50 @@ -286,7 +285,6 @@ void lv_indev_set_driver_data(lv_indev_t * indev, void * driver_data) indev->driver_data = driver_data; } - lv_indev_type_t lv_indev_get_type(const lv_indev_t * indev) { if(indev == NULL) return LV_INDEV_TYPE_NONE; @@ -460,7 +458,6 @@ lv_timer_t * lv_indev_get_read_timer(lv_indev_t * indev) return indev->read_timer; } - lv_obj_t * lv_indev_search_obj(lv_obj_t * obj, lv_point_t * point) { lv_obj_t * found_p = NULL; @@ -1162,7 +1159,6 @@ static void indev_proc_release(lv_indev_t * indev) indev->pr_timestamp = 0; indev->longpr_rep_timestamp = 0; - /*Get the transformed vector with this object*/ if(scroll_obj) { int16_t angle = 0; diff --git a/src/indev/lv_indev_scroll.c b/src/indev/lv_indev_scroll.c index f874918cb..901cb8bce 100644 --- a/src/indev/lv_indev_scroll.c +++ b/src/indev/lv_indev_scroll.c @@ -84,7 +84,6 @@ void _lv_indev_scroll_handler(lv_indev_t * indev) lv_point_transform(&indev->pointer.vect, angle, scale_x, scale_y, &pivot, false); } - int32_t diff_x = 0; int32_t diff_y = 0; if(indev->pointer.scroll_dir == LV_DIR_HOR) { @@ -113,7 +112,6 @@ void _lv_indev_scroll_handler(lv_indev_t * indev) indev->pointer.scroll_sum.y += diff_y; } - void _lv_indev_scroll_throw_handler(lv_indev_t * indev) { lv_obj_t * scroll_obj = indev->pointer.scroll_obj; @@ -592,8 +590,6 @@ static void scroll_limit_diff(lv_indev_t * indev, int32_t * diff_x, int32_t * di } } - - static int32_t scroll_throw_predict_y(lv_indev_t * indev) { int32_t y = indev->pointer.scroll_throw_vect.y; @@ -609,7 +605,6 @@ static int32_t scroll_throw_predict_y(lv_indev_t * indev) return move; } - static int32_t scroll_throw_predict_x(lv_indev_t * indev) { int32_t x = indev->pointer.scroll_throw_vect.x; @@ -702,5 +697,3 @@ static int32_t elastic_diff(lv_obj_t * scroll_obj, int32_t diff, int32_t scroll_ return diff; } - - diff --git a/src/layouts/flex/lv_flex.c b/src/layouts/flex/lv_flex.c index 35754759e..7d080288c 100644 --- a/src/layouts/flex/lv_flex.c +++ b/src/layouts/flex/lv_flex.c @@ -49,7 +49,6 @@ typedef struct { uint32_t grow_dsc_calc : 1; } track_t; - /********************** * GLOBAL PROTOTYPES **********************/ @@ -285,7 +284,6 @@ static int32_t find_track_end(lv_obj_t * cont, flex_t * f, int32_t item_start_id t->track_fix_main_size += item_size + item_gap; } - t->track_cross_size = LV_MAX(get_cross_size(item), t->track_cross_size); t->item_cnt++; } @@ -365,7 +363,6 @@ static void children_repos(lv_obj_t * cont, flex_t * f, int32_t item_first_id, i } } - bool rtl = lv_obj_get_style_base_dir(cont, LV_PART_MAIN) == LV_BASE_DIR_RTL; int32_t main_pos = 0; @@ -435,7 +432,6 @@ static void children_repos(lv_obj_t * cont, flex_t * f, int32_t item_first_id, i if(f->row && rtl) main_pos -= area_get_main_size(&item->coords); - /*Handle percentage value of translate*/ int32_t tr_x = lv_obj_get_style_translate_x(item, LV_PART_MAIN); int32_t tr_y = lv_obj_get_style_translate_y(item, LV_PART_MAIN); diff --git a/src/layouts/flex/lv_flex.h b/src/layouts/flex/lv_flex.h index d7fc5b030..0e804c463 100644 --- a/src/layouts/flex/lv_flex.h +++ b/src/layouts/flex/lv_flex.h @@ -95,7 +95,6 @@ void lv_obj_set_flex_grow(struct _lv_obj_t * obj, uint8_t grow); * MACROS **********************/ - #endif /*LV_USE_FLEX*/ #ifdef __cplusplus diff --git a/src/layouts/grid/lv_grid.c b/src/layouts/grid/lv_grid.c index 06613dfe1..c66bda9ca 100644 --- a/src/layouts/grid/lv_grid.c +++ b/src/layouts/grid/lv_grid.c @@ -136,7 +136,6 @@ static inline int32_t get_margin_ver(lv_obj_t * obj) * GLOBAL FUNCTIONS **********************/ - void lv_grid_init(void) { layout_list_def[LV_LAYOUT_GRID].cb = grid_update; @@ -355,7 +354,6 @@ static void calc_cols(lv_obj_t * cont, _lv_grid_calc_t * c) c->w[last_fr_i] = free_w - ((free_w * (col_fr_cnt - last_fr_x)) / col_fr_cnt); } - if(subgrid) { lv_free((void *)col_templ); } @@ -427,7 +425,6 @@ static void calc_rows(lv_obj_t * cont, _lv_grid_calc_t * c) } } - int32_t row_gap = lv_obj_get_style_pad_row(cont, LV_PART_MAIN); int32_t cont_h = lv_obj_get_content_height(cont) - row_gap * (c->row_num - 1); int32_t free_h = cont_h - grid_h; @@ -474,7 +471,6 @@ static void item_repos(lv_obj_t * item, _lv_grid_calc_t * c, item_repos_hint_t * lv_grid_align_t col_align = get_cell_col_align(item); lv_grid_align_t row_align = get_cell_row_align(item); - int32_t col_x1 = c->x[col_pos]; int32_t col_x2 = c->x[col_pos + col_span - 1] + c->w[col_pos + col_span - 1]; int32_t col_w = col_x2 - col_x1; @@ -483,7 +479,6 @@ static void item_repos(lv_obj_t * item, _lv_grid_calc_t * c, item_repos_hint_t * int32_t row_y2 = c->y[row_pos + row_span - 1] + c->h[row_pos + row_span - 1]; int32_t row_h = row_y2 - row_y1; - /*If the item has RTL base dir switch start and end*/ if(lv_obj_get_style_base_dir(item, LV_PART_MAIN) == LV_BASE_DIR_RTL) { if(col_align == LV_GRID_ALIGN_START) col_align = LV_GRID_ALIGN_END; @@ -665,5 +660,4 @@ static uint32_t count_tracks(const int32_t * templ) return i; } - #endif /*LV_USE_GRID*/ diff --git a/src/layouts/lv_layout.h b/src/layouts/lv_layout.h index 8fc31109d..0266d4386 100644 --- a/src/layouts/lv_layout.h +++ b/src/layouts/lv_layout.h @@ -15,7 +15,6 @@ extern "C" { *********************/ #include "../lv_conf_internal.h" - /********************* * DEFINES *********************/ @@ -32,7 +31,6 @@ typedef struct { void * user_data; } lv_layout_dsc_t; - typedef enum { LV_LAYOUT_NONE = 0, @@ -63,7 +61,6 @@ void _lv_layout_deinit(void); */ uint32_t lv_layout_register(lv_layout_update_cb_t cb, void * user_data); - /** * Update the layout of a widget * @param obj pointer to a widget @@ -82,7 +79,6 @@ void _lv_layout_apply(struct _lv_obj_t * obj); #include "grid/lv_grid.h" #endif /* LV_USE_GRID */ - #ifdef __cplusplus } /*extern "C"*/ #endif diff --git a/src/libs/bmp/lv_bmp.c b/src/libs/bmp/lv_bmp.c index 0781871e4..fd03cadc3 100644 --- a/src/libs/bmp/lv_bmp.c +++ b/src/libs/bmp/lv_bmp.c @@ -134,7 +134,6 @@ static lv_result_t decoder_info(lv_image_decoder_t * decoder, const void * src, return LV_RESULT_INVALID; /*If didn't succeeded earlier then it's an error*/ } - /** * Open a PNG image and return the decided image * @param src can be file name or pointer to a C array @@ -189,7 +188,6 @@ static lv_result_t decoder_open(lv_image_decoder_t * decoder, lv_image_decoder_d return LV_RESULT_INVALID; /*If not returned earlier then it failed*/ } - static lv_result_t decoder_get_area(lv_image_decoder_t * decoder, lv_image_decoder_dsc_t * dsc, const lv_area_t * full_area, lv_area_t * decoded_area) { @@ -207,7 +205,6 @@ static lv_result_t decoder_get_area(lv_image_decoder_t * decoder, lv_image_decod decoded_area->y2++; } - if(decoded_area->y1 > full_area->y2) { return LV_RESULT_INVALID; } @@ -222,7 +219,6 @@ static lv_result_t decoder_get_area(lv_image_decoder_t * decoder, lv_image_decod } } - /** * Free the allocated resources */ diff --git a/src/libs/ffmpeg/lv_ffmpeg.c b/src/libs/ffmpeg/lv_ffmpeg.c index 163848e7c..b12ec93f0 100644 --- a/src/libs/ffmpeg/lv_ffmpeg.c +++ b/src/libs/ffmpeg/lv_ffmpeg.c @@ -171,7 +171,6 @@ lv_result_t lv_ffmpeg_player_set_src(lv_obj_t * obj, const char * path) data_size = width * height * 4; - player->imgdsc.header.always_zero = 0; player->imgdsc.header.w = width; player->imgdsc.header.h = height; diff --git a/src/libs/freetype/ftoption.h b/src/libs/freetype/ftoption.h index 694e26e80..141278b01 100644 --- a/src/libs/freetype/ftoption.h +++ b/src/libs/freetype/ftoption.h @@ -15,14 +15,11 @@ * */ - #ifndef FTOPTION_H_ #define FTOPTION_H_ - #include - FT_BEGIN_HEADER /************************************************************************** @@ -67,7 +64,6 @@ FT_BEGIN_HEADER * */ - /*************************************************************************/ /*************************************************************************/ /**** ****/ @@ -76,7 +72,6 @@ FT_BEGIN_HEADER /*************************************************************************/ /*************************************************************************/ - /*#************************************************************************ * * If you enable this configuration option, FreeType recognizes an @@ -111,7 +106,6 @@ FT_BEGIN_HEADER */ #define FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES - /************************************************************************** * * Uncomment the line below if you want to activate LCD rendering @@ -125,7 +119,6 @@ FT_BEGIN_HEADER */ /* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ - /************************************************************************** * * Many compilers provide a non-ANSI 64-bit data type that can be used by @@ -145,7 +138,6 @@ FT_BEGIN_HEADER */ #undef FT_CONFIG_OPTION_FORCE_INT64 - /************************************************************************** * * If this macro is defined, do not try to use an assembler version of @@ -155,7 +147,6 @@ FT_BEGIN_HEADER */ /* #define FT_CONFIG_OPTION_NO_ASSEMBLER */ - /************************************************************************** * * If this macro is defined, try to use an inlined assembler version of the @@ -167,7 +158,6 @@ FT_BEGIN_HEADER */ #define FT_CONFIG_OPTION_INLINE_MULFIX - /************************************************************************** * * LZW-compressed file support. @@ -182,7 +172,6 @@ FT_BEGIN_HEADER */ #define FT_CONFIG_OPTION_USE_LZW - /************************************************************************** * * Gzip-compressed file support. @@ -197,7 +186,6 @@ FT_BEGIN_HEADER */ #define FT_CONFIG_OPTION_USE_ZLIB - /************************************************************************** * * ZLib library selection @@ -226,7 +214,6 @@ FT_BEGIN_HEADER */ /* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */ - /************************************************************************** * * Bzip2-compressed file support. @@ -246,7 +233,6 @@ FT_BEGIN_HEADER */ /* #define FT_CONFIG_OPTION_USE_BZIP2 */ - /************************************************************************** * * Define to disable the use of file stream functions and types, `FILE`, @@ -257,7 +243,6 @@ FT_BEGIN_HEADER */ /* #define FT_CONFIG_OPTION_DISABLE_STREAM_SUPPORT */ - /************************************************************************** * * PNG bitmap support. @@ -275,7 +260,6 @@ FT_BEGIN_HEADER */ /* #define FT_CONFIG_OPTION_USE_PNG */ - /************************************************************************** * * HarfBuzz support. @@ -292,7 +276,6 @@ FT_BEGIN_HEADER */ /* #define FT_CONFIG_OPTION_USE_HARFBUZZ */ - /************************************************************************** * * Brotli support. @@ -308,7 +291,6 @@ FT_BEGIN_HEADER */ /* #define FT_CONFIG_OPTION_USE_BROTLI */ - /************************************************************************** * * Glyph Postscript Names handling @@ -333,7 +315,6 @@ FT_BEGIN_HEADER */ #define FT_CONFIG_OPTION_POSTSCRIPT_NAMES - /************************************************************************** * * Postscript Names to Unicode Values support @@ -350,7 +331,6 @@ FT_BEGIN_HEADER */ #define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST - /************************************************************************** * * Support for Mac fonts @@ -363,7 +343,6 @@ FT_BEGIN_HEADER */ /* #define FT_CONFIG_OPTION_MAC_FONTS */ - /************************************************************************** * * Guessing methods to access embedded resource forks @@ -384,7 +363,6 @@ FT_BEGIN_HEADER #define FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK #endif - /************************************************************************** * * Allow the use of `FT_Incremental_Interface` to load typefaces that @@ -395,7 +373,6 @@ FT_BEGIN_HEADER */ #define FT_CONFIG_OPTION_INCREMENTAL - /************************************************************************** * * The size in bytes of the render pool used by the scan-line converter to @@ -403,7 +380,6 @@ FT_BEGIN_HEADER */ #define FT_RENDER_POOL_SIZE 16384L - /************************************************************************** * * FT_MAX_MODULES @@ -413,7 +389,6 @@ FT_BEGIN_HEADER */ #define FT_MAX_MODULES 32 - /************************************************************************** * * Debug level @@ -433,7 +408,6 @@ FT_BEGIN_HEADER /* #define FT_DEBUG_LEVEL_ERROR */ /* #define FT_DEBUG_LEVEL_TRACE */ - /************************************************************************** * * Logging @@ -450,7 +424,6 @@ FT_BEGIN_HEADER */ /* #define FT_DEBUG_LOGGING */ - /************************************************************************** * * Autofitter debugging @@ -491,7 +464,6 @@ FT_BEGIN_HEADER */ /* #define FT_DEBUG_AUTOFIT */ - /************************************************************************** * * Memory Debugging @@ -509,7 +481,6 @@ FT_BEGIN_HEADER */ /* #define FT_DEBUG_MEMORY */ - /************************************************************************** * * Module errors @@ -526,7 +497,6 @@ FT_BEGIN_HEADER */ #undef FT_CONFIG_OPTION_USE_MODULE_ERRORS - /************************************************************************** * * OpenType SVG Glyph Support @@ -540,7 +510,6 @@ FT_BEGIN_HEADER */ #define FT_CONFIG_OPTION_SVG - /************************************************************************** * * Error Strings @@ -553,7 +522,6 @@ FT_BEGIN_HEADER */ #define FT_CONFIG_OPTION_ERROR_STRINGS - /*************************************************************************/ /*************************************************************************/ /**** ****/ @@ -562,7 +530,6 @@ FT_BEGIN_HEADER /*************************************************************************/ /*************************************************************************/ - /************************************************************************** * * Define `TT_CONFIG_OPTION_EMBEDDED_BITMAPS` if you want to support @@ -571,7 +538,6 @@ FT_BEGIN_HEADER */ #define TT_CONFIG_OPTION_EMBEDDED_BITMAPS - /************************************************************************** * * Define `TT_CONFIG_OPTION_COLOR_LAYERS` if you want to support colored @@ -580,7 +546,6 @@ FT_BEGIN_HEADER */ #define TT_CONFIG_OPTION_COLOR_LAYERS - /************************************************************************** * * Define `TT_CONFIG_OPTION_POSTSCRIPT_NAMES` if you want to be able to @@ -595,7 +560,6 @@ FT_BEGIN_HEADER */ #define TT_CONFIG_OPTION_POSTSCRIPT_NAMES - /************************************************************************** * * Define `TT_CONFIG_OPTION_SFNT_NAMES` if your applications need to access @@ -609,7 +573,6 @@ FT_BEGIN_HEADER */ #define TT_CONFIG_OPTION_SFNT_NAMES - /************************************************************************** * * TrueType CMap support @@ -627,7 +590,6 @@ FT_BEGIN_HEADER #define TT_CONFIG_CMAP_FORMAT_13 #define TT_CONFIG_CMAP_FORMAT_14 - /*************************************************************************/ /*************************************************************************/ /**** ****/ @@ -649,7 +611,6 @@ FT_BEGIN_HEADER */ #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER - /************************************************************************** * * Define `TT_CONFIG_OPTION_SUBPIXEL_HINTING` if you want to compile @@ -709,7 +670,6 @@ FT_BEGIN_HEADER #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */ - /************************************************************************** * * Define `TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED` to compile the @@ -728,7 +688,6 @@ FT_BEGIN_HEADER */ #undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED - /************************************************************************** * * Define `TT_CONFIG_OPTION_GX_VAR_SUPPORT` if you want to include support @@ -738,7 +697,6 @@ FT_BEGIN_HEADER */ #define TT_CONFIG_OPTION_GX_VAR_SUPPORT - /************************************************************************** * * Define `TT_CONFIG_OPTION_BDF` if you want to include support for an @@ -746,7 +704,6 @@ FT_BEGIN_HEADER */ #define TT_CONFIG_OPTION_BDF - /************************************************************************** * * Option `TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES` controls the maximum @@ -764,7 +721,6 @@ FT_BEGIN_HEADER #define TT_CONFIG_OPTION_MAX_RUNNABLE_OPCODES 1000000L #endif - /*************************************************************************/ /*************************************************************************/ /**** ****/ @@ -773,7 +729,6 @@ FT_BEGIN_HEADER /*************************************************************************/ /*************************************************************************/ - /************************************************************************** * * `T1_MAX_DICT_DEPTH` is the maximum depth of nest dictionaries and arrays @@ -781,7 +736,6 @@ FT_BEGIN_HEADER */ #define T1_MAX_DICT_DEPTH 5 - /************************************************************************** * * `T1_MAX_SUBRS_CALLS` details the maximum number of nested sub-routine @@ -789,7 +743,6 @@ FT_BEGIN_HEADER */ #define T1_MAX_SUBRS_CALLS 16 - /************************************************************************** * * `T1_MAX_CHARSTRING_OPERANDS` is the charstring stack's capacity. A @@ -800,7 +753,6 @@ FT_BEGIN_HEADER */ #define T1_MAX_CHARSTRINGS_OPERANDS 256 - /************************************************************************** * * Define this configuration macro if you want to prevent the compilation @@ -810,7 +762,6 @@ FT_BEGIN_HEADER */ #undef T1_CONFIG_OPTION_NO_AFM - /************************************************************************** * * Define this configuration macro if you want to prevent the compilation @@ -818,7 +769,6 @@ FT_BEGIN_HEADER */ #undef T1_CONFIG_OPTION_NO_MM_SUPPORT - /************************************************************************** * * `T1_CONFIG_OPTION_OLD_ENGINE` controls whether the pre-Adobe Type~1 @@ -828,7 +778,6 @@ FT_BEGIN_HEADER */ /* #define T1_CONFIG_OPTION_OLD_ENGINE */ - /*************************************************************************/ /*************************************************************************/ /**** ****/ @@ -837,7 +786,6 @@ FT_BEGIN_HEADER /*************************************************************************/ /*************************************************************************/ - /************************************************************************** * * Using `CFF_CONFIG_OPTION_DARKENING_PARAMETER_{X,Y}{1,2,3,4}` it is @@ -860,7 +808,6 @@ FT_BEGIN_HEADER #define CFF_CONFIG_OPTION_DARKENING_PARAMETER_X4 2333 #define CFF_CONFIG_OPTION_DARKENING_PARAMETER_Y4 0 - /************************************************************************** * * `CFF_CONFIG_OPTION_OLD_ENGINE` controls whether the pre-Adobe CFF engine @@ -870,7 +817,6 @@ FT_BEGIN_HEADER */ /* #define CFF_CONFIG_OPTION_OLD_ENGINE */ - /*************************************************************************/ /*************************************************************************/ /**** ****/ @@ -879,7 +825,6 @@ FT_BEGIN_HEADER /*************************************************************************/ /*************************************************************************/ - /************************************************************************** * * There are many PCF fonts just called 'Fixed' which look completely @@ -897,7 +842,6 @@ FT_BEGIN_HEADER */ /* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ - /*************************************************************************/ /*************************************************************************/ /**** ****/ @@ -906,7 +850,6 @@ FT_BEGIN_HEADER /*************************************************************************/ /*************************************************************************/ - /************************************************************************** * * Compile 'autofit' module with CJK (Chinese, Japanese, Korean) script @@ -914,7 +857,6 @@ FT_BEGIN_HEADER */ #define AF_CONFIG_OPTION_CJK - /************************************************************************** * * Compile 'autofit' module with fallback Indic script support, covering @@ -925,7 +867,6 @@ FT_BEGIN_HEADER #define AF_CONFIG_OPTION_INDIC #endif - /************************************************************************** * * Use TrueType-like size metrics for 'light' auto-hinting. @@ -950,14 +891,12 @@ FT_BEGIN_HEADER /* */ - /* * This macro is obsolete. Support has been removed in FreeType version * 2.5. */ /* #define FT_CONFIG_OPTION_OLD_INTERNALS */ - /* * The next three macros are defined if native TrueType hinting is * requested by the definitions above. Don't change this. @@ -976,7 +915,6 @@ FT_BEGIN_HEADER #endif #endif - /* * The TT_SUPPORT_COLRV1 macro is defined to indicate to clients that this * version of FreeType has support for 'COLR' v1 API. This definition is @@ -991,7 +929,6 @@ FT_BEGIN_HEADER #define TT_SUPPORT_COLRV1 #endif - /* * Check CFF darkening parameters. The checks are the same as in function * `cff_property_set` in file `cffdrivr.c`. @@ -1020,10 +957,8 @@ FT_BEGIN_HEADER #error "Invalid CFF darkening parameters!" #endif - FT_END_HEADER #endif /* FTOPTION_H_ */ - /* END */ diff --git a/src/libs/freetype/lv_ftsystem.c b/src/libs/freetype/lv_ftsystem.c index 18248ae74..ee0e836b6 100644 --- a/src/libs/freetype/lv_ftsystem.c +++ b/src/libs/freetype/lv_ftsystem.c @@ -155,7 +155,6 @@ FT_New_Memory(void) { FT_Memory memory; - memory = (FT_Memory)lv_malloc(sizeof(*memory)); if(memory) { memory->user = NULL; diff --git a/src/libs/fsdrv/lv_fs_memfs.c b/src/libs/fsdrv/lv_fs_memfs.c index e9bf6716e..eddf0ab4b 100644 --- a/src/libs/fsdrv/lv_fs_memfs.c +++ b/src/libs/fsdrv/lv_fs_memfs.c @@ -37,7 +37,6 @@ * */ - /********************* * INCLUDES *********************/ @@ -207,7 +206,6 @@ static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p) return LV_FS_RES_OK; } - #else /*LV_USE_FS_MEMFS == 0*/ #if defined(LV_FS_MEMFS_LETTER) && LV_FS_MEMFS_LETTER != '\0' @@ -215,4 +213,3 @@ static lv_fs_res_t fs_tell(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p) #endif #endif /*LV_USE_FS_MEMFS*/ - diff --git a/src/libs/fsdrv/lv_fs_posix.c b/src/libs/fsdrv/lv_fs_posix.c index 85858eac0..67f7c96b1 100644 --- a/src/libs/fsdrv/lv_fs_posix.c +++ b/src/libs/fsdrv/lv_fs_posix.c @@ -3,7 +3,6 @@ * */ - /********************* * INCLUDES *********************/ diff --git a/src/libs/fsdrv/lv_fs_stdio.c b/src/libs/fsdrv/lv_fs_stdio.c index e22658b8f..e23c78052 100644 --- a/src/libs/fsdrv/lv_fs_stdio.c +++ b/src/libs/fsdrv/lv_fs_stdio.c @@ -3,7 +3,6 @@ * */ - /********************* * INCLUDES *********************/ @@ -342,4 +341,3 @@ static lv_fs_res_t fs_dir_close(lv_fs_drv_t * drv, void * dir_p) #endif #endif /*LV_USE_FS_POSIX*/ - diff --git a/src/libs/fsdrv/lv_fs_win32.c b/src/libs/fsdrv/lv_fs_win32.c index 3c0402fa2..03e0d9108 100644 --- a/src/libs/fsdrv/lv_fs_win32.c +++ b/src/libs/fsdrv/lv_fs_win32.c @@ -3,7 +3,6 @@ * */ - /********************* * INCLUDES *********************/ diff --git a/src/libs/gif/lv_gif.c b/src/libs/gif/lv_gif.c index ac4192edc..80735a314 100644 --- a/src/libs/gif/lv_gif.c +++ b/src/libs/gif/lv_gif.c @@ -20,7 +20,6 @@ * TYPEDEFS **********************/ - /********************** * STATIC PROTOTYPES **********************/ diff --git a/src/libs/libpng/lv_libpng.c b/src/libs/libpng/lv_libpng.c index e1faa56d3..8b0038c0a 100644 --- a/src/libs/libpng/lv_libpng.c +++ b/src/libs/libpng/lv_libpng.c @@ -114,7 +114,6 @@ static lv_result_t decoder_info(lv_image_decoder_t * decoder, const void * src, return LV_RESULT_INVALID; /*If didn't succeeded earlier then it's an error*/ } - /** * Open a PNG image and return the decided image * @param src can be file name or pointer to a C array diff --git a/src/libs/lodepng/lv_lodepng.c b/src/libs/lodepng/lv_lodepng.c index 0f4c66f79..d6bf2154b 100644 --- a/src/libs/lodepng/lv_lodepng.c +++ b/src/libs/lodepng/lv_lodepng.c @@ -145,7 +145,6 @@ static lv_result_t decoder_info(struct _lv_image_decoder_t * decoder, const void return LV_RESULT_INVALID; /*If didn't succeeded earlier then it's an error*/ } - /** * Open a PNG image and decode it into dsc.img_data * @param decoder pointer to the decoder where this function belongs @@ -230,7 +229,6 @@ static void decoder_close(lv_image_decoder_t * decoder, lv_image_decoder_dsc_t * lv_cache_unlock(); } - static lv_result_t try_cache(lv_image_decoder_dsc_t * dsc) { lv_cache_lock(); @@ -282,7 +280,6 @@ static const void * decode_png_data(const void * png_data, size_t png_data_size) return img_data; } - /** * If the display is not in 32 bit format (ARGB888) then convert the image to the current color depth * @param img the ARGB888 image @@ -300,5 +297,3 @@ static void convert_color_depth(uint8_t * img_p, uint32_t px_cnt) } #endif /*LV_USE_LODEPNG*/ - - diff --git a/src/libs/qrcode/lv_qrcode.c b/src/libs/qrcode/lv_qrcode.c index 4dca87706..ebea012ba 100644 --- a/src/libs/qrcode/lv_qrcode.c +++ b/src/libs/qrcode/lv_qrcode.c @@ -30,7 +30,6 @@ static void lv_qrcode_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj) * STATIC VARIABLES **********************/ - const lv_obj_class_t lv_qrcode_class = { .constructor_cb = lv_qrcode_constructor, .destructor_cb = lv_qrcode_destructor, diff --git a/src/libs/rlottie/lv_rlottie.c b/src/libs/rlottie/lv_rlottie.c index 9e772f7a2..075a1b5f8 100644 --- a/src/libs/rlottie/lv_rlottie.c +++ b/src/libs/rlottie/lv_rlottie.c @@ -154,7 +154,6 @@ static void lv_rlottie_constructor(const lv_obj_class_t * class_p, lv_obj_t * ob lv_obj_update_layout(obj); } - static void lv_rlottie_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj) { LV_UNUSED(class_p); diff --git a/src/libs/tiny_ttf/stb_rect_pack.h b/src/libs/tiny_ttf/stb_rect_pack.h index 413e5047d..b265df907 100644 --- a/src/libs/tiny_ttf/stb_rect_pack.h +++ b/src/libs/tiny_ttf/stb_rect_pack.h @@ -97,7 +97,6 @@ typedef int stbrp_coord; #pragma GCC diagnostic ignored "-Wunused-function" #endif - STBRP_DEF int stbrp_pack_rects(stbrp_context * context, stbrp_rect * rects, int num_rects); // Assign packed locations to rectangles. The rectangles are of type // 'stbrp_rect' defined below, stored in the array 'rects', and there @@ -136,7 +135,6 @@ struct stbrp_rect { }; // 16 bytes, nominally - STBRP_DEF void stbrp_init_target(stbrp_context * context, int width, int height, stbrp_node * nodes, int num_nodes); // Initialize a rectangle packer to: // pack a rectangle that is 'width' by 'height' in dimensions @@ -163,7 +161,6 @@ STBRP_DEF void stbrp_setup_allow_out_of_mem(stbrp_context * context, int allow_o // change the handling of the out-of-temp-memory scenario, described above. // If you call init again, this will be reset to the default (false). - STBRP_DEF void stbrp_setup_heuristic(stbrp_context * context, int heuristic); // Optionally select which packing heuristic the library should use. Different // heuristics will produce better/worse results for different data sets. @@ -175,7 +172,6 @@ enum { STBRP_HEURISTIC_Skyline_BF_sortHeight }; - ////////////////////////////////////////////////////////////////////////////// // // the details of the following structures don't matter to you, but they must diff --git a/src/libs/tiny_ttf/stb_truetype_htcw.h b/src/libs/tiny_ttf/stb_truetype_htcw.h index d0e839d9d..e91997b4b 100644 --- a/src/libs/tiny_ttf/stb_truetype_htcw.h +++ b/src/libs/tiny_ttf/stb_truetype_htcw.h @@ -418,7 +418,6 @@ int main(int arg, char ** argv) } #endif - ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// //// @@ -590,7 +589,6 @@ STBTT_DEF void stbtt_GetBakedQuad(const stbtt_bakedchar * chardata, int pw, int // // It's inefficient; you might want to c&p it and optimize it. - ////////////////////////////////////////////////////////////////////////////// // // NEW TEXTURE BAKING API @@ -769,7 +767,6 @@ STBTT_DEF int stbtt_InitFont(stbtt_fontinfo * info, const unsigned char * data, // need to do anything special to free it, because the contents are pure // value data with no additional data structures. Returns 0 on failure. - ////////////////////////////////////////////////////////////////////////////// // // CHARACTER TO GLYPH-INDEX CONVERSIOn @@ -781,7 +778,6 @@ STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo * info, int unicode_code // codepoint-based functions. // Returns 0 if the character codepoint is not defined in the font. - ////////////////////////////////////////////////////////////////////////////// // // CHARACTER PROPERTIES @@ -968,7 +964,6 @@ STBTT_DEF void stbtt_GetGlyphBitmapBox(const stbtt_fontinfo * font, int glyph, f STBTT_DEF void stbtt_GetGlyphBitmapBoxSubpixel(const stbtt_fontinfo * font, int glyph, float scale_x, float scale_y, float shift_x, float shift_y, int * ix0, int * iy0, int * ix1, int * iy1); - // @TODO: don't expose this structure typedef struct { int w, h, stride; @@ -1044,8 +1039,6 @@ STBTT_DEF unsigned char * stbtt_GetCodepointSDF(const stbtt_fontinfo * info, flo // The algorithm has not been optimized at all, so expect it to be slow // if computing lots of characters or very large sizes. - - ////////////////////////////////////////////////////////////////////////////// // // Finding the right font... @@ -1374,7 +1367,6 @@ static stbtt__buf stbtt__cff_index_get(stbtt__buf b, int i) // on platforms that don't allow misaligned reads, if we want to allow // truetype fonts that aren't padded to alignment, define ALLOW_UNALIGNED_TRUETYPE - #ifdef STBTT_STREAM_TYPE static stbtt_uint8 ttBYTE(STBTT_STREAM_TYPE s, stbtt_uint32 offset) { @@ -3075,7 +3067,6 @@ typedef struct stbtt__edge { int invert; } stbtt__edge; - typedef struct stbtt__active_edge { struct stbtt__active_edge * next; #if STBTT_RASTERIZER_VERSION==1 @@ -4637,7 +4628,6 @@ STBTT_DEF int stbtt_PackFontRanges(stbtt_pack_context * spc, const unsigned char stbtt_pack_range * ranges, int num_ranges); #endif - STBTT_DEF void stbtt_PackFontRangesPackRects(stbtt_pack_context * spc, stbrp_rect * rects, int num_rects) { stbrp_pack_rects((stbrp_context *)spc->pack_info, rects, num_rects); @@ -4711,7 +4701,6 @@ STBTT_DEF int stbtt_PackFontRange(stbtt_pack_context * spc, const unsigned char return stbtt_PackFontRanges(spc, fontdata, font_index, &range, 1); } - #ifdef STBTT_STREAM_TYPE STBTT_DEF void stbtt_GetScaledFontVMetrics(STBTT_STREAM_TYPE fontdata, int index, float size, float * ascent, float * descent, float * lineGap); @@ -4720,7 +4709,6 @@ STBTT_DEF void stbtt_GetScaledFontVMetrics(const unsigned char * fontdata, int i float * descent, float * lineGap); #endif - #ifdef STBTT_STREAM_TYPE STBTT_DEF void stbtt_GetScaledFontVMetrics(STBTT_STREAM_TYPE fontdata, int index, float size, float * ascent, float * descent, float * lineGap) @@ -5372,7 +5360,6 @@ static int stbtt__matchpair(stbtt_uint8 * fc, stbtt_uint32 nm, stbtt_uint8 * nam #pragma GCC diagnostic ignored "-Wcast-qual" #endif - #ifdef STBTT_STREAM_TYPE STBTT_DEF int stbtt_BakeFontBitmap(STBTT_STREAM_TYPE data, int offset, float pixel_height, unsigned char * pixels, int pw, int ph, @@ -5465,7 +5452,6 @@ STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char * s1, int len1, cons #endif // STB_TRUETYPE_IMPLEMENTATION - // FULL VERSION HISTORY // // 1.25 (2021-07-11) many fixes diff --git a/src/lv_api_map.h b/src/lv_api_map.h index 5d577a33a..b594655a1 100644 --- a/src/lv_api_map.h +++ b/src/lv_api_map.h @@ -88,7 +88,6 @@ static inline void lv_obj_move_background(lv_obj_t * obj) lv_obj_move_to_index(obj, 0); } - /********************** * MACROS **********************/ diff --git a/src/lv_init.h b/src/lv_init.h index 8ac69702c..e5b551f05 100644 --- a/src/lv_init.h +++ b/src/lv_init.h @@ -34,7 +34,6 @@ extern "C" { */ void lv_init(void); - /** * Deinit the 'lv' library */ @@ -45,7 +44,6 @@ void lv_deinit(void); */ bool lv_is_initialized(void); - /********************** * MACROS **********************/ diff --git a/src/misc/lv_anim.c b/src/misc/lv_anim.c index 0d11a2975..3935714d5 100644 --- a/src/misc/lv_anim.c +++ b/src/misc/lv_anim.c @@ -50,7 +50,6 @@ static int32_t lv_anim_path_cubic_bezier(const lv_anim_t * a, int32_t x1, #define LV_TRACE_ANIM(...) #endif - /********************** * GLOBAL FUNCTIONS **********************/ @@ -327,7 +326,6 @@ static void anim_timer(lv_timer_t * param) { LV_UNUSED(param); - /*Flip the run round*/ state.anim_run_round = state.anim_run_round ? false : true; diff --git a/src/misc/lv_anim.h b/src/misc/lv_anim.h index ee92e4d04..b0ab12df9 100644 --- a/src/misc/lv_anim.h +++ b/src/misc/lv_anim.h @@ -388,7 +388,6 @@ static inline void lv_anim_set_bezier3_param(lv_anim_t * a, int16_t x1, int16_t para->y2 = y2; } - /** * Create an animation * @param a an initialized 'anim_t' variable. Not required after call. diff --git a/src/misc/lv_anim_timeline.c b/src/misc/lv_anim_timeline.c index 7277ebae3..382bfc1fa 100644 --- a/src/misc/lv_anim_timeline.c +++ b/src/misc/lv_anim_timeline.c @@ -19,8 +19,6 @@ * TYPEDEFS **********************/ - - /********************** * STATIC PROTOTYPES **********************/ diff --git a/src/misc/lv_area.c b/src/misc/lv_area.c index c5b8b2a3d..2f182b810 100644 --- a/src/misc/lv_area.c +++ b/src/misc/lv_area.c @@ -589,7 +589,6 @@ void lv_point_transform(lv_point_t * p, int32_t angle, int32_t scale_x, int32_t } } - /********************** * STATIC FUNCTIONS **********************/ diff --git a/src/misc/lv_area.h b/src/misc/lv_area.h index e9a73d6b6..ba83c0b2e 100644 --- a/src/misc/lv_area.h +++ b/src/misc/lv_area.h @@ -21,7 +21,6 @@ extern "C" { * DEFINES *********************/ - /********************** * TYPEDEFS **********************/ @@ -81,7 +80,6 @@ typedef _lv_align_t lv_align_t; typedef uint8_t lv_align_t; #endif /*DOXYGEN*/ - enum _lv_dir_t { LV_DIR_NONE = 0x00, LV_DIR_LEFT = (1 << 0), @@ -237,7 +235,6 @@ bool _lv_area_is_on(const lv_area_t * a1_p, const lv_area_t * a2_p); */ bool _lv_area_is_in(const lv_area_t * ain_p, const lv_area_t * aholder_p, int32_t radius); - /** * Check if an area is fully out of an other * @param aout_p pointer to an area which could be in 'aholder_p' diff --git a/src/misc/lv_bidi.h b/src/misc/lv_bidi.h index 6ffa3c355..e5b19c295 100644 --- a/src/misc/lv_bidi.h +++ b/src/misc/lv_bidi.h @@ -45,7 +45,6 @@ typedef _lv_base_dir_t lv_base_dir_t; typedef uint8_t lv_base_dir_t; #endif /*DOXYGEN*/ - /********************** * GLOBAL PROTOTYPES **********************/ @@ -118,7 +117,6 @@ void _lv_bidi_process_paragraph(const char * str_in, char * str_out, uint32_t le */ void lv_bidi_calculate_align(lv_text_align_t * align, lv_base_dir_t * base_dir, const char * txt); - /********************** * MACROS **********************/ diff --git a/src/misc/lv_cache.h b/src/misc/lv_cache.h index 9c267afb3..5a60ea900 100644 --- a/src/misc/lv_cache.h +++ b/src/misc/lv_cache.h @@ -75,7 +75,6 @@ typedef struct _lv_cache_entry_t { void * user_data; } lv_cache_entry_t; - /** * Add a new entry to the cache with the given size. * It won't allocate any buffers just free enough space to be a new entry diff --git a/src/misc/lv_color.c b/src/misc/lv_color.c index 85fc5f55e..8f88686bd 100644 --- a/src/misc/lv_color.c +++ b/src/misc/lv_color.c @@ -245,7 +245,6 @@ lv_color_hsv_t lv_color_to_hsv(lv_color_t c) return lv_color_rgb_to_hsv(c.red, c.green, c.blue); } - /********************** * STATIC FUNCTIONS **********************/ @@ -269,4 +268,3 @@ static lv_color_t lv_color_filter_shade_cb(const lv_color_filter_dsc_t * dsc, lv if(opa < LV_OPA_50) return lv_color_lighten(c, (LV_OPA_50 - opa) * 2); else return lv_color_darken(c, (opa - LV_OPA_50 * LV_OPA_50) * 2); } - diff --git a/src/misc/lv_color.h b/src/misc/lv_color.h index 1332ec957..9e48a5552 100644 --- a/src/misc/lv_color.h +++ b/src/misc/lv_color.h @@ -61,7 +61,6 @@ typedef _lv_opa_t lv_opa_t; typedef uint8_t lv_opa_t; #endif /*DOXYGEN*/ - #define LV_OPA_MIN 2 /*Opacities below this will be transparent*/ #define LV_OPA_MAX 253 /*Opacities above this will fully cover*/ @@ -187,7 +186,6 @@ static inline uint8_t lv_color_format_get_size(lv_color_format_t cf) */ bool lv_color_format_has_alpha(lv_color_format_t src_cf); - lv_color32_t lv_color_to_32(lv_color_t color, lv_opa_t opa); static inline uint32_t lv_color_to_int(lv_color_t c) @@ -196,7 +194,6 @@ static inline uint32_t lv_color_to_int(lv_color_t c) return tmp[0] + (tmp[1] << 8) + (tmp[2] << 16); } - static inline lv_color_t lv_color_from_int(uint32_t v) { void * p = (void *)&v; @@ -227,7 +224,6 @@ static inline lv_color_t lv_color_make(uint8_t r, uint8_t g, uint8_t b) return lv_color_hex((r << 16) + (g << 8) + b); } - static inline lv_color_t lv_color_hex3(uint32_t c) { return lv_color_make((uint8_t)(((c >> 4) & 0xF0) | ((c >> 8) & 0xF)), (uint8_t)((c & 0xF0) | ((c & 0xF0) >> 4)), @@ -296,7 +292,6 @@ static inline lv_color_t lv_color_black(void) return lv_color_make(0x00, 0x00, 0x00); } - /********************** * MACROS **********************/ diff --git a/src/misc/lv_color_op.h b/src/misc/lv_color_op.h index 706943db2..efcde364f 100644 --- a/src/misc/lv_color_op.h +++ b/src/misc/lv_color_op.h @@ -56,7 +56,6 @@ LV_ATTRIBUTE_FAST_MEM static inline lv_color_t lv_color_mix(lv_color_t c1, lv_co return ret; } - /** * * @param fg @@ -80,7 +79,6 @@ static inline lv_color32_t lv_color_mix32(lv_color32_t fg, lv_color32_t bg) return bg; } - //! @endcond /** diff --git a/src/misc/lv_event.c b/src/misc/lv_event.c index ff372b7ab..8164b7a13 100644 --- a/src/misc/lv_event.c +++ b/src/misc/lv_event.c @@ -96,14 +96,12 @@ void lv_event_add(lv_event_list_t * list, lv_event_cb_t cb, lv_event_code_t filt list->dsc[list->cnt - 1].user_data = user_data; } - uint32_t lv_event_get_count(lv_event_list_t * list) { LV_ASSERT_NULL(list); return list->cnt; } - lv_event_dsc_t * lv_event_get_dsc(lv_event_list_t * list, uint32_t index) { LV_ASSERT_NULL(list); @@ -204,4 +202,3 @@ void _lv_event_mark_deleted(void * target) /********************** * STATIC FUNCTIONS **********************/ - diff --git a/src/misc/lv_event.h b/src/misc/lv_event.h index 0902ec30b..51078677d 100644 --- a/src/misc/lv_event.h +++ b/src/misc/lv_event.h @@ -29,14 +29,12 @@ struct _lv_event_t; typedef void (*lv_event_cb_t)(struct _lv_event_t * e); - typedef struct { lv_event_cb_t cb; void * user_data; uint32_t filter; } lv_event_dsc_t; - /** * Type of event being sent to the object. */ @@ -109,12 +107,10 @@ typedef enum { _LV_EVENT_LAST, /** Number of default events*/ - LV_EVENT_PREPROCESS = 0x80, /** This is a flag that can be set with an event so it's processed before the class default event processing */ } lv_event_code_t; - typedef struct { lv_event_dsc_t * dsc; uint32_t cnt; diff --git a/src/misc/lv_fs.c b/src/misc/lv_fs.c index fc5b553f2..f6bdd3700 100644 --- a/src/misc/lv_fs.c +++ b/src/misc/lv_fs.c @@ -229,8 +229,6 @@ static lv_fs_res_t lv_fs_read_cached(lv_fs_file_t * file_p, char * buf, uint32_t buffer = file_p->cache->buffer; } - - uint32_t bytes_read_to_buffer = 0; res = file_p->drv->read_cb(file_p->drv, file_p->file_d, (void *)buffer, buffer_size, &bytes_read_to_buffer); file_p->cache->start = file_position; diff --git a/src/misc/lv_fs.h b/src/misc/lv_fs.h index fe18dd4eb..09e7270a2 100644 --- a/src/misc/lv_fs.h +++ b/src/misc/lv_fs.h @@ -55,7 +55,6 @@ typedef _lv_fs_res_t lv_fs_res_t; typedef uint8_t lv_fs_res_t; #endif /*DOXYGEN*/ - /** * File open mode. */ @@ -70,7 +69,6 @@ typedef _lv_fs_mode_t lv_fs_mode_t; typedef uint8_t lv_fs_mode_t; #endif /*DOXYGEN*/ - /** * Seek modes. */ diff --git a/src/misc/lv_lru.c b/src/misc/lv_lru.c index 0ef253b58..5f3618cf4 100644 --- a/src/misc/lv_lru.c +++ b/src/misc/lv_lru.c @@ -98,7 +98,6 @@ lv_lru_t * lv_lru_create(size_t cache_size, size_t average_length, lv_lru_free_c return cache; } - void lv_lru_delete(lv_lru_t * cache) { LV_ASSERT_NULL(cache); @@ -134,7 +133,6 @@ void lv_lru_delete(lv_lru_t * cache) lv_free(cache); } - lv_lru_res_t lv_lru_set(lv_lru_t * cache, const void * key, size_t key_length, void * value, size_t value_length) { test_for_missing_cache(); @@ -187,7 +185,6 @@ lv_lru_res_t lv_lru_set(lv_lru_t * cache, const void * key, size_t key_length, v return LV_LRU_OK; } - lv_lru_res_t lv_lru_get(lv_lru_t * cache, const void * key, size_t key_size, void ** value) { test_for_missing_cache(); diff --git a/src/misc/lv_lru.h b/src/misc/lv_lru.h index 3a300774f..9a9a008e9 100644 --- a/src/misc/lv_lru.h +++ b/src/misc/lv_lru.h @@ -21,7 +21,6 @@ extern "C" { #include #include - /********************* * DEFINES *********************/ @@ -62,7 +61,6 @@ typedef struct /// @cond lv_lru_item_t * free_items; } lv_lru_t; - /********************** * GLOBAL PROTOTYPES **********************/ diff --git a/src/misc/lv_profiler_builtin.c b/src/misc/lv_profiler_builtin.c index 46dffc832..11b4fa944 100644 --- a/src/misc/lv_profiler_builtin.c +++ b/src/misc/lv_profiler_builtin.c @@ -19,7 +19,6 @@ #define profiler_ctx LV_GLOBAL_DEFAULT()->profiler_context - #define LV_PROFILER_STR_MAX_LEN 128 #define LV_PROFILER_TICK_PER_SEC_MAX 1000000 diff --git a/src/misc/lv_profiler_builtin.h b/src/misc/lv_profiler_builtin.h index d70d37d93..99cc1ef59 100644 --- a/src/misc/lv_profiler_builtin.h +++ b/src/misc/lv_profiler_builtin.h @@ -45,7 +45,6 @@ typedef struct { void (*flush_cb)(const char * buf); /**< Callback function to flush the profiling data */ } lv_profiler_builtin_config_t; - /** * @brief Structure representing a built-in profiler item in LVGL */ diff --git a/src/misc/lv_style.h b/src/misc/lv_style.h index 6215f6697..12a37d22e 100644 --- a/src/misc/lv_style.h +++ b/src/misc/lv_style.h @@ -108,7 +108,6 @@ typedef _lv_text_decor_t lv_text_decor_t; typedef uint8_t lv_text_decor_t; #endif /*DOXYGEN*/ - /** * Selects on which sides border should be drawn * 'OR'ed values can be used. @@ -129,7 +128,6 @@ typedef _lv_border_side_t lv_border_side_t; typedef uint8_t lv_border_side_t; #endif /*DOXYGEN*/ - /** * The direction of the gradient. */ @@ -145,7 +143,6 @@ typedef _lv_grad_dir_t lv_grad_dir_t; typedef uint8_t lv_grad_dir_t; #endif /*DOXYGEN*/ - /** A gradient stop definition. * This matches a color and a position in a virtual 0-255 scale. */ @@ -195,7 +192,6 @@ enum _lv_style_prop_t { LV_STYLE_RADIUS = 12, - /*Group 1*/ LV_STYLE_PAD_TOP = 16, LV_STYLE_PAD_BOTTOM = 17, @@ -215,7 +211,6 @@ enum _lv_style_prop_t { LV_STYLE_BG_COLOR = 28, LV_STYLE_BG_OPA = 29, - LV_STYLE_BG_GRAD_DIR = 32, LV_STYLE_BG_MAIN_STOP = 33, LV_STYLE_BG_GRAD_STOP = 34, @@ -234,7 +229,6 @@ enum _lv_style_prop_t { LV_STYLE_BG_IMAGE_TILED = 44, LV_STYLE_CLIP_CORNER = 45, - /*Group 3*/ LV_STYLE_BORDER_WIDTH = 48, LV_STYLE_BORDER_COLOR = 49, @@ -326,7 +320,6 @@ enum _lv_style_prop_t { _LV_STYLE_LAST_BUILT_IN_PROP = 128, - _LV_STYLE_NUM_BUILT_IN_PROPS = _LV_STYLE_LAST_BUILT_IN_PROP + 1, LV_STYLE_PROP_ANY = 0xFF, @@ -350,7 +343,6 @@ typedef _lv_style_res_t lv_style_res_t; typedef uint8_t lv_style_res_t; #endif /*DOXYGEN*/ - /** * Descriptor for style transitions */ @@ -389,7 +381,6 @@ typedef struct { * GLOBAL PROTOTYPES **********************/ - /** * Initialize a style * @param style pointer to a style to initialize @@ -554,7 +545,6 @@ static inline uint32_t _lv_style_get_prop_group(lv_style_prop_t prop) */ uint8_t _lv_style_prop_lookup_flags(lv_style_prop_t prop); - #include "lv_style_gen.h" static inline void lv_style_set_size(lv_style_t * style, int32_t width, int32_t height) diff --git a/src/misc/lv_style_gen.c b/src/misc/lv_style_gen.c index 9e70895e4..674d73280 100644 --- a/src/misc/lv_style_gen.c +++ b/src/misc/lv_style_gen.c @@ -6,10 +6,8 @@ ********************************************************************** */ - #include "lv_style.h" - void lv_style_set_width(lv_style_t * style, int32_t value) { lv_style_value_t v = { diff --git a/src/misc/lv_style_gen.h b/src/misc/lv_style_gen.h index 95c12ee8e..be8083b58 100644 --- a/src/misc/lv_style_gen.h +++ b/src/misc/lv_style_gen.h @@ -6,7 +6,6 @@ ********************************************************************** */ - #ifndef LV_STYLE_GEN_H #define LV_STYLE_GEN_H diff --git a/src/misc/lv_text.h b/src/misc/lv_text.h index cf9ea140f..3aaecabac 100644 --- a/src/misc/lv_text.h +++ b/src/misc/lv_text.h @@ -49,7 +49,6 @@ typedef _lv_text_flag_t lv_text_flag_t; typedef uint8_t lv_text_flag_t; #endif /*DOXYGEN*/ - /** Label align policy*/ enum _lv_text_align_t { LV_TEXT_ALIGN_AUTO, /**< Align text auto*/ @@ -64,7 +63,6 @@ typedef _lv_text_align_t lv_text_align_t; typedef uint8_t lv_text_align_t; #endif /*DOXYGEN*/ - /********************** * GLOBAL PROTOTYPES **********************/ @@ -169,7 +167,6 @@ static inline bool _lv_text_is_break_char(uint32_t letter) return ret; } - /** * Test if char is break char or not (a text can broken here or not) * @param letter a letter diff --git a/src/misc/lv_types.h b/src/misc/lv_types.h index c6271180e..1b70bfd65 100644 --- a/src/misc/lv_types.h +++ b/src/misc/lv_types.h @@ -70,7 +70,6 @@ typedef _lv_result_t lv_result_t; typedef uint8_t lv_result_t; #endif /*DOXYGEN*/ - #if defined(__cplusplus) || __STDC_VERSION__ >= 199901L // If c99 or newer, use the definition of uintptr_t directly from typedef uintptr_t lv_uintptr_t; diff --git a/src/osal/lv_os_none.c b/src/osal/lv_os_none.c index b66f3d9c5..4e044d057 100644 --- a/src/osal/lv_os_none.c +++ b/src/osal/lv_os_none.c @@ -36,7 +36,6 @@ * GLOBAL FUNCTIONS **********************/ - lv_result_t lv_thread_init(lv_thread_t * thread, lv_thread_prio_t prio, void (*callback)(void *), size_t stack_size, void * user_data) { @@ -56,7 +55,6 @@ lv_result_t lv_thread_delete(lv_thread_t * thread) return LV_RESULT_INVALID; } - lv_result_t lv_mutex_init(lv_mutex_t * mutex) { LV_UNUSED(mutex); diff --git a/src/others/file_explorer/lv_file_explorer.c b/src/others/file_explorer/lv_file_explorer.c index 09ac6e3b1..df9a7ead1 100644 --- a/src/others/file_explorer/lv_file_explorer.c +++ b/src/others/file_explorer/lv_file_explorer.c @@ -73,7 +73,6 @@ lv_obj_t * lv_file_explorer_create(lv_obj_t * parent) return obj; } - /*===================== * Setter functions *====================*/ @@ -125,7 +124,6 @@ void lv_file_explorer_set_quick_access_path(lv_obj_t * obj, lv_file_explorer_dir #endif - void lv_file_explorer_set_sort(lv_obj_t * obj, lv_file_explorer_sort_t sort) { LV_ASSERT_OBJ(obj, MY_CLASS); @@ -137,7 +135,6 @@ void lv_file_explorer_set_sort(lv_obj_t * obj, lv_file_explorer_sort_t sort) file_explorer_sort(obj); } - /*===================== * Getter functions *====================*/ @@ -337,7 +334,6 @@ static void lv_file_explorer_constructor(const lv_obj_class_t * class_p, lv_obj_ LV_TRACE_OBJ_CREATE("finished"); } - static void init_style(lv_obj_t * obj) { lv_file_explorer_t * explorer = (lv_file_explorer_t *)obj; @@ -527,7 +523,6 @@ static void browser_file_event_handler(lv_event_t * e) } } - static void show_dir(lv_obj_t * obj, const char * path) { lv_file_explorer_t * explorer = (lv_file_explorer_t *)obj; @@ -611,7 +606,6 @@ static void show_dir(lv_obj_t * obj, const char * path) } } - /*Remove the specified suffix*/ static void strip_ext(char * dir) { @@ -629,8 +623,6 @@ static void strip_ext(char * dir) } } - - static void exch_table_item(lv_obj_t * tb, int16_t i, int16_t j) { const char * tmp; @@ -645,7 +637,6 @@ static void exch_table_item(lv_obj_t * tb, int16_t i, int16_t j) lv_table_set_cell_value(tb, j, 1, lv_table_get_cell_value(tb, 0, 2)); } - static void file_explorer_sort(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); @@ -689,7 +680,6 @@ static void sort_by_file_kind(lv_obj_t * tb, int16_t lo, int16_t hi) sort_by_file_kind(tb, gt + 1, hi); } - static bool is_end_with(const char * str1, const char * str2) { if(str1 == NULL || str2 == NULL) diff --git a/src/others/file_explorer/lv_file_explorer.h b/src/others/file_explorer/lv_file_explorer.h index 88a127cd1..cdebe7a49 100644 --- a/src/others/file_explorer/lv_file_explorer.h +++ b/src/others/file_explorer/lv_file_explorer.h @@ -91,7 +91,6 @@ lv_obj_t * lv_file_explorer_create(lv_obj_t * parent); void lv_file_explorer_set_quick_access_path(lv_obj_t * obj, lv_file_explorer_dir_t dir, const char * path); #endif - /** * Set file_explorer sort * @param obj pointer to a file explorer object diff --git a/src/others/fragment/lv_fragment.h b/src/others/fragment/lv_fragment.h index a460c2938..9d71754f1 100644 --- a/src/others/fragment/lv_fragment.h +++ b/src/others/fragment/lv_fragment.h @@ -17,7 +17,6 @@ extern "C" { #if LV_USE_FRAGMENT - /********************* * DEFINES *********************/ @@ -265,7 +264,6 @@ lv_fragment_t * lv_fragment_manager_find_by_container(lv_fragment_manager_t * ma */ lv_fragment_t * lv_fragment_manager_get_parent_fragment(lv_fragment_manager_t * manager); - /** * Create a fragment instance. * @@ -324,7 +322,6 @@ void lv_fragment_delete_obj(lv_fragment_t * fragment); */ void lv_fragment_recreate_obj(lv_fragment_t * fragment); - /********************** * MACROS **********************/ diff --git a/src/others/fragment/lv_fragment_manager.c b/src/others/fragment/lv_fragment_manager.c index cabed0bb0..73b0c9df2 100644 --- a/src/others/fragment/lv_fragment_manager.c +++ b/src/others/fragment/lv_fragment_manager.c @@ -37,7 +37,6 @@ struct _lv_fragment_manager_t { lv_ll_t stack; }; - /********************** * STATIC PROTOTYPES **********************/ @@ -258,7 +257,6 @@ static void item_delete_fragment(lv_fragment_managed_states_t * item) item->instance = NULL; } - static lv_fragment_managed_states_t * fragment_attach(lv_fragment_manager_t * manager, lv_fragment_t * fragment, lv_obj_t * const * container) { diff --git a/src/others/ime/lv_ime_pinyin.c b/src/others/ime/lv_ime_pinyin.c index ce54bda53..e70abfa59 100644 --- a/src/others/ime/lv_ime_pinyin.c +++ b/src/others/ime/lv_ime_pinyin.c @@ -402,7 +402,6 @@ static const lv_pinyin_dict_t lv_ime_pinyin_def_dict[] = { }; #endif - /********************** * MACROS **********************/ @@ -418,7 +417,6 @@ lv_obj_t * lv_ime_pinyin_create(lv_obj_t * parent) return obj; } - /*===================== * Setter functions *====================*/ @@ -614,7 +612,6 @@ static void lv_ime_pinyin_constructor(const lv_obj_class_t * class_p, lv_obj_t * #endif } - static void lv_ime_pinyin_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj) { LV_UNUSED(class_p); @@ -628,7 +625,6 @@ static void lv_ime_pinyin_destructor(const lv_obj_class_t * class_p, lv_obj_t * lv_obj_delete(pinyin_ime->cand_panel); } - static void lv_ime_pinyin_kb_event(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); @@ -765,7 +761,6 @@ static void lv_ime_pinyin_kb_event(lv_event_t * e) } } - static void lv_ime_pinyin_cand_panel_event(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); @@ -802,7 +797,6 @@ static void lv_ime_pinyin_cand_panel_event(lv_event_t * e) } } - static void pinyin_input_proc(lv_obj_t * obj) { lv_ime_pinyin_t * pinyin_ime = (lv_ime_pinyin_t *)obj; @@ -868,7 +862,6 @@ static void pinyin_page_proc(lv_obj_t * obj, uint16_t dir) } } - static void lv_ime_pinyin_style_change_event(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); @@ -882,7 +875,6 @@ static void lv_ime_pinyin_style_change_event(lv_event_t * e) } } - static void init_pinyin_dict(lv_obj_t * obj, const lv_pinyin_dict_t * dict) { lv_ime_pinyin_t * pinyin_ime = (lv_ime_pinyin_t *)obj; @@ -917,7 +909,6 @@ static void init_pinyin_dict(lv_obj_t * obj, const lv_pinyin_dict_t * dict) } } - static char * pinyin_search_matching(lv_obj_t * obj, char * py_str, uint16_t * cand_num) { lv_ime_pinyin_t * pinyin_ime = (lv_ime_pinyin_t *)obj; @@ -978,7 +969,6 @@ static void pinyin_ime_clear_data(lv_obj_t * obj) lv_obj_add_flag(pinyin_ime->cand_panel, LV_OBJ_FLAG_HIDDEN); } - #if LV_IME_PINYIN_USE_K9_MODE static void pinyin_k9_init_data(lv_obj_t * obj) { @@ -1068,7 +1058,6 @@ static void pinyin_k9_get_legal_py(lv_obj_t * obj, char * k9_input, const char * } } - /*true: visible; false: not visible*/ static bool pinyin_k9_is_valid_py(lv_obj_t * obj, char * py_str) { @@ -1105,7 +1094,6 @@ static bool pinyin_k9_is_valid_py(lv_obj_t * obj, char * py_str) return false; } - static void pinyin_k9_fill_cand(lv_obj_t * obj) { uint16_t index = 0, tmp_len = 0; @@ -1143,7 +1131,6 @@ static void pinyin_k9_fill_cand(lv_obj_t * obj) lv_textarea_add_text(ta, pinyin_ime->input_char); } - static void pinyin_k9_cand_page_proc(lv_obj_t * obj, uint16_t dir) { lv_ime_pinyin_t * pinyin_ime = (lv_ime_pinyin_t *)obj; diff --git a/src/others/ime/lv_ime_pinyin.h b/src/others/ime/lv_ime_pinyin.h index 6518898d2..a7dee9612 100644 --- a/src/others/ime/lv_ime_pinyin.h +++ b/src/others/ime/lv_ime_pinyin.h @@ -101,7 +101,6 @@ void lv_ime_pinyin_set_dict(lv_obj_t * obj, lv_pinyin_dict_t * dict); */ void lv_ime_pinyin_set_mode(lv_obj_t * obj, lv_ime_pinyin_mode_t mode); - /*===================== * Getter functions *====================*/ @@ -113,7 +112,6 @@ void lv_ime_pinyin_set_mode(lv_obj_t * obj, lv_ime_pinyin_mode_t mode); */ lv_obj_t * lv_ime_pinyin_get_kb(lv_obj_t * obj); - /** * Set the dictionary of Pinyin input method. * @param obj pointer to a Pinyin input method object @@ -121,7 +119,6 @@ lv_obj_t * lv_ime_pinyin_get_kb(lv_obj_t * obj); */ lv_obj_t * lv_ime_pinyin_get_cand_panel(lv_obj_t * obj); - /** * Set the dictionary of Pinyin input method. * @param obj pointer to a Pinyin input method object diff --git a/src/others/observer/lv_observer.c b/src/others/observer/lv_observer.c index b41b4f245..013f5c8f6 100644 --- a/src/others/observer/lv_observer.c +++ b/src/others/observer/lv_observer.c @@ -71,7 +71,6 @@ void lv_subject_init_int(lv_subject_t * subject, int32_t value) _lv_ll_init(&(subject->subs_ll), sizeof(lv_observer_t)); } - void lv_subject_set_int(lv_subject_t * subject, int32_t value) { if(subject->type != LV_SUBJECT_TYPE_INT) { @@ -206,7 +205,6 @@ void lv_subject_init_color(lv_subject_t * subject, lv_color_t color) _lv_ll_init(&(subject->subs_ll), sizeof(lv_observer_t)); } - void lv_subject_set_color(lv_subject_t * subject, lv_color_t color) { if(subject->type != LV_SUBJECT_TYPE_COLOR) { @@ -266,7 +264,6 @@ lv_subject_t * lv_subject_get_group_element(lv_subject_t * subject, int32_t inde return ((lv_subject_t **)(subject->value.pointer))[index]; } - lv_observer_t * lv_subject_add_observer(lv_subject_t * subject, lv_observer_cb_t cb, void * user_data) { lv_observer_t * observer = lv_subject_add_observer_obj(subject, cb, NULL, user_data); @@ -297,7 +294,6 @@ lv_observer_t * lv_subject_add_observer_obj(lv_subject_t * subject, lv_observer_ return observer; } - lv_observer_t * lv_subject_add_observer_with_target(lv_subject_t * subject, lv_observer_cb_t cb, void * target, void * user_data) { @@ -378,7 +374,6 @@ void lv_subject_notify(lv_subject_t * subject) } while(subject->notify_restart_query); } - lv_observer_t * lv_obj_bind_flag_if_eq(lv_obj_t * obj, lv_subject_t * subject, lv_obj_flag_t flag, int32_t ref_value) { lv_observer_t * observable = bind_to_bitfield(subject, obj, obj_flag_observer_cb, flag, ref_value, false); @@ -443,7 +438,6 @@ lv_observer_t * lv_arc_bind_value(lv_obj_t * obj, lv_subject_t * subject) return observer; } - lv_observer_t * lv_slider_bind_value(lv_obj_t * obj, lv_subject_t * subject) { if(subject->type != LV_SUBJECT_TYPE_INT) { @@ -555,7 +549,6 @@ static void obj_state_observer_cb(lv_subject_t * subject, lv_observer_t * observ } } - static void btn_value_changed_event_cb(lv_event_t * e) { lv_obj_t * obj = lv_event_get_current_target(e); diff --git a/src/others/observer/lv_observer.h b/src/others/observer/lv_observer.h index 0091c0b39..101cb419c 100644 --- a/src/others/observer/lv_observer.h +++ b/src/others/observer/lv_observer.h @@ -21,7 +21,6 @@ extern "C" { * DEFINES *********************/ - /********************** * TYPEDEFS **********************/ @@ -37,7 +36,6 @@ typedef enum { LV_SUBJECT_TYPE_STRING = 5, /**< a char pointer*/ } lv_subject_type_t; - /** * A common type to handle all the various observable types in the same way */ @@ -236,7 +234,6 @@ lv_observer_t * lv_subject_add_observer(lv_subject_t * subject, lv_observer_cb_t lv_observer_t * lv_subject_add_observer_obj(lv_subject_t * subject, lv_observer_cb_t observer_cb, lv_obj_t * obj, void * user_data); - /** * Add an observer to a subject and also save a target. * @param subject pointer to the subject diff --git a/src/others/snapshot/lv_snapshot.h b/src/others/snapshot/lv_snapshot.h index 305ebc8c1..6459898f0 100644 --- a/src/others/snapshot/lv_snapshot.h +++ b/src/others/snapshot/lv_snapshot.h @@ -66,7 +66,6 @@ uint32_t lv_snapshot_buf_size_needed(lv_obj_t * obj, lv_color_format_t cf); lv_result_t lv_snapshot_take_to_buf(lv_obj_t * obj, lv_color_format_t cf, lv_image_dsc_t * dsc, void * buf, uint32_t buff_size); - /********************** * MACROS **********************/ diff --git a/src/others/sysmon/lv_sysmon.c b/src/others/sysmon/lv_sysmon.c index c208e664b..17f522526 100644 --- a/src/others/sysmon/lv_sysmon.c +++ b/src/others/sysmon/lv_sysmon.c @@ -88,7 +88,6 @@ void _lv_sysmon_builtin_deinit(void) #endif } - lv_obj_t * lv_sysmon_create(lv_obj_t * parent) { LV_LOG_INFO("begin"); @@ -105,7 +104,6 @@ lv_obj_t * lv_sysmon_create(lv_obj_t * parent) * STATIC FUNCTIONS **********************/ - #if LV_USE_PERF_MONITOR static void perf_monitor_disp_event_cb(lv_event_t * e) @@ -247,5 +245,4 @@ static void sysmon_backend_init_async_cb(void * user_data) #endif } - #endif /*LV_USE_SYSMON*/ diff --git a/src/stdlib/builtin/lv_mem_core_builtin.c b/src/stdlib/builtin/lv_mem_core_builtin.c index 46df90ab5..40dfa254d 100644 --- a/src/stdlib/builtin/lv_mem_core_builtin.c +++ b/src/stdlib/builtin/lv_mem_core_builtin.c @@ -38,7 +38,6 @@ #endif #define state LV_GLOBAL_DEFAULT()->tlsf_state - /********************** * TYPEDEFS **********************/ @@ -137,7 +136,6 @@ void lv_mem_remove_pool(lv_mem_pool_t pool) LV_LOG_WARN("invalid pool: %p", pool); } - void * lv_malloc_core(size_t size) { #if LV_USE_OS @@ -211,7 +209,6 @@ void lv_mem_monitor_core(lv_mem_monitor_t * mon_p) LV_TRACE_MEM("finished"); } - lv_result_t lv_mem_test_core(void) { #if LV_USE_OS diff --git a/src/stdlib/builtin/lv_tlsf.c b/src/stdlib/builtin/lv_tlsf.c index 1e96be224..b582c3d9b 100644 --- a/src/stdlib/builtin/lv_tlsf.c +++ b/src/stdlib/builtin/lv_tlsf.c @@ -358,7 +358,6 @@ static const size_t block_size_min = sizeof(block_header_t) - sizeof(block_header_t *); static const size_t block_size_max = tlsf_cast(size_t, 1) << FL_INDEX_MAX; - /* The TLSF control structure. */ typedef struct control_t { /* Empty lists point at this block to indicate they are free. */ diff --git a/src/stdlib/clib/lv_mem_core_clib.c b/src/stdlib/clib/lv_mem_core_clib.c index efd67eb81..997c9d0a4 100644 --- a/src/stdlib/clib/lv_mem_core_clib.c +++ b/src/stdlib/clib/lv_mem_core_clib.c @@ -59,7 +59,6 @@ void lv_mem_remove_pool(lv_mem_pool_t pool) return; } - void * lv_malloc_core(size_t size) { return malloc(size); @@ -82,7 +81,6 @@ void lv_mem_monitor_core(lv_mem_monitor_t * mon_p) return; } - lv_result_t lv_mem_test_core(void) { /*Not supported*/ diff --git a/src/stdlib/clib/lv_sprintf_clib.c b/src/stdlib/clib/lv_sprintf_clib.c index 405a059a8..4f4fb9c74 100644 --- a/src/stdlib/clib/lv_sprintf_clib.c +++ b/src/stdlib/clib/lv_sprintf_clib.c @@ -1,5 +1,4 @@ - /** * @file lv_templ.c * diff --git a/src/stdlib/lv_mem.c b/src/stdlib/lv_mem.c index 74687f159..cdf5b7fef 100644 --- a/src/stdlib/lv_mem.c +++ b/src/stdlib/lv_mem.c @@ -42,7 +42,6 @@ void lv_free_core(void * p); void lv_mem_monitor_core(lv_mem_monitor_t * mon_p); lv_result_t lv_mem_test_core(void); - /********************** * STATIC VARIABLES **********************/ diff --git a/src/stdlib/lv_mem.h b/src/stdlib/lv_mem.h index e673b0aca..48a176379 100644 --- a/src/stdlib/lv_mem.h +++ b/src/stdlib/lv_mem.h @@ -92,7 +92,6 @@ void lv_free(void * data); */ void * lv_realloc(void * data_p, size_t new_size); - /** * Used internally to execute a plain `malloc` operation * @param size size in bytes to `malloc` @@ -118,7 +117,6 @@ void * lv_realloc_core(void * p, size_t new_size); */ void lv_mem_monitor_core(lv_mem_monitor_t * mon_p); - lv_result_t lv_mem_test_core(void); /** diff --git a/src/stdlib/lv_sprintf.h b/src/stdlib/lv_sprintf.h index 778085ae9..cd5a80346 100644 --- a/src/stdlib/lv_sprintf.h +++ b/src/stdlib/lv_sprintf.h @@ -36,12 +36,10 @@ extern "C" { #endif - int lv_snprintf(char * buffer, size_t count, const char * format, ...); int lv_vsnprintf(char * buffer, size_t count, const char * format, va_list va); - #ifdef __cplusplus } /*extern "C"*/ #endif diff --git a/src/stdlib/micropython/lv_mem_core_micropython.c b/src/stdlib/micropython/lv_mem_core_micropython.c index 03b396013..a55b3be15 100644 --- a/src/stdlib/micropython/lv_mem_core_micropython.c +++ b/src/stdlib/micropython/lv_mem_core_micropython.c @@ -60,7 +60,6 @@ void lv_mem_remove_pool(lv_mem_pool_t pool) return; } - void * lv_malloc_core(size_t size) { return m_malloc(size); @@ -83,7 +82,6 @@ void lv_mem_monitor_core(lv_mem_monitor_t * mon_p) return; } - lv_result_t lv_mem_test_core(void) { /*Not supported*/ diff --git a/src/themes/basic/lv_theme_basic.c b/src/themes/basic/lv_theme_basic.c index 9aad195a8..b6a4eb60c 100644 --- a/src/themes/basic/lv_theme_basic.c +++ b/src/themes/basic/lv_theme_basic.c @@ -45,7 +45,6 @@ typedef struct { #endif } my_theme_styles_t; - typedef struct _my_theme_t { lv_theme_t base; my_theme_styles_t styles; @@ -82,7 +81,6 @@ static void style_init(struct _my_theme_t * theme) lv_style_set_bg_color(&theme->styles.scr, COLOR_SCR); lv_style_set_text_color(&theme->styles.scr, COLOR_DIM); - style_init_reset(&theme->styles.transp); lv_style_set_bg_opa(&theme->styles.transp, LV_OPA_TRANSP); @@ -135,7 +133,6 @@ static void style_init(struct _my_theme_t * theme) #endif } - /********************** * GLOBAL FUNCTIONS **********************/ diff --git a/src/themes/default/lv_theme_default.c b/src/themes/default/lv_theme_default.c index 2495720f4..51f44aaa0 100644 --- a/src/themes/default/lv_theme_default.c +++ b/src/themes/default/lv_theme_default.c @@ -178,7 +178,6 @@ typedef struct _my_theme_t { #endif } my_theme_t; - /********************** * STATIC PROTOTYPES **********************/ @@ -197,7 +196,6 @@ static void style_init_reset(lv_style_t * style); * STATIC FUNCTIONS **********************/ - static lv_color_t dark_color_filter_cb(const lv_color_filter_dsc_t * f, lv_color_t c, lv_opa_t opa) { LV_UNUSED(f); @@ -633,7 +631,6 @@ static void style_init(struct _my_theme_t * theme) lv_style_set_transform_width(&theme->styles.list_item_grow, PAD_DEF); #endif - #if LV_USE_LED style_init_reset(&theme->styles.led); lv_style_set_bg_opa(&theme->styles.led, LV_OPA_COVER); @@ -744,7 +741,6 @@ bool lv_theme_default_is_inited(void) return theme->inited; } - static void theme_apply(lv_theme_t * th, lv_obj_t * obj) { LV_UNUSED(th); @@ -791,7 +787,6 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj) } #endif - #if LV_USE_CALENDAR if(lv_obj_check_type(lv_obj_get_parent(obj), &lv_calendar_class)) { /*No style*/ @@ -1030,7 +1025,6 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj) } #endif - #if LV_USE_SPINNER else if(lv_obj_check_type(obj, &lv_spinner_class)) { lv_obj_add_style(obj, &theme->styles.arc_indic, 0); diff --git a/src/themes/lv_theme.h b/src/themes/lv_theme.h index 076240b6b..bfe4bd5b5 100644 --- a/src/themes/lv_theme.h +++ b/src/themes/lv_theme.h @@ -113,7 +113,6 @@ lv_color_t lv_theme_get_color_secondary(lv_obj_t * obj); * MACROS **********************/ - #include "default/lv_theme_default.h" #include "mono/lv_theme_mono.h" #include "basic/lv_theme_basic.h" diff --git a/src/widgets/animimage/lv_animimage.h b/src/widgets/animimage/lv_animimage.h index f57c48aa0..c186ed897 100644 --- a/src/widgets/animimage/lv_animimage.h +++ b/src/widgets/animimage/lv_animimage.h @@ -41,20 +41,17 @@ typedef struct { int8_t pic_count; } lv_animimg_t; - /*Image parts*/ enum _lv_animimg_part_t { LV_ANIM_IMAGE_PART_MAIN, }; - #ifdef DOXYGEN typedef _lv_animimg_part_t lv_animimg_part_t; #else typedef uint8_t lv_animimg_part_t; #endif - /********************** * GLOBAL PROTOTYPES **********************/ diff --git a/src/widgets/arc/lv_arc.c b/src/widgets/arc/lv_arc.c index 189e8aa8b..3009ade59 100644 --- a/src/widgets/arc/lv_arc.c +++ b/src/widgets/arc/lv_arc.c @@ -350,7 +350,6 @@ int32_t lv_arc_get_knob_offset(const lv_obj_t * obj) * Other functions *====================*/ - void lv_arc_align_obj_to_angle(const lv_obj_t * obj, lv_obj_t * obj_to_align, int32_t r_offset) { LV_ASSERT_OBJ(obj, MY_CLASS); @@ -399,7 +398,6 @@ void lv_arc_rotate_obj_to_angle(const lv_obj_t * obj, lv_obj_t * obj_to_rotate, lv_obj_set_style_transform_rotation(obj_to_rotate, angle * 10 + 900, 0); } - /********************** * STATIC FUNCTIONS **********************/ @@ -432,7 +430,6 @@ static void lv_arc_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj) lv_obj_remove_flag(obj, LV_OBJ_FLAG_SCROLL_CHAIN | LV_OBJ_FLAG_SCROLLABLE); lv_obj_set_ext_click_area(obj, LV_DPI_DEF / 10); - LV_TRACE_OBJ_CREATE("finished"); } @@ -814,7 +811,6 @@ static lv_value_precise_t get_angle(const lv_obj_t * obj) return angle; } - static void get_knob_area(lv_obj_t * obj, const lv_point_t * center, int32_t r, lv_area_t * knob_area) { int32_t indic_width = lv_obj_get_style_arc_width(obj, LV_PART_INDICATOR); diff --git a/src/widgets/arc/lv_arc.h b/src/widgets/arc/lv_arc.h index 23a74e584..9948f36ab 100644 --- a/src/widgets/arc/lv_arc.h +++ b/src/widgets/arc/lv_arc.h @@ -38,7 +38,6 @@ typedef _lv_arc_mode_t lv_arc_mode_t; typedef uint8_t lv_arc_mode_t; #endif /*DOXYGEN*/ - typedef struct { lv_obj_t obj; uint32_t rotation; diff --git a/src/widgets/bar/lv_bar.h b/src/widgets/bar/lv_bar.h index fa4a9ba48..513cefd5d 100644 --- a/src/widgets/bar/lv_bar.h +++ b/src/widgets/bar/lv_bar.h @@ -40,7 +40,6 @@ typedef _lv_bar_mode_t lv_bar_mode_t; typedef uint8_t lv_bar_mode_t; #endif /*DOXYGEN*/ - typedef struct { lv_obj_t * bar; int32_t anim_start; @@ -63,7 +62,6 @@ typedef struct { LV_ATTRIBUTE_EXTERN_DATA extern const lv_obj_class_t lv_bar_class; - /********************** * GLOBAL PROTOTYPES **********************/ diff --git a/src/widgets/buttonmatrix/lv_buttonmatrix.c b/src/widgets/buttonmatrix/lv_buttonmatrix.c index 5c2b2e989..345ca42a7 100644 --- a/src/widgets/buttonmatrix/lv_buttonmatrix.c +++ b/src/widgets/buttonmatrix/lv_buttonmatrix.c @@ -477,7 +477,6 @@ static void lv_buttonmatrix_event(const lv_obj_class_t * class_p, lv_event_t * e if(btnm->one_check) make_one_button_checked(obj, btnm->btn_id_sel); } - if((button_is_click_trig(btnm->ctrl_bits[btnm->btn_id_sel]) == true || button_is_popover(btnm->ctrl_bits[btnm->btn_id_sel]) == true) && button_is_inactive(btnm->ctrl_bits[btnm->btn_id_sel]) == false && diff --git a/src/widgets/buttonmatrix/lv_buttonmatrix.h b/src/widgets/buttonmatrix/lv_buttonmatrix.h index b12d28285..616e40d5f 100644 --- a/src/widgets/buttonmatrix/lv_buttonmatrix.h +++ b/src/widgets/buttonmatrix/lv_buttonmatrix.h @@ -53,7 +53,6 @@ typedef _lv_buttonmatrix_ctrl_t lv_buttonmatrix_ctrl_t; typedef uint32_t lv_buttonmatrix_ctrl_t; #endif /*DOXYGEN*/ - typedef bool (*lv_buttonmatrix_button_draw_cb_t)(lv_obj_t * btnm, uint32_t btn_id, const lv_area_t * draw_area, const lv_area_t * clip_area); @@ -71,7 +70,6 @@ typedef struct { LV_ATTRIBUTE_EXTERN_DATA extern const lv_obj_class_t lv_buttonmatrix_class; - /********************** * GLOBAL PROTOTYPES **********************/ diff --git a/src/widgets/calendar/lv_calendar.c b/src/widgets/calendar/lv_calendar.c index 7d7bc1863..9a601b542 100644 --- a/src/widgets/calendar/lv_calendar.c +++ b/src/widgets/calendar/lv_calendar.c @@ -234,7 +234,6 @@ lv_result_t lv_calendar_get_pressed_date(const lv_obj_t * obj, lv_calendar_date_ return LV_RESULT_OK; } - /********************** * STATIC FUNCTIONS **********************/ diff --git a/src/widgets/canvas/lv_canvas.c b/src/widgets/canvas/lv_canvas.c index 31091911a..1ab521ad7 100644 --- a/src/widgets/canvas/lv_canvas.c +++ b/src/widgets/canvas/lv_canvas.c @@ -288,8 +288,6 @@ void lv_canvas_fill_bg(lv_obj_t * obj, lv_color_t color, lv_opa_t opa) lv_obj_invalidate(obj); } - - void lv_canvas_init_layer(lv_obj_t * canvas, lv_layer_t * layer) { LV_ASSERT_NULL(canvas); @@ -306,7 +304,6 @@ void lv_canvas_init_layer(lv_obj_t * canvas, lv_layer_t * layer) layer->buf_stride = lv_draw_buf_width_to_stride(lv_area_get_width(&layer->buf_area), layer->color_format); } - void lv_canvas_finish_layer(lv_obj_t * canvas, lv_layer_t * layer) { while(layer->draw_task_head) { @@ -350,5 +347,4 @@ static void lv_canvas_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj) lv_cache_unlock(); } - #endif diff --git a/src/widgets/canvas/lv_canvas.h b/src/widgets/canvas/lv_canvas.h index 01efd8548..fa7b16fbc 100644 --- a/src/widgets/canvas/lv_canvas.h +++ b/src/widgets/canvas/lv_canvas.h @@ -82,7 +82,6 @@ void lv_canvas_set_palette(lv_obj_t * canvas, uint8_t id, lv_color32_t c); * Getter functions *====================*/ - lv_color32_t lv_canvas_get_px(lv_obj_t * obj, int32_t x, int32_t y); /** diff --git a/src/widgets/chart/lv_chart.c b/src/widgets/chart/lv_chart.c index 60175020d..acb4368c3 100644 --- a/src/widgets/chart/lv_chart.c +++ b/src/widgets/chart/lv_chart.c @@ -357,7 +357,6 @@ void lv_chart_hide_series(lv_obj_t * chart, lv_chart_series_t * series, bool hid lv_chart_refresh(chart); } - void lv_chart_set_series_color(lv_obj_t * chart, lv_chart_series_t * series, lv_color_t color) { LV_ASSERT_OBJ(chart, MY_CLASS); @@ -434,7 +433,6 @@ void lv_chart_set_cursor_pos(lv_obj_t * chart, lv_chart_cursor_t * cursor, lv_po lv_chart_refresh(chart); } - /** * Set the coordinate of the cursor with respect * to the origin of series area of the chart. @@ -472,7 +470,6 @@ lv_point_t lv_chart_get_cursor_point(lv_obj_t * chart, lv_chart_cursor_t * curso * Set/Get value(s) *====================*/ - void lv_chart_set_all_value(lv_obj_t * obj, lv_chart_series_t * ser, int32_t value) { LV_ASSERT_OBJ(obj, MY_CLASS); @@ -1232,7 +1229,6 @@ static void draw_cursors(lv_obj_t * obj, lv_layer_t * layer) layer->clip_area = clip_area_ori; } - /** * Get the nearest index to an X coordinate * @param chart pointer to a chart object @@ -1362,5 +1358,4 @@ static void new_points_alloc(lv_obj_t * obj, lv_chart_series_t * ser, uint32_t c } } - #endif diff --git a/src/widgets/chart/lv_chart.h b/src/widgets/chart/lv_chart.h index cd3a299ef..c3628f9e3 100644 --- a/src/widgets/chart/lv_chart.h +++ b/src/widgets/chart/lv_chart.h @@ -45,7 +45,6 @@ typedef _lv_chart_type_t lv_chart_type_t; typedef uint8_t lv_chart_type_t; #endif /*DOXYGEN*/ - /** * Chart update mode for `lv_chart_set_next` */ @@ -60,7 +59,6 @@ typedef _lv_chart_update_mode_t lv_chart_update_mode_t; typedef uint8_t lv_chart_update_mode_t; #endif /*DOXYGEN*/ - /** * Enumeration of the axis' */ @@ -78,7 +76,6 @@ typedef _lv_chart_axis_t lv_chart_axis_t; typedef uint8_t lv_chart_axis_t; #endif /*DOXYGEN*/ - /** * Descriptor a chart series */ @@ -103,7 +100,6 @@ typedef struct { uint32_t pos_set: 1; /*1: pos is set; 0: point_id is set*/ } lv_chart_cursor_t; - typedef struct { lv_obj_t obj; lv_ll_t series_ll; /**< Linked list for the series (stores lv_chart_series_t)*/ @@ -260,8 +256,6 @@ void lv_chart_set_x_start_point(lv_obj_t * obj, lv_chart_series_t * ser, uint32_ */ lv_chart_series_t * lv_chart_get_series_next(const lv_obj_t * chart, const lv_chart_series_t * ser); - - /*===================== * Cursor *====================*/ diff --git a/src/widgets/dropdown/lv_dropdown.c b/src/widgets/dropdown/lv_dropdown.c index 361bd1e1b..36363a43b 100644 --- a/src/widgets/dropdown/lv_dropdown.c +++ b/src/widgets/dropdown/lv_dropdown.c @@ -83,7 +83,6 @@ const lv_obj_class_t lv_dropdownlist_class = { .name = "dropdown-list", }; - /********************** * MACROS **********************/ @@ -426,7 +425,6 @@ int32_t lv_dropdown_get_option_index(lv_obj_t * obj, const char * option) return -1; } - const char * lv_dropdown_get_symbol(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); @@ -780,7 +778,6 @@ static void lv_dropdown_list_event(const lv_obj_class_t * class_p, lv_event_t * } } - static void draw_main(lv_event_t * e) { lv_obj_t * obj = lv_event_get_target(e); @@ -1020,7 +1017,6 @@ static void draw_box_label(lv_obj_t * dropdown_obj, lv_layer_t * layer, uint32_t list_obj->skip_trans = 0; } - static lv_result_t btn_release_handler(lv_obj_t * obj) { lv_dropdown_t * dropdown = (lv_dropdown_t *)obj; diff --git a/src/widgets/image/lv_image.c b/src/widgets/image/lv_image.c index a0fa46540..b0f951452 100644 --- a/src/widgets/image/lv_image.c +++ b/src/widgets/image/lv_image.c @@ -746,7 +746,6 @@ static void scale_update(lv_obj_t * obj, int32_t scale_x, int32_t scale_y) lv_obj_invalidate_area(obj, &a); } - static void update_align(lv_obj_t * obj) { lv_image_t * img = (lv_image_t *)obj; diff --git a/src/widgets/image/lv_image.h b/src/widgets/image/lv_image.h index 06dfc444f..8cbc2d420 100644 --- a/src/widgets/image/lv_image.h +++ b/src/widgets/image/lv_image.h @@ -133,7 +133,6 @@ void lv_image_set_offset_x(lv_obj_t * obj, int32_t x); */ void lv_image_set_offset_y(lv_obj_t * obj, int32_t y); - /** * Set the rotation angle of the image. * The image will be rotated around the set pivot set by `lv_image_set_pivot()` @@ -164,7 +163,6 @@ static inline void _lv_image_set_pivot(lv_obj_t * obj, lv_point_t * pivot) lv_image_set_pivot(obj, pivot->x, pivot->y); } - /** * Set the zoom factor of the image. * Note that indexed and alpha only images can't be transformed. @@ -204,7 +202,6 @@ void lv_image_set_scale_x(lv_obj_t * obj, uint32_t zoom); */ void lv_image_set_scale_y(lv_obj_t * obj, uint32_t zoom); - /** * Enable/disable anti-aliasing for the transformations (rotate, zoom) or not. * The quality is better with anti-aliasing looks better but slower. diff --git a/src/widgets/imgbtn/lv_imgbtn.c b/src/widgets/imgbtn/lv_imgbtn.c index da5b949ea..c8c2f7b42 100644 --- a/src/widgets/imgbtn/lv_imgbtn.c +++ b/src/widgets/imgbtn/lv_imgbtn.c @@ -117,7 +117,6 @@ void lv_imgbtn_set_state(lv_obj_t * obj, lv_imgbtn_state_t state) * Getter functions *====================*/ - /** * Get the left image in a given state * @param obj pointer to an image button object @@ -161,7 +160,6 @@ const void * lv_imgbtn_get_src_right(lv_obj_t * obj, lv_imgbtn_state_t state) return imgbtn->src_right[state].img_src; } - /********************** * STATIC FUNCTIONS **********************/ @@ -177,7 +175,6 @@ static void lv_imgbtn_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj lv_memzero(&imgbtn->src_right, sizeof(imgbtn->src_right)); } - static void lv_imgbtn_event(const lv_obj_class_t * class_p, lv_event_t * e) { LV_UNUSED(class_p); diff --git a/src/widgets/imgbtn/lv_imgbtn.h b/src/widgets/imgbtn/lv_imgbtn.h index 07c4776a8..d656946f4 100644 --- a/src/widgets/imgbtn/lv_imgbtn.h +++ b/src/widgets/imgbtn/lv_imgbtn.h @@ -81,7 +81,6 @@ lv_obj_t * lv_imgbtn_create(lv_obj_t * parent); void lv_imgbtn_set_src(lv_obj_t * imgbtn, lv_imgbtn_state_t state, const void * src_left, const void * src_mid, const void * src_right); - /** * Use this function instead of `lv_obj_add/remove_state` to set a state manually * @param imgbtn pointer to an image button object @@ -117,7 +116,6 @@ const void * lv_imgbtn_get_src_middle(lv_obj_t * imgbtn, lv_imgbtn_state_t state */ const void * lv_imgbtn_get_src_right(lv_obj_t * imgbtn, lv_imgbtn_state_t state); - /*===================== * Other functions *====================*/ diff --git a/src/widgets/keyboard/lv_keyboard.h b/src/widgets/keyboard/lv_keyboard.h index 4e939d121..543be9299 100644 --- a/src/widgets/keyboard/lv_keyboard.h +++ b/src/widgets/keyboard/lv_keyboard.h @@ -56,7 +56,6 @@ typedef _lv_keyboard_mode_t lv_keyboard_mode_t; typedef uint8_t lv_keyboard_mode_t; #endif /*DOXYGEN*/ - /*Data of keyboard*/ typedef struct { lv_buttonmatrix_t btnm; diff --git a/src/widgets/label/lv_label.c b/src/widgets/label/lv_label.c index 36ccc011c..96dd89fe7 100644 --- a/src/widgets/label/lv_label.c +++ b/src/widgets/label/lv_label.c @@ -706,7 +706,6 @@ static void lv_label_event(const lv_obj_class_t * class_p, lv_event_t * e) } } - static void draw_main(lv_event_t * e) { lv_obj_t * obj = lv_event_get_target(e); @@ -1117,7 +1116,6 @@ static void lv_label_refr_text(lv_obj_t * obj) lv_obj_invalidate(obj); } - static void lv_label_revert_dots(lv_obj_t * obj) { lv_label_t * label = (lv_label_t *)obj; @@ -1205,7 +1203,6 @@ static void lv_label_dot_tmp_free(lv_obj_t * obj) label->dot.tmp_ptr = NULL; } - static void set_ofs_x_anim(void * obj, int32_t v) { lv_label_t * label = (lv_label_t *)obj; diff --git a/src/widgets/label/lv_label.h b/src/widgets/label/lv_label.h index b95f6a5ba..0a0677129 100644 --- a/src/widgets/label/lv_label.h +++ b/src/widgets/label/lv_label.h @@ -60,7 +60,6 @@ typedef _lv_label_long_mode_t lv_label_long_mode_t; typedef uint8_t lv_label_long_mode_t; #endif /*DOXYGEN*/ - typedef struct { lv_obj_t obj; char * text; diff --git a/src/widgets/led/lv_led.h b/src/widgets/led/lv_led.h index c9c3d42b7..208c09b15 100644 --- a/src/widgets/led/lv_led.h +++ b/src/widgets/led/lv_led.h @@ -103,5 +103,4 @@ uint8_t lv_led_get_brightness(const lv_obj_t * obj); } /*extern "C"*/ #endif - #endif /*LV_LED_H*/ diff --git a/src/widgets/menu/lv_menu.c b/src/widgets/menu/lv_menu.c index 171d39712..654324d1d 100644 --- a/src/widgets/menu/lv_menu.c +++ b/src/widgets/menu/lv_menu.c @@ -433,7 +433,6 @@ void lv_menu_set_page_title_static(lv_obj_t * page_obj, char const * const title } } - /*===================== * Getter functions *====================*/ diff --git a/src/widgets/menu/lv_menu.h b/src/widgets/menu/lv_menu.h index 8f0498a60..d7a40c858 100644 --- a/src/widgets/menu/lv_menu.h +++ b/src/widgets/menu/lv_menu.h @@ -36,7 +36,6 @@ typedef _lv_menu_mode_header_t lv_menu_mode_header_t; typedef uint8_t lv_menu_mode_header_t; #endif /*DOXYGEN*/ - enum _lv_menu_mode_root_back_button_t { LV_MENU_ROOT_BACK_BUTTON_DISABLED, LV_MENU_ROOT_BACK_BUTTON_ENABLED diff --git a/src/widgets/msgbox/lv_msgbox.c b/src/widgets/msgbox/lv_msgbox.c index e2f654d36..06b2b9c0f 100644 --- a/src/widgets/msgbox/lv_msgbox.c +++ b/src/widgets/msgbox/lv_msgbox.c @@ -147,7 +147,6 @@ lv_obj_t * lv_msgbox_create(lv_obj_t * parent, const char * title, const char * return obj; } - lv_obj_t * lv_msgbox_get_title(lv_obj_t * obj) { LV_ASSERT_OBJ(obj, MY_CLASS); diff --git a/src/widgets/roller/lv_roller.c b/src/widgets/roller/lv_roller.c index c5f7f32da..eac5ae734 100644 --- a/src/widgets/roller/lv_roller.c +++ b/src/widgets/roller/lv_roller.c @@ -266,7 +266,6 @@ void lv_roller_get_selected_str(const lv_obj_t * obj, char * buf, uint32_t buf_s buf[c] = '\0'; } - /** * Get the options of a roller * @param roller pointer to roller object @@ -279,7 +278,6 @@ const char * lv_roller_get_options(const lv_obj_t * obj) return lv_label_get_text(get_label(obj)); } - /** * Get the total number of options * @param roller pointer to a roller object @@ -302,7 +300,6 @@ uint32_t lv_roller_get_option_cnt(const lv_obj_t * obj) * STATIC FUNCTIONS **********************/ - static void lv_roller_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj) { LV_UNUSED(class_p); @@ -461,7 +458,6 @@ static void lv_roller_label_event(const lv_obj_class_t * class_p, lv_event_t * e } } - static void draw_main(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); @@ -792,7 +788,6 @@ static lv_obj_t * get_label(const lv_obj_t * obj) return lv_obj_get_child(obj, 0); } - static int32_t get_selected_label_width(const lv_obj_t * obj) { lv_obj_t * label = get_label(obj); @@ -817,7 +812,6 @@ static void set_y_anim(void * obj, int32_t v) lv_obj_set_y(obj, v); } - static void transform_vect_recursive(lv_obj_t * roller, lv_point_t * vect) { int16_t angle = 0; diff --git a/src/widgets/roller/lv_roller.h b/src/widgets/roller/lv_roller.h index 7dcbc45d0..a7f7bb678 100644 --- a/src/widgets/roller/lv_roller.h +++ b/src/widgets/roller/lv_roller.h @@ -44,7 +44,6 @@ typedef _lv_roller_mode_t lv_roller_mode_t; typedef uint8_t lv_roller_mode_t; #endif /*DOXYGEN*/ - typedef struct { lv_obj_t obj; uint32_t option_cnt; /**< Number of options*/ @@ -57,7 +56,6 @@ typedef struct { LV_ATTRIBUTE_EXTERN_DATA extern const lv_obj_class_t lv_roller_class; - /********************** * GLOBAL PROTOTYPES **********************/ @@ -115,7 +113,6 @@ uint32_t lv_roller_get_selected(const lv_obj_t * obj); */ void lv_roller_get_selected_str(const lv_obj_t * obj, char * buf, uint32_t buf_size); - /** * Get the options of a roller * @param obj pointer to roller object diff --git a/src/widgets/scale/lv_scale.c b/src/widgets/scale/lv_scale.c index b02fa24e0..e4cf1d4eb 100644 --- a/src/widgets/scale/lv_scale.c +++ b/src/widgets/scale/lv_scale.c @@ -832,7 +832,6 @@ static void scale_get_tick_points(lv_obj_t * obj, const uint32_t tick_idx, bool } else { /* Nothing to do */ } - if(is_major_tick && ((LV_SCALE_MODE_HORIZONTAL_TOP == scale->mode) || (LV_SCALE_MODE_VERTICAL_RIGHT == scale->mode))) { major_len *= -1; } diff --git a/src/widgets/slider/lv_slider.h b/src/widgets/slider/lv_slider.h index cf9cc0b1b..6c83c14f0 100644 --- a/src/widgets/slider/lv_slider.h +++ b/src/widgets/slider/lv_slider.h @@ -22,7 +22,6 @@ extern "C" { #error "lv_slider: lv_bar is required. Enable it in lv_conf.h (LV_USE_BAR 1)" #endif - /********************* * DEFINES *********************/ @@ -42,7 +41,6 @@ typedef _lv_slider_mode_t lv_slider_mode_t; typedef uint8_t lv_slider_mode_t; #endif /*DOXYGEN*/ - typedef struct { lv_bar_t bar; /*Add the ancestor's type first*/ lv_area_t left_knob_area; diff --git a/src/widgets/span/lv_span.h b/src/widgets/span/lv_span.h index 5922a3a7e..e337d814e 100644 --- a/src/widgets/span/lv_span.h +++ b/src/widgets/span/lv_span.h @@ -52,7 +52,6 @@ typedef _lv_span_mode_t lv_span_mode_t; typedef uint32_t lv_span_mode_t; #endif /*DOXYGEN*/ - typedef struct { char * txt; /* a pointer to display text */ lv_obj_t * spangroup; /* a pointer to spangroup */ @@ -239,7 +238,6 @@ uint32_t lv_spangroup_get_expand_width(lv_obj_t * obj, uint32_t max_width); */ int32_t lv_spangroup_get_expand_height(lv_obj_t * obj, int32_t width); - /*===================== * Other functions *====================*/ diff --git a/src/widgets/spinner/lv_spinner.c b/src/widgets/spinner/lv_spinner.c index eaa689e27..6c1c2afc9 100644 --- a/src/widgets/spinner/lv_spinner.c +++ b/src/widgets/spinner/lv_spinner.c @@ -51,7 +51,6 @@ lv_obj_t * lv_spinner_create(lv_obj_t * parent) return obj; } - void lv_spinner_set_anim_params(lv_obj_t * obj, uint32_t t, uint32_t angle) { /*Delete the current animation*/ @@ -92,13 +91,11 @@ static void lv_spinner_constructor(const lv_obj_class_t * class_p, lv_obj_t * ob lv_spinner_set_anim_params(obj, DEF_TIME, DEF_ARC_ANGLE); } - static void arc_anim_start_angle(void * obj, int32_t v) { lv_arc_set_start_angle(obj, (uint32_t) v); } - static void arc_anim_end_angle(void * obj, int32_t v) { lv_arc_set_end_angle(obj, (uint32_t) v); diff --git a/src/widgets/spinner/lv_spinner.h b/src/widgets/spinner/lv_spinner.h index 5cdabecc7..3f0355f6c 100644 --- a/src/widgets/spinner/lv_spinner.h +++ b/src/widgets/spinner/lv_spinner.h @@ -37,7 +37,6 @@ LV_ATTRIBUTE_EXTERN_DATA extern const lv_obj_class_t lv_spinner_class; lv_obj_t * lv_spinner_create(lv_obj_t * parent); - void lv_spinner_set_anim_params(lv_obj_t * obj, uint32_t t, uint32_t angle); /********************** diff --git a/src/widgets/switch/lv_switch.c b/src/widgets/switch/lv_switch.c index b06eec621..8393dadfd 100644 --- a/src/widgets/switch/lv_switch.c +++ b/src/widgets/switch/lv_switch.c @@ -261,5 +261,4 @@ static void lv_switch_trigger_anim(lv_obj_t * obj) } } - #endif diff --git a/src/widgets/table/lv_table.c b/src/widgets/table/lv_table.c index 65d3d1f5d..afd591b62 100644 --- a/src/widgets/table/lv_table.c +++ b/src/widgets/table/lv_table.c @@ -296,7 +296,6 @@ void lv_table_set_col_cnt(lv_obj_t * obj, uint32_t col_cnt) table->col_w[col] = LV_DPI_DEF; } - refr_size_form_row(obj, 0) ; } @@ -646,7 +645,6 @@ static void lv_table_event(const lv_obj_class_t * class_p, lv_event_t * e) } } - static void draw_main(lv_event_t * e) { lv_obj_t * obj = lv_event_get_target(e); @@ -863,7 +861,6 @@ static void refr_size_form_row(lv_obj_t * obj, uint32_t start_row) lv_obj_invalidate(obj); } - static void refr_cell_size(lv_obj_t * obj, uint32_t row, uint32_t col) { const int32_t cell_pad_left = lv_obj_get_style_pad_left(obj, LV_PART_ITEMS); @@ -1073,7 +1070,6 @@ static void get_cell_area(lv_obj_t * obj, uint32_t row, uint32_t col, lv_area_t } - static void scroll_to_selected_cell(lv_obj_t * obj) { lv_table_t * table = (lv_table_t *)obj; diff --git a/src/widgets/table/lv_table.h b/src/widgets/table/lv_table.h index 5587c3a21..ccae204e3 100644 --- a/src/widgets/table/lv_table.h +++ b/src/widgets/table/lv_table.h @@ -48,7 +48,6 @@ typedef _lv_table_cell_ctrl_t lv_table_cell_ctrl_t; typedef uint32_t lv_table_cell_ctrl_t; #endif /*DOXYGEN*/ - /*Data of cell*/ typedef struct { lv_table_cell_ctrl_t ctrl; @@ -137,7 +136,6 @@ void lv_table_set_col_width(lv_obj_t * obj, uint32_t col_id, int32_t w); */ void lv_table_add_cell_ctrl(lv_obj_t * obj, uint32_t row, uint32_t col, lv_table_cell_ctrl_t ctrl); - /** * Clear control bits of the cell. * @param obj pointer to a Table object diff --git a/src/widgets/tabview/lv_tabview.c b/src/widgets/tabview/lv_tabview.c index 2c293fafd..829fde18e 100644 --- a/src/widgets/tabview/lv_tabview.c +++ b/src/widgets/tabview/lv_tabview.c @@ -287,7 +287,6 @@ static void lv_tabview_destructor(const lv_obj_class_t * class_p, lv_obj_t * obj } } - lv_free(tabview->map); tabview->map = NULL; } @@ -306,7 +305,6 @@ static void lv_tabview_event(const lv_obj_class_t * class_p, lv_event_t * e) } } - static void buttons_value_changed_event_cb(lv_event_t * e) { lv_obj_t * buttons = lv_event_get_target(e); @@ -350,7 +348,6 @@ static void cont_scroll_end_event_cb(lv_event_t * e) bool new_tab = false; if(t != (int32_t)lv_tabview_get_tab_active(tv)) new_tab = true; - /*If not scrolled by an indev set the tab immediately*/ if(lv_indev_active()) { lv_tabview_set_active(tv, t, LV_ANIM_ON); diff --git a/src/widgets/textarea/lv_textarea.c b/src/widgets/textarea/lv_textarea.c index 643e07ae4..8a340b8b1 100644 --- a/src/widgets/textarea/lv_textarea.c +++ b/src/widgets/textarea/lv_textarea.c @@ -934,8 +934,6 @@ static void label_event_cb(lv_event_t * e) } } - - /** * Called to blink the cursor * @param ta pointer to a text area @@ -1322,7 +1320,6 @@ static void draw_cursor(lv_event_t * e) lv_area_t cur_area; lv_area_copy(&cur_area, &ta->cursor.area); - cur_area.x1 += ta->label->coords.x1; cur_area.y1 += ta->label->coords.y1; cur_area.x2 += ta->label->coords.x1; diff --git a/src/widgets/win/lv_win.c b/src/widgets/win/lv_win.c index 7a830601b..f95d725da 100644 --- a/src/widgets/win/lv_win.c +++ b/src/widgets/win/lv_win.c @@ -9,7 +9,6 @@ #include "lv_win.h" #if LV_USE_WIN - /********************* * DEFINES *********************/ @@ -105,4 +104,3 @@ static void lv_win_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj) } #endif - diff --git a/src/widgets/win/lv_win.h b/src/widgets/win/lv_win.h index ab7b38661..c57d0c376 100644 --- a/src/widgets/win/lv_win.h +++ b/src/widgets/win/lv_win.h @@ -34,7 +34,6 @@ LV_ATTRIBUTE_EXTERN_DATA extern const lv_obj_class_t lv_win_class; lv_obj_t * lv_win_create(lv_obj_t * parent); - lv_obj_t * lv_win_add_title(lv_obj_t * win, const char * txt); lv_obj_t * lv_win_add_button(lv_obj_t * win, const void * icon, int32_t btn_w); diff --git a/tests/src/lv_test_conf.h b/tests/src/lv_test_conf.h index 659463c6c..b01fa2a0f 100644 --- a/tests/src/lv_test_conf.h +++ b/tests/src/lv_test_conf.h @@ -31,7 +31,6 @@ extern "C" { #define LV_OBJ_STYLE_CACHE 1 #endif - #ifdef MICROPYTHON #define LV_USE_BUILTIN_MALLOC 0 #define LV_USE_BUILTIN_MEMCPY 1 @@ -57,7 +56,6 @@ void lv_test_assert_fail(void); typedef void * lv_user_data_t; - /*********************** * TEST CONFIGS ***********************/ @@ -102,7 +100,6 @@ typedef void * lv_user_data_t; #undef LV_USE_FLOAT #endif - #ifdef __cplusplus } /*extern "C"*/ #endif diff --git a/tests/src/lv_test_helpers.h b/tests/src/lv_test_helpers.h index e37dba4e6..6377f09d4 100644 --- a/tests/src/lv_test_helpers.h +++ b/tests/src/lv_test_helpers.h @@ -11,7 +11,6 @@ #else #define LV_HEAP_CHECK(x) x - static inline uint32_t lv_test_get_free_mem(void) { lv_mem_monitor_t m1; @@ -23,5 +22,3 @@ static inline uint32_t lv_test_get_free_mem(void) #define CANVAS_WIDTH_TO_STRIDE(w, px_size) ((((w) * (px_size) + (LV_DRAW_BUF_STRIDE_ALIGN - 1)) / LV_DRAW_BUF_STRIDE_ALIGN) * LV_DRAW_BUF_STRIDE_ALIGN) #endif /*LV_TEST_HELPERS_H*/ - - diff --git a/tests/src/lv_test_indev.h b/tests/src/lv_test_indev.h index 9fd20b133..6b524d47d 100644 --- a/tests/src/lv_test_indev.h +++ b/tests/src/lv_test_indev.h @@ -45,10 +45,8 @@ extern lv_indev_t * lv_test_mouse_indev; extern lv_indev_t * lv_test_keypad_indev; extern lv_indev_t * lv_test_encoder_indev; - #ifdef __cplusplus } /*extern "C"*/ #endif #endif /*LV_TEST_INDEV_H*/ - diff --git a/tests/src/lv_test_init.c b/tests/src/lv_test_init.c index 4cc421781..c62aaa037 100644 --- a/tests/src/lv_test_init.c +++ b/tests/src/lv_test_init.c @@ -17,7 +17,6 @@ lv_indev_t * lv_test_mouse_indev; lv_indev_t * lv_test_keypad_indev; lv_indev_t * lv_test_encoder_indev; - void lv_test_init(void) { lv_init(); diff --git a/tests/src/test_cases/draw/test_clip_corner.c b/tests/src/test_cases/draw/test_clip_corner.c index a26b71ab9..95c9d0c40 100644 --- a/tests/src/test_cases/draw/test_clip_corner.c +++ b/tests/src/test_cases/draw/test_clip_corner.c @@ -21,7 +21,6 @@ static lv_obj_t * create_panel(int32_t radius, bool transform) lv_obj_set_style_clip_corner(parent, true, 0); if(transform) lv_obj_set_style_transform_rotation(parent, 300, 0); - lv_obj_t * label = lv_label_create(parent); lv_obj_set_width(label, lv_pct(200)); lv_label_set_text(label, diff --git a/tests/src/test_cases/draw/test_draw_blend.c b/tests/src/test_cases/draw/test_draw_blend.c index 67d44f788..1ab5d753f 100644 --- a/tests/src/test_cases/draw/test_draw_blend.c +++ b/tests/src/test_cases/draw/test_draw_blend.c @@ -41,7 +41,6 @@ static void canvas_basic_render(uint8_t * canvas_buf, lv_color_format_t render_c area.y2 = 25; lv_draw_label(&layer, &label_dsc, &area); - lv_draw_rect_dsc_t rect_dsc; lv_draw_rect_dsc_init(&rect_dsc); rect_dsc.radius = 10; @@ -88,7 +87,6 @@ static void canvas_basic_render(uint8_t * canvas_buf, lv_color_format_t render_c lv_obj_delete(canvas); } - void canvas_blend_test(lv_obj_t * canvas_large, lv_draw_image_dsc_t * img_dsc, const char * name_main, const char * name_sub, lv_color_format_t small_render_cf, uint32_t idx) { @@ -124,7 +122,6 @@ static void canvas_draw(const char * name, lv_color_format_t large_render_cf) static uint8_t canvas_buf[CANVAS_WIDTH_TO_STRIDE(180, 4) * 180 + LV_DRAW_BUF_ALIGN]; - static uint8_t canvas2_buf[CANVAS_WIDTH_TO_STRIDE(768, 4) * 390 + LV_DRAW_BUF_ALIGN]; lv_obj_t * canvas2 = lv_canvas_create(lv_screen_active()); lv_canvas_set_buffer(canvas2, lv_draw_buf_align(canvas2_buf, large_render_cf), 768, 390, large_render_cf); @@ -155,19 +152,16 @@ void test_xrgb8888(void) canvas_draw("xrgb8888", LV_COLOR_FORMAT_XRGB8888); } - void test_argb8888(void) { canvas_draw("argb8888", LV_COLOR_FORMAT_ARGB8888); } - void test_rgb888(void) { canvas_draw("rgb888", LV_COLOR_FORMAT_RGB888); } - void test_rgb565(void) { canvas_draw("rgb565", LV_COLOR_FORMAT_RGB565); diff --git a/tests/src/test_cases/draw/test_draw_label.c b/tests/src/test_cases/draw/test_draw_label.c index 6a79c7aa2..f06c2c1a1 100644 --- a/tests/src/test_cases/draw/test_draw_label.c +++ b/tests/src/test_cases/draw/test_draw_label.c @@ -16,8 +16,6 @@ void tearDown(void) lv_obj_clean(lv_screen_active()); } - - static lv_obj_t * label_create(const lv_font_t * font, lv_style_t * style, const char * text_base) { lv_obj_t * label = lv_label_create(lv_screen_active()); @@ -43,19 +41,16 @@ static void all_labels_create(const char * name, lv_style_t * style) label_create(&test_font_montserrat_ascii_4bpp_compressed, style, "4bpp compressed font"); // label_create(&test_font_montserrat_ascii_4bpp_subpx, style, "4bpp subpx font"); - char buf[64]; lv_snprintf(buf, sizeof(buf), "draw/label_%s.png", name); TEST_ASSERT_EQUAL_SCREENSHOT(buf); } - void test_draw_label_normal(void) { all_labels_create("normal", NULL); } - void test_draw_label_color(void) { static lv_style_t style; @@ -82,7 +77,6 @@ void test_draw_label_color_and_opa(void) all_labels_create("color_and_opa", &style); } - static lv_obj_t * decor_label_create(lv_text_decor_t decor, lv_text_align_t align, lv_opa_t opa) { lv_color_t color = lv_palette_main(LV_PALETTE_BLUE); @@ -128,5 +122,4 @@ void test_label_decor(void) TEST_ASSERT_EQUAL_SCREENSHOT("draw/label_decor.png"); } - #endif diff --git a/tests/src/test_cases/draw/test_draw_vector.c b/tests/src/test_cases/draw/test_draw_vector.c index d19818cf7..858687134 100644 --- a/tests/src/test_cases/draw/test_draw_vector.c +++ b/tests/src/test_cases/draw/test_draw_vector.c @@ -31,14 +31,12 @@ static void draw_shapes(lv_layer_t * layer) lv_vector_dsc_set_fill_color(ctx, lv_color_make(0xff, 0x00, 0x00)); lv_vector_dsc_add_path(ctx, path); - lv_vector_path_clear(path); lv_vector_path_append_rect(path, &rect1, 20, 20); lv_vector_dsc_translate(ctx, 150, 0); lv_vector_dsc_set_fill_color(ctx, lv_color_make(0x00, 0x00, 0xff)); lv_vector_dsc_add_path(ctx, path); - lv_fpoint_t pc = {100, 100}; lv_vector_path_clear(path); lv_vector_path_append_circle(path, &pc, 50, 50); @@ -46,7 +44,6 @@ static void draw_shapes(lv_layer_t * layer) lv_vector_dsc_set_fill_color32(ctx, lv_color_to_32(lv_color_make(0x00, 0xff, 0x00), 0x80)); lv_vector_dsc_add_path(ctx, path); - lv_vector_dsc_identity(ctx); lv_vector_dsc_translate(ctx, 0, 150); @@ -66,7 +63,6 @@ static void draw_shapes(lv_layer_t * layer) lv_vector_dsc_set_fill_radial_gradient(ctx, &grad, 50, 50, 50, LV_VECTOR_GRADIENT_SPREAD_PAD); lv_vector_dsc_add_path(ctx, path); - lv_vector_dsc_identity(ctx); lv_vector_dsc_translate(ctx, 150, 150); lv_draw_image_dsc_t img_dsc; @@ -83,7 +79,6 @@ static void draw_shapes(lv_layer_t * layer) lv_vector_dsc_set_fill_transform(ctx, &mt); lv_vector_dsc_add_path(ctx, path); - lv_vector_dsc_identity(ctx); lv_vector_dsc_translate(ctx, 300, 150); lv_vector_dsc_set_fill_color(ctx, lv_color_make(0xff, 0x00, 0x00)); @@ -176,7 +171,6 @@ static void draw_lines(lv_layer_t * layer) lv_vector_dsc_set_stroke_cap(ctx, LV_VECTOR_STROKE_CAP_ROUND); lv_vector_dsc_add_path(ctx, path); - lv_area_t rect1 = {250, 300, 350, 400}; lv_vector_dsc_identity(ctx); lv_vector_path_clear(path); @@ -231,7 +225,6 @@ void test_draw_lines(void) canvas_draw("draw_lines", draw_lines); } - void test_draw_shapes(void) { canvas_draw("draw_shapes", draw_shapes); diff --git a/tests/src/test_cases/draw/test_image_formats.c b/tests/src/test_cases/draw/test_image_formats.c index c6ca461e7..fbc0c96b9 100644 --- a/tests/src/test_cases/draw/test_image_formats.c +++ b/tests/src/test_cases/draw/test_image_formats.c @@ -18,7 +18,6 @@ void tearDown(void) /* Function run after every test */ } - static void img_create(const char * name, const void * img_src, bool rotate, bool recolor) { lv_obj_t * cont = lv_obj_create(lv_screen_active()); @@ -38,7 +37,6 @@ static void img_create(const char * name, const void * img_src, bool rotate, boo lv_label_set_text(label, name); } - void test_image_built_in_decode(void) { LV_IMAGE_DECLARE(test_image_cogwheel_i4); @@ -126,7 +124,6 @@ void test_image_built_in_decode_recolor(void) img_create("binXRGB8888", "A:src/test_files/binimages/cogwheel.XRGB8888.bin", false, true); img_create("binARGB8888", "A:src/test_files/binimages/cogwheel.ARGB8888.bin", false, true); - TEST_ASSERT_EQUAL_SCREENSHOT("draw/image_format_recolor.png"); } @@ -157,11 +154,7 @@ void test_image_built_in_decode_rotate_and_recolor(void) img_create("binXRGB8888", "A:src/test_files/binimages/cogwheel.XRGB8888.bin", true, true); img_create("binARGB8888", "A:src/test_files/binimages/cogwheel.ARGB8888.bin", true, true); - TEST_ASSERT_EQUAL_SCREENSHOT("draw/image_format_rotate_and_recolor.png"); } - - - #endif diff --git a/tests/src/test_cases/libs/test_libjpeg_turbo.c b/tests/src/test_cases/libs/test_libjpeg_turbo.c index 6e77542be..3b7d64264 100644 --- a/tests/src/test_cases/libs/test_libjpeg_turbo.c +++ b/tests/src/test_cases/libs/test_libjpeg_turbo.c @@ -34,7 +34,6 @@ void test_jpg_2(void) TEST_ASSERT_EQUAL_SCREENSHOT("libs/jpg_2.png"); - uint32_t mem_before = lv_test_get_free_mem(); for(uint32_t i = 0; i < 20; i++) { create_images(); diff --git a/tests/src/test_cases/libs/test_libpng.c b/tests/src/test_cases/libs/test_libpng.c index e68e95601..b00d58565 100644 --- a/tests/src/test_cases/libs/test_libpng.c +++ b/tests/src/test_cases/libs/test_libpng.c @@ -34,7 +34,6 @@ void test_libpng_1(void) TEST_ASSERT_EQUAL_SCREENSHOT("libs/png_2.png"); - uint32_t mem_before = lv_test_get_free_mem(); for(uint32_t i = 0; i < 20; i++) { create_images(); diff --git a/tests/src/test_cases/libs/test_lodepng.c b/tests/src/test_cases/libs/test_lodepng.c index e3244cfeb..1b045095d 100644 --- a/tests/src/test_cases/libs/test_lodepng.c +++ b/tests/src/test_cases/libs/test_lodepng.c @@ -48,7 +48,6 @@ void test_lodepng_1(void) TEST_ASSERT_EQUAL_SCREENSHOT("libs/png_1.png"); - uint32_t mem_before = lv_test_get_free_mem(); for(uint32_t i = 0; i < 20; i++) { create_images(); diff --git a/tests/src/test_cases/libs/test_tjpgd.c b/tests/src/test_cases/libs/test_tjpgd.c index 3943b452a..c5983e628 100644 --- a/tests/src/test_cases/libs/test_tjpgd.c +++ b/tests/src/test_cases/libs/test_tjpgd.c @@ -48,7 +48,6 @@ void test_tjpgd_1(void) TEST_ASSERT_EQUAL_SCREENSHOT("libs/jpg_1.png"); - uint32_t mem_before = lv_test_get_free_mem(); for(uint32_t i = 0; i < 20; i++) { create_images(); diff --git a/tests/src/test_cases/test_array.c b/tests/src/test_cases/test_array.c index 75a966a59..93fc0a43e 100644 --- a/tests/src/test_cases/test_array.c +++ b/tests/src/test_cases/test_array.c @@ -24,7 +24,6 @@ void test_array_append_values(void) TEST_ASSERT_EQUAL_UINT32(8, lv_array_length(&array)); } - void test_array_set_get(void) { uint32_t v = 100; @@ -33,7 +32,6 @@ void test_array_set_get(void) TEST_ASSERT_EQUAL_UINT32(100, *r); } - void test_array_len(void) { for(int32_t i = 0; i < 10; i++) { @@ -47,7 +45,6 @@ void test_array_len(void) TEST_ASSERT_EQUAL_UINT32(0, lv_array_length(&array)); } - void test_array_resize(void) { for(int32_t i = 0; i < 10; i++) { @@ -60,7 +57,6 @@ void test_array_resize(void) TEST_ASSERT_EQUAL_UINT32(6, lv_array_length(&array)); } - void test_array_copy(void) { for(int32_t i = 0; i < 10; i++) { @@ -77,6 +73,4 @@ void test_array_copy(void) lv_array_destroy(&array2); } - - #endif diff --git a/tests/src/test_cases/test_bindings.c b/tests/src/test_cases/test_bindings.c index 274b164a2..5dcb0f56c 100644 --- a/tests/src/test_cases/test_bindings.c +++ b/tests/src/test_cases/test_bindings.c @@ -31,8 +31,6 @@ void test_binding(void) TEST_ASSERT_EQUAL_SCREENSHOT("binding.png"); } - - static void create_ui(void) { /*Create a colors*/ @@ -94,7 +92,6 @@ static void create_ui(void) lv_obj_set_style_text_color(label, c2, 0); lv_obj_add_style(label, &style_big_font, 0); - /*Declare an array of strings*/ static const char * btnmatrix_options[] = { "First", "Second", "\n", @@ -216,7 +213,6 @@ static void opa_anim_cb(void * var, int32_t v) lv_obj_set_style_opa(var, v, 0); } - static void draw_to_canvas(lv_obj_t * canvas) { lv_layer_t layer; @@ -257,5 +253,4 @@ static void draw_to_canvas(lv_obj_t * canvas) } } - #endif diff --git a/tests/src/test_cases/test_event.c b/tests/src/test_cases/test_event.c index b2ef5ae0c..dbb7f400e 100644 --- a/tests/src/test_cases/test_event.c +++ b/tests/src/test_cases/test_event.c @@ -16,7 +16,6 @@ static const lv_obj_class_t event_object_deletion_class = { .base_class = &lv_obj_class }; - /* Checks for memory leaks/invalid memory accesses on deleted objects */ void test_event_object_deletion(void) { diff --git a/tests/src/test_cases/test_fs.c b/tests/src/test_cases/test_fs.c index 24493292e..4944a4607 100644 --- a/tests/src/test_cases/test_fs.c +++ b/tests/src/test_cases/test_fs.c @@ -3,11 +3,9 @@ #include "unity/unity.h" - const char * read_exp = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam sed maximus orci. Morbi massa nisi, varius eu convallis ac, venenatis at metus. In in nibh id urna pretium feugiat vitae eu libero. Ut eget fringilla eros. Nunc ullamcorper lectus mauris, vel rhoncus velit volutpat et. Phasellus sed molestie massa. Maecenas quis dui sollicitudin, vulputate nunc ut, dictum quam. Nam a congue lorem. Nulla non facilisis sapien. Ut luctus nulla nibh, sed finibus urna porta non. Duis aliquet augue id urna euismod auctor. Integer pellentesque vulputate enim non mattis. Donec finibus mattis dolor, et feugiat nisi pharetra porta. Mauris ullamcorper cursus magna. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus."; - static void read_range(lv_fs_file_t * f, uint32_t from, uint32_t to); static void read_random_drv(char drv_letter, uint32_t cache_size); diff --git a/tests/src/test_cases/test_grid.c b/tests/src/test_cases/test_grid.c index 37535a2b3..03251034e 100644 --- a/tests/src/test_cases/test_grid.c +++ b/tests/src/test_cases/test_grid.c @@ -42,7 +42,6 @@ void test_subgrid_row(void) lv_obj_set_grid_dsc_array(cont_sub, col_dsc2, NULL); lv_obj_set_style_pad_all(cont_sub, 0, 0); - button_create(cont_main, "Main 0,0", 0, 0); button_create(cont_main, "Main 3,3", 3, 3); button_create(cont_main, "Main 2,2", 2, 2); @@ -53,11 +52,9 @@ void test_subgrid_row(void) button_create(cont_sub, "Sub 1,1", 1, 1); button_create(cont_sub, "Sub 0,1", 0, 1); - TEST_ASSERT_EQUAL_SCREENSHOT("subgrid_row.png"); } - void test_subgrid_col(void) { @@ -75,7 +72,6 @@ void test_subgrid_col(void) lv_obj_set_grid_dsc_array(cont_sub, NULL, row_dsc2); lv_obj_set_style_pad_all(cont_sub, 0, 0); - button_create(cont_main, "Main 0,0", 0, 0); button_create(cont_main, "Main 3,3", 3, 3); button_create(cont_main, "Main 2,2", 2, 2); @@ -89,5 +85,4 @@ void test_subgrid_col(void) TEST_ASSERT_EQUAL_SCREENSHOT("subgrid_col.png"); } - #endif diff --git a/tests/src/test_cases/test_margin_align.c b/tests/src/test_cases/test_margin_align.c index cc2ce8d64..9aef1fe32 100644 --- a/tests/src/test_cases/test_margin_align.c +++ b/tests/src/test_cases/test_margin_align.c @@ -67,7 +67,6 @@ void test_align(void) TEST_ASSERT_EQUAL_SCREENSHOT("margin_align_0.png"); obj_set_margin(obj0s[4], 6, 100, 100, 100); - lv_obj_set_style_radius(obj0s[0], 0, LV_PART_MAIN); lv_obj_align(obj0s[4], LV_ALIGN_LEFT_MID, 0, 0); diff --git a/tests/src/test_cases/test_math.c b/tests/src/test_cases/test_math.c index 9881845a4..e96e856fa 100644 --- a/tests/src/test_cases/test_math.c +++ b/tests/src/test_cases/test_math.c @@ -74,7 +74,6 @@ found: return do_cubic_bezier_f(t, ay, by, cy); } - static int test_cubic_bezier_ease_functions(float fx1, float fy1, float fx2, float fy2) { int x1, y1, x2, y2, y; diff --git a/tests/src/test_cases/test_observer.c b/tests/src/test_cases/test_observer.c index f87834e72..6031ad2a3 100644 --- a/tests/src/test_cases/test_observer.c +++ b/tests/src/test_cases/test_observer.c @@ -25,7 +25,6 @@ static void observer_int(lv_subject_t * subject, lv_observer_t * observer) current_v = lv_subject_get_int(subject); } - void test_observer_add_remove(void) { static lv_subject_t subject; diff --git a/tests/src/test_cases/test_snapshot.c b/tests/src/test_cases/test_snapshot.c index 764ff6b5a..179ef94a6 100644 --- a/tests/src/test_cases/test_snapshot.c +++ b/tests/src/test_cases/test_snapshot.c @@ -5,7 +5,6 @@ #include "unity/unity.h" - #define NUM_SNAPSHOTS 1 void test_snapshot_should_not_leak_memory(void) diff --git a/tests/src/test_cases/widgets/test_animimg.c b/tests/src/test_cases/widgets/test_animimg.c index a9169fc81..8dc059631 100644 --- a/tests/src/test_cases/widgets/test_animimg.c +++ b/tests/src/test_cases/widgets/test_animimg.c @@ -59,7 +59,6 @@ void test_animimg_get_src(void) TEST_ASSERT_EQUAL_PTR(actual_dsc, anim_imgs); } - void test_animimg_get_src_count(void) { uint8_t expected_count = 3; @@ -105,4 +104,3 @@ void test_animimg_start(void) } #endif - diff --git a/tests/src/test_cases/widgets/test_bar.c b/tests/src/test_cases/widgets/test_bar.c index 51272ae34..95d146b4b 100644 --- a/tests/src/test_cases/widgets/test_bar.c +++ b/tests/src/test_cases/widgets/test_bar.c @@ -206,7 +206,6 @@ void test_bar_normal(void) TEST_ASSERT_EQUAL_SCREENSHOT("widgets/bar_1.png"); } - void test_bar_indicator_area_should_get_smaller_when_padding_is_increased(void) { lv_bar_t * bar_ptr = (lv_bar_t *) bar; diff --git a/tests/src/test_cases/widgets/test_btnmatrix.c b/tests/src/test_cases/widgets/test_btnmatrix.c index d857ab6cd..84944ec30 100644 --- a/tests/src/test_cases/widgets/test_btnmatrix.c +++ b/tests/src/test_cases/widgets/test_btnmatrix.c @@ -456,5 +456,4 @@ void test_button_matrix_focused_event_works(void) TEST_ASSERT_TRUE(event_triggered); } - #endif diff --git a/tests/src/test_cases/widgets/test_dropdown.c b/tests/src/test_cases/widgets/test_dropdown.c index bfb0c3333..6388d46ad 100644 --- a/tests/src/test_cases/widgets/test_dropdown.c +++ b/tests/src/test_cases/widgets/test_dropdown.c @@ -260,7 +260,6 @@ void test_dropdown_keypad(void) lv_group_delete(g); } - void test_dropdown_encoder(void) { lv_obj_clean(lv_screen_active()); @@ -317,7 +316,6 @@ void test_dropdown_encoder(void) lv_group_delete(g); } - void test_dropdown_render_1(void) { lv_obj_clean(lv_screen_active()); @@ -452,5 +450,4 @@ void test_dropdown_get_options_should_check_lengths(void) TEST_ASSERT_EQUAL_INT(-1, lv_dropdown_get_option_index(dd, "Option ")); } - #endif diff --git a/tests/src/test_cases/widgets/test_image.c b/tests/src/test_cases/widgets/test_image.c index 0471ace13..6a09802ad 100644 --- a/tests/src/test_cases/widgets/test_image.c +++ b/tests/src/test_cases/widgets/test_image.c @@ -271,7 +271,6 @@ void test_image_stretch(void) int32_t w_array[] = {img_w / 2, img_w, img_w * 2}; int32_t h_array[] = {img_h / 2, img_h, img_h * 2}; - for(i = 0; i < 9; i++) { img = img_create(); lv_obj_set_size(img, w_array[i / 3], h_array[i % 3]); @@ -282,7 +281,6 @@ void test_image_stretch(void) TEST_ASSERT_EQUAL_SCREENSHOT("widgets/image_stretch.png"); } - void test_image_tile(void) { lv_obj_t * img; @@ -362,6 +360,4 @@ void test_image_ignore_transformation_settings_when_tiled(void) TEST_ASSERT_EQUAL_INT(LV_SCALE_NONE, lv_image_get_scale_y(img)); } - - #endif diff --git a/tests/src/test_cases/widgets/test_line.c b/tests/src/test_cases/widgets/test_line.c index 3d614c01f..bc5769ca9 100644 --- a/tests/src/test_cases/widgets/test_line.c +++ b/tests/src/test_cases/widgets/test_line.c @@ -88,7 +88,6 @@ void test_line_should_update_extra_draw_size_based_on_style(void) TEST_ASSERT_EQUAL(final_extra_draw_size, _lv_obj_get_ext_draw_size(line)); } - void test_line_basic_render(void) { static lv_point_precise_t points[] = { {5, 5}, @@ -101,7 +100,6 @@ void test_line_basic_render(void) lv_line_set_points(line, points, point_cnt); lv_obj_set_pos(line, 10, 10); - line = lv_line_create(active_screen); lv_line_set_points(line, points, point_cnt); lv_obj_set_pos(line, 400, 0); diff --git a/tests/src/test_cases/widgets/test_obj_flags.c b/tests/src/test_cases/widgets/test_obj_flags.c index 5627b529e..0dc68b5c7 100644 --- a/tests/src/test_cases/widgets/test_obj_flags.c +++ b/tests/src/test_cases/widgets/test_obj_flags.c @@ -69,7 +69,6 @@ void test_obj_flag_overflow_visible_1(void) lv_label_set_text(label_2, "Button 2"); lv_obj_center(label_2); - cnt_1 = 0; cnt_2 = 0; @@ -142,5 +141,4 @@ void test_obj_flag_overflow_visible_1(void) } - #endif diff --git a/tests/src/test_cases/widgets/test_win.c b/tests/src/test_cases/widgets/test_win.c index b754a2ede..b716747be 100644 --- a/tests/src/test_cases/widgets/test_win.c +++ b/tests/src/test_cases/widgets/test_win.c @@ -19,7 +19,6 @@ void tearDown(void) lv_obj_clean(active_screen); } - void test_win_should_have_valid_documented_default_values(void) { // Create the win object and update layout diff --git a/tests/unity/unity.h b/tests/unity/unity.h index bf8eceaea..3a6d15e62 100644 --- a/tests/unity/unity.h +++ b/tests/unity/unity.h @@ -286,7 +286,6 @@ void verifyTest(void); #define TEST_ASSERT_HEX64_ARRAY_WITHIN(delta, expected, actual, num_elements) UNITY_TEST_ASSERT_HEX64_ARRAY_WITHIN((delta), (expected), (actual), num_elements, __LINE__, NULL) #define TEST_ASSERT_CHAR_ARRAY_WITHIN(delta, expected, actual, num_elements) UNITY_TEST_ASSERT_CHAR_ARRAY_WITHIN((delta), (expected), (actual), num_elements, __LINE__, NULL) - /* Structs and Strings */ #define TEST_ASSERT_EQUAL_PTR(expected, actual) UNITY_TEST_ASSERT_EQUAL_PTR((expected), (actual), __LINE__, NULL) #define TEST_ASSERT_EQUAL_STRING(expected, actual) UNITY_TEST_ASSERT_EQUAL_STRING((expected), (actual), __LINE__, NULL) @@ -443,7 +442,6 @@ void verifyTest(void); #define TEST_ASSERT_NOT_EQUAL_HEX64_MESSAGE(threshold, actual, message) UNITY_TEST_ASSERT_NOT_EQUAL_HEX64((threshold), (actual), __LINE__, (message)) #define TEST_ASSERT_NOT_EQUAL_CHAR_MESSAGE(threshold, actual, message) UNITY_TEST_ASSERT_NOT_EQUAL_CHAR((threshold), (actual), __LINE__, (message)) - /* Integer Greater Than/ Less Than (of all sizes) */ #define TEST_ASSERT_GREATER_THAN_MESSAGE(threshold, actual, message) UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, (message)) #define TEST_ASSERT_GREATER_THAN_INT_MESSAGE(threshold, actual, message) UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, (message)) @@ -555,7 +553,6 @@ void verifyTest(void); #define TEST_ASSERT_HEX64_ARRAY_WITHIN_MESSAGE(delta, expected, actual, num_elements, message) UNITY_TEST_ASSERT_HEX64_ARRAY_WITHIN((delta), (expected), (actual), num_elements, __LINE__, (message)) #define TEST_ASSERT_CHAR_ARRAY_WITHIN_MESSAGE(delta, expected, actual, num_elements, message) UNITY_TEST_ASSERT_CHAR_ARRAY_WITHIN((delta), (expected), (actual), num_elements, __LINE__, (message)) - /* Structs and Strings */ #define TEST_ASSERT_EQUAL_PTR_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_PTR((expected), (actual), __LINE__, (message)) #define TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, actual, message) UNITY_TEST_ASSERT_EQUAL_STRING((expected), (actual), __LINE__, (message)) @@ -662,7 +659,6 @@ void verifyTest(void); #endif #endif - #include "unity_support.h" #endif /*LV_BUILD_TEST*/