diff --git a/components/lv_drivers/indev/keyboard.c b/components/lv_drivers/indev/keyboard.c index 991c915..8ce95cd 100644 --- a/components/lv_drivers/indev/keyboard.c +++ b/components/lv_drivers/indev/keyboard.c @@ -72,7 +72,7 @@ void keyboard_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data) } if (data->key != 0) { /* Only record button state when actual output is produced to prevent widgets from refreshing */ - data->state = (!in.value) ? LV_INDEV_STATE_PR : LV_INDEV_STATE_REL; + data->state = (!in.value) ? LV_INDEV_STATE_KEY_PRESSED : LV_INDEV_STATE_REL; // if(data->key == LV_KEY_LEFT) { // /*emulate encoder left*/ // data->enc_diff = 1; diff --git a/components/lvgl/src/core/lv_indev.c b/components/lvgl/src/core/lv_indev.c index 8409265..b1e73eb 100755 --- a/components/lvgl/src/core/lv_indev.c +++ b/components/lvgl/src/core/lv_indev.c @@ -395,7 +395,7 @@ static void indev_pointer_proc(lv_indev_t * i, lv_indev_data_t * data) */ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data) { - if(data->state == LV_INDEV_STATE_PRESSED && i->proc.wait_until_release) return; + if(data->state == LV_INDEV_STATE_KEY_PRESSED && i->proc.wait_until_release) return; if(i->proc.wait_until_release) { i->proc.wait_until_release = 0; @@ -426,7 +426,7 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data) i->proc.types.keypad.last_state = data->state; /*Key press happened*/ - if(data->state == LV_INDEV_STATE_PRESSED && prev_state == LV_INDEV_STATE_RELEASED) { + if(data->state == LV_INDEV_STATE_KEY_PRESSED && prev_state == LV_INDEV_STATE_RELEASED) { LV_LOG_INFO("%" LV_PRIu32 " key is pressed", data->key); i->proc.pr_timestamp = lv_tick_get(); @@ -468,7 +468,7 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data) } } /*Pressing*/ - else if(!dis && data->state == LV_INDEV_STATE_PRESSED && prev_state == LV_INDEV_STATE_PRESSED) { + else if(!dis && data->state == (LV_INDEV_STATE_PRESSED + 1) && prev_state == LV_INDEV_STATE_KEY_PRESSED) { if(data->key == LV_KEY_ENTER) { lv_event_send(indev_obj_act, LV_EVENT_PRESSING, indev_act); @@ -515,7 +515,7 @@ static void indev_keypad_proc(lv_indev_t * i, lv_indev_data_t * data) } } /*Release happened*/ - else if(!dis && data->state == LV_INDEV_STATE_RELEASED && prev_state == LV_INDEV_STATE_PRESSED) { + else if(!dis && data->state == LV_INDEV_STATE_RELEASED && prev_state == LV_INDEV_STATE_KEY_PRESSED) { LV_LOG_INFO("%" LV_PRIu32 " key is released", data->key); /*The user might clear the key when it was released. Always release the pressed key*/ data->key = prev_key; diff --git a/components/lvgl/src/hal/lv_hal_indev.h b/components/lvgl/src/hal/lv_hal_indev.h index 5bbcf53..2ac4f82 100755 --- a/components/lvgl/src/hal/lv_hal_indev.h +++ b/components/lvgl/src/hal/lv_hal_indev.h @@ -70,7 +70,8 @@ typedef enum { /** States for input devices*/ typedef enum { LV_INDEV_STATE_RELEASED = 0, - LV_INDEV_STATE_PRESSED + LV_INDEV_STATE_PRESSED, + LV_INDEV_STATE_KEY_PRESSED } lv_indev_state_t; /** Data structure passed to an input driver to fill*/