diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-07-13 18:53:40 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-07-13 18:53:40 (GMT) |
| commit | e2efb193c4af3b6f447e82be0d29ceccd734c507 (patch) | |
| tree | 120e45f628654821db0fc141e550bb0feac34e3d /src/libs/lv_conf.h | |
| parent | af10747c94080123a5847d5258c2cfeb7ec317cb (diff) | |
| parent | 99e26bdd4cbafcdeec815ce6435f1830f1d74816 (diff) | |
Merge branch 'lvgl_use_system_tick' of https://github.com/Riksu9000/InfiniTime into Riksu9000-lvgl_use_system_tick
# Conflicts:
# src/displayapp/screens/BatteryInfo.cpp
# src/displayapp/screens/BatteryInfo.h
Diffstat (limited to 'src/libs/lv_conf.h')
| -rw-r--r-- | src/libs/lv_conf.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h index e85eeb1..65263da 100644 --- a/src/libs/lv_conf.h +++ b/src/libs/lv_conf.h @@ -293,10 +293,10 @@ typedef void* lv_img_decoder_user_data_t; /* 1: use a custom tick source. * It removes the need to manually update the tick with `lv_tick_inc`) */ -#define LV_TICK_CUSTOM 0 +#define LV_TICK_CUSTOM 1 #if LV_TICK_CUSTOM == 1 -#define LV_TICK_CUSTOM_INCLUDE "Arduino.h" /*Header for the system time function*/ -#define LV_TICK_CUSTOM_SYS_TIME_EXPR (millis()) /*Expression evaluating to current system time in ms*/ +#define LV_TICK_CUSTOM_INCLUDE "FreeRTOS.h" /*Header for the system time function*/ +#define LV_TICK_CUSTOM_SYS_TIME_EXPR (xTaskGetTickCount()) /*Expression evaluating to current system time in ms*/ #endif /*LV_TICK_CUSTOM*/ typedef void* lv_disp_drv_user_data_t; /*Type of user data in the display driver*/ @@ -759,4 +759,4 @@ typedef void* lv_obj_user_data_t; /*--END OF LV_CONF_H--*/ -#endif /*LV_CONF_H*/
\ No newline at end of file +#endif /*LV_CONF_H*/ |