From be72cad1c8626b10caa6ddce386cf5e1bc2573a7 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 24 Nov 2020 18:15:47 +0100 Subject: [PATCH] fix build errors --- src/lv_api_map.h | 2 +- src/lv_font/lv_font.mk | 3 +++ src/lv_misc/lv_misc.mk | 2 +- src/lv_misc/lv_tmr.c | 3 +-- src/lv_misc/lv_tmr.h | 7 +++++++ src/lv_themes/lv_theme.h | 3 --- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/lv_api_map.h b/src/lv_api_map.h index 782758b13..f6800ce0e 100644 --- a/src/lv_api_map.h +++ b/src/lv_api_map.h @@ -27,7 +27,7 @@ extern "C" { * GLOBAL PROTOTYPES **********************/ -static LV_ATTRIBUTE_TMR_HANDLER uint32_t lv_task_handler(void) +static inline LV_ATTRIBUTE_TMR_HANDLER uint32_t lv_task_handler(void) { return lv_tmr_handler(); } diff --git a/src/lv_font/lv_font.mk b/src/lv_font/lv_font.mk index 5b2f8bc05..dd266a109 100644 --- a/src/lv_font/lv_font.mk +++ b/src/lv_font/lv_font.mk @@ -1,6 +1,8 @@ CSRCS += lv_font.c CSRCS += lv_font_fmt_txt.c CSRCS += lv_font_loader.c +CSRCS += lv_font_montserrat_8.c +CSRCS += lv_font_montserrat_10.c CSRCS += lv_font_montserrat_12.c CSRCS += lv_font_montserrat_14.c CSRCS += lv_font_montserrat_16.c @@ -23,6 +25,7 @@ CSRCS += lv_font_montserrat_48.c CSRCS += lv_font_montserrat_12_subpx.c CSRCS += lv_font_montserrat_28_compressed.c CSRCS += lv_font_unscii_8.c +CSRCS += lv_font_unscii_16.c CSRCS += lv_font_dejavu_16_persian_hebrew.c DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_font diff --git a/src/lv_misc/lv_misc.mk b/src/lv_misc/lv_misc.mk index 898a248db..42545f322 100644 --- a/src/lv_misc/lv_misc.mk +++ b/src/lv_misc/lv_misc.mk @@ -1,5 +1,5 @@ CSRCS += lv_area.c -CSRCS += lv_task.c +CSRCS += lv_tmr.c CSRCS += lv_fs.c CSRCS += lv_anim.c CSRCS += lv_mem.c diff --git a/src/lv_misc/lv_tmr.c b/src/lv_misc/lv_tmr.c index 7cf97f4a7..e91fb184a 100644 --- a/src/lv_misc/lv_tmr.c +++ b/src/lv_misc/lv_tmr.c @@ -62,7 +62,7 @@ void _lv_tmr_core_init(void) * Call it periodically to handle lv_tmrs. * @return the time after which it must be called again */ -LV_ATTRIBUTE_TASK_HANDLER uint32_t lv_tmr_handler(void) +LV_ATTRIBUTE_TMR_HANDLER uint32_t lv_tmr_handler(void) { LV_LOG_TRACE("lv_tmr_handler started"); @@ -172,7 +172,6 @@ lv_tmr_t * lv_tmr_create_basic(void) * (the 'x' in the argument name indicates that its not a fully generic function because it not follows * the `func_name(object, callback, ...)` convention) * @param period call period in ms unit - * @param prio priority of the tmr (LV_TASK_PRIO_OFF means the tmr is stopped) * @param user_data custom parameter * @return pointer to the new tmr */ diff --git a/src/lv_misc/lv_tmr.h b/src/lv_misc/lv_tmr.h index a5ba478ec..2db72827f 100644 --- a/src/lv_misc/lv_tmr.h +++ b/src/lv_misc/lv_tmr.h @@ -107,6 +107,13 @@ void lv_tmr_pause(lv_tmr_t * tmr, bool pause); */ void lv_tmr_set_cb(lv_tmr_t * tmr, lv_tmr_cb_t tmr_cb); +/** + * Set new period for a lv_tmr + * @param tmr pointer to a lv_tmr + * @param period the new period + */ +void lv_tmr_set_period(lv_tmr_t * tmr, uint32_t period); + /** * Make a lv_tmr ready. It will not wait its period. * @param tmr pointer to a lv_tmr. diff --git a/src/lv_themes/lv_theme.h b/src/lv_themes/lv_theme.h index 2f07045e1..675fce63f 100644 --- a/src/lv_themes/lv_theme.h +++ b/src/lv_themes/lv_theme.h @@ -71,9 +71,6 @@ typedef enum { #if LV_USE_LABEL LV_THEME_LABEL, #endif -#if LV_USE_LED - LV_THEME_LED, -#endif #if LV_USE_LINE LV_THEME_LINE, #endif