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 pull request #971 from manison/patch/fix-multiple-keypad-events

Browse Source 
Fix keypad event might be generated multiple times
This commit is contained in:
Gabor Kiss-Vamosi 2019-03-25 15:53:44 +01:00 committed by GitHub
commit a979a445ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lv_core/lv_indev.c
View File

@ -402,9 +402,14 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data)
* It must be done here else `lv_indev_get_key` will return the last key in events and signals*/ * It must be done here else `lv_indev_get_key` will return the last key in events and signals*/
i->proc.types.keypad.last_key = data->key; i->proc.types.keypad.last_key = data->key;
/* Save the previous state so we can detect state changes below and also set the last state now
* so if any signal/event handler on the way returns `LV_RES_INV` the last state is remembered
* for the next time*/
uint32_t prev_state = i->proc.types.keypad.last_state;
i->proc.types.keypad.last_state = data->state;
/*Key press happened*/ /*Key press happened*/
if(data->state == LV_INDEV_STATE_PR && if(data->state == LV_INDEV_STATE_PR && prev_state == LV_INDEV_STATE_REL)
i->proc.types.keypad.last_state == LV_INDEV_STATE_REL)
{ {
i->proc.pr_timestamp = lv_tick_get(); i->proc.pr_timestamp = lv_tick_get();
@ -436,7 +441,7 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data)
} }
} }
/*Pressing*/ /*Pressing*/
else if(data->state == LV_INDEV_STATE_PR && i->proc.types.keypad.last_state == LV_INDEV_STATE_PR) else if(data->state == LV_INDEV_STATE_PR && prev_state == LV_INDEV_STATE_PR)
{ {
/*Long press time has elapsed?*/ /*Long press time has elapsed?*/
if(i->proc.long_pr_sent == 0 && lv_tick_elaps(i->proc.pr_timestamp) > LV_INDEV_LONG_PRESS_TIME) { if(i->proc.long_pr_sent == 0 && lv_tick_elaps(i->proc.pr_timestamp) > LV_INDEV_LONG_PRESS_TIME) {
@ -481,7 +486,7 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data)
} }
} }
/*Release happened*/ /*Release happened*/
else if(data->state == LV_INDEV_STATE_REL && i->proc.types.keypad.last_state == LV_INDEV_STATE_PR) else if(data->state == LV_INDEV_STATE_REL && prev_state == LV_INDEV_STATE_PR)
{ {
/*The user might clear the key when it was released. Always release the pressed key*/ /*The user might clear the key when it was released. Always release the pressed key*/
data->key = prev_key; data->key = prev_key;
@ -503,8 +508,6 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data)
i->proc.pr_timestamp = 0; i->proc.pr_timestamp = 0;
i->proc.long_pr_sent = 0; i->proc.long_pr_sent = 0;
} }
i->proc.types.keypad.last_state = data->state;
#else #else
(void)data; /*Unused*/ (void)data; /*Unused*/
(void)i; /*Unused*/ (void)i; /*Unused*/