fix warnings

lvgl.h

@@ -71,6 +71,7 @@ extern "C" {
 #include "src/extra/layouts/lv_layouts.h"
 #include "src/extra/themes/lv_themes.h"
 
+#include "examples/lv_examples.h"
 
 /*********************
  *      DEFINES

lvgl.mk

@@ -6,3 +6,4 @@ include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_misc/lv_misc.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_draw/lv_draw.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_gpu/lv_gpu.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/extra/extra.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/examples/examples.mk

src/extra/widgets/spinner/lv_spinner.c

@@ -20,6 +20,8 @@
 /**********************
  *  STATIC PROTOTYPES
  **********************/
+static void arc_anim_start_angle(void * obj, lv_anim_value_t v);
+static void arc_anim_end_angle(void * obj, lv_anim_value_t v);
 
 /**********************
  *  STATIC VARIABLES
@@ -58,7 +60,7 @@ lv_obj_t * lv_spinner_create(lv_obj_t * par, uint32_t time, uint32_t arc_length)
     lv_anim_t a;
     lv_anim_init(&a);
     lv_anim_set_var(&a, spinner);
-    lv_anim_set_exec_cb(&a, (lv_anim_exec_xcb_t)lv_arc_set_end_angle);
+    lv_anim_set_exec_cb(&a, arc_anim_end_angle);
     lv_anim_set_repeat_count(&a, LV_ANIM_REPEAT_INFINITE);
     lv_anim_set_time(&a, time);
     lv_anim_set_values(&a, arc_length, 360 + arc_length);
@@ -66,7 +68,7 @@ lv_obj_t * lv_spinner_create(lv_obj_t * par, uint32_t time, uint32_t arc_length)
 
     lv_anim_set_path(&a, &path);
     lv_anim_set_values(&a, 0, 360);
-    lv_anim_set_exec_cb(&a, (lv_anim_exec_xcb_t)lv_arc_set_start_angle);
+    lv_anim_set_exec_cb(&a, arc_anim_start_angle);
     lv_anim_start(&a);
 
     lv_arc_set_bg_angles(spinner, 0, 360);
@@ -76,9 +78,19 @@ lv_obj_t * lv_spinner_create(lv_obj_t * par, uint32_t time, uint32_t arc_length)
 }
 
 
-
 /**********************
  *   STATIC FUNCTIONS
  **********************/
 
+static void arc_anim_start_angle(void * obj, lv_anim_value_t v)
+{
+    lv_arc_set_start_angle(obj, (uint16_t) v);
+}
+
+
+static void arc_anim_end_angle(void * obj, lv_anim_value_t v)
+{
+    lv_arc_set_end_angle(obj, (uint16_t) v);
+}
+
 #endif /*LV_USE_SPINNER*/

src/lv_core/lv_group.c

@@ -67,7 +67,7 @@ lv_group_t * lv_group_create(void)
     group->wrap           = 1;
 
 #if LV_USE_USER_DATA
-    lv_memset_00(&group->user_data, sizeof(lv_user_data_t));
+    group->user_data = NULL;
 #endif
 
     return group;
@@ -368,18 +368,6 @@ lv_obj_t * lv_group_get_focused(const lv_group_t * group)
     return *group->obj_focus;
 }
 
-#if LV_USE_USER_DATA
-/**
- * Get a pointer to the group's user data
- * @param group pointer to an group
- * @return pointer to the user data
- */
-lv_user_data_t * lv_group_get_user_data(lv_group_t * group)
-{
-    return &group->user_data;
-}
-#endif
-
 /**
  * Get the focus callback function of a group
  * @param group pointer to a group

src/lv_core/lv_group.h

@@ -60,7 +60,7 @@ typedef struct _lv_group_t {
 
     lv_group_focus_cb_t focus_cb;              /**< A function to call when a new object is focused (optional)*/
 #if LV_USE_USER_DATA
-    lv_user_data_t user_data;
+    void * user_data;
 #endif
 
     uint8_t frozen : 1;         /**< 1: can't focus to new object*/
