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

merge dev-6.0

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-02-27 06:04:30 +01:00
parent dc0ce46b0c e85e4a8eb9
commit e323924176
4 changed files with 160 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lv_hal/lv_hal_indev.h
View File

@@ -93,7 +93,7 @@ typedef struct _lv_indev_proc_t {
lv_point_t last_point;
lv_point_t vect;
lv_point_t drag_sum; /*Count the dragged pixels to check LV_INDEV_DRAG_LIMIT*/
lv_point_t drawg_throw_vect;
lv_point_t drag_throw_vect;
struct _lv_obj_t * act_obj;
struct _lv_obj_t * last_obj;
@@ -101,12 +101,12 @@ typedef struct _lv_indev_proc_t {
uint8_t drag_limit_out :1;
uint8_t drag_in_prog :1;
uint8_t wait_unil_release :1;
};
}pointer;
struct { /*Keypad data*/
lv_indev_state_t last_state;
uint32_t last_key;
};
};
}keypad;
}types;
uint32_t pr_timestamp; /*Pressed time stamp*/
uint32_t longpr_rep_timestamp; /*Long press repeat time stamp*/