diff --git a/demos/benchmark/lv_demo_benchmark.c b/demos/benchmark/lv_demo_benchmark.c index 466959116..da885e65a 100644 --- a/demos/benchmark/lv_demo_benchmark.c +++ b/demos/benchmark/lv_demo_benchmark.c @@ -37,7 +37,7 @@ #include "../../src/core/lv_global.h" #if LV_USE_PERF_MONITOR - #include "../../src/display/lv_display_private.h" + #include "../../lvgl_private.h" #endif /********************** diff --git a/demos/ebike/lv_demo_ebike_home.c b/demos/ebike/lv_demo_ebike_home.c index 314d71260..0afec3c80 100644 --- a/demos/ebike/lv_demo_ebike_home.c +++ b/demos/ebike/lv_demo_ebike_home.c @@ -12,7 +12,7 @@ #include "lv_demo_ebike_private.h" #include "lv_demo_ebike_home.h" #include "translations/lv_i18n.h" -#include "../../src/lvgl_private.h" +#include "../../lvgl_private.h" /********************* * DEFINES diff --git a/demos/ebike/lv_demo_ebike_stats.c b/demos/ebike/lv_demo_ebike_stats.c index e3caaf21d..2a25e37e2 100644 --- a/demos/ebike/lv_demo_ebike_stats.c +++ b/demos/ebike/lv_demo_ebike_stats.c @@ -9,7 +9,7 @@ #include "lv_demo_ebike.h" #if LV_USE_DEMO_EBIKE -#include "../../src/lvgl_private.h" +#include "../../lvgl_private.h" #include "translations/lv_i18n.h" #include "lv_demo_ebike_stats.h" #include "lv_demo_ebike_private.h" diff --git a/demos/music/lv_demo_music.c b/demos/music/lv_demo_music.c index 00e9213dc..a03809d76 100644 --- a/demos/music/lv_demo_music.c +++ b/demos/music/lv_demo_music.c @@ -13,7 +13,7 @@ #include "lv_demo_music_main.h" #include "lv_demo_music_list.h" #if LV_DEMO_MUSIC_AUTO_PLAY && LV_USE_PERF_MONITOR - #include "../../src/display/lv_display_private.h" + #include "../../lvgl_private.h" #endif /********************* diff --git a/demos/music/lv_demo_music_main.c b/demos/music/lv_demo_music_main.c index 84d4179c6..87ad0226f 100644 --- a/demos/music/lv_demo_music_main.c +++ b/demos/music/lv_demo_music_main.c @@ -13,7 +13,7 @@ #include "assets/spectrum_1.h" #include "assets/spectrum_2.h" #include "assets/spectrum_3.h" -#include "../../src/lvgl_private.h" +#include "../../lvgl_private.h" /********************* * DEFINES diff --git a/demos/widgets/lv_demo_widgets.c b/demos/widgets/lv_demo_widgets.c index d5c8b6922..c44678157 100644 --- a/demos/widgets/lv_demo_widgets.c +++ b/demos/widgets/lv_demo_widgets.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_demo_widgets.h" -#include "../../src/lvgl_private.h" +#include "../../lvgl_private.h" #if LV_USE_DEMO_WIDGETS diff --git a/examples/styles/lv_example_style_14.c b/examples/styles/lv_example_style_14.c index 1b14c01c4..ea98cc6fe 100644 --- a/examples/styles/lv_example_style_14.c +++ b/examples/styles/lv_example_style_14.c @@ -1,6 +1,6 @@ -#include "../../src/themes/lv_theme_private.h" #include "../lv_examples.h" #if LV_BUILD_EXAMPLES && LV_USE_IMAGE +#include "../../lvgl_private.h" static lv_style_t style_btn; diff --git a/examples/widgets/chart/lv_example_chart_5.c b/examples/widgets/chart/lv_example_chart_5.c index 402f4cec9..376522b76 100644 --- a/examples/widgets/chart/lv_example_chart_5.c +++ b/examples/widgets/chart/lv_example_chart_5.c @@ -1,7 +1,7 @@ #include "../../lv_examples.h" -#include "../../../src/lvgl_private.h" #if LV_USE_CHART && LV_DRAW_SW_COMPLEX && LV_BUILD_EXAMPLES +#include "../../../lvgl_private.h" static void hook_division_lines(lv_event_t * e); static void add_faded_area(lv_event_t * e); diff --git a/examples/widgets/scale/lv_example_scale_7.c b/examples/widgets/scale/lv_example_scale_7.c index 7891164aa..ef0891b9c 100644 --- a/examples/widgets/scale/lv_example_scale_7.c +++ b/examples/widgets/scale/lv_example_scale_7.c @@ -1,7 +1,7 @@ #include "../../lv_examples.h" #if LV_USE_SCALE && LV_BUILD_EXAMPLES -#include "../../../src/lvgl_private.h" //To expose the fields of lv_draw_task_t +#include "../../../lvgl_private.h" /*To expose the fields of lv_draw_task_t*/ static void draw_event_cb(lv_event_t * e) { diff --git a/lvgl_private.h b/lvgl_private.h new file mode 100644 index 000000000..b42a3260d --- /dev/null +++ b/lvgl_private.h @@ -0,0 +1,125 @@ +/** + * @file lvgl_private.h + * + */ + +#ifndef LVGL_PRIVATE_H +#define LVGL_PRIVATE_H + +#ifdef __cplusplus +extern "C" { +#endif + +/********************* + * INCLUDES + *********************/ +#include "src/core/lv_global.h" + +#include "src/display/lv_display_private.h" +#include "src/indev/lv_indev_private.h" +#include "src/misc/lv_text_private.h" +#include "src/misc/cache/lv_cache_entry_private.h" +#include "src/misc/cache/lv_cache_private.h" +#include "src/layouts/lv_layout_private.h" +#include "src/stdlib/lv_mem_private.h" +#include "src/others/file_explorer/lv_file_explorer_private.h" +#include "src/others/sysmon/lv_sysmon_private.h" +#include "src/others/monkey/lv_monkey_private.h" +#include "src/others/ime/lv_ime_pinyin_private.h" +#include "src/others/fragment/lv_fragment_private.h" +#include "src/others/observer/lv_observer_private.h" +#include "src/libs/qrcode/lv_qrcode_private.h" +#include "src/libs/barcode/lv_barcode_private.h" +#include "src/libs/gif/lv_gif_private.h" +#include "src/draw/lv_draw_triangle_private.h" +#include "src/draw/lv_draw_private.h" +#include "src/draw/lv_draw_rect_private.h" +#include "src/draw/lv_draw_image_private.h" +#include "src/draw/lv_image_decoder_private.h" +#include "src/draw/lv_draw_label_private.h" +#include "src/draw/lv_draw_vector_private.h" +#include "src/draw/lv_draw_buf_private.h" +#include "src/draw/lv_draw_mask_private.h" +#include "src/draw/sw/lv_draw_sw_gradient_private.h" +#include "src/draw/sw/lv_draw_sw_private.h" +#include "src/draw/sw/lv_draw_sw_mask_private.h" +#include "src/draw/sw/blend/lv_draw_sw_blend_private.h" +#include "src/drivers/libinput/lv_xkb_private.h" +#include "src/drivers/libinput/lv_libinput_private.h" +#include "src/font/lv_font_fmt_txt_private.h" +#include "src/themes/lv_theme_private.h" +#include "src/core/lv_refr_private.h" +#include "src/core/lv_obj_style_private.h" +#include "src/core/lv_obj_private.h" +#include "src/core/lv_obj_scroll_private.h" +#include "src/core/lv_obj_draw_private.h" +#include "src/core/lv_obj_class_private.h" +#include "src/core/lv_group_private.h" +#include "src/core/lv_obj_event_private.h" +#include "src/misc/lv_timer_private.h" +#include "src/misc/lv_area_private.h" +#include "src/misc/lv_fs_private.h" +#include "src/misc/lv_profiler_builtin_private.h" +#include "src/misc/lv_event_private.h" +#include "src/misc/lv_bidi_private.h" +#include "src/misc/lv_rb_private.h" +#include "src/misc/lv_style_private.h" +#include "src/misc/lv_color_op_private.h" +#include "src/misc/lv_anim_private.h" +#include "src/widgets/msgbox/lv_msgbox_private.h" +#include "src/widgets/buttonmatrix/lv_buttonmatrix_private.h" +#include "src/widgets/slider/lv_slider_private.h" +#include "src/widgets/switch/lv_switch_private.h" +#include "src/widgets/calendar/lv_calendar_private.h" +#include "src/widgets/imagebutton/lv_imagebutton_private.h" +#include "src/widgets/bar/lv_bar_private.h" +#include "src/widgets/image/lv_image_private.h" +#include "src/widgets/textarea/lv_textarea_private.h" +#include "src/widgets/table/lv_table_private.h" +#include "src/widgets/checkbox/lv_checkbox_private.h" +#include "src/widgets/roller/lv_roller_private.h" +#include "src/widgets/win/lv_win_private.h" +#include "src/widgets/keyboard/lv_keyboard_private.h" +#include "src/widgets/line/lv_line_private.h" +#include "src/widgets/animimage/lv_animimage_private.h" +#include "src/widgets/dropdown/lv_dropdown_private.h" +#include "src/widgets/menu/lv_menu_private.h" +#include "src/widgets/chart/lv_chart_private.h" +#include "src/widgets/button/lv_button_private.h" +#include "src/widgets/scale/lv_scale_private.h" +#include "src/widgets/led/lv_led_private.h" +#include "src/widgets/arc/lv_arc_private.h" +#include "src/widgets/tileview/lv_tileview_private.h" +#include "src/widgets/spinbox/lv_spinbox_private.h" +#include "src/widgets/span/lv_span_private.h" +#include "src/widgets/label/lv_label_private.h" +#include "src/widgets/canvas/lv_canvas_private.h" +#include "src/widgets/tabview/lv_tabview_private.h" +#include "src/tick/lv_tick_private.h" +#include "src/stdlib/builtin/lv_tlsf_private.h" +#include "src/libs/rlottie/lv_rlottie_private.h" +#include "src/libs/ffmpeg/lv_ffmpeg_private.h" +#include "src/widgets/lottie/lv_lottie_private.h" +#include "src/osal/lv_os_private.h" + +/********************* + * DEFINES + *********************/ + +/********************** + * TYPEDEFS + **********************/ + +/********************** + * GLOBAL PROTOTYPES + **********************/ + +/********************** + * MACROS + **********************/ + +#ifdef __cplusplus +} /*extern "C"*/ +#endif + +#endif /*LVGL_PRIVATE_H*/ diff --git a/src/drivers/nuttx/lv_nuttx_libuv.c b/src/drivers/nuttx/lv_nuttx_libuv.c index 12b8c439c..65e13f1c4 100644 --- a/src/drivers/nuttx/lv_nuttx_libuv.c +++ b/src/drivers/nuttx/lv_nuttx_libuv.c @@ -7,7 +7,7 @@ *********************/ #include "lv_nuttx_libuv.h" -#include "../../../lvgl.h" +#include "../../lvgl.h" #include "../../lvgl_private.h" #if LV_USE_NUTTX diff --git a/src/lvgl_private.h b/src/lvgl_private.h index 8ab64e973..325290c22 100644 --- a/src/lvgl_private.h +++ b/src/lvgl_private.h @@ -1,10 +1,10 @@ /** * @file lvgl_private.h - * + * This file exists only to be compatible with Arduino's library structure */ -#ifndef LVGL_PRIVATE_H -#define LVGL_PRIVATE_H +#ifndef LVGL_PRIVATE_SRC_H +#define LVGL_PRIVATE_SRC_H #ifdef __cplusplus extern "C" { @@ -13,94 +13,7 @@ extern "C" { /********************* * INCLUDES *********************/ -#include "core/lv_global.h" - -#include "display/lv_display_private.h" -#include "indev/lv_indev_private.h" -#include "misc/lv_text_private.h" -#include "misc/cache/lv_cache_entry_private.h" -#include "misc/cache/lv_cache_private.h" -#include "layouts/lv_layout_private.h" -#include "stdlib/lv_mem_private.h" -#include "others/file_explorer/lv_file_explorer_private.h" -#include "others/sysmon/lv_sysmon_private.h" -#include "others/monkey/lv_monkey_private.h" -#include "others/ime/lv_ime_pinyin_private.h" -#include "others/fragment/lv_fragment_private.h" -#include "others/observer/lv_observer_private.h" -#include "libs/qrcode/lv_qrcode_private.h" -#include "libs/barcode/lv_barcode_private.h" -#include "libs/gif/lv_gif_private.h" -#include "draw/lv_draw_triangle_private.h" -#include "draw/lv_draw_private.h" -#include "draw/lv_draw_rect_private.h" -#include "draw/lv_draw_image_private.h" -#include "draw/lv_image_decoder_private.h" -#include "draw/lv_draw_label_private.h" -#include "draw/lv_draw_vector_private.h" -#include "draw/lv_draw_buf_private.h" -#include "draw/lv_draw_mask_private.h" -#include "draw/sw/lv_draw_sw_gradient_private.h" -#include "draw/sw/lv_draw_sw_private.h" -#include "draw/sw/lv_draw_sw_mask_private.h" -#include "draw/sw/blend/lv_draw_sw_blend_private.h" -#include "drivers/libinput/lv_xkb_private.h" -#include "drivers/libinput/lv_libinput_private.h" -#include "font/lv_font_fmt_txt_private.h" -#include "themes/lv_theme_private.h" -#include "core/lv_refr_private.h" -#include "core/lv_obj_style_private.h" -#include "core/lv_obj_private.h" -#include "core/lv_obj_scroll_private.h" -#include "core/lv_obj_draw_private.h" -#include "core/lv_obj_class_private.h" -#include "core/lv_group_private.h" -#include "core/lv_obj_event_private.h" -#include "misc/lv_timer_private.h" -#include "misc/lv_area_private.h" -#include "misc/lv_fs_private.h" -#include "misc/lv_profiler_builtin_private.h" -#include "misc/lv_event_private.h" -#include "misc/lv_bidi_private.h" -#include "misc/lv_rb_private.h" -#include "misc/lv_style_private.h" -#include "misc/lv_color_op_private.h" -#include "misc/lv_anim_private.h" -#include "widgets/msgbox/lv_msgbox_private.h" -#include "widgets/buttonmatrix/lv_buttonmatrix_private.h" -#include "widgets/slider/lv_slider_private.h" -#include "widgets/switch/lv_switch_private.h" -#include "widgets/calendar/lv_calendar_private.h" -#include "widgets/imagebutton/lv_imagebutton_private.h" -#include "widgets/bar/lv_bar_private.h" -#include "widgets/image/lv_image_private.h" -#include "widgets/textarea/lv_textarea_private.h" -#include "widgets/table/lv_table_private.h" -#include "widgets/checkbox/lv_checkbox_private.h" -#include "widgets/roller/lv_roller_private.h" -#include "widgets/win/lv_win_private.h" -#include "widgets/keyboard/lv_keyboard_private.h" -#include "widgets/line/lv_line_private.h" -#include "widgets/animimage/lv_animimage_private.h" -#include "widgets/dropdown/lv_dropdown_private.h" -#include "widgets/menu/lv_menu_private.h" -#include "widgets/chart/lv_chart_private.h" -#include "widgets/button/lv_button_private.h" -#include "widgets/scale/lv_scale_private.h" -#include "widgets/led/lv_led_private.h" -#include "widgets/arc/lv_arc_private.h" -#include "widgets/tileview/lv_tileview_private.h" -#include "widgets/spinbox/lv_spinbox_private.h" -#include "widgets/span/lv_span_private.h" -#include "widgets/label/lv_label_private.h" -#include "widgets/canvas/lv_canvas_private.h" -#include "widgets/tabview/lv_tabview_private.h" -#include "tick/lv_tick_private.h" -#include "stdlib/builtin/lv_tlsf_private.h" -#include "libs/rlottie/lv_rlottie_private.h" -#include "libs/ffmpeg/lv_ffmpeg_private.h" -#include "widgets/lottie/lv_lottie_private.h" -#include "osal/lv_os_private.h" +#include "../lvgl_private.h" /********************* * DEFINES @@ -122,4 +35,4 @@ extern "C" { } /*extern "C"*/ #endif -#endif /*LVGL_PRIVATE_H*/ +#endif /* LVGL_PRIVATE_SRC_H */