From 42b546a6d7f912132ac02762d3eb9c87e266c8ae Mon Sep 17 00:00:00 2001 From: Amir Gonnen Date: Sat, 18 May 2019 01:31:29 +0300 Subject: [PATCH 1/3] Fixed include path. Fixed typos --- src/lv_draw/lv_draw_img.c | 2 +- src/lv_misc/lv_task.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lv_draw/lv_draw_img.c b/src/lv_draw/lv_draw_img.c index d7f6071b1..466037da0 100644 --- a/src/lv_draw/lv_draw_img.c +++ b/src/lv_draw/lv_draw_img.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "lv_draw_img.h" -#include "lv_log.h" +#include "../lv_misc/lv_log.h" /********************* * DEFINES diff --git a/src/lv_misc/lv_task.h b/src/lv_misc/lv_task.h index 7a814a6ff..7b5c2f3df 100644 --- a/src/lv_misc/lv_task.h +++ b/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 From 80760c46698461da3f55fe09e530ca287519cc8c Mon Sep 17 00:00:00 2001 From: Brian Pugh Date: Sat, 18 May 2019 11:44:50 -0700 Subject: [PATCH 2/3] Fix LV_OBJX_DEF_ANIM_TIME guards --- src/lv_objx/lv_ddlist.c | 2 +- src/lv_objx/lv_roller.c | 2 +- src/lv_objx/lv_tabview.c | 2 +- src/lv_objx/lv_tileview.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lv_objx/lv_ddlist.c b/src/lv_objx/lv_ddlist.c index ed2def291..ff6beda09 100644 --- a/src/lv_objx/lv_ddlist.c +++ b/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 diff --git a/src/lv_objx/lv_roller.c b/src/lv_objx/lv_roller.c index 533b0c1a4..9d098463a 100644 --- a/src/lv_objx/lv_roller.c +++ b/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 diff --git a/src/lv_objx/lv_tabview.c b/src/lv_objx/lv_tabview.c index d5d106683..fad7969ce 100644 --- a/src/lv_objx/lv_tabview.c +++ b/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 diff --git a/src/lv_objx/lv_tileview.c b/src/lv_objx/lv_tileview.c index f4a959380..055d72acb 100644 --- a/src/lv_objx/lv_tileview.c +++ b/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 From 89a2856d6e2639f1aa04c931d27a4f48bc8d1993 Mon Sep 17 00:00:00 2001 From: Amir Gonnen Date: Sat, 18 May 2019 22:54:10 +0300 Subject: [PATCH 3/3] Add missing 'log level' argument to log callback --- src/lv_misc/lv_log.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lv_misc/lv_log.h b/src/lv_misc/lv_log.h index 5292b746d..4deb8f8d4 100644 --- a/src/lv_misc/lv_log.h +++ b/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