Merge branch 'dev-5.0' of https://github.com/littlevgl/lvgl into dev-5.0

lv_core/lv_obj.c

@@ -918,7 +918,7 @@ void lv_obj_animate(lv_obj_t * obj, lv_anim_builtin_t type, uint16_t time, uint1
 	lv_obj_t * par = lv_obj_get_parent(obj);
 
 	/*Get the direction*/
-	bool out = (type & ANIM_DIR_MASK) == ANIM_IN ? false : true;
+	bool out = (type & ANIM_DIR_MASK) == LV_ANIM_IN ? false : true;
 	type = type & (~ANIM_DIR_MASK);
 
 	lv_anim_t a;

lv_core/lv_obj.h

@@ -47,7 +47,7 @@ extern "C" {
 #error "LV: Small Virtual Display Buffer (lv_conf.h: LV_VDB_SIZE >= (2 * LV_HOR_RES))"
 #endif
 
-#define ANIM_IN					0x00	/*Animation to show an object. 'OR' it with lv_anim_builtin_t*/
+#define LV_ANIM_IN					0x00	/*Animation to show an object. 'OR' it with lv_anim_builtin_t*/
 #define ANIM_OUT				0x80    /*Animation to hide an object. 'OR' it with lv_anim_builtin_t*/
 #define ANIM_DIR_MASK			0x80	/*ANIM_IN/ANIM_OUT mask*/
 

lv_core/lv_style.c

@@ -15,7 +15,7 @@
  *      DEFINES
  *********************/
 #if LV_NO_ANIM == 0
-#define LV_STYLE_ANIM_RES       256    /*Animation max in 1024 steps*/
+#define LV_STYLE_ANIM_RES       255    /*Animation max in 1024 steps*/
 #define LV_STYLE_ANIM_SHIFT     8      /*log2(LV_STYLE_ANIM_RES)*/
 
 #define VAL_PROP(v1, v2, r)   v1 + (((v2-v1) * r) >> LV_STYLE_ANIM_SHIFT)

lv_core/lv_style.h

@@ -106,7 +106,7 @@ typedef struct {
     const lv_style_t * style_start; /*Pointer to the starting style*/
     const lv_style_t * style_end;   /*Pointer to the destination style*/
     lv_style_t * style_anim;        /*Pointer to a style to animate*/
-    lv_anim_cb_t end_cb;               /*Call it when the animation is ready*/
+    lv_anim_cb_t end_cb;            /*Call it when the animation is ready (NULL if unused)*/
     int16_t time;                   /*Animation time in ms*/
     int16_t act_time;               /*Current time in animation. Set to negative to make delay.*/
     uint16_t playback_pause;        /*Wait before play back*/

lv_misc/lv_anim.h

@@ -62,8 +62,8 @@ lv_anim_t a;
 a.var = obj;
 a.start = lv_obj_get_height(obj);
 a.end = new_height;
-a.fp = (anim_fp_t)lv_obj_set_height;
-a.path = anim_get_path(ANIM_PATH_LIN);
+a.fp = (lv_anim_fp_t)lv_obj_set_height;
+a.path = anim_get_path(LV_ANIM_PATH_LIN);
 a.end_cb = NULL;
 a.act_time = 0;
 a.time = 200;

lv_misc/lv_color.h

@@ -100,16 +100,16 @@ typedef union
 }lv_color24_t;
 
 #if LV_COLOR_DEPTH == 1
-typedef uint8_t color_int_t;
+typedef uint8_t lv_color_int_t;
 typedef lv_color1_t lv_color_t;
 #elif LV_COLOR_DEPTH == 8
-typedef uint8_t color_int_t;
+typedef uint8_t lv_color_int_t;
 typedef lv_color8_t lv_color_t;
 #elif LV_COLOR_DEPTH == 16
-typedef uint16_t color_int_t;
+typedef uint16_t lv_color_int_t;
 typedef lv_color16_t lv_color_t;
 #elif LV_COLOR_DEPTH == 24
-typedef uint32_t color_int_t;
+typedef uint32_t lv_color_int_t;
 typedef lv_color24_t lv_color_t;
 #else
 #error "Invalid LV_COLOR_DEPTH in misc_conf.h! Set it to 1, 8, 16 or 24!"

lv_objx/lv_img.c

@@ -100,7 +100,7 @@ lv_obj_t * lv_img_create(lv_obj_t * par, lv_obj_t * copy)
  * @param data pointer to a color map with lv_img_raw_header_t header
  * @return result of the file operation. FS_RES_OK or any error from lv_fs_res_t
  */
-lv_fs_res_t lv_img_create_file(const char * fn, const color_int_t * data)
+lv_fs_res_t lv_img_create_file(const char * fn, const lv_color_int_t * data)
 {
 	const lv_img_raw_header_t * raw_p = (lv_img_raw_header_t *) data;
 	lv_fs_res_t res;

lv_objx/lv_img.h

@@ -59,7 +59,7 @@ lv_obj_t * lv_img_create(lv_obj_t * par, lv_obj_t * copy);
  * @param data pointer to a color map with lv_img_raw_header_t header
  * @return result of the file operation. FS_RES_OK or any error from lv_fs_res_t
  */
-lv_fs_res_t lv_img_create_file(const char * fn, const color_int_t * data);
+lv_fs_res_t lv_img_create_file(const char * fn, const lv_color_int_t * data);
 
 /*=====================
  * Setter functions
@@ -139,7 +139,7 @@ static inline lv_style_t* lv_img_get_style(lv_obj_t *img)
  **********************/
 
 /*Use this macro to declare an image in a c file*/
-#define LV_IMG_DECLARE(var_name) extern const color_int_t var_name[];
+#define LV_IMG_DECLARE(var_name) extern const lv_color_int_t var_name[];
 
 #endif  /*USE_LV_IMG*/