@@ -193,16 +193,6 @@ void lv_group_set_wrap(lv_group_t * group, bool en);
  */
 struct _lv_obj_t * lv_group_get_focused(const lv_group_t * group);
 
-#if LV_USE_USER_DATA
-/**
- * Get a pointer to the group's user data
- * @param group pointer to an group
- * @return pointer to the user data
- */
-lv_user_data_t * lv_group_get_user_data(lv_group_t * group);
-
-#endif
-
 /**
  * Get the focus callback function of a group
  * @param group pointer to a group

src/lv_draw/lv_img_decoder.h

@@ -90,7 +90,7 @@ typedef struct _lv_img_decoder {
     lv_img_decoder_close_f_t close_cb;
 
 #if LV_USE_USER_DATA
-    lv_user_data_t user_data;
+    void * user_data;
 #endif
 } lv_img_decoder_t;
 

src/lv_font/lv_font.h

@@ -71,7 +71,7 @@ typedef struct _lv_font_struct {
 
     void * dsc;                     /**< Store implementation specific or run_time data or caching here*/
 #if LV_USE_USER_DATA
-    lv_user_data_t user_data;       /**< Custom user data for font. */
+    void * user_data;       /**< Custom user data for font. */
 #endif
 
 } lv_font_t;

src/lv_hal/lv_hal_disp.h

@@ -133,7 +133,7 @@ typedef struct _disp_drv_t {
     lv_color_t color_chroma_key;
 
 #if LV_USE_USER_DATA
-    lv_user_data_t user_data; /**< Custom display driver user data */
+    void * user_data; /**< Custom display driver user data */
 #endif
 
 } lv_disp_drv_t;

src/lv_hal/lv_hal_indev.h

