github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-5.3

Browse Source
This commit is contained in:
embeddedt
2019-01-04 08:27:43 -05:00
parent 83cadc8abe 10b648c96e
commit a4bfd51401
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lv_hal/lv_hal_tick.c
View File

@@ -75,7 +75,7 @@ uint32_t lv_tick_get(void)
} }
/** /**
* Get the elapsed milliseconds science a previous time stamp * Get the elapsed milliseconds since a previous time stamp
* @param prev_tick a previous time stamp (return value of systick_get() ) * @param prev_tick a previous time stamp (return value of systick_get() )
* @return the elapsed milliseconds since 'prev_tick' * @return the elapsed milliseconds since 'prev_tick'
*/ */

2
lv_hal/lv_hal_tick.h
View File

@@ -49,7 +49,7 @@ LV_ATTRIBUTE_TICK_INC void lv_tick_inc(uint32_t tick_period);
uint32_t lv_tick_get(void); uint32_t lv_tick_get(void);
/** /**
* Get the elapsed milliseconds science a previous time stamp * Get the elapsed milliseconds since a previous time stamp
* @param prev_tick a previous time stamp (return value of systick_get() ) * @param prev_tick a previous time stamp (return value of systick_get() )
* @return the elapsed milliseconds since 'prev_tick' * @return the elapsed milliseconds since 'prev_tick'
*/ */