mirror of
https://github.com/lvgl/lvgl.git
synced 2025-02-04 07:13:00 +08:00
fix build errors
This commit is contained in:
parent
77b16c96a0
commit
be72cad1c8
@ -27,7 +27,7 @@ extern "C" {
|
|||||||
* GLOBAL PROTOTYPES
|
* 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();
|
return lv_tmr_handler();
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
CSRCS += lv_font.c
|
CSRCS += lv_font.c
|
||||||
CSRCS += lv_font_fmt_txt.c
|
CSRCS += lv_font_fmt_txt.c
|
||||||
CSRCS += lv_font_loader.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_12.c
|
||||||
CSRCS += lv_font_montserrat_14.c
|
CSRCS += lv_font_montserrat_14.c
|
||||||
CSRCS += lv_font_montserrat_16.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_12_subpx.c
|
||||||
CSRCS += lv_font_montserrat_28_compressed.c
|
CSRCS += lv_font_montserrat_28_compressed.c
|
||||||
CSRCS += lv_font_unscii_8.c
|
CSRCS += lv_font_unscii_8.c
|
||||||
|
CSRCS += lv_font_unscii_16.c
|
||||||
CSRCS += lv_font_dejavu_16_persian_hebrew.c
|
CSRCS += lv_font_dejavu_16_persian_hebrew.c
|
||||||
|
|
||||||
DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_font
|
DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_font
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
CSRCS += lv_area.c
|
CSRCS += lv_area.c
|
||||||
CSRCS += lv_task.c
|
CSRCS += lv_tmr.c
|
||||||
CSRCS += lv_fs.c
|
CSRCS += lv_fs.c
|
||||||
CSRCS += lv_anim.c
|
CSRCS += lv_anim.c
|
||||||
CSRCS += lv_mem.c
|
CSRCS += lv_mem.c
|
||||||
|
@ -62,7 +62,7 @@ void _lv_tmr_core_init(void)
|
|||||||
* Call it periodically to handle lv_tmrs.
|
* Call it periodically to handle lv_tmrs.
|
||||||
* @return the time after which it must be called again
|
* @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");
|
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 'x' in the argument name indicates that its not a fully generic function because it not follows
|
||||||
* the `func_name(object, callback, ...)` convention)
|
* the `func_name(object, callback, ...)` convention)
|
||||||
* @param period call period in ms unit
|
* @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
|
* @param user_data custom parameter
|
||||||
* @return pointer to the new tmr
|
* @return pointer to the new tmr
|
||||||
*/
|
*/
|
||||||
|
@ -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);
|
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.
|
* Make a lv_tmr ready. It will not wait its period.
|
||||||
* @param tmr pointer to a lv_tmr.
|
* @param tmr pointer to a lv_tmr.
|
||||||
|
@ -71,9 +71,6 @@ typedef enum {
|
|||||||
#if LV_USE_LABEL
|
#if LV_USE_LABEL
|
||||||
LV_THEME_LABEL,
|
LV_THEME_LABEL,
|
||||||
#endif
|
#endif
|
||||||
#if LV_USE_LED
|
|
||||||
LV_THEME_LED,
|
|
||||||
#endif
|
|
||||||
#if LV_USE_LINE
|
#if LV_USE_LINE
|
||||||
LV_THEME_LINE,
|
LV_THEME_LINE,
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user