对keypad的按下使用专门的标志,解决实体按键按下影响触摸按下

This commit is contained in:
Yu Xifeng 2024-12-22 12:37:39 +00:00
parent 821f815d07
commit 99af98a15b
3 changed files with 7 additions and 6 deletions

View File

@ -72,7 +72,7 @@ void keyboard_read(lv_indev_drv_t * indev_drv, lv_indev_data_t * data)
} }
if (data->key != 0) { if (data->key != 0) {
/* Only record button state when actual output is produced to prevent widgets from refreshing */ /* 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) { // if(data->key == LV_KEY_LEFT) {
// /*emulate encoder left*/ // /*emulate encoder left*/
// data->enc_diff = 1; // data->enc_diff = 1;

View File

@ -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) 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) { if(i->proc.wait_until_release) {
i->proc.wait_until_release = 0; 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; i->proc.types.keypad.last_state = data->state;
/*Key press happened*/ /*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); LV_LOG_INFO("%" LV_PRIu32 " key is pressed", data->key);
i->proc.pr_timestamp = lv_tick_get(); 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*/ /*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) { if(data->key == LV_KEY_ENTER) {
lv_event_send(indev_obj_act, LV_EVENT_PRESSING, indev_act); 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*/ /*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); 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*/ /*The user might clear the key when it was released. Always release the pressed key*/
data->key = prev_key; data->key = prev_key;

View File

@ -70,7 +70,8 @@ typedef enum {
/** States for input devices*/ /** States for input devices*/
typedef enum { typedef enum {
LV_INDEV_STATE_RELEASED = 0, LV_INDEV_STATE_RELEASED = 0,
LV_INDEV_STATE_PRESSED LV_INDEV_STATE_PRESSED,
LV_INDEV_STATE_KEY_PRESSED
} lv_indev_state_t; } lv_indev_state_t;
/** Data structure passed to an input driver to fill*/ /** Data structure passed to an input driver to fill*/