diff --git a/.github/workflows/build_examples_with_cxx_compiler.yml b/.github/workflows/build_examples_with_cxx_compiler.yml new file mode 100644 index 0000000000..ac306149e2 --- /dev/null +++ b/.github/workflows/build_examples_with_cxx_compiler.yml @@ -0,0 +1,27 @@ +name: Build Examples with C++ Compiler + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +concurrency: + group: ${{ github.ref }}-${{ github.workflow }} + cancel-in-progress: true + +jobs: + build-examples: + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v4 + - name: Generate lv_conf.h + run: | + cp lv_conf_template.h lv_conf.h + python ./scripts/generate_lv_conf.py \ + --template lv_conf_template.h \ + --config lv_conf.h \ + --defaults configs/ci/examples/lv_conf_examples.defaults + - name: Build Examples with C++ compiler + run: g++ -DLV_CONF_PATH="\"$(pwd)/lv_conf.h\"" -Werror -c $(find examples -type f \( -name '*.cpp' -o -name '*.c' \)) + diff --git a/configs/ci/examples/lv_conf_examples.defaults b/configs/ci/examples/lv_conf_examples.defaults new file mode 100644 index 0000000000..6d5ae86765 --- /dev/null +++ b/configs/ci/examples/lv_conf_examples.defaults @@ -0,0 +1,125 @@ +LV_DRAW_BUF_STRIDE_ALIGN 1 +LV_DRAW_BUF_ALIGN 4 +LV_DRAW_TRANSFORM_USE_MATRIX 1 +LV_USE_DRAW_SW 1 +LV_DRAW_SW_SUPPORT_RGB565 1 +LV_DRAW_SW_SUPPORT_RGB565A8 1 +LV_DRAW_SW_SUPPORT_RGB888 1 +LV_DRAW_SW_SUPPORT_XRGB8888 1 +LV_DRAW_SW_SUPPORT_ARGB8888 1 +LV_DRAW_SW_SUPPORT_ARGB8888_PREMULTIPLIED 1 +LV_DRAW_SW_SUPPORT_L8 1 +LV_DRAW_SW_SUPPORT_AL88 1 +LV_DRAW_SW_SUPPORT_A8 1 +LV_DRAW_SW_SUPPORT_I1 1 +LV_DRAW_SW_COMPLEX 1 +LV_DRAW_SW_SHADOW_CACHE_SIZE 0 +LV_DRAW_SW_CIRCLE_CACHE_SIZE 4 +LV_USE_DRAW_SW_COMPLEX_GRADIENTS 1 +LV_GRADIENT_MAX_STOPS 8 +LV_USE_GESTURE_RECOGNITION 1 +LV_USE_FLOAT 1 +LV_USE_MATRIX 1 +LV_FONT_MONTSERRAT_8 1 +LV_FONT_MONTSERRAT_10 1 +LV_FONT_MONTSERRAT_12 1 +LV_FONT_MONTSERRAT_14 1 +LV_FONT_MONTSERRAT_16 1 +LV_FONT_MONTSERRAT_18 1 +LV_FONT_MONTSERRAT_20 1 +LV_FONT_MONTSERRAT_22 1 +LV_FONT_MONTSERRAT_24 1 +LV_FONT_MONTSERRAT_26 1 +LV_FONT_MONTSERRAT_28 1 +LV_FONT_MONTSERRAT_30 1 +LV_FONT_MONTSERRAT_32 1 +LV_FONT_MONTSERRAT_34 1 +LV_FONT_MONTSERRAT_36 1 +LV_FONT_MONTSERRAT_38 1 +LV_FONT_MONTSERRAT_40 1 +LV_FONT_MONTSERRAT_42 1 +LV_FONT_MONTSERRAT_44 1 +LV_FONT_MONTSERRAT_46 1 +LV_FONT_MONTSERRAT_48 1 +LV_FONT_MONTSERRAT_28_COMPRESSED 1 +LV_FONT_DEJAVU_16_PERSIAN_HEBREW 1 +LV_FONT_SIMSUN_14_CJK 1 +LV_FONT_SIMSUN_16_CJK 1 +LV_FONT_SOURCE_HAN_SANS_SC_14_CJK 1 +LV_FONT_SOURCE_HAN_SANS_SC_16_CJK 1 +LV_FONT_UNSCII_8 1 +LV_FONT_UNSCII_16 1 +LV_FONT_DEFAULT &lv_font_montserrat_14 +LV_USE_FONT_PLACEHOLDER 1 +LV_USE_BIDI 1 +LV_USE_ARABIC_PERSIAN_CHARS 1 +LV_TXT_COLOR_CMD "#" +LV_WIDGETS_HAS_DEFAULT_VALUE 1 +LV_USE_ANIMIMG 1 +LV_USE_ARC 1 +LV_USE_BAR 1 +LV_USE_BUTTON 1 +LV_USE_BUTTONMATRIX 1 +LV_USE_CALENDAR 1 +LV_USE_CALENDAR_CHINESE 1 +LV_USE_CANVAS 1 +LV_USE_CHART 1 +LV_USE_CHECKBOX 1 +LV_USE_DROPDOWN 1 +LV_USE_IMAGE 1 +LV_USE_IMAGEBUTTON 1 +LV_USE_KEYBOARD 1 +LV_USE_LABEL 1 +LV_USE_LED 1 +LV_USE_LINE 1 +LV_USE_LIST 1 +LV_USE_LOTTIE 0 +LV_USE_MENU 1 +LV_USE_MSGBOX 1 +LV_USE_ROLLER 1 +LV_USE_SCALE 1 +LV_USE_SLIDER 1 +LV_USE_SPAN 1 +LV_USE_SPINBOX 1 +LV_USE_SPINNER 1 +LV_USE_SWITCH 1 +LV_USE_TABLE 1 +LV_USE_TABVIEW 1 +LV_USE_TEXTAREA 1 +LV_USE_TILEVIEW 1 +LV_USE_WIN 1 +LV_USE_THEME_DEFAULT 1 +LV_USE_THEME_SIMPLE 1 +LV_USE_THEME_MONO 1 +LV_USE_FLEX 1 +LV_USE_GRID 1 +LV_USE_FS_STDIO 1 +LV_USE_FS_FATFS 0 +LV_USE_LODEPNG 1 +LV_USE_LIBPNG 1 +LV_USE_BMP 1 +LV_USE_TJPGD 1 +LV_USE_LIBJPEG_TURBO 1 +LV_USE_GIF 1 +LV_USE_RLE 1 +LV_USE_QRCODE 1 +LV_USE_BARCODE 1 +LV_USE_FREETYPE 1 +LV_USE_TINY_TTF 1 +LV_USE_RLOTTIE 1 +LV_USE_VECTOR_GRAPHIC 1 +LV_USE_LZ4_INTERNAL 1 +LV_USE_LZ4_EXTERNAL 1 +LV_USE_SVG 1 +LV_USE_FFMPEG 1 +LV_USE_SNAPSHOT 1 +LV_USE_MONKEY 1 +LV_USE_GRIDNAV 1 +LV_USE_FRAGMENT 1 +LV_USE_IMGFONT 1 +LV_USE_OBSERVER 1 +LV_USE_IME_PINYIN 1 +LV_USE_FILE_EXPLORER 1 +LV_USE_FONT_MANAGER 1 +LV_USE_XML 1 +LV_BUILD_EXAMPLES 1 diff --git a/examples/anim/lv_example_anim_1.c b/examples/anim/lv_example_anim_1.c index 168f5ad574..aa32555376 100644 --- a/examples/anim/lv_example_anim_1.c +++ b/examples/anim/lv_example_anim_1.c @@ -3,13 +3,13 @@ static void anim_x_cb(void * var, int32_t v) { - lv_obj_set_x(var, v); + lv_obj_set_x((lv_obj_t *) var, v); } static void sw_event_cb(lv_event_t * e) { - lv_obj_t * sw = lv_event_get_target(e); - lv_obj_t * label = lv_event_get_user_data(e); + lv_obj_t * sw = lv_event_get_target_obj(e); + lv_obj_t * label = (lv_obj_t *) lv_event_get_user_data(e); if(lv_obj_has_state(sw, LV_STATE_CHECKED)) { lv_anim_t a; diff --git a/examples/anim/lv_example_anim_2.c b/examples/anim/lv_example_anim_2.c index 00eed004ee..24fe7bde6a 100644 --- a/examples/anim/lv_example_anim_2.c +++ b/examples/anim/lv_example_anim_2.c @@ -3,12 +3,12 @@ static void anim_x_cb(void * var, int32_t v) { - lv_obj_set_x(var, v); + lv_obj_set_x((lv_obj_t *) var, v); } static void anim_size_cb(void * var, int32_t v) { - lv_obj_set_size(var, v, v); + lv_obj_set_size((lv_obj_t *) var, v, v); } /** diff --git a/examples/anim/lv_example_anim_3.c b/examples/anim/lv_example_anim_3.c index a0b42fd2fe..31bd053912 100644 --- a/examples/anim/lv_example_anim_3.c +++ b/examples/anim/lv_example_anim_3.c @@ -85,7 +85,7 @@ static void refer_chart_cubic_bezier(void) static void anim_x_cb(void * var, int32_t v) { - lv_obj_set_style_translate_x(var, v, LV_PART_MAIN); + lv_obj_set_style_translate_x((lv_obj_t *)var, v, LV_PART_MAIN); } static void run_button_event_handler(lv_event_t * e) @@ -100,7 +100,7 @@ static void slider_event_cb(lv_event_t * e) { char buf[16]; lv_obj_t * label; - lv_obj_t * slider = lv_event_get_target(e); + lv_obj_t * slider = lv_event_get_target_obj(e); if(slider == ginfo.p1_slider) { label = ginfo.p1_label; diff --git a/examples/anim/lv_example_anim_4.c b/examples/anim/lv_example_anim_4.c index 7f152e8f50..1e92344887 100644 --- a/examples/anim/lv_example_anim_4.c +++ b/examples/anim/lv_example_anim_4.c @@ -3,20 +3,20 @@ static void anim_x_cb(void * var, int32_t v) { - lv_obj_set_x(var, v); + lv_obj_set_x((lv_obj_t *) var, v); } static void timer_cb(lv_timer_t * timer) { - lv_anim_t * anim = lv_timer_get_user_data(timer); + lv_anim_t * anim = (lv_anim_t *) lv_timer_get_user_data(timer); lv_anim_pause_for(anim, 1000); lv_timer_delete(timer); } static void sw_event_cb(lv_event_t * e) { - lv_obj_t * sw = lv_event_get_target(e); - lv_obj_t * label = lv_event_get_user_data(e); + lv_obj_t * sw = lv_event_get_target_obj(e); + lv_obj_t * label = (lv_obj_t *) lv_event_get_user_data(e); if(lv_obj_has_state(sw, LV_STATE_CHECKED)) { lv_anim_t a; diff --git a/examples/anim/lv_example_anim_timeline_1.c b/examples/anim/lv_example_anim_timeline_1.c index 89ee2d5b3e..9ff2cf8363 100644 --- a/examples/anim/lv_example_anim_timeline_1.c +++ b/examples/anim/lv_example_anim_timeline_1.c @@ -6,23 +6,23 @@ static const int32_t obj_height = 70; static void set_width(lv_anim_t * var, int32_t v) { - lv_obj_set_width(var->var, v); + lv_obj_set_width((lv_obj_t *) var->var, v); } static void set_height(lv_anim_t * var, int32_t v) { - lv_obj_set_height(var->var, v); + lv_obj_set_height((lv_obj_t *) var->var, v); } static void set_slider_value(lv_anim_t * var, int32_t v) { - lv_slider_set_value(var->var, v, LV_ANIM_OFF); + lv_slider_set_value((lv_obj_t *) var->var, v, LV_ANIM_OFF); } static void btn_start_event_handler(lv_event_t * e) { lv_obj_t * btn = lv_event_get_current_target_obj(e); - lv_anim_timeline_t * anim_timeline = lv_event_get_user_data(e); + lv_anim_timeline_t * anim_timeline = (lv_anim_timeline_t *) lv_event_get_user_data(e); bool reverse = lv_obj_has_state(btn, LV_STATE_CHECKED); lv_anim_timeline_set_reverse(anim_timeline, reverse); @@ -31,14 +31,14 @@ static void btn_start_event_handler(lv_event_t * e) static void btn_pause_event_handler(lv_event_t * e) { - lv_anim_timeline_t * anim_timeline = lv_event_get_user_data(e); + lv_anim_timeline_t * anim_timeline = (lv_anim_timeline_t *) lv_event_get_user_data(e); lv_anim_timeline_pause(anim_timeline); } static void slider_prg_event_handler(lv_event_t * e) { lv_obj_t * slider = lv_event_get_current_target_obj(e); - lv_anim_timeline_t * anim_timeline = lv_event_get_user_data(e); + lv_anim_timeline_t * anim_timeline = (lv_anim_timeline_t *) lv_event_get_user_data(e); int32_t progress = lv_slider_get_value(slider); lv_anim_timeline_set_progress(anim_timeline, (uint16_t) progress); } diff --git a/examples/assets/animimg001.c b/examples/assets/animimg001.c index a2f3134e7d..4b96b8e658 100644 --- a/examples/assets/animimg001.c +++ b/examples/assets/animimg001.c @@ -184,12 +184,14 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_ANIMIMG }; const lv_image_dsc_t animimg001 = { - .header.w = 130, - .header.h = 170, - .header.stride = 520, - .header.cf = LV_COLOR_FORMAT_ARGB8888, - .data = animimg001_map, + .header = { + .cf = LV_COLOR_FORMAT_ARGB8888, + .w = 130, + .h = 170, + .stride = 520, + }, .data_size = sizeof(animimg001_map), + .data = animimg001_map, }; #endif /* LV_BUILD_EXAMPLES */ diff --git a/examples/assets/animimg002.c b/examples/assets/animimg002.c index 5cd5818cce..11b4c0794b 100644 --- a/examples/assets/animimg002.c +++ b/examples/assets/animimg002.c @@ -184,12 +184,14 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_ANIMIMG }; const lv_image_dsc_t animimg002 = { - .header.w = 130, - .header.h = 170, - .header.stride = 520, - .header.cf = LV_COLOR_FORMAT_ARGB8888, - .data = animimg002_map, + .header = { + .cf = LV_COLOR_FORMAT_ARGB8888, + .w = 130, + .h = 170, + .stride = 520, + }, .data_size = sizeof(animimg002_map), + .data = animimg002_map, }; #endif /* LV_BUILD_EXAMPLES */ diff --git a/examples/assets/animimg003.c b/examples/assets/animimg003.c index fe2133008e..bf2d121081 100644 --- a/examples/assets/animimg003.c +++ b/examples/assets/animimg003.c @@ -184,12 +184,14 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_ANIMIMG }; const lv_image_dsc_t animimg003 = { - .header.w = 130, - .header.h = 170, - .header.stride = 520, - .header.cf = LV_COLOR_FORMAT_ARGB8888, - .data = animimg003_map, + .header = { + .cf = LV_COLOR_FORMAT_ARGB8888, + .w = 130, + .h = 170, + .stride = 520, + }, .data_size = sizeof(animimg003_map), + .data = animimg003_map, }; #endif /* LV_BUILD_EXAMPLES */ diff --git a/examples/assets/emoji/img_emoji_F617.c b/examples/assets/emoji/img_emoji_F617.c index f5c9700afe..3b545912dc 100644 --- a/examples/assets/emoji/img_emoji_F617.c +++ b/examples/assets/emoji/img_emoji_F617.c @@ -239,16 +239,18 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMAGE_1F617 uint8_t emoji_F617_map[] = }; const lv_image_dsc_t emoji_F617 = { - .header.cf = LV_COLOR_FORMAT_NATIVE, - .header.w = 72, - .header.h = 72, + .header = { + .cf = LV_COLOR_FORMAT_NATIVE, + .w = 72, + .h = 72, #if LV_COLOR_DEPTH == 1 || LV_COLOR_DEPTH == 8 - .header.stride = 72, + .stride = 72, #elif LV_COLOR_DEPTH == 16 - .header.stride = 144, + .stride = 144, #elif LV_COLOR_DEPTH == 32 - .header.stride = 288, + .stride = 288, #endif - .data = emoji_F617_map, + }, .data_size = sizeof(emoji_F617_map), + .data = emoji_F617_map, }; diff --git a/examples/assets/img_caret_down.c b/examples/assets/img_caret_down.c index 60bfdfcf49..7042682c6c 100644 --- a/examples/assets/img_caret_down.c +++ b/examples/assets/img_caret_down.c @@ -47,12 +47,14 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_CAR }; const lv_image_dsc_t img_caret_down = { - .header.w = 13, - .header.h = 8, - .header.stride = 52, - .header.cf = LV_COLOR_FORMAT_ARGB8888, - .data = img_caret_down_map, + .header = { + .cf = LV_COLOR_FORMAT_ARGB8888, + .w = 13, + .h = 8, + .stride = 52, + }, .data_size = sizeof(img_caret_down_map), + .data = img_caret_down_map, }; #endif /* LV_BUILD_EXAMPLES */ diff --git a/examples/assets/img_cogwheel_argb.c b/examples/assets/img_cogwheel_argb.c index 0b40623290..a6e4bcabff 100644 --- a/examples/assets/img_cogwheel_argb.c +++ b/examples/assets/img_cogwheel_argb.c @@ -115,12 +115,14 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMAGE_IMG_COGWHEEL_ARGB uint8_t img_co }; const lv_image_dsc_t img_cogwheel_argb = { - .header.w = 100, - .header.h = 100, - .header.stride = 400, - .header.cf = LV_COLOR_FORMAT_ARGB8888, - .data = img_cogwheel_argb_map, + .header = { + .cf = LV_COLOR_FORMAT_ARGB8888, + .w = 100, + .h = 100, + .stride = 400, + }, .data_size = sizeof(img_cogwheel_argb_map), + .data = img_cogwheel_argb_map, }; #endif /* LV_BUILD_EXAMPLES */ diff --git a/examples/assets/img_cogwheel_indexed16.c b/examples/assets/img_cogwheel_indexed16.c index 78c4bf7bfb..910170e47b 100644 --- a/examples/assets/img_cogwheel_indexed16.c +++ b/examples/assets/img_cogwheel_indexed16.c @@ -131,12 +131,14 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMAGE_IMG_COGWHEEL_INDEXED16 uint8_t i }; const lv_image_dsc_t img_cogwheel_indexed16 = { - .header.w = 100, - .header.h = 100, - .header.stride = 50, - .header.cf = LV_COLOR_FORMAT_I4, - .data = img_cogwheel_indexed16_map, + .header = { + .cf = LV_COLOR_FORMAT_I4, + .w = 100, + .h = 100, + .stride = 50, + }, .data_size = sizeof(img_cogwheel_indexed16_map), + .data = img_cogwheel_indexed16_map, }; #endif /* LV_BUILD_EXAMPLES */ diff --git a/examples/assets/img_cogwheel_rgb.c b/examples/assets/img_cogwheel_rgb.c index 64d4273e1f..52d1feea7c 100644 --- a/examples/assets/img_cogwheel_rgb.c +++ b/examples/assets/img_cogwheel_rgb.c @@ -426,20 +426,22 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMAGE_IMG_COGWHEEL_RGB uint8_t img_cog }; const lv_image_dsc_t img_cogwheel_rgb = { - .header.w = 100, - .header.h = 100, + .header = { + .cf = LV_COLOR_FORMAT_NATIVE, + .w = 100, + .h = 100, #if LV_COLOR_DEPTH == 1 || LV_COLOR_DEPTH == 8 - .header.stride = 100, + .stride = 100, #elif LV_COLOR_DEPTH == 16 - .header.stride = 200, + .stride = 200, #elif LV_COLOR_DEPTH == 24 - .header.stride = 300, + .stride = 300, #elif LV_COLOR_DEPTH == 32 - .header.stride = 400, + .stride = 400, #endif - .header.cf = LV_COLOR_FORMAT_NATIVE, - .data = img_cogwheel_rgb_map, + }, .data_size = sizeof(img_cogwheel_rgb_map), + .data = img_cogwheel_rgb_map, }; #endif /* LV_BUILD_EXAMPLES */ diff --git a/examples/assets/img_hand.c b/examples/assets/img_hand.c index 6ffbbc82d0..bc43ee03f9 100644 --- a/examples/assets/img_hand.c +++ b/examples/assets/img_hand.c @@ -23,12 +23,14 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_IMAGE_IMG_HAND uint8_t img_hand_map[] }; const lv_image_dsc_t img_hand = { - .header.w = 100, - .header.h = 9, - .header.stride = 400, - .header.cf = LV_COLOR_FORMAT_ARGB8888, - .data = img_hand_map, + .header = { + .cf = LV_COLOR_FORMAT_ARGB8888, + .w = 100, + .h = 9, + .stride = 400, + }, .data_size = sizeof(img_hand_map), + .data = img_hand_map, }; #endif /* LV_BUILD_EXAMPLES */ diff --git a/examples/assets/img_skew_strip.c b/examples/assets/img_skew_strip.c index 67e819557f..51109513b5 100644 --- a/examples/assets/img_skew_strip.c +++ b/examples/assets/img_skew_strip.c @@ -34,10 +34,12 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_SKE }; const lv_image_dsc_t img_skew_strip = { - .header.cf = LV_COLOR_FORMAT_ARGB8888, - .header.magic = LV_IMAGE_HEADER_MAGIC, - .header.w = 80, - .header.h = 20, + .header = { + .magic = LV_IMAGE_HEADER_MAGIC, + .cf = LV_COLOR_FORMAT_ARGB8888, + .w = 80, + .h = 20, + }, .data_size = 1600 * 4, .data = img_skew_strip_map, }; diff --git a/examples/assets/img_star.c b/examples/assets/img_star.c index d62098fa79..39db5d4ab4 100644 --- a/examples/assets/img_star.c +++ b/examples/assets/img_star.c @@ -1,16 +1,4 @@ -#ifdef __has_include - #if __has_include("lvgl.h") - #ifndef LV_LVGL_H_INCLUDE_SIMPLE - #define LV_LVGL_H_INCLUDE_SIMPLE - #endif - #endif -#endif - -#if defined(LV_LVGL_H_INCLUDE_SIMPLE) - #include "lvgl.h" -#else - #include "lvgl/lvgl.h" -#endif +#include "../../lvgl.h" #ifndef LV_ATTRIBUTE_MEM_ALIGN @@ -54,11 +42,13 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMG_STA }; const lv_image_dsc_t img_star = { - .header.cf = LV_COLOR_FORMAT_ARGB8888, - .header.magic = LV_IMAGE_HEADER_MAGIC, - .header.w = 30, - .header.h = 29, - .header.stride = 120, - .data_size = 870 * 4, + .header = { + .magic = LV_IMAGE_HEADER_MAGIC, + .cf = LV_COLOR_FORMAT_ARGB8888, + .w = 30, + .h = 29, + .stride = 120, + }, + .data_size = sizeof(img_star_map), .data = img_star_map, }; diff --git a/examples/assets/img_svg_img.c b/examples/assets/img_svg_img.c index b7402699f5..0383d9a218 100644 --- a/examples/assets/img_svg_img.c +++ b/examples/assets/img_svg_img.c @@ -7,12 +7,14 @@ const LV_ATTRIBUTE_MEM_ALIGN uint8_t img_svg_data[] = ""; const lv_image_dsc_t img_svg_img = { - .header.w = 450, - .header.h = 150, - .header.stride = 0, - .header.cf = LV_COLOR_FORMAT_NATIVE, - .data = img_svg_data, + .header = { + .cf = LV_COLOR_FORMAT_NATIVE, + .w = 450, + .h = 150, + .stride = 0, + }, .data_size = sizeof(img_svg_data), + .data = img_svg_data, }; #endif /* LV_BUILD_EXAMPLES */ diff --git a/examples/assets/imgbtn_left.c b/examples/assets/imgbtn_left.c index 31dd4a624b..2616123d91 100644 --- a/examples/assets/imgbtn_left.c +++ b/examples/assets/imgbtn_left.c @@ -65,12 +65,14 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMGBTN_ }; const lv_image_dsc_t imagebutton_left = { - .header.w = 8, - .header.h = 50, - .header.stride = 32, - .header.cf = LV_COLOR_FORMAT_ARGB8888, - .data = imagebutton_left_map, + .header = { + .cf = LV_COLOR_FORMAT_ARGB8888, + .w = 8, + .h = 50, + .stride = 32, + }, .data_size = sizeof(imagebutton_left_map), + .data = imagebutton_left_map, }; #endif /* LV_BUILD_EXAMPLES */ diff --git a/examples/assets/imgbtn_mid.c b/examples/assets/imgbtn_mid.c index eda552315d..99376b3fa7 100644 --- a/examples/assets/imgbtn_mid.c +++ b/examples/assets/imgbtn_mid.c @@ -64,12 +64,14 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMGBTN_ }; const lv_image_dsc_t imagebutton_mid = { - .header.w = 5, - .header.h = 49, - .header.stride = 20, - .header.cf = LV_COLOR_FORMAT_ARGB8888, - .data = imagebutton_mid_map, + .header = { + .cf = LV_COLOR_FORMAT_ARGB8888, + .w = 5, + .h = 49, + .stride = 20, + }, .data_size = sizeof(imagebutton_mid_map), + .data = imagebutton_mid_map, }; #endif /* LV_BUILD_EXAMPLES */ diff --git a/examples/assets/imgbtn_right.c b/examples/assets/imgbtn_right.c index 4586b688c5..501816393c 100644 --- a/examples/assets/imgbtn_right.c +++ b/examples/assets/imgbtn_right.c @@ -66,12 +66,14 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_IMGBTN_ }; const lv_image_dsc_t imagebutton_right = { - .header.w = 8, - .header.h = 50, - .header.stride = 32, - .header.cf = LV_COLOR_FORMAT_ARGB8888, - .data = imagebutton_right_map, + .header = { + .cf = LV_COLOR_FORMAT_ARGB8888, + .w = 8, + .h = 50, + .stride = 32, + }, .data_size = sizeof(imagebutton_right_map), + .data = imagebutton_right_map, }; #endif /* LV_BUILD_EXAMPLES */ diff --git a/examples/event/lv_example_event_bubble.c b/examples/event/lv_example_event_bubble.c index dedac2f38d..1ef511e314 100644 --- a/examples/event/lv_example_event_bubble.c +++ b/examples/event/lv_example_event_bubble.c @@ -4,10 +4,10 @@ static void event_cb(lv_event_t * e) { /*The original target of the event. Can be the buttons or the container*/ - lv_obj_t * target = lv_event_get_target(e); + lv_obj_t * target = lv_event_get_target_obj(e); /*The current target is always the container as the event is added to it*/ - lv_obj_t * cont = lv_event_get_current_target(e); + lv_obj_t * cont = lv_event_get_current_target_obj(e); /*If container was clicked do nothing*/ if(target == cont) return; @@ -34,7 +34,7 @@ void lv_example_event_bubble(void) lv_obj_add_flag(btn, LV_OBJ_FLAG_EVENT_BUBBLE); lv_obj_t * label = lv_label_create(btn); - lv_label_set_text_fmt(label, "%"LV_PRIu32, i); + lv_label_set_text_fmt(label, "%" LV_PRIu32, i); lv_obj_center(label); } diff --git a/examples/event/lv_example_event_button.c b/examples/event/lv_example_event_button.c index 8f5ea30e02..afc9ce6ba5 100644 --- a/examples/event/lv_example_event_button.c +++ b/examples/event/lv_example_event_button.c @@ -4,7 +4,7 @@ static void event_cb(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); - lv_obj_t * label = lv_event_get_user_data(e); + lv_obj_t * label = (lv_obj_t *) lv_event_get_user_data(e); switch(code) { case LV_EVENT_PRESSED: diff --git a/examples/event/lv_example_event_click.c b/examples/event/lv_example_event_click.c index fd81002666..1c2a027ff0 100644 --- a/examples/event/lv_example_event_click.c +++ b/examples/event/lv_example_event_click.c @@ -6,9 +6,9 @@ static void event_cb(lv_event_t * e) LV_LOG_USER("Clicked"); static uint32_t cnt = 1; - lv_obj_t * btn = lv_event_get_target(e); + lv_obj_t * btn = lv_event_get_target_obj(e); lv_obj_t * label = lv_obj_get_child(btn, 0); - lv_label_set_text_fmt(label, "%"LV_PRIu32, cnt); + lv_label_set_text_fmt(label, "%" LV_PRIu32, cnt); cnt++; } diff --git a/examples/event/lv_example_event_draw.c b/examples/event/lv_example_event_draw.c index c4a5c7ced9..da8191dda9 100644 --- a/examples/event/lv_example_event_draw.c +++ b/examples/event/lv_example_event_draw.c @@ -7,7 +7,7 @@ static bool size_dec = false; static void timer_cb(lv_timer_t * timer) { - lv_obj_invalidate(lv_timer_get_user_data(timer)); + lv_obj_invalidate((lv_obj_t *) lv_timer_get_user_data(timer)); if(size_dec) size--; else size++; @@ -17,9 +17,9 @@ static void timer_cb(lv_timer_t * timer) static void event_cb(lv_event_t * e) { - lv_obj_t * obj = lv_event_get_target(e); + lv_obj_t * obj = lv_event_get_target_obj(e); lv_draw_task_t * draw_task = lv_event_get_draw_task(e); - lv_draw_dsc_base_t * base_dsc = lv_draw_task_get_draw_dsc(draw_task); + lv_draw_dsc_base_t * base_dsc = (lv_draw_dsc_base_t *) lv_draw_task_get_draw_dsc(draw_task); if(base_dsc->part == LV_PART_MAIN) { lv_draw_rect_dsc_t draw_dsc; lv_draw_rect_dsc_init(&draw_dsc); diff --git a/examples/event/lv_example_event_streak.c b/examples/event/lv_example_event_streak.c index e1b1131c23..fe518fb461 100644 --- a/examples/event/lv_example_event_streak.c +++ b/examples/event/lv_example_event_streak.c @@ -5,17 +5,17 @@ static void short_click_event_cb(lv_event_t * e) { LV_LOG_USER("Short clicked"); - lv_obj_t * info_label = lv_event_get_user_data(e); - lv_indev_t * indev = lv_event_get_param(e); + lv_obj_t * info_label = (lv_obj_t *) lv_event_get_user_data(e); + lv_indev_t * indev = (lv_indev_t *) lv_event_get_param(e); uint8_t cnt = lv_indev_get_short_click_streak(indev); lv_label_set_text_fmt(info_label, "Short click streak: %u", cnt); } static void streak_event_cb(lv_event_t * e) { - lv_obj_t * btn = lv_event_get_target(e); + lv_obj_t * btn = lv_event_get_target_obj(e); lv_obj_t * label = lv_obj_get_child(btn, 0); - const char * text = lv_event_get_user_data(e); + const char * text = (const char *) lv_event_get_user_data(e); lv_label_set_text(label, text); } @@ -28,9 +28,9 @@ void lv_example_event_streak(void) lv_obj_set_size(btn, 100, 50); lv_obj_center(btn); lv_obj_add_event_cb(btn, short_click_event_cb, LV_EVENT_SHORT_CLICKED, info_label); - lv_obj_add_event_cb(btn, streak_event_cb, LV_EVENT_SINGLE_CLICKED, "Single clicked"); - lv_obj_add_event_cb(btn, streak_event_cb, LV_EVENT_DOUBLE_CLICKED, "Double clicked"); - lv_obj_add_event_cb(btn, streak_event_cb, LV_EVENT_TRIPLE_CLICKED, "Triple clicked"); + lv_obj_add_event_cb(btn, streak_event_cb, LV_EVENT_SINGLE_CLICKED, (void *) "Single clicked"); + lv_obj_add_event_cb(btn, streak_event_cb, LV_EVENT_DOUBLE_CLICKED, (void *) "Double clicked"); + lv_obj_add_event_cb(btn, streak_event_cb, LV_EVENT_TRIPLE_CLICKED, (void *) "Triple clicked"); lv_obj_t * label = lv_label_create(btn); lv_label_set_text(label, "Click me!"); diff --git a/examples/get_started/lv_example_get_started_2.c b/examples/get_started/lv_example_get_started_2.c index 9edac9f03e..247fc539c7 100644 --- a/examples/get_started/lv_example_get_started_2.c +++ b/examples/get_started/lv_example_get_started_2.c @@ -4,7 +4,7 @@ static void btn_event_cb(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); - lv_obj_t * btn = lv_event_get_target(e); + lv_obj_t * btn = lv_event_get_target_obj(e); if(code == LV_EVENT_CLICKED) { static uint8_t cnt = 0; cnt++; diff --git a/examples/get_started/lv_example_get_started_4.c b/examples/get_started/lv_example_get_started_4.c index e6f3b97e29..368473c3ed 100644 --- a/examples/get_started/lv_example_get_started_4.c +++ b/examples/get_started/lv_example_get_started_4.c @@ -5,10 +5,10 @@ static lv_obj_t * label; static void slider_event_cb(lv_event_t * e) { - lv_obj_t * slider = lv_event_get_target(e); + lv_obj_t * slider = lv_event_get_target_obj(e); /*Refresh the text*/ - lv_label_set_text_fmt(label, "%"LV_PRId32, lv_slider_get_value(slider)); + lv_label_set_text_fmt(label, "%" LV_PRId32, lv_slider_get_value(slider)); lv_obj_align_to(label, slider, LV_ALIGN_OUT_TOP_MID, 0, -15); /*Align top of the slider*/ } diff --git a/examples/grad/lv_example_grad_1.c b/examples/grad/lv_example_grad_1.c index 2f8d70890a..3fd25fc868 100644 --- a/examples/grad/lv_example_grad_1.c +++ b/examples/grad/lv_example_grad_1.c @@ -3,10 +3,10 @@ static void position_bullet(lv_event_t * e, lv_point_t * p) { - lv_indev_t * indev = lv_event_get_param(e); + lv_indev_t * indev = (lv_indev_t *) lv_event_get_param(e); lv_indev_get_point(indev, p); - lv_obj_t * bullet = lv_event_get_target(e); + lv_obj_t * bullet = lv_event_get_target_obj(e); lv_obj_t * parent = lv_obj_get_parent(bullet); p->x -= lv_obj_get_x(parent); @@ -19,7 +19,7 @@ static void position_bullet(lv_event_t * e, lv_point_t * p) static void frac_1_event_cb(lv_event_t * e) { - lv_style_t * style = lv_event_get_user_data(e); + lv_style_t * style = (lv_style_t *) lv_event_get_user_data(e); lv_style_value_t v; if(lv_style_get_prop(style, LV_STYLE_BG_GRAD, &v) != LV_STYLE_RES_FOUND) { LV_LOG_WARN("style prop not found"); @@ -30,7 +30,7 @@ static void frac_1_event_cb(lv_event_t * e) lv_point_t p; position_bullet(e, &p); - lv_obj_t * bullet = lv_event_get_target(e); + lv_obj_t * bullet = lv_event_get_target_obj(e); lv_obj_t * parent = lv_obj_get_parent(bullet); dsc->stops[0].frac = (uint8_t)LV_CLAMP(0, p.x * 255 / lv_obj_get_width(parent), 255); @@ -40,7 +40,7 @@ static void frac_1_event_cb(lv_event_t * e) static void frac_2_event_cb(lv_event_t * e) { - lv_style_t * style = lv_event_get_user_data(e); + lv_style_t * style = (lv_style_t *) lv_event_get_user_data(e); lv_style_value_t v; if(lv_style_get_prop(style, LV_STYLE_BG_GRAD, &v) != LV_STYLE_RES_FOUND) { LV_LOG_WARN("style prop not found"); @@ -51,7 +51,7 @@ static void frac_2_event_cb(lv_event_t * e) lv_point_t p; position_bullet(e, &p); - lv_obj_t * bullet = lv_event_get_target(e); + lv_obj_t * bullet = lv_event_get_target_obj(e); lv_obj_t * parent = lv_obj_get_parent(bullet); dsc->stops[1].frac = (uint8_t)LV_CLAMP(0, p.x * 255 / lv_obj_get_width(parent), 255); diff --git a/examples/grad/lv_example_grad_2.c b/examples/grad/lv_example_grad_2.c index 2de98181cf..e59600c108 100644 --- a/examples/grad/lv_example_grad_2.c +++ b/examples/grad/lv_example_grad_2.c @@ -1,13 +1,12 @@ #include "../lv_examples.h" #if LV_BUILD_EXAMPLES && LV_USE_LABEL - #if LV_USE_DRAW_SW_COMPLEX_GRADIENTS static void position_bullet(lv_event_t * e, lv_point_t * p) { - lv_indev_t * indev = lv_event_get_param(e); + lv_indev_t * indev = (lv_indev_t *) lv_event_get_param(e); lv_indev_get_point(indev, p); - lv_obj_t * bullet = lv_event_get_target(e); + lv_obj_t * bullet = lv_event_get_target_obj(e); lv_obj_t * parent = lv_obj_get_parent(bullet); p->x -= lv_obj_get_x(parent); @@ -20,7 +19,7 @@ static void position_bullet(lv_event_t * e, lv_point_t * p) static void start_event_cb(lv_event_t * e) { - lv_style_t * style = lv_event_get_user_data(e); + lv_style_t * style = (lv_style_t *) lv_event_get_user_data(e); lv_style_value_t v; lv_style_get_prop(style, LV_STYLE_BG_GRAD, &v); lv_grad_dsc_t * dsc = (lv_grad_dsc_t *)v.ptr; @@ -31,14 +30,14 @@ static void start_event_cb(lv_event_t * e) dsc->params.linear.start.x = p.x; dsc->params.linear.start.y = p.y; - lv_obj_t * bullet = lv_event_get_target(e); + lv_obj_t * bullet = lv_event_get_target_obj(e); lv_obj_t * parent = lv_obj_get_parent(bullet); lv_obj_invalidate(parent); } static void end_event_cb(lv_event_t * e) { - lv_style_t * style = lv_event_get_user_data(e); + lv_style_t * style = (lv_style_t *) lv_event_get_user_data(e); lv_style_value_t v; lv_style_get_prop(style, LV_STYLE_BG_GRAD, &v); lv_grad_dsc_t * dsc = (lv_grad_dsc_t *)v.ptr; @@ -49,7 +48,7 @@ static void end_event_cb(lv_event_t * e) dsc->params.linear.end.x = p.x; dsc->params.linear.end.y = p.y; - lv_obj_t * bullet = lv_event_get_target(e); + lv_obj_t * bullet = lv_event_get_target_obj(e); lv_obj_t * parent = lv_obj_get_parent(bullet); lv_obj_invalidate(parent); } diff --git a/examples/grad/lv_example_grad_3.c b/examples/grad/lv_example_grad_3.c index bb2ec83fec..cc9368aca5 100644 --- a/examples/grad/lv_example_grad_3.c +++ b/examples/grad/lv_example_grad_3.c @@ -5,10 +5,10 @@ static void position_bullet(lv_event_t * e, lv_point_t * p) { - lv_indev_t * indev = lv_event_get_param(e); + lv_indev_t * indev = (lv_indev_t *) lv_event_get_param(e); lv_indev_get_point(indev, p); - lv_obj_t * bullet = lv_event_get_target(e); + lv_obj_t * bullet = lv_event_get_target_obj(e); lv_obj_t * parent = lv_obj_get_parent(bullet); p->x -= lv_obj_get_x(parent); @@ -21,7 +21,7 @@ static void position_bullet(lv_event_t * e, lv_point_t * p) static void focal_event_cb(lv_event_t * e) { - lv_style_t * style = lv_event_get_user_data(e); + lv_style_t * style = (lv_style_t *) lv_event_get_user_data(e); lv_style_value_t v; lv_style_get_prop(style, LV_STYLE_BG_GRAD, &v); lv_grad_dsc_t * dsc = (lv_grad_dsc_t *)v.ptr; @@ -34,14 +34,14 @@ static void focal_event_cb(lv_event_t * e) dsc->params.radial.focal_extent.x = p.x + 10; dsc->params.radial.focal_extent.y = p.y; - lv_obj_t * bullet = lv_event_get_target(e); + lv_obj_t * bullet = lv_event_get_target_obj(e); lv_obj_t * parent = lv_obj_get_parent(bullet); lv_obj_invalidate(parent); } static void end_event_cb(lv_event_t * e) { - lv_style_t * style = lv_event_get_user_data(e); + lv_style_t * style = (lv_style_t *) lv_event_get_user_data(e); lv_style_value_t v; lv_style_get_prop(style, LV_STYLE_BG_GRAD, &v); lv_grad_dsc_t * dsc = (lv_grad_dsc_t *)v.ptr; @@ -53,7 +53,7 @@ static void end_event_cb(lv_event_t * e) dsc->params.radial.end.y = p.y; dsc->params.radial.end_extent.x = p.x + 100; dsc->params.radial.end_extent.y = p.y; - lv_obj_t * bullet = lv_event_get_target(e); + lv_obj_t * bullet = lv_event_get_target_obj(e); lv_obj_t * parent = lv_obj_get_parent(bullet); lv_obj_invalidate(parent); } diff --git a/examples/grad/lv_example_grad_4.c b/examples/grad/lv_example_grad_4.c index 303108d7c4..07fddc45a1 100644 --- a/examples/grad/lv_example_grad_4.c +++ b/examples/grad/lv_example_grad_4.c @@ -5,10 +5,10 @@ static void position_bullet(lv_event_t * e, lv_point_t * p) { - lv_indev_t * indev = lv_event_get_param(e); + lv_indev_t * indev = (lv_indev_t *) lv_event_get_param(e); lv_indev_get_point(indev, p); - lv_obj_t * bullet = lv_event_get_target(e); + lv_obj_t * bullet = lv_event_get_target_obj(e); lv_obj_t * parent = lv_obj_get_parent(bullet); p->x -= lv_obj_get_x(parent); @@ -21,7 +21,7 @@ static void position_bullet(lv_event_t * e, lv_point_t * p) static void start_event_cb(lv_event_t * e) { - lv_style_t * style = lv_event_get_user_data(e); + lv_style_t * style = (lv_style_t *) lv_event_get_user_data(e); lv_style_value_t v; lv_style_get_prop(style, LV_STYLE_BG_GRAD, &v); lv_grad_dsc_t * dsc = (lv_grad_dsc_t *)v.ptr; @@ -29,7 +29,7 @@ static void start_event_cb(lv_event_t * e) lv_point_t p; position_bullet(e, &p); - lv_obj_t * bullet = lv_event_get_target(e); + lv_obj_t * bullet = lv_event_get_target_obj(e); lv_obj_t * parent = lv_obj_get_parent(bullet); p.x -= lv_obj_get_width(parent) / 2; p.y -= lv_obj_get_height(parent) / 2; @@ -40,7 +40,7 @@ static void start_event_cb(lv_event_t * e) static void end_event_cb(lv_event_t * e) { - lv_style_t * style = lv_event_get_user_data(e); + lv_style_t * style = (lv_style_t *) lv_event_get_user_data(e); lv_style_value_t v; lv_style_get_prop(style, LV_STYLE_BG_GRAD, &v); lv_grad_dsc_t * dsc = (lv_grad_dsc_t *)v.ptr; @@ -48,7 +48,7 @@ static void end_event_cb(lv_event_t * e) lv_point_t p; position_bullet(e, &p); - lv_obj_t * bullet = lv_event_get_target(e); + lv_obj_t * bullet = lv_event_get_target_obj(e); lv_obj_t * parent = lv_obj_get_parent(bullet); p.x -= lv_obj_get_width(parent) / 2; p.y -= lv_obj_get_height(parent) / 2; diff --git a/examples/layouts/flex/lv_example_flex_1.c b/examples/layouts/flex/lv_example_flex_1.c index b92a9bd2bc..6306011ac3 100644 --- a/examples/layouts/flex/lv_example_flex_1.c +++ b/examples/layouts/flex/lv_example_flex_1.c @@ -28,7 +28,7 @@ void lv_example_flex_1(void) lv_obj_set_size(obj, 100, LV_PCT(100)); label = lv_label_create(obj); - lv_label_set_text_fmt(label, "Item: %"LV_PRIu32"", i); + lv_label_set_text_fmt(label, "Item: %" LV_PRIu32"", i); lv_obj_center(label); /*Add items to the column*/ @@ -36,7 +36,7 @@ void lv_example_flex_1(void) lv_obj_set_size(obj, LV_PCT(100), LV_SIZE_CONTENT); label = lv_label_create(obj); - lv_label_set_text_fmt(label, "Item: %"LV_PRIu32, i); + lv_label_set_text_fmt(label, "Item: %" LV_PRIu32, i); lv_obj_center(label); } } diff --git a/examples/layouts/flex/lv_example_flex_2.c b/examples/layouts/flex/lv_example_flex_2.c index 7c5c3d0406..25a4ce0d35 100644 --- a/examples/layouts/flex/lv_example_flex_2.c +++ b/examples/layouts/flex/lv_example_flex_2.c @@ -24,7 +24,7 @@ void lv_example_flex_2(void) lv_obj_add_flag(obj, LV_OBJ_FLAG_CHECKABLE); lv_obj_t * label = lv_label_create(obj); - lv_label_set_text_fmt(label, "%"LV_PRIu32, i); + lv_label_set_text_fmt(label, "%" LV_PRIu32, i); lv_obj_center(label); } } diff --git a/examples/layouts/flex/lv_example_flex_4.c b/examples/layouts/flex/lv_example_flex_4.c index bf9a4ba2c9..12d4404bd8 100644 --- a/examples/layouts/flex/lv_example_flex_4.c +++ b/examples/layouts/flex/lv_example_flex_4.c @@ -18,7 +18,7 @@ void lv_example_flex_4(void) lv_obj_set_size(obj, 100, 50); lv_obj_t * label = lv_label_create(obj); - lv_label_set_text_fmt(label, "Item: %"LV_PRIu32, i); + lv_label_set_text_fmt(label, "Item: %" LV_PRIu32, i); lv_obj_center(label); } } diff --git a/examples/layouts/flex/lv_example_flex_5.c b/examples/layouts/flex/lv_example_flex_5.c index 06bea9e6c4..586503269e 100644 --- a/examples/layouts/flex/lv_example_flex_5.c +++ b/examples/layouts/flex/lv_example_flex_5.c @@ -3,12 +3,12 @@ static void row_gap_anim(void * obj, int32_t v) { - lv_obj_set_style_pad_row(obj, v, 0); + lv_obj_set_style_pad_row((lv_obj_t *) obj, v, 0); } static void column_gap_anim(void * obj, int32_t v) { - lv_obj_set_style_pad_column(obj, v, 0); + lv_obj_set_style_pad_column((lv_obj_t *) obj, v, 0); } /** @@ -27,7 +27,7 @@ void lv_example_flex_5(void) lv_obj_set_size(obj, 70, LV_SIZE_CONTENT); lv_obj_t * label = lv_label_create(obj); - lv_label_set_text_fmt(label, "%"LV_PRIu32, i); + lv_label_set_text_fmt(label, "%" LV_PRIu32, i); lv_obj_center(label); } diff --git a/examples/layouts/flex/lv_example_flex_6.c b/examples/layouts/flex/lv_example_flex_6.c index 0f9b27ccfe..b08cc33db3 100644 --- a/examples/layouts/flex/lv_example_flex_6.c +++ b/examples/layouts/flex/lv_example_flex_6.c @@ -19,7 +19,7 @@ void lv_example_flex_6(void) lv_obj_set_size(obj, 70, LV_SIZE_CONTENT); lv_obj_t * label = lv_label_create(obj); - lv_label_set_text_fmt(label, "%"LV_PRIu32, i); + lv_label_set_text_fmt(label, "%" LV_PRIu32, i); lv_obj_center(label); } } diff --git a/examples/layouts/grid/lv_example_grid_5.c b/examples/layouts/grid/lv_example_grid_5.c index d75ea602ea..6299269ee2 100644 --- a/examples/layouts/grid/lv_example_grid_5.c +++ b/examples/layouts/grid/lv_example_grid_5.c @@ -3,12 +3,12 @@ static void row_gap_anim(void * obj, int32_t v) { - lv_obj_set_style_pad_row(obj, v, 0); + lv_obj_set_style_pad_row((lv_obj_t *) obj, v, 0); } static void column_gap_anim(void * obj, int32_t v) { - lv_obj_set_style_pad_column(obj, v, 0); + lv_obj_set_style_pad_column((lv_obj_t *) obj, v, 0); } /** diff --git a/examples/libs/gif/img_bulb_gif.c b/examples/libs/gif/img_bulb_gif.c index d93b72dba5..ffef344a4d 100644 --- a/examples/libs/gif/img_bulb_gif.c +++ b/examples/libs/gif/img_bulb_gif.c @@ -1118,9 +1118,11 @@ static const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_ }; const lv_image_dsc_t img_bulb_gif = { - .header.w = 0, - .header.h = 0, - .header.cf = LV_COLOR_FORMAT_RAW, - .data = img_blub_gif_map, + .header = { + .cf = LV_COLOR_FORMAT_RAW, + .w = 0, + .h = 0, + }, .data_size = sizeof(img_blub_gif_map), + .data = img_blub_gif_map, }; diff --git a/examples/libs/libpng/img_png_demo.c b/examples/libs/libpng/img_png_demo.c index e30df86144..0e22419062 100644 --- a/examples/libs/libpng/img_png_demo.c +++ b/examples/libs/libpng/img_png_demo.c @@ -1305,12 +1305,14 @@ uint8_t img_png_demo_map[] = { }; const lv_image_dsc_t img_png_demo = { - .header.magic = LV_IMAGE_HEADER_MAGIC, - .header.cf = LV_COLOR_FORMAT_RAW_ALPHA, - .header.flags = 0, - .header.w = 160, - .header.h = 120, - .header.stride = 0, + .header = { + .magic = LV_IMAGE_HEADER_MAGIC, + .cf = LV_COLOR_FORMAT_RAW_ALPHA, + .flags = 0, + .w = 160, + .h = 120, + .stride = 0, + }, .data_size = sizeof(img_png_demo_map), .data = img_png_demo_map, }; diff --git a/examples/libs/lodepng/img_wink_png.c b/examples/libs/lodepng/img_wink_png.c index 2402aff7a9..192bf5ebb8 100644 --- a/examples/libs/lodepng/img_wink_png.c +++ b/examples/libs/lodepng/img_wink_png.c @@ -336,11 +336,13 @@ const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMAGE_PNG_DEC }; const lv_image_dsc_t img_wink_png = { - .header.w = 50, - .header.h = 50, - .header.cf = LV_COLOR_FORMAT_RAW_ALPHA, - .data = img_wink_png_map, + .header = { + .cf = LV_COLOR_FORMAT_RAW_ALPHA, + .w = 50, + .h = 50, + }, .data_size = sizeof(img_wink_png_map), + .data = img_wink_png_map, }; #endif /*LV_USE_LODEPNG && LV_BUILD_EXAMPLES*/ diff --git a/examples/libs/rlottie/lv_example_rlottie_1.c b/examples/libs/rlottie/lv_example_rlottie_1.c index 71f01398ea..f7d215a608 100644 --- a/examples/libs/rlottie/lv_example_rlottie_1.c +++ b/examples/libs/rlottie/lv_example_rlottie_1.c @@ -8,7 +8,7 @@ void lv_example_rlottie_1(void) { extern const uint8_t lv_example_rlottie_approve[]; - lv_obj_t * lottie = lv_rlottie_create_from_raw(lv_screen_active(), 100, 100, (const void *)lv_example_rlottie_approve); + lv_obj_t * lottie = lv_rlottie_create_from_raw(lv_screen_active(), 100, 100, (const char *)lv_example_rlottie_approve); lv_obj_center(lottie); } 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 af52a09e90..1b7f40fe21 100644 --- a/examples/libs/tiny_ttf/lv_example_tiny_ttf_3.c +++ b/examples/libs/tiny_ttf/lv_example_tiny_ttf_3.c @@ -44,7 +44,7 @@ void lv_example_tiny_ttf_3(void) static void font_size_observer_cb(lv_observer_t * observer, lv_subject_t * subject) { - lv_style_t * style = lv_observer_get_user_data(observer); + lv_style_t * style = (lv_style_t *) lv_observer_get_user_data(observer); lv_style_value_t v; lv_style_get_prop(style, LV_STYLE_TEXT_FONT, &v); lv_font_t * font = (lv_font_t *) v.ptr; diff --git a/examples/others/file_explorer/lv_example_file_explorer_1.c b/examples/others/file_explorer/lv_example_file_explorer_1.c index 465cae7ca4..31d28eaaf5 100644 --- a/examples/others/file_explorer/lv_example_file_explorer_1.c +++ b/examples/others/file_explorer/lv_example_file_explorer_1.c @@ -9,7 +9,7 @@ static void file_explorer_event_handler(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); - lv_obj_t * obj = lv_event_get_target(e); + lv_obj_t * obj = lv_event_get_target_obj(e); if(code == LV_EVENT_VALUE_CHANGED) { const char * cur_path = lv_file_explorer_get_current_path(obj); @@ -51,7 +51,7 @@ void lv_example_file_explorer_1(void) lv_file_explorer_open_dir(file_explorer, "A:/"); #if LV_FILE_EXPLORER_QUICK_ACCESS - char * envvar = "HOME"; + const char * envvar = "HOME"; char home_dir[LV_FS_MAX_PATH_LENGTH]; strcpy(home_dir, "A:"); /* get the user's home directory from the HOME environment variable*/ diff --git a/examples/others/file_explorer/lv_example_file_explorer_2.c b/examples/others/file_explorer/lv_example_file_explorer_2.c index 79df256da0..8f974c129c 100644 --- a/examples/others/file_explorer/lv_example_file_explorer_2.c +++ b/examples/others/file_explorer/lv_example_file_explorer_2.c @@ -9,7 +9,7 @@ static void file_explorer_event_handler(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); - lv_obj_t * obj = lv_event_get_target(e); + lv_obj_t * obj = lv_event_get_target_obj(e); if(code == LV_EVENT_VALUE_CHANGED) { const char * cur_path = lv_file_explorer_get_current_path(obj); @@ -23,8 +23,8 @@ static void file_explorer_event_handler(lv_event_t * e) static void btn_event_handler(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); - lv_obj_t * btn = lv_event_get_target(e); - lv_obj_t * file_explorer = lv_event_get_user_data(e); + lv_obj_t * btn = lv_event_get_target_obj(e); + lv_obj_t * file_explorer = (lv_obj_t *) lv_event_get_user_data(e); if(code == LV_EVENT_VALUE_CHANGED) { if(lv_obj_has_state(btn, LV_STATE_CHECKED)) @@ -37,8 +37,8 @@ static void btn_event_handler(lv_event_t * e) static void dd_event_handler(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); - lv_obj_t * dd = lv_event_get_target(e); - lv_obj_t * fe_quick_access_obj = lv_event_get_user_data(e); + lv_obj_t * dd = lv_event_get_target_obj(e); + lv_obj_t * fe_quick_access_obj = (lv_obj_t *) lv_event_get_user_data(e); if(code == LV_EVENT_VALUE_CHANGED) { char buf[32]; @@ -84,7 +84,7 @@ void lv_example_file_explorer_2(void) /* linux */ lv_file_explorer_open_dir(file_explorer, "A:/"); #if LV_FILE_EXPLORER_QUICK_ACCESS - char * envvar = "HOME"; + const char * envvar = "HOME"; char home_dir[LV_FS_MAX_PATH_LENGTH]; strcpy(home_dir, "A:"); /* get the user's home directory from the HOME environment variable*/ 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 5025d8e552..1b53f114fa 100644 --- a/examples/others/file_explorer/lv_example_file_explorer_3.c +++ b/examples/others/file_explorer/lv_example_file_explorer_3.c @@ -45,7 +45,7 @@ static void sort_by_file_kind(lv_obj_t * tb, int16_t lo, int16_t hi) static void file_explorer_event_handler(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); - lv_obj_t * obj = lv_event_get_target(e); + lv_obj_t * obj = lv_event_get_target_obj(e); if(code == LV_EVENT_VALUE_CHANGED) { const char * cur_path = lv_file_explorer_get_current_path(obj); @@ -94,7 +94,7 @@ void lv_example_file_explorer_3(void) /* linux */ lv_file_explorer_open_dir(file_explorer, "A:/"); #if LV_FILE_EXPLORER_QUICK_ACCESS - char * envvar = "HOME"; + const char * envvar = "HOME"; char home_dir[LV_FS_MAX_PATH_LENGTH]; strcpy(home_dir, "A:"); /* get the user's home directory from the HOME environment variable*/ diff --git a/examples/others/font_manager/lv_example_font_manager_3.c b/examples/others/font_manager/lv_example_font_manager_3.c index af7a6d9ec4..bb5f317d91 100644 --- a/examples/others/font_manager/lv_example_font_manager_3.c +++ b/examples/others/font_manager/lv_example_font_manager_3.c @@ -34,7 +34,7 @@ static const void * get_imgfont_path(const lv_font_t * font, uint32_t unicode, u static lv_font_t * imgfont_create_cb(const lv_font_info_t * info, const void * src) { - const imgfont_src_t * imgfont_src = src; + const imgfont_src_t * imgfont_src = (imgfont_src_t *) src; if(info->size < imgfont_src->match_size_min || info->size > imgfont_src->match_size_max) { @@ -51,7 +51,7 @@ static void imgfont_delete_cb(lv_font_t * font) static void * imgfont_dup_src_cb(const void * src) { - imgfont_src_t * imgfont_src = lv_malloc(sizeof(imgfont_src_t)); + imgfont_src_t * imgfont_src = (imgfont_src_t *) lv_malloc(sizeof(imgfont_src_t)); LV_ASSERT_MALLOC(imgfont_src); lv_memcpy(imgfont_src, src, sizeof(imgfont_src_t)); return imgfont_src; diff --git a/examples/others/fragment/lv_example_fragment_1.c b/examples/others/fragment/lv_example_fragment_1.c index cb3470a018..81ccf8e202 100644 --- a/examples/others/fragment/lv_example_fragment_1.c +++ b/examples/others/fragment/lv_example_fragment_1.c @@ -33,13 +33,13 @@ void lv_example_fragment_1(void) /* Clean up the fragment manager before objects in containers got deleted */ lv_obj_add_event_cb(root, sample_container_delete, LV_EVENT_DELETE, manager); - lv_fragment_t * fragment = lv_fragment_create(&sample_cls, "Fragment"); + lv_fragment_t * fragment = lv_fragment_create(&sample_cls, (void *) "Fragment"); 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; + ((struct sample_fragment_t *) self)->name = (const char *) args; } static lv_obj_t * sample_fragment_create_obj(lv_fragment_t * self, lv_obj_t * parent) diff --git a/examples/others/gestures/lv_example_gestures.c b/examples/others/gestures/lv_example_gestures.c index f035cd91b5..eb2cfd78a4 100644 --- a/examples/others/gestures/lv_example_gestures.c +++ b/examples/others/gestures/lv_example_gestures.c @@ -120,7 +120,7 @@ static void label_swipe(lv_event_t * gesture_event) lv_dir_t dir; lv_indev_gesture_state_t state; - char * text; + const char * text; if(lv_event_get_gesture_type(gesture_event) != LV_INDEV_GESTURE_TWO_FINGERS_SWIPE) { return; diff --git a/examples/others/gridnav/lv_example_gridnav_1.c b/examples/others/gridnav/lv_example_gridnav_1.c index 17dafccb6e..312a0fe184 100644 --- a/examples/others/gridnav/lv_example_gridnav_1.c +++ b/examples/others/gridnav/lv_example_gridnav_1.c @@ -31,7 +31,7 @@ void lv_example_gridnav_1(void) lv_group_remove_obj(obj); /*Not needed, we use the gridnav instead*/ label = lv_label_create(obj); - lv_label_set_text_fmt(label, "%"LV_PRIu32"", i); + lv_label_set_text_fmt(label, "%" LV_PRIu32"", i); lv_obj_center(label); } diff --git a/examples/others/gridnav/lv_example_gridnav_3.c b/examples/others/gridnav/lv_example_gridnav_3.c index e8c3dbf071..a608c61225 100644 --- a/examples/others/gridnav/lv_example_gridnav_3.c +++ b/examples/others/gridnav/lv_example_gridnav_3.c @@ -4,7 +4,7 @@ static void cont_sub_event_cb(lv_event_t * e) { uint32_t k = lv_event_get_key(e); - lv_obj_t * obj = lv_event_get_target(e); + lv_obj_t * obj = lv_event_get_target_obj(e); if(k == LV_KEY_ENTER) { lv_group_focus_obj(obj); } @@ -23,7 +23,7 @@ void lv_example_gridnav_3(void) *there is a keyboard indev*/ lv_obj_t * cont_main = lv_obj_create(lv_screen_active()); - lv_gridnav_add(cont_main, LV_GRIDNAV_CTRL_ROLLOVER | LV_GRIDNAV_CTRL_SCROLL_FIRST); + lv_gridnav_add(cont_main, (lv_gridnav_ctrl_t)(LV_GRIDNAV_CTRL_ROLLOVER | LV_GRIDNAV_CTRL_SCROLL_FIRST)); /*Only the container needs to be in a group*/ lv_group_add_obj(lv_group_get_default(), cont_main); diff --git a/examples/others/gridnav/lv_example_gridnav_4.c b/examples/others/gridnav/lv_example_gridnav_4.c index 069ba66b72..f879c34894 100644 --- a/examples/others/gridnav/lv_example_gridnav_4.c +++ b/examples/others/gridnav/lv_example_gridnav_4.c @@ -3,7 +3,7 @@ static void event_handler(lv_event_t * e) { - lv_obj_t * obj = lv_event_get_target(e); + lv_obj_t * obj = lv_event_get_target_obj(e); lv_obj_t * list = lv_obj_get_parent(obj); LV_UNUSED(list); /*If logging is disabled*/ LV_LOG_USER("Clicked: %s", lv_list_get_button_text(list, obj)); diff --git a/examples/others/ime/lv_example_ime_pinyin_1.c b/examples/others/ime/lv_example_ime_pinyin_1.c index f96990fb12..542ea76a77 100644 --- a/examples/others/ime/lv_example_ime_pinyin_1.c +++ b/examples/others/ime/lv_example_ime_pinyin_1.c @@ -4,8 +4,8 @@ static void ta_event_cb(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); - lv_obj_t * ta = lv_event_get_target(e); - lv_obj_t * kb = lv_event_get_user_data(e); + lv_obj_t * ta = lv_event_get_target_obj(e); + lv_obj_t * kb = (lv_obj_t *) lv_event_get_user_data(e); if(code == LV_EVENT_FOCUSED) { if(lv_indev_get_type(lv_indev_active()) != LV_INDEV_TYPE_KEYPAD) { diff --git a/examples/others/ime/lv_example_ime_pinyin_2.c b/examples/others/ime/lv_example_ime_pinyin_2.c index 5b705aad37..ec58545b83 100644 --- a/examples/others/ime/lv_example_ime_pinyin_2.c +++ b/examples/others/ime/lv_example_ime_pinyin_2.c @@ -4,8 +4,8 @@ static void ta_event_cb(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); - lv_obj_t * ta = lv_event_get_target(e); - lv_obj_t * kb = lv_event_get_user_data(e); + lv_obj_t * ta = lv_event_get_target_obj(e); + lv_obj_t * kb = (lv_obj_t *) lv_event_get_user_data(e); if(code == LV_EVENT_FOCUSED) { if(lv_indev_get_type(lv_indev_active()) != LV_INDEV_TYPE_KEYPAD) { diff --git a/examples/others/observer/lv_example_observer_2.c b/examples/others/observer/lv_example_observer_2.c index fdd23f0f80..3bd218b634 100644 --- a/examples/others/observer/lv_example_observer_2.c +++ b/examples/others/observer/lv_example_observer_2.c @@ -58,7 +58,7 @@ static lv_subject_t auth_state_subject; static void textarea_event_cb(lv_event_t * e) { - lv_obj_t * ta = lv_event_get_target(e); + lv_obj_t * ta = lv_event_get_target_obj(e); if(lv_strcmp(lv_textarea_get_text(ta), "hello") == 0) { lv_subject_set_int(&auth_state_subject, LOGGED_IN); } @@ -69,7 +69,7 @@ static void textarea_event_cb(lv_event_t * e) static void info_label_observer_cb(lv_observer_t * observer, lv_subject_t * subject) { - lv_obj_t * label = lv_observer_get_target(observer); + lv_obj_t * label = (lv_obj_t *) lv_observer_get_target(observer); switch(lv_subject_get_int(subject)) { case LOGGED_IN: lv_label_set_text(label, "Login successful"); diff --git a/examples/others/observer/lv_example_observer_3.c b/examples/others/observer/lv_example_observer_3.c index 029bbf3e37..9682238a37 100644 --- a/examples/others/observer/lv_example_observer_3.c +++ b/examples/others/observer/lv_example_observer_3.c @@ -68,7 +68,7 @@ void lv_example_observer_3(void) static void set_btn_clicked_event_cb(lv_event_t * e) { - lv_obj_t * set_btn = lv_event_get_target(e); + lv_obj_t * set_btn = lv_event_get_target_obj(e); lv_obj_add_state(set_btn, LV_STATE_DISABLED); lv_obj_t * cont = lv_obj_create(lv_screen_active()); @@ -110,8 +110,8 @@ static void set_btn_clicked_event_cb(lv_event_t * e) static void close_clicked_event_cb(lv_event_t * e) { - lv_obj_t * set_btn = lv_event_get_user_data(e); - lv_obj_t * close_btn = lv_event_get_target(e); + lv_obj_t * set_btn = (lv_obj_t *) lv_event_get_user_data(e); + lv_obj_t * close_btn = lv_event_get_target_obj(e); lv_obj_t * cont = lv_obj_get_parent(close_btn); lv_obj_remove_state(set_btn, LV_STATE_DISABLED); lv_obj_delete(cont); @@ -125,20 +125,20 @@ static void time_observer_cb(lv_observer_t * observer, lv_subject_t * subject) int32_t format = lv_subject_get_int(lv_subject_get_group_element(subject, 2)); int32_t am_pm = lv_subject_get_int(lv_subject_get_group_element(subject, 3)); - lv_obj_t * label = lv_observer_get_target(observer); + lv_obj_t * label = (lv_obj_t *) lv_observer_get_target(observer); if(format == TIME_FORMAT_24) { lv_label_set_text_fmt(label, "%" LV_PRId32 ":%02" LV_PRId32, hour, minute); } else { - lv_label_set_text_fmt(label, "%"LV_PRId32":%02"LV_PRId32" %s", hour + 1, minute, am_pm == TIME_AM ? "am" : "pm"); + lv_label_set_text_fmt(label, "%" LV_PRId32":%02" LV_PRId32" %s", hour + 1, minute, am_pm == TIME_AM ? "am" : "pm"); } } /*Change the hour options on format change*/ static void hour_roller_options_update(lv_observer_t * observer, lv_subject_t * subject) { - lv_obj_t * roller = lv_observer_get_target(observer); + lv_obj_t * roller = (lv_obj_t *) lv_observer_get_target(observer); int32_t prev_selected = lv_roller_get_selected(roller); int32_t v = lv_subject_get_int(subject); if(v == TIME_FORMAT_12) { diff --git a/examples/others/observer/lv_example_observer_4.c b/examples/others/observer/lv_example_observer_4.c index 934a3f5b06..e3bf0fc095 100644 --- a/examples/others/observer/lv_example_observer_4.c +++ b/examples/others/observer/lv_example_observer_4.c @@ -66,19 +66,19 @@ void lv_example_observer_4(void) static int32_t anim_get_x_cb(lv_anim_t * a) { - return lv_obj_get_x_aligned(a->var); + return lv_obj_get_x_aligned((lv_obj_t *) a->var); } static void anim_set_x_cb(void * obj, int32_t v) { - lv_obj_set_x(obj, v); + lv_obj_set_x((lv_obj_t *) obj, v); } static void cont_observer_cb(lv_observer_t * observer, lv_subject_t * subject) { int32_t prev_v = lv_subject_get_previous_int(subject); int32_t cur_v = lv_subject_get_int(subject); - lv_obj_t * cont = lv_observer_get_target(observer); + lv_obj_t * cont = (lv_obj_t *) lv_observer_get_target(observer); /*Animate out the previous content*/ lv_anim_t a; @@ -165,7 +165,7 @@ static void btn_create(lv_obj_t * parent, const char * text) static void btn_click_event_cb(lv_event_t * e) { - lv_obj_t * btn = lv_event_get_target(e); + lv_obj_t * btn = lv_event_get_target_obj(e); uint32_t idx = lv_obj_get_index(btn); lv_subject_set_int(¤t_tab_subject, idx); } @@ -175,7 +175,7 @@ static void btn_observer_cb(lv_observer_t * observer, lv_subject_t * subject) int32_t prev_v = lv_subject_get_previous_int(subject); int32_t cur_v = lv_subject_get_int(subject); - lv_obj_t * btn = lv_observer_get_target(observer); + lv_obj_t * btn = (lv_obj_t *) lv_observer_get_target(observer); int32_t idx = (int32_t)lv_obj_get_index(btn); if(idx == prev_v) lv_obj_remove_state(btn, LV_STATE_CHECKED); @@ -185,7 +185,7 @@ static void btn_observer_cb(lv_observer_t * observer, lv_subject_t * subject) static void indicator_observer_cb(lv_observer_t * observer, lv_subject_t * subject) { int32_t cur_v = lv_subject_get_int(subject); - lv_obj_t * indicator = lv_observer_get_target(observer); + lv_obj_t * indicator = (lv_obj_t *) lv_observer_get_target(observer); lv_obj_t * footer = lv_obj_get_parent(indicator); lv_obj_t * btn_act = lv_obj_get_child(footer, cur_v); diff --git a/examples/others/observer/lv_example_observer_5.c b/examples/others/observer/lv_example_observer_5.c index 47ea4eefa8..2d3dbcf248 100644 --- a/examples/others/observer/lv_example_observer_5.c +++ b/examples/others/observer/lv_example_observer_5.c @@ -8,7 +8,7 @@ typedef enum { FW_UPDATE_STATE_DOWNLOADING, FW_UPDATE_STATE_CANCEL, FW_UPDATE_STATE_READY, -} fw_update_state_t; +} lv_fw_update_state_t; static void fw_upload_manager_observer_cb(lv_observer_t * observer, lv_subject_t * subject); static void fw_update_btn_clicked_event_cb(lv_event_t * e); @@ -68,16 +68,16 @@ static void fw_update_close_event_cb(lv_event_t * e) static void restart_btn_click_event_cb(lv_event_t * e) { - lv_obj_t * win = lv_event_get_user_data(e); + lv_obj_t * win = (lv_obj_t *) lv_event_get_user_data(e); lv_obj_delete(win); lv_subject_set_int(&fw_update_status_subject, FW_UPDATE_STATE_IDLE); } static void fw_update_win_observer_cb(lv_observer_t * observer, lv_subject_t * subject) { - lv_obj_t * win = lv_observer_get_target(observer); + lv_obj_t * win = (lv_obj_t *) lv_observer_get_target(observer); lv_obj_t * cont = lv_win_get_content(win); - fw_update_state_t status = lv_subject_get_int(&fw_update_status_subject); + lv_fw_update_state_t status = (lv_fw_update_state_t) lv_subject_get_int(&fw_update_status_subject); if(status == FW_UPDATE_STATE_IDLE) { lv_obj_clean(cont); lv_obj_t * spinner = lv_spinner_create(cont); @@ -153,7 +153,7 @@ static void fw_upload_manager_observer_cb(lv_observer_t * observer, lv_subject_t LV_UNUSED(subject); LV_UNUSED(observer); - fw_update_state_t state = lv_subject_get_int(&fw_update_status_subject); + lv_fw_update_state_t state = (lv_fw_update_state_t) lv_subject_get_int(&fw_update_status_subject); if(state == FW_UPDATE_STATE_CONNECTING) { lv_timer_create(connect_timer_cb, 2000, NULL); } diff --git a/examples/others/observer/lv_example_observer_6.c b/examples/others/observer/lv_example_observer_6.c index f6926aad47..d1bb7b07ab 100644 --- a/examples/others/observer/lv_example_observer_6.c +++ b/examples/others/observer/lv_example_observer_6.c @@ -4,7 +4,7 @@ typedef enum { THEME_MODE_LIGHT, THEME_MODE_DARK, -} theme_mode_t; +} lv_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); @@ -54,15 +54,15 @@ static void switch_theme_event_cb(lv_event_t * e) typedef struct { lv_style_t style_main; lv_style_t style_scrollbar; -} my_panel_styles_t; +} lv_panel_styles_t; static void my_panel_style_observer_cb(lv_observer_t * observer, lv_subject_t * subject) { LV_UNUSED(subject); LV_UNUSED(observer); - theme_mode_t m = lv_subject_get_int(&theme_subject); - my_panel_styles_t * styles = lv_observer_get_target(observer); + lv_theme_mode_t m = (lv_theme_mode_t) lv_subject_get_int(&theme_subject); + lv_panel_styles_t * styles = (lv_panel_styles_t *) lv_observer_get_target(observer); if(m == THEME_MODE_LIGHT) { lv_style_set_bg_color(&styles->style_main, lv_color_hex3(0xfff)); lv_style_set_shadow_color(&styles->style_main, lv_color_hex3(0x888)); @@ -83,7 +83,7 @@ static void my_panel_style_observer_cb(lv_observer_t * observer, lv_subject_t * static lv_obj_t * my_panel_create(lv_obj_t * parent) { static bool inited = false; - static my_panel_styles_t styles; + static lv_panel_styles_t styles; if(!inited) { inited = true; @@ -124,15 +124,15 @@ static lv_obj_t * my_panel_create(lv_obj_t * parent) typedef struct { lv_style_t style_main; lv_style_t style_pressed; -} my_button_styles_t; +} lv_button_styles_t; static void my_button_style_observer_cb(lv_observer_t * observer, lv_subject_t * subject) { LV_UNUSED(subject); LV_UNUSED(observer); - theme_mode_t m = lv_subject_get_int(&theme_subject); - my_button_styles_t * styles = lv_observer_get_target(observer); + lv_theme_mode_t m = (lv_theme_mode_t) lv_subject_get_int(&theme_subject); + lv_button_styles_t * styles = (lv_button_styles_t *) lv_observer_get_target(observer); if(m == THEME_MODE_LIGHT) { lv_style_set_bg_color(&styles->style_main, lv_color_hex(0x3379de)); lv_style_set_bg_grad_color(&styles->style_main, lv_color_hex(0xd249a5)); @@ -157,7 +157,7 @@ static void my_button_style_observer_cb(lv_observer_t * observer, lv_subject_t * static lv_obj_t * my_button_create(lv_obj_t * parent, const char * text, lv_event_cb_t event_cb) { static bool inited = false; - static my_button_styles_t styles; + static lv_button_styles_t styles; if(!inited) { inited = true; diff --git a/examples/others/snapshot/lv_example_snapshot_1.c b/examples/others/snapshot/lv_example_snapshot_1.c index f659cae4fb..0eea3b42e9 100644 --- a/examples/others/snapshot/lv_example_snapshot_1.c +++ b/examples/others/snapshot/lv_example_snapshot_1.c @@ -3,8 +3,8 @@ static void event_cb(lv_event_t * e) { - lv_obj_t * snapshot_obj = lv_event_get_user_data(e); - lv_obj_t * img = lv_event_get_target(e); + lv_obj_t * snapshot_obj = (lv_obj_t *) lv_event_get_user_data(e); + lv_obj_t * img = lv_event_get_target_obj(e); if(snapshot_obj) { lv_draw_buf_t * snapshot = (lv_draw_buf_t *)lv_image_get_src(snapshot_obj); diff --git a/examples/others/xml/lv_example_xml_1.c b/examples/others/xml/lv_example_xml_1.c index d0e78fc449..864673e03a 100644 --- a/examples/others/xml/lv_example_xml_1.c +++ b/examples/others/xml/lv_example_xml_1.c @@ -44,10 +44,10 @@ void lv_example_xml_1(void) lv_obj_t * card; /*Create a card with the default values*/ - card = lv_xml_create(lv_screen_active(), "card", NULL); + card = (lv_obj_t *) lv_xml_create(lv_screen_active(), "card", NULL); /*Create a motor card too. The returned value can be adjusted freely*/ - card = lv_xml_create(lv_screen_active(), "motor_card", NULL); + card = (lv_obj_t *) lv_xml_create(lv_screen_active(), "motor_card", NULL); lv_obj_set_y(card, 90); /*Pass properties to a card*/ @@ -57,7 +57,7 @@ void lv_example_xml_1(void) "title", "New title", NULL, NULL, }; - card = lv_xml_create(lv_screen_active(), "card", attrs); + card = (lv_obj_t *) lv_xml_create(lv_screen_active(), "card", attrs); } #endif diff --git a/examples/others/xml/lv_example_xml_2.c b/examples/others/xml/lv_example_xml_2.c index eac2fd2e81..f037a54ac3 100644 --- a/examples/others/xml/lv_example_xml_2.c +++ b/examples/others/xml/lv_example_xml_2.c @@ -17,7 +17,7 @@ void lv_example_xml_2(void) lv_xml_register_font(NULL, "lv_montserrat_18", &lv_font_montserrat_18); - lv_obj_t * obj = lv_xml_create(lv_screen_active(), "view", NULL); + lv_obj_t * obj = (lv_obj_t *) lv_xml_create(lv_screen_active(), "view", NULL); lv_obj_set_pos(obj, 10, 10); const char * my_button_attrs[] = { @@ -40,7 +40,7 @@ void lv_example_xml_2(void) NULL, NULL, }; - lv_obj_t * slider = lv_xml_create(lv_screen_active(), "lv_slider", slider_attrs); + lv_obj_t * slider = (lv_obj_t *) lv_xml_create(lv_screen_active(), "lv_slider", slider_attrs); lv_obj_set_width(slider, 100); } #endif diff --git a/examples/scroll/lv_example_scroll_1.c b/examples/scroll/lv_example_scroll_1.c index 0e1cfc7a57..100376f947 100644 --- a/examples/scroll/lv_example_scroll_1.c +++ b/examples/scroll/lv_example_scroll_1.c @@ -14,8 +14,8 @@ static void scroll_update_cb(lv_event_t * e) { LV_UNUSED(e); - LV_LOG("scroll info: x:%3"LV_PRId32", y:%3"LV_PRId32", top:%3"LV_PRId32", " - "bottom:%3"LV_PRId32", left:%3"LV_PRId32", right:%3"LV_PRId32"\n", + LV_LOG("scroll info: x:%3" LV_PRId32", y:%3" LV_PRId32", top:%3" LV_PRId32", " + "bottom:%3" LV_PRId32", left:%3" LV_PRId32", right:%3" LV_PRId32"\n", lv_obj_get_scroll_x(panel), lv_obj_get_scroll_y(panel), lv_obj_get_scroll_top(panel), diff --git a/examples/scroll/lv_example_scroll_2.c b/examples/scroll/lv_example_scroll_2.c index 13385c235c..2357e8cb02 100644 --- a/examples/scroll/lv_example_scroll_2.c +++ b/examples/scroll/lv_example_scroll_2.c @@ -4,10 +4,10 @@ static void sw_event_cb(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); - lv_obj_t * sw = lv_event_get_target(e); + lv_obj_t * sw = lv_event_get_target_obj(e); if(code == LV_EVENT_VALUE_CHANGED) { - lv_obj_t * list = lv_event_get_user_data(e); + lv_obj_t * list = (lv_obj_t *) lv_event_get_user_data(e); if(lv_obj_has_state(sw, LV_STATE_CHECKED)) lv_obj_add_flag(list, LV_OBJ_FLAG_SCROLL_ONE); else lv_obj_remove_flag(list, LV_OBJ_FLAG_SCROLL_ONE); @@ -32,11 +32,11 @@ void lv_example_scroll_2(void) lv_obj_t * label = lv_label_create(btn); if(i == 3) { - lv_label_set_text_fmt(label, "Panel %"LV_PRIu32"\nno snap", i); + lv_label_set_text_fmt(label, "Panel %" LV_PRIu32"\nno snap", i); lv_obj_remove_flag(btn, LV_OBJ_FLAG_SNAPPABLE); } else { - lv_label_set_text_fmt(label, "Panel %"LV_PRIu32, i); + lv_label_set_text_fmt(label, "Panel %" LV_PRIu32, i); } lv_obj_center(label); diff --git a/examples/scroll/lv_example_scroll_3.c b/examples/scroll/lv_example_scroll_3.c index 8181c43497..04c8d92c4a 100644 --- a/examples/scroll/lv_example_scroll_3.c +++ b/examples/scroll/lv_example_scroll_3.c @@ -6,10 +6,10 @@ static uint32_t btn_cnt = 1; static void float_button_event_cb(lv_event_t * e) { lv_event_code_t code = lv_event_get_code(e); - lv_obj_t * float_btn = lv_event_get_target(e); + lv_obj_t * float_btn = lv_event_get_target_obj(e); if(code == LV_EVENT_CLICKED) { - lv_obj_t * list = lv_event_get_user_data(e); + lv_obj_t * list = (lv_obj_t *) lv_event_get_user_data(e); char buf[32]; lv_snprintf(buf, sizeof(buf), "Track %d", (int)btn_cnt); lv_obj_t * list_btn = lv_list_add_button(list, LV_SYMBOL_AUDIO, buf); diff --git a/examples/scroll/lv_example_scroll_6.c b/examples/scroll/lv_example_scroll_6.c index 75125f8da8..95288f5121 100644 --- a/examples/scroll/lv_example_scroll_6.c +++ b/examples/scroll/lv_example_scroll_6.c @@ -3,7 +3,7 @@ static void scroll_event_cb(lv_event_t * e) { - lv_obj_t * cont = lv_event_get_target(e); + lv_obj_t * cont = lv_event_get_target_obj(e); lv_area_t cont_a; lv_obj_get_coords(cont, &cont_a); @@ -67,7 +67,7 @@ void lv_example_scroll_6(void) lv_obj_set_width(btn, lv_pct(100)); lv_obj_t * label = lv_label_create(btn); - lv_label_set_text_fmt(label, "Button %"LV_PRIu32, i); + lv_label_set_text_fmt(label, "Button %" LV_PRIu32, i); } /*Update the buttons position manually for first*/ diff --git a/examples/scroll/lv_example_scroll_7.c b/examples/scroll/lv_example_scroll_7.c index 2de084e588..bfb3d83340 100644 --- a/examples/scroll/lv_example_scroll_7.c +++ b/examples/scroll/lv_example_scroll_7.c @@ -9,11 +9,11 @@ static bool update_scroll_running = false; static lv_obj_t * load_item(lv_obj_t * parent, int32_t num) { - lv_obj_t * new = lv_obj_create(parent); - lv_obj_set_size(new, LV_PCT(100), LV_SIZE_CONTENT); - lv_obj_t * label = lv_label_create(new); - lv_label_set_text_fmt(label, "%"PRId32, num); - return new; + lv_obj_t * obj = (lv_obj_t *) lv_obj_create(parent); + lv_obj_set_size(obj, LV_PCT(100), LV_SIZE_CONTENT); + lv_obj_t * label = lv_label_create(obj); + lv_label_set_text_fmt(label, "%" PRId32, num); + return obj; } static void update_scroll(lv_obj_t * obj) @@ -32,7 +32,7 @@ static void update_scroll(lv_obj_t * obj) bottom_num -= 1; load_item(obj, bottom_num); lv_obj_update_layout(obj); - LV_LOG_USER("loaded bottom num: %"PRId32, bottom_num); + LV_LOG_USER("loaded bottom num: %" PRId32, bottom_num); } while(top_num < 30 && lv_obj_get_scroll_top(obj) < 200) { top_num += 1; @@ -42,7 +42,7 @@ static void update_scroll(lv_obj_t * obj) lv_obj_update_layout(obj); int32_t bottom_after = lv_obj_get_scroll_bottom(obj); lv_obj_scroll_by(obj, 0, bottom_before - bottom_after, LV_ANIM_OFF); - LV_LOG_USER("loaded top num: %"PRId32, top_num); + LV_LOG_USER("loaded top num: %" PRId32, top_num); } /* delete far-away items */ @@ -51,7 +51,7 @@ static void update_scroll(lv_obj_t * obj) lv_obj_t * child = lv_obj_get_child(obj, -1); lv_obj_delete(child); lv_obj_update_layout(obj); - LV_LOG_USER("deleted bottom num: %"PRId32, bottom_num); + LV_LOG_USER("deleted bottom num: %" PRId32, bottom_num); } while(lv_obj_get_scroll_top(obj) > 600) { top_num -= 1; @@ -61,14 +61,14 @@ static void update_scroll(lv_obj_t * obj) lv_obj_update_layout(obj); int32_t bottom_after = lv_obj_get_scroll_bottom(obj); lv_obj_scroll_by(obj, 0, bottom_before - bottom_after, LV_ANIM_OFF); - LV_LOG_USER("deleted top num: %"PRId32, top_num); + LV_LOG_USER("deleted top num: %" PRId32, top_num); } if(top_num != top_num_original) { - lv_label_set_text_fmt(high_label, "current largest\nloaded value:\n%"PRId32, top_num); + lv_label_set_text_fmt(high_label, "current largest\nloaded value:\n%" PRId32, top_num); } if(bottom_num != bottom_num_original) { - lv_label_set_text_fmt(low_label, "current smallest\nloaded value:\n%"PRId32, bottom_num); + lv_label_set_text_fmt(low_label, "current smallest\nloaded value:\n%" PRId32, bottom_num); } update_scroll_running = false; @@ -83,7 +83,7 @@ static void scroll_cb(lv_event_t * e) static void checkbox_cb(lv_event_t * e) { lv_obj_t * checkbox = lv_event_get_target_obj(e); - lv_obj_t * obj = lv_event_get_user_data(e); + lv_obj_t * obj = (lv_obj_t *) lv_event_get_user_data(e); bool checked = lv_obj_has_state(checkbox, LV_STATE_CHECKED); lv_obj_set_style_opa(obj, checked ? LV_OPA_COVER : LV_OPA_TRANSP, LV_PART_SCROLLBAR); } diff --git a/examples/styles/lv_example_style_3.c b/examples/styles/lv_example_style_3.c index 0a1dea82dc..95201ee1bd 100644 --- a/examples/styles/lv_example_style_3.c +++ b/examples/styles/lv_example_style_3.c @@ -18,7 +18,7 @@ void lv_example_style_3(void) lv_style_set_border_color(&style, lv_palette_main(LV_PALETTE_BLUE)); lv_style_set_border_width(&style, 5); lv_style_set_border_opa(&style, LV_OPA_50); - lv_style_set_border_side(&style, LV_BORDER_SIDE_BOTTOM | LV_BORDER_SIDE_RIGHT); + lv_style_set_border_side(&style, (lv_border_side_t)(LV_BORDER_SIDE_BOTTOM | LV_BORDER_SIDE_RIGHT)); /*Create an object with the new style*/ lv_obj_t * obj = lv_obj_create(lv_screen_active()); diff --git a/examples/widgets/canvas/lv_example_canvas_11.c b/examples/widgets/canvas/lv_example_canvas_11.c index fb304e5c4b..6677af71e1 100644 --- a/examples/widgets/canvas/lv_example_canvas_11.c +++ b/examples/widgets/canvas/lv_example_canvas_11.c @@ -35,9 +35,10 @@ static void timer_cb(lv_timer_t * timer) letter_dsc.unicode = (uint32_t)string[i % string_len]; letter_dsc.rotation = lv_atan2(y - pre_y, x - pre_x) * 10; letter_dsc.color = lv_color_hsv_to_rgb(i * 10, 100, 100); - lv_draw_letter(&layer, &letter_dsc, &(lv_point_t) { + lv_point_t p = (lv_point_t) { .x = x, .y = y - }); + }; + lv_draw_letter(&layer, &letter_dsc, &p); pre_x = x; pre_y = y; diff --git a/examples/widgets/keyboard/lv_example_keyboard_3.c b/examples/widgets/keyboard/lv_example_keyboard_3.c index 7e6b3ced57..bacce51e35 100644 --- a/examples/widgets/keyboard/lv_example_keyboard_3.c +++ b/examples/widgets/keyboard/lv_example_keyboard_3.c @@ -14,7 +14,7 @@ static void event_cb(lv_event_t * e) /*When the keyboard draws the buttons...*/ if(base_dsc->part == LV_PART_ITEMS) { /*Get a color based on the button's index*/ - lv_palette_t palette = base_dsc->id1 % LV_PALETTE_LAST; + lv_palette_t palette = (lv_palette_t)(base_dsc->id1 % LV_PALETTE_LAST); lv_draw_fill_dsc_t * fill_draw_dsc = lv_draw_task_get_fill_dsc(draw_task); if(fill_draw_dsc) { fill_draw_dsc->color = pressed ? lv_palette_darken(palette, 3) : lv_palette_main(palette); diff --git a/examples/widgets/menu/lv_example_menu_4.c b/examples/widgets/menu/lv_example_menu_4.c index 3cd7165de8..1249f36d2c 100644 --- a/examples/widgets/menu/lv_example_menu_4.c +++ b/examples/widgets/menu/lv_example_menu_4.c @@ -18,11 +18,11 @@ static void float_button_event_cb(lv_event_t * e) cont = lv_menu_cont_create(sub_page); label = lv_label_create(cont); - lv_label_set_text_fmt(label, "Hello, I am hiding inside %"LV_PRIu32"", btn_cnt); + lv_label_set_text_fmt(label, "Hello, I am hiding inside %" LV_PRIu32"", btn_cnt); cont = lv_menu_cont_create(main_page); label = lv_label_create(cont); - lv_label_set_text_fmt(label, "Item %"LV_PRIu32"", btn_cnt); + lv_label_set_text_fmt(label, "Item %" LV_PRIu32"", btn_cnt); lv_menu_set_load_page_event(menu, cont, sub_page); lv_obj_scroll_to_view_recursive(cont, LV_ANIM_ON); diff --git a/examples/widgets/obj/lv_example_obj_2.c b/examples/widgets/obj/lv_example_obj_2.c index b9abfe901d..909ae6bb24 100644 --- a/examples/widgets/obj/lv_example_obj_2.c +++ b/examples/widgets/obj/lv_example_obj_2.c @@ -3,7 +3,7 @@ static void drag_event_handler(lv_event_t * e) { - lv_obj_t * obj = lv_event_get_target(e); + lv_obj_t * obj = lv_event_get_target_obj(e); lv_indev_t * indev = lv_indev_active(); if(indev == NULL) return; diff --git a/examples/widgets/obj/lv_example_obj_3.c b/examples/widgets/obj/lv_example_obj_3.c index b8582a9498..bb5979fc7f 100644 --- a/examples/widgets/obj/lv_example_obj_3.c +++ b/examples/widgets/obj/lv_example_obj_3.c @@ -4,7 +4,7 @@ static void timer_cb(lv_timer_t * timer) { - lv_obj_t * obj = lv_timer_get_user_data(timer); + lv_obj_t * obj = (lv_obj_t *) lv_timer_get_user_data(timer); static float value = 0.1f; lv_matrix_t matrix; diff --git a/examples/widgets/table/lv_example_table_2.c b/examples/widgets/table/lv_example_table_2.c index d77ac17a8c..f15d4a1a7a 100644 --- a/examples/widgets/table/lv_example_table_2.c +++ b/examples/widgets/table/lv_example_table_2.c @@ -81,7 +81,7 @@ void lv_example_table_2(void) uint32_t i; for(i = 0; i < ITEM_CNT; i++) { - lv_table_set_cell_value_fmt(table, i, 0, "Item %"LV_PRIu32, i + 1); + lv_table_set_cell_value_fmt(table, i, 0, "Item %" LV_PRIu32, i + 1); } lv_obj_align(table, LV_ALIGN_CENTER, 0, -20); @@ -99,7 +99,7 @@ void lv_example_table_2(void) uint32_t elaps = lv_tick_elaps(t); lv_obj_t * label = lv_label_create(lv_screen_active()); - lv_label_set_text_fmt(label, "%"LV_PRIu32" items were created in %"LV_PRIu32" ms\n" + lv_label_set_text_fmt(label, "%" LV_PRIu32" items were created in %" LV_PRIu32" ms\n" "using %zu bytes of memory", (uint32_t)ITEM_CNT, elaps, mem_used); diff --git a/examples/widgets/win/lv_example_win_1.c b/examples/widgets/win/lv_example_win_1.c index 37b684de9a..7d3b70440c 100644 --- a/examples/widgets/win/lv_example_win_1.c +++ b/examples/widgets/win/lv_example_win_1.c @@ -38,7 +38,6 @@ void lv_example_win_1(void) "text to be\n" "sure it\n" "overflows. :)"); - } #endif diff --git a/scripts/LVGLImage.py b/scripts/LVGLImage.py index 247637cf73..5d6dacb05f 100755 --- a/scripts/LVGLImage.py +++ b/scripts/LVGLImage.py @@ -359,13 +359,15 @@ uint8_t {varname}_map[] = {{ }}; const lv_image_dsc_t {varname} = {{ - .header.magic = LV_IMAGE_HEADER_MAGIC, - .header.cf = LV_COLOR_FORMAT_{cf.name}, - .header.flags = {flags}, - .header.w = {w}, - .header.h = {h}, - .header.stride = {stride}, - .header.reserved_2 = 0, + .header = {{ + .magic = LV_IMAGE_HEADER_MAGIC, + .cf = LV_COLOR_FORMAT_{cf.name}, + .flags = {flags}, + .w = {w}, + .h = {h}, + .stride = {stride}, + .reserved_2 = 0, + }}, .data_size = sizeof({varname}_map), .data = {varname}_map, .reserved = NULL,