diff options
author | Mason Wang <masonwang@google.com> | 2022-04-15 17:48:15 +0800 |
---|---|---|
committer | Mason Wang <masonwang@google.com> | 2022-04-18 16:14:17 +0800 |
commit | 9af2e20f8a24c6ebf2872fe96d2c513411fab508 (patch) | |
tree | 281aee2993918316bf1de988e54acfee32327309 /ft3658 | |
parent | 790619bc38500a503e426555125455c763a56923 (diff) | |
download | focaltech_touch-9af2e20f8a24c6ebf2872fe96d2c513411fab508.tar.gz |
touch/focaltech: Update relative code for FW V0B_D01.
Change list:
1. Remove buf[2] == 0, and filtered events of grip and palm.
2. Use Edge palm status instead of STTW status.
Bug: 229359119
Test: Touch operation is normal in touch palm enable.
Signed-off-by: Mason Wang <masonwang@google.com>
Change-Id: Ic97700e7d8cda2bfd9dd59197239026f16fcec8f
Diffstat (limited to 'ft3658')
-rw-r--r-- | ft3658/focaltech_core.c | 34 | ||||
-rw-r--r-- | ft3658/focaltech_core.h | 2 |
2 files changed, 5 insertions, 31 deletions
diff --git a/ft3658/focaltech_core.c b/ft3658/focaltech_core.c index 8415a0d..474191e 100644 --- a/ft3658/focaltech_core.c +++ b/ft3658/focaltech_core.c @@ -873,9 +873,9 @@ static int fts_read_parse_touchdata(struct fts_ts_data *data) (get_regB2_status & (1 << i)) ? "Enable" : "Disable" ); } break; - case STATUS_STTW : // STTW result + case STATUS_EDGE_PALM : // Edge palm result if( check_regB2_status & (1 << i)) { - FTS_INFO("-------STTW = %s\n", + FTS_INFO("-------Edge palm = %s\n", (get_regB2_status & (1 << i)) ? "Enable" : "Disable" ); } break; @@ -890,32 +890,6 @@ static int fts_read_parse_touchdata(struct fts_ts_data *data) } } current_host_status = get_regB2_status; - - if (buf[2] == 0) { - if ((data->log_level >= 2) || - ((1 == data->log_level) && (FTS_TOUCH_DOWN == events[i].flag))) { - FTS_DEBUG("Skip report key data."); - } - return -EIO; - } - - /* Filter the touch data by report flag. */ - if (check_regB2_status & (1 << STATUS_PALM)) { - if ((data->log_level >= 2) || - ((1 == data->log_level) && (FTS_TOUCH_DOWN == events[i].flag))) { - FTS_DEBUG("Skip report palm touch data."); - } - return -EINVAL; - } - - if (check_regB2_status & (1 << STATUS_GRIP)) { - if ((data->log_level >= 2) || - ((1 == data->log_level) && (FTS_TOUCH_DOWN == events[i].flag))) { - FTS_DEBUG("Skip report grip touch data."); - } - return -EINVAL; - } - /* end of filter the touch data. */ } } #endif @@ -2933,8 +2907,8 @@ static int fts_ts_probe_entry(struct fts_ts_data *ts_data) (current_host_status & (1 << STATUS_GRIP)) ? "Enable" : "Disable"); FTS_DEBUG("-------GlOVE mode = %s\n", (current_host_status & (1 << STATUS_GLOVE)) ? "Enable" : "Disable"); - FTS_DEBUG("-------STTW = %s\n", - (current_host_status & (1 << STATUS_STTW)) ? "Enable" : "Disable"); + FTS_DEBUG("-------Edge palm %s\n", + (current_host_status & (1 << STATUS_EDGE_PALM)) ? "Enable" : "Disable"); FTS_DEBUG("-------LPTW = %s\n", (current_host_status & (1 << STATUS_LPTW)) ? "Enable" : "Disable"); #endif diff --git a/ft3658/focaltech_core.h b/ft3658/focaltech_core.h index 1c0dc60..f81a755 100644 --- a/ft3658/focaltech_core.h +++ b/ft3658/focaltech_core.h @@ -336,7 +336,7 @@ enum FTS_CUSTOMER_STATUS { STATUS_WATER, STATUS_GRIP, STATUS_GLOVE, - STATUS_STTW, + STATUS_EDGE_PALM, STATUS_LPTW, STATUS_CNT_END, }; |