diff options
| author | Kieran Cawthray <kieranc@gmail.com> | 2021-07-28 16:07:43 +0200 |
|---|---|---|
| committer | Kieran Cawthray <kieranc@gmail.com> | 2021-07-28 16:07:43 +0200 |
| commit | 12aeb4688923a06d574b7aa7262626e7eab5b7f1 (patch) | |
| tree | e626b0e55e4144e6928632b17bada38b2aaade7d /src/libs/lv_conf.h | |
| parent | e6bc485679022c51486ac3a28b8473b95ff0d115 (diff) | |
| parent | 514481ef7f9c71ad816b31d979c6ab39ce9380dd (diff) | |
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
Diffstat (limited to 'src/libs/lv_conf.h')
| -rw-r--r-- | src/libs/lv_conf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h index 18fc3fa2..73109c5a 100644 --- a/src/libs/lv_conf.h +++ b/src/libs/lv_conf.h @@ -295,6 +295,7 @@ typedef void* lv_img_decoder_user_data_t; #define LV_TICK_CUSTOM 1 #if LV_TICK_CUSTOM == 1 #define LV_TICK_CUSTOM_INCLUDE "FreeRTOS.h" /*Header for the system time function*/ +uint32_t xTaskGetTickCount(); /*Forward declare to avoid compiler warning*/ #define LV_TICK_CUSTOM_SYS_TIME_EXPR (xTaskGetTickCount()) /*Expression evaluating to current system time in ms*/ #endif /*LV_TICK_CUSTOM*/ |