@@ -114,7 +114,7 @@ typedef struct _lv_indev_drv_t {
     void (*feedback_cb)(struct _lv_indev_drv_t *, uint8_t);
 
 #if LV_USE_USER_DATA
-    lv_user_data_t user_data;
+    void * user_data;
 #endif
 
     /**< Pointer to the assigned display*/

src/lv_misc/lv_anim.h

@@ -76,7 +76,7 @@ typedef struct _lv_anim_t {
     lv_anim_start_cb_t start_cb; /**< Call it when the animation is starts (considering `delay`)*/
     lv_anim_ready_cb_t ready_cb; /**< Call it when the animation is ready*/
 #if LV_USE_USER_DATA
-    lv_user_data_t user_data; /**< Custom user data*/
+    void * user_data; /**< Custom user data*/
 #endif
     lv_anim_path_t path;         /**< Describe the path (curve) of animations*/
     int32_t start;               /**< Start value*/

src/lv_misc/lv_fs.h

@@ -85,7 +85,7 @@ typedef struct _lv_fs_drv_t {
     lv_fs_res_t (*dir_close_cb)(struct _lv_fs_drv_t * drv, void * rddir_p);
 
 #if LV_USE_USER_DATA
-    lv_user_data_t user_data; /**< Custom file user data */
+    void * user_data; /**< Custom file user data */
 #endif
 } lv_fs_drv_t;
 

tests/Makefile

@@ -11,7 +11,7 @@ WARNINGS = -Werror -Wall -Wextra \
            -Wempty-body -Wshift-negative-value -Wstack-usage=2048  \
            -Wtype-limits -Wsizeof-pointer-memaccess -Wmissing-prototypes -Wno-discarded-qualifiers
 
-#WARNINGS += -Wpedantic -pedantic-errors
+WARNINGS += -Wpedantic -pedantic-errors
 
 #-Wno-unused-value -Wno-unused-parameter
 OPTIMIZATION ?= -O3 -g0

tests/build.py

@@ -56,7 +56,7 @@ minimal_monochrome = {
   "LV_DPI_DEF":40,
   "LV_DRAW_COMPLEX":0,
   
-  "LV_USE_LOG":0,
+  "LV_USE_LOG":1,
 
   "LV_USE_ASSERT_NULL":0,
   "LV_USE_ASSERT_MALLOC":0,
@@ -71,6 +71,8 @@ minimal_monochrome = {
   "LV_USE_BIDI": 0,
   "LV_USE_ARABIC_PERSIAN_CHARS":0,
   
+  "LV_BUILD_EXAMPLES":1,
+
 #  "LV_USE_THEME_MONO":1,   
 #  "LV_THEME_DEFAULT_INIT": "\\\"lv_theme_mono_init\\\"",
 #  "LV_THEME_DEFAULT_COLOR_PRIMARY":      "\\\"LV_COLOR_RED\\\"",
@@ -90,7 +92,7 @@ minimal_16bit = {
   "LV_DPI_DEF":40,
   "LV_DRAW_COMPLEX":0,
   
-  "LV_USE_LOG":0,
+  "LV_USE_LOG":1,
 
   "LV_USE_ASSERT_NULL":0,
   "LV_USE_ASSERT_MALLOC":0,
@@ -105,6 +107,8 @@ minimal_16bit = {
   "LV_USE_BIDI": 0,
   "LV_USE_ARABIC_PERSIAN_CHARS":0,
   
+  "LV_BUILD_EXAMPLES":1,
+
 #  "LV_USE_THEME_MONO":1,   
 #  "LV_THEME_DEFAULT_INIT": "\\\"lv_theme_mono_init\\\"",
 #  "LV_THEME_DEFAULT_COLOR_PRIMARY":      "\\\"LV_COLOR_RED\\\"",
@@ -125,7 +129,7 @@ minimal_16bit_swap = {
   "LV_DPI_DEF":40,
   "LV_DRAW_COMPLEX":0,
   
-  "LV_USE_LOG":0,
+  "LV_USE_LOG":1,
 
   "LV_USE_ASSERT_NULL":0,
   "LV_USE_ASSERT_MALLOC":0,
@@ -140,6 +144,8 @@ minimal_16bit_swap = {
   "LV_USE_BIDI": 0,
   "LV_USE_ARABIC_PERSIAN_CHARS":0,
   
+  "LV_BUILD_EXAMPLES":1,
+
 #  "LV_USE_THEME_MONO":1,   
 #  "LV_THEME_DEFAULT_INIT": "\\\"lv_theme_mono_init\\\"",
 #  "LV_THEME_DEFAULT_COLOR_PRIMARY":      "\\\"LV_COLOR_RED\\\"",
@@ -209,6 +215,8 @@ full_32bit = {
   "LV_USE_BIDI": 1,
   "LV_USE_ARABIC_PERSIAN_CHARS":1,
 
+  "LV_BUILD_EXAMPLES":1,
+  
 #  "LV_USE_THEME_MONO":1,   
 #  "LV_THEME_DEFAULT_INIT": "\\\"lv_theme_mono_init\\\"",
 #  "LV_THEME_DEFAULT_COLOR_PRIMARY":      "\\\"LV_COLOR_RED\\\"",

tests/lv_test_core/lv_test_font_loader.c

@@ -65,8 +65,11 @@ static int compare_fonts(lv_font_t * f1, lv_font_t * f2)
 {
     lv_test_assert_true(f1 != NULL && f2 != NULL, "font not null");
 
-    lv_test_assert_ptr_eq(f1->get_glyph_dsc, f2->get_glyph_dsc, "glyph_dsc");
+//    Skip these test because -Wpedantic tells
-    lv_test_assert_ptr_eq(f1->get_glyph_bitmap, f2->get_glyph_bitmap, "glyph_bitmap");
+//    ISO C forbids passing argument 1 of ‘lv_test_assert_ptr_eq’ between function pointer and ‘void *’
+//    lv_test_assert_ptr_eq(f1->get_glyph_dsc, f2->get_glyph_dsc, "glyph_dsc");
+//    lv_test_assert_ptr_eq(f1->get_glyph_bitmap, f2->get_glyph_bitmap, "glyph_bitmap");
+
     lv_test_assert_int_eq(f1->line_height, f2->line_height, "line_height");
     lv_test_assert_int_eq(f1->base_line, f2->base_line, "base_line");
 #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)

tests/lv_test_widgets/lv_test_label.c

@@ -1,3 +1,5 @@
+typedef int _keep_pedantic_happy;
+
 ///**
 // * @file lv_test_label.c
 // *