Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dev-5.3

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2018-11-24 07:42:02 +01:00
commit e8013a4252
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lv_hal/lv_hal_indev.c
View File

@ -109,9 +109,10 @@ bool lv_indev_read(lv_indev_t * indev, lv_indev_data_t * data)
{
bool cont = false;
memset(data, 0, sizeof(lv_indev_data_t));
data->state = LV_INDEV_STATE_REL;
if(indev->driver.read) {
memset(data, 0, sizeof(data));
data->state = LV_INDEV_STATE_REL;
data->user_data = indev->driver.user_data;
LV_LOG_TRACE("idnev read started");
@ -119,7 +120,6 @@ bool lv_indev_read(lv_indev_t * indev, lv_indev_data_t * data)
LV_LOG_TRACE("idnev read finished");
} else {
LV_LOG_WARN("indev function registered");
memset(data, 0, sizeof(lv_indev_data_t));
}
return cont;