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

src/lv_misc/lv_log.h

@@ -40,9 +40,9 @@ typedef int8_t lv_log_level_t;
  **********************/
 
 /**
- * Log print function. Receives "File path", "Line number" and "Description".
+ * Log print function. Receives "Log Level", "File path", "Line number" and "Description".
  */
-typedef void (*lv_log_print_g_cb_t) (const char *, uint32_t, const char *);
+typedef void (*lv_log_print_g_cb_t) (lv_log_level_t level, const char *, uint32_t, const char *);
 
 /**********************
  * GLOBAL PROTOTYPES

src/lv_misc/lv_task.h

@@ -111,9 +111,9 @@ void lv_task_del(lv_task_t * task);
 /**
  * Set the callback the task (the function to call periodically)
  * @param task pointer to a task
- * @param taack_cb teh function to call periodically
+ * @param task_cb the function to call periodically
  */
-void lv_task_set_cb(lv_task_t * task, lv_task_cb_t taack_cb);
+void lv_task_set_cb(lv_task_t * task, lv_task_cb_t task_cb);
 
 /**
  * Set new priority for a lv_task

src/lv_objx/lv_ddlist.c

@@ -22,7 +22,7 @@
  *      DEFINES
  *********************/
 #if LV_USE_ANIMATION
-#ifndef LV_DDLIST_ANIM_TIME
+#ifndef LV_DDLIST_DEF_ANIM_TIME
 #define LV_DDLIST_DEF_ANIM_TIME 200 /*ms*/
 #endif
 #else

src/lv_objx/lv_roller.c

@@ -17,7 +17,7 @@
  *      DEFINES
  *********************/
 #if LV_USE_ANIMATION
-#ifndef LV_ROLLER_ANIM_TIME
+#ifndef LV_ROLLER_DEF_ANIM_TIME
 #define LV_ROLLER_DEF_ANIM_TIME 200 /*ms*/
 #endif
 #else

src/lv_objx/lv_tabview.c

@@ -18,7 +18,7 @@
  *      DEFINES
  *********************/
 #if LV_USE_ANIMATION
-#ifndef LV_TABVIEW_ANIM_TIME
+#ifndef LV_TABVIEW_DEF_ANIM_TIME
 #define LV_TABVIEW_DEF_ANIM_TIME                                                                   \
     300 /*Animation time of focusing to the a list element [ms] (0: no animation)  */
 #endif

src/lv_objx/lv_tileview.c

@@ -17,7 +17,7 @@
  *      DEFINES
  *********************/
 #if LV_USE_ANIMATION
-#ifndef LV_TILEVIEW_ANIM_TIME
+#ifndef LV_TILEVIEW_DEF_ANIM_TIME
 #define LV_TILEVIEW_DEF_ANIM_TIME 300 /*Animation time loading a tile [ms] (0: no animation)  */
 #endif
 